From f84a16c967ef5249a4a6b81adacdbd5991f0dacc Mon Sep 17 00:00:00 2001
From: William Wills <wwills2@protonmail.com>
Date: Fri, 26 Jul 2024 11:22:48 -0400
Subject: [PATCH] fix non-translatable text

---
 .../blocks/forms/CoBenifetsForm.tsx           |  4 +-
 .../blocks/forms/EstimationsForm.tsx          |  8 ++-
 .../components/blocks/forms/IssuancesForm.tsx | 12 ++--
 .../components/blocks/forms/LabelsForm.tsx    | 18 +++---
 .../components/blocks/forms/ProjectForm.tsx   | 42 +++++++-------
 .../blocks/forms/ProjectLocationsForm.tsx     | 10 ++--
 .../components/blocks/forms/RatingsForm.tsx   | 12 ++--
 .../blocks/forms/RelatedProjectsForm.tsx      |  8 ++-
 .../components/blocks/forms/SplitUnitForm.tsx | 15 +++--
 .../components/blocks/forms/UnitForm.tsx      | 38 +++++++------
 .../blocks/forms/UnitIssuanceForm.tsx         | 43 ++++++++-------
 .../blocks/forms/UnitLabelsForm.tsx           | 18 +++---
 .../components/blocks/layout/PageCounter.tsx  |  5 +-
 .../components/blocks/modals/AuditModal.tsx   | 53 +++++++++++++-----
 .../blocks/tables/ProjectsListTable.tsx       |  5 +-
 .../components/blocks/widgets/OrgUidBadge.tsx |  7 ++-
 .../blocks/widgets/OrganizationSelector.tsx   | 18 +++---
 .../blocks/widgets/SyncIndicator.tsx          | 20 +++++--
 src/renderer/translations/tokens/en-US.json   | 55 ++++++++++++++++++-
 19 files changed, 261 insertions(+), 130 deletions(-)

diff --git a/src/renderer/components/blocks/forms/CoBenifetsForm.tsx b/src/renderer/components/blocks/forms/CoBenifetsForm.tsx
index 7388793f..4749a3b0 100644
--- a/src/renderer/components/blocks/forms/CoBenifetsForm.tsx
+++ b/src/renderer/components/blocks/forms/CoBenifetsForm.tsx
@@ -5,6 +5,7 @@ import * as yup from 'yup';
 import { CoBenefit } from '@/schemas/CoBenefit.schema';
 import { PickList } from '@/schemas/PickList.schema';
 import { deepOmit, validateAndSubmitFieldArrayForm } from '@/utils/formik-utils';
+import { useIntl } from 'react-intl';
 
 const validationSchema = yup.object({
   cobenefits: yup.array().of(
@@ -26,6 +27,7 @@ export interface CoBenefitsFormRef {
 
 const CoBenefitsForm = forwardRef<CoBenefitsFormRef, CoBenefitsFormProps>(
   ({ readonly = false, data, picklistOptions }, ref) => {
+    const intl = useIntl();
     const formikRef = useRef<FormikProps<any>>(null);
 
     useImperativeHandle(ref, () => ({
@@ -58,7 +60,7 @@ const CoBenefitsForm = forwardRef<CoBenefitsFormRef, CoBenefitsFormProps>(
                 <div className="grid grid-cols-1 md:grid-cols-2 gap-x-4">
                   <Field
                     name={`${name}[${index}].cobenefit`}
-                    label="Co-Benefit"
+                    label={intl.formatMessage({ id: 'co-benefit' })}
                     type="picklist"
                     freeform={true}
                     options={picklistOptions?.coBenefits}
diff --git a/src/renderer/components/blocks/forms/EstimationsForm.tsx b/src/renderer/components/blocks/forms/EstimationsForm.tsx
index 87e69dee..d7e05c0c 100644
--- a/src/renderer/components/blocks/forms/EstimationsForm.tsx
+++ b/src/renderer/components/blocks/forms/EstimationsForm.tsx
@@ -4,6 +4,7 @@ import { Field, Repeater } from '@/components';
 import { Estimation } from '@/schemas/Estimation.schema';
 import * as yup from 'yup';
 import { deepOmit, validateAndSubmitFieldArrayForm } from '@/utils/formik-utils';
+import { useIntl } from 'react-intl';
 
 const validationSchema = yup.object({
   estimations: yup.array().of(
@@ -28,6 +29,7 @@ export interface EstimationsFormRef {
 }
 
 const EstimationsForm = forwardRef<EstimationsFormRef, EstimationsFormProps>(({ readonly = false, data }, ref) => {
+  const intl = useIntl();
   const formikRef = useRef<FormikProps<any>>(null);
 
   useImperativeHandle(ref, () => ({
@@ -65,7 +67,7 @@ const EstimationsForm = forwardRef<EstimationsFormRef, EstimationsFormProps>(({
               <div className="grid grid-cols-1 md:grid-cols-2 gap-x-4">
                 <Field
                   name={`${name}[${index}].creditingPeriodStart`}
-                  label="Crediting Period Start"
+                  label={intl.formatMessage({ id: 'crediting-period-start' })}
                   type="date"
                   readonly={readonly}
                   required={true}
@@ -73,7 +75,7 @@ const EstimationsForm = forwardRef<EstimationsFormRef, EstimationsFormProps>(({
                 />
                 <Field
                   name={`${name}[${index}].creditingPeriodEnd`}
-                  label="Crediting Period End"
+                  label={intl.formatMessage({ id: 'crediting-period-end' })}
                   type="date"
                   readonly={readonly}
                   required={true}
@@ -81,7 +83,7 @@ const EstimationsForm = forwardRef<EstimationsFormRef, EstimationsFormProps>(({
                 />
                 <Field
                   name={`${name}[${index}].unitCount`}
-                  label="Unit Count"
+                  label={intl.formatMessage({ id: 'unit-count' })}
                   type="number"
                   readonly={readonly}
                   required={true}
diff --git a/src/renderer/components/blocks/forms/IssuancesForm.tsx b/src/renderer/components/blocks/forms/IssuancesForm.tsx
index 15700a7f..ca30ac75 100644
--- a/src/renderer/components/blocks/forms/IssuancesForm.tsx
+++ b/src/renderer/components/blocks/forms/IssuancesForm.tsx
@@ -5,6 +5,7 @@ import { Field, Repeater, UnitSummary } from '@/components';
 import { Issuance } from '@/schemas/Issuance.schema';
 import { PickList } from '@/schemas/PickList.schema';
 import { deepOmit, validateAndSubmitFieldArrayForm } from '@/utils/formik-utils';
+import { useIntl } from 'react-intl';
 
 const validationSchema = yup.object({
   issuances: yup.array().of(
@@ -36,6 +37,7 @@ const defaultIssuanceData: Issuance[] = [];
 
 const IssuancesForm = forwardRef<IssuancesFormRef, IssuancesFormProps>(
   ({ readonly = false, data = defaultIssuanceData, showUnits = false, picklistOptions }, ref) => {
+    const intl = useIntl();
     const formikRef = useRef<FormikProps<any>>(null);
 
     useImperativeHandle(ref, () => ({
@@ -75,7 +77,7 @@ const IssuancesForm = forwardRef<IssuancesFormRef, IssuancesFormProps>(
                   <div className="grid grid-cols-1 md:grid-cols-2 gap-x-4">
                     <Field
                       name={`${name}[${index}].startDate`}
-                      label="Start Date"
+                      label={intl.formatMessage({ id: 'start-date' })}
                       type="date"
                       readonly={readonly}
                       required={true}
@@ -83,7 +85,7 @@ const IssuancesForm = forwardRef<IssuancesFormRef, IssuancesFormProps>(
                     />
                     <Field
                       name={`${name}[${index}].endDate`}
-                      label="End Date"
+                      label={intl.formatMessage({ id: 'end-date' })}
                       type="date"
                       readonly={readonly}
                       required={true}
@@ -91,7 +93,7 @@ const IssuancesForm = forwardRef<IssuancesFormRef, IssuancesFormProps>(
                     />
                     <Field
                       name={`${name}[${index}].verificationApproach`}
-                      label="Verification Approach"
+                      label={intl.formatMessage({ id: 'verification-approach' })}
                       type="text"
                       readonly={readonly}
                       required={true}
@@ -99,7 +101,7 @@ const IssuancesForm = forwardRef<IssuancesFormRef, IssuancesFormProps>(
                     />
                     <Field
                       name={`${name}[${index}].verificationBody`}
-                      label="Verification Body"
+                      label={intl.formatMessage({ id: 'verification-body' })}
                       type="picklist"
                       freeform={true}
                       options={picklistOptions?.verificationBody}
@@ -109,7 +111,7 @@ const IssuancesForm = forwardRef<IssuancesFormRef, IssuancesFormProps>(
                     />
                     <Field
                       name={`${name}[${index}].verificationReportDate`}
-                      label="Verification Report Date"
+                      label={intl.formatMessage({ id: 'verification-report-date' })}
                       type="date"
                       readonly={readonly}
                       required={true}
diff --git a/src/renderer/components/blocks/forms/LabelsForm.tsx b/src/renderer/components/blocks/forms/LabelsForm.tsx
index 057da0cb..b6c537da 100644
--- a/src/renderer/components/blocks/forms/LabelsForm.tsx
+++ b/src/renderer/components/blocks/forms/LabelsForm.tsx
@@ -5,6 +5,7 @@ import * as yup from 'yup';
 import { Label } from '@/schemas/Label.schema';
 import { PickList } from '@/schemas/PickList.schema';
 import { deepOmit, validateAndSubmitFieldArrayForm } from '@/utils/formik-utils';
+import { useIntl } from 'react-intl';
 
 const validationSchema = yup.object({
   labels: yup.array().of(
@@ -50,6 +51,7 @@ export interface LabelsFormRef {
 }
 
 const LabelsForm = forwardRef<LabelsFormRef, LabelsFormProps>(({ readonly = false, data, picklistOptions }, ref) => {
+  const intl = useIntl();
   const formikRef = useRef<FormikProps<any>>(null);
 
   useImperativeHandle(ref, () => ({
@@ -93,7 +95,7 @@ const LabelsForm = forwardRef<LabelsFormRef, LabelsFormProps>(({ readonly = fals
                 <div className="grid grid-cols-1 md:grid-cols-2 gap-x-4">
                   <Field
                     name={`${name}[${index}].label`}
-                    label="Label"
+                    label={intl.formatMessage({ id: 'label' })}
                     type="text"
                     readonly={readonly}
                     required={true}
@@ -101,7 +103,7 @@ const LabelsForm = forwardRef<LabelsFormRef, LabelsFormProps>(({ readonly = fals
                   />
                   <Field
                     name={`${name}[${index}].labelType`}
-                    label="Label Type"
+                    label={intl.formatMessage({ id: 'label-type' })}
                     type="picklist"
                     options={picklistOptions?.labelType}
                     readonly={readonly}
@@ -110,7 +112,7 @@ const LabelsForm = forwardRef<LabelsFormRef, LabelsFormProps>(({ readonly = fals
                   />
                   <Field
                     name={`${name}[${index}].labelLink`}
-                    label="Label Link"
+                    label={intl.formatMessage({ id: 'label-link' })}
                     type="link"
                     readonly={readonly}
                     required={true}
@@ -118,7 +120,7 @@ const LabelsForm = forwardRef<LabelsFormRef, LabelsFormProps>(({ readonly = fals
                   />
                   <Field
                     name={`${name}[${index}].validityPeriodStartDate`}
-                    label="Validity Period Start Date"
+                    label={intl.formatMessage({ id: 'validity-period-start-date' })}
                     type="date"
                     readonly={readonly}
                     required={true}
@@ -126,7 +128,7 @@ const LabelsForm = forwardRef<LabelsFormRef, LabelsFormProps>(({ readonly = fals
                   />
                   <Field
                     name={`${name}[${index}].validityPeriodEndDate`}
-                    label="Validity Period End Date"
+                    label={intl.formatMessage({ id: 'validity-period-end-date' })}
                     type="date"
                     readonly={readonly}
                     required={true}
@@ -134,7 +136,7 @@ const LabelsForm = forwardRef<LabelsFormRef, LabelsFormProps>(({ readonly = fals
                   />
                   <Field
                     name={`${name}[${index}].creditingPeriodStartDate`}
-                    label="Crediting Period Start Date"
+                    label={intl.formatMessage({ id: 'crediting-period-start-date' })}
                     type="date"
                     readonly={readonly}
                     required={true}
@@ -142,7 +144,7 @@ const LabelsForm = forwardRef<LabelsFormRef, LabelsFormProps>(({ readonly = fals
                   />
                   <Field
                     name={`${name}[${index}].creditingPeriodEndDate`}
-                    label="Crediting Period End Date"
+                    label={intl.formatMessage({ id: 'crediting-period-end-date' })}
                     type="date"
                     readonly={readonly}
                     required={true}
@@ -150,7 +152,7 @@ const LabelsForm = forwardRef<LabelsFormRef, LabelsFormProps>(({ readonly = fals
                   />
                   <Field
                     name={`${name}[${index}].unitQuantity`}
-                    label="Unit Quantity"
+                    label={intl.formatMessage({ id: 'unit-quantity' })}
                     type="number"
                     readonly={readonly}
                     required={true}
diff --git a/src/renderer/components/blocks/forms/ProjectForm.tsx b/src/renderer/components/blocks/forms/ProjectForm.tsx
index e8573e4a..69a36ec3 100644
--- a/src/renderer/components/blocks/forms/ProjectForm.tsx
+++ b/src/renderer/components/blocks/forms/ProjectForm.tsx
@@ -4,6 +4,7 @@ import * as yup from 'yup';
 import { Card, Field } from '@/components';
 import { Project } from '@/schemas/Project.schema';
 import { PickList } from '@/schemas/PickList.schema';
+import { useIntl } from 'react-intl';
 
 const validationSchema = yup.object({
   projectName: yup.string().required('Project Name is required').min(1, 'Project Name cannot be empty'),
@@ -75,6 +76,7 @@ const getDefaultInitialValues = (data: Partial<Project>): Project => {
 
 const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, ProjectFormProps>(
   ({ readonly = false, data = {}, picklistOptions }, ref) => {
+    const intl = useIntl();
     const formikRef = React.useRef<FormikProps<any>>(null);
 
     useImperativeHandle(ref, () => ({
@@ -105,7 +107,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                 <div className="grid grid-cols-1 md:grid-cols-2 gap-x-4">
                   <Field
                     name="projectName"
-                    label="Project Name"
+                    label={intl.formatMessage({ id: 'project-name' })}
                     type="text"
                     readonly={readonly}
                     required={true}
@@ -113,7 +115,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                   />
                   <Field
                     name="projectId"
-                    label="External Project Id"
+                    label={intl.formatMessage({ id: 'external-project-id' })}
                     type="text"
                     readonly={readonly}
                     required={true}
@@ -121,7 +123,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                   />
                   <Field
                     name="projectDeveloper"
-                    label="Project Developer"
+                    label={intl.formatMessage({ id: 'project-developer' })}
                     type="text"
                     readonly={readonly}
                     required={true}
@@ -129,7 +131,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                   />
                   <Field
                     name="program"
-                    label="Program"
+                    label={intl.formatMessage({ id: 'program' })}
                     type="text"
                     readonly={readonly}
                     initialValue={data?.program || ''}
@@ -138,7 +140,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                 <div>
                   <Field
                     name="projectLink"
-                    label="Project Link"
+                    label={intl.formatMessage({ id: 'project-link' })}
                     type="link"
                     readonly={readonly}
                     required={true}
@@ -148,7 +150,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                 <div className="grid grid-cols-1 md:grid-cols-2 gap-x-4">
                   <Field
                     name="sector"
-                    label="Sector"
+                    label={intl.formatMessage({ id: 'sector' })}
                     type="picklist"
                     freeform={true}
                     options={picklistOptions?.projectSector}
@@ -158,7 +160,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                   />
                   <Field
                     name="projectType"
-                    label="Project Type"
+                    label={intl.formatMessage({ id: 'project-type' })}
                     freeform={true}
                     type="picklist"
                     options={picklistOptions?.projectType}
@@ -168,7 +170,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                   />
                   <Field
                     name="projectStatus"
-                    label="Project Status"
+                    label={intl.formatMessage({ id: 'project-status' })}
                     type="picklist"
                     options={picklistOptions?.projectStatusValues}
                     readonly={readonly}
@@ -177,7 +179,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                   />
                   <Field
                     name="projectStatusDate"
-                    label="Project Status Date"
+                    label={intl.formatMessage({ id: 'project-status-date' })}
                     type="date"
                     readonly={readonly}
                     required={true}
@@ -189,7 +191,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                 <div className="grid grid-cols-1 md:grid-cols-2 gap-x-4">
                   <Field
                     name="coveredByNDC"
-                    label="Covered By NDC"
+                    label={intl.formatMessage({ id: 'covered-by-ndc' })}
                     type="picklist"
                     options={picklistOptions?.coveredByNDC}
                     readonly={readonly}
@@ -198,14 +200,14 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                   />
                   <Field
                     name="ndcInformation"
-                    label="NDC Information"
+                    label={intl.formatMessage({ id: 'ndc-information' })}
                     type="text"
                     readonly={readonly}
                     initialValue={data?.ndcInformation || ''}
                   />
                   <Field
                     name="currentRegistry"
-                    label="Current Registry"
+                    label={intl.formatMessage({ id: 'current-registry' })}
                     type="picklist"
                     freeform={true}
                     options={picklistOptions?.registries}
@@ -215,7 +217,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                   />
                   <Field
                     name="registryOfOrigin"
-                    label="Registry Of Origin"
+                    label={intl.formatMessage({ id: 'registry-of-origin' })}
                     type="picklist"
                     freeform={true}
                     options={picklistOptions?.registries}
@@ -225,7 +227,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                   />
                   <Field
                     name="originProjectId"
-                    label="Origin Project ID"
+                    label={intl.formatMessage({ id: 'origin-project-id' })}
                     type="text"
                     readonly={readonly}
                     required={true}
@@ -237,7 +239,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                 <div className="grid grid-cols-1 md:grid-cols-2 gap-x-4">
                   <Field
                     name="unitMetric"
-                    label="Unit Metric"
+                    label={intl.formatMessage({ id: 'unit-metric' })}
                     type="picklist"
                     options={picklistOptions?.unitMetric}
                     readonly={readonly}
@@ -246,7 +248,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                   />
                   <Field
                     name="methodology"
-                    label="Methodology"
+                    label={intl.formatMessage({ id: 'methodology' })}
                     type="picklist"
                     freeform={true}
                     options={picklistOptions?.methodology}
@@ -256,7 +258,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                   />
                   <Field
                     name="methodology2"
-                    label="Methodology 2"
+                    label={intl.formatMessage({ id: 'methodology' }) + ' 2'}
                     type="picklist"
                     freeform={true}
                     options={picklistOptions?.methodology}
@@ -265,7 +267,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                   />
                   <Field
                     name="validationBody"
-                    label="Validation Body"
+                    label={intl.formatMessage({ id: 'validation-body' })}
                     type="picklist"
                     options={picklistOptions?.validationBody}
                     readonly={readonly}
@@ -273,7 +275,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                   />
                   <Field
                     name="validationDate"
-                    label="Validation Date"
+                    label={intl.formatMessage({ id: 'validation-date' })}
                     type="date"
                     readonly={readonly}
                     initialValue={data?.validationDate || ''}
@@ -283,7 +285,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
               <Card>
                 <Field
                   name="projectTags"
-                  label="Project Tags"
+                  label={intl.formatMessage({ id: 'project-tags' })}
                   type="tag"
                   readonly={readonly}
                   initialValue={data?.projectTags || ''}
diff --git a/src/renderer/components/blocks/forms/ProjectLocationsForm.tsx b/src/renderer/components/blocks/forms/ProjectLocationsForm.tsx
index 084efc6f..723b8725 100644
--- a/src/renderer/components/blocks/forms/ProjectLocationsForm.tsx
+++ b/src/renderer/components/blocks/forms/ProjectLocationsForm.tsx
@@ -5,6 +5,7 @@ import * as yup from 'yup';
 import { ProjectLocation } from '@/schemas/ProjectLocation.schema';
 import { PickList } from '@/schemas/PickList.schema';
 import { deepOmit, validateAndSubmitFieldArrayForm } from '@/utils/formik-utils';
+import { useIntl } from 'react-intl';
 
 const validationSchema = yup.object({
   locations: yup.array().of(
@@ -29,6 +30,7 @@ export interface ProjectLocationsFormRef {
 
 const ProjectLocationsForm = forwardRef<ProjectLocationsFormRef, ProjectLocationsFormProps>(
   ({ readonly = false, data, picklistOptions }, ref) => {
+    const intl = useIntl();
     const formikRef = useRef<FormikProps<any>>(null);
 
     useImperativeHandle(ref, () => ({
@@ -66,7 +68,7 @@ const ProjectLocationsForm = forwardRef<ProjectLocationsFormRef, ProjectLocation
                 <div className="grid grid-cols-1 md:grid-cols-2 gap-x-4">
                   <Field
                     name={`${name}[${index}].country`}
-                    label="Host Country"
+                    label={intl.formatMessage({ id: 'country' })}
                     type="picklist"
                     options={picklistOptions?.countries}
                     readonly={readonly}
@@ -75,14 +77,14 @@ const ProjectLocationsForm = forwardRef<ProjectLocationsFormRef, ProjectLocation
                   />
                   <Field
                     name={`${name}[${index}].inCountryRegion`}
-                    label="In-Country Region"
+                    label={intl.formatMessage({ id: 'in-country-region' })}
                     type="text"
                     readonly={readonly}
                     initialValue={location.inCountryRegion}
                   />
                   <Field
                     name={`${name}[${index}].geographicIdentifier`}
-                    label="Geographic Identifier"
+                    label={intl.formatMessage({ id: 'geographic-identifier' })}
                     type="text"
                     readonly={readonly}
                     required={true}
@@ -90,7 +92,7 @@ const ProjectLocationsForm = forwardRef<ProjectLocationsFormRef, ProjectLocation
                   />
                   <Field
                     name={`${name}[${index}].fileId`}
-                    label="File ID"
+                    label={intl.formatMessage({ id: 'file-id' })}
                     type="text"
                     readonly={readonly}
                     initialValue={location.fileId}
diff --git a/src/renderer/components/blocks/forms/RatingsForm.tsx b/src/renderer/components/blocks/forms/RatingsForm.tsx
index fadce108..865fa620 100644
--- a/src/renderer/components/blocks/forms/RatingsForm.tsx
+++ b/src/renderer/components/blocks/forms/RatingsForm.tsx
@@ -5,6 +5,7 @@ import * as yup from 'yup';
 import { Rating } from '@/schemas/Rating.schema';
 import { PickList } from '@/schemas/PickList.schema';
 import { deepOmit, validateAndSubmitFieldArrayForm } from '@/utils/formik-utils';
+import { useIntl } from 'react-intl';
 
 const validationSchema = yup.object({
   ratings: yup.array().of(
@@ -29,6 +30,7 @@ export interface RatingsFormRef {
 }
 
 const RatingsForm = forwardRef<RatingsFormRef, RatingsFormProps>(({ readonly = false, data, picklistOptions }, ref) => {
+  const intl = useIntl();
   const formikRef = useRef<FormikProps<any>>(null);
 
   useImperativeHandle(ref, () => ({
@@ -68,7 +70,7 @@ const RatingsForm = forwardRef<RatingsFormRef, RatingsFormProps>(({ readonly = f
                 <div className="grid grid-cols-1 md:grid-cols-2 gap-x-4">
                   <Field
                     name={`${name}[${index}].ratingType`}
-                    label="Rating Type"
+                    label={intl.formatMessage({ id: 'rating-type' })}
                     type="picklist"
                     options={picklistOptions?.ratingType}
                     readonly={readonly}
@@ -77,7 +79,7 @@ const RatingsForm = forwardRef<RatingsFormRef, RatingsFormProps>(({ readonly = f
                   />
                   <Field
                     name={`${name}[${index}].ratingRangeLowest`}
-                    label="Rating Lowest"
+                    label={intl.formatMessage({ id: 'rating-range-lowest' })}
                     type="text"
                     readonly={readonly}
                     required={true}
@@ -85,7 +87,7 @@ const RatingsForm = forwardRef<RatingsFormRef, RatingsFormProps>(({ readonly = f
                   />
                   <Field
                     name={`${name}[${index}].ratingRangeHighest`}
-                    label="Rating Highest"
+                    label={intl.formatMessage({ id: 'rating-range-highest' })}
                     type="text"
                     readonly={readonly}
                     required={true}
@@ -93,7 +95,7 @@ const RatingsForm = forwardRef<RatingsFormRef, RatingsFormProps>(({ readonly = f
                   />
                   <Field
                     name={`${name}[${index}].rating`}
-                    label="Rating"
+                    label={intl.formatMessage({ id: 'rating' })}
                     type="text"
                     readonly={readonly}
                     required={true}
@@ -101,7 +103,7 @@ const RatingsForm = forwardRef<RatingsFormRef, RatingsFormProps>(({ readonly = f
                   />
                   <Field
                     name={`${name}[${index}].ratingLink`}
-                    label="Rating Link"
+                    label={intl.formatMessage({ id: 'rating-link' })}
                     type="link"
                     readonly={readonly}
                     required={true}
diff --git a/src/renderer/components/blocks/forms/RelatedProjectsForm.tsx b/src/renderer/components/blocks/forms/RelatedProjectsForm.tsx
index 4f6d8d6d..3f8de471 100644
--- a/src/renderer/components/blocks/forms/RelatedProjectsForm.tsx
+++ b/src/renderer/components/blocks/forms/RelatedProjectsForm.tsx
@@ -5,6 +5,7 @@ import * as yup from 'yup';
 import { RelatedProject } from '@/schemas/RelatedProject.schema';
 import { deepOmit, validateAndSubmitFieldArrayForm } from '@/utils/formik-utils';
 import { useGetProjectOptionsList, useQueryParamState } from '@/hooks';
+import { useIntl } from 'react-intl';
 
 const validationSchema = yup.object({
   relatedProjects: yup.array().of(
@@ -27,6 +28,7 @@ export interface RelatedProjectsFormRef {
 
 const RelatedProjectsForm = forwardRef<RelatedProjectsFormRef, RelatedProjectsFormProps>(
   ({ readonly = false, data }, ref) => {
+    const intl = useIntl();
     const formikRef = useRef<FormikProps<any>>(null);
     const [orgUid] = useQueryParamState('orgUid');
 
@@ -70,21 +72,21 @@ const RelatedProjectsForm = forwardRef<RelatedProjectsFormRef, RelatedProjectsFo
                 <div className="grid grid-cols-1 md:grid-cols-2 gap-x-4">
                   <Field
                     name={`${name}[${index}].relationshipType`}
-                    label="Relationship Type"
+                    label={intl.formatMessage({ id: 'relationship-type' })}
                     type="text"
                     readonly={readonly}
                     initialValue={relatedProject.relationshipType}
                   />
                   <Field
                     name={`${name}[${index}].registry`}
-                    label="Registry"
+                    label={intl.formatMessage({ id: 'registry' })}
                     type="text"
                     readonly={readonly}
                     initialValue={relatedProject.registry}
                   />
                   <Field
                     name={`${name}[${index}].relatedProjectId`}
-                    label="Related Projects"
+                    label={intl.formatMessage({ id: 'related-projects' })}
                     type="picklist"
                     options={projectOptions}
                     readonly={readonly}
diff --git a/src/renderer/components/blocks/forms/SplitUnitForm.tsx b/src/renderer/components/blocks/forms/SplitUnitForm.tsx
index 92770a2b..8398e402 100644
--- a/src/renderer/components/blocks/forms/SplitUnitForm.tsx
+++ b/src/renderer/components/blocks/forms/SplitUnitForm.tsx
@@ -5,6 +5,7 @@ import * as yup from 'yup';
 import { UnitSplit } from '@/schemas/Unit.schema';
 import { PickList } from '@/schemas/PickList.schema';
 import { deepOmit, validateAndSubmitFieldArrayForm } from '@/utils/formik-utils';
+import { useIntl } from 'react-intl';
 
 const validationSchema = yup.object({
   units: yup.array().of(
@@ -28,6 +29,7 @@ export interface SplitUnitFormRef {
 }
 
 const SplitUnitForm = forwardRef<SplitUnitFormRef, SplitUnitFormProps>(({ picklistOptions }, ref) => {
+  const intl = useIntl();
   const formikRef = useRef<FormikProps<any>>(null);
 
   useImperativeHandle(ref, () => ({
@@ -89,19 +91,24 @@ const SplitUnitForm = forwardRef<SplitUnitFormRef, SplitUnitFormProps>(({ pickli
                   <Field
                     name={`${name}[${index}].unitBlockStart`}
                     required={true}
-                    label="Unit Block Start"
+                    label={intl.formatMessage({ id: 'unit-block-start' })}
+                    type="text"
+                  />
+                  <Field
+                    name={`${name}[${index}].unitBlockEnd`}
+                    required={true}
+                    label={intl.formatMessage({ id: 'unit-block-end' })}
                     type="text"
                   />
-                  <Field name={`${name}[${index}].unitBlockEnd`} required={true} label="Unit Block End" type="text" />
                   <Field
                     name={`${name}[${index}].countryJurisdictionOfOwner`}
-                    label="Country Jurisdiction Of Owner"
+                    label={intl.formatMessage({ id: 'country-jurisdiction-of-owner' })}
                     type="picklist"
                     options={picklistOptions?.countries}
                   />
                   <Field
                     name={`${name}[${index}].inCountryJurisdictionOfOwner`}
-                    label="In-Country Jurisdiction Of Owner"
+                    label={intl.formatMessage({ id: 'in-country-jurisdiction-of-owner' })}
                     type="picklist"
                     options={picklistOptions?.countries}
                   />
diff --git a/src/renderer/components/blocks/forms/UnitForm.tsx b/src/renderer/components/blocks/forms/UnitForm.tsx
index e53b0a77..72283c3e 100644
--- a/src/renderer/components/blocks/forms/UnitForm.tsx
+++ b/src/renderer/components/blocks/forms/UnitForm.tsx
@@ -6,6 +6,7 @@ import { Unit } from '@/schemas/Unit.schema';
 import { useGetHomeOrgQuery, useGetProjectQuery } from '@/api';
 import { PickList } from '@/schemas/PickList.schema';
 import { useGetProjectOptionsList } from '@/hooks';
+import { useIntl } from 'react-intl';
 
 function removeNullFields(obj) {
   // Check if the input is an object and not null
@@ -75,6 +76,7 @@ export interface UnitFormRef {
 }
 
 const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, data: unit, picklistOptions }, ref) => {
+  const intl = useIntl();
   const formikRef = useRef<FormikProps<any>>(null);
   const { data: homeOrg, isLoading: isHomeOrgLoading } = useGetHomeOrgQuery();
   const [error, setError] = useState<string | null>(null);
@@ -182,7 +184,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
 
                 <Field
                   name="projectLocationId"
-                  label="Project Location Id"
+                  label={intl.formatMessage({ id: 'project-location-id' })}
                   disabled={!selectedWarehouseProjectId}
                   type="picklist"
                   options={projectLocationOptions}
@@ -191,14 +193,14 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
                 />
                 <Field
                   name="unitOwner"
-                  label="Unit Owner"
+                  label={intl.formatMessage({ id: 'unit-owner' })}
                   type="text"
                   readonly={readonly}
                   initialValue={unit?.unitOwner || ''}
                 />
                 <Field
                   name="unitBlockStart"
-                  label="Unit Block Start"
+                  label={intl.formatMessage({ id: 'unit-block-start' })}
                   type="text"
                   readonly={readonly}
                   required={true}
@@ -207,7 +209,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
 
                 <Field
                   name="unitBlockEnd"
-                  label="Unit Block End"
+                  label={intl.formatMessage({ id: 'unit-block-end' })}
                   type="text"
                   readonly={readonly}
                   required={true}
@@ -216,7 +218,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
 
                 <Field
                   name="unitCount"
-                  label="Unit Count"
+                  label={intl.formatMessage({ id: 'unit-count' })}
                   type="number"
                   readonly={readonly}
                   required={true}
@@ -225,7 +227,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
 
                 <Field
                   name="countryJurisdictionOfOwner"
-                  label="Country Jurisdiction Of Owner"
+                  label={intl.formatMessage({ id: 'country-jurisdiction-of-owner' })}
                   type="picklist"
                   options={picklistOptions?.countries}
                   readonly={readonly}
@@ -235,7 +237,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
 
                 <Field
                   name="inCountryJurisdictionOfOwner"
-                  label="In-Country Jurisdiction Of Owner"
+                  label={intl.formatMessage({ id: 'in-country-jurisdiction-of-owner' })}
                   type="text"
                   readonly={readonly}
                   required={true}
@@ -244,7 +246,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
 
                 <Field
                   name="unitType"
-                  label="Unit Type"
+                  label={intl.formatMessage({ id: 'unit-type' })}
                   type="picklist"
                   options={picklistOptions?.unitType}
                   readonly={readonly}
@@ -254,7 +256,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
 
                 <Field
                   name="unitStatus"
-                  label="Unit Status"
+                  label={intl.formatMessage({ id: 'unit-status' })}
                   type="picklist"
                   options={picklistOptions?.unitStatus}
                   readonly={readonly}
@@ -264,7 +266,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
 
                 <Field
                   name="unitStatusReason"
-                  label="Unit Status Reason"
+                  label={intl.formatMessage({ id: 'unit-status-reason' })}
                   type="text"
                   readonly={readonly}
                   initialValue={unit?.unitStatusReason || ''}
@@ -272,7 +274,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
 
                 <Field
                   name="vintageYear"
-                  label="Vintage Year"
+                  label={intl.formatMessage({ id: 'vintage-year' })}
                   type="number"
                   readonly={readonly}
                   required={true}
@@ -282,7 +284,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
               <div>
                 <Field
                   name="unitRegistryLink"
-                  label="Unit Registry Link"
+                  label={intl.formatMessage({ id: 'unit-registry-link' })}
                   type="link"
                   readonly={readonly}
                   initialValue={unit?.unitRegistryLink || ''}
@@ -294,7 +296,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
               <div className="grid grid-cols-1 md:grid-cols-2 gap-x-4">
                 <Field
                   name="marketplace"
-                  label="Marketplace"
+                  label={intl.formatMessage({ id: 'marketplace' })}
                   type="text"
                   readonly={readonly}
                   initialValue={unit?.marketplace || ''}
@@ -302,7 +304,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
 
                 <Field
                   name="marketplaceIdentifier"
-                  label="Marketplace Identifier"
+                  label={intl.formatMessage({ id: 'marketplace-identifier' })}
                   type="text"
                   readonly={readonly}
                   initialValue={unit?.marketplaceIdentifier || ''}
@@ -310,7 +312,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
 
                 <Field
                   name="marketplaceLink"
-                  label="Marketplace Link"
+                  label={intl.formatMessage({ id: 'marketplace-link' })}
                   type="text"
                   readonly={readonly}
                   initialValue={unit?.marketplaceLink || ''}
@@ -318,7 +320,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
 
                 <Field
                   name="correspondingAdjustmentStatus"
-                  label="Corresponding Adjustment Status"
+                  label={intl.formatMessage({ id: 'corresponding-adjustment-status' })}
                   type="picklist"
                   options={picklistOptions?.correspondingAdjustmentStatus}
                   readonly={readonly}
@@ -328,7 +330,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
 
                 <Field
                   name="correspondingAdjustmentDeclaration"
-                  label="Corresponding Adjustment Declaration"
+                  label={intl.formatMessage({ id: 'corresponding-adjustment-declaration' })}
                   type="picklist"
                   options={picklistOptions?.correspondingAdjustmentDeclaration}
                   readonly={readonly}
@@ -340,7 +342,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
             <Card>
               <Field
                 name="unitTags"
-                label="Unit Tags"
+                label={intl.formatMessage({ id: 'unit-tags' })}
                 type="tag"
                 readonly={readonly}
                 initialValue={unit?.unitTags || ''}
diff --git a/src/renderer/components/blocks/forms/UnitIssuanceForm.tsx b/src/renderer/components/blocks/forms/UnitIssuanceForm.tsx
index 1afc0d79..3f03f3cc 100644
--- a/src/renderer/components/blocks/forms/UnitIssuanceForm.tsx
+++ b/src/renderer/components/blocks/forms/UnitIssuanceForm.tsx
@@ -1,10 +1,10 @@
-import { omit } from 'lodash';
-import { isEmpty } from 'lodash';
-import { forwardRef, useImperativeHandle, useState, useMemo, useCallback } from 'react';
+import { isEmpty, omit } from 'lodash';
+import { forwardRef, useCallback, useImperativeHandle, useMemo, useState } from 'react';
 import { Issuance } from '@/schemas/Issuance.schema';
 import { useGetProjectQuery } from '@/api';
-import { SelectOption, Select, IssuancesForm, Spacer } from '@/components';
+import { IssuancesForm, Select, SelectOption, Spacer } from '@/components';
 import dayjs from 'dayjs';
+import { useIntl } from 'react-intl';
 
 interface UnitIssuanceFormProps {
   readonly?: boolean;
@@ -18,12 +18,10 @@ export interface UnitIssuanceFormRef {
 
 const UnitIssuanceForm = forwardRef<UnitIssuanceFormRef, UnitIssuanceFormProps>(
   ({ data: issuance, selectedWarehouseProjectId }, ref) => {
+    const intl = useIntl();
     const [selectedIssuance, setSelectedIssuance] = useState<Issuance | undefined>(issuance || undefined);
     const [error, setError] = useState<string | null>(null);
-    const {
-      data: projectData,
-      isLoading: isProjectLoading,
-    } = useGetProjectQuery(
+    const { data: projectData, isLoading: isProjectLoading } = useGetProjectQuery(
       // @ts-ignore
       { warehouseProjectId: selectedWarehouseProjectId },
       { skip: !selectedWarehouseProjectId },
@@ -37,7 +35,7 @@ const UnitIssuanceForm = forwardRef<UnitIssuanceFormRef, UnitIssuanceFormProps>(
           return;
         }
 
-        return [isEmpty(errors) ? null : errors, { issuance: omit(selectedIssuance, ['orgUid'])}];
+        return [isEmpty(errors) ? null : errors, { issuance: omit(selectedIssuance, ['orgUid']) }];
       },
     }));
 
@@ -45,23 +43,28 @@ const UnitIssuanceForm = forwardRef<UnitIssuanceFormRef, UnitIssuanceFormProps>(
       if (isProjectLoading || !projectData?.issuances) {
         return [];
       }
-      return projectData.issuances.map((issuance): SelectOption => ({
-        label: `${dayjs(issuance.startDate).format('DD/MM/YYYY')} - ${dayjs(issuance.endDate).format('DD/MM/YYYY')}`,
-        value: issuance.id || '',
-      }));
+      return projectData.issuances.map(
+        (issuance): SelectOption => ({
+          label: `${dayjs(issuance.startDate).format('DD/MM/YYYY')} - ${dayjs(issuance.endDate).format('DD/MM/YYYY')}`,
+          value: issuance.id || '',
+        }),
+      );
     }, [projectData, isProjectLoading]);
 
-    const handleSetIssuance = useCallback((value) => {
-      setError(null);
-      const selectedIssuanceId = value;
-      const foundIssuance = projectData?.issuances?.find(issuance => issuance.id === selectedIssuanceId);
-      setSelectedIssuance(foundIssuance);
-    }, [projectData]);
+    const handleSetIssuance = useCallback(
+      (value) => {
+        setError(null);
+        const selectedIssuanceId = value;
+        const foundIssuance = projectData?.issuances?.find((issuance) => issuance.id === selectedIssuanceId);
+        setSelectedIssuance(foundIssuance);
+      },
+      [projectData],
+    );
 
     return (
       <div>
         <Select
-          name="Select Issuance"
+          name={intl.formatMessage({ id: 'select-issuance' })}
           options={issuanceOptions}
           onChange={handleSetIssuance}
           initialValue={selectedIssuance ? selectedIssuance.id?.toString() : ''}
diff --git a/src/renderer/components/blocks/forms/UnitLabelsForm.tsx b/src/renderer/components/blocks/forms/UnitLabelsForm.tsx
index a2bc22d2..7533c15d 100644
--- a/src/renderer/components/blocks/forms/UnitLabelsForm.tsx
+++ b/src/renderer/components/blocks/forms/UnitLabelsForm.tsx
@@ -6,6 +6,7 @@ import { Label } from '@/schemas/Label.schema';
 import { PickList } from '@/schemas/PickList.schema';
 import { deepOmit, validateAndSubmitFieldArrayForm } from '@/utils/formik-utils';
 import { useGetProjectQuery } from '@/api';
+import { useIntl } from 'react-intl';
 
 /**
  * Validation schema for labels form
@@ -65,6 +66,7 @@ export interface UnitLabelsFormRef {
  */
 const UnitLabelsForm = forwardRef<UnitLabelsFormRef, LabelsFormProps>(
   ({ readonly = false, data: labels, picklistOptions, selectedWarehouseProjectId }, ref) => {
+    const intl = useIntl();
     const formikRef = useRef<FormikProps<any>>(null);
     const [selectedLabels, setSelectedLabels] = useState<Label[]>(labels || []);
 
@@ -171,7 +173,7 @@ const UnitLabelsForm = forwardRef<UnitLabelsFormRef, LabelsFormProps>(
                   <div className="grid grid-cols-1 md:grid-cols-2 gap-x-4">
                     <Field
                       name={`${name}[${index}].label`}
-                      label="Label"
+                      label={intl.formatMessage({ id: 'label' })}
                       type="text"
                       readonly={readonly || Boolean(selectedLabels[index]?.id)}
                       required={true}
@@ -179,7 +181,7 @@ const UnitLabelsForm = forwardRef<UnitLabelsFormRef, LabelsFormProps>(
                     />
                     <Field
                       name={`${name}[${index}].labelType`}
-                      label="Label Type"
+                      label={intl.formatMessage({ id: 'label-type' })}
                       type="picklist"
                       options={picklistOptions?.labelType}
                       readonly={readonly || Boolean(selectedLabels[index]?.id)}
@@ -188,42 +190,42 @@ const UnitLabelsForm = forwardRef<UnitLabelsFormRef, LabelsFormProps>(
                     />
                     <Field
                       name={`${name}[${index}].labelLink`}
-                      label="Label Link"
+                      label={intl.formatMessage({ id: 'label-link' })}
                       type="link"
                       readonly={readonly || Boolean(selectedLabels[index]?.id)}
                       initialValue={selectedLabels[index]?.labelLink}
                     />
                     <Field
                       name={`${name}[${index}].validityPeriodStartDate`}
-                      label="Validity Period Start Date"
+                      label={intl.formatMessage({ id: 'validity-period-start-date' })}
                       type="date"
                       readonly={readonly || Boolean(selectedLabels[index]?.id)}
                       initialValue={selectedLabels[index]?.validityPeriodStartDate}
                     />
                     <Field
                       name={`${name}[${index}].validityPeriodEndDate`}
-                      label="Validity Period End Date"
+                      label={intl.formatMessage({ id: 'validity-period-end-date' })}
                       type="date"
                       readonly={readonly || Boolean(selectedLabels[index]?.id)}
                       initialValue={selectedLabels[index]?.validityPeriodEndDate}
                     />
                     <Field
                       name={`${name}[${index}].creditingPeriodStartDate`}
-                      label="Crediting Period Start Date"
+                      label={intl.formatMessage({ id: 'crediting-period-start-date' })}
                       type="date"
                       readonly={readonly || Boolean(selectedLabels[index]?.id)}
                       initialValue={selectedLabels[index]?.creditingPeriodStartDate}
                     />
                     <Field
                       name={`${name}[${index}].creditingPeriodEndDate`}
-                      label="Crediting Period End Date"
+                      label={intl.formatMessage({ id: 'crediting-period-end-date' })}
                       type="date"
                       readonly={readonly || Boolean(selectedLabels[index]?.id)}
                       initialValue={selectedLabels[index]?.creditingPeriodEndDate}
                     />
                     <Field
                       name={`${name}[${index}].unitQuantity`}
-                      label="Unit Quantity"
+                      label={intl.formatMessage({ id: 'unit-quantity' })}
                       type="number"
                       readonly={readonly || Boolean(selectedLabels[index]?.id)}
                       required={true}
diff --git a/src/renderer/components/blocks/layout/PageCounter.tsx b/src/renderer/components/blocks/layout/PageCounter.tsx
index 037e2ccf..53797666 100644
--- a/src/renderer/components/blocks/layout/PageCounter.tsx
+++ b/src/renderer/components/blocks/layout/PageCounter.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { FormattedMessage } from 'react-intl';
 
 // Define an interface for the component's props
 interface PageCounterProps {
@@ -9,11 +10,11 @@ interface PageCounterProps {
 const PageCounter: React.FC<PageCounterProps> = ({ currentPage, totalCount }) => {
   return (
     <div className="text-sm text-gray-600 dark:text-gray-400">
-      Show{' '}
+      <FormattedMessage id="show" />{' '}
       <span className="font-semibold">
         {(currentPage - 1) * 10 + 1} - {Math.min((currentPage - 1) * 10 + 10, totalCount)}
       </span>{' '}
-      of <span className="font-semibold">{totalCount}</span>
+      <FormattedMessage id="of" /> <span className="font-semibold">{totalCount}</span>
     </div>
   );
 };
diff --git a/src/renderer/components/blocks/modals/AuditModal.tsx b/src/renderer/components/blocks/modals/AuditModal.tsx
index 7c5617cc..ab2bfc86 100644
--- a/src/renderer/components/blocks/modals/AuditModal.tsx
+++ b/src/renderer/components/blocks/modals/AuditModal.tsx
@@ -1,19 +1,19 @@
 import React, { useCallback } from 'react';
 import {
-  Modal,
+  CoBenefitsForm,
+  EstimationsForm,
   Field,
-  ProjectForm,
-  LabelsForm,
   IssuancesForm,
+  LabelsForm,
+  Modal,
+  ProjectForm,
   ProjectLocationsForm,
-  UnitForm,
   RatingsForm,
   RelatedProjectsForm,
-  CoBenefitsForm,
-  EstimationsForm,
-  Spacer
+  Spacer,
+  UnitForm,
 } from '@/components';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, useIntl } from 'react-intl';
 import { Form, Formik } from 'formik';
 
 interface AuditModalProps {
@@ -22,6 +22,7 @@ interface AuditModalProps {
 }
 
 const AuditModal: React.FC<AuditModalProps> = ({ auditData, onClose }: AuditModalProps) => {
+  const intl = useIntl();
   const changeForm = useCallback(() => {
     const change = JSON.parse(auditData.change);
     switch (auditData.table) {
@@ -60,24 +61,48 @@ const AuditModal: React.FC<AuditModalProps> = ({ auditData, onClose }: AuditModa
           <Formik initialValues={{}} validationSchema={null} onSubmit={() => {}}>
             <Form>
               <div className="grid grid-cols-1 md:grid-cols-2 gap-x-4">
-                <Field label="Table" name="table" type="text" initialValue={auditData.table} readonly={true} />
                 <Field
-                  label="Timestamp"
+                  label={intl.formatMessage({ id: 'table' })}
+                  name="table"
+                  type="text"
+                  initialValue={auditData.table}
+                  readonly={true}
+                />
+                <Field
+                  label={intl.formatMessage({ id: 'timestamp' })}
                   name="updatedAt"
                   type="date"
                   initialValue={auditData.updatedAt}
                   readonly={true}
                 />
-                <Field label="Type" name="type" type="text" initialValue={auditData.type} readonly={true} />
                 <Field
-                  label="Root Hash"
+                  label={intl.formatMessage({ id: 'type' })}
+                  name="type"
+                  type="text"
+                  initialValue={auditData.type}
+                  readonly={true}
+                />
+                <Field
+                  label={intl.formatMessage({ id: 'root-hash' })}
                   name="rootHash"
                   type="text"
                   initialValue={auditData.rootHash}
                   readonly={true}
                 />
-                <Field label="Author" name="author" type="text" initialValue={auditData.author} readonly={true} />
-                <Field label="Comment" name="comment" type="text" initialValue={auditData.comment} readonly={true} />
+                <Field
+                  label={intl.formatMessage({ id: 'author' })}
+                  name="author"
+                  type="text"
+                  initialValue={auditData.author}
+                  readonly={true}
+                />
+                <Field
+                  label={intl.formatMessage({ id: 'comment' })}
+                  name="comment"
+                  type="text"
+                  initialValue={auditData.comment}
+                  readonly={true}
+                />
               </div>
               <Spacer size={15} />
               {changeForm()}
diff --git a/src/renderer/components/blocks/tables/ProjectsListTable.tsx b/src/renderer/components/blocks/tables/ProjectsListTable.tsx
index bc4fb1da..f74cb167 100644
--- a/src/renderer/components/blocks/tables/ProjectsListTable.tsx
+++ b/src/renderer/components/blocks/tables/ProjectsListTable.tsx
@@ -1,6 +1,6 @@
 import { DebouncedFunc, partial } from 'lodash';
 import React, { useMemo } from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, useIntl } from 'react-intl';
 import {
   Column,
   DataTable,
@@ -39,6 +39,7 @@ const ProjectsListTable: React.FC<TableProps> = ({
   totalPages,
   totalCount,
 }) => {
+  const intl = useIntl();
   const [, editProjectModalActive, setEditProjectModalActive] = useWildCardUrlHash('edit-project');
   const [createProjectModalActive, setCreateProjectModalActive] = useUrlHash('create-project');
 
@@ -141,6 +142,8 @@ const ProjectsListTable: React.FC<TableProps> = ({
           <>
             <PageCounter currentPage={currentPage} totalCount={totalCount} />
             <Pagination
+              nextLabel={intl.formatMessage({ id: 'next-page' })}
+              previousLabel={intl.formatMessage({ id: 'previous-page' })}
               currentPage={currentPage}
               layout="pagination"
               onPageChange={onPageChange}
diff --git a/src/renderer/components/blocks/widgets/OrgUidBadge.tsx b/src/renderer/components/blocks/widgets/OrgUidBadge.tsx
index 884a237a..aa028142 100644
--- a/src/renderer/components/blocks/widgets/OrgUidBadge.tsx
+++ b/src/renderer/components/blocks/widgets/OrgUidBadge.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { Spinner, Toast } from '@/components';
 import { FiInfo } from 'react-icons/fi';
+import { FormattedMessage } from 'react-intl';
 
 interface OrgUidBadgeProps {
   orgUid: string;
@@ -62,7 +63,11 @@ const OrgUidBadge: React.FC<OrgUidBadgeProps> = ({ orgUid, registryId }) => {
             >
               {orgUid}
             </div>
-            <div className="text-gray-700 text-xs font-mono dark:text-gray-300">Registry ID:</div>
+            <div className="text-gray-700 text-xs font-mono dark:text-gray-300">
+              <p>
+                <FormattedMessage id="Registry" /> ID:
+              </p>
+            </div>
             {registryId ? (
               <div
                 className="cursor-pointer hover:bg-gray-100 p-2 rounded text-xs font-mono dark:hover:bg-gray-600 dark:text-gray-200"
diff --git a/src/renderer/components/blocks/widgets/OrganizationSelector.tsx b/src/renderer/components/blocks/widgets/OrganizationSelector.tsx
index 24dd048f..1c8bde6d 100644
--- a/src/renderer/components/blocks/widgets/OrganizationSelector.tsx
+++ b/src/renderer/components/blocks/widgets/OrganizationSelector.tsx
@@ -1,7 +1,8 @@
-import React, { useState, useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useGetOrganizationsListQuery } from '@/api/cadt/v1/organizations';
-import { Dropdown, SyncIndicator, Spinner } from '@/components';
+import { Dropdown, Spinner, SyncIndicator } from '@/components';
 import { Organization } from '@/schemas/Organization.schema';
+import { useIntl } from 'react-intl';
 
 interface OrganizationSelectorProps {
   onSelect: (organization: any | undefined) => void;
@@ -9,18 +10,19 @@ interface OrganizationSelectorProps {
   noSelectionLabel?: string;
 }
 
-const OrganizationSelector: React.FC<OrganizationSelectorProps> = ({
-  onSelect,
-  defaultOrgUid,
-  noSelectionLabel = 'Select Organization',
-}) => {
+const OrganizationSelector: React.FC<OrganizationSelectorProps> = ({ onSelect, defaultOrgUid, noSelectionLabel }) => {
+  const intl = useIntl();
   const { data: organizations, error, isLoading } = useGetOrganizationsListQuery();
   const [selectedOrganization, setSelectedOrganization] = useState<Organization | undefined>(undefined);
 
+  if (!noSelectionLabel) {
+    noSelectionLabel = intl.formatMessage({ id: 'select-organization' });
+  }
+
   useEffect(() => {
     if (defaultOrgUid === null) {
       const allOrganizationsPlaceholder: Organization = {
-        name: 'All Organizations',
+        name: intl.formatMessage({ id: 'all-organizations' }),
         id: 0,
         orgUid: '',
         icon: '',
diff --git a/src/renderer/components/blocks/widgets/SyncIndicator.tsx b/src/renderer/components/blocks/widgets/SyncIndicator.tsx
index a43ca239..d3e2df9b 100644
--- a/src/renderer/components/blocks/widgets/SyncIndicator.tsx
+++ b/src/renderer/components/blocks/widgets/SyncIndicator.tsx
@@ -1,14 +1,15 @@
 import React, { useEffect, useState } from 'react';
 import _ from 'lodash';
 import {
-  useGetOrganizationsMapQuery,
-  useGetOrganizationsListQuery,
   invalidateProjectApiTag,
   invalidateUnitsApiTag,
+  useGetOrganizationsListQuery,
+  useGetOrganizationsMapQuery,
 } from '@/api';
 import { BiRefresh } from 'react-icons/bi';
 import { useLocation } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
+import { FormattedMessage } from 'react-intl';
 
 interface SyncIndicatorProps {
   detailed: boolean;
@@ -92,9 +93,20 @@ const SyncIndicator: React.FC<SyncIndicatorProps> = ({ detailed, orgUid }) => {
         {detailed && (
           <div className="flex flex-col text-left">
             <span className={`text-sm ${isSynced ? 'text-green-700' : 'text-yellow-600'}`}>
-              {isSynced ? 'Synced' : 'Syncing...'}
+              {isSynced ? (
+                <FormattedMessage id="synced" />
+              ) : (
+                <p>
+                  <FormattedMessage id="syncing" />
+                  ...
+                </p>
+              )}
             </span>
-            {!isSynced && <span className="text-xs text-yellow-400">{syncRemaining + 1} remaining</span>}
+            {!isSynced && (
+              <span className="text-xs text-yellow-400">
+                {syncRemaining + 1} <FormattedMessage id="remaining" />
+              </span>
+            )}
           </div>
         )}
       </div>
diff --git a/src/renderer/translations/tokens/en-US.json b/src/renderer/translations/tokens/en-US.json
index 6dc28be7..1e602db4 100644
--- a/src/renderer/translations/tokens/en-US.json
+++ b/src/renderer/translations/tokens/en-US.json
@@ -130,5 +130,58 @@
   "split": "Split",
   "split-unit": "Split Unit",
   "detailed-audit-view": "Detailed Audit Record",
-  "download-failed": "Download failed"
+  "download-failed": "Download failed",
+  "all-organizations": "All Organizations",
+  "syncing": "Syncing",
+  "remaining": "remaining",
+  "registry": "Registry",
+  "show": "Show",
+  "of": "of",
+  "previous-page": "Previous Page",
+  "next-page": "Next Page",
+  "external-project-id": "External Project ID",
+  "program": "Program",
+  "project-link": "Project Link",
+  "project-status-date": "Project Status Date",
+  "ndc-information": "NDC Information",
+  "registry-of-origin": "Registry of Origin",
+  "origin-project-id": "Origin Project ID",
+  "methodology": "Methodology",
+  "validation-date": "Validation Date",
+  "co-benefit": "Co-Benefit",
+  "crediting-period-start": "Crediting Period Start",
+  "crediting-period-end": "Crediting Period End",
+  "start-date": "Start Date",
+  "end-date": "End Date",
+  "verification-approach": "Verification Approach",
+  "verification-body": "Verification Body",
+  "verification-report-date": "Verification Report Date",
+  "label": "Label",
+  "label-type": "Label Type",
+  "label-link": "Label Link",
+  "validity-period-start-date": "Validity Period Start Date",
+  "validity-period-end-date": "Validity Period End Date",
+  "crediting-period-start-date": "Crediting Period Start Date",
+  "crediting-period-end-date": "Crediting Period End Date",
+  "unit-quantity": "Unit Quantity",
+  "country": "Country",
+  "in-country-region": "In Country Reason",
+  "geographic-identifier": "Geographic Identifier",
+  "file-id": "File ID",
+  "rating-type": "Rating Type",
+  "rating-range-lowest": "Rating Range Lowest",
+  "rating-range-highest": "Rating Range Highest",
+  "rating": "Rating",
+  "rating-link": "Rating Link",
+  "relationship-type": "Relationship Type",
+  "unit-block-start": "Unit Block Start",
+  "unit-block-end": "Unit Block End",
+  "in-country-jurisdiction-of-owner": "In-Country Jurisdiction of Owner",
+  "project-location-id": "Project Location ID",
+  "unit-status-reason": "Unit Status Reason",
+  "unit-registry-link": "Unit Registry Link",
+  "marketplace-identifier": "Marketplace Identifier",
+  "marketplace-link": "Marketplace Link",
+  "select-issuance": "Select Issuance",
+  "select-organization": "Select Organization"
 }