diff --git a/packages/forklift-console-plugin/locales/en/plugin__forklift-console-plugin.json b/packages/forklift-console-plugin/locales/en/plugin__forklift-console-plugin.json
index bd34fc4d5..d9379176f 100644
--- a/packages/forklift-console-plugin/locales/en/plugin__forklift-console-plugin.json
+++ b/packages/forklift-console-plugin/locales/en/plugin__forklift-console-plugin.json
@@ -8,6 +8,7 @@
   "{{selectedLength}} hosts selected.": "{{selectedLength}} hosts selected.",
   "{{vmCount}} VMs selected ": "{{vmCount}} VMs selected ",
   "{{vmDone}} of {{vmCount}} VMs migrated": "{{vmDone}} of {{vmCount}} VMs migrated",
+  "{children}": "{children}",
   "24 hours": "24 hours",
   "404: Not Found": "404: Not Found",
   "7 days": "7 days",
@@ -16,15 +17,12 @@
   "A CA certificate to be trusted when connecting to the Red Hat Virtualization Manager (RHVM) API endpoint. Ensure the CA certificate format is in a PEM encoded X.509 format. To use a CA certificate, drag the file to the text box or browse for it. To use the system CA certificate, leave the field empty.": "A CA certificate to be trusted when connecting to the Red Hat Virtualization Manager (RHVM) API endpoint. Ensure the CA certificate format is in a PEM encoded X.509 format. To use a CA certificate, drag the file to the text box or browse for it. To use the system CA certificate, leave the field empty.",
   "A CA certificate to be trusted when connecting to the vCenter API endpoint. Ensure the CA certificate format is in a PEM encoded X.509 format. To use a CA certificate, drag the file to the text box or browse for it. To use the system CA certificate, leave the field empty.": "A CA certificate to be trusted when connecting to the vCenter API endpoint. Ensure the CA certificate format is in a PEM encoded X.509 format. To use a CA certificate, drag the file to the text box or browse for it. To use the system CA certificate, leave the field empty.",
   "A Secret containing credentials and other confidential information.": "A Secret containing credentials and other confidential information.",
-  "A service account token with cluster admin privileges, required for authenticating the connection to the API server.": "A service account token with cluster admin privileges, required for authenticating the connection to the API server.",
   "A user ID for connecting to the OpenStack Identity (Keystone) endpoint.": "A user ID for connecting to the OpenStack Identity (Keystone) endpoint.",
   "A user password for connecting to the OpenStack Identity (Keystone) endpoint.": "A user password for connecting to the OpenStack Identity (Keystone) endpoint.",
   "A user password for connecting to the Red Hat Virtualization Manager (RHVM) API endpoint.": "A user password for connecting to the Red Hat Virtualization Manager (RHVM) API endpoint.",
   "A user password for connecting to the vCenter API endpoint.": "A user password for connecting to the vCenter API endpoint.",
   "A username for connecting to the OpenStack Identity (Keystone) endpoint.": "A username for connecting to the OpenStack Identity (Keystone) endpoint.",
   "A username for connecting to the Red Hat Virtualization Manager (RHVM) API endpoint. Ensure the username is in the format of username@user-domain. For example: admin@internal.": "A username for connecting to the Red Hat Virtualization Manager (RHVM) API endpoint. Ensure the username is in the format of username@user-domain. For example: admin@internal.",
-  "A username for connecting to the vCenter API endpoint. Ensure the username includes the user domain. For example: <1>user@vsphere.local</1>.": "A username for connecting to the vCenter API endpoint. Ensure the username includes the user domain. For example: <1>user@vsphere.local</1>.",
-  "A VDDK init image is optional, but it is strongly recommended to specify a VDDK init image to accelerate migrations.": "A VDDK init image is optional, but it is strongly recommended to specify a VDDK init image to accelerate migrations.",
   "Actions": "Actions",
   "Add mapping": "Add mapping",
   "Add source and target providers for the migration.": "Add source and target providers for the migration.",
@@ -40,8 +38,6 @@
   "Archive plan?": "Archive plan?",
   "Archived": "Archived",
   "Archiving": "Archiving",
-  "Are you sure you want to delete <2>{{resourceName}}</2> in namespace <5>{{namespace}}</5>?": "Are you sure you want to delete <2>{{resourceName}}</2> in namespace <5>{{namespace}}</5>?",
-  "Are you sure you want to delete <2>{{resourceName}}</2>?": "Are you sure you want to delete <2>{{resourceName}}</2>?",
   "Authentication type": "Authentication type",
   "Bandwidth": "Bandwidth",
   "CA certificate": "CA certificate",
@@ -101,7 +97,6 @@
   "Delete Provider": "Delete Provider",
   "Delete StorageMap?": "Delete StorageMap?",
   "Delete the provider resource.": "Delete the provider resource.",
-  "Deleting a migration plan does not remove temporary resources, it is recommended to <2>archive</2> the plan first before deleting it, to remove temporary resources.": "Deleting a migration plan does not remove temporary resources, it is recommended to <2>archive</2> the plan first before deleting it, to remove temporary resources.",
   "Description": "Description",
   "Details": "Details",
   "Determines the frequency with which the system checks the status of snapshot creation or removal during oVirt warm migration. The default value is 10 seconds.": "Determines the frequency with which the system checks the status of snapshot creation or removal during oVirt warm migration. The default value is 10 seconds.",
@@ -132,7 +127,6 @@
   "Empty": "Empty",
   "Endpoint": "Endpoint",
   "Ensure the URL includes the \"/ovirt-engine/api\" path. For example: https://rhv-host-example.com/ovirt-engine/api.": "Ensure the URL includes the \"/ovirt-engine/api\" path. For example: https://rhv-host-example.com/ovirt-engine/api.",
-  "Ensure the URL includes the <1>/sdk</1> path. For example: <4>https://vCenter-host-example.com/sdk</4>.": "Ensure the URL includes the <1>/sdk</1> path. For example: <4>https://vCenter-host-example.com/sdk</4>.",
   "Error": "Error",
   "Error: Insecure Skip Verify must be a boolean value.": "Error: Insecure Skip Verify must be a boolean value.",
   "Error: Name is required and must be a unique within a namespace and valid Kubernetes name (i.e., must contain no more than 253 characters, consists of lower case alphanumeric characters , '-' or '.' and starts and ends with an alphanumeric character).": "Error: Name is required and must be a unique within a namespace and valid Kubernetes name (i.e., must contain no more than 253 characters, consists of lower case alphanumeric characters , '-' or '.' and starts and ends with an alphanumeric character).",
@@ -146,16 +140,10 @@
   "Error: The format of the provided project name is invalid. Ensure the project name does not include spaces.": "Error: The format of the provided project name is invalid. Ensure the project name does not include spaces.",
   "Error: The format of the provided region name is invalid. Ensure the region name does not include spaces.": "Error: The format of the provided region name is invalid. Ensure the region name does not include spaces.",
   "Error: The format of the provided token is invalid. Ensure the token does not include spaces.": "Error: The format of the provided token is invalid. Ensure the token does not include spaces.",
-  "Error: The format of the provided token is invalid. Ensure the token is a valid Kubernetes service account token.": "Error: The format of the provided token is invalid. Ensure the token is a valid Kubernetes service account token.",
-  "Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and a path. For example: <2>https://identity_service.com:5000/v3</2>.": "Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and a path. For example: <2>https://identity_service.com:5000/v3</2>.",
-  "Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and a path. For example: <2>https://vCenter-host-example.com/sdk</2>.": "Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and a path. For example: <2>https://vCenter-host-example.com/sdk</2>.",
   "Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and a path. For example: https://rhv-host-example.com/ovirt-engine/api.": "Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and a path. For example: https://rhv-host-example.com/ovirt-engine/api.",
-  "Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and, optionally, a port. For example: <2>https://api.openshift-domain.com:6443</2>.": "Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a domain name, and, optionally, a port. For example: <2>https://api.openshift-domain.com:6443</2>.",
-  "Error: The format of the provided URL is invalid. Ensure the URL is in the following format: <1>ip_or_hostname_of_nfs_server:/nfs_path</1>. For example: <4>10.10.0.10:/ova</4>.": "Error: The format of the provided URL is invalid. Ensure the URL is in the following format: <1>ip_or_hostname_of_nfs_server:/nfs_path</1>. For example: <4>10.10.0.10:/ova</4>.",
   "Error: The format of the provided user ID is invalid. Ensure the user ID does not include spaces.": "Error: The format of the provided user ID is invalid. Ensure the user ID does not include spaces.",
   "Error: The format of the provided user password is invalid. Ensure the user password does not include spaces.": "Error: The format of the provided user password is invalid. Ensure the user password does not include spaces.",
   "Error: The format of the provided username is invalid. Ensure the username does not include spaces.": "Error: The format of the provided username is invalid. Ensure the username does not include spaces.",
-  "Error: The format of the provided VDDK init image is invalid. Ensure the path is a valid container image path. For example: <1>quay.io/kubev2v/vddk:latest</1>.": "Error: The format of the provided VDDK init image is invalid. Ensure the path is a valid container image path. For example: <1>quay.io/kubev2v/vddk:latest</1>.",
   "Error: This field must be a boolean.": "Error: This field must be a boolean.",
   "Error: this field must be set to a boolean value.": "Error: this field must be set to a boolean value.",
   "Failed": "Failed",
@@ -177,7 +165,6 @@
   "Filter by tenant": "Filter by tenant",
   "Filter provider": "Filter provider",
   "Flavor": "Flavor",
-  "For example: <1>https://identity_service.com:5000/v3</1>.": "For example: <1>https://identity_service.com:5000/v3</1>.",
   "From": "From",
   "GPUs/Host Devices": "GPUs/Host Devices",
   "Hide from view": "Hide from view",
@@ -213,20 +200,14 @@
   "Method of authentication to use when connecting to the OpenStack Identity (Keystone) server.": "Method of authentication to use when connecting to the OpenStack Identity (Keystone) server.",
   "Metrics": "Metrics",
   "Migrate": "Migrate",
-  "Migrating virtualization workloads is a multi-step process. <2>Learn more</2>.": "Migrating virtualization workloads is a multi-step process. <2>Learn more</2>.",
-  "Migration network maps are used to map network interfaces between source and target virtualization providers, at least one source and one target provider must be available in order to create a migration storage map, <2>Learn more</2>.": "Migration network maps are used to map network interfaces between source and target virtualization providers, at least one source and one target provider must be available in order to create a migration storage map, <2>Learn more</2>.",
   "Migration networks maps are used to map network interfaces between source and target workloads.": "Migration networks maps are used to map network interfaces between source and target workloads.",
   "Migration plans are used to plan migration or virtualization workloads from source providers to target providers.": "Migration plans are used to plan migration or virtualization workloads from source providers to target providers.",
-  "Migration plans are used to plan migration or virtualization workloads from source providers to target providers. At least one source and one target provider must be available in order to create a migration plan, <2>Learn more</2>.": "Migration plans are used to plan migration or virtualization workloads from source providers to target providers. At least one source and one target provider must be available in order to create a migration plan, <2>Learn more</2>.",
   "Migration started": "Migration started",
-  "Migration storage maps are used to map storage interfaces between source and target workloads, at least one source and one target provider must be available in order to create a migration plan, <2>Learn more</2>.": "Migration storage maps are used to map storage interfaces between source and target workloads, at least one source and one target provider must be available in order to create a migration plan, <2>Learn more</2>.",
   "Migration storage maps are used to map storage interfaces between source and target workloads.": "Migration storage maps are used to map storage interfaces between source and target workloads.",
   "Migration Toolkit for Virtualization": "Migration Toolkit for Virtualization",
-  "Migration Toolkit for Virtualization (MTV) migrates virtual machines at scale to Red Hat OpenShift Virtualization. You can migrate virtual machines from VMware vSphere, Red Hat Virtualization, OpenStack, OVA and OpenShift Virtualization source providers to OpenShift Virtualization with the Migration Toolkit for Virtualization (MTV).": "Migration Toolkit for Virtualization (MTV) migrates virtual machines at scale to Red Hat OpenShift Virtualization. You can migrate virtual machines from VMware vSphere, Red Hat Virtualization, OpenStack, OVA and OpenShift Virtualization source providers to OpenShift Virtualization with the Migration Toolkit for Virtualization (MTV).",
   "Migrations": "Migrations",
   "Migrations (last 24 hours)": "Migrations (last 24 hours)",
   "Migrations (last 7 days)": "Migrations (last 7 days)",
-  "Migrations are performed in a few simple steps, first by providing source and destination credentials, then mapping the source and destination infrastructure and creating a choreographed plan, and finally, executing the migration effort.": "Migrations are performed in a few simple steps, first by providing source and destination credentials, then mapping the source and destination infrastructure and creating a choreographed plan, and finally, executing the migration effort.",
   "Migrations for virtualization": "Migrations for virtualization",
   "MTU": "MTU",
   "Must gather cleanup after (hours)": "Must gather cleanup after (hours)",
@@ -249,30 +230,21 @@
   "New name was generated for the Network Map due to naming conflict.": "New name was generated for the Network Map due to naming conflict.",
   "No credentials found.": "No credentials found.",
   "No inventory data available.": "No inventory data available.",
-  "No NetworkMaps found in namespace <1>{namespace}</1>.": "No NetworkMaps found in namespace <1>{namespace}</1>.",
   "No NetworkMaps found.": "No NetworkMaps found.",
   "No networks in this category": "No networks in this category",
   "No owner": "No owner",
-  "No Plans found in namespace <1>{namespace}</1>.": "No Plans found in namespace <1>{namespace}</1>.",
   "No Plans found.": "No Plans found.",
   "No provider is available": "No provider is available",
   "No providers found": "No providers found",
-  "No Providers found in namespace <1>{namespace}</1>.": "No Providers found in namespace <1>{namespace}</1>.",
   "No results found": "No results found",
   "No results match the filter criteria. Clear all filters and try again.": "No results match the filter criteria. Clear all filters and try again.",
   "No secret": "No secret",
   "No secret found.": "No secret found.",
   "No secret.": "No secret.",
-  "No StorageMaps found in namespace <1>{namespace}</1>.": "No StorageMaps found in namespace <1>{namespace}</1>.",
   "No StorageMaps found.": "No StorageMaps found.",
   "No storages in this category": "No storages in this category",
   "No target provider exists ": "No target provider exists ",
   "Not Ready": "Not Ready",
-  "Note: If <1>Skip certificate validation</1> is selected, migrations from this provider will not be secure, meaning that the transferred data is sent over an insecure connection and potentially sensitive data could be exposed.": "Note: If <1>Skip certificate validation</1> is selected, migrations from this provider will not be secure, meaning that the transferred data is sent over an insecure connection and potentially sensitive data could be exposed.",
-  "Note: If this field is checked/true, migrations from this provider will not be secure, meaning that the transferred data is sent over an insecure connection and potentially sensitive data could be exposed.": "Note: If this field is checked/true, migrations from this provider will not be secure, meaning that the transferred data is sent over an insecure connection and potentially sensitive data could be exposed.",
-  "Note: Use the Manager CA certificate unless it was replaced by a third-party certificate, in which case use the Manager Apache CA certificate.": "Note: Use the Manager CA certificate unless it was replaced by a third-party certificate, in which case use the Manager Apache CA certificate.",
-  "Note: Use the Manager CA certificate unless it was replaced by a third-party certificate, in which case use the Manager Apache CA certificate. <1></1><2></2>You can retrieve the Manager CA certificate at:<4></4><5>https://&#8249;rhv-host-example.com&#8250;/ovirt-engine/services/pki-resource?resource=ca-certificate&format=X509-PEM-CA</5> .": "Note: Use the Manager CA certificate unless it was replaced by a third-party certificate, in which case use the Manager Apache CA certificate. <1></1><2></2>You can retrieve the Manager CA certificate at:<4></4><5>https://&#8249;rhv-host-example.com&#8250;/ovirt-engine/services/pki-resource?resource=ca-certificate&format=X509-PEM-CA</5> .",
-  "Note: Use the Manager CA certificate unless it was replaced by a third-party certificate, in which case use the Manager Apache CA certificate.<1></1><2></2>You can retrieve the Manager CA certificate at:<4></4><5>https://&#8249;rhv-host-example.com&#8250;/ovirt-engine/services/pki-resource?resource=ca-certificate&format=X509-PEM-CA</5> .": "Note: Use the Manager CA certificate unless it was replaced by a third-party certificate, in which case use the Manager Apache CA certificate.<1></1><2></2>You can retrieve the Manager CA certificate at:<4></4><5>https://&#8249;rhv-host-example.com&#8250;/ovirt-engine/services/pki-resource?resource=ca-certificate&format=X509-PEM-CA</5> .",
   "NUMA": "NUMA",
   "Number of cluster in provider": "Number of cluster in provider",
   "Number of data centers in provider": "Number of data centers in provider",
@@ -404,7 +376,6 @@
   "The limit for memory usage by the controller, specified in Megabytes (Mi). Default value is 800Mi.": "The limit for memory usage by the controller, specified in Megabytes (Mi). Default value is 800Mi.",
   "The maximum age in hours for must gather cleanup. Default value is -1, which implies never.": "The maximum age in hours for must gather cleanup. Default value is -1, which implies never.",
   "The password for the ESXi host admin": "The password for the ESXi host admin",
-  "The path must be empty or a valid container image path. For example: <2>quay.io/kubev2v/vddk:latest</2>.": "The path must be empty or a valid container image path. For example: <2>quay.io/kubev2v/vddk:latest</2>.",
   "The provider is not ready - ": "The provider is not ready - ",
   "The provider is not ready.": "The provider is not ready.",
   "The provider's CA certificate will be validated.": "The provider's CA certificate will be validated.",
@@ -412,7 +383,6 @@
   "The provider's REST API TLS certificate will be validated.": "The provider's REST API TLS certificate will be validated.",
   "The provider's REST API TLS certificate won't be validated.": "The provider's REST API TLS certificate won't be validated.",
   "The username for the ESXi host admin": "The username for the ESXi host admin",
-  "This gives organizations the ability to more easily access workloads running on virtual machines, while developing new cloud-native applications.": "This gives organizations the ability to more easily access workloads running on virtual machines, while developing new cloud-native applications.",
   "This plan cannot be archived because it is not completed.": "This plan cannot be archived because it is not completed.",
   "This plan cannot be duplicated because the inventory data for its associated providers is not ready.": "This plan cannot be duplicated because the inventory data for its associated providers is not ready.",
   "This plan cannot be edited because it has been archived.": "This plan cannot be edited because it has been archived.",
@@ -420,15 +390,8 @@
   "This plan cannot be edited because it is running must gather.": "This plan cannot be edited because it is running must gather.",
   "This plan cannot be edited because the inventory data for its associated providers is not ready.": "This plan cannot be edited because the inventory data for its associated providers is not ready.",
   "This plan cannot be restarted because it is running must gather service": "This plan cannot be restarted because it is running must gather service",
-  "This plan will be created in <1>{defaultNamespace}</1> namespace, if you wish to choose another namespace please cancel, and choose a namespace from the top bar.": "This plan will be created in <1>{defaultNamespace}</1> namespace, if you wish to choose another namespace please cancel, and choose a namespace from the top bar.",
-  "This provider will be created in <1>{defaultNamespace}</1> namespace, if you wish to choose another namespace please cancel, and choose a namespace from the top bar.": "This provider will be created in <1>{defaultNamespace}</1> namespace, if you wish to choose another namespace please cancel, and choose a namespace from the top bar.",
-  "This resource is managed by <2></2> and any modifications may be overwritten. Edit the managing resource to preserve changes.": "This resource is managed by <2></2> and any modifications may be overwritten. Edit the managing resource to preserve changes.",
   "To": "To",
   "To make changes to the plan, select Duplicate and edit the duplicate plan.": "To make changes to the plan, select Duplicate and edit the duplicate plan.",
-  "To migrate virtual machines from <1>{name}</1> provider, select the virtual machines to migrate from the list of available virtual machines and click the <4>Create migration plan</4> button.": "To migrate virtual machines from <1>{name}</1> provider, select the virtual machines to migrate from the list of available virtual machines and click the <4>Create migration plan</4> button.",
-  "To migrate virtual machines from <1>{provider.metadata.name}</1> provider, select the virtual machines to migrate from the list of available virtual machines located in the virtual machines tab. <4>Go to <1>Virtual Machines</1> tab</4>": "To migrate virtual machines from <1>{provider.metadata.name}</1> provider, select the virtual machines to migrate from the list of available virtual machines located in the virtual machines tab. <4>Go to <1>Virtual Machines</1> tab</4>",
-  "To migrate virtual machines select a provider, then select the virtual machines to migrate and click the <1>Create migration plan</1> button.": "To migrate virtual machines select a provider, then select the virtual machines to migrate and click the <1>Create migration plan</1> button.",
-  "To migrate virtual machines select target provider, namespace, mappings and click the <2>Create</2> button to crete the plan.": "To migrate virtual machines select target provider, namespace, mappings and click the <2>Create</2> button to crete the plan.",
   "To troubleshoot, check the Forklift controller pod events and logs.": "To troubleshoot, check the Forklift controller pod events and logs.",
   "To troubleshoot, check the Forklift controller pod logs.": "To troubleshoot, check the Forklift controller pod logs.",
   "To troubleshoot, view the provider status available in the provider details page\n          and check the Forklift controller pod logs.": "To troubleshoot, view the provider status available in the provider details page\n          and check the Forklift controller pod logs.",
@@ -446,19 +409,14 @@
   "Updated": "Updated",
   "URL": "URL",
   "URL of the API endpoint of the Red Hat Virtualization Manager (RHVM) on which the source VM is mounted. Ensure that the URL includes the path leading to the RHVM API server, usually /ovirt-engine/api. For example, https://rhv-host-example.com/ovirt-engine/api.": "URL of the API endpoint of the Red Hat Virtualization Manager (RHVM) on which the source VM is mounted. Ensure that the URL includes the path leading to the RHVM API server, usually /ovirt-engine/api. For example, https://rhv-host-example.com/ovirt-engine/api.",
-  "URL of the API endpoint of the vCenter on which the source VM is mounted. Ensure that the URL includes the sdk path, usually <1>/sdk</1>.<3></3><4></4>For example: <6>https://vCenter-host-example.com/sdk</6>.<8></8><9></9>If a certificate for FQDN is specified, the value of this field needs to match the FQDN in the certificate.": "URL of the API endpoint of the vCenter on which the source VM is mounted. Ensure that the URL includes the sdk path, usually <1>/sdk</1>.<3></3><4></4>For example: <6>https://vCenter-host-example.com/sdk</6>.<8></8><9></9>If a certificate for FQDN is specified, the value of this field needs to match the FQDN in the certificate.",
-  "URL of the NFS file share that serves the OVA. Ensure the URL is in the following format: <2>ip_or_hostname_of_nfs_server:/nfs_path</2>. For example: <5>10.10.0.10:/ova</5> .": "URL of the NFS file share that serves the OVA. Ensure the URL is in the following format: <2>ip_or_hostname_of_nfs_server:/nfs_path</2>. For example: <5>10.10.0.10:/ova</5> .",
   "URL of the NFS file share that serves the OVA., for example, 10.10.0.10:/ova": "URL of the NFS file share that serves the OVA., for example, 10.10.0.10:/ova",
   "URL of the Openshift Virtualization API endpoint.": "URL of the Openshift Virtualization API endpoint.",
   "URL of the Openshift Virtualization API endpoint. Empty may be used for the host provider.": "URL of the Openshift Virtualization API endpoint. Empty may be used for the host provider.",
-  "URL of the Openshift Virtualization API endpoint. If both <1>URL</1> and <4>Service account bearer token</4> are left blank, the local OpenShift cluster is used.": "URL of the Openshift Virtualization API endpoint. If both <1>URL</1> and <4>Service account bearer token</4> are left blank, the local OpenShift cluster is used.",
   "URL of the OpenStack Identity (Keystone) endpoint.": "URL of the OpenStack Identity (Keystone) endpoint.",
-  "URL of the OpenStack Identity (Keystone) endpoint. For example: <2>https://identity_service.com:5000/v3</2>.": "URL of the OpenStack Identity (Keystone) endpoint. For example: <2>https://identity_service.com:5000/v3</2>.",
   "URL of the providers API endpoint. The URL must be a valid endpoint for the provider type, see\n      the documentation for each provider type to learn more about the URL format.": "URL of the providers API endpoint. The URL must be a valid endpoint for the provider type, see\n      the documentation for each provider type to learn more about the URL format.",
   "URL of the Red Hat Virtualization Manager (RHVM) API endpoint.": "URL of the Red Hat Virtualization Manager (RHVM) API endpoint.",
   "URL of the Red Hat Virtualization Manager (RHVM) API endpoint. Ensure the URL includes the \"/ovirt-engine/api\" path. For example: https://rhv-host-example.com/ovirt-engine/api.": "URL of the Red Hat Virtualization Manager (RHVM) API endpoint. Ensure the URL includes the \"/ovirt-engine/api\" path. For example: https://rhv-host-example.com/ovirt-engine/api.",
   "URL of the vCenter API endpoint.": "URL of the vCenter API endpoint.",
-  "URL of the vCenter API endpoint. Ensure the URL includes the <1>/sdk</1> path. For example: <3>https://vCenter-host-example.com/sdk</3>.": "URL of the vCenter API endpoint. Ensure the URL includes the <1>/sdk</1> path. For example: <3>https://vCenter-host-example.com/sdk</3>.",
   "User ID": "User ID",
   "Username": "Username",
   "Validation Failed": "Validation Failed",
@@ -466,9 +424,6 @@
   "View and edit provider details.": "View and edit provider details.",
   "View details": "View details",
   "View provider details": "View provider details",
-  "Virtual Disk Development Kit (VDDK) container init image path. The path must be empty or a valid container image path in the format of <2>registry_route_or_server_path/vddk:&#8249;tag&#8250;</2>.<4></4><5></5>For example: <7>quay.io/kubev2v/example:latest</7>.<9></9><10></10>It is strongly recommended to specify a VDDK init image to accelerate migrations.": "Virtual Disk Development Kit (VDDK) container init image path. The path must be empty or a valid container image path in the format of <2>registry_route_or_server_path/vddk:&#8249;tag&#8250;</2>.<4></4><5></5>For example: <7>quay.io/kubev2v/example:latest</7>.<9></9><10></10>It is strongly recommended to specify a VDDK init image to accelerate migrations.",
-  "Virtual Disk Development Kit (VDDK) container init image path. The path must be empty or a valid container image path. For example: <1>quay.io/kubev2v/vddk:latest</1>.": "Virtual Disk Development Kit (VDDK) container init image path. The path must be empty or a valid container image path. For example: <1>quay.io/kubev2v/vddk:latest</1>.",
-  "Virtual Disk Development Kit (VDDK) container init image path.<1></1><2></2>Note: It is strongly recommended to specify a VDDK init image to accelerate migrations.": "Virtual Disk Development Kit (VDDK) container init image path.<1></1><2></2>Note: It is strongly recommended to specify a VDDK init image to accelerate migrations.",
   "Virtual Machine Migrations": "Virtual Machine Migrations",
   "Virtual machines": "Virtual machines",
   "Virtual Machines": "Virtual Machines",
@@ -478,11 +433,7 @@
   "Volumes": "Volumes",
   "vSphere product name": "vSphere product name",
   "Warning concerns": "Warning concerns",
-  "Warning: The provided URL does not end with the API endpoint path: <2>\"/v3\"</2>. Ensure the URL includes the correct path. For example: <5>https://identity_service.com:5000/v3</5>.": "Warning: The provided URL does not end with the API endpoint path: <2>\"/v3\"</2>. Ensure the URL includes the correct path. For example: <5>https://identity_service.com:5000/v3</5>.",
-  "Warning: The provided URL does not end with the API endpoint path:<1>\"/v3\"</1>. Ensure the URL includes the correct path. For example: <5>https://identity_service.com:5000/v3</5>.": "Warning: The provided URL does not end with the API endpoint path:<1>\"/v3\"</1>. Ensure the URL includes the correct path. For example: <5>https://identity_service.com:5000/v3</5>.",
   "Warning: The provided URL does not end with the RHVM API endpoint path: \"/ovirt-engine/api\". Ensure the URL includes the correct path. For example: https://rhv-host-example.com/ovirt-engine/api.": "Warning: The provided URL does not end with the RHVM API endpoint path: \"/ovirt-engine/api\". Ensure the URL includes the correct path. For example: https://rhv-host-example.com/ovirt-engine/api.",
-  "Warning: The provided URL does not end with the SDK endpoint path: <1>/sdk</1>. Ensure the URL includes the correct path. For example: <4>https://vCenter-host-example.com/sdk</4>.": "Warning: The provided URL does not end with the SDK endpoint path: <1>/sdk</1>. Ensure the URL includes the correct path. For example: <4>https://vCenter-host-example.com/sdk</4>.",
-  "Warning: The provided username does not include the user domain. Ensure the username includes the domain. For example: <1>user@vsphere.local</1>.": "Warning: The provided username does not include the user domain. Ensure the username includes the domain. For example: <1>user@vsphere.local</1>.",
   "Warning: The provided username does not include the user domain. Ensure the username is in the format of username@user-domain. For example: admin@internal.": "Warning: The provided username does not include the user domain. Ensure the username is in the format of username@user-domain. For example: admin@internal.",
   "Welcome": "Welcome",
   "When a plan is archived, its history, metadata, and logs are deleted. The plan cannot be edited or restarted but it can be viewed.": "When a plan is archived, its history, metadata, and logs are deleted. The plan cannot be edited or restarted but it can be viewed.",
diff --git a/packages/forklift-console-plugin/src/modules/NetworkMaps/EmptyStateNetworkMaps.tsx b/packages/forklift-console-plugin/src/modules/NetworkMaps/EmptyStateNetworkMaps.tsx
index 63904ddcc..8e0d765f4 100644
--- a/packages/forklift-console-plugin/src/modules/NetworkMaps/EmptyStateNetworkMaps.tsx
+++ b/packages/forklift-console-plugin/src/modules/NetworkMaps/EmptyStateNetworkMaps.tsx
@@ -1,10 +1,9 @@
 import React from 'react';
-import { Trans } from 'react-i18next';
 import { Link } from 'react-router-dom';
 import ForkliftEmptyState from 'src/components/empty-states/ForkliftEmptyState';
 import automationIcon from 'src/components/empty-states/images/automation.svg';
 import { HELP_LINK_HREF } from 'src/utils/constants';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { ExternalLink } from '@kubev2v/common';
 import { PROVIDERS_REFERENCE } from '@kubev2v/legacy/common/constants';
@@ -27,9 +26,9 @@ const EmptyStatePlans: React.FC<{ namespace: string }> = ({ namespace }) => {
       icon={AutomationIcon}
       title={
         namespace ? (
-          <Trans t={t} ns="plugin__forklift-console-plugin">
+          <ForkliftTrans>
             No NetworkMaps found in namespace <strong>{namespace}</strong>.
-          </Trans>
+          </ForkliftTrans>
         ) : (
           t('No NetworkMaps found.')
         )
@@ -38,7 +37,7 @@ const EmptyStatePlans: React.FC<{ namespace: string }> = ({ namespace }) => {
         !hasSufficientProviders ? (
           <Flex direction={{ default: 'column' }} alignItems={{ default: 'alignItemsCenter' }}>
             <FlexItem>
-              <Trans t={t} ns="plugin__forklift-console-plugin">
+              <ForkliftTrans>
                 Migration network maps are used to map network interfaces between source and target
                 virtualization providers, at least one source and one target provider must be
                 available in order to create a migration storage map,{' '}
@@ -46,7 +45,7 @@ const EmptyStatePlans: React.FC<{ namespace: string }> = ({ namespace }) => {
                   Learn more
                 </ExternalLink>
                 .
-              </Trans>
+              </ForkliftTrans>
             </FlexItem>
             <FlexItem>
               <Button variant="secondary">
diff --git a/packages/forklift-console-plugin/src/modules/Overview/views/overview/tabs/Details/cards/WelcomeCard.tsx b/packages/forklift-console-plugin/src/modules/Overview/views/overview/tabs/Details/cards/WelcomeCard.tsx
index e0d5f6f90..d93b9cc19 100644
--- a/packages/forklift-console-plugin/src/modules/Overview/views/overview/tabs/Details/cards/WelcomeCard.tsx
+++ b/packages/forklift-console-plugin/src/modules/Overview/views/overview/tabs/Details/cards/WelcomeCard.tsx
@@ -1,7 +1,6 @@
 import React, { FC } from 'react';
-import { Trans } from 'react-i18next';
 import automationIcon from 'src/modules/Overview/images/automation.svg';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { V1beta1ForkliftController } from '@kubev2v/types';
 import {
@@ -74,25 +73,25 @@ export const OverviewCard: FC<OverviewCardProps> = ({ onHide }) => {
           </CardHeader>
           <CardBody>
             <Text className="forklift-welcome-text">
-              <Trans t={t} ns="plugin__forklift-console-plugin">
+              <ForkliftTrans>
                 Migration Toolkit for Virtualization (MTV) migrates virtual machines at scale to Red
                 Hat OpenShift Virtualization. You can migrate virtual machines from VMware vSphere,
                 Red Hat Virtualization, OpenStack, OVA and OpenShift Virtualization source providers
                 to OpenShift Virtualization with the Migration Toolkit for Virtualization (MTV).
-              </Trans>
+              </ForkliftTrans>
             </Text>
             <Text className="forklift-welcome-text">
-              <Trans t={t} ns="plugin__forklift-console-plugin">
+              <ForkliftTrans>
                 This gives organizations the ability to more easily access workloads running on
                 virtual machines, while developing new cloud-native applications.
-              </Trans>
+              </ForkliftTrans>
             </Text>
             <Text className="forklift-welcome-text">
-              <Trans t={t} ns="plugin__forklift-console-plugin">
+              <ForkliftTrans>
                 Migrations are performed in a few simple steps, first by providing source and
                 destination credentials, then mapping the source and destination infrastructure and
                 creating a choreographed plan, and finally, executing the migration effort.
-              </Trans>
+              </ForkliftTrans>
             </Text>
           </CardBody>
         </SplitItem>
diff --git a/packages/forklift-console-plugin/src/modules/Plans/EmptyStatePlans.tsx b/packages/forklift-console-plugin/src/modules/Plans/EmptyStatePlans.tsx
index 62547da10..4851034eb 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/EmptyStatePlans.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/EmptyStatePlans.tsx
@@ -1,10 +1,9 @@
 import React from 'react';
-import { Trans } from 'react-i18next';
 import { Link } from 'react-router-dom';
 import ForkliftEmptyState from 'src/components/empty-states/ForkliftEmptyState';
 import digitalTransformation from 'src/modules/Overview/images/digitalTransormation.svg';
 import { HELP_LINK_HREF } from 'src/utils/constants';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { ExternalLink } from '@kubev2v/common';
 import { PROVIDERS_REFERENCE } from '@kubev2v/legacy/common/constants';
@@ -28,9 +27,9 @@ const EmptyStatePlans: React.FC<{ namespace: string }> = ({ namespace }) => {
       icon={AutomationIcon}
       title={
         namespace ? (
-          <Trans t={t} ns="plugin__forklift-console-plugin">
+          <ForkliftTrans>
             No Plans found in namespace <strong>{namespace}</strong>.
-          </Trans>
+          </ForkliftTrans>
         ) : (
           t('No Plans found.')
         )
@@ -39,7 +38,7 @@ const EmptyStatePlans: React.FC<{ namespace: string }> = ({ namespace }) => {
         !hasSufficientProviders ? (
           <Flex direction={{ default: 'column' }} alignItems={{ default: 'alignItemsCenter' }}>
             <FlexItem>
-              <Trans t={t} ns="plugin__forklift-console-plugin">
+              <ForkliftTrans>
                 Migration plans are used to plan migration or virtualization workloads from source
                 providers to target providers. At least one source and one target provider must be
                 available in order to create a migration plan,{' '}
@@ -47,7 +46,7 @@ const EmptyStatePlans: React.FC<{ namespace: string }> = ({ namespace }) => {
                   Learn more
                 </ExternalLink>
                 .
-              </Trans>
+              </ForkliftTrans>
             </FlexItem>
             <FlexItem>
               <Button variant="secondary">
diff --git a/packages/forklift-console-plugin/src/modules/Plans/planActions.tsx b/packages/forklift-console-plugin/src/modules/Plans/planActions.tsx
index a2d538e18..fbc414692 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/planActions.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/planActions.tsx
@@ -1,6 +1,5 @@
 import React, { useCallback, useMemo, useState } from 'react';
-import { Trans } from 'react-i18next';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { withActionServiceContext } from '@kubev2v/common';
 import { withQueryClient } from '@kubev2v/common';
@@ -376,10 +375,10 @@ const DeleteModal = ({
   const IsExecutingAlert = <Alert isInline variant="danger" title="Plan is currently running" />;
   const IsNotArchivedAlert = (
     <Alert isInline variant="info" title="Plan is not archived">
-      <Trans t={t} ns="plugin__forklift-console-plugin">
+      <ForkliftTrans>
         Deleting a migration plan does not remove temporary resources, it is recommended to{' '}
         <strong>archive</strong> the plan first before deleting it, to remove temporary resources.
-      </Trans>
+      </ForkliftTrans>
     </Alert>
   );
 
@@ -399,11 +398,11 @@ const DeleteModal = ({
           {isPlanExecuting ? IsExecutingAlert : ''}
           {isPlanArchived || !isPlanStarted ? '' : IsNotArchivedAlert}
           <TextContent>
-            <Trans t={t} ns="plugin__forklift-console-plugin">
+            <ForkliftTrans>
               Are you sure you want to delete{' '}
               <strong className="co-break-word">{{ resourceName: plan.name }}</strong> in namespace{' '}
               <strong>{{ namespace: plan.namespace }}</strong>?
-            </Trans>
+            </ForkliftTrans>
           </TextContent>
         </Stack>
       }
diff --git a/packages/forklift-console-plugin/src/modules/Plans/views/create/PlanCreatePage.tsx b/packages/forklift-console-plugin/src/modules/Plans/views/create/PlanCreatePage.tsx
index 27ecacdc5..97fb0ae24 100644
--- a/packages/forklift-console-plugin/src/modules/Plans/views/create/PlanCreatePage.tsx
+++ b/packages/forklift-console-plugin/src/modules/Plans/views/create/PlanCreatePage.tsx
@@ -1,9 +1,8 @@
 import React, { useReducer } from 'react';
-import { Trans } from 'react-i18next';
 import { useHistory } from 'react-router';
 import { getResourceUrl } from 'src/modules/Providers/utils';
 import { MigrationAction } from 'src/modules/Providers/views/details/tabs/VirtualMachines/components/MigrationAction';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { ProviderModelGroupVersionKind, ProviderModelRef, V1beta1Provider } from '@kubev2v/types';
 import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
@@ -70,10 +69,10 @@ export const PlanCreatePage: React.FC<{
           variant="info"
           title={t('How to create a migration plan')}
         >
-          <Trans t={t} ns="plugin__forklift-console-plugin">
+          <ForkliftTrans>
             To migrate virtual machines select a provider, then select the virtual machines to
             migrate and click the <strong>Create migration plan</strong> button.
-          </Trans>
+          </ForkliftTrans>
         </Alert>
 
         {!namespace && (
@@ -83,11 +82,11 @@ export const PlanCreatePage: React.FC<{
             variant="warning"
             title={t('Namespace is not defined')}
           >
-            <Trans t={t} ns="plugin__forklift-console-plugin">
+            <ForkliftTrans>
               This plan will be created in <strong>{defaultNamespace}</strong> namespace, if you
               wish to choose another namespace please cancel, and choose a namespace from the top
               bar.
-            </Trans>
+            </ForkliftTrans>
           </Alert>
         )}
 
diff --git a/packages/forklift-console-plugin/src/modules/Providers/modals/DeleteModal/DeleteModal.tsx b/packages/forklift-console-plugin/src/modules/Providers/modals/DeleteModal/DeleteModal.tsx
index 0b15acf36..e18946725 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/modals/DeleteModal/DeleteModal.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/modals/DeleteModal/DeleteModal.tsx
@@ -1,7 +1,6 @@
 import React, { ReactNode, useCallback, useState } from 'react';
-import { Trans } from 'react-i18next';
 import { useHistory } from 'react-router-dom';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import {
   k8sDelete,
@@ -98,16 +97,16 @@ export const DeleteModal: React.FC<DeleteModalProps> = ({ title, resource, model
       actions={actions}
     >
       {namespace ? (
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Are you sure you want to delete{' '}
           <strong className="co-break-word">{{ resourceName: name }}</strong> in namespace{' '}
           <strong>{{ namespace: namespace }}</strong>?
-        </Trans>
+        </ForkliftTrans>
       ) : (
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Are you sure you want to delete{' '}
           <strong className="co-break-word">{{ resourceName: name }}</strong>?
-        </Trans>
+        </ForkliftTrans>
       )}
       {typeof owner === 'object' && <ItemIsOwnedAlert owner={owner} namespace={namespace} />}
       {alertMessage}
diff --git a/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/OpenshiftEditURLModal.tsx b/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/OpenshiftEditURLModal.tsx
index f5bbcf683..ba3df7d02 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/OpenshiftEditURLModal.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/OpenshiftEditURLModal.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
-import { Trans } from 'react-i18next';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { ProviderModel } from '@kubev2v/types';
 import { ModalVariant } from '@patternfly/react-core';
@@ -17,25 +16,21 @@ export const OpenshiftEditURLModal: React.FC<EditProviderURLModalProps> = (props
   const helperTextMsgs = {
     error: (
       <div className="forklift-edit-modal-field-error-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a
           domain name, and, optionally, a port. For example:{' '}
           <strong>https://api.openshift-domain.com:6443</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     success: (
       <div className="forklift-edit-modal-field-success-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
-          {'URL of the Openshift Virtualization API endpoint.'}
-        </Trans>
+        <ForkliftTrans>{'URL of the Openshift Virtualization API endpoint.'}</ForkliftTrans>
       </div>
     ),
     default: (
       <div className="forklift-edit-modal-field-default-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
-          {'URL of the Openshift Virtualization API endpoint.'}
-        </Trans>
+        <ForkliftTrans>{'URL of the Openshift Virtualization API endpoint.'}</ForkliftTrans>
       </div>
     ),
   };
diff --git a/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/OpenstackEditURLModal.tsx b/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/OpenstackEditURLModal.tsx
index 6c07b30d6..67ccaf3d9 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/OpenstackEditURLModal.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/OpenstackEditURLModal.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
-import { Trans } from 'react-i18next';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { ProviderModel } from '@kubev2v/types';
 import { ModalVariant } from '@patternfly/react-core';
@@ -17,16 +16,16 @@ export const OpenstackEditURLModal: React.FC<EditProviderURLModalProps> = (props
   const helperTextMsgs = {
     error: (
       <div className="forklift-edit-modal-field-error-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a
           domain name, and a path. For example:{' '}
           <strong>https://identity_service.com:5000/v3</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     warning: (
       <div className="forklift--edit-modal-field-warning-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Warning: The provided URL does not end with the API endpoint path:
           <strong>
             {'"'}/v3{'"'}
@@ -34,21 +33,21 @@ export const OpenstackEditURLModal: React.FC<EditProviderURLModalProps> = (props
           {'. '}
           Ensure the URL includes the correct path. For example:{' '}
           <strong>https://identity_service.com:5000/v3</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     success: (
       <div className="forklift-edit-modal-field-success-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           For example: <strong>https://identity_service.com:5000/v3</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     default: (
       <div className="forklift-edit-modal-field-default-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           For example: <strong>https://identity_service.com:5000/v3</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
   };
diff --git a/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/VSphereEditURLModal.tsx b/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/VSphereEditURLModal.tsx
index b48e35932..0344712d7 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/VSphereEditURLModal.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderURL/VSphereEditURLModal.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
-import { Trans } from 'react-i18next';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { ProviderModel } from '@kubev2v/types';
 import { ModalVariant } from '@patternfly/react-core';
@@ -17,36 +16,36 @@ export const VSphereEditURLModal: React.FC<EditProviderURLModalProps> = (props)
   const helperTextMsgs = {
     error: (
       <div className="forklift-edit-modal-field-error-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a
           domain name, and a path. For example:{' '}
           <strong>https://vCenter-host-example.com/sdk</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     warning: (
       <div className="forklift--edit-modal-field-warning-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Warning: The provided URL does not end with the SDK endpoint path: <strong>/sdk</strong>.
           Ensure the URL includes the correct path. For example:{' '}
           <strong>https://vCenter-host-example.com/sdk</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     success: (
       <div className="forklift-edit-modal-field-success-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Ensure the URL includes the <strong>/sdk</strong> path. For example:{' '}
           <strong>https://vCenter-host-example.com/sdk</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     default: (
       <div className="forklift-edit-modal-field-default-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Ensure the URL includes the <strong>/sdk</strong> path. For example:{' '}
           <strong>https://vCenter-host-example.com/sdk</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
   };
diff --git a/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderVDDKImage/EditProviderVDDKImage.tsx b/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderVDDKImage/EditProviderVDDKImage.tsx
index 0c5b2f4f5..77a32d20d 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderVDDKImage/EditProviderVDDKImage.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/modals/EditProviderVDDKImage/EditProviderVDDKImage.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
-import { Trans } from 'react-i18next';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { Modify, ProviderModel, V1beta1Provider } from '@kubev2v/types';
 import { K8sModel, k8sPatch } from '@openshift-console/dynamic-plugin-sdk';
@@ -60,26 +59,26 @@ const EditProviderVDDKImage_: React.FC<EditProviderVDDKImageProps> = (props) =>
   const vddkHelperTextMsgs = {
     error: (
       <div className="forklift-edit-modal-field-error-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Error: The format of the provided VDDK init image is invalid. Ensure the path is a valid
           container image path. For example: <strong>quay.io/kubev2v/vddk:latest</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     success: (
       <div className="forklift-edit-modal-field-success-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           The path must be empty or a valid container image path. For example:{' '}
           <strong>quay.io/kubev2v/vddk:latest</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     default: (
       <div className="forklift-edit-modal-field-default-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           The path must be empty or a valid container image path. For example:{' '}
           <strong>quay.io/kubev2v/vddk:latest</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
   };
@@ -107,12 +106,12 @@ const EditProviderVDDKImage_: React.FC<EditProviderVDDKImageProps> = (props) =>
       label={props?.label || t('VDDK init image')}
       model={ProviderModel}
       body={
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Virtual Disk Development Kit (VDDK) container init image path.
           <br />
           <br />
           Note: It is strongly recommended to specify a VDDK init image to accelerate migrations.
-        </Trans>
+        </ForkliftTrans>
       }
       helperText={vddkHelperTextMsgs.default}
       validationHook={imageValidationHook}
diff --git a/packages/forklift-console-plugin/src/modules/Providers/modals/components/ItemIsOwnedAlert.tsx b/packages/forklift-console-plugin/src/modules/Providers/modals/components/ItemIsOwnedAlert.tsx
index bf3d64886..fedad94f2 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/modals/components/ItemIsOwnedAlert.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/modals/components/ItemIsOwnedAlert.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
-import { Trans } from 'react-i18next';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import {
   getGroupVersionKindForResource,
@@ -26,7 +25,7 @@ export const ItemIsOwnedAlert: React.FC<ItemIsOwnedAlertProps> = ({ owner, names
       variant="warning"
       title={t('Managed resource')}
     >
-      <Trans t={t} ns="plugin__forklift-console-plugin">
+      <ForkliftTrans>
         This resource is managed by{' '}
         <ResourceLink
           className="modal__inline-resource-link"
@@ -38,7 +37,7 @@ export const ItemIsOwnedAlert: React.FC<ItemIsOwnedAlertProps> = ({ owner, names
           namespace={namespace}
         />{' '}
         and any modifications may be overwritten. Edit the managing resource to preserve changes.
-      </Trans>
+      </ForkliftTrans>
     </Alert>
   );
 };
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/create/ProvidersCreatePage.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/create/ProvidersCreatePage.tsx
index c82a39afc..7291e293d 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/create/ProvidersCreatePage.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/create/ProvidersCreatePage.tsx
@@ -1,9 +1,8 @@
 import React, { useReducer } from 'react';
-import { Trans } from 'react-i18next';
 import { useHistory } from 'react-router';
 import { Base64 } from 'js-base64';
 import SectionHeading from 'src/components/headers/SectionHeading';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { ProviderModelRef, V1beta1Provider, V1Secret } from '@kubev2v/types';
 import {
@@ -246,11 +245,11 @@ export const ProvidersCreatePage: React.FC<{
             variant="warning"
             title={t('Namespace is not defined')}
           >
-            <Trans t={t} ns="plugin__forklift-console-plugin">
+            <ForkliftTrans>
               This provider will be created in <strong>{defaultNamespace}</strong> namespace, if you
               wish to choose another namespace please cancel, and choose a namespace from the top
               bar.
-            </Trans>
+            </ForkliftTrans>
           </Alert>
         )}
 
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OVAProviderCreateForm.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OVAProviderCreateForm.tsx
index e12d68364..c55baeeb5 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OVAProviderCreateForm.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OVAProviderCreateForm.tsx
@@ -1,7 +1,6 @@
 import React, { useCallback, useReducer } from 'react';
-import { Trans } from 'react-i18next';
 import { validateNFSMount, Validation } from 'src/modules/Providers/utils';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { V1beta1Provider } from '@kubev2v/types';
 import { Form, FormGroup, TextInput } from '@patternfly/react-core';
@@ -22,29 +21,29 @@ export const OVAProviderCreateForm: React.FC<OVAProviderCreateFormProps> = ({
   const helperTextMsgs = {
     error: (
       <div className="forklift--create-provider-field-error-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Error: The format of the provided URL is invalid. Ensure the URL is in the following
           format: <strong>ip_or_hostname_of_nfs_server:/nfs_path</strong>. For example:{' '}
           <strong>10.10.0.10:/ova</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     success: (
       <div className="forklift--create-provider-field-success-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           URL of the NFS file share that serves the OVA. Ensure the URL is in the following format:{' '}
           <strong>ip_or_hostname_of_nfs_server:/nfs_path</strong>. For example:{' '}
           <strong>10.10.0.10:/ova</strong> .
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     default: (
       <div className="forklift--create-provider-field-default-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           URL of the NFS file share that serves the OVA. Ensure the URL is in the following format:{' '}
           <strong>ip_or_hostname_of_nfs_server:/nfs_path</strong>. For example:{' '}
           <strong>10.10.0.10:/ova</strong> .
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
   };
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OpenshiftProviderCreateForm.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OpenshiftProviderCreateForm.tsx
index cf706fd0a..454e5efff 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OpenshiftProviderCreateForm.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OpenshiftProviderCreateForm.tsx
@@ -1,7 +1,6 @@
 import React, { useCallback, useReducer } from 'react';
-import { Trans } from 'react-i18next';
 import { validateURL, Validation } from 'src/modules/Providers/utils';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { V1beta1Provider } from '@kubev2v/types';
 import { Form, FormGroup, TextInput } from '@patternfly/react-core';
@@ -22,29 +21,29 @@ export const OpenshiftProviderFormCreate: React.FC<OpenshiftProviderCreateFormPr
   const helperTextMsgs = {
     error: (
       <div className="forklift--create-provider-field-error-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a
           domain name, and, optionally, a port. For example:{' '}
           <strong>https://api.openshift-domain.com:6443</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     success: (
       <div className="forklift--create-provider-field-success-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           URL of the Openshift Virtualization API endpoint. If both <strong>URL</strong> and{' '}
           <strong>Service account bearer token</strong> are left blank, the local OpenShift cluster
           is used.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     default: (
       <div className="forklift--create-provider-field-default-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           URL of the Openshift Virtualization API endpoint. If both <strong>URL</strong> and{' '}
           <strong>Service account bearer token</strong> are left blank, the local OpenShift cluster
           is used.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
   };
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OpenstackProviderCreateForm.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OpenstackProviderCreateForm.tsx
index f922069f6..ed5ed1130 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OpenstackProviderCreateForm.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/OpenstackProviderCreateForm.tsx
@@ -1,7 +1,6 @@
 import React, { useCallback, useReducer } from 'react';
-import { Trans } from 'react-i18next';
 import { validateURL, Validation } from 'src/modules/Providers/utils';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { V1beta1Provider } from '@kubev2v/types';
 import { Form, FormGroup, TextInput } from '@patternfly/react-core';
@@ -22,39 +21,39 @@ export const OpenstackProviderCreateForm: React.FC<OpenstackProviderCreateFormPr
   const urlHelperTextMsgs = {
     error: (
       <div className="forklift--create-provider-field-error-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a
           domain name, and a path. For example:{' '}
           <strong>https://identity_service.com:5000/v3</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     warning: (
       <div className="forklift--create-provider-field-warning-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Warning: The provided URL does not end with the API endpoint path:{' '}
           <strong>
             {'"'}/v3{'"'}
           </strong>
           . Ensure the URL includes the correct path. For example:{' '}
           <strong>https://identity_service.com:5000/v3</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     success: (
       <div className="forklift--create-provider-field-success-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           URL of the OpenStack Identity (Keystone) endpoint. For example:{' '}
           <strong>https://identity_service.com:5000/v3</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     default: (
       <div className="forklift--create-provider-field-default-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           URL of the OpenStack Identity (Keystone) endpoint. For example:{' '}
           <strong>https://identity_service.com:5000/v3</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
   };
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/VSphereProviderCreateForm.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/VSphereProviderCreateForm.tsx
index 7afbe8d41..275411391 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/create/components/VSphereProviderCreateForm.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/create/components/VSphereProviderCreateForm.tsx
@@ -1,7 +1,6 @@
 import React, { useCallback, useReducer } from 'react';
-import { Trans } from 'react-i18next';
 import { validateContainerImage, validateURL, Validation } from 'src/modules/Providers/utils';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { V1beta1Provider } from '@kubev2v/types';
 import { Form, FormGroup, Popover, TextInput } from '@patternfly/react-core';
@@ -24,36 +23,36 @@ export const VSphereProviderCreateForm: React.FC<VSphereProviderCreateFormProps>
   const urlHelperTextMsgs = {
     error: (
       <div className="forklift--create-provider-field-error-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Error: The format of the provided URL is invalid. Ensure the URL includes a scheme, a
           domain name, and a path. For example:{' '}
           <strong>https://vCenter-host-example.com/sdk</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     warning: (
       <div className="forklift--create-provider-field-warning-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Warning: The provided URL does not end with the SDK endpoint path: <strong>/sdk</strong>.
           Ensure the URL includes the correct path. For example:{' '}
           <strong>https://vCenter-host-example.com/sdk</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     success: (
       <div className="forklift--create-provider-field-success-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           URL of the vCenter API endpoint. Ensure the URL includes the <strong>/sdk</strong> path.
           For example: <strong>https://vCenter-host-example.com/sdk</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     default: (
       <div className="forklift--create-provider-field-default-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           URL of the vCenter API endpoint. Ensure the URL includes the <strong>/sdk</strong> path.
           For example: <strong>https://vCenter-host-example.com/sdk</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
   };
@@ -61,35 +60,35 @@ export const VSphereProviderCreateForm: React.FC<VSphereProviderCreateFormProps>
   const vddkHelperTextMsgs = {
     error: (
       <div className="forklift--create-provider-field-error-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Error: The format of the provided VDDK init image is invalid. Ensure the path is a valid
           container image path. For example: <strong>quay.io/kubev2v/vddk:latest</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     success: (
       <div className="forklift--create-provider-field-success-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Virtual Disk Development Kit (VDDK) container init image path. The path must be empty or a
           valid container image path. For example: <strong>quay.io/kubev2v/vddk:latest</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     default: (
       <div className="forklift--create-provider-field-default-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Virtual Disk Development Kit (VDDK) container init image path. The path must be empty or a
           valid container image path. For example: <strong>quay.io/kubev2v/vddk:latest</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
   };
 
   const vddkHelperTextPopover = (
-    <Trans t={t} ns="plugin__forklift-console-plugin">
+    <ForkliftTrans>
       A VDDK init image is optional, but it is strongly recommended to specify a VDDK init image to
       accelerate migrations.
-    </Trans>
+    </ForkliftTrans>
   );
 
   const initialState = {
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenshiftCredentialsEdit.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenshiftCredentialsEdit.tsx
index 837823d57..f90201ff0 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenshiftCredentialsEdit.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenshiftCredentialsEdit.tsx
@@ -1,12 +1,11 @@
 import React, { useCallback, useReducer } from 'react';
-import { Trans } from 'react-i18next';
 import { Base64 } from 'js-base64';
 import {
   openshiftSecretFieldValidator,
   safeBase64Decode,
   Validation,
 } from 'src/modules/Providers/utils';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import {
   Button,
@@ -34,26 +33,26 @@ export const OpenshiftCredentialsEdit: React.FC<EditComponentProps> = ({ secret,
   const tokenHelperTextMsgs = {
     error: (
       <div className="forklift-page-provider-field-error-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Error: The format of the provided token is invalid. Ensure the token is a valid Kubernetes
           service account token.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     success: (
       <div className="forklift-page-provider-field-success-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           A service account token with cluster admin privileges, required for authenticating the
           connection to the API server.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     default: (
       <div className="forklift-page-provider-field-default-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           A service account token with cluster admin privileges, required for authenticating the
           connection to the API server.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
   };
@@ -74,18 +73,18 @@ export const OpenshiftCredentialsEdit: React.FC<EditComponentProps> = ({ secret,
   };
 
   const insecureSkipVerifyHelperTextPopover = (
-    <Trans t={t} ns="plugin__forklift-console-plugin">
+    <ForkliftTrans>
       Note: If <strong>Skip certificate validation</strong> is selected, migrations from this
       provider will not be secure, meaning that the transferred data is sent over an insecure
       connection and potentially sensitive data could be exposed.
-    </Trans>
+    </ForkliftTrans>
   );
 
   const cacertHelperTextPopover = (
-    <Trans t={t} ns="plugin__forklift-console-plugin">
+    <ForkliftTrans>
       Note: Use the Manager CA certificate unless it was replaced by a third-party certificate, in
       which case use the Manager Apache CA certificate.
-    </Trans>
+    </ForkliftTrans>
   );
 
   const initialState = {
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEdit.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEdit.tsx
index a57570122..c89776f27 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEdit.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OpenstackCredentialsEdit.tsx
@@ -1,12 +1,11 @@
 import React, { useCallback, useReducer } from 'react';
-import { Trans } from 'react-i18next';
 import { Base64 } from 'js-base64';
 import {
   openstackSecretFieldValidator,
   safeBase64Decode,
   Validation,
 } from 'src/modules/Providers/utils';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import {
   Divider,
@@ -48,11 +47,11 @@ export const OpenstackCredentialsEdit: React.FC<EditComponentProps> = ({ secret,
   };
 
   const insecureSkipVerifyHelperTextPopover = (
-    <Trans t={t} ns="plugin__forklift-console-plugin">
+    <ForkliftTrans>
       Note: If <strong>Skip certificate validation</strong> is selected, migrations from this
       provider will not be secure, meaning that the transferred data is sent over an insecure
       connection and potentially sensitive data could be exposed.
-    </Trans>
+    </ForkliftTrans>
   );
 
   const authType = safeBase64Decode(secret?.data?.authType || '');
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OvirtCredentialsEdit.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OvirtCredentialsEdit.tsx
index 9c1b52615..22078fcc6 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OvirtCredentialsEdit.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/OvirtCredentialsEdit.tsx
@@ -1,12 +1,11 @@
 import React, { useCallback, useReducer } from 'react';
-import { Trans } from 'react-i18next';
 import { Base64 } from 'js-base64';
 import {
   ovirtSecretFieldValidator,
   safeBase64Decode,
   Validation,
 } from 'src/modules/Providers/utils';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { ExternalLink } from '@kubev2v/common';
 import {
@@ -70,15 +69,15 @@ export const OvirtCredentialsEdit: React.FC<EditComponentProps> = ({ secret, onC
   };
 
   const insecureSkipVerifyHelperTextPopover = (
-    <Trans t={t} ns="plugin__forklift-console-plugin">
+    <ForkliftTrans>
       Note: If <strong>Skip certificate validation</strong> is selected, migrations from this
       provider will not be secure, meaning that the transferred data is sent over an insecure
       connection and potentially sensitive data could be exposed.
-    </Trans>
+    </ForkliftTrans>
   );
 
   const cacertHelperTextPopover = (
-    <Trans t={t} ns="plugin__forklift-console-plugin">
+    <ForkliftTrans>
       Note: Use the Manager CA certificate unless it was replaced by a third-party certificate, in
       which case use the Manager Apache CA certificate.
       <br />
@@ -93,7 +92,7 @@ export const OvirtCredentialsEdit: React.FC<EditComponentProps> = ({ secret, onC
         https://&#8249;rhv-host-example.com&#8250;/ovirt-engine/services/pki-resource?resource=ca-certificate&format=X509-PEM-CA
       </ExternalLink>
       {' .'}
-    </Trans>
+    </ForkliftTrans>
   );
 
   const initialState = {
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/VSphereCredentialsEdit.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/VSphereCredentialsEdit.tsx
index 60f4396bc..13e65ce7f 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/VSphereCredentialsEdit.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/edit/VSphereCredentialsEdit.tsx
@@ -1,12 +1,11 @@
 import React, { useCallback, useReducer } from 'react';
-import { Trans } from 'react-i18next';
 import { Base64 } from 'js-base64';
 import {
   safeBase64Decode,
   Validation,
   vsphereSecretFieldValidator,
 } from 'src/modules/Providers/utils';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import {
   Button,
@@ -42,43 +41,43 @@ export const VSphereCredentialsEdit: React.FC<EditComponentProps> = ({ secret, o
   };
 
   const cacertHelperTextPopover = (
-    <Trans t={t} ns="plugin__forklift-console-plugin">
+    <ForkliftTrans>
       Note: Use the Manager CA certificate unless it was replaced by a third-party certificate, in
       which case use the Manager Apache CA certificate.
-    </Trans>
+    </ForkliftTrans>
   );
 
   const usernameHelperTextMsgs = {
     error: (
       <div className="forklift-page-provider-field-error-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Error: The format of the provided username is invalid. Ensure the username does not
           include spaces.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     warning: (
       <div className="forklift-page-provider-field-warning-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Warning: The provided username does not include the user domain. Ensure the username
           includes the domain. For example: <strong>user@vsphere.local</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     success: (
       <div className="forklift-page-provider-field-success-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           A username for connecting to the vCenter API endpoint. Ensure the username includes the
           user domain. For example: <strong>user@vsphere.local</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
     default: (
       <div className="forklift-page-provider-field-default-validation">
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           A username for connecting to the vCenter API endpoint. Ensure the username includes the
           user domain. For example: <strong>user@vsphere.local</strong>.
-        </Trans>
+        </ForkliftTrans>
       </div>
     ),
   };
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OpenshiftCredentialsList.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OpenshiftCredentialsList.tsx
index 2e9fb7fbe..50dde1656 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OpenshiftCredentialsList.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OpenshiftCredentialsList.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
-import { Trans } from 'react-i18next';
 import { Base64 } from 'js-base64';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { ClipboardCopy, ClipboardCopyVariant, Text, TextVariants } from '@patternfly/react-core';
 
@@ -18,10 +17,10 @@ export const OpenshiftCredentialsList: React.FC<ListComponentProps> = ({ secret,
       label: t('Service account bearer token'),
       description: (
         <div className="forklift-page-provider-field-default-validation">
-          <Trans t={t} ns="plugin__forklift-console-plugin">
+          <ForkliftTrans>
             A service account token with cluster admin privileges, required for authenticating the
             connection to the API server.
-          </Trans>
+          </ForkliftTrans>
         </div>
       ),
     },
@@ -29,11 +28,11 @@ export const OpenshiftCredentialsList: React.FC<ListComponentProps> = ({ secret,
       label: t('Skip certificate validation'),
       description: t("If true, the provider's CA certificate won't be validated."),
       helperTextPopover: (
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Note: If this field is checked/true, migrations from this provider will not be secure,
           meaning that the transferred data is sent over an insecure connection and potentially
           sensitive data could be exposed.
-        </Trans>
+        </ForkliftTrans>
       ),
     },
     cacert: {
@@ -42,10 +41,10 @@ export const OpenshiftCredentialsList: React.FC<ListComponentProps> = ({ secret,
         'A CA certificate to be trusted when connecting to Openshift API endpoint. Ensure the CA certificate format is in a PEM encoded X.509 format. To use a CA certificate, drag the file to the text box or browse for it. To use the system CA certificate, leave the field empty.',
       ),
       helperTextPopover: (
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Note: Use the Manager CA certificate unless it was replaced by a third-party certificate,
           in which case use the Manager Apache CA certificate.
-        </Trans>
+        </ForkliftTrans>
       ),
     },
   };
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OpenstackCredentialsList.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OpenstackCredentialsList.tsx
index 10fd5f17e..ef7f245b7 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OpenstackCredentialsList.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OpenstackCredentialsList.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
-import { Trans } from 'react-i18next';
 import { Base64 } from 'js-base64';
 import { DetailsItem } from 'src/modules/Providers/utils';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import {
   ClipboardCopy,
@@ -63,11 +62,11 @@ export const OpenstackCredentialsList: React.FC<ListComponentProps> = ({ secret,
           "If true (check box is selected), the provider's CA certificate won't be validated.",
         ),
         helperTextPopover: (
-          <Trans t={t} ns="plugin__forklift-console-plugin">
+          <ForkliftTrans>
             Note: If this field is checked/true, migrations from this provider will not be secure,
             meaning that the transferred data is sent over an insecure connection and potentially
             sensitive data could be exposed.
-          </Trans>
+          </ForkliftTrans>
         ),
       },
       cacert: {
@@ -95,11 +94,11 @@ export const OpenstackCredentialsList: React.FC<ListComponentProps> = ({ secret,
           "If true (check box is selected), the provider's CA certificate won't be validated.",
         ),
         helperTextPopover: (
-          <Trans t={t} ns="plugin__forklift-console-plugin">
+          <ForkliftTrans>
             Note: If this field is checked/true, migrations from this provider will not be secure,
             meaning that the transferred data is sent over an insecure connection and potentially
             sensitive data could be exposed.
-          </Trans>
+          </ForkliftTrans>
         ),
       },
       cacert: {
@@ -128,11 +127,11 @@ export const OpenstackCredentialsList: React.FC<ListComponentProps> = ({ secret,
           "If true (check box is selected), the provider's CA certificate won't be validated.",
         ),
         helperTextPopover: (
-          <Trans t={t} ns="plugin__forklift-console-plugin">
+          <ForkliftTrans>
             Note: If this field is checked/true, migrations from this provider will not be secure,
             meaning that the transferred data is sent over an insecure connection and potentially
             sensitive data could be exposed.
-          </Trans>
+          </ForkliftTrans>
         ),
       },
       cacert: {
@@ -166,11 +165,11 @@ export const OpenstackCredentialsList: React.FC<ListComponentProps> = ({ secret,
           "If true (check box is selected), the provider's CA certificate won't be validated.",
         ),
         helperTextPopover: (
-          <Trans t={t} ns="plugin__forklift-console-plugin">
+          <ForkliftTrans>
             Note: If this field is checked/true, migrations from this provider will not be secure,
             meaning that the transferred data is sent over an insecure connection and potentially
             sensitive data could be exposed.
-          </Trans>
+          </ForkliftTrans>
         ),
       },
       cacert: {
@@ -206,11 +205,11 @@ export const OpenstackCredentialsList: React.FC<ListComponentProps> = ({ secret,
           "If true (check box is selected), the provider's CA certificate won't be validated.",
         ),
         helperTextPopover: (
-          <Trans t={t} ns="plugin__forklift-console-plugin">
+          <ForkliftTrans>
             Note: If this field is checked/true, migrations from this provider will not be secure,
             meaning that the transferred data is sent over an insecure connection and potentially
             sensitive data could be exposed.
-          </Trans>
+          </ForkliftTrans>
         ),
       },
       cacert: {
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OvirtCredentialsList.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OvirtCredentialsList.tsx
index f95d48c83..d739a207e 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OvirtCredentialsList.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/OvirtCredentialsList.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
-import { Trans } from 'react-i18next';
 import { Base64 } from 'js-base64';
 import { DetailsItem } from 'src/modules/Providers/utils';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { ExternalLink } from '@kubev2v/common';
 import {
@@ -38,11 +37,11 @@ export const OvirtCredentialsList: React.FC<ListComponentProps> = ({ secret, rev
       label: t('Skip certificate validation'),
       description: t("If true, the provider's CA certificate won't be validated."),
       helperTextPopover: (
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Note: If this field is checked/true, migrations from this provider will not be secure,
           meaning that the transferred data is sent over an insecure connection and potentially
           sensitive data could be exposed.
-        </Trans>
+        </ForkliftTrans>
       ),
     },
     cacert: {
@@ -51,7 +50,7 @@ export const OvirtCredentialsList: React.FC<ListComponentProps> = ({ secret, rev
         'A CA certificate to be trusted when connecting to the Red Hat Virtualization Manager (RHVM) API endpoint. Ensure the CA certificate format is in a PEM encoded X.509 format. To use a CA certificate, drag the file to the text box or browse for it. To use the system CA certificate, leave the field empty.',
       ),
       helperTextPopover: (
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Note: Use the Manager CA certificate unless it was replaced by a third-party certificate,
           in which case use the Manager Apache CA certificate. <br />
           <br />
@@ -65,7 +64,7 @@ export const OvirtCredentialsList: React.FC<ListComponentProps> = ({ secret, rev
             https://&#8249;rhv-host-example.com&#8250;/ovirt-engine/services/pki-resource?resource=ca-certificate&format=X509-PEM-CA
           </ExternalLink>
           {' .'}
-        </Trans>
+        </ForkliftTrans>
       ),
     },
   };
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/VSphereCredentialsList.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/VSphereCredentialsList.tsx
index b4d746f9b..cf63a5e9a 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/VSphereCredentialsList.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/CredentialsSection/components/list/VSphereCredentialsList.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
-import { Trans } from 'react-i18next';
 import { Base64 } from 'js-base64';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { ClipboardCopy, ClipboardCopyVariant, Text, TextVariants } from '@patternfly/react-core';
 
@@ -18,10 +17,10 @@ export const VSphereCredentialsList: React.FC<ListComponentProps> = ({ secret, r
       label: t('Username'),
       description: (
         <div className="forklift-page-provider-field-default-validation">
-          <Trans t={t} ns="plugin__forklift-console-plugin">
+          <ForkliftTrans>
             A username for connecting to the vCenter API endpoint. Ensure the username includes the
             user domain. For example: <strong>user@vsphere.local</strong>.
-          </Trans>
+          </ForkliftTrans>
         </div>
       ),
     },
@@ -39,10 +38,10 @@ export const VSphereCredentialsList: React.FC<ListComponentProps> = ({ secret, r
         'A CA certificate to be trusted when connecting to the vCenter API endpoint. Ensure the CA certificate format is in a PEM encoded X.509 format. To use a CA certificate, drag the file to the text box or browse for it. To use the system CA certificate, leave the field empty.',
       ),
       helperTextPopover: (
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           Note: Use the Manager CA certificate unless it was replaced by a third-party certificate,
           in which case use the Manager Apache CA certificate.
-        </Trans>
+        </ForkliftTrans>
       ),
     },
   };
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/DetailsSection/OpenstackDetailsSection.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/DetailsSection/OpenstackDetailsSection.tsx
index 3f187aba1..50e001e6b 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/DetailsSection/OpenstackDetailsSection.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/DetailsSection/OpenstackDetailsSection.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
-import { Trans } from 'react-i18next';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans } from 'src/utils/i18n';
 
 import { DescriptionList } from '@patternfly/react-core';
 
@@ -18,8 +17,6 @@ import {
 import { DetailsSectionProps } from './DetailsSection';
 
 export const OpenstackDetailsSection: React.FC<DetailsSectionProps> = ({ data }) => {
-  const { t } = useForkliftTranslation();
-
   const { provider, permissions } = data;
 
   return (
@@ -40,10 +37,10 @@ export const OpenstackDetailsSection: React.FC<DetailsSectionProps> = ({ data })
         resource={provider}
         canPatch={permissions.canPatch}
         helpContent={
-          <Trans t={t} ns="plugin__forklift-console-plugin">
+          <ForkliftTrans>
             URL of the OpenStack Identity (Keystone) endpoint. For example:{' '}
             <strong>https://identity_service.com:5000/v3</strong>.
-          </Trans>
+          </ForkliftTrans>
         }
       />
 
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/DetailsSection/VSphereDetailsSection.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/DetailsSection/VSphereDetailsSection.tsx
index b09b9c57d..f21aa1707 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/DetailsSection/VSphereDetailsSection.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/DetailsSection/VSphereDetailsSection.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
-import { Trans } from 'react-i18next';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { DescriptionList } from '@patternfly/react-core';
 
@@ -46,7 +45,7 @@ export const VSphereDetailsSection: React.FC<DetailsSectionProps> = ({ data }) =
         resource={provider}
         canPatch={permissions.canPatch}
         helpContent={
-          <Trans t={t} ns="plugin__forklift-console-plugin">
+          <ForkliftTrans>
             URL of the API endpoint of the vCenter on which the source VM is mounted. Ensure that
             the URL includes the sdk path, usually <strong>/sdk</strong>.<br />
             <br />
@@ -54,7 +53,7 @@ export const VSphereDetailsSection: React.FC<DetailsSectionProps> = ({ data }) =
             <br />
             If a certificate for FQDN is specified, the value of this field needs to match the FQDN
             in the certificate.
-          </Trans>
+          </ForkliftTrans>
         }
       />
 
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/DetailsSection/components/VDDKDetailsItem.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/DetailsSection/components/VDDKDetailsItem.tsx
index afc1aa919..b3206ba85 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/components/DetailsSection/components/VDDKDetailsItem.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/components/DetailsSection/components/VDDKDetailsItem.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
-import { Trans } from 'react-i18next';
 import { EditProviderVDDKImage, useModal } from 'src/modules/Providers/modals';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { DetailsItem } from '../../../../../utils';
 
@@ -19,7 +18,7 @@ export const VDDKDetailsItem: React.FC<ProviderDetailsItemProps> = ({
   const defaultMoreInfoLink =
     'https://access.redhat.com/documentation/en-us/migration_toolkit_for_virtualization/2.5/html-single/installing_and_using_the_migration_toolkit_for_virtualization/index#creating-vddk-image_mtv';
   const defaultHelpContent = (
-    <Trans t={t} ns="plugin__forklift-console-plugin">
+    <ForkliftTrans>
       Virtual Disk Development Kit (VDDK) container init image path. The path must be empty or a
       valid container image path in the format of{' '}
       <strong>registry_route_or_server_path/vddk:&#8249;tag&#8250;</strong>.<br />
@@ -27,7 +26,7 @@ export const VDDKDetailsItem: React.FC<ProviderDetailsItemProps> = ({
       For example: <strong>quay.io/kubev2v/example:latest</strong>.<br />
       <br />
       It is strongly recommended to specify a VDDK init image to accelerate migrations.
-    </Trans>
+    </ForkliftTrans>
   );
 
   return (
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/Details/ProviderDetails.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/Details/ProviderDetails.tsx
index be6370640..b927dd52b 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/Details/ProviderDetails.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/Details/ProviderDetails.tsx
@@ -1,11 +1,10 @@
 import React from 'react';
-import { Trans } from 'react-i18next';
 import { Link } from 'react-router-dom';
 import { RouteComponentProps } from 'react-router-dom';
 import { SectionHeading } from 'src/components/headers/SectionHeading';
 import { useGetDeleteAndEditAccessReview, useProviderInventory } from 'src/modules/Providers/hooks';
 import { getResourceUrl, ProviderData } from 'src/modules/Providers/utils';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import {
   ProviderInventory,
@@ -51,14 +50,14 @@ export const ProviderDetails: React.FC<ProviderDetailsProps> = ({ obj, loaded, l
     <div>
       <PageSection variant="light" className="forklift-page-section--info">
         <Alert customIcon={<BellIcon />} variant="info" title={t('How to create a migration plan')}>
-          <Trans t={t} ns="plugin__forklift-console-plugin">
+          <ForkliftTrans>
             To migrate virtual machines from <strong>{provider.metadata.name}</strong> provider,
             select the virtual machines to migrate from the list of available virtual machines
             located in the virtual machines tab.{' '}
             <Link to={`${providerURL}/vms`}>
               Go to <strong>Virtual Machines</strong> tab
             </Link>
-          </Trans>
+          </ForkliftTrans>
         </Alert>
       </PageSection>
 
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/VirtualMachines/ProviderVirtualMachines.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/VirtualMachines/ProviderVirtualMachines.tsx
index 35649aa8c..c793be735 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/VirtualMachines/ProviderVirtualMachines.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/details/tabs/VirtualMachines/ProviderVirtualMachines.tsx
@@ -1,9 +1,8 @@
 import React from 'react';
-import { Trans } from 'react-i18next';
 import { RouteComponentProps } from 'react-router-dom';
 import { useProviderInventory } from 'src/modules/Providers/hooks';
 import { ProviderData } from 'src/modules/Providers/utils';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { ProviderInventory, ProviderModelGroupVersionKind, V1beta1Provider } from '@kubev2v/types';
 import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
@@ -47,11 +46,11 @@ export const ProviderVirtualMachines: React.FC<{ name: string; namespace: string
     <>
       <PageSection variant="light" className="forklift-page-section--info">
         <Alert customIcon={<BellIcon />} variant="info" title={t('How to create a migration plan')}>
-          <Trans t={t} ns="plugin__forklift-console-plugin">
+          <ForkliftTrans>
             To migrate virtual machines from <strong>{name}</strong> provider, select the virtual
             machines to migrate from the list of available virtual machines and click the{' '}
             <strong>Create migration plan</strong> button.
-          </Trans>
+          </ForkliftTrans>
         </Alert>
       </PageSection>
 
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/list/ProvidersListPage.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/list/ProvidersListPage.tsx
index 04f949873..52f32de91 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/list/ProvidersListPage.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/list/ProvidersListPage.tsx
@@ -1,10 +1,9 @@
 import React, { useState } from 'react';
-import { Trans } from 'react-i18next';
 import StandardPage from 'src/components/page/StandardPage';
 import modernizeMigration from 'src/modules/Providers/images/modernizeMigration.svg';
 import { ProviderData, SOURCE_ONLY_PROVIDER_TYPES } from 'src/modules/Providers/utils';
 import { PROVIDER_STATUS, PROVIDERS } from 'src/utils/enums';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { EnumToTuple, loadUserSettings, ResourceFieldFactory } from '@kubev2v/common';
 import {
@@ -246,9 +245,9 @@ const EmptyState_: React.FC<EmptyStateProps> = ({ AddButton, namespace }) => {
       AddButton={AddButton}
       title={
         namespace ? (
-          <Trans t={t} ns="plugin__forklift-console-plugin">
+          <ForkliftTrans>
             No Providers found in namespace <strong>{namespace}</strong>.
-          </Trans>
+          </ForkliftTrans>
         ) : (
           t('No providers found')
         )
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/list/components/ProvidersEmptyState.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/list/components/ProvidersEmptyState.tsx
index 32bf121a1..f8e98401b 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/list/components/ProvidersEmptyState.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/list/components/ProvidersEmptyState.tsx
@@ -1,7 +1,6 @@
 import React, { ComponentType, ReactNode } from 'react';
-import { Trans } from 'react-i18next';
 import { HELP_LINK_HREF } from 'src/utils/constants';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { ExternalLink } from '@kubev2v/common';
 import {
@@ -45,13 +44,13 @@ export const ProvidersEmptyState: React.FC<ProvidersEmptyStateProps> = ({
                   {title}
                 </Title>
                 <Text>
-                  <Trans>
+                  <ForkliftTrans>
                     Migrating virtualization workloads is a multi-step process.{' '}
                     <ExternalLink href={HELP_LINK_HREF} isInline>
                       Learn more
                     </ExternalLink>
                     .
-                  </Trans>
+                  </ForkliftTrans>
                 </Text>
                 <TextList component="ol">
                   <TextListItem>
diff --git a/packages/forklift-console-plugin/src/modules/Providers/views/migrate/ProvidersCreateVmMigrationPage.tsx b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/ProvidersCreateVmMigrationPage.tsx
index 0323112ae..46c037781 100644
--- a/packages/forklift-console-plugin/src/modules/Providers/views/migrate/ProvidersCreateVmMigrationPage.tsx
+++ b/packages/forklift-console-plugin/src/modules/Providers/views/migrate/ProvidersCreateVmMigrationPage.tsx
@@ -1,8 +1,7 @@
 import React, { FC } from 'react';
-import { Trans } from 'react-i18next';
 import { useHistory } from 'react-router';
 import SectionHeading from 'src/components/headers/SectionHeading';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { Alert, AlertVariant, Button, Flex, FlexItem, PageSection } from '@patternfly/react-core';
 import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon';
@@ -43,10 +42,10 @@ const ProvidersCreateVmMigrationPage: FC = () => {
         variant="info"
         title={t('How to create a migration plan')}
       >
-        <Trans t={t} ns="plugin__forklift-console-plugin">
+        <ForkliftTrans>
           To migrate virtual machines select target provider, namespace, mappings and click the{' '}
           <strong>Create</strong> button to crete the plan.
-        </Trans>
+        </ForkliftTrans>
       </Alert>
 
       <SectionHeading text={t('Select migration target')} />
diff --git a/packages/forklift-console-plugin/src/modules/StorageMaps/EmptyStateStorageMaps.tsx b/packages/forklift-console-plugin/src/modules/StorageMaps/EmptyStateStorageMaps.tsx
index 658ff565b..9902b389c 100644
--- a/packages/forklift-console-plugin/src/modules/StorageMaps/EmptyStateStorageMaps.tsx
+++ b/packages/forklift-console-plugin/src/modules/StorageMaps/EmptyStateStorageMaps.tsx
@@ -1,11 +1,10 @@
 import React from 'react';
-import { Trans } from 'react-i18next';
 import { Link } from 'react-router-dom';
 import ForkliftEmptyState from 'src/components/empty-states/ForkliftEmptyState';
 import automationIcon from 'src/components/empty-states/images/automation.svg';
 import { AddMappingButton } from 'src/components/mappings/MappingPage';
 import { HELP_LINK_HREF } from 'src/utils/constants';
-import { useForkliftTranslation } from 'src/utils/i18n';
+import { ForkliftTrans, useForkliftTranslation } from 'src/utils/i18n';
 
 import { ExternalLink } from '@kubev2v/common';
 import { PROVIDERS_REFERENCE } from '@kubev2v/legacy/common/constants';
@@ -27,9 +26,9 @@ const EmptyStatePlans: React.FC<{ namespace: string }> = ({ namespace }) => {
       icon={AutomationIcon}
       title={
         namespace ? (
-          <Trans t={t} ns="plugin__forklift-console-plugin">
+          <ForkliftTrans>
             No StorageMaps found in namespace <strong>{namespace}</strong>.
-          </Trans>
+          </ForkliftTrans>
         ) : (
           t('No StorageMaps found.')
         )
@@ -38,7 +37,7 @@ const EmptyStatePlans: React.FC<{ namespace: string }> = ({ namespace }) => {
         !hasSufficientProviders ? (
           <Flex direction={{ default: 'column' }} alignItems={{ default: 'alignItemsCenter' }}>
             <FlexItem>
-              <Trans t={t} ns="plugin__forklift-console-plugin">
+              <ForkliftTrans>
                 Migration storage maps are used to map storage interfaces between source and target
                 workloads, at least one source and one target provider must be available in order to
                 create a migration plan,{' '}
@@ -46,7 +45,7 @@ const EmptyStatePlans: React.FC<{ namespace: string }> = ({ namespace }) => {
                   Learn more
                 </ExternalLink>
                 .
-              </Trans>
+              </ForkliftTrans>
             </FlexItem>
             <FlexItem>
               <Button variant="secondary">
diff --git a/packages/forklift-console-plugin/src/utils/i18n.ts b/packages/forklift-console-plugin/src/utils/i18n.ts
deleted file mode 100644
index eb303752d..000000000
--- a/packages/forklift-console-plugin/src/utils/i18n.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { useTranslation as useReactI18NextTranslation } from 'react-i18next';
-
-export function useForkliftTranslation() {
-  return useReactI18NextTranslation('plugin__forklift-console-plugin');
-}
diff --git a/packages/forklift-console-plugin/src/utils/i18n.tsx b/packages/forklift-console-plugin/src/utils/i18n.tsx
new file mode 100644
index 000000000..6390d1990
--- /dev/null
+++ b/packages/forklift-console-plugin/src/utils/i18n.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+import { Trans, useTranslation } from 'react-i18next';
+
+export function useForkliftTranslation() {
+  return useTranslation('plugin__forklift-console-plugin');
+}
+
+export const ForkliftTrans: React.FC = ({ children }) => {
+  const { t } = useForkliftTranslation();
+
+  return (
+    <Trans t={t} ns="plugin__forklift-console-plugin">
+      {children}
+    </Trans>
+  );
+};