diff --git a/frontend/__tests__/components/cluster-settings.spec.tsx b/frontend/__tests__/components/cluster-settings.spec.tsx
index 7e2b2d10e8f..cd16900fdf5 100644
--- a/frontend/__tests__/components/cluster-settings.spec.tsx
+++ b/frontend/__tests__/components/cluster-settings.spec.tsx
@@ -52,7 +52,7 @@ jest.mock('react-redux', () => {
   };
 });
 
-const i18nNS = 'cluster-settings';
+const i18nNS = 'public';
 
 describe('Cluster Settings page', () => {
   let wrapper: ShallowWrapper<any>;
@@ -327,7 +327,7 @@ describe('Updates Graph', () => {
         .find(ChannelName)
         .at(1)
         .text(),
-    ).toBe('cluster-settings~{{newerChannel}} channel');
+    ).toBe('public~{{newerChannel}} channel');
   });
 });
 
diff --git a/frontend/packages/ceph-storage-plugin/integration-tests-cypress/views/obcPage.ts b/frontend/packages/ceph-storage-plugin/integration-tests-cypress/views/obcPage.ts
index efd268c7176..05c292d00b0 100644
--- a/frontend/packages/ceph-storage-plugin/integration-tests-cypress/views/obcPage.ts
+++ b/frontend/packages/ceph-storage-plugin/integration-tests-cypress/views/obcPage.ts
@@ -45,7 +45,7 @@ export class CreateOBCHandler {
   }
 
   deploymentReady(deploymentName: string) {
-    cy.byLegacyTestID('horizontal-link-details-page~Details').click();
+    cy.byLegacyTestID('horizontal-link-public~Details').click();
     cy.contains(DEPLOYMENT_REPLICAS_STATUS);
     cy.byTestSelector('details-item-value__Name')
       .should('be.visible')
diff --git a/frontend/packages/ceph-storage-plugin/locales/en/dashboard.json b/frontend/packages/ceph-storage-plugin/locales/en/dashboard.json
new file mode 100644
index 00000000000..ead4c050ba5
--- /dev/null
+++ b/frontend/packages/ceph-storage-plugin/locales/en/dashboard.json
@@ -0,0 +1,3 @@
+{
+  "Not available": "Not available"
+}
\ No newline at end of file
diff --git a/frontend/packages/console-shared/locales/en/console-shared.json b/frontend/packages/console-shared/locales/en/console-shared.json
index 8bc3cee2806..e96f8fdb2c3 100644
--- a/frontend/packages/console-shared/locales/en/console-shared.json
+++ b/frontend/packages/console-shared/locales/en/console-shared.json
@@ -1,11 +1,49 @@
 {
   "An error occurred": "An error occurred",
   "No resources found": "No resources found",
+  "Started": "Started",
+  "There are no recent events.": "There are no recent events.",
+  "View all events": "View all events",
+  "Resume": "Resume",
+  "Pause": "Pause",
+  "Recent events": "Recent events",
+  "There are no ongoing activities.": "There are no ongoing activities.",
+  "Ongoing": "Ongoing",
+  "Not available": "Not available",
+  "1 hour": "1 hour",
+  "6 hours": "6 hours",
+  "24 hours": "24 hours",
+  "No resource quotas": "No resource quotas",
+  "View details": "View details",
+  "Alerts could not be loaded.": "Alerts could not be loaded.",
   "({{operatorStatusLength}} installed)": "({{operatorStatusLength}} installed)",
   "Status": "Status",
-  "Not available": "Not available",
   "View all": "View all",
   "All {{status}}": "All {{status}}",
+  "Unknown": "Unknown",
+  "Pending": "Pending",
+  "Updating": "Updating",
+  "Degraded": "Degraded",
+  "Loading": "Loading",
+  "{{title}} breakdown": "{{title}} breakdown",
+  "Total capacity": "Total capacity",
+  "Total limit": "Total limit",
+  "Current utilization": "Current utilization",
+  "Current available capacity": "Current available capacity",
+  "Total requested": "Total requested",
+  "By {{label}}": "By {{label}}",
+  "Top consumer by {{label}}": "Top consumer by {{label}}",
+  "View more": "View more",
+  "Top {{label}} consumers": "Top {{label}} consumers",
+  "Top consumers": "Top consumers",
+  "Select consumer type": "Select consumer type",
+  "time axis": "time axis",
+  "Resource": "Resource",
+  "Usage": "Usage",
+  "View {{title}} metrics in query browser": "View {{title}} metrics in query browser",
+  "{{humanAvailable}} available of {{humanLimit}} total limit": "{{humanAvailable}} available of {{humanLimit}} total limit",
+  "{{humanAvailable}} available of {{humanMax}}": "{{humanAvailable}} available of {{humanMax}}",
+  "{{humanAvailable}} available": "{{humanAvailable}} available",
   "Error loading - {{placeholder}}": "Error loading - {{placeholder}}",
   "Value": "Value",
   "Resource requirements": "Resource requirements",
diff --git a/frontend/packages/console-shared/src/components/dashboard/activity-card/ActivityBody.tsx b/frontend/packages/console-shared/src/components/dashboard/activity-card/ActivityBody.tsx
index b1ab6d58307..7cc2076770b 100644
--- a/frontend/packages/console-shared/src/components/dashboard/activity-card/ActivityBody.tsx
+++ b/frontend/packages/console-shared/src/components/dashboard/activity-card/ActivityBody.tsx
@@ -21,7 +21,7 @@ export const Activity: React.FC<ActivityProps> = ({ timestamp, children }) => {
     <div className="co-activity-item__ongoing" data-test="activity">
       {timestamp && (
         <span className="text-secondary">
-          {t('dashboard~Started')}{' '}
+          {t('console-shared~Started')}{' '}
           <span data-test="timestamp">
             <Timestamp simple timestamp={timestamp.toString()} />
           </span>
@@ -91,7 +91,7 @@ export const RecentEventsBodyContent: React.FC<RecentEventsBodyContentProps> = (
   if (sortedEvents.length === 0) {
     return (
       <Activity>
-        <div className="text-secondary">{t('dashboard~There are no recent events.')}</div>
+        <div className="text-secondary">{t('console-shared~There are no recent events.')}</div>
       </Activity>
     );
   }
@@ -112,7 +112,7 @@ export const RecentEventsBodyContent: React.FC<RecentEventsBodyContentProps> = (
           to={moreLink}
           data-test="events-view-all-link"
         >
-          {t('dashboard~View all events')}
+          {t('console-shared~View all events')}
         </Link>
       )}
     </>
@@ -129,7 +129,7 @@ export const PauseButton: React.FC<PauseButtonProps> = ({ paused, togglePause })
       data-test-id="events-pause-button"
       data-test="events-pause-button"
     >
-      {paused ? t('public~Resume') : t('public~Pause')}
+      {paused ? t('console-shared~Resume') : t('console-shared~Pause')}
     </DashboardCardButtonLink>
   );
 };
@@ -141,7 +141,7 @@ export const RecentEventsBody: React.FC<RecentEventsBodyProps> = (props) => {
   return (
     <>
       <div className="co-activity-card__recent-title" data-test="activity-recent-title">
-        {t('dashboard~Recent events')}
+        {t('console-shared~Recent events')}
         <PauseButton paused={paused} togglePause={togglePause} />
       </div>
       <RecentEventsBodyContent {...props} paused={paused} setPaused={setPaused} />
@@ -184,14 +184,14 @@ export const OngoingActivityBody: React.FC<OngoingActivityBodyProps> = ({
       allActivities
     ) : (
       <Activity>
-        <div className="text-secondary">{t('dashboard~There are no ongoing activities.')}</div>
+        <div className="text-secondary">{t('console-shared~There are no ongoing activities.')}</div>
       </Activity>
     );
   }
   return (
     <>
       <div className="co-activity-card__ongoing-title" data-test="ongoing-title">
-        {t('dashboard~Ongoing')}
+        {t('console-shared~Ongoing')}
       </div>
       <div className="co-activity-card__ongoing-body">{body}</div>
     </>
diff --git a/frontend/packages/console-shared/src/components/dashboard/details-card/DetailItem.tsx b/frontend/packages/console-shared/src/components/dashboard/details-card/DetailItem.tsx
index f01b8b20f31..73eb00722ed 100644
--- a/frontend/packages/console-shared/src/components/dashboard/details-card/DetailItem.tsx
+++ b/frontend/packages/console-shared/src/components/dashboard/details-card/DetailItem.tsx
@@ -10,7 +10,7 @@ export const DetailItem: React.FC<DetailItemProps> = React.memo(
 
     if (error) {
       status = (
-        <span className="text-secondary">{errorMessage || t('dashboard~Not available')}</span>
+        <span className="text-secondary">{errorMessage || t('console-shared~Not available')}</span>
       );
     } else if (isLoading) {
       status = <div className="skeleton-text" />;
diff --git a/frontend/packages/console-shared/src/components/dashboard/duration-hook.ts b/frontend/packages/console-shared/src/components/dashboard/duration-hook.ts
index adf2718355a..3fb3d591494 100644
--- a/frontend/packages/console-shared/src/components/dashboard/duration-hook.ts
+++ b/frontend/packages/console-shared/src/components/dashboard/duration-hook.ts
@@ -3,20 +3,20 @@ import { TFunction } from 'i18next';
 
 export const Duration = (t: TFunction) => {
   return {
-    ONE_HR: t('public~1 hour'),
-    SIX_HR: t('public~6 hours'),
-    TWENTY_FOUR_HR: t('public~24 hours'),
+    ONE_HR: t('console-shared~1 hour'),
+    SIX_HR: t('console-shared~6 hours'),
+    TWENTY_FOUR_HR: t('console-shared~24 hours'),
   };
 };
 
 export const TranslatedDuration = (duration, t: TFunction): string => {
   switch (duration) {
     case 'ONE_HR':
-      return t('public~1 hour');
+      return t('console-shared~1 hour');
     case 'SIX_HR':
-      return t('public~6 hours');
+      return t('console-shared~6 hours');
     default:
-      return t('public~24 hours');
+      return t('console-shared~24 hours');
   }
 };
 
diff --git a/frontend/packages/console-shared/src/components/dashboard/inventory-card/InventoryItem.tsx b/frontend/packages/console-shared/src/components/dashboard/inventory-card/InventoryItem.tsx
index db46268b087..08abdac01ab 100644
--- a/frontend/packages/console-shared/src/components/dashboard/inventory-card/InventoryItem.tsx
+++ b/frontend/packages/console-shared/src/components/dashboard/inventory-card/InventoryItem.tsx
@@ -97,7 +97,7 @@ export const InventoryItem: React.FC<InventoryItemProps> = React.memo(
                 <div className="co-inventory-card__item-status">
                   {error ? (
                     <div className="co-dashboard-text--small text-secondary">
-                      {t('dashboard~Not available')}
+                      {t('console-shared~Not available')}
                     </div>
                   ) : (
                     children
@@ -124,7 +124,7 @@ export const InventoryItem: React.FC<InventoryItemProps> = React.memo(
           <div className="co-inventory-card__item-status">
             {error ? (
               <div className="co-dashboard-text--small text-secondary">
-                {t('dashboard~Not available')}
+                {t('console-shared~Not available')}
               </div>
             ) : (
               children
diff --git a/frontend/packages/console-shared/src/components/dashboard/resource-quota-card/ResourceQuotaBody.tsx b/frontend/packages/console-shared/src/components/dashboard/resource-quota-card/ResourceQuotaBody.tsx
index bd926ed4708..6654128dc26 100644
--- a/frontend/packages/console-shared/src/components/dashboard/resource-quota-card/ResourceQuotaBody.tsx
+++ b/frontend/packages/console-shared/src/components/dashboard/resource-quota-card/ResourceQuotaBody.tsx
@@ -7,11 +7,11 @@ const ResourceQuotaBody: React.FC<ResourceQuotaBodyProps> = ({ error, isLoading,
   let body: React.ReactNode;
   const { t } = useTranslation();
   if (error) {
-    body = <div className="text-secondary">{t('dashboard~Not available')}</div>;
+    body = <div className="text-secondary">{t('console-shared~Not available')}</div>;
   } else if (isLoading) {
     body = <div className="skeleton-quota" />;
   } else if (!React.Children.count(children)) {
-    body = <div className="text-secondary">{t('dashboard~No resource quotas')}</div>;
+    body = <div className="text-secondary">{t('console-shared~No resource quotas')}</div>;
   }
 
   return <div className="co-dashboard-card__body--top-margin">{body || children}</div>;
diff --git a/frontend/packages/console-shared/src/components/dashboard/status-card/AlertItem.tsx b/frontend/packages/console-shared/src/components/dashboard/status-card/AlertItem.tsx
index ac89419a95e..7a116e88035 100644
--- a/frontend/packages/console-shared/src/components/dashboard/status-card/AlertItem.tsx
+++ b/frontend/packages/console-shared/src/components/dashboard/status-card/AlertItem.tsx
@@ -70,7 +70,7 @@ const AlertItem: React.FC<AlertItemProps> = ({ alert }) => {
           {text}
         </Button>
       ) : (
-        <Link to={alertURL(alert, alert.rule.id)}>{t('dashboard~View details')}</Link>
+        <Link to={alertURL(alert, alert.rule.id)}>{t('console-shared~View details')}</Link>
       )}
     </StatusItem>
   );
diff --git a/frontend/packages/console-shared/src/components/dashboard/status-card/AlertsBody.tsx b/frontend/packages/console-shared/src/components/dashboard/status-card/AlertsBody.tsx
index 5f5e4fe9f83..0c7f660e3c8 100644
--- a/frontend/packages/console-shared/src/components/dashboard/status-card/AlertsBody.tsx
+++ b/frontend/packages/console-shared/src/components/dashboard/status-card/AlertsBody.tsx
@@ -16,7 +16,7 @@ const AlertsBody: React.FC<AlertsBodyProps> = ({ error = false, children }) => {
         {error ? (
           <EmptyState variant={EmptyStateVariant.full} className="co-status-card__alerts-msg">
             <EmptyStateIcon className="co-status-card__alerts-icon" icon={UnknownIcon} />
-            <EmptyStateBody>{t('dashboard~Alerts could not be loaded.')}</EmptyStateBody>
+            <EmptyStateBody>{t('console-shared~Alerts could not be loaded.')}</EmptyStateBody>
           </EmptyState>
         ) : (
           children
diff --git a/frontend/packages/console-shared/src/components/dashboard/status-card/states.tsx b/frontend/packages/console-shared/src/components/dashboard/status-card/states.tsx
index 6b1f2758614..03a4afd36e4 100644
--- a/frontend/packages/console-shared/src/components/dashboard/status-card/states.tsx
+++ b/frontend/packages/console-shared/src/components/dashboard/status-card/states.tsx
@@ -25,21 +25,21 @@ export const healthStateMessage = (state: keyof typeof HealthState, t: TFunction
     case HealthState.OK:
       return '';
     case HealthState.UNKNOWN:
-      return t('dashboard~Unknown');
+      return t('console-shared~Unknown');
     case HealthState.PROGRESS:
-      return t('dashboard~Pending');
+      return t('console-shared~Pending');
     case HealthState.UPDATING:
-      return t('dashboard~Updating');
+      return t('console-shared~Updating');
     case HealthState.WARNING:
-      return t('dashboard~Degraded');
+      return t('console-shared~Degraded');
     case HealthState.ERROR:
-      return t('dashboard~Degraded');
+      return t('console-shared~Degraded');
     case HealthState.LOADING:
-      return t('dashboard~Loading');
+      return t('console-shared~Loading');
     case HealthState.NOT_AVAILABLE:
-      return t('dashboard~Not available');
+      return t('console-shared~Not available');
     default:
-      return t('dashboard~Unknown');
+      return t('console-shared~Unknown');
   }
 };
 
diff --git a/frontend/packages/console-shared/src/components/dashboard/utilization-card/TopConsumerPopover.tsx b/frontend/packages/console-shared/src/components/dashboard/utilization-card/TopConsumerPopover.tsx
index b0f5dd4b8e3..69548d2bc7a 100644
--- a/frontend/packages/console-shared/src/components/dashboard/utilization-card/TopConsumerPopover.tsx
+++ b/frontend/packages/console-shared/src/components/dashboard/utilization-card/TopConsumerPopover.tsx
@@ -34,7 +34,7 @@ const ConsumerPopover: React.FC<ConsumerPopoverProps> = React.memo(
     const [isOpen, setOpen] = React.useState(false);
     return (
       <DashboardCardPopupLink
-        popupTitle={t('dashboard~{{title}} breakdown', { title })}
+        popupTitle={t('console-shared~{{title}} breakdown', { title })}
         linkTitle={current}
         onHide={React.useCallback(() => setOpen(false), [])}
         onShow={React.useCallback(() => setOpen(true), [])}
@@ -88,14 +88,14 @@ export const LimitsBody: React.FC<LimitsBodyProps> = ({
     ((!!limitState && limitState !== LIMIT_STATE.OK) ||
       (!!requestedState && requestedState !== LIMIT_STATE.OK)) && (
       <ul className="co-utilization-card-popover__consumer-list">
-        <Status value={total}>{t('dashboard~Total capacity')}</Status>
+        <Status value={total}>{t('console-shared~Total capacity')}</Status>
         <Status value={limit} icon={getLimitIcon(limitState)}>
-          {t('dashboard~Total limit')}
+          {t('console-shared~Total limit')}
         </Status>
-        <Status value={current}>{t('dashboard~Current utilization')}</Status>
-        <Status value={available}>{t('dashboard~Current available capacity')}</Status>
+        <Status value={current}>{t('console-shared~Current utilization')}</Status>
+        <Status value={available}>{t('console-shared~Current available capacity')}</Status>
         <Status value={requested} icon={getLimitIcon(requestedState)}>
-          {t('dashboard~Total requested')}
+          {t('console-shared~Total requested')}
         </Status>
       </ul>
     )
@@ -171,7 +171,7 @@ export const PopoverBody = withDashboardResources<DashboardItemProps & PopoverBo
       const dropdownItems = React.useMemo(
         () =>
           consumers.reduce((items, curr) => {
-            items[referenceForModel(curr.model)] = t('dashboard~By {{label}}', {
+            items[referenceForModel(curr.model)] = t('console-shared~By {{label}}', {
               label: curr.model.label,
             });
             return items;
@@ -191,7 +191,7 @@ export const PopoverBody = withDashboardResources<DashboardItemProps & PopoverBo
 
       let body: React.ReactNode;
       if (error || consumersLoadError) {
-        body = <div className="text-secondary">{t('public~Not available')}</div>;
+        body = <div className="text-secondary">{t('console-shared~Not available')}</div>;
       } else if (!consumerLoaded || !data) {
         body = (
           <ul className="co-utilization-card-popover__consumer-list">
@@ -207,7 +207,7 @@ export const PopoverBody = withDashboardResources<DashboardItemProps & PopoverBo
           <>
             <ul
               className="co-utilization-card-popover__consumer-list"
-              aria-label={t('dashboard~Top consumer by {{label}}', { label: model.label })}
+              aria-label={t('console-shared~Top consumer by {{label}}', { label: model.label })}
             >
               {top5Data &&
                 top5Data.map((item) => {
@@ -224,7 +224,7 @@ export const PopoverBody = withDashboardResources<DashboardItemProps & PopoverBo
                   );
                 })}
             </ul>
-            <Link to={monitoringURL}>{t('dashboard~View more')}</Link>
+            <Link to={monitoringURL}>{t('console-shared~View more')}</Link>
           </>
         );
       }
@@ -237,17 +237,17 @@ export const PopoverBody = withDashboardResources<DashboardItemProps & PopoverBo
           {children}
           <div className="co-utilization-card-popover__title">
             {consumers.length === 1
-              ? t('dashboard~Top {{label}} consumers', {
+              ? t('console-shared~Top {{label}} consumers', {
                   label: currentConsumer.model.label.toLowerCase(),
                 })
-              : t('dashboard~Top consumers')}
+              : t('console-shared~Top consumers')}
           </div>
           {consumers.length > 1 && (
             <Dropdown
               className="co-utilization-card-popover__dropdown"
               id="consumer-select"
               name="selectConsumerType"
-              aria-label={t('dashboard~Select consumer type')}
+              aria-label={t('console-shared~Select consumer type')}
               items={dropdownItems}
               onChange={onDropdownChange}
               selectedKey={referenceForModel(model)}
diff --git a/frontend/packages/console-shared/src/components/dashboard/utilization-card/UtilizationBody.tsx b/frontend/packages/console-shared/src/components/dashboard/utilization-card/UtilizationBody.tsx
index 1e3eb25a86f..78eacb8f05f 100644
--- a/frontend/packages/console-shared/src/components/dashboard/utilization-card/UtilizationBody.tsx
+++ b/frontend/packages/console-shared/src/components/dashboard/utilization-card/UtilizationBody.tsx
@@ -14,7 +14,7 @@ const UtilizationAxis: React.FC<UtilizationAxisProps> = ({ timestamps = [] }) =>
     <div ref={containerRef}>
       {!!timestamps.length && (
         <ChartAxis
-          containerComponent={<ChartContainer title={t('dashboard~time axis')} />}
+          containerComponent={<ChartContainer title={t('console-shared~time axis')} />}
           scale={{ x: 'time' }}
           domain={{ x: [timestamps[0], timestamps[timestamps.length - 1]] }}
           tickFormat={timeFormatter.format}
@@ -38,10 +38,10 @@ export const UtilizationBody: React.FC<UtilizationBodyProps> = ({ timestamps, ch
     <div className="co-utilization-card__item">
       <div className="co-utilization-card__item-section co-u-hidden co-u-visible-on-xl">
         <span className="co-utilization-card__item-text" data-test="utilization-card-item-text">
-          {t('public~Resource')}
+          {t('console-shared~Resource')}
         </span>
         <span className="co-utilization-card__item-text" data-test="utilization-card-item-text">
-          {t('dashboard~Usage')}
+          {t('console-shared~Usage')}
         </span>
       </div>
       <div className="co-utilization-card__item-chart co-utilization-card__item-chart--times">
diff --git a/frontend/packages/console-shared/src/components/dashboard/utilization-card/UtilizationItem.tsx b/frontend/packages/console-shared/src/components/dashboard/utilization-card/UtilizationItem.tsx
index d1ccc443fde..5dd7fc0eea0 100644
--- a/frontend/packages/console-shared/src/components/dashboard/utilization-card/UtilizationItem.tsx
+++ b/frontend/packages/console-shared/src/components/dashboard/utilization-card/UtilizationItem.tsx
@@ -67,7 +67,7 @@ export const MultilineUtilizationItem: React.FC<MultilineUtilizationItemProps> =
         height={70}
         byteDataType={byteDataType}
         showAllTooltip
-        ariaChartLinkLabel={t('dashboard~View {{title}} metrics in query browser', {
+        ariaChartLinkLabel={t('console-shared~View {{title}} metrics in query browser', {
           title,
         })}
         ariaChartTitle={title}
@@ -89,7 +89,7 @@ export const MultilineUtilizationItem: React.FC<MultilineUtilizationItemProps> =
           <div className="co-utilization-card__item-section-multiline">
             <h4 className="pf-c-title pf-m-md">{title}</h4>
             {error || (!isLoading && !(data.length && data.every((datum) => datum.length))) ? (
-              <div className="text-secondary">{t('public~Not available')}</div>
+              <div className="text-secondary">{t('console-shared~Not available')}</div>
             ) : (
               <div className="co-utilization-card__item-description">{currentValue}</div>
             )}
@@ -157,7 +157,7 @@ export const UtilizationItem: React.FC<UtilizationItemProps> = React.memo(
 
     const chart = (
       <AreaChart
-        ariaChartLinkLabel={t('dashboard~View {{title}} metrics in query browser', {
+        ariaChartLinkLabel={t('console-shared~View {{title}} metrics in query browser', {
           title,
         })}
         ariaChartTitle={title}
@@ -216,7 +216,7 @@ export const UtilizationItem: React.FC<UtilizationItemProps> = React.memo(
           <div className="co-utilization-card__item-section">
             <h4 className="pf-c-title pf-m-md">{title}</h4>
             {error || (!isLoading && !utilizationData?.length) ? (
-              <div className="text-secondary">{t('public~Not available')}</div>
+              <div className="text-secondary">{t('console-shared~Not available')}</div>
             ) : (
               <div>
                 {LimitIcon && <LimitIcon className="co-utilization-card__item-icon" />}
@@ -245,15 +245,18 @@ export const UtilizationItem: React.FC<UtilizationItemProps> = React.memo(
               >
                 {humanLimit && (
                   <span>
-                    {t('dashboard~{{humanAvailable}} available of {{humanLimit}} total limit', {
-                      humanAvailable,
-                      humanLimit,
-                    })}
+                    {t(
+                      'console-shared~{{humanAvailable}} available of {{humanLimit}} total limit',
+                      {
+                        humanAvailable,
+                        humanLimit,
+                      },
+                    )}
                   </span>
                 )}
                 {!humanLimit && humanMax && (
                   <span>
-                    {t('dashboard~{{humanAvailable}} available of {{humanMax}}', {
+                    {t('console-shared~{{humanAvailable}} available of {{humanMax}}', {
                       humanAvailable,
                       humanMax,
                     })}
@@ -261,7 +264,7 @@ export const UtilizationItem: React.FC<UtilizationItemProps> = React.memo(
                 )}
                 {!humanLimit && !humanMax && (
                   <span>
-                    {t('dashboard~{{humanAvailable}} available', {
+                    {t('console-shared~{{humanAvailable}} available', {
                       humanAvailable,
                     })}
                   </span>
diff --git a/frontend/packages/dev-console/locales/en/devconsole.json b/frontend/packages/dev-console/locales/en/devconsole.json
index 906e37bff45..3fcfbbb17f9 100644
--- a/frontend/packages/dev-console/locales/en/devconsole.json
+++ b/frontend/packages/dev-console/locales/en/devconsole.json
@@ -403,6 +403,7 @@
   "Silence for": "Silence for",
   "Dashboard": "Dashboard",
   "Workload": "Workload",
+  "View metrics for {{title}}": "View metrics for {{title}}",
   "All workloads": "All workloads",
   "Filter by workload": "Filter by workload",
   "Select a query or enter your own to view metrics for this Project": "Select a query or enter your own to view metrics for this Project",
diff --git a/frontend/packages/dev-console/src/components/monitoring/dashboard/MonitoringDashboardGraph.tsx b/frontend/packages/dev-console/src/components/monitoring/dashboard/MonitoringDashboardGraph.tsx
index 62eff567b27..c2ce065a379 100644
--- a/frontend/packages/dev-console/src/components/monitoring/dashboard/MonitoringDashboardGraph.tsx
+++ b/frontend/packages/dev-console/src/components/monitoring/dashboard/MonitoringDashboardGraph.tsx
@@ -46,7 +46,7 @@ export const MonitoringDashboardGraph: React.FC<MonitoringDashboardGraphProps> =
       <DashboardCardBody>
         <PrometheusGraphLink
           query={query}
-          ariaChartLinkLabel={t('dashboard~View metrics for {{title}}', {
+          ariaChartLinkLabel={t('devconsole~View metrics for {{title}}', {
             title,
           })}
         >
diff --git a/frontend/packages/operator-lifecycle-manager/src/components/catalog-source.spec.tsx b/frontend/packages/operator-lifecycle-manager/src/components/catalog-source.spec.tsx
index 30a2035ea0b..b122d40db1e 100644
--- a/frontend/packages/operator-lifecycle-manager/src/components/catalog-source.spec.tsx
+++ b/frontend/packages/operator-lifecycle-manager/src/components/catalog-source.spec.tsx
@@ -32,7 +32,6 @@ jest.mock('react-i18next', () => {
     useTranslation: () => ({ t: (key) => key }),
   };
 });
-const i18nNS = 'details-page';
 
 jest.mock('@console/internal/components/utils/k8s-watch-hook', () => ({
   useK8sWatchResource: jest.fn(),
@@ -80,8 +79,8 @@ describe(CatalogSourceDetailsPage.displayName, () => {
     const detailsPage = wrapper.find(DetailsPage);
     const { pages } = detailsPage.props();
     expect(pages.length).toEqual(3);
-    expect(pages[0].nameKey).toEqual(`${i18nNS}~Details`);
-    expect(pages[1].nameKey).toEqual(`${i18nNS}~YAML`);
+    expect(pages[0].nameKey).toEqual(`public~Details`);
+    expect(pages[1].nameKey).toEqual(`public~YAML`);
     expect(pages[2].nameKey).toEqual(`olm~Operators`);
 
     expect(pages[0].component).toEqual(CatalogSourceDetails);
diff --git a/frontend/packages/operator-lifecycle-manager/src/components/clusterserviceversion.spec.tsx b/frontend/packages/operator-lifecycle-manager/src/components/clusterserviceversion.spec.tsx
index 8438eebb0b2..d4eb56a77bc 100644
--- a/frontend/packages/operator-lifecycle-manager/src/components/clusterserviceversion.spec.tsx
+++ b/frontend/packages/operator-lifecycle-manager/src/components/clusterserviceversion.spec.tsx
@@ -538,14 +538,14 @@ describe(ClusterServiceVersionsDetailsPage.displayName, () => {
   it('renders a `DetailsPage` with the correct subpages', () => {
     const detailsPage = wrapper.find(DetailsPage);
     expect(detailsPage.props().pagesFor(testClusterServiceVersion)[0].nameKey).toEqual(
-      'details-page~Details',
+      'public~Details',
     );
     expect(detailsPage.props().pagesFor(testClusterServiceVersion)[0].href).toEqual('');
     expect(detailsPage.props().pagesFor(testClusterServiceVersion)[0].component).toEqual(
       ClusterServiceVersionDetails,
     );
     expect(detailsPage.props().pagesFor(testClusterServiceVersion)[1].nameKey).toEqual(
-      `details-page~YAML`,
+      `public~YAML`,
     );
     expect(detailsPage.props().pagesFor(testClusterServiceVersion)[1].href).toEqual('yaml');
     expect(detailsPage.props().pagesFor(testClusterServiceVersion)[2].nameKey).toEqual(
@@ -553,7 +553,7 @@ describe(ClusterServiceVersionsDetailsPage.displayName, () => {
     );
     expect(detailsPage.props().pagesFor(testClusterServiceVersion)[2].href).toEqual('subscription');
     expect(detailsPage.props().pagesFor(testClusterServiceVersion)[3].nameKey).toEqual(
-      `details-page~Events`,
+      `public~Events`,
     );
     expect(detailsPage.props().pagesFor(testClusterServiceVersion)[3].href).toEqual('events');
   });
diff --git a/frontend/packages/operator-lifecycle-manager/src/components/install-plan.spec.tsx b/frontend/packages/operator-lifecycle-manager/src/components/install-plan.spec.tsx
index 0b81ee527a5..8ea7572c3f8 100644
--- a/frontend/packages/operator-lifecycle-manager/src/components/install-plan.spec.tsx
+++ b/frontend/packages/operator-lifecycle-manager/src/components/install-plan.spec.tsx
@@ -50,7 +50,7 @@ jest.mock('react-i18next', () => {
   };
 });
 
-const i18nNS = 'details-page';
+const i18nNS = 'public';
 
 describe('InstallPlanTableRow', () => {
   let obj: InstallPlanKind;
diff --git a/frontend/packages/operator-lifecycle-manager/src/components/operand/index.spec.tsx b/frontend/packages/operator-lifecycle-manager/src/components/operand/index.spec.tsx
index e3fe2d51a66..2d71f7966cc 100644
--- a/frontend/packages/operator-lifecycle-manager/src/components/operand/index.spec.tsx
+++ b/frontend/packages/operator-lifecycle-manager/src/components/operand/index.spec.tsx
@@ -86,7 +86,7 @@ jest.mock('@console/shared/src/hooks/useK8sModel', () => ({
   ],
 }));
 
-const i18nNS = 'details-page';
+const i18nNS = 'public';
 
 describe(OperandTableRow.displayName, () => {
   let wrapper: ShallowWrapper<OperandTableRowProps>;
diff --git a/frontend/packages/pipelines-plugin/src/components/pipelineruns/__tests__/PipelineRunDetailsPage.spec.tsx b/frontend/packages/pipelines-plugin/src/components/pipelineruns/__tests__/PipelineRunDetailsPage.spec.tsx
index 5bee3487ff9..372d00bc5f2 100644
--- a/frontend/packages/pipelines-plugin/src/components/pipelineruns/__tests__/PipelineRunDetailsPage.spec.tsx
+++ b/frontend/packages/pipelines-plugin/src/components/pipelineruns/__tests__/PipelineRunDetailsPage.spec.tsx
@@ -13,7 +13,7 @@ import TaskRuns from '../detail-page-tabs/TaskRuns';
 const menuActions = jest.spyOn(utils, 'useMenuActionsWithUserAnnotation');
 const breadCrumbs = jest.spyOn(hookUtils, 'usePipelinesBreadcrumbsFor');
 type PipelineRunDetailsPageProps = React.ComponentProps<typeof PipelineRunDetailsPage>;
-const i18nNS = 'details-page';
+const i18nNS = 'public';
 
 jest.mock('react-i18next', () => {
   const reactI18next = require.requireActual('react-i18next');
diff --git a/frontend/packages/pipelines-plugin/src/components/taskruns/events/__tests__/TaskRunDetailsPage.spec.tsx b/frontend/packages/pipelines-plugin/src/components/taskruns/events/__tests__/TaskRunDetailsPage.spec.tsx
index 75ae57ed44f..452339a5954 100644
--- a/frontend/packages/pipelines-plugin/src/components/taskruns/events/__tests__/TaskRunDetailsPage.spec.tsx
+++ b/frontend/packages/pipelines-plugin/src/components/taskruns/events/__tests__/TaskRunDetailsPage.spec.tsx
@@ -9,7 +9,7 @@ import TaskRunEvents from '../TaskRunEvents';
 
 const breadCrumbs = jest.spyOn(hookUtils, 'useTasksBreadcrumbsFor');
 type TaskRunDetailsPageProps = React.ComponentProps<typeof TaskRunDetailsPage>;
-const i18nNS = 'details-page';
+const i18nNS = 'public';
 
 jest.mock('react-i18next', () => {
   const reactI18next = require.requireActual('react-i18next');
diff --git a/frontend/public/components/RBAC/bindings.jsx b/frontend/public/components/RBAC/bindings.jsx
index b6f2793855e..2600d21205f 100644
--- a/frontend/public/components/RBAC/bindings.jsx
+++ b/frontend/public/components/RBAC/bindings.jsx
@@ -71,7 +71,7 @@ const menuActions = ({ subjectIndex, subjects }, startImpersonate) => {
 
   const actions = [
     (kind, obj) => ({
-      label: i18next.t('bindings~Duplicate {{label}}', kind),
+      label: i18next.t('public~Duplicate {{label}}', kind),
       href: `${resourceObjPath(obj, kind.kind)}/copy?subjectIndex=${subjectIndex}`,
       // Only perform access checks when duplicating cluster role bindings.
       // It's not practical to check namespace role bindings since we don't know what namespace the user will pick in the form.
@@ -80,7 +80,7 @@ const menuActions = ({ subjectIndex, subjects }, startImpersonate) => {
         : { group: kind.apiGroup, resource: kind.plural, verb: 'create' },
     }),
     (kind, obj) => ({
-      label: i18next.t('bindings~Edit {{label}} subject', kind),
+      label: i18next.t('public~Edit {{label}} subject', kind),
       href: `${resourceObjPath(obj, kind.kind)}/edit?subjectIndex=${subjectIndex}`,
       accessReview: {
         group: kind.apiGroup,
@@ -93,15 +93,15 @@ const menuActions = ({ subjectIndex, subjects }, startImpersonate) => {
     subjects.length === 1
       ? Kebab.factory.Delete
       : (kind, binding) => ({
-          label: i18next.t('bindings~Delete {{label}} subject', kind),
+          label: i18next.t('public~Delete {{label}} subject', kind),
           callback: () =>
             confirmModal({
-              title: i18next.t('bindings~Delete {{label}} subject', kind),
+              title: i18next.t('public~Delete {{label}} subject', kind),
               message: i18next.t(
-                'bindings~Are you sure you want to delete subject {{name}} of type {{kind}}?',
+                'public~Are you sure you want to delete subject {{name}} of type {{kind}}?',
                 subject,
               ),
-              btnText: i18next.t('bindings~Delete subject'),
+              btnText: i18next.t('public~Delete subject'),
               executeFn: () =>
                 k8sPatch(kind, binding, [{ op: 'remove', path: `/subjects/${subjectIndex}` }]),
             }),
@@ -117,7 +117,7 @@ const menuActions = ({ subjectIndex, subjects }, startImpersonate) => {
 
   if (subject.kind === 'User' || subject.kind === 'Group') {
     actions.unshift(() => ({
-      label: i18next.t('bindings~Impersonate {{kind}} "{{name}}"', subject),
+      label: i18next.t('public~Impersonate {{kind}} "{{name}}"', subject),
       callback: () => startImpersonate(subject.kind, subject.name),
     }));
   }
@@ -137,31 +137,31 @@ const tableColumnClasses = [
 const RoleBindingsTableHeader = () => {
   return [
     {
-      title: i18next.t('bindings~Name'),
+      title: i18next.t('public~Name'),
       sortField: 'metadata.name',
       transforms: [sortable],
       props: { className: tableColumnClasses[0] },
     },
     {
-      title: i18next.t('bindings~Role ref'),
+      title: i18next.t('public~Role ref'),
       sortField: 'roleRef.name',
       transforms: [sortable],
       props: { className: tableColumnClasses[1] },
     },
     {
-      title: i18next.t('bindings~Subject kind'),
+      title: i18next.t('public~Subject kind'),
       sortField: 'subject.kind',
       transforms: [sortable],
       props: { className: tableColumnClasses[2] },
     },
     {
-      title: i18next.t('bindings~Subject name'),
+      title: i18next.t('public~Subject name'),
       sortField: 'subject.name',
       transforms: [sortable],
       props: { className: tableColumnClasses[3] },
     },
     {
-      title: i18next.t('bindings~Namespace'),
+      title: i18next.t('public~Namespace'),
       sortField: 'metadata.namespace',
       transforms: [sortable],
       props: { className: tableColumnClasses[4] },
@@ -227,7 +227,7 @@ const RoleBindingsTableRow = ({ obj: binding, index, key, style }) => {
         {binding.metadata.namespace ? (
           <ResourceLink kind="Namespace" name={binding.metadata.namespace} />
         ) : (
-          i18next.t('bindings~All namespaces')
+          i18next.t('public~All namespaces')
         )}
       </TableData>
       <TableData className={tableColumnClasses[5]}>
@@ -241,9 +241,9 @@ const EmptyMsg = () => {
   const { t } = useTranslation();
   return (
     <MsgBox
-      title={t('bindings~No RoleBindings found')}
+      title={t('public~No RoleBindings found')}
       detail={t(
-        'bindings~Roles grant access to types of objects in the cluster. Roles are applied to a group or user via a RoleBinding.',
+        'public~Roles grant access to types of objects in the cluster. Roles are applied to a group or user via a RoleBinding.',
       )}
     />
   );
@@ -254,7 +254,7 @@ export const BindingsList = (props) => {
   return (
     <Table
       {...props}
-      aria-label={t('bindings~RoleBindings')}
+      aria-label={t('public~RoleBindings')}
       EmptyMsg={EmptyMsg}
       Header={RoleBindingsTableHeader}
       Row={RoleBindingsTableRow}
@@ -292,18 +292,18 @@ export const RoleBindingsPage = ({
   const { t } = useTranslation();
   const rowFilters = [
     {
-      filterGroupName: t('bindings~Kind'),
+      filterGroupName: t('public~Kind'),
       type: 'role-binding-kind',
       reducer: bindingType,
       itemsGenerator: ({ ClusterRoleBinding: data }) => {
         const items = [
-          { id: 'namespace', title: t('bindings~Namespace RoleBindings') },
-          { id: 'system', title: t('bindings~System RoleBindings') },
+          { id: 'namespace', title: t('public~Namespace RoleBindings') },
+          { id: 'system', title: t('public~System RoleBindings') },
         ];
         if (data && data.loaded && !data.loadError) {
           items.unshift({
             id: 'cluster',
-            title: t('bindings~Cluster-wide RoleBindings'),
+            title: t('public~Cluster-wide RoleBindings'),
           });
         }
         return items;
@@ -313,14 +313,14 @@ export const RoleBindingsPage = ({
   return (
     <MultiListPage
       canCreate={!mock}
-      createButtonText={t('bindings~Create binding')}
+      createButtonText={t('public~Create binding')}
       createProps={{
         to: createPath,
       }}
       mock={mock}
-      filterLabel={t('bindings~by role or subject')}
+      filterLabel={t('public~by role or subject')}
       flatten={flatten}
-      label={t('bindings~RoleBindings')}
+      label={t('public~RoleBindings')}
       ListComponent={BindingsList}
       namespace={namespace}
       resources={roleResources}
@@ -328,7 +328,7 @@ export const RoleBindingsPage = ({
       staticFilters={staticFilters}
       showTitle={showTitle}
       textFilter="role-binding"
-      title={t('bindings~RoleBindings')}
+      title={t('public~RoleBindings')}
     />
   );
 };
@@ -354,9 +354,9 @@ const NsRoleDropdown_ = (props) => {
   return (
     <ListDropdown
       {...props}
-      desc={t('bindings~Namespace roles (Role)')}
+      desc={t('public~Namespace roles (Role)')}
       resources={resources}
-      placeholder={t('bindings~Select role name')}
+      placeholder={t('public~Select role name')}
     />
   );
 };
@@ -368,9 +368,9 @@ const ClusterRoleDropdown = (props) => {
   return (
     <ListDropdown
       {...props}
-      desc={t('bindings~Cluster-wide roles (ClusterRole)')}
+      desc={t('public~Cluster-wide roles (ClusterRole)')}
       resources={[{ kind: 'ClusterRole' }]}
-      placeholder={t('bindings~Select role name')}
+      placeholder={t('public~Select role name')}
     />
   );
 };
@@ -468,7 +468,7 @@ class BaseEditRoleBindingWithTranslation extends React.Component {
       (kind === 'RoleBinding' && !metadata.namespace) ||
       (subject.kind === 'ServiceAccount' && !subject.namespace)
     ) {
-      this.setState({ error: t('bindings~Please complete all fields.') });
+      this.setState({ error: t('public~Please complete all fields.') });
       return;
     }
 
@@ -502,23 +502,23 @@ class BaseEditRoleBindingWithTranslation extends React.Component {
     const bindingKinds = [
       {
         value: 'RoleBinding',
-        title: t('bindings~Namespace role binding (RoleBinding)'),
+        title: t('public~Namespace role binding (RoleBinding)'),
         desc: t(
-          'bindings~Grant the permissions to a user or set of users within the selected namespace.',
+          'public~Grant the permissions to a user or set of users within the selected namespace.',
         ),
       },
       {
         value: 'ClusterRoleBinding',
-        title: t('bindings~Cluster-wide role binding (ClusterRoleBinding)'),
+        title: t('public~Cluster-wide role binding (ClusterRoleBinding)'),
         desc: t(
-          'bindings~Grant the permissions to a user or set of users at the cluster level and in all namespaces.',
+          'public~Grant the permissions to a user or set of users at the cluster level and in all namespaces.',
         ),
       },
     ];
     const subjectKinds = [
-      { value: 'User', title: t('bindings~User'), disabled: false },
-      { value: 'Group', title: t('bindings~Group'), disabled: false },
-      { value: 'ServiceAccount', title: t('bindings~ServiceAccount'), disabled: false },
+      { value: 'User', title: t('public~User'), disabled: false },
+      { value: 'Group', title: t('public~Group'), disabled: false },
+      { value: 'ServiceAccount', title: t('public~ServiceAccount'), disabled: false },
     ];
 
     return (
@@ -532,22 +532,22 @@ class BaseEditRoleBindingWithTranslation extends React.Component {
           </h1>
           <p className="co-m-pane__explanation">
             {t(
-              'bindings~Associate a user/group to the selected role to define the type of access and resources that are allowed.',
+              'public~Associate a user/group to the selected role to define the type of access and resources that are allowed.',
             )}
           </p>
 
           {!_.get(fixed, 'kind') && (
-            <Section label={t('bindings~Binding type')}>
+            <Section label={t('public~Binding type')}>
               <RadioGroup currentValue={kind} items={bindingKinds} onChange={this.setKind} />
             </Section>
           )}
 
           <div className="co-form-section__separator" />
 
-          <Section label={t('bindings~RoleBinding')}>
+          <Section label={t('public~RoleBinding')}>
             <div className="form-group">
               <label htmlFor="role-binding-name" className="co-required">
-                {t('bindings~Name')}
+                {t('public~Name')}
               </label>
               {_.get(fixed, 'metadata.name') ? (
                 <ResourceName kind={kind} name={metadata.name} />
@@ -556,7 +556,7 @@ class BaseEditRoleBindingWithTranslation extends React.Component {
                   className="pf-c-form-control"
                   type="text"
                   onChange={this.changeName}
-                  placeholder={t('bindings~RoleBinding name')}
+                  placeholder={t('public~RoleBinding name')}
                   value={metadata.name}
                   required
                   id="role-binding-name"
@@ -567,7 +567,7 @@ class BaseEditRoleBindingWithTranslation extends React.Component {
             {kind === 'RoleBinding' && (
               <div className="form-group" data-test="namespace-dropdown">
                 <label htmlFor="ns-dropdown" className="co-required">
-                  {t('bindings~Namespace')}
+                  {t('public~Namespace')}
                 </label>
                 <NsDropdown
                   fixed={!!_.get(fixed, 'metadata.namespace')}
@@ -581,10 +581,10 @@ class BaseEditRoleBindingWithTranslation extends React.Component {
 
           <div className="co-form-section__separator" />
 
-          <Section label={t('bindings~Role')}>
+          <Section label={t('public~Role')}>
             <div className="form-group" data-test="role-dropdown">
               <label htmlFor="role-dropdown" className="co-required">
-                {t('bindings~Role name')}
+                {t('public~Role name')}
               </label>
               <RoleDropdown
                 fixed={!!_.get(fixed, 'roleRef.name')}
@@ -599,7 +599,7 @@ class BaseEditRoleBindingWithTranslation extends React.Component {
 
           <div className="co-form-section__separator" />
 
-          <Section label={t('bindings~Subject')}>
+          <Section label={t('public~Subject')}>
             <div className="form-group">
               <RadioGroup
                 currentValue={subject.kind}
@@ -610,7 +610,7 @@ class BaseEditRoleBindingWithTranslation extends React.Component {
             {subject.kind === 'ServiceAccount' && (
               <div className="form-group">
                 <label htmlFor="subject-namespace" className="co-required">
-                  {t('bindings~Subject namespace')}
+                  {t('public~Subject namespace')}
                 </label>
                 <NsDropdown
                   id="subject-namespace"
@@ -621,13 +621,13 @@ class BaseEditRoleBindingWithTranslation extends React.Component {
             )}
             <div className="form-group">
               <label htmlFor="subject-name" className="co-required">
-                {t('bindings~Subject name')}
+                {t('public~Subject name')}
               </label>
               <input
                 className="pf-c-form-control"
                 type="text"
                 onChange={this.changeSubjectName}
-                placeholder={t('bindings~Subject name')}
+                placeholder={t('public~Subject name')}
                 value={subject.name}
                 required
                 id="subject-name"
@@ -642,10 +642,10 @@ class BaseEditRoleBindingWithTranslation extends React.Component {
           <ButtonBar errorMessage={this.state.error} inProgress={this.state.inProgress}>
             <ActionGroup className="pf-c-form">
               <Button type="submit" id="save-changes" variant="primary" data-test="save-changes">
-                {saveButtonText || t('bindings~Create')}
+                {saveButtonText || t('public~Create')}
               </Button>
               <Button onClick={history.goBack} id="cancel" variant="secondary">
-                {t('bindings~Cancel')}
+                {t('public~Cancel')}
               </Button>
             </ActionGroup>
           </ButtonBar>
@@ -683,7 +683,7 @@ export const CreateRoleBinding = ({ match: { params }, location }) => {
       setActiveNamespace={setActiveNamespace}
       fixed={fixed}
       isCreate={true}
-      titleVerb={t('bindings~Create')}
+      titleVerb={t('public~Create')}
     />
   );
 };
@@ -718,8 +718,8 @@ export const EditRoleBinding = ({ match: { params }, kind }) => {
       <BindingLoadingWrapper
         fixedKeys={['kind', 'metadata', 'roleRef']}
         subjectIndex={getSubjectIndex()}
-        titleVerb={t('bindings~Edit')}
-        saveButtonText={t('bindings~Save')}
+        titleVerb={t('public~Edit')}
+        saveButtonText={t('public~Save')}
       />
     </Firehose>
   );
@@ -735,7 +735,7 @@ export const CopyRoleBinding = ({ match: { params }, kind }) => {
         isCreate={true}
         fixedKeys={['kind']}
         subjectIndex={getSubjectIndex()}
-        titleVerb={t('bindings~Duplicate')}
+        titleVerb={t('public~Duplicate')}
       />
     </Firehose>
   );
diff --git a/frontend/public/components/RBAC/role.jsx b/frontend/public/components/RBAC/role.jsx
index 84cd16d99f1..e77f2949132 100644
--- a/frontend/public/components/RBAC/role.jsx
+++ b/frontend/public/components/RBAC/role.jsx
@@ -255,7 +255,7 @@ const getBreadcrumbs = (model, kindObj, match) => {
       ),
     },
     {
-      name: i18next.t('details-page~{{kind}} details', {
+      name: i18next.t('public~{{kind}} details', {
         kind: kindObj.labelKey ? i18next.t(kindObj.labelKey) : kindObj.label,
       }),
       path: `${match.url}`,
diff --git a/frontend/public/components/build.tsx b/frontend/public/components/build.tsx
index c1df0b1ac7c..8336f5da544 100644
--- a/frontend/public/components/build.tsx
+++ b/frontend/public/components/build.tsx
@@ -48,8 +48,8 @@ import { timeFormatter, timeFormatterWithSeconds } from './utils/datetime';
 const BuildsReference: K8sResourceKindReference = 'Build';
 
 const CloneBuildAction: KebabAction = (kind: K8sKind, build: K8sResourceKind) => ({
-  // t('build~Rebuild')
-  labelKey: 'build~Rebuild',
+  // t('public~Rebuild')
+  labelKey: 'public~Rebuild',
   callback: () =>
     cloneBuild(build)
       .then((clone) => {
@@ -70,22 +70,22 @@ const CloneBuildAction: KebabAction = (kind: K8sKind, build: K8sResourceKind) =>
 });
 
 const CancelAction: KebabAction = (kind: K8sKind, build: K8sResourceKind) => ({
-  // t('build~Cancel build')
-  labelKey: 'build~Cancel build',
+  // t('public~Cancel build')
+  labelKey: 'public~Cancel build',
   hidden:
     build.status.phase !== 'Running' &&
     build.status.phase !== 'Pending' &&
     build.status.phase !== 'New',
   callback: () =>
     confirmModal({
-      // t('build~Cancel build'),
-      // t('build~Are you sure you want to cancel this build?'),
-      // t('build~Yes, cancel'),
-      // t("build~No, don't cancel"),
-      titleKey: 'build~Cancel build',
-      messageKey: 'build~Are you sure you want to cancel this build?',
-      btnTextKey: 'build~Yes, cancel',
-      cancelTextKey: "build~No, don't cancel",
+      // t('public~Cancel build'),
+      // t('public~Are you sure you want to cancel this build?'),
+      // t('public~Yes, cancel'),
+      // t("public~No, don't cancel"),
+      titleKey: 'public~Cancel build',
+      messageKey: 'public~Are you sure you want to cancel this build?',
+      btnTextKey: 'public~Yes, cancel',
+      cancelTextKey: "public~No, don't cancel",
       executeFn: () =>
         k8sPatch(kind, build, [{ op: 'add', path: '/status/cancelled', value: true }]),
     }),
@@ -122,7 +122,7 @@ export const BuildLogLink = ({ build }) => {
   return isPipeline ? (
     <BuildPipelineLogLink obj={build} />
   ) : (
-    <Link to={`${resourcePath('Build', name, namespace)}/logs`}>{t('build~View logs')}</Link>
+    <Link to={`${resourcePath('Build', name, namespace)}/logs`}>{t('public~View logs')}</Link>
   );
 };
 
@@ -171,7 +171,7 @@ const BuildGraphs = requirePrometheus(({ build }) => {
             byteDataType={ByteDataTypes.BinaryBytes}
             humanize={humanizeBinaryBytes}
             query={`sum(container_memory_working_set_bytes{pod='${podName}',namespace='${namespace}',container=''}) BY (pod, namespace)`}
-            title={t('build~Memory usage')}
+            title={t('public~Memory usage')}
             {...areaProps}
           />
         </div>
@@ -179,7 +179,7 @@ const BuildGraphs = requirePrometheus(({ build }) => {
           <Area
             humanize={humanizeCpuCores}
             query={`pod:container_cpu_usage:sum{pod='${podName}',container='',namespace='${namespace}'}`}
-            title={t('build~CPU usage')}
+            title={t('public~CPU usage')}
             {...areaProps}
           />
         </div>
@@ -188,7 +188,7 @@ const BuildGraphs = requirePrometheus(({ build }) => {
             byteDataType={ByteDataTypes.BinaryBytes}
             humanize={humanizeBinaryBytes}
             query={`pod:container_fs_usage_bytes:sum{pod='${podName}',container='',namespace='${namespace}'}`}
-            title={t('build~Filesystem')}
+            title={t('public~Filesystem')}
             {...areaProps}
           />
         </div>
@@ -205,19 +205,19 @@ export const PipelineBuildStrategyAlert: React.FC<BuildsDetailsProps> = () => {
       isInline
       className="co-alert"
       variant="info"
-      title={t('build~Pipeline build strategy deprecation')}
+      title={t('public~Pipeline build strategy deprecation')}
     >
-      <Trans i18nKey="build~pipelineBuildStrategyAlert">
+      <Trans i18nKey="public~pipelineBuildStrategyAlert">
         With the release of{' '}
         <ExternalLink
           href="https://openshift.github.io/pipelines-docs/"
-          text={t('build~OpenShift Pipelines based on Tekton')}
+          text={t('public~OpenShift Pipelines based on Tekton')}
         />
         , the pipelines build strategy has been deprecated. Users should either use Jenkins files
         directly on Jenkins or use cloud-native CI/CD with Openshift Pipelines.
         <ExternalLink
           href="https://github.com/openshift/pipelines-tutorial/"
-          text={t('build~Try the OpenShift Pipelines tutorial')}
+          text={t('public~Try the OpenShift Pipelines tutorial')}
         />
       </Trans>
     </Alert>
@@ -234,7 +234,7 @@ export const BuildsDetails: React.SFC<BuildsDetailsProps> = ({ obj: build }) =>
     <>
       <div className="co-m-pane__body">
         {hasPipeline && <PipelineBuildStrategyAlert obj={build} />}
-        <SectionHeading text={t('build~Build details')} />
+        <SectionHeading text={t('public~Build details')} />
         <BuildGraphs build={build} />
         {hasPipeline && (
           <div className="row">
@@ -247,7 +247,7 @@ export const BuildsDetails: React.SFC<BuildsDetailsProps> = ({ obj: build }) =>
           <div className="col-sm-6">
             <ResourceSummary resource={build}>
               <DetailsItem
-                label={t('build~Triggered by')}
+                label={t('public~Triggered by')}
                 obj={build}
                 path="spec.triggeredBy"
                 hideEmpty
@@ -255,7 +255,7 @@ export const BuildsDetails: React.SFC<BuildsDetailsProps> = ({ obj: build }) =>
                 {triggeredBy}
               </DetailsItem>
               <DetailsItem
-                label={t('build~Started')}
+                label={t('public~Started')}
                 obj={build}
                 path="status.startTimestamp"
                 hideEmpty
@@ -266,21 +266,26 @@ export const BuildsDetails: React.SFC<BuildsDetailsProps> = ({ obj: build }) =>
           </div>
           <div className="col-sm-6">
             <BuildStrategy resource={build}>
-              <DetailsItem label={t('build~Status')} obj={build} path="status.phase">
+              <DetailsItem label={t('public~Status')} obj={build} path="status.phase">
                 <Status status={build.status.phase} />
               </DetailsItem>
-              <DetailsItem label={t('build~Message')} obj={build} path="status.message" hideEmpty>
+              <DetailsItem label={t('public~Message')} obj={build} path="status.message" hideEmpty>
                 {message}
               </DetailsItem>
               <DetailsItem
-                label={t('build~Log snippet')}
+                label={t('public~Log snippet')}
                 obj={build}
                 path="status.logSnippet"
                 hideEmpty
               >
                 <pre>{logSnippet}</pre>
               </DetailsItem>
-              <DetailsItem label={t('build~Duration')} obj={build} path="status.duration" hideEmpty>
+              <DetailsItem
+                label={t('public~Duration')}
+                obj={build}
+                path="status.duration"
+                hideEmpty
+              >
                 {duration}
               </DetailsItem>
             </BuildStrategy>
@@ -339,7 +344,7 @@ export const BuildEnvironmentComponent = (props) => {
   return (
     <div className="cos-status-box">
       <div className="text-center">
-        {t('build~The environment variable editor does not support build strategy: {{ type }}', {
+        {t('public~The environment variable editor does not support build strategy: {{ type }}', {
           type: obj.spec.strategy.type,
         })}
         .
@@ -404,26 +409,26 @@ export const BuildsList: React.SFC = (props) => {
   const BuildsTableHeader = () => {
     return [
       {
-        title: t('build~Name'),
+        title: t('public~Name'),
         sortField: 'metadata.name',
         transforms: [sortable],
         props: { className: tableColumnClasses[0] },
       },
       {
-        title: t('build~Namespace'),
+        title: t('public~Namespace'),
         sortField: 'metadata.namespace',
         transforms: [sortable],
         props: { className: tableColumnClasses[1] },
         id: 'namespace',
       },
       {
-        title: t('build~Status'),
+        title: t('public~Status'),
         sortField: 'status.phase',
         transforms: [sortable],
         props: { className: tableColumnClasses[2] },
       },
       {
-        title: t('build~Created'),
+        title: t('public~Created'),
         sortField: 'metadata.creationTimestamp',
         transforms: [sortable],
         props: { className: tableColumnClasses[3] },
@@ -439,7 +444,7 @@ export const BuildsList: React.SFC = (props) => {
   return (
     <Table
       {...props}
-      aria-label={t('build~Builds')}
+      aria-label={t('public~Builds')}
       Header={BuildsTableHeader}
       Row={BuildsTableRow}
       virtualize
@@ -458,7 +463,7 @@ export const BuildsPage: React.SFC<BuildsPageProps> = (props) => {
   return (
     <ListPage
       {...props}
-      title={t('build~Builds')}
+      title={t('public~Builds')}
       kind={BuildsReference}
       ListComponent={BuildsList}
       canCreate={false}
diff --git a/frontend/public/components/cluster-settings/cluster-operator.tsx b/frontend/public/components/cluster-settings/cluster-operator.tsx
index 8f36d772184..7ecf58a1d2f 100644
--- a/frontend/public/components/cluster-settings/cluster-operator.tsx
+++ b/frontend/public/components/cluster-settings/cluster-operator.tsx
@@ -94,25 +94,25 @@ export const ClusterOperatorList: React.FC = (props) => {
   const ClusterOperatorTableHeader = () => {
     return [
       {
-        title: t('cluster-operator~Name'),
+        title: t('public~Name'),
         sortField: 'metadata.name',
         transforms: [sortable],
         props: { className: tableColumnClasses[0] },
       },
       {
-        title: t('cluster-operator~Status'),
+        title: t('public~Status'),
         sortFunc: 'getClusterOperatorStatus',
         transforms: [sortable],
         props: { className: tableColumnClasses[1] },
       },
       {
-        title: t('cluster-operator~Version'),
+        title: t('public~Version'),
         sortFunc: 'getClusterOperatorVersion',
         transforms: [sortable],
         props: { className: tableColumnClasses[2] },
       },
       {
-        title: t('cluster-operator~Message'),
+        title: t('public~Message'),
         props: { className: tableColumnClasses[3] },
       },
     ];
@@ -163,7 +163,7 @@ export const ClusterOperatorPage: React.FC<ClusterOperatorPageProps> = (props) =
   const { t } = useTranslation();
   const filters = [
     {
-      filterGroupName: t('cluster-operator~Status'),
+      filterGroupName: t('public~Status'),
       type: 'cluster-operator-status',
       reducer: getClusterOperatorStatus,
       items: _.map(allStatuses, (phase) => ({
@@ -196,8 +196,8 @@ const OperandVersions: React.FC<OperandVersionsProps> = ({ versions }) => {
       <table className="table">
         <thead>
           <tr>
-            <th>{t('cluster-operator~Name')}</th>
-            <th>{t('cluster-operator~Version')}</th>
+            <th>{t('public~Name')}</th>
+            <th>{t('public~Version')}</th>
           </tr>
         </thead>
         <tbody>
@@ -225,7 +225,7 @@ const ClusterOperatorDetails: React.FC<ClusterOperatorDetailsProps> = ({ obj })
     <>
       <div className="co-m-pane__body">
         <SectionHeading
-          text={t('cluster-operator~{{resource}} details', {
+          text={t('public~{{resource}} details', {
             resource: ClusterOperatorModel.label,
           })}
         />
@@ -237,26 +237,26 @@ const ClusterOperatorDetails: React.FC<ClusterOperatorDetailsProps> = ({ obj })
             <dl>
               {operatorVersion && (
                 <>
-                  <dt>{t('cluster-operator~Version')}</dt>
+                  <dt>{t('public~Version')}</dt>
                   <dd>{operatorVersion}</dd>
                 </>
               )}
-              <dt>{t('cluster-operator~Status')}</dt>
+              <dt>{t('public~Status')}</dt>
               <dd>
                 <OperatorStatusIconAndLabel status={status} />
               </dd>
-              <dt>{t('cluster-operator~Message')}</dt>
+              <dt>{t('public~Message')}</dt>
               <dd className="co-pre-line">{message || '-'}</dd>
             </dl>
           </div>
         </div>
       </div>
       <div className="co-m-pane__body">
-        <SectionHeading text={t('cluster-operator~Conditions')} />
+        <SectionHeading text={t('public~Conditions')} />
         <Conditions conditions={conditions} />
       </div>
       <div className="co-m-pane__body">
-        <SectionHeading text={t('cluster-operator~Operand versions')} />
+        <SectionHeading text={t('public~Operand versions')} />
         <OperandVersions versions={versions} />
       </div>
     </>
@@ -274,14 +274,14 @@ export const ClusterOperatorDetailsPage: React.FC<ClusterOperatorDetailsPageProp
         navFactory.editYaml(),
         {
           href: 'related-objects',
-          name: t('cluster-operator~Related objects'),
+          name: t('public~Related objects'),
           component: RelatedObjectsPage,
         },
       ]}
       breadcrumbsFor={() => [
         { name: ClusterOperatorModel.labelPlural, path: '/settings/cluster/clusteroperators' },
         {
-          name: t('cluster-operator~{{resource}} details', {
+          name: t('public~{{resource}} details', {
             resource: ClusterOperatorModel.label,
           }),
           path: props.match.url,
diff --git a/frontend/public/components/cluster-settings/cluster-settings.tsx b/frontend/public/components/cluster-settings/cluster-settings.tsx
index c70cd55d21d..108b26c61e0 100644
--- a/frontend/public/components/cluster-settings/cluster-settings.tsx
+++ b/frontend/public/components/cluster-settings/cluster-settings.tsx
@@ -142,7 +142,7 @@ const calculatePercentage = (numerator: number, denominator: number): number =>
 
 export const CurrentChannel: React.FC<CurrentChannelProps> = ({ cv, clusterVersionIsEditable }) => {
   const { t } = useTranslation();
-  const label = cv.spec.channel || t('cluster-settings~Not configured');
+  const label = cv.spec.channel || t('public~Not configured');
   return clusterVersionIsEditable ? (
     <Button
       type="button"
@@ -164,10 +164,10 @@ const InvalidMessage: React.FC<CVStatusMessageProps> = ({ cv }) => {
   return (
     <>
       <div>
-        <RedExclamationCircleIcon /> {t('cluster-settings~Invalid cluster version')}
+        <RedExclamationCircleIcon /> {t('public~Invalid cluster version')}
       </div>
       <Button onClick={() => cancelUpdate(cv)} variant="primary">
-        {t('cluster-settings~Cancel update')}
+        {t('public~Cancel update')}
       </Button>
     </>
   );
@@ -177,7 +177,7 @@ const UpdatesAvailableMessage: React.FC<CVStatusMessageProps> = () => {
   const { t } = useTranslation();
   return (
     <div className="co-update-status">
-      <BlueArrowCircleUpIcon /> {t('cluster-settings~Available updates')}
+      <BlueArrowCircleUpIcon /> {t('public~Available updates')}
     </div>
   );
 };
@@ -193,7 +193,7 @@ const FailingMessageText: React.FC<CVStatusMessageProps> = ({ cv }) => {
     <div>
       <Tooltip content={truncateMiddle(failingCondition.message, { length: 256 })}>
         <span>
-          <RedExclamationCircleIcon /> {t('cluster-settings~Failing')}
+          <RedExclamationCircleIcon /> {t('public~Failing')}
         </span>
       </Tooltip>
     </div>
@@ -209,7 +209,7 @@ export const ClusterVersionConditionsLink: React.FC<ClusterVersionConditionsLink
       smooth
       to={`${resourcePathFromModel(ClusterVersionModel, cv.metadata.name)}#conditions`}
     >
-      {t('cluster-settings~View conditions')}
+      {t('public~View conditions')}
     </HashLink>
   );
 };
@@ -217,7 +217,7 @@ export const ClusterVersionConditionsLink: React.FC<ClusterVersionConditionsLink
 export const UpdatingMessageText: React.FC<CVStatusMessageProps> = ({ cv }) => {
   const version = getDesiredClusterVersion(cv);
   const { t } = useTranslation();
-  return <>{t('cluster-settings~Update to {{version}} in progress', { version })}</>;
+  return <>{t('public~Update to {{version}} in progress', { version })}</>;
 };
 
 const UpdatingMessage: React.FC<CVStatusMessageProps> = ({ cv, isFailing }) => {
@@ -242,16 +242,15 @@ const ErrorRetrievingMessage: React.FC<CVStatusMessageProps> = ({ cv }) => {
   const { t } = useTranslation();
   return retrievedUpdatesCondition.reason === 'NoChannel' ? (
     <>
-      <BlueInfoCircleIcon />{' '}
-      {t('cluster-settings~Not configured to request update recommedations.')}
+      <BlueInfoCircleIcon /> {t('public~Not configured to request update recommedations.')}
     </>
   ) : (
     <Tooltip content={truncateMiddle(retrievedUpdatesCondition.message, { length: 256 })}>
       <span>
         <RedExclamationCircleIcon />{' '}
         {retrievedUpdatesCondition.reason === 'VersionNotFound'
-          ? t('cluster-settings~Version not found')
-          : t('cluster-settings~Error retrieving')}
+          ? t('public~Version not found')
+          : t('public~Error retrieving')}
       </span>
     </Tooltip>
   );
@@ -270,7 +269,7 @@ const UpToDateMessage: React.FC<{}> = () => {
   const { t } = useTranslation();
   return (
     <span>
-      <GreenCheckCircleIcon /> {t('cluster-settings~Up to date')}
+      <GreenCheckCircleIcon /> {t('public~Up to date')}
     </span>
   );
 };
@@ -300,7 +299,7 @@ export const ReleaseNotesLink: React.FC<ReleaseNotesLinkProps> = ({ version }) =
   const { t } = useTranslation();
   return (
     releaseNotesLink && (
-      <ExternalLink text={t('cluster-settings~View release notes')} href={releaseNotesLink} />
+      <ExternalLink text={t('public~View release notes')} href={releaseNotesLink} />
     )
   );
 };
@@ -324,7 +323,7 @@ export const CurrentVersion: React.FC<CurrentVersionProps> = ({ cv }) => {
     ) : (
       <>
         <YellowExclamationTriangleIcon />
-        &nbsp;{t('cluster-settings~Unknown')}
+        &nbsp;{t('public~Unknown')}
       </>
     );
   }
@@ -339,7 +338,7 @@ export const CurrentVersion: React.FC<CurrentVersionProps> = ({ cv }) => {
       <ReleaseNotesLink version={getLastCompletedUpdate(cv)} />
     </>
   ) : (
-    <>{t('cluster-settings~None')}</>
+    <>{t('public~None')}</>
   );
 };
 
@@ -372,8 +371,8 @@ export const CurrentVersionHeader: React.FC<CurrentVersionProps> = ({ cv }) => {
   return (
     <>
       {status === ClusterUpdateStatus.UpToDate || status === ClusterUpdateStatus.UpdatesAvailable
-        ? t('cluster-settings~Current version')
-        : t('cluster-settings~Last completed version')}
+        ? t('public~Current version')
+        : t('public~Last completed version')}
     </>
   );
 };
@@ -383,7 +382,7 @@ export const ChannelDocLink: React.FC<{}> = () => {
   return (
     <ExternalLink
       href={`${openshiftHelpBase}updating/updating-cluster-between-minor.html#understanding-upgrade-channels_updating-cluster-between-minor`}
-      text={t('cluster-settings~Learn more about OpenShift update channels')}
+      text={t('public~Learn more about OpenShift update channels')}
     />
   );
 };
@@ -392,11 +391,11 @@ const ChannelHeader: React.FC<{}> = () => {
   const { t } = useTranslation();
   return (
     <>
-      {t('cluster-settings~Channel')}
+      {t('public~Channel')}
       <FieldLevelHelp>
         <p>
           {t(
-            'cluster-settings~Channels help to control the pace of updates and recommend the appropriate release versions. Update channels are tied to a minor version of OpenShift Container Platform, for example 4.5.',
+            'public~Channels help to control the pace of updates and recommend the appropriate release versions. Update channels are tied to a minor version of OpenShift Container Platform, for example 4.5.',
           )}
         </p>
         <ChannelDocLink />
@@ -467,7 +466,7 @@ const ChannelVersionDot: React.FC<ChannelVersionDotProps> = ({ current, version
     <Popover
       headerContent={
         <>
-          {t('cluster-settings~Version')} {version}
+          {t('public~Version')} {version}
         </>
       }
       bodyContent={<ReleaseNotesLink version={version} />}
@@ -534,7 +533,7 @@ export const NodesUpdatesGroup: React.FC<NodesUpdatesGroupProps> = ({
         {name !== 'Master' && (
           <FieldLevelHelp>
             {t(
-              'cluster-settings~{{name}} {{resource}} may continue to update after the update of Master {{resource}} and {{resource2}} are complete.',
+              'public~{{name}} {{resource}} may continue to update after the update of Master {{resource}} and {{resource2}} are complete.',
               {
                 name,
                 resource: NodeModel.labelPlural,
@@ -546,7 +545,7 @@ export const NodesUpdatesGroup: React.FC<NodesUpdatesGroupProps> = ({
       </UpdatesType>
       <UpdatesBar>
         <Progress
-          title={t('cluster-settings~{{updatedMCPNodes}} of {{totalMCPNodes}}', {
+          title={t('public~{{updatedMCPNodes}} of {{totalMCPNodes}}', {
             updatedMCPNodes,
             totalMCPNodes,
           })}
@@ -617,7 +616,7 @@ export const UpdatesGraph: React.FC<UpdatesGraphProps> = ({ cv }) => {
                 className="co-channel-more-versions"
                 onClick={() => clusterMoreUpdatesModal({ cv })}
               >
-                {t('cluster-settings~+ More')}
+                {t('public~+ More')}
               </Button>
             )}
           </ChannelLine>
@@ -631,7 +630,7 @@ export const UpdatesGraph: React.FC<UpdatesGraphProps> = ({ cv }) => {
           </ChannelLine>
         </ChannelPath>
         <ChannelName current>
-          {t('cluster-settings~{{currentChannel}} channel', { currentChannel })}
+          {t('public~{{currentChannel}} channel', { currentChannel })}
         </ChannelName>
       </Channel>
       {newerChannel && (
@@ -643,9 +642,7 @@ export const UpdatesGraph: React.FC<UpdatesGraphProps> = ({ cv }) => {
             <ChannelLine />
             <ChannelLine />
           </ChannelPath>
-          <ChannelName>
-            {t('cluster-settings~{{newerChannel}} channel', { newerChannel })}
-          </ChannelName>
+          <ChannelName>{t('public~{{newerChannel}} channel', { newerChannel })}</ChannelName>
         </Channel>
       )}
     </div>
@@ -683,7 +680,7 @@ export const UpdateInProgress: React.FC<UpdateInProgressProps> = ({
         </UpdatesType>
         <UpdatesBar>
           <Progress
-            title={t('cluster-settings~{{updatedOperatorsCount}} of {{totalOperatorsCount}}', {
+            title={t('public~{{updatedOperatorsCount}} of {{totalOperatorsCount}}', {
               updatedOperatorsCount,
               totalOperatorsCount,
             })}
@@ -759,7 +756,7 @@ export const ClusterVersionDetailsTable: React.FC<ClusterVersionDetailsTableProp
               variant="info"
               isInline
               title={t(
-                'cluster-settings~This cluster is not currently requesting update notifications. To request update recommendations, configure a channel.',
+                'public~This cluster is not currently requesting update notifications. To request update recommendations, configure a channel.',
               )}
               className="co-alert"
             />
@@ -769,7 +766,7 @@ export const ClusterVersionDetailsTable: React.FC<ClusterVersionDetailsTableProp
               variant="danger"
               isInline
               title={t(
-                'cluster-settings~Version {{version}} not found in channel {{channel}}.  To request update recommendations, configure a channel that supports your version.',
+                'public~Version {{version}} not found in channel {{channel}}.  To request update recommendations, configure a channel that supports your version.',
                 { version: getLastCompletedUpdate(cv), channel: cv.spec.channel },
               )}
               className="co-alert"
@@ -790,7 +787,7 @@ export const ClusterVersionDetailsTable: React.FC<ClusterVersionDetailsTableProp
               <div className="co-cluster-settings__section">
                 <div className="co-cluster-settings__row">
                   <dl className="co-m-pane__details co-cluster-settings__details co-cluster-settings__details--status">
-                    <dt>{t('cluster-settings~Update status')}</dt>
+                    <dt>{t('public~Update status')}</dt>
                     <dd>
                       <UpdateStatus cv={cv} />
                     </dd>
@@ -852,21 +849,21 @@ export const ClusterVersionDetailsTable: React.FC<ClusterVersionDetailsTableProp
           <dl className="co-m-pane__details">
             {window.SERVER_FLAGS.branding !== 'okd' && window.SERVER_FLAGS.branding !== 'azure' && (
               <>
-                <dt>{t('cluster-settings~Subscription')}</dt>
+                <dt>{t('public~Subscription')}</dt>
                 <dd>
                   <ExternalLink
-                    text={t('cluster-settings~OpenShift Cluster Manager')}
+                    text={t('public~OpenShift Cluster Manager')}
                     href={getOCMLink(clusterID)}
                   />
                   .
                 </dd>
               </>
             )}
-            <dt>{t('cluster-settings~Cluster ID')}</dt>
+            <dt>{t('public~Cluster ID')}</dt>
             <dd className="co-break-all co-select-to-copy" data-test-id="cv-details-table-cid">
               {clusterID}
             </dd>
-            <dt>{t('cluster-settings~Desired release image')}</dt>
+            <dt>{t('public~Desired release image')}</dt>
             <dd className="co-break-all co-select-to-copy" data-test-id="cv-details-table-image">
               {imageParts.length === 2 ? (
                 <>
@@ -877,18 +874,18 @@ export const ClusterVersionDetailsTable: React.FC<ClusterVersionDetailsTableProp
                 desiredImage || '-'
               )}
             </dd>
-            <dt>{t('cluster-settings~Cluster version configuration')}</dt>
+            <dt>{t('public~Cluster version configuration')}</dt>
             <dd>
               <ResourceLink kind={referenceForModel(ClusterVersionModel)} name={cv.metadata.name} />
             </dd>
             {autoscalers && (
               <>
-                <dt>{t('cluster-settings~Cluster autoscaler')}</dt>
+                <dt>{t('public~Cluster autoscaler')}</dt>
                 <dd>
                   {_.isEmpty(autoscalers) ? (
                     <Link to={`${resourcePathFromModel(ClusterAutoscalerModel)}/~new`}>
                       <AddCircleOIcon className="co-icon-space-r" />
-                      {t('cluster-settings~Create autoscaler')}
+                      {t('public~Create autoscaler')}
                     </Link>
                   ) : (
                     autoscalers.map((autoscaler) => (
@@ -907,20 +904,20 @@ export const ClusterVersionDetailsTable: React.FC<ClusterVersionDetailsTableProp
         </div>
       </div>
       <div className="co-m-pane__body">
-        <SectionHeading text={t('cluster-settings~Update history')} />
+        <SectionHeading text={t('public~Update history')} />
         {_.isEmpty(history) ? (
-          <EmptyBox label={t('cluster-settings~History')} />
+          <EmptyBox label={t('public~History')} />
         ) : (
           <div className="co-table-container">
             <table className="table">
               <thead>
                 <tr>
-                  <th>{t('cluster-settings~Version')}</th>
-                  <th>{t('cluster-settings~State')}</th>
-                  <th>{t('cluster-settings~Started')}</th>
-                  <th>{t('cluster-settings~Completed')}</th>
+                  <th>{t('public~Version')}</th>
+                  <th>{t('public~State')}</th>
+                  <th>{t('public~Started')}</th>
+                  <th>{t('public~Completed')}</th>
                   {releaseNotes && (
-                    <th className="hidden-xs hidden-sm">{t('cluster-settings~Release notes')}</th>
+                    <th className="hidden-xs hidden-sm">{t('public~Release notes')}</th>
                   )}
                 </tr>
               </thead>
@@ -971,7 +968,7 @@ export const ClusterOperatorTabPage: React.FC<ClusterOperatorTabPageProps> = ({
 export const ClusterSettingsPage: React.FC<ClusterSettingsPageProps> = ({ match }) => {
   const { t } = useTranslation();
   const hasClusterAutoscaler = useFlag(FLAGS.CLUSTER_AUTOSCALER);
-  const title = t('cluster-settings~Cluster Settings');
+  const title = t('public~Cluster Settings');
   const resources: FirehoseResource[] = [
     { kind: clusterVersionReference, name: 'version', isList: false, prop: 'obj' },
   ];
@@ -987,7 +984,7 @@ export const ClusterSettingsPage: React.FC<ClusterSettingsPageProps> = ({ match
   const pages = [
     {
       href: '',
-      name: t('cluster-settings~Details'),
+      name: t('public~Details'),
       component: ClusterVersionDetailsTable,
     },
     {
@@ -997,7 +994,7 @@ export const ClusterSettingsPage: React.FC<ClusterSettingsPageProps> = ({ match
     },
     {
       href: 'globalconfig',
-      name: t('cluster-settings~Global configuration'),
+      name: t('public~Global configuration'),
       component: GlobalConfigPage,
     },
   ];
diff --git a/frontend/public/components/cluster-settings/cluster-version.tsx b/frontend/public/components/cluster-settings/cluster-version.tsx
index f7d6ad56e07..afe6a955a4a 100644
--- a/frontend/public/components/cluster-settings/cluster-version.tsx
+++ b/frontend/public/components/cluster-settings/cluster-version.tsx
@@ -18,12 +18,12 @@ const ClusterVersionDetails: React.FC<ClusterVersionDetailsProps> = ({ obj }) =>
     <>
       <div className="co-m-pane__body">
         <SectionHeading
-          text={t('cluster-version~{{resource}} details', { resource: ClusterVersionModel.label })}
+          text={t('public~{{resource}} details', { resource: ClusterVersionModel.label })}
         />
         <ResourceSummary resource={obj} />
       </div>
       <div className="co-m-pane__body">
-        <SectionHeading text={t('cluster-version~Conditions')} id="conditions" />
+        <SectionHeading text={t('public~Conditions')} id="conditions" />
         <Conditions conditions={conditions} />
       </div>
     </>
diff --git a/frontend/public/components/cluster-settings/global-config.tsx b/frontend/public/components/cluster-settings/global-config.tsx
index 7149ccd4777..4212940b8ff 100644
--- a/frontend/public/components/cluster-settings/global-config.tsx
+++ b/frontend/public/components/cluster-settings/global-config.tsx
@@ -32,11 +32,11 @@ const stateToProps = (state: RootState) => ({
 
 export const breadcrumbsForGlobalConfig = (detailsPageKind: string, detailsPagePath: string) => [
   {
-    name: i18next.t('details-page~Global configuration'),
+    name: i18next.t('public~Global configuration'),
     path: '/settings/cluster/globalconfig',
   },
   {
-    name: i18next.t('details-page~{{kind}} details', { kind: detailsPageKind }),
+    name: i18next.t('public~{{kind}} details', { kind: detailsPageKind }),
     path: detailsPagePath,
   },
 ];
diff --git a/frontend/public/components/conditions.tsx b/frontend/public/components/conditions.tsx
index 592a0fac7d7..27f729b8cf3 100644
--- a/frontend/public/components/conditions.tsx
+++ b/frontend/public/components/conditions.tsx
@@ -44,17 +44,17 @@ export const Conditions: React.FC<ConditionsProps> = ({ conditions }) => {
       {conditions?.length ? (
         <div className="co-m-table-grid co-m-table-grid--bordered">
           <div className="row co-m-table-grid__head">
-            <div className="col-xs-4 col-sm-2 col-md-2">{t('details-page~Type')}</div>
-            <div className="col-xs-4 col-sm-2 col-md-2">{t('details-page~Status')}</div>
-            <div className="hidden-xs hidden-sm col-md-2">{t('details-page~Updated')}</div>
-            <div className="col-xs-4 col-sm-3 col-md-2">{t('details-page~Reason')}</div>
-            <div className="hidden-xs col-sm-5 col-md-4">{t('details-page~Message')}</div>
+            <div className="col-xs-4 col-sm-2 col-md-2">{t('public~Type')}</div>
+            <div className="col-xs-4 col-sm-2 col-md-2">{t('public~Status')}</div>
+            <div className="hidden-xs hidden-sm col-md-2">{t('public~Updated')}</div>
+            <div className="col-xs-4 col-sm-3 col-md-2">{t('public~Reason')}</div>
+            <div className="hidden-xs col-sm-5 col-md-4">{t('public~Message')}</div>
           </div>
           <div className="co-m-table-grid__body">{rows}</div>
         </div>
       ) : (
         <div className="cos-status-box">
-          <div className="text-center">{t('details-page~No conditions found')}</div>
+          <div className="text-center">{t('public~No conditions found')}</div>
         </div>
       )}
     </>
diff --git a/frontend/public/components/custom-resource-definition.tsx b/frontend/public/components/custom-resource-definition.tsx
index 481a26c7371..bb68c99a0da 100644
--- a/frontend/public/components/custom-resource-definition.tsx
+++ b/frontend/public/components/custom-resource-definition.tsx
@@ -49,8 +49,8 @@ const crdInstancesPath = (crd: CustomResourceDefinitionKind) =>
     : `/k8s/cluster/${referenceForCRD(crd)}`;
 
 const instances = (kind: K8sKind, obj: CustomResourceDefinitionKind) => ({
-  // t('custom-resource-definition~View instances')
-  labelKey: 'custom-resource-definition~View instances',
+  // t('public~View instances')
+  labelKey: 'public~View instances',
   href: crdInstancesPath(obj),
 });
 
@@ -80,18 +80,18 @@ const Established: React.FC<{ crd: CustomResourceDefinitionKind }> = ({ crd }) =
   const { t } = useTranslation();
   return crd.status && isEstablished(crd.status.conditions) ? (
     <span>
-      <GreenCheckCircleIcon title={t('custom-resource-definition~true')} />
+      <GreenCheckCircleIcon title={t('public~true')} />
     </span>
   ) : (
     <span>
-      <BanIcon title={t('custom-resource-definition~false')} />
+      <BanIcon title={t('public~false')} />
     </span>
   );
 };
 
 const EmptyVersionsMsg: React.FC<{}> = () => {
   const { t } = useTranslation();
-  return <EmptyBox label={t('custom-resource-definition~CRD versions')} />;
+  return <EmptyBox label={t('public~CRD versions')} />;
 };
 
 const CRDVersionTable: React.FC<CRDVersionProps> = ({ versions }) => {
@@ -120,15 +120,15 @@ const CRDVersionTable: React.FC<CRDVersionProps> = ({ versions }) => {
   const { t } = useTranslation();
   const crdVersionTableHeaders = [
     {
-      title: t('custom-resource-definition~Name'),
+      title: t('public~Name'),
       transforms: [sortable],
     },
     {
-      title: t('custom-resource-definition~Served'),
+      title: t('public~Served'),
       transforms: [sortable],
     },
     {
-      title: t('custom-resource-definition~Storage'),
+      title: t('public~Storage'),
       transforms: [sortable],
     },
   ];
@@ -136,7 +136,7 @@ const CRDVersionTable: React.FC<CRDVersionProps> = ({ versions }) => {
   return versionRows.length > 0 ? (
     <PFTable
       variant={TableVariant.compact}
-      aria-label={t('custom-resource-definition~CRD versions')}
+      aria-label={t('public~CRD versions')}
       cells={crdVersionTableHeaders}
       rows={versionRows}
       onSort={onSort}
@@ -156,7 +156,7 @@ const Details: React.FC<{ obj: CustomResourceDefinitionKind }> = ({ obj: crd })
     <>
       <div className="co-m-pane__body">
         <SectionHeading
-          text={t('custom-resource-definition~{{resource}} details', {
+          text={t('public~{{resource}} details', {
             resource: CustomResourceDefinitionModel.label,
           })}
         />
@@ -167,33 +167,25 @@ const Details: React.FC<{ obj: CustomResourceDefinitionKind }> = ({ obj: crd })
             </div>
             <div className="col-sm-6">
               <dl className="co-m-pane__details">
-                <dt>{t('custom-resource-definition~Established')}</dt>
+                <dt>{t('public~Established')}</dt>
                 <dd>
                   <Established crd={crd} />
                 </dd>
-                <DetailsItem
-                  label={t('custom-resource-definition~Group')}
-                  obj={crd}
-                  path="spec.group"
-                />
-                <dt>{t('custom-resource-definition~Latest version')}</dt>
+                <DetailsItem label={t('public~Group')} obj={crd} path="spec.group" />
+                <dt>{t('public~Latest version')}</dt>
                 <dd>{getLatestVersionForCRD(crd)}</dd>
-                <DetailsItem
-                  label={t('custom-resource-definition~Scope')}
-                  obj={crd}
-                  path="spec.scope"
-                />
+                <DetailsItem label={t('public~Scope')} obj={crd} path="spec.scope" />
               </dl>
             </div>
           </div>
         </div>
       </div>
       <div className="co-m-pane__body">
-        <SectionHeading text={t('custom-resource-definition~Conditions')} />
+        <SectionHeading text={t('public~Conditions')} />
         <Conditions conditions={crd.status.conditions} />
       </div>
       <div className="co-m-pane__body">
-        <SectionHeading text={t('custom-resource-definition~Versions')} />
+        <SectionHeading text={t('public~Versions')} />
         <CRDVersionTable versions={crd.spec.versions} />
       </div>
     </>
@@ -224,31 +216,31 @@ export const CustomResourceDefinitionsList: React.FC<CustomResourceDefinitionsLi
   const CRDTableHeader = () => {
     return [
       {
-        title: t('custom-resource-definition~Name'),
+        title: t('public~Name'),
         sortField: 'spec.names.kind',
         transforms: [sortable],
         props: { className: tableColumnClasses[0] },
       },
       {
-        title: t('custom-resource-definition~Group'),
+        title: t('public~Group'),
         sortField: 'spec.group',
         transforms: [sortable],
         props: { className: tableColumnClasses[1] },
       },
       {
-        title: t('custom-resource-definition~Latest version'),
+        title: t('public~Latest version'),
         sortFunc: 'crdLatestVersion',
         transforms: [sortable],
         props: { className: tableColumnClasses[2] },
       },
       {
-        title: t('custom-resource-definition~Namespaced'),
+        title: t('public~Namespaced'),
         sortField: 'spec.scope',
         transforms: [sortable],
         props: { className: tableColumnClasses[3] },
       },
       {
-        title: t('custom-resource-definition~Established'),
+        title: t('public~Established'),
         props: { className: tableColumnClasses[4] },
       },
       {
@@ -280,9 +272,7 @@ export const CustomResourceDefinitionsList: React.FC<CustomResourceDefinitionsLi
         </TableData>
         <TableData className={tableColumnClasses[2]}>{getLatestVersionForCRD(crd)}</TableData>
         <TableData className={tableColumnClasses[3]}>
-          {namespaced(crd)
-            ? t('custom-resource-definition~Yes')
-            : t('custom-resource-definition~No')}
+          {namespaced(crd) ? t('public~Yes') : t('public~No')}
         </TableData>
         <TableData className={tableColumnClasses[4]}>
           <Established crd={crd} />
@@ -331,7 +321,7 @@ export const CustomResourceDefinitionsDetailsPage: React.FC<CustomResourceDefini
         navFactory.details(Details),
         navFactory.editYaml(),
         {
-          name: t('custom-resource-definition~Instances'),
+          name: t('public~Instances'),
           href: 'instances',
           component: Instances,
         },
diff --git a/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/activity-card.tsx b/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/activity-card.tsx
index 91b5184f2b0..2288d8d9261 100644
--- a/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/activity-card.tsx
+++ b/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/activity-card.tsx
@@ -177,8 +177,8 @@ export const ActivityCard: React.FC<{}> = React.memo(() => {
   return (
     <DashboardCard gradient data-test-id="activity-card">
       <DashboardCardHeader>
-        <DashboardCardTitle>{t('dashboard~Activity')}</DashboardCardTitle>
-        <DashboardCardLink to={viewEvents}>{t('dashboard~View events')}</DashboardCardLink>
+        <DashboardCardTitle>{t('public~Activity')}</DashboardCardTitle>
+        <DashboardCardLink to={viewEvents}>{t('public~View events')}</DashboardCardLink>
       </DashboardCardHeader>
       <DashboardCardBody>
         <ActivityBody className="co-overview-dashboard__activity-body">
diff --git a/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/details-card.tsx b/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/details-card.tsx
index 268f3e1b640..833bc9623f0 100644
--- a/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/details-card.tsx
+++ b/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/details-card.tsx
@@ -60,7 +60,7 @@ const ClusterVersion: React.FC<ClusterVersionProps> = ({ cv }) => {
           <div>
             <Link to="/settings/cluster/">
               <InProgressIcon className="co-icon-and-text__icon" />
-              {t('dashboard~Updating')}
+              {t('public~Updating')}
             </Link>
           </div>
         </>
@@ -73,7 +73,7 @@ const ClusterVersion: React.FC<ClusterVersionProps> = ({ cv }) => {
             <div>
               <Link to="/settings/cluster?showVersions">
                 <BlueArrowCircleUpIcon className="co-icon-space-r" />
-                {t('dashboard~Update cluster')}
+                {t('public~Update cluster')}
               </Link>
             </div>
           )}
@@ -83,7 +83,7 @@ const ClusterVersion: React.FC<ClusterVersionProps> = ({ cv }) => {
       return lastVersion ? (
         <span className="co-select-to-copy">{lastVersion}</span>
       ) : (
-        <span className="text-secondary">{t('dashboard~Not available')}</span>
+        <span className="text-secondary">{t('public~Not available')}</span>
       );
   }
 };
@@ -138,17 +138,15 @@ export const DetailsCard_ = connect(mapStateToProps)(
     return (
       <DashboardCard data-test-id="details-card">
         <DashboardCardHeader>
-          <DashboardCardTitle>{t('dashboard~Details')}</DashboardCardTitle>
-          <DashboardCardLink to="/settings/cluster/">
-            {t('dashboard~View settings')}
-          </DashboardCardLink>
+          <DashboardCardTitle>{t('public~Details')}</DashboardCardTitle>
+          <DashboardCardLink to="/settings/cluster/">{t('public~View settings')}</DashboardCardLink>
         </DashboardCardHeader>
         <DashboardCardBody isLoading={flagPending(openshiftFlag)}>
           <DetailsBody>
             {openshiftFlag ? (
               <>
                 <DetailItem
-                  title={t('dashboard~Cluster API address')}
+                  title={t('public~Cluster API address')}
                   isLoading={!infrastructureLoaded}
                   error={!!infrastructureError || (infrastructure && !infrastuctureApiUrl)}
                   valueClassName="co-select-to-copy"
@@ -156,7 +154,7 @@ export const DetailsCard_ = connect(mapStateToProps)(
                   {infrastuctureApiUrl}
                 </DetailItem>
                 <DetailItem
-                  title={t('dashboard~Cluster ID')}
+                  title={t('public~Cluster ID')}
                   error={!!clusterVersionError || (clusterVersionLoaded && !clusterId)}
                   isLoading={!clusterVersionLoaded}
                 >
@@ -164,13 +162,13 @@ export const DetailsCard_ = connect(mapStateToProps)(
                   {window.SERVER_FLAGS.branding !== 'okd' &&
                     window.SERVER_FLAGS.branding !== 'azure' && (
                       <ExternalLink
-                        text={t('dashboard~OpenShift Cluster Manager')}
+                        text={t('public~OpenShift Cluster Manager')}
                         href={getOCMLink(clusterId)}
                       />
                     )}
                 </DetailItem>
                 <DetailItem
-                  title={t('dashboard~Provider')}
+                  title={t('public~Provider')}
                   error={!!infrastructureError || (infrastructure && !infrastructurePlatform)}
                   isLoading={!infrastructureLoaded}
                   valueClassName="co-select-to-copy"
@@ -178,14 +176,14 @@ export const DetailsCard_ = connect(mapStateToProps)(
                   {infrastructurePlatform}
                 </DetailItem>
                 <DetailItem
-                  title={t('dashboard~OpenShift version')}
+                  title={t('public~OpenShift version')}
                   error={!!clusterVersionError || (clusterVersionLoaded && !openShiftVersion)}
                   isLoading={!clusterVersionLoaded}
                 >
                   <ClusterVersion cv={clusterVersionData} />
                 </DetailItem>
                 <DetailItem
-                  title={t('dashboard~Update channel')}
+                  title={t('public~Update channel')}
                   isLoading={!clusterVersionLoaded && !clusterVersionError}
                   error={!!clusterVersionError || (clusterVersionLoaded && !cvChannel)}
                   valueClassName="co-select-to-copy"
@@ -194,18 +192,18 @@ export const DetailsCard_ = connect(mapStateToProps)(
                 </DetailItem>
                 {isSingleNode(infrastructure) && (
                   <DetailItem
-                    title={t('dashboard~Control plane high availability')}
+                    title={t('public~Control plane high availability')}
                     isLoading={false}
                     valueClassName="co-select-to-copy"
                   >
-                    {t('dashboard~No (single master)')}
+                    {t('public~No (single master)')}
                   </DetailItem>
                 )}
               </>
             ) : (
               <DetailItem
                 key="kubernetes"
-                title={t('dashboard~Kubernetes version')}
+                title={t('public~Kubernetes version')}
                 error={!!k8sVersionError || (k8sVersion && !k8sGitVersion)}
                 isLoading={!k8sVersion}
                 valueClassName="co-select-to-copy"
diff --git a/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/health-item.tsx b/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/health-item.tsx
index f3ba2d21b46..c0a024f0a49 100644
--- a/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/health-item.tsx
+++ b/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/health-item.tsx
@@ -54,7 +54,7 @@ export const OperatorsPopup: React.FC<OperatorsPopupProps> = ({
   return (
     <>
       {t(
-        'dashboard~Operators create, configure, and manage applications by extending the Kubernetes API.',
+        'public~Operators create, configure, and manage applications by extending the Kubernetes API.',
       )}
       {sections}
     </>
@@ -100,10 +100,10 @@ export const OperatorHealthItem = withDashboardResources<OperatorHealthItemProps
 
     return (
       <HealthItem
-        title={t('dashboard~Operators')}
+        title={t('public~Operators')}
         state={operatorsHealth.health}
         details={operatorsHealth.detailMessage}
-        popupTitle={t('dashboard~Operator status')}
+        popupTitle={t('public~Operator status')}
       >
         <OperatorsPopup resources={resources} operatorExtensions={operatorExtensions} />
       </HealthItem>
diff --git a/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/inventory-card.tsx b/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/inventory-card.tsx
index f443cb02756..1a87e8e4fad 100644
--- a/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/inventory-card.tsx
+++ b/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/inventory-card.tsx
@@ -125,7 +125,7 @@ export const InventoryCard = () => {
   return (
     <DashboardCard data-test-id="inventory-card">
       <DashboardCardHeader>
-        <DashboardCardTitle>{t('dashboard~Cluster inventory')}</DashboardCardTitle>
+        <DashboardCardTitle>{t('public~Cluster inventory')}</DashboardCardTitle>
       </DashboardCardHeader>
       <DashboardCardBody>
         {mergedItems.map((item) => (
diff --git a/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/status-card.tsx b/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/status-card.tsx
index ee8ee8f23b5..329dc4293cc 100644
--- a/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/status-card.tsx
+++ b/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/status-card.tsx
@@ -108,9 +108,9 @@ const ClusterAlerts = withDashboardResources(
         <StatusItem
           key="clusterUpdate"
           Icon={UpdateIcon}
-          message={t('dashboard~A cluster version update is available')}
+          message={t('public~A cluster version update is available')}
         >
-          <Link to="/settings/cluster?showVersions">{t('dashboard~Update cluster')}</Link>
+          <Link to="/settings/cluster?showVersions">{t('public~Update cluster')}</Link>
         </StatusItem>,
       );
     }
@@ -183,8 +183,8 @@ export const StatusCard = connect<StatusCardProps>(mapStateToProps)(({ k8sModels
   return (
     <DashboardCard gradient data-test-id="status-card">
       <DashboardCardHeader>
-        <DashboardCardTitle>{t('dashboard~Status')}</DashboardCardTitle>
-        <DashboardCardLink to="/monitoring/alerts">{t('dashboard~View alerts')}</DashboardCardLink>
+        <DashboardCardTitle>{t('public~Status')}</DashboardCardTitle>
+        <DashboardCardLink to="/monitoring/alerts">{t('public~View alerts')}</DashboardCardLink>
       </DashboardCardHeader>
       <DashboardCardBody>
         <HealthBody>
diff --git a/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/utilization-card.tsx b/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/utilization-card.tsx
index 02ef1dfd5fd..6e7fce9cffd 100644
--- a/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/utilization-card.tsx
+++ b/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/utilization-card.tsx
@@ -376,7 +376,7 @@ export const UtilizationCard = () => {
   const cpuPopover = React.useCallback(
     React.memo<TopConsumerPopoverProp>(({ current }) => (
       <ConsumerPopover
-        title={t('dashboard~CPU')}
+        title={t('public~CPU')}
         current={current}
         consumers={cpuQueriesPopup}
         humanize={humanizeCpuCores}
@@ -389,7 +389,7 @@ export const UtilizationCard = () => {
   const memPopover = React.useCallback(
     React.memo<TopConsumerPopoverProp>(({ current }) => (
       <ConsumerPopover
-        title={t('dashboard~Memory')}
+        title={t('public~Memory')}
         current={current}
         consumers={memQueriesPopup}
         humanize={humanizeBinaryBytes}
@@ -402,7 +402,7 @@ export const UtilizationCard = () => {
   const storagePopover = React.useCallback(
     React.memo<TopConsumerPopoverProp>(({ current }) => (
       <ConsumerPopover
-        title={t('dashboard~Filesystem')}
+        title={t('public~Filesystem')}
         current={current}
         consumers={storageQueriesPopup}
         humanize={humanizeBinaryBytes}
@@ -415,7 +415,7 @@ export const UtilizationCard = () => {
   const podPopover = React.useCallback(
     React.memo<TopConsumerPopoverProp>(({ current }) => (
       <ConsumerPopover
-        title={t('dashboard~Pod count')}
+        title={t('public~Pod count')}
         current={current}
         consumers={podQueriesPopup}
         humanize={humanizeNumber}
@@ -428,7 +428,7 @@ export const UtilizationCard = () => {
   const networkInPopover = React.useCallback(
     React.memo<TopConsumerPopoverProp>(({ current }) => (
       <ConsumerPopover
-        title={t('dashboard~Network in')}
+        title={t('public~Network in')}
         current={current}
         consumers={networkInQueriesPopup}
         humanize={humanizeDecimalBytesPerSec}
@@ -441,7 +441,7 @@ export const UtilizationCard = () => {
   const networkOutPopover = React.useCallback(
     React.memo<TopConsumerPopoverProp>(({ current }) => (
       <ConsumerPopover
-        title={t('dashboard~Network out')}
+        title={t('public~Network out')}
         current={current}
         consumers={networkOutQueriesPopup}
         humanize={humanizeDecimalBytesPerSec}
@@ -454,7 +454,7 @@ export const UtilizationCard = () => {
   return (
     <DashboardCard data-test-id="utilization-card">
       <DashboardCardHeader>
-        <DashboardCardTitle>{t('dashboard~Cluster utilization')}</DashboardCardTitle>
+        <DashboardCardTitle>{t('public~Cluster utilization')}</DashboardCardTitle>
         <Dropdown
           items={Duration(t)}
           onChange={setDuration}
@@ -464,7 +464,7 @@ export const UtilizationCard = () => {
       </DashboardCardHeader>
       <UtilizationBody timestamps={timestamps}>
         <PrometheusUtilizationItem
-          title={t('dashboard~CPU')}
+          title={t('public~CPU')}
           utilizationQuery={queries[OverviewQuery.CPU_UTILIZATION].utilization}
           totalQuery={queries[OverviewQuery.CPU_UTILIZATION].total}
           requestQuery={queries[OverviewQuery.CPU_UTILIZATION].requests}
@@ -474,7 +474,7 @@ export const UtilizationCard = () => {
           setTimestamps={setTimestamps}
         />
         <PrometheusUtilizationItem
-          title={t('dashboard~Memory')}
+          title={t('public~Memory')}
           utilizationQuery={queries[OverviewQuery.MEMORY_UTILIZATION].utilization}
           totalQuery={queries[OverviewQuery.MEMORY_UTILIZATION].total}
           requestQuery={queries[OverviewQuery.MEMORY_UTILIZATION].requests}
@@ -484,7 +484,7 @@ export const UtilizationCard = () => {
           byteDataType={ByteDataTypes.BinaryBytes}
         />
         <PrometheusUtilizationItem
-          title={t('dashboard~Filesystem')}
+          title={t('public~Filesystem')}
           utilizationQuery={queries[OverviewQuery.STORAGE_UTILIZATION].utilization}
           totalQuery={queries[OverviewQuery.STORAGE_UTILIZATION].total}
           TopConsumerPopover={storagePopover}
@@ -493,14 +493,14 @@ export const UtilizationCard = () => {
           byteDataType={ByteDataTypes.BinaryBytes}
         />
         <PrometheusMultilineUtilizationItem
-          title={t('dashboard~Network transfer')}
+          title={t('public~Network transfer')}
           queries={multilineQueries[OverviewQuery.NETWORK_UTILIZATION]}
           duration={duration}
           humanizeValue={humanizeDecimalBytesPerSec}
           TopConsumerPopovers={[networkInPopover, networkOutPopover]}
         />
         <PrometheusUtilizationItem
-          title={t('dashboard~Pod count')}
+          title={t('public~Pod count')}
           utilizationQuery={queries[OverviewQuery.POD_UTILIZATION].utilization}
           TopConsumerPopover={podPopover}
           duration={duration}
diff --git a/frontend/public/components/dashboard/dashboards-page/dashboards.tsx b/frontend/public/components/dashboard/dashboards-page/dashboards.tsx
index 5cb73e05f86..6825157eb24 100644
--- a/frontend/public/components/dashboard/dashboards-page/dashboards.tsx
+++ b/frontend/public/components/dashboard/dashboards-page/dashboards.tsx
@@ -59,7 +59,7 @@ export const getPluginTabPages = (
 
 const DashboardsPage_: React.FC<DashboardsPageProps> = ({ match, kindsInFlight, k8sModels }) => {
   const { t } = useTranslation();
-  const title = t('dashboard~Overview');
+  const title = t('public~Overview');
   const tabExtensions = useExtensions<DashboardsTab>(isDashboardsTab);
   const cardExtensions = useExtensions<DashboardsCard>(isDashboardsCard);
 
@@ -72,7 +72,7 @@ const DashboardsPage_: React.FC<DashboardsPageProps> = ({ match, kindsInFlight,
     () => [
       {
         href: '',
-        name: t('dashboard~Cluster'),
+        name: t('public~Cluster'),
         component: ClusterDashboard,
       },
       ...pluginPages,
diff --git a/frontend/public/components/deployment-config.tsx b/frontend/public/components/deployment-config.tsx
index bd65c929d64..5bebeb2d5d0 100644
--- a/frontend/public/components/deployment-config.tsx
+++ b/frontend/public/components/deployment-config.tsx
@@ -273,13 +273,13 @@ const ReplicationControllersTab: React.FC<ReplicationControllersTabProps> = ({ o
     />
   );
 };
-// t('details-page~ReplicationControllers')
+// t('public~ReplicationControllers')
 const pages = [
   navFactory.details(DeploymentConfigsDetails),
   navFactory.editYaml(),
   {
     href: 'replicationcontrollers',
-    nameKey: 'details-page~ReplicationControllers',
+    nameKey: 'public~ReplicationControllers',
     component: ReplicationControllersTab,
   },
   navFactory.pods(),
diff --git a/frontend/public/components/deployment.tsx b/frontend/public/components/deployment.tsx
index 79ed05264fe..61d338a31f5 100644
--- a/frontend/public/components/deployment.tsx
+++ b/frontend/public/components/deployment.tsx
@@ -225,7 +225,7 @@ export const DeploymentsDetailsPage: React.FC<DeploymentsDetailsPageProps> = (pr
   const ns = useSelector((state: RootState) => getActiveNamespace(state));
 
   const { csvData } = useCsvWatchResource(ns);
-  // t('details-page~ReplicaSets')
+  // t('public~ReplicaSets')
   return (
     <DetailsPage
       {...props}
@@ -236,7 +236,7 @@ export const DeploymentsDetailsPage: React.FC<DeploymentsDetailsPageProps> = (pr
         editYaml(),
         {
           href: 'replicasets',
-          nameKey: 'details-page~ReplicaSets',
+          nameKey: 'public~ReplicaSets',
           component: ReplicaSetsTab,
         },
         pods(),
diff --git a/frontend/public/components/modals/add-users-modal.tsx b/frontend/public/components/modals/add-users-modal.tsx
index 8b1021acd1c..8b2d1148993 100644
--- a/frontend/public/components/modals/add-users-modal.tsx
+++ b/frontend/public/components/modals/add-users-modal.tsx
@@ -28,20 +28,15 @@ export const AddUsersModal = withHandlePromise((props: AddUsersModalProps) => {
 
   return (
     <form onSubmit={submit} name="form" className="modal-content ">
-      <ModalTitle>{t('add-users-modal~Add users')}</ModalTitle>
+      <ModalTitle>{t('public~Add users')}</ModalTitle>
       <ModalBody>
-        <p>{t('add-users-modal~Add new Users to Group {name}.', props.group.metadata)}</p>
-        <ListInput
-          label={t('add-users-modal~Users')}
-          required
-          initialValues={values}
-          onChange={setValues}
-        />
+        <p>{t('public~Add new Users to Group {name}.', props.group.metadata)}</p>
+        <ListInput label={t('public~Users')} required initialValues={values} onChange={setValues} />
       </ModalBody>
       <ModalSubmitFooter
         errorMessage={props.errorMessage}
         inProgress={props.inProgress}
-        submitText={t('add-users-modal~Save')}
+        submitText={t('public~Save')}
         cancel={props.cancel}
       />
     </form>
diff --git a/frontend/public/components/modals/cluster-channel-modal.tsx b/frontend/public/components/modals/cluster-channel-modal.tsx
index f0ebccfe015..a1187e8d309 100644
--- a/frontend/public/components/modals/cluster-channel-modal.tsx
+++ b/frontend/public/components/modals/cluster-channel-modal.tsx
@@ -40,25 +40,23 @@ const ClusterChannelModal = withHandlePromise((props: ClusterChannelModalProps)
   return (
     <form onSubmit={submit} name="form" className="modal-content modal-content--no-inner-scroll">
       <ModalTitle>
-        {channelsExist
-          ? t('cluster-channel-modal~Select channel')
-          : t('cluster-channel-modal~Input channel')}
+        {channelsExist ? t('public~Select channel') : t('public~Input channel')}
       </ModalTitle>
       <ModalBody>
         <p>
           {channelsExist
             ? t(
-                'cluster-channel-modal~The current version is available in the channels listed in the dropdown below. Select a channel that reflects the desired version. Critical security updates will be delivered to any vulnerable channels.',
+                'public~The current version is available in the channels listed in the dropdown below. Select a channel that reflects the desired version. Critical security updates will be delivered to any vulnerable channels.',
               )
             : t(
-                'cluster-channel-modal~Input a channel that reflects the desired version. To verify if the version exists in a channel, save and check the update status. Critical security updates will be delivered to any vulnerable channels.',
+                'public~Input a channel that reflects the desired version. To verify if the version exists in a channel, save and check the update status. Critical security updates will be delivered to any vulnerable channels.',
               )}
         </p>
         <p>
           <ChannelDocLink />
         </p>
         <div className="form-group">
-          <label htmlFor="channel">{t('cluster-channel-modal~Channel')}</label>
+          <label htmlFor="channel">{t('public~Channel')}</label>
           {channelsExist ? (
             <Dropdown
               className="cluster-channel-modal__dropdown"
@@ -66,7 +64,7 @@ const ClusterChannelModal = withHandlePromise((props: ClusterChannelModalProps)
               items={availableChannels}
               onChange={(newChannel: string) => setChannel(newChannel)}
               selectedKey={channel}
-              title={t('cluster-channel-modal~Channel')}
+              title={t('public~Channel')}
             />
           ) : (
             <>
@@ -74,19 +72,16 @@ const ClusterChannelModal = withHandlePromise((props: ClusterChannelModalProps)
                 id="channel"
                 onChange={(newChannel) => setChannel(newChannel)}
                 value={channel}
-                placeholder={t(`cluster-channel-modal~e.g., {{version}}`, {
+                placeholder={t(`public~e.g., {{version}}`, {
                   version: `stable-${version.major}.${version.minor}`,
                 })}
               />
               <p className="help-block">
-                {t(
-                  `cluster-channel-modal~Potential channels are {{stable}}, {{fast}}, or {{candidate}}.`,
-                  {
-                    stable: `stable-${version.major}.${version.minor}`,
-                    fast: `fast-${version.major}.${version.minor}`,
-                    candidate: `candidate-${version.major}.${version.minor}`,
-                  },
-                )}
+                {t(`public~Potential channels are {{stable}}, {{fast}}, or {{candidate}}.`, {
+                  stable: `stable-${version.major}.${version.minor}`,
+                  fast: `fast-${version.major}.${version.minor}`,
+                  candidate: `candidate-${version.major}.${version.minor}`,
+                })}
               </p>
             </>
           )}
diff --git a/frontend/public/components/modals/cluster-update-modal.tsx b/frontend/public/components/modals/cluster-update-modal.tsx
index e5856e98edd..46c3e965eea 100644
--- a/frontend/public/components/modals/cluster-update-modal.tsx
+++ b/frontend/public/components/modals/cluster-update-modal.tsx
@@ -58,21 +58,21 @@ const ClusterUpdateModal = withHandlePromise((props: ClusterUpdateModalProps) =>
 
   return (
     <form onSubmit={submit} name="form" className="modal-content modal-content--no-inner-scroll">
-      <ModalTitle>{t('cluster-update-modal~Update cluster')}</ModalTitle>
+      <ModalTitle>{t('public~Update cluster')}</ModalTitle>
       <ModalBody>
         <div className="form-group">
-          <label>{t('cluster-update-modal~Current version')}</label>
+          <label>{t('public~Current version')}</label>
           <p>{currentVersion}</p>
         </div>
         <div className="form-group">
-          <label htmlFor="version_dropdown">{t('cluster-update-modal~Select new version')}</label>
+          <label htmlFor="version_dropdown">{t('public~Select new version')}</label>
           <Dropdown
             className="cluster-update-modal__dropdown"
             id="version_dropdown"
             items={dropdownItems}
             onChange={(newDesiredVersion: string) => setDesiredVersion(newDesiredVersion)}
             selectedKey={desiredVersion}
-            title={t('cluster-update-modal~Select version')}
+            title={t('public~Select version')}
           />
         </div>
       </ModalBody>
diff --git a/frontend/public/components/namespace.jsx b/frontend/public/components/namespace.jsx
index 31b55ed7b18..db4b728db54 100644
--- a/frontend/public/components/namespace.jsx
+++ b/frontend/public/components/namespace.jsx
@@ -1067,7 +1067,7 @@ class NamespaceBarDropdowns_ extends React.Component {
     const { loaded, data } = this.props.namespace;
     const model = getModel(useProjects);
     const allNamespacesTitle =
-      model.label === 'Project' ? t('dropdown~All Projects') : t('dropdown~All Namespaces');
+      model.label === 'Project' ? t('public~All Projects') : t('public~All Namespaces');
     const items = {};
     if (canListNS) {
       items[ALL_NAMESPACES_KEY] = allNamespacesTitle;
@@ -1120,15 +1120,15 @@ class NamespaceBarDropdowns_ extends React.Component {
           canFavorite
           items={items}
           actionItems={defaultActionItem}
-          titlePrefix={model.label === 'Project' ? t('dropdown~Project') : t('dropdown~Namespace')}
+          titlePrefix={model.label === 'Project' ? t('public~Project') : t('public~Namespace')}
           title={title}
           onChange={onChange}
           selectedKey={activeNamespace || ALL_NAMESPACES_KEY}
           autocompleteFilter={autocompleteFilter}
           autocompletePlaceholder={
             model.label === 'Project'
-              ? t('dropdown~Select Project...')
-              : t('dropdown~Select Namespace...')
+              ? t('public~Select Project...')
+              : t('public~Select Namespace...')
           }
           userSettingsPrefix={NAMESPACE_USERSETTINGS_PREFIX}
           storageKey={NAMESPACE_LOCAL_STORAGE_KEY}
diff --git a/frontend/public/components/persistent-volume-claim.jsx b/frontend/public/components/persistent-volume-claim.jsx
index 15313c9f183..c4f1c30a483 100644
--- a/frontend/public/components/persistent-volume-claim.jsx
+++ b/frontend/public/components/persistent-volume-claim.jsx
@@ -55,7 +55,7 @@ const menuActions = [
   ModifyAnnotations,
   Edit,
   (kind, obj) => ({
-    label: i18next.t('details-page~Delete PersistentVolumeClaim'),
+    label: i18next.t('public~Delete PersistentVolumeClaim'),
     callback: () =>
       deletePVCModal({
         pvc: obj,
diff --git a/frontend/public/components/pod.tsx b/frontend/public/components/pod.tsx
index 936c479910d..9f363602498 100644
--- a/frontend/public/components/pod.tsx
+++ b/frontend/public/components/pod.tsx
@@ -772,7 +772,7 @@ export const PodExecLoader: React.FC<PodExecLoaderProps> = ({ obj, message }) =>
 );
 
 export const PodsDetailsPage: React.FC<PodDetailsPageProps> = (props) => {
-  // t('details-page~Terminal')
+  // t('public~Terminal')
   return (
     <DetailsPage
       {...props}
@@ -786,7 +786,7 @@ export const PodsDetailsPage: React.FC<PodDetailsPageProps> = (props) => {
         navFactory.events(ResourceEventStream),
         {
           href: 'terminal',
-          nameKey: 'details-page~Terminal',
+          nameKey: 'public~Terminal',
           component: PodExecLoader,
         },
       ]}
diff --git a/frontend/public/components/utils/breadcrumbs.ts b/frontend/public/components/utils/breadcrumbs.ts
index 1d48be0fc0a..eed12bcf0d0 100644
--- a/frontend/public/components/utils/breadcrumbs.ts
+++ b/frontend/public/components/utils/breadcrumbs.ts
@@ -24,7 +24,7 @@ export const breadcrumbsForDetailsPage = (kindObj: K8sKind, match: any) => () =>
           path: getBreadcrumbPath(match),
         },
         {
-          name: i18next.t('details-page~{{kind}} details', {
+          name: i18next.t('public~{{kind}} details', {
             kind: i18next.t(kindObj.labelKey) || kindObj.label,
           }),
           path: `${match.url}`,
diff --git a/frontend/public/components/utils/build-strategy.tsx b/frontend/public/components/utils/build-strategy.tsx
index 937058519ee..b4a5fe55a7d 100644
--- a/frontend/public/components/utils/build-strategy.tsx
+++ b/frontend/public/components/utils/build-strategy.tsx
@@ -28,25 +28,21 @@ export const BuildStrategy: React.SFC<BuildStrategyProps> = ({ resource, childre
   return (
     <dl className="co-m-pane__details">
       {children}
-      <DetailsItem label={t('build-strategy~Type')} obj={resource} path="spec.strategy.type" />
+      <DetailsItem label={t('public~Type')} obj={resource} path="spec.strategy.type" />
       <DetailsItem
-        label={t('build-strategy~Git repository')}
+        label={t('public~Git repository')}
         obj={resource}
         path="spec.source.git.uri"
         hideEmpty
       />
       <DetailsItem
-        label={t('build-strategy~Git ref')}
+        label={t('public~Git ref')}
         obj={resource}
         path="spec.source.git.ref"
         hideEmpty
       />
       {commitMessage && (
-        <DetailsItem
-          label={t('build-strategy~Git commit')}
-          obj={resource}
-          path="spec.revision.git.message"
-        >
+        <DetailsItem label={t('public~Git commit')} obj={resource} path="spec.revision.git.message">
           {commitMessage}
           <br />
           {commitHash && <code>{commitHash.substring(0, 7)}</code>}{' '}
@@ -54,23 +50,19 @@ export const BuildStrategy: React.SFC<BuildStrategyProps> = ({ resource, childre
         </DetailsItem>
       )}
       <DetailsItem
-        label={t('build-strategy~Binary file')}
+        label={t('public~Binary file')}
         obj={resource}
         path="spec.source.binary.asFile"
         hideEmpty
       />
       <DetailsItem
-        label={t('build-strategy~Context dir')}
+        label={t('public~Context dir')}
         obj={resource}
         path="spec.source.contextDir"
         hideEmpty
       />
       {dockerfile && (
-        <DetailsItem
-          label={t('build-strategy~Dockerfile')}
-          obj={resource}
-          path="spec.source.dockerfile"
-        >
+        <DetailsItem label={t('public~Dockerfile')} obj={resource} path="spec.source.dockerfile">
           <pre>{dockerfile}</pre>
         </DetailsItem>
       )}
@@ -81,7 +73,7 @@ export const BuildStrategy: React.SFC<BuildStrategyProps> = ({ resource, childre
       )}
       {jenkinsfile && (
         <DetailsItem
-          label={t('build-strategy~Dockerfile')}
+          label={t('public~Dockerfile')}
           obj={resource}
           path="spec.strategy.jenkinsPipelineStrategy.jenkinsfile"
         >
@@ -89,13 +81,13 @@ export const BuildStrategy: React.SFC<BuildStrategyProps> = ({ resource, childre
         </DetailsItem>
       )}
       <DetailsItem
-        label={t('build-strategy~JenskinsFile path')}
+        label={t('public~JenskinsFile path')}
         obj={resource}
         path="spec.strategy.jenkinsPipelineStrategy.jenkinsfilePath"
         hideEmpty
       />
       {buildFrom && buildFrom.kind === 'ImageStreamTag' && (
-        <DetailsItem label={t('build-strategy~Build from')} obj={resource} path={buildFromPath}>
+        <DetailsItem label={t('public~Build from')} obj={resource} path={buildFromPath}>
           <ResourceLink
             kind={ImageStreamTagsReference}
             name={buildFrom.name}
@@ -105,12 +97,12 @@ export const BuildStrategy: React.SFC<BuildStrategyProps> = ({ resource, childre
         </DetailsItem>
       )}
       {buildFrom && buildFrom.kind === 'DockerImage' && (
-        <DetailsItem label={t('build-strategy~Build from')} obj={resource} path={buildFromPath}>
+        <DetailsItem label={t('public~Build from')} obj={resource} path={buildFromPath}>
           {buildFrom.name}
         </DetailsItem>
       )}
       {outputTo && outputTo.kind === 'ImageStreamTag' && (
-        <DetailsItem label={t('build-strategy~Output to')} obj={resource} path="spec.output.to">
+        <DetailsItem label={t('public~Output to')} obj={resource} path="spec.output.to">
           <ResourceLink
             kind={ImageStreamTagsReference}
             name={outputTo.name}
@@ -120,16 +112,12 @@ export const BuildStrategy: React.SFC<BuildStrategyProps> = ({ resource, childre
         </DetailsItem>
       )}
       {outputTo && outputTo.kind === 'DockerImage' && (
-        <DetailsItem label={t('build-strategy~Output to')} obj={resource} path="spec.output.to">
+        <DetailsItem label={t('public~Output to')} obj={resource} path="spec.output.to">
           {outputTo.name}
         </DetailsItem>
       )}
       {pushSecret && (
-        <DetailsItem
-          label={t('build-strategy~Push secret')}
-          obj={resource}
-          path="spec.output.pushSecret"
-        >
+        <DetailsItem label={t('public~Push secret')} obj={resource} path="spec.output.pushSecret">
           <ResourceLink
             kind="Secret"
             name={pushSecret.name}
@@ -138,15 +126,10 @@ export const BuildStrategy: React.SFC<BuildStrategyProps> = ({ resource, childre
           />
         </DetailsItem>
       )}
-      <DetailsItem
-        label={t('build-strategy~Run policy')}
-        obj={resource}
-        path="spec.runPolicy"
-        hideEmpty
-      />
+      <DetailsItem label={t('public~Run policy')} obj={resource} path="spec.runPolicy" hideEmpty />
       {resourceLimits && (
         <DetailsItem
-          label={t('build-strategy~Resource limits')}
+          label={t('public~Resource limits')}
           obj={resource}
           path="spec.resources.limits"
         >
@@ -154,7 +137,7 @@ export const BuildStrategy: React.SFC<BuildStrategyProps> = ({ resource, childre
         </DetailsItem>
       )}
       {triggers && (
-        <DetailsItem label={t('build-strategy~Triggers')} obj={resource} path="spec.triggers">
+        <DetailsItem label={t('public~Triggers')} obj={resource} path="spec.triggers">
           {triggers}
         </DetailsItem>
       )}
diff --git a/frontend/public/components/utils/details-page.tsx b/frontend/public/components/utils/details-page.tsx
index 6be222288bf..37041724db2 100644
--- a/frontend/public/components/utils/details-page.tsx
+++ b/frontend/public/components/utils/details-page.tsx
@@ -77,12 +77,12 @@ export const ResourceSummary: React.FC<ResourceSummaryProps> = ({
   return (
     <dl data-test-id="resource-summary" className="co-m-pane__details">
       <DetailsItem
-        label={t('details-page~Name')}
+        label={t('public~Name')}
         obj={resource}
         path={customPathName || 'metadata.name'}
       />
       {metadata.namespace && (
-        <DetailsItem label={t('details-page~Namespace')} obj={resource} path="metadata.namespace">
+        <DetailsItem label={t('public~Namespace')} obj={resource} path="metadata.namespace">
           <ResourceLink
             kind="Namespace"
             name={metadata.namespace}
@@ -92,7 +92,7 @@ export const ResourceSummary: React.FC<ResourceSummaryProps> = ({
         </DetailsItem>
       )}
       <DetailsItem
-        label={t('details-page~Labels')}
+        label={t('public~Labels')}
         obj={resource}
         path="metadata.labels"
         valueClassName="details-item__value--labels"
@@ -103,7 +103,7 @@ export const ResourceSummary: React.FC<ResourceSummaryProps> = ({
         <LabelList kind={reference} labels={metadata.labels} />
       </DetailsItem>
       {showPodSelector && (
-        <DetailsItem label={t('details-page~Pod selector')} obj={resource} path={podSelector}>
+        <DetailsItem label={t('public~Pod selector')} obj={resource} path={podSelector}>
           <Selector
             selector={_.get(resource, podSelector)}
             namespace={_.get(resource, 'metadata.namespace')}
@@ -111,12 +111,12 @@ export const ResourceSummary: React.FC<ResourceSummaryProps> = ({
         </DetailsItem>
       )}
       {showNodeSelector && (
-        <DetailsItem label={t('details-page~Node selector')} obj={resource} path={nodeSelector}>
-          <Selector kind={t('details-page~Node')} selector={_.get(resource, nodeSelector)} />
+        <DetailsItem label={t('public~Node selector')} obj={resource} path={nodeSelector}>
+          <Selector kind={t('public~Node')} selector={_.get(resource, nodeSelector)} />
         </DetailsItem>
       )}
       {showTolerations && (
-        <DetailsItem label={t('details-page~Tolerations')} obj={resource} path={tolerationsPath}>
+        <DetailsItem label={t('public~Tolerations')} obj={resource} path={tolerationsPath}>
           {canUpdate ? (
             <Button
               type="button"
@@ -124,20 +124,16 @@ export const ResourceSummary: React.FC<ResourceSummaryProps> = ({
               onClick={Kebab.factory.ModifyTolerations(model, resource).callback}
               variant="link"
             >
-              {t('details-page~{{count}} toleration', { count: _.size(tolerations) })}
+              {t('public~{{count}} toleration', { count: _.size(tolerations) })}
               <PencilAltIcon className="co-icon-space-l pf-c-button-icon--plain" />
             </Button>
           ) : (
-            t('details-page~{{count}} toleration', { count: _.size(tolerations) })
+            t('public~{{count}} toleration', { count: _.size(tolerations) })
           )}
         </DetailsItem>
       )}
       {showAnnotations && (
-        <DetailsItem
-          label={t('details-page~Annotations')}
-          obj={resource}
-          path="metadata.annotations"
-        >
+        <DetailsItem label={t('public~Annotations')} obj={resource} path="metadata.annotations">
           {canUpdate ? (
             <Button
               data-test="edit-annotations"
@@ -146,23 +142,19 @@ export const ResourceSummary: React.FC<ResourceSummaryProps> = ({
               onClick={Kebab.factory.ModifyAnnotations(model, resource).callback}
               variant="link"
             >
-              {t('details-page~{{count}} annotation', { count: _.size(metadata.annotations) })}
+              {t('public~{{count}} annotation', { count: _.size(metadata.annotations) })}
               <PencilAltIcon className="co-icon-space-l pf-c-button-icon--plain" />
             </Button>
           ) : (
-            t('details-page~{{count}} annotation', { count: _.size(metadata.annotations) })
+            t('public~{{count}} annotation', { count: _.size(metadata.annotations) })
           )}
         </DetailsItem>
       )}
       {children}
-      <DetailsItem
-        label={t('details-page~Created at')}
-        obj={resource}
-        path="metadata.creationTimestamp"
-      >
+      <DetailsItem label={t('public~Created at')} obj={resource} path="metadata.creationTimestamp">
         <Timestamp timestamp={metadata.creationTimestamp} />
       </DetailsItem>
-      <DetailsItem label={t('details-page~Owner')} obj={resource} path="metadata.ownerReferences">
+      <DetailsItem label={t('public~Owner')} obj={resource} path="metadata.ownerReferences">
         <OwnerReferences resource={resource} />
       </DetailsItem>
     </dl>
@@ -174,13 +166,13 @@ export const ResourcePodCount: React.SFC<ResourcePodCountProps> = ({ resource })
   return (
     <>
       <DetailsItem
-        label={t('details-page~Current count')}
+        label={t('public~Current count')}
         obj={resource}
         path="status.replicas"
         defaultValue="0"
       />
       <DetailsItem
-        label={t('details-page~Desired count')}
+        label={t('public~Desired count')}
         obj={resource}
         path="spec.replicas"
         defaultValue="0"
diff --git a/frontend/public/components/utils/dropdown.jsx b/frontend/public/components/utils/dropdown.jsx
index 8f91471c322..bbeef259737 100644
--- a/frontend/public/components/utils/dropdown.jsx
+++ b/frontend/public/components/utils/dropdown.jsx
@@ -154,8 +154,8 @@ class DropDownRowWithTranslation extends React.PureComponent {
           }}
           aria-label={
             isBookmarked
-              ? t('dropdown~Remove bookmark {{content}}', { content: contentString })
-              : t('dropdown~Add bookmark {{content}}', { content: contentString })
+              ? t('public~Remove bookmark {{content}}', { content: contentString })
+              : t('public~Add bookmark {{content}}', { content: contentString })
           }
         >
           {isBookmarked ? <MinusCircleIcon /> : <PlusCircleIcon />}
@@ -177,8 +177,8 @@ class DropDownRowWithTranslation extends React.PureComponent {
           }}
           aria-label={
             isFavorite
-              ? t('dropdown~Remove favorite {{content}}', { content: contentString })
-              : t('dropdown~Add favorite {{content}}', { content: contentString })
+              ? t('public~Remove favorite {{content}}', { content: contentString })
+              : t('public~Add favorite {{content}}', { content: contentString })
           }
         >
           <StarIcon className={classNames({ favorite: isFavorite })} />
@@ -658,13 +658,13 @@ class ActionsMenuDropdown_ extends DropdownMixin {
         <button
           type="button"
           aria-haspopup="true"
-          aria-label={t('dropdown~Actions')}
+          aria-label={t('public~Actions')}
           aria-expanded={this.state.active}
           className="pf-c-dropdown__toggle"
           onClick={this.toggle}
           data-test-id="actions-menu-button"
         >
-          <span className="pf-c-dropdown__toggle-text">{title || t('dropdown~Actions')}</span>
+          <span className="pf-c-dropdown__toggle-text">{title || t('public~Actions')}</span>
           <CaretDownIcon className="pf-c-dropdown__toggle-icon" />
         </button>
         {this.state.active && <KebabItems options={actions} onClick={onClick} />}
@@ -733,8 +733,8 @@ export const ContainerDropdown = (props) => {
   const getHeaders = (container, initContainer) => {
     return initContainer
       ? {
-          [container.name]: t('dropdown~Containers'),
-          [initContainer.name]: t('dropdown~Init containers'),
+          [container.name]: t('public~Containers'),
+          [initContainer.name]: t('public~Init containers'),
         }
       : {};
   };
diff --git a/frontend/public/components/utils/horizontal-nav.tsx b/frontend/public/components/utils/horizontal-nav.tsx
index 0008213bf08..c6fcd6d634a 100644
--- a/frontend/public/components/utils/horizontal-nav.tsx
+++ b/frontend/public/components/utils/horizontal-nav.tsx
@@ -62,104 +62,104 @@ type NavFactory = { [name: string]: (c?: React.ComponentType<any>) => Page };
 export const navFactory: NavFactory = {
   details: (component) => ({
     href: '',
-    // t('details-page~Details')
-    nameKey: 'details-page~Details',
+    // t('public~Details')
+    nameKey: 'public~Details',
     component,
   }),
   events: (component) => ({
     href: 'events',
-    // t('details-page~Events')
-    nameKey: 'details-page~Events',
+    // t('public~Events')
+    nameKey: 'public~Events',
     component,
   }),
   logs: (component) => ({
     href: 'logs',
-    // t('details-page~Logs')
-    nameKey: 'details-page~Logs',
+    // t('public~Logs')
+    nameKey: 'public~Logs',
     component,
   }),
   editYaml: (component) => ({
     href: 'yaml',
-    // t('details-page~YAML')
-    nameKey: 'details-page~YAML',
+    // t('public~YAML')
+    nameKey: 'public~YAML',
     component: component || editYamlComponent,
   }),
   pods: (component) => ({
     href: 'pods',
-    // t('details-page~Pods')
-    nameKey: 'details-page~Pods',
+    // t('public~Pods')
+    nameKey: 'public~Pods',
     component: component || PodsComponent,
   }),
   jobs: (component) => ({
     href: 'jobs',
-    // t('details-page~Jobs')
-    nameKey: 'details-page~Jobs',
+    // t('public~Jobs')
+    nameKey: 'public~Jobs',
     component,
   }),
   roles: (component) => ({
     href: 'roles',
-    // t('details-page~RoleBindings')
-    nameKey: 'details-page~RoleBindings',
+    // t('public~RoleBindings')
+    nameKey: 'public~RoleBindings',
     component,
   }),
   builds: (component) => ({
     href: 'builds',
-    // t('details-page~Builds')
-    nameKey: 'details-page~Builds',
+    // t('public~Builds')
+    nameKey: 'public~Builds',
     component,
   }),
   envEditor: (component) => ({
     href: 'environment',
-    // t('details-page~Environment')
-    nameKey: 'details-page~Environment',
+    // t('public~Environment')
+    nameKey: 'public~Environment',
     component,
   }),
   clusterServiceClasses: (component) => ({
     href: 'serviceclasses',
-    // t('details-page~ServiceClasses')
-    nameKey: 'details-page~ServiceClasses',
+    // t('public~ServiceClasses')
+    nameKey: 'public~ServiceClasses',
     component,
   }),
   clusterServicePlans: (component) => ({
     href: 'serviceplans',
-    // t('details-page~ServicePlans')
-    nameKey: 'details-page~ServicePlans',
+    // t('public~ServicePlans')
+    nameKey: 'public~ServicePlans',
     component,
   }),
   serviceBindings: (component) => ({
     href: 'servicebindings',
-    // t('details-page~ServiceBindings')
-    nameKey: 'details-page~ServiceBindings',
+    // t('public~ServiceBindings')
+    nameKey: 'public~ServiceBindings',
     component,
   }),
   clusterOperators: (component) => ({
     href: 'clusteroperators',
-    // t('details-page~Cluster Operators')
-    nameKey: 'details-page~Cluster Operators',
+    // t('public~Cluster Operators')
+    nameKey: 'public~Cluster Operators',
     component,
   }),
   machineConfigs: (component) => ({
     href: 'machineconfigs',
-    // t('details-page~MachineConfigs')
-    nameKey: 'details-page~MachineConfigs',
+    // t('public~MachineConfigs')
+    nameKey: 'public~MachineConfigs',
     component,
   }),
   machines: (component) => ({
     href: 'machines',
-    // t('details-page~Machines')
-    nameKey: 'details-page~Machines',
+    // t('public~Machines')
+    nameKey: 'public~Machines',
     component,
   }),
   workloads: (component) => ({
     href: 'workloads',
-    // t('details-page~Workloads')
-    nameKey: 'details-page~Workloads',
+    // t('public~Workloads')
+    nameKey: 'public~Workloads',
     component,
   }),
   history: (component) => ({
     href: 'history',
-    // t('details-page~History')
-    nameKey: 'details-page~History',
+    // t('public~History')
+    nameKey: 'public~History',
     component,
   }),
 };
diff --git a/frontend/public/components/utils/kebab.tsx b/frontend/public/components/utils/kebab.tsx
index a0a29036cac..38884f9c628 100644
--- a/frontend/public/components/utils/kebab.tsx
+++ b/frontend/public/components/utils/kebab.tsx
@@ -255,8 +255,8 @@ export const KebabItems: React.FC<KebabItemsProps> = ({ options, ...props }) =>
 
 const kebabFactory: KebabFactory = {
   Delete: (kind, obj) => ({
-    // t('details-page~Delete {{kind}}', {kind: kind.label})
-    labelKey: 'details-page~Delete {{kind}}',
+    // t('public~Delete {{kind}}', {kind: kind.label})
+    labelKey: 'public~Delete {{kind}}',
     labelKind: { kind: kind.labelKey ? i18next.t(kind.labelKey) : kind.label },
     callback: () =>
       deleteModal({
@@ -266,8 +266,8 @@ const kebabFactory: KebabFactory = {
     accessReview: asAccessReview(kind, obj, 'delete'),
   }),
   Edit: (kind, obj) => ({
-    // t('details-page~Edit {{kind}}', {kind: kind.label})
-    labelKey: 'details-page~Edit {{kind}}',
+    // t('public~Edit {{kind}}', {kind: kind.label})
+    labelKey: 'public~Edit {{kind}}',
     labelKind: { kind: kind.labelKey ? i18next.t(kind.labelKey) : kind.label },
     dataTest: `Edit ${kind.label}`,
     href: `${resourceObjPath(obj, kind.crd ? referenceForModel(kind) : kind.kind)}/yaml`,
@@ -275,8 +275,8 @@ const kebabFactory: KebabFactory = {
     accessReview: asAccessReview(kind, obj, 'update'),
   }),
   ModifyLabels: (kind, obj) => ({
-    // t('details-page~Edit labels')
-    labelKey: 'details-page~Edit labels',
+    // t('public~Edit labels')
+    labelKey: 'public~Edit labels',
     callback: () =>
       labelsModal({
         kind,
@@ -286,8 +286,8 @@ const kebabFactory: KebabFactory = {
     accessReview: asAccessReview(kind, obj, 'patch'),
   }),
   ModifyPodSelector: (kind, obj) => ({
-    // t('details-page~Edit Pod selector')
-    labelKey: 'details-page~Edit Pod selector',
+    // t('public~Edit Pod selector')
+    labelKey: 'public~Edit Pod selector',
     callback: () =>
       podSelectorModal({
         kind,
@@ -297,8 +297,8 @@ const kebabFactory: KebabFactory = {
     accessReview: asAccessReview(kind, obj, 'patch'),
   }),
   ModifyAnnotations: (kind, obj) => ({
-    // t('details-page~Edit annotations')
-    labelKey: 'details-page~Edit annotations',
+    // t('public~Edit annotations')
+    labelKey: 'public~Edit annotations',
     callback: () =>
       annotationsModal({
         kind,
@@ -308,8 +308,8 @@ const kebabFactory: KebabFactory = {
     accessReview: asAccessReview(kind, obj, 'patch'),
   }),
   ModifyCount: (kind, obj) => ({
-    // t('details-page~Edit Pod count')
-    labelKey: 'details-page~Edit Pod count',
+    // t('public~Edit Pod count')
+    labelKey: 'public~Edit Pod count',
     callback: () =>
       configureReplicaCountModal({
         resourceKind: kind,
@@ -318,8 +318,8 @@ const kebabFactory: KebabFactory = {
     accessReview: asAccessReview(kind, obj, 'patch', 'scale'),
   }),
   ModifyTaints: (kind, obj) => ({
-    // t('details-page~Edit taints')
-    labelKey: 'details-page~Edit taints',
+    // t('public~Edit taints')
+    labelKey: 'public~Edit taints',
     callback: () =>
       taintsModal({
         resourceKind: kind,
@@ -329,8 +329,8 @@ const kebabFactory: KebabFactory = {
     accessReview: asAccessReview(kind, obj, 'patch'),
   }),
   ModifyTolerations: (kind, obj) => ({
-    // t('details-page~Edit tolerations')
-    labelKey: 'details-page~Edit tolerations',
+    // t('public~Edit tolerations')
+    labelKey: 'public~Edit tolerations',
     callback: () =>
       tolerationsModal({
         resourceKind: kind,
@@ -340,14 +340,14 @@ const kebabFactory: KebabFactory = {
     accessReview: asAccessReview(kind, obj, 'patch'),
   }),
   AddStorage: (kind, obj) => ({
-    // t('details-page~Add storage')
-    labelKey: 'details-page~Add storage',
+    // t('public~Add storage')
+    labelKey: 'public~Add storage',
     href: `${resourceObjPath(obj, kind.crd ? referenceForModel(kind) : kind.kind)}/attach-storage`,
     accessReview: asAccessReview(kind, obj, 'patch'),
   }),
   ExpandPVC: (kind, obj) => ({
-    // t('details-page~Expand PVC')
-    labelKey: 'details-page~Expand PVC',
+    // t('public~Expand PVC')
+    labelKey: 'public~Expand PVC',
     callback: () =>
       expandPVCModal({
         kind,
@@ -356,8 +356,8 @@ const kebabFactory: KebabFactory = {
     accessReview: asAccessReview(kind, obj, 'patch'),
   }),
   PVCSnapshot: (kind, obj) => ({
-    // t('details-page~Create snapshot')
-    labelKey: 'details-page~Create snapshot',
+    // t('public~Create snapshot')
+    labelKey: 'public~Create snapshot',
     isDisabled: obj?.status?.phase !== 'Bound',
     tooltip: obj?.status?.phase !== 'Bound' ? 'PVC is not Bound' : '',
     href: `${resourceObjPath(obj, kind.crd ? referenceForModel(kind) : kind.kind)}/${
@@ -366,8 +366,8 @@ const kebabFactory: KebabFactory = {
     accessReview: asAccessReview(kind, obj, 'create'),
   }),
   ClonePVC: (kind, obj) => ({
-    // t('details-page~Clone PVC')
-    labelKey: 'details-page~Clone PVC',
+    // t('public~Clone PVC')
+    labelKey: 'public~Clone PVC',
     isDisabled: obj?.status?.phase !== 'Bound',
     tooltip: obj?.status?.phase !== 'Bound' ? 'PVC is not Bound' : '',
     callback: () =>
@@ -378,8 +378,8 @@ const kebabFactory: KebabFactory = {
     accessReview: asAccessReview(kind, obj, 'create'),
   }),
   RestorePVC: (kind, obj: VolumeSnapshotKind) => ({
-    // t('details-page~Restore as new PVC')
-    labelKey: 'details-page~Restore as new PVC',
+    // t('public~Restore as new PVC')
+    labelKey: 'public~Restore as new PVC',
     isDisabled: !obj?.status?.readyToUse,
     tooltip: !obj?.status?.readyToUse ? 'Volume Snapshot is not Ready' : '',
     callback: () =>
diff --git a/frontend/public/components/utils/label-list.tsx b/frontend/public/components/utils/label-list.tsx
index e0ff3a735bd..052656f8a7c 100644
--- a/frontend/public/components/utils/label-list.tsx
+++ b/frontend/public/components/utils/label-list.tsx
@@ -38,7 +38,7 @@ class TranslatedLabelList extends React.Component<LabelListProps> {
     if (_.isEmpty(list)) {
       list = [
         <div className="text-muted" key="0">
-          {t('details-page~No labels')}
+          {t('public~No labels')}
         </div>,
       ];
     }
diff --git a/frontend/public/components/utils/managed-by.tsx b/frontend/public/components/utils/managed-by.tsx
index 32c2a6954b7..faa82a3312b 100644
--- a/frontend/public/components/utils/managed-by.tsx
+++ b/frontend/public/components/utils/managed-by.tsx
@@ -70,7 +70,7 @@ export const ManagedByOperatorLink: React.SFC<ManagedByLinkProps> = (props) => {
   if (owner && csv) {
     return (
       <div className={classNames('co-m-pane__heading-owner', className)}>
-        {t('details-page~Managed by')}{' '}
+        {t('public~Managed by')}{' '}
         <ManagedByOperatorResourceLink
           className="co-resource-item"
           namespace={namespace}
diff --git a/frontend/public/components/utils/owner-references.tsx b/frontend/public/components/utils/owner-references.tsx
index 9f6c42f59cf..e330e4e50e8 100644
--- a/frontend/public/components/utils/owner-references.tsx
+++ b/frontend/public/components/utils/owner-references.tsx
@@ -14,11 +14,7 @@ export const OwnerReferences: React.FC<OwnerReferencesProps> = ({ resource }) =>
       namespace={resource.metadata.namespace}
     />
   ));
-  return owners.length ? (
-    <>{owners}</>
-  ) : (
-    <span className="text-muted">{t('details-page~No owner')}</span>
-  );
+  return owners.length ? <>{owners}</> : <span className="text-muted">{t('public~No owner')}</span>;
 };
 
 type OwnerReferencesProps = {
diff --git a/frontend/public/locales/en/add-users-modal.json b/frontend/public/locales/en/add-users-modal.json
deleted file mode 100644
index 4ffdf72b71e..00000000000
--- a/frontend/public/locales/en/add-users-modal.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "Add users": "Add users",
-  "Add new Users to Group {name}.": "Add new Users to Group {name}.",
-  "Users": "Users",
-  "Save": "Save"
-}
\ No newline at end of file
diff --git a/frontend/public/locales/en/bindings.json b/frontend/public/locales/en/bindings.json
deleted file mode 100644
index c8b324eb4c0..00000000000
--- a/frontend/public/locales/en/bindings.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "Duplicate {{label}}": "Duplicate {{label}}",
-  "Edit {{label}} subject": "Edit {{label}} subject",
-  "Delete {{label}} subject": "Delete {{label}} subject",
-  "Are you sure you want to delete subject {{name}} of type {{kind}}?": "Are you sure you want to delete subject {{name}} of type {{kind}}?",
-  "Delete subject": "Delete subject",
-  "Impersonate {{kind}} \"{{name}}\"": "Impersonate {{kind}} \"{{name}}\"",
-  "Name": "Name",
-  "Role ref": "Role ref",
-  "Subject kind": "Subject kind",
-  "Subject name": "Subject name",
-  "Namespace": "Namespace",
-  "All namespaces": "All namespaces",
-  "No RoleBindings found": "No RoleBindings found",
-  "Roles grant access to types of objects in the cluster. Roles are applied to a group or user via a RoleBinding.": "Roles grant access to types of objects in the cluster. Roles are applied to a group or user via a RoleBinding.",
-  "RoleBindings": "RoleBindings",
-  "Kind": "Kind",
-  "Namespace RoleBindings": "Namespace RoleBindings",
-  "System RoleBindings": "System RoleBindings",
-  "Cluster-wide RoleBindings": "Cluster-wide RoleBindings",
-  "Create binding": "Create binding",
-  "by role or subject": "by role or subject",
-  "Namespace roles (Role)": "Namespace roles (Role)",
-  "Select role name": "Select role name",
-  "Cluster-wide roles (ClusterRole)": "Cluster-wide roles (ClusterRole)",
-  "Please complete all fields.": "Please complete all fields.",
-  "Namespace role binding (RoleBinding)": "Namespace role binding (RoleBinding)",
-  "Grant the permissions to a user or set of users within the selected namespace.": "Grant the permissions to a user or set of users within the selected namespace.",
-  "Cluster-wide role binding (ClusterRoleBinding)": "Cluster-wide role binding (ClusterRoleBinding)",
-  "Grant the permissions to a user or set of users at the cluster level and in all namespaces.": "Grant the permissions to a user or set of users at the cluster level and in all namespaces.",
-  "User": "User",
-  "Group": "Group",
-  "ServiceAccount": "ServiceAccount",
-  "Associate a user/group to the selected role to define the type of access and resources that are allowed.": "Associate a user/group to the selected role to define the type of access and resources that are allowed.",
-  "Binding type": "Binding type",
-  "RoleBinding": "RoleBinding",
-  "RoleBinding name": "RoleBinding name",
-  "Role": "Role",
-  "Role name": "Role name",
-  "Subject": "Subject",
-  "Subject namespace": "Subject namespace",
-  "Create": "Create",
-  "Cancel": "Cancel",
-  "Edit": "Edit",
-  "Save": "Save",
-  "Duplicate": "Duplicate"
-}
\ No newline at end of file
diff --git a/frontend/public/locales/en/build-strategy.json b/frontend/public/locales/en/build-strategy.json
deleted file mode 100644
index c1276fdab7a..00000000000
--- a/frontend/public/locales/en/build-strategy.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "Type": "Type",
-  "Git repository": "Git repository",
-  "Git ref": "Git ref",
-  "Git commit": "Git commit",
-  "Binary file": "Binary file",
-  "Context dir": "Context dir",
-  "Dockerfile": "Dockerfile",
-  "JenskinsFile path": "JenskinsFile path",
-  "Build from": "Build from",
-  "Output to": "Output to",
-  "Push secret": "Push secret",
-  "Run policy": "Run policy",
-  "Resource limits": "Resource limits",
-  "Triggers": "Triggers"
-}
\ No newline at end of file
diff --git a/frontend/public/locales/en/build.json b/frontend/public/locales/en/build.json
deleted file mode 100644
index d8f00d18fd3..00000000000
--- a/frontend/public/locales/en/build.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "Rebuild": "Rebuild",
-  "Cancel build": "Cancel build",
-  "Are you sure you want to cancel this build?": "Are you sure you want to cancel this build?",
-  "Yes, cancel": "Yes, cancel",
-  "No, don't cancel": "No, don't cancel",
-  "View logs": "View logs",
-  "Memory usage": "Memory usage",
-  "CPU usage": "CPU usage",
-  "Filesystem": "Filesystem",
-  "Pipeline build strategy deprecation": "Pipeline build strategy deprecation",
-  "pipelineBuildStrategyAlert": "With the release of <2></2>, the pipelines build strategy has been deprecated. Users should either use Jenkins files directly on Jenkins or use cloud-native CI/CD with Openshift Pipelines.<4></4>",
-  "OpenShift Pipelines based on Tekton": "OpenShift Pipelines based on Tekton",
-  "Try the OpenShift Pipelines tutorial": "Try the OpenShift Pipelines tutorial",
-  "Build details": "Build details",
-  "Triggered by": "Triggered by",
-  "Started": "Started",
-  "Status": "Status",
-  "Message": "Message",
-  "Log snippet": "Log snippet",
-  "Duration": "Duration",
-  "The environment variable editor does not support build strategy: {{ type }}": "The environment variable editor does not support build strategy: {{ type }}",
-  "Name": "Name",
-  "Namespace": "Namespace",
-  "Created": "Created",
-  "Builds": "Builds"
-}
\ No newline at end of file
diff --git a/frontend/public/locales/en/cluster-channel-modal.json b/frontend/public/locales/en/cluster-channel-modal.json
deleted file mode 100644
index b526dad40d8..00000000000
--- a/frontend/public/locales/en/cluster-channel-modal.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "Select channel": "Select channel",
-  "Input channel": "Input channel",
-  "The current version is available in the channels listed in the dropdown below. Select a channel that reflects the desired version. Critical security updates will be delivered to any vulnerable channels.": "The current version is available in the channels listed in the dropdown below. Select a channel that reflects the desired version. Critical security updates will be delivered to any vulnerable channels.",
-  "Input a channel that reflects the desired version. To verify if the version exists in a channel, save and check the update status. Critical security updates will be delivered to any vulnerable channels.": "Input a channel that reflects the desired version. To verify if the version exists in a channel, save and check the update status. Critical security updates will be delivered to any vulnerable channels.",
-  "Channel": "Channel",
-  "e.g., {{version}}": "e.g., {{version}}",
-  "Potential channels are {{stable}}, {{fast}}, or {{candidate}}.": "Potential channels are {{stable}}, {{fast}}, or {{candidate}}."
-}
\ No newline at end of file
diff --git a/frontend/public/locales/en/cluster-operator.json b/frontend/public/locales/en/cluster-operator.json
deleted file mode 100644
index f6dbb52ef49..00000000000
--- a/frontend/public/locales/en/cluster-operator.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "Name": "Name",
-  "Status": "Status",
-  "Version": "Version",
-  "Message": "Message",
-  "{{resource}} details": "{{resource}} details",
-  "Conditions": "Conditions",
-  "Operand versions": "Operand versions",
-  "Related objects": "Related objects"
-}
\ No newline at end of file
diff --git a/frontend/public/locales/en/cluster-settings.json b/frontend/public/locales/en/cluster-settings.json
deleted file mode 100644
index 32d3501494b..00000000000
--- a/frontend/public/locales/en/cluster-settings.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "Not configured": "Not configured",
-  "Invalid cluster version": "Invalid cluster version",
-  "Cancel update": "Cancel update",
-  "Available updates": "Available updates",
-  "Failing": "Failing",
-  "View conditions": "View conditions",
-  "Update to {{version}} in progress": "Update to {{version}} in progress",
-  "Not configured to request update recommedations.": "Not configured to request update recommedations.",
-  "Version not found": "Version not found",
-  "Error retrieving": "Error retrieving",
-  "Up to date": "Up to date",
-  "View release notes": "View release notes",
-  "Unknown": "Unknown",
-  "None": "None",
-  "Current version": "Current version",
-  "Last completed version": "Last completed version",
-  "Learn more about OpenShift update channels": "Learn more about OpenShift update channels",
-  "Channel": "Channel",
-  "Channels help to control the pace of updates and recommend the appropriate release versions. Update channels are tied to a minor version of OpenShift Container Platform, for example 4.5.": "Channels help to control the pace of updates and recommend the appropriate release versions. Update channels are tied to a minor version of OpenShift Container Platform, for example 4.5.",
-  "Version": "Version",
-  "{{name}} {{resource}} may continue to update after the update of Master {{resource}} and {{resource2}} are complete.": "{{name}} {{resource}} may continue to update after the update of Master {{resource}} and {{resource2}} are complete.",
-  "{{updatedMCPNodes}} of {{totalMCPNodes}}": "{{updatedMCPNodes}} of {{totalMCPNodes}}",
-  "+ More": "+ More",
-  "{{currentChannel}} channel": "{{currentChannel}} channel",
-  "{{newerChannel}} channel": "{{newerChannel}} channel",
-  "{{updatedOperatorsCount}} of {{totalOperatorsCount}}": "{{updatedOperatorsCount}} of {{totalOperatorsCount}}",
-  "This cluster is not currently requesting update notifications. To request update recommendations, configure a channel.": "This cluster is not currently requesting update notifications. To request update recommendations, configure a channel.",
-  "Version {{version}} not found in channel {{channel}}.  To request update recommendations, configure a channel that supports your version.": "Version {{version}} not found in channel {{channel}}.  To request update recommendations, configure a channel that supports your version.",
-  "Update status": "Update status",
-  "Subscription": "Subscription",
-  "OpenShift Cluster Manager": "OpenShift Cluster Manager",
-  "Cluster ID": "Cluster ID",
-  "Desired release image": "Desired release image",
-  "Cluster version configuration": "Cluster version configuration",
-  "Cluster autoscaler": "Cluster autoscaler",
-  "Create autoscaler": "Create autoscaler",
-  "Update history": "Update history",
-  "History": "History",
-  "State": "State",
-  "Started": "Started",
-  "Completed": "Completed",
-  "Release notes": "Release notes",
-  "Cluster Settings": "Cluster Settings",
-  "Details": "Details",
-  "Global configuration": "Global configuration"
-}
\ No newline at end of file
diff --git a/frontend/public/locales/en/cluster-update-modal.json b/frontend/public/locales/en/cluster-update-modal.json
deleted file mode 100644
index 92f424b6d6a..00000000000
--- a/frontend/public/locales/en/cluster-update-modal.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "Update cluster": "Update cluster",
-  "Current version": "Current version",
-  "Select new version": "Select new version",
-  "Select version": "Select version"
-}
\ No newline at end of file
diff --git a/frontend/public/locales/en/cluster-version.json b/frontend/public/locales/en/cluster-version.json
deleted file mode 100644
index d10856d616e..00000000000
--- a/frontend/public/locales/en/cluster-version.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "{{resource}} details": "{{resource}} details",
-  "Conditions": "Conditions"
-}
\ No newline at end of file
diff --git a/frontend/public/locales/en/custom-resource-definition.json b/frontend/public/locales/en/custom-resource-definition.json
deleted file mode 100644
index 60969c737fc..00000000000
--- a/frontend/public/locales/en/custom-resource-definition.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "View instances": "View instances",
-  "true": "true",
-  "false": "false",
-  "CRD versions": "CRD versions",
-  "Name": "Name",
-  "Served": "Served",
-  "Storage": "Storage",
-  "{{resource}} details": "{{resource}} details",
-  "Established": "Established",
-  "Group": "Group",
-  "Latest version": "Latest version",
-  "Scope": "Scope",
-  "Conditions": "Conditions",
-  "Versions": "Versions",
-  "Namespaced": "Namespaced",
-  "Yes": "Yes",
-  "No": "No",
-  "Instances": "Instances"
-}
\ No newline at end of file
diff --git a/frontend/public/locales/en/dashboard.json b/frontend/public/locales/en/dashboard.json
deleted file mode 100644
index af85ea1ec36..00000000000
--- a/frontend/public/locales/en/dashboard.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "Activity": "Activity",
-  "View events": "View events",
-  "Updating": "Updating",
-  "Update cluster": "Update cluster",
-  "Not available": "Not available",
-  "Details": "Details",
-  "View settings": "View settings",
-  "Cluster API address": "Cluster API address",
-  "Cluster ID": "Cluster ID",
-  "OpenShift Cluster Manager": "OpenShift Cluster Manager",
-  "Provider": "Provider",
-  "OpenShift version": "OpenShift version",
-  "Update channel": "Update channel",
-  "Control plane high availability": "Control plane high availability",
-  "No (single master)": "No (single master)",
-  "Kubernetes version": "Kubernetes version",
-  "Operators create, configure, and manage applications by extending the Kubernetes API.": "Operators create, configure, and manage applications by extending the Kubernetes API.",
-  "Operators": "Operators",
-  "Operator status": "Operator status",
-  "Cluster inventory": "Cluster inventory",
-  "A cluster version update is available": "A cluster version update is available",
-  "Status": "Status",
-  "View alerts": "View alerts",
-  "CPU": "CPU",
-  "Memory": "Memory",
-  "Filesystem": "Filesystem",
-  "Pod count": "Pod count",
-  "Network in": "Network in",
-  "Network out": "Network out",
-  "Cluster utilization": "Cluster utilization",
-  "Network transfer": "Network transfer",
-  "Overview": "Overview",
-  "Cluster": "Cluster",
-  "Started": "Started",
-  "There are no recent events.": "There are no recent events.",
-  "View all events": "View all events",
-  "Recent events": "Recent events",
-  "There are no ongoing activities.": "There are no ongoing activities.",
-  "Ongoing": "Ongoing",
-  "No resource quotas": "No resource quotas",
-  "View details": "View details",
-  "Alerts could not be loaded.": "Alerts could not be loaded.",
-  "Unknown": "Unknown",
-  "Pending": "Pending",
-  "Degraded": "Degraded",
-  "Loading": "Loading",
-  "{{title}} breakdown": "{{title}} breakdown",
-  "Total capacity": "Total capacity",
-  "Total limit": "Total limit",
-  "Current utilization": "Current utilization",
-  "Current available capacity": "Current available capacity",
-  "Total requested": "Total requested",
-  "By {{label}}": "By {{label}}",
-  "Top consumer by {{label}}": "Top consumer by {{label}}",
-  "View more": "View more",
-  "Top {{label}} consumers": "Top {{label}} consumers",
-  "Top consumers": "Top consumers",
-  "Select consumer type": "Select consumer type",
-  "time axis": "time axis",
-  "Usage": "Usage",
-  "View {{title}} metrics in query browser": "View {{title}} metrics in query browser",
-  "{{humanAvailable}} available of {{humanLimit}} total limit": "{{humanAvailable}} available of {{humanLimit}} total limit",
-  "{{humanAvailable}} available of {{humanMax}}": "{{humanAvailable}} available of {{humanMax}}",
-  "{{humanAvailable}} available": "{{humanAvailable}} available",
-  "View metrics for {{title}}": "View metrics for {{title}}"
-}
\ No newline at end of file
diff --git a/frontend/public/locales/en/details-page.json b/frontend/public/locales/en/details-page.json
deleted file mode 100644
index 1d63d03e052..00000000000
--- a/frontend/public/locales/en/details-page.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "Global configuration": "Global configuration",
-  "{{kind}} details": "{{kind}} details",
-  "Type": "Type",
-  "Status": "Status",
-  "Updated": "Updated",
-  "Reason": "Reason",
-  "Message": "Message",
-  "No conditions found": "No conditions found",
-  "ReplicationControllers": "ReplicationControllers",
-  "ReplicaSets": "ReplicaSets",
-  "Delete PersistentVolumeClaim": "Delete PersistentVolumeClaim",
-  "Terminal": "Terminal",
-  "Name": "Name",
-  "Namespace": "Namespace",
-  "Labels": "Labels",
-  "Pod selector": "Pod selector",
-  "Node selector": "Node selector",
-  "Node": "Node",
-  "Tolerations": "Tolerations",
-  "{{count}} toleration": "{{count}} toleration",
-  "{{count}} toleration_plural": "{{count}} tolerations",
-  "Annotations": "Annotations",
-  "{{count}} annotation": "{{count}} annotation",
-  "{{count}} annotation_plural": "{{count}} annotations",
-  "Created at": "Created at",
-  "Owner": "Owner",
-  "Current count": "Current count",
-  "Desired count": "Desired count",
-  "Details": "Details",
-  "Events": "Events",
-  "Logs": "Logs",
-  "YAML": "YAML",
-  "Pods": "Pods",
-  "Jobs": "Jobs",
-  "RoleBindings": "RoleBindings",
-  "Builds": "Builds",
-  "Environment": "Environment",
-  "ServiceClasses": "ServiceClasses",
-  "ServicePlans": "ServicePlans",
-  "ServiceBindings": "ServiceBindings",
-  "Cluster Operators": "Cluster Operators",
-  "MachineConfigs": "MachineConfigs",
-  "Machines": "Machines",
-  "Workloads": "Workloads",
-  "History": "History",
-  "Delete {{kind}}": "Delete {{kind}}",
-  "Edit {{kind}}": "Edit {{kind}}",
-  "Edit labels": "Edit labels",
-  "Edit Pod selector": "Edit Pod selector",
-  "Edit annotations": "Edit annotations",
-  "Edit Pod count": "Edit Pod count",
-  "Edit taints": "Edit taints",
-  "Edit tolerations": "Edit tolerations",
-  "Add storage": "Add storage",
-  "Expand PVC": "Expand PVC",
-  "Create snapshot": "Create snapshot",
-  "Clone PVC": "Clone PVC",
-  "Restore as new PVC": "Restore as new PVC",
-  "No labels": "No labels",
-  "Managed by": "Managed by",
-  "No owner": "No owner"
-}
\ No newline at end of file
diff --git a/frontend/public/locales/en/dropdown.json b/frontend/public/locales/en/dropdown.json
deleted file mode 100644
index 5a5892fb18c..00000000000
--- a/frontend/public/locales/en/dropdown.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "All Projects": "All Projects",
-  "All Namespaces": "All Namespaces",
-  "Project": "Project",
-  "Namespace": "Namespace",
-  "Select Project...": "Select Project...",
-  "Select Namespace...": "Select Namespace...",
-  "Remove bookmark {{content}}": "Remove bookmark {{content}}",
-  "Add bookmark {{content}}": "Add bookmark {{content}}",
-  "Remove favorite {{content}}": "Remove favorite {{content}}",
-  "Add favorite {{content}}": "Add favorite {{content}}",
-  "Actions": "Actions",
-  "Containers": "Containers",
-  "Init containers": "Init containers"
-}
\ No newline at end of file
diff --git a/frontend/public/locales/en/public.json b/frontend/public/locales/en/public.json
index b7897cac81a..f72b6839dd8 100644
--- a/frontend/public/locales/en/public.json
+++ b/frontend/public/locales/en/public.json
@@ -49,7 +49,28 @@
   "Source": "Source",
   "Custom": "Custom",
   "Build strategy": "Build strategy",
+  "Rebuild": "Rebuild",
+  "Cancel build": "Cancel build",
+  "Are you sure you want to cancel this build?": "Are you sure you want to cancel this build?",
+  "Yes, cancel": "Yes, cancel",
+  "No, don't cancel": "No, don't cancel",
+  "View logs": "View logs",
+  "Memory usage": "Memory usage",
+  "CPU usage": "CPU usage",
+  "Filesystem": "Filesystem",
+  "Pipeline build strategy deprecation": "Pipeline build strategy deprecation",
+  "pipelineBuildStrategyAlert": "With the release of <2></2>, the pipelines build strategy has been deprecated. Users should either use Jenkins files directly on Jenkins or use cloud-native CI/CD with Openshift Pipelines.<4></4>",
+  "OpenShift Pipelines based on Tekton": "OpenShift Pipelines based on Tekton",
+  "Try the OpenShift Pipelines tutorial": "Try the OpenShift Pipelines tutorial",
+  "Build details": "Build details",
+  "Triggered by": "Triggered by",
+  "Started": "Started",
   "Status": "Status",
+  "Message": "Message",
+  "Log snippet": "Log snippet",
+  "Duration": "Duration",
+  "The environment variable editor does not support build strategy: {{ type }}": "The environment variable editor does not support build strategy: {{ type }}",
+  "Builds": "Builds",
   "Values for certificate and key should both be either excluded or provided.": "Values for certificate and key should both be either excluded or provided.",
   "Add Identity Provider: Basic Authentication": "Add Identity Provider: Basic Authentication",
   "Basic authentication is a generic backend integration mechanism that allows users to authenticate with credentials validated against a remote identity provider.": "Basic authentication is a generic backend integration mechanism that allows users to authenticate with credentials validated against a remote identity provider.",
@@ -61,7 +82,54 @@
   "PEM-encoded TLS private key for the client certificate. Required if certificate is specified.": "PEM-encoded TLS private key for the client certificate. Required if certificate is specified.",
   "Add": "Add",
   "Cancel": "Cancel",
+  "{{resource}} details": "{{resource}} details",
+  "Conditions": "Conditions",
+  "Operand versions": "Operand versions",
+  "Related objects": "Related objects",
+  "Not configured": "Not configured",
+  "Invalid cluster version": "Invalid cluster version",
+  "Cancel update": "Cancel update",
+  "Available updates": "Available updates",
+  "Failing": "Failing",
+  "View conditions": "View conditions",
+  "Update to {{version}} in progress": "Update to {{version}} in progress",
+  "Not configured to request update recommedations.": "Not configured to request update recommedations.",
+  "Version not found": "Version not found",
+  "Error retrieving": "Error retrieving",
+  "Up to date": "Up to date",
+  "View release notes": "View release notes",
+  "Unknown": "Unknown",
+  "None": "None",
   "Update": "Update",
+  "Current version": "Current version",
+  "Last completed version": "Last completed version",
+  "Learn more about OpenShift update channels": "Learn more about OpenShift update channels",
+  "Channel": "Channel",
+  "Channels help to control the pace of updates and recommend the appropriate release versions. Update channels are tied to a minor version of OpenShift Container Platform, for example 4.5.": "Channels help to control the pace of updates and recommend the appropriate release versions. Update channels are tied to a minor version of OpenShift Container Platform, for example 4.5.",
+  "{{name}} {{resource}} may continue to update after the update of Master {{resource}} and {{resource2}} are complete.": "{{name}} {{resource}} may continue to update after the update of Master {{resource}} and {{resource2}} are complete.",
+  "{{updatedMCPNodes}} of {{totalMCPNodes}}": "{{updatedMCPNodes}} of {{totalMCPNodes}}",
+  "+ More": "+ More",
+  "{{currentChannel}} channel": "{{currentChannel}} channel",
+  "{{newerChannel}} channel": "{{newerChannel}} channel",
+  "{{updatedOperatorsCount}} of {{totalOperatorsCount}}": "{{updatedOperatorsCount}} of {{totalOperatorsCount}}",
+  "This cluster is not currently requesting update notifications. To request update recommendations, configure a channel.": "This cluster is not currently requesting update notifications. To request update recommendations, configure a channel.",
+  "Version {{version}} not found in channel {{channel}}.  To request update recommendations, configure a channel that supports your version.": "Version {{version}} not found in channel {{channel}}.  To request update recommendations, configure a channel that supports your version.",
+  "Update status": "Update status",
+  "Subscription": "Subscription",
+  "OpenShift Cluster Manager": "OpenShift Cluster Manager",
+  "Cluster ID": "Cluster ID",
+  "Desired release image": "Desired release image",
+  "Cluster version configuration": "Cluster version configuration",
+  "Cluster autoscaler": "Cluster autoscaler",
+  "Create autoscaler": "Create autoscaler",
+  "Update history": "Update history",
+  "History": "History",
+  "State": "State",
+  "Completed": "Completed",
+  "Release notes": "Release notes",
+  "Cluster Settings": "Cluster Settings",
+  "Global configuration": "Global configuration",
+  "{{kind}} details": "{{kind}} details",
   "{{label}}": "{{label}}",
   "Identity providers": "Identity providers",
   "Mapping method": "Mapping method",
@@ -74,11 +142,13 @@
   "LDAP": "LDAP",
   "OpenID Connect": "OpenID Connect",
   "Request Header": "Request Header",
-  "{{resource}} details": "{{resource}} details",
   "Access token max age": "Access token max age",
   "Identity providers determine how users log into the cluster.": "Identity providers determine how users log into the cluster.",
   "True": "True",
   "False": "False",
+  "Updated": "Updated",
+  "Reason": "Reason",
+  "No conditions found": "No conditions found",
   "Value hidden": "Value hidden",
   "Save file": "Save file",
   "binary data": "binary data",
@@ -96,13 +166,22 @@
   "Starting deadline seconds": "Starting deadline seconds",
   "{{count}} second": "{{count}} second",
   "{{count}} second_plural": "{{count}} seconds",
-  "Not configured": "Not configured",
   "Last schedule time": "Last schedule time",
   "Job details": "Job details",
   "Desired completions": "Desired completions",
   "Parallelism": "Parallelism",
   "Active deadline seconds": "Active deadline seconds",
   "Containers": "Containers",
+  "View instances": "View instances",
+  "CRD versions": "CRD versions",
+  "Served": "Served",
+  "Storage": "Storage",
+  "Established": "Established",
+  "Latest version": "Latest version",
+  "Scope": "Scope",
+  "Versions": "Versions",
+  "Yes": "Yes",
+  "No": "No",
   "Current count": "Current count",
   "Desired count": "Desired count",
   "DaemonSet details": "DaemonSet details",
@@ -112,6 +191,31 @@
   "DaemonSets": "DaemonSets",
   "Activity": "Activity",
   "View events": "View events",
+  "Updating": "Updating",
+  "Update cluster": "Update cluster",
+  "Not available": "Not available",
+  "View settings": "View settings",
+  "Cluster API address": "Cluster API address",
+  "Provider": "Provider",
+  "OpenShift version": "OpenShift version",
+  "Update channel": "Update channel",
+  "Control plane high availability": "Control plane high availability",
+  "No (single master)": "No (single master)",
+  "Kubernetes version": "Kubernetes version",
+  "Operators create, configure, and manage applications by extending the Kubernetes API.": "Operators create, configure, and manage applications by extending the Kubernetes API.",
+  "Operators": "Operators",
+  "Operator status": "Operator status",
+  "Cluster inventory": "Cluster inventory",
+  "A cluster version update is available": "A cluster version update is available",
+  "View alerts": "View alerts",
+  "CPU": "CPU",
+  "Memory": "Memory",
+  "Pod count": "Pod count",
+  "Network in": "Network in",
+  "Network out": "Network out",
+  "Cluster utilization": "Cluster utilization",
+  "Network transfer": "Network transfer",
+  "Overview": "Overview",
   "View all": "View all",
   "Requester": "Requester",
   "No requester": "No requester",
@@ -121,22 +225,11 @@
   "Inventory": "Inventory",
   "Launcher": "Launcher",
   "ResourceQuotas": "ResourceQuotas",
-  "CPU": "CPU",
-  "Memory": "Memory",
-  "Filesystem": "Filesystem",
-  "Network in": "Network in",
-  "Network out": "Network out",
   "Utilization": "Utilization",
-  "Network transfer": "Network transfer",
-  "Pod count": "Pod count",
   "{{kindLabel}} details": "{{kindLabel}} details",
-  "Conditions": "Conditions",
-  "None": "None",
   "Start rollout": "Start rollout",
   "Resume rollouts": "Resume rollouts",
   "Pause rollouts": "Pause rollouts",
-  "Latest version": "Latest version",
-  "Message": "Message",
   "Update strategy": "Update strategy",
   "Timeout": "Timeout",
   "Update period": "Update period",
@@ -150,10 +243,12 @@
   "Min ready seconds": "Min ready seconds",
   "Triggers": "Triggers",
   "DeploymentConfig details": "DeploymentConfig details",
+  "ReplicationControllers": "ReplicationControllers",
   "DeploymentConfigs": "DeploymentConfigs",
   "Edit update strategy": "Edit update strategy",
   "Progress deadline seconds": "Progress deadline seconds",
   "Deployment details": "Deployment details",
+  "ReplicaSets": "ReplicaSets",
   "Deployments": "Deployments",
   "Filter {{label}}...": "Filter {{label}}...",
   "Create": "Create",
@@ -184,14 +279,24 @@
   "Failed pods": "Failed pods",
   "Completions": "Completions",
   "You are logged in as a temporary administrative user. Update the <2>cluster OAuth configuration</2> to allow others to log in.": "You are logged in as a temporary administrative user. Update the <2>cluster OAuth configuration</2> to allow others to log in.",
-  "Not available": "Not available",
+  "Add users": "Add users",
+  "Add new Users to Group {name}.": "Add new Users to Group {name}.",
+  "Users": "Users",
+  "Save": "Save",
   "Edit routing configuration": "Edit routing configuration",
   "Group by": "Group by",
   "Group wait": "Group wait",
   "Group interval": "Group interval",
   "Repeat interval": "Repeat interval",
-  "Save": "Save",
+  "Select channel": "Select channel",
+  "Input channel": "Input channel",
+  "The current version is available in the channels listed in the dropdown below. Select a channel that reflects the desired version. Critical security updates will be delivered to any vulnerable channels.": "The current version is available in the channels listed in the dropdown below. Select a channel that reflects the desired version. Critical security updates will be delivered to any vulnerable channels.",
+  "Input a channel that reflects the desired version. To verify if the version exists in a channel, save and check the update status. Critical security updates will be delivered to any vulnerable channels.": "Input a channel that reflects the desired version. To verify if the version exists in a channel, save and check the update status. Critical security updates will be delivered to any vulnerable channels.",
+  "e.g., {{version}}": "e.g., {{version}}",
+  "Potential channels are {{stable}}, {{fast}}, or {{candidate}}.": "Potential channels are {{stable}}, {{fast}}, or {{candidate}}.",
   "Close": "Close",
+  "Select new version": "Select new version",
+  "Select version": "Select version",
   "Default pull Secret": "Default pull Secret",
   "Specify default credentials to be used to authenticate and download containers within this namespace. These credentials will be the default unless a pod references a specific pull Secret.": "Specify default credentials to be used to authenticate and download containers within this namespace. These credentials will be the default unless a pod references a specific pull Secret.",
   "Overwriting default pull Secret": "Overwriting default pull Secret",
@@ -292,7 +397,6 @@
   "View in Metrics": "View in Metrics",
   "Starts": "Starts",
   "Firing alerts": "Firing alerts",
-  "State": "State",
   "Creator": "Creator",
   "Platform": "Platform",
   "{{alertName}} details": "{{alertName}} details",
@@ -390,7 +494,6 @@
   "Invalid date / time": "Invalid date / time",
   "Datetime": "Datetime",
   "Silences temporarily mute alerts based on a set of label selectors that you define. Notifications will not be sent for alerts that match all the listed values or regular expressions.": "Silences temporarily mute alerts based on a set of label selectors that you define. Notifications will not be sent for alerts that match all the listed values or regular expressions.",
-  "Duration": "Duration",
   "Silence alert from...": "Silence alert from...",
   "Now": "Now",
   "For...": "For...",
@@ -416,19 +519,18 @@
   "No projects found": "No projects found",
   "by name or display name": "by name or display name",
   "Project": "Project",
-  "CPU usage": "CPU usage",
-  "Memory usage": "Memory usage",
   "Memory usage by pod (top 10)": "Memory usage by pod (top 10)",
   "Resource usage": "Resource usage",
   "Default pull secret": "Default pull secret",
   "NetworkPolicies": "NetworkPolicies",
-  "{{kind}} details": "{{kind}} details",
-  "Overview": "Overview",
+  "All Projects": "All Projects",
+  "All Namespaces": "All Namespaces",
+  "Select Project...": "Select Project...",
+  "Select Namespace...": "Select Namespace...",
   "Monitoring": "Monitoring",
   "Home": "Home",
   "Search": "Search",
   "Events": "Events",
-  "Operators": "Operators",
   "Workloads": "Workloads",
   "Pods": "Pods",
   "StatefulSets": "StatefulSets",
@@ -437,21 +539,17 @@
   "WorkloadsSeparator": "WorkloadsSeparator",
   "CronJobs": "CronJobs",
   "Jobs": "Jobs",
-  "ReplicaSets": "ReplicaSets",
-  "ReplicationControllers": "ReplicationControllers",
   "HorizontalPodAutoscalers": "HorizontalPodAutoscalers",
   "Serverless": "Serverless",
   "Networking": "Networking",
   "Services": "Services",
   "Routes": "Routes",
   "Ingresses": "Ingresses",
-  "Storage": "Storage",
   "PersistentVolumes": "PersistentVolumes",
   "PersistentVolumeClaims": "PersistentVolumeClaims",
   "StorageClasses": "StorageClasses",
   "VolumeSnapshots": "VolumeSnapshots",
   "VolumeSnapshotClasses": "VolumeSnapshotClasses",
-  "Builds": "Builds",
   "ImageStreams": "ImageStreams",
   "Pipelines": "Pipelines",
   "Service Catalog": "Service Catalog",
@@ -467,13 +565,11 @@
   "MachineConfigs": "MachineConfigs",
   "MachineConfigPools": "MachineConfigPools",
   "User Management": "User Management",
-  "Users": "Users",
   "Groups": "Groups",
   "ServiceAccounts": "ServiceAccounts",
   "Roles": "Roles",
   "RoleBindings": "RoleBindings",
   "Administration": "Administration",
-  "Cluster Settings": "Cluster Settings",
   "LimitRanges": "LimitRanges",
   "Chargeback": "Chargeback",
   "CustomResourceDefinitions": "CustomResourceDefinitions",
@@ -488,13 +584,11 @@
   "Start Build": "Start Build",
   "No Builds found for this Build Config.": "No Builds found for this Build Config.",
   "Resources": "Resources",
-  "Updating": "Updating",
   "Service port:": "Service port:",
   "Pod Port:": "Pod Port:",
   "Location:": "Location:",
   "No Services found for this resource.": "No Services found for this resource.",
   "No Routes found for this resource.": "No Routes found for this resource.",
-  "View logs": "View logs",
   "No Pods found for this resource.": "No Pods found for this resource.",
   "Waiting for the build": "Waiting for the build",
   "Hide waiting pods with errors": "Hide waiting pods with errors",
@@ -522,7 +616,6 @@
   "Node": "Node",
   "IP address": "IP address",
   "Image": "Image",
-  "Started": "Started",
   "Finished": "Finished",
   "Exit code": "Exit code",
   "View {{title}} metrics in query browser": "View {{title}} metrics in query browser",
@@ -531,15 +624,47 @@
   "Pod IP": "Pod IP",
   "Pod details": "Pod details",
   "Init containers": "Init containers",
+  "Terminal": "Terminal",
   "Pod": "Pod",
+  "Duplicate {{label}}": "Duplicate {{label}}",
+  "Edit {{label}} subject": "Edit {{label}} subject",
+  "Delete {{label}} subject": "Delete {{label}} subject",
+  "Are you sure you want to delete subject {{name}} of type {{kind}}?": "Are you sure you want to delete subject {{name}} of type {{kind}}?",
+  "Delete subject": "Delete subject",
+  "Impersonate {{kind}} \"{{name}}\"": "Impersonate {{kind}} \"{{name}}\"",
+  "Role ref": "Role ref",
+  "Subject kind": "Subject kind",
+  "Subject name": "Subject name",
+  "All namespaces": "All namespaces",
+  "No RoleBindings found": "No RoleBindings found",
+  "Roles grant access to types of objects in the cluster. Roles are applied to a group or user via a RoleBinding.": "Roles grant access to types of objects in the cluster. Roles are applied to a group or user via a RoleBinding.",
+  "Namespace RoleBindings": "Namespace RoleBindings",
+  "System RoleBindings": "System RoleBindings",
+  "Cluster-wide RoleBindings": "Cluster-wide RoleBindings",
+  "Create binding": "Create binding",
+  "by role or subject": "by role or subject",
+  "Namespace roles (Role)": "Namespace roles (Role)",
+  "Select role name": "Select role name",
+  "Cluster-wide roles (ClusterRole)": "Cluster-wide roles (ClusterRole)",
+  "Please complete all fields.": "Please complete all fields.",
+  "Namespace role binding (RoleBinding)": "Namespace role binding (RoleBinding)",
+  "Grant the permissions to a user or set of users within the selected namespace.": "Grant the permissions to a user or set of users within the selected namespace.",
+  "Cluster-wide role binding (ClusterRoleBinding)": "Cluster-wide role binding (ClusterRoleBinding)",
+  "Grant the permissions to a user or set of users at the cluster level and in all namespaces.": "Grant the permissions to a user or set of users at the cluster level and in all namespaces.",
+  "Associate a user/group to the selected role to define the type of access and resources that are allowed.": "Associate a user/group to the selected role to define the type of access and resources that are allowed.",
+  "Binding type": "Binding type",
+  "RoleBinding": "RoleBinding",
+  "RoleBinding name": "RoleBinding name",
+  "Role": "Role",
+  "Role name": "Role name",
+  "Subject namespace": "Subject namespace",
+  "Duplicate": "Duplicate",
   "Rollback": "Rollback",
   "ReplicaSet details": "ReplicaSet details",
   "Deployment revision": "Deployment revision",
   "{{count1}} of {{count2}} pods": "{{count1}} of {{count2}} pods",
   "Cancel rollout": "Cancel rollout",
   "Are you sure you want to cancel this rollout?": "Are you sure you want to cancel this rollout?",
-  "Yes, cancel": "Yes, cancel",
-  "No, don't cancel": "No, don't cancel",
   "ReplicationController details": "ReplicationController details",
   "Phase": "Phase",
   "{{statusReplicas}} of {{specReplicas}} pods": "{{statusReplicas}} of {{specReplicas}} pods",
@@ -635,12 +760,36 @@
   "Command": "Command",
   "Script": "Script",
   "Args": "Args",
+  "Git repository": "Git repository",
+  "Git ref": "Git ref",
+  "Git commit": "Git commit",
+  "Binary file": "Binary file",
+  "Context dir": "Context dir",
+  "Dockerfile": "Dockerfile",
+  "JenskinsFile path": "JenskinsFile path",
+  "Build from": "Build from",
+  "Output to": "Output to",
+  "Push secret": "Push secret",
+  "Run policy": "Run policy",
   "Resource limits": "Resource limits",
   "Ports": "Ports",
   "Copied": "Copied",
   "Copy to clipboard": "Copy to clipboard",
   "Just now": "Just now",
+  "Node selector": "Node selector",
+  "Tolerations": "Tolerations",
+  "{{count}} toleration": "{{count}} toleration",
+  "{{count}} toleration_plural": "{{count}} tolerations",
+  "Annotations": "Annotations",
+  "{{count}} annotation": "{{count}} annotation",
+  "{{count}} annotation_plural": "{{count}} annotations",
+  "Created at": "Created at",
   "Runtime class": "Runtime class",
+  "Remove bookmark {{content}}": "Remove bookmark {{content}}",
+  "Add bookmark {{content}}": "Add bookmark {{content}}",
+  "Remove favorite {{content}}": "Remove favorite {{content}}",
+  "Add favorite {{content}}": "Add favorite {{content}}",
+  "Actions": "Actions",
   "Help": "Help",
   "Maximum file size exceeded. File limit is 4MB.": "Maximum file size exceeded. File limit is 4MB.",
   "Drop file here": "Drop file here",
@@ -648,6 +797,25 @@
   "Non-printable file detected.": "Non-printable file detected.",
   "File contains non-printable characters. Preview is not available.": "File contains non-printable characters. Preview is not available.",
   "Deleting": "Deleting",
+  "Logs": "Logs",
+  "Environment": "Environment",
+  "ServiceClasses": "ServiceClasses",
+  "ServicePlans": "ServicePlans",
+  "ServiceBindings": "ServiceBindings",
+  "Cluster Operators": "Cluster Operators",
+  "Delete {{kind}}": "Delete {{kind}}",
+  "Edit {{kind}}": "Edit {{kind}}",
+  "Edit labels": "Edit labels",
+  "Edit Pod selector": "Edit Pod selector",
+  "Edit annotations": "Edit annotations",
+  "Edit Pod count": "Edit Pod count",
+  "Edit taints": "Edit taints",
+  "Edit tolerations": "Edit tolerations",
+  "Add storage": "Add storage",
+  "Expand PVC": "Expand PVC",
+  "Create snapshot": "Create snapshot",
+  "Clone PVC": "Clone PVC",
+  "Restore as new PVC": "Restore as new PVC",
   "Select {{item}}": "Select {{item}}",
   "Add more": "Add more",
   "last {{count}} line": "last {{count}} line",
@@ -657,9 +825,11 @@
   "Resume stream and show {{count}} new line": "Resume stream and show {{count}} new line",
   "Resume stream and show {{count}} new line_plural": "Resume stream and show {{count}} new lines",
   "Resume stream": "Resume stream",
+  "Managed by": "Managed by",
   "Decrement": "Decrement",
   "Increment": "Increment",
   "Managed by:": "Managed by:",
+  "No owner": "No owner",
   "An error occurred. Please try again.": "An error occurred. Please try again.",
   "Select claim": "Select claim",
   "Number of {{sizeUnit}}": "Number of {{sizeUnit}}",
@@ -729,8 +899,6 @@
   "ClusterRoleBindings": "ClusterRoleBindings",
   "ClusterRole": "ClusterRole",
   "ClusterRoles": "ClusterRoles",
-  "RoleBinding": "RoleBinding",
-  "Role": "Role",
   "SelfSubjectAccessReview": "SelfSubjectAccessReview",
   "SelfSubjectAccessReviews": "SelfSubjectAccessReviews",
   "ResourceAccessReview": "ResourceAccessReview",
@@ -754,7 +922,6 @@
   "ServiceInstance": "ServiceInstance",
   "ServiceInstances": "ServiceInstances",
   "ServiceBinding": "ServiceBinding",
-  "ServiceBindings": "ServiceBindings",
   "LimitRange": "LimitRange",
   "APIService": "APIService",
   "APIServices": "APIServices",
@@ -792,13 +959,7 @@
   "VolumeSnapshotClass": "VolumeSnapshotClass",
   "VolumeSnapshotContent": "VolumeSnapshotContent",
   "VolumeSnapshotContents": "VolumeSnapshotContents",
-  "Resume": "Resume",
-  "Pause": "Pause",
-  "1 hour": "1 hour",
-  "6 hours": "6 hours",
-  "24 hours": "24 hours",
   "Loading {{title}} status": "Loading {{title}} status",
-  "Resource": "Resource",
   "Unsupported": "Unsupported",
   "Disable": "Disable",
   "default": "default",