diff --git a/public/locales/actions/ar/translation.json b/public/locales/actions/ar/translation.json
deleted file mode 100644
index e5bcee862f..0000000000
--- a/public/locales/actions/ar/translation.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "edit": "تصحيح",
-  "save": "حفظ",
-  "cancel": "إلغاء",
-  "new": "الجديد",
-  "list": "قائمة"
-}
diff --git a/public/locales/actions/de/translation.json b/public/locales/actions/de/translation.json
deleted file mode 100644
index 7a819ff973..0000000000
--- a/public/locales/actions/de/translation.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "edit": "Bearbeiten",
-  "save": "speichern",
-  "cancel": "Stornieren",
-  "new": "Neu",
-  "list": "Liste"
-}
diff --git a/public/locales/actions/en/translation.json b/public/locales/actions/en/translation.json
deleted file mode 100644
index fcc7553ea9..0000000000
--- a/public/locales/actions/en/translation.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "edit": "Edit",
-  "save": "Save",
-  "cancel": "Cancel",
-  "new": "New",
-  "list": "List"
-}
diff --git a/public/locales/actions/es/translation.json b/public/locales/actions/es/translation.json
deleted file mode 100644
index 633664e99e..0000000000
--- a/public/locales/actions/es/translation.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "edit": "Editar",
-  "save": "Guardar",
-  "cancel": "Cancelar",
-  "new": "Nuevo",
-  "list": "Lista"
-}
diff --git a/public/locales/actions/in/translation.json b/public/locales/actions/in/translation.json
deleted file mode 100644
index 586ac04aff..0000000000
--- a/public/locales/actions/in/translation.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "edit": "Edit",
-  "save": "Menyimpan",
-  "cancel": "Membatalkan",
-  "new": "Baru",
-  "list": "Daftar"
-}
diff --git a/public/locales/actions/ja/translation.json b/public/locales/actions/ja/translation.json
deleted file mode 100644
index e41a839268..0000000000
--- a/public/locales/actions/ja/translation.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "edit": "編集",
-    "save": "セーブ",
-    "cancel": "キャンセル",
-    "new": "新しい",
-    "list": "リスト"
-}
diff --git a/public/locales/actions/pt/translation.json b/public/locales/actions/pt/translation.json
deleted file mode 100644
index 56eeb99314..0000000000
--- a/public/locales/actions/pt/translation.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "edit": "Editar",
-  "save": "Salvar",
-  "cancel": "Cancelar",
-  "new": "Novo",
-  "list": "Lista"
-}
diff --git a/public/locales/actions/ru/translation.json b/public/locales/actions/ru/translation.json
deleted file mode 100644
index 94591a0714..0000000000
--- a/public/locales/actions/ru/translation.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "edit": "редактировать",
-  "save": "Сохранить",
-  "cancel": "Отмена",
-  "new": "новый",
-  "list": "Список"
-}
diff --git a/public/locales/actions/zr/translation.json b/public/locales/actions/zr/translation.json
deleted file mode 100644
index 3ada546c5a..0000000000
--- a/public/locales/actions/zr/translation.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "edit": "编辑",
-  "save": "保存",
-  "cancel": "取消",
-  "new": "新",
-  "list": "清单"
-}
diff --git a/public/locales/dashboard/ar/translation.json b/public/locales/dashboard/ar/translation.json
deleted file mode 100644
index af1ee256fa..0000000000
--- a/public/locales/dashboard/ar/translation.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "label": "لوحة القيادة"
-}
diff --git a/public/locales/dashboard/de/translation.json b/public/locales/dashboard/de/translation.json
deleted file mode 100644
index 2a566bebe7..0000000000
--- a/public/locales/dashboard/de/translation.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "label": "Dashboard"
-}
diff --git a/public/locales/dashboard/en/translation.json b/public/locales/dashboard/en/translation.json
deleted file mode 100644
index 2a566bebe7..0000000000
--- a/public/locales/dashboard/en/translation.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "label": "Dashboard"
-}
diff --git a/public/locales/dashboard/es/translation.json b/public/locales/dashboard/es/translation.json
deleted file mode 100644
index 74b19e9afd..0000000000
--- a/public/locales/dashboard/es/translation.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "label": "Panel"
-}
diff --git a/public/locales/dashboard/in/translation.json b/public/locales/dashboard/in/translation.json
deleted file mode 100644
index 87c249706c..0000000000
--- a/public/locales/dashboard/in/translation.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "label": "Dasbor"
-}
diff --git a/public/locales/dashboard/ja/translation.json b/public/locales/dashboard/ja/translation.json
deleted file mode 100644
index e26d8ee732..0000000000
--- a/public/locales/dashboard/ja/translation.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "label": "ダッシュボード"
-}
diff --git a/public/locales/dashboard/pt/translation.json b/public/locales/dashboard/pt/translation.json
deleted file mode 100644
index 5edfd74ff1..0000000000
--- a/public/locales/dashboard/pt/translation.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "label": "Painel de controle"
-}
diff --git a/public/locales/dashboard/ru/translation.json b/public/locales/dashboard/ru/translation.json
deleted file mode 100644
index 1c32f6ae61..0000000000
--- a/public/locales/dashboard/ru/translation.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "label": "Панель приборов"
-}
diff --git a/public/locales/dashboard/zr/translation.json b/public/locales/dashboard/zr/translation.json
deleted file mode 100644
index 1795b4304a..0000000000
--- a/public/locales/dashboard/zr/translation.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "label": "仪表板"
-}
diff --git a/public/locales/patient/ar/translation.json b/public/locales/patient/ar/translation.json
deleted file mode 100644
index 33b8f58fd2..0000000000
--- a/public/locales/patient/ar/translation.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "firstName": "الاسم الاول",
-  "lastName": "الكنية"
-}
diff --git a/public/locales/patient/de/translation.json b/public/locales/patient/de/translation.json
deleted file mode 100644
index 1858fa6833..0000000000
--- a/public/locales/patient/de/translation.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "firstName": "Vorname",
-  "lastName": "Nachname"
-}
diff --git a/public/locales/patient/en/translation.json b/public/locales/patient/en/translation.json
deleted file mode 100644
index 6f283a5744..0000000000
--- a/public/locales/patient/en/translation.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "firstName": "First Name",
-  "lastName": "Last Name"
-}
diff --git a/public/locales/patient/es/translation.json b/public/locales/patient/es/translation.json
deleted file mode 100644
index b7bb3e6700..0000000000
--- a/public/locales/patient/es/translation.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "firstName": "Nombre de pila",
-  "lastName": "Apellido"
-}
diff --git a/public/locales/patient/in/translation.json b/public/locales/patient/in/translation.json
deleted file mode 100644
index b89af63dc6..0000000000
--- a/public/locales/patient/in/translation.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "firstName": "Nama depan",
-  "lastName": "Nama keluarga"
-}
diff --git a/public/locales/patient/ja/translation.json b/public/locales/patient/ja/translation.json
deleted file mode 100644
index d94fc8c0e8..0000000000
--- a/public/locales/patient/ja/translation.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "firstName": "ファーストネーム",
-  "lastName": "苗字"
-}
diff --git a/public/locales/patient/pt/translation.json b/public/locales/patient/pt/translation.json
deleted file mode 100644
index dfeb7b7e13..0000000000
--- a/public/locales/patient/pt/translation.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "firstName": "Primeiro nome",
-  "lastName": "Último nome"
-}
diff --git a/public/locales/patient/ru/translation.json b/public/locales/patient/ru/translation.json
deleted file mode 100644
index 26c13923dc..0000000000
--- a/public/locales/patient/ru/translation.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "firstName": "Имя",
-  "lastName": "Фамилия"
-}
diff --git a/public/locales/patient/zr/translation.json b/public/locales/patient/zr/translation.json
deleted file mode 100644
index 8b66532a55..0000000000
--- a/public/locales/patient/zr/translation.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "firstName": "名字",
-  "lastName": "姓"
-}
diff --git a/public/locales/patients/ar/translation.json b/public/locales/patients/ar/translation.json
deleted file mode 100644
index 7dd89820c8..0000000000
--- a/public/locales/patients/ar/translation.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "label": "المرضى",
-  "viewPatients": "عرض المرضى",
-  "viewPatient": "عرض المريض",
-  "newPatient": "مريض جديد"
-}
diff --git a/public/locales/patients/de/translation.json b/public/locales/patients/de/translation.json
deleted file mode 100644
index 62c68da4c1..0000000000
--- a/public/locales/patients/de/translation.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "label": "Patienten",
-  "viewPatients": "Patienten anzeigen",
-  "viewPatient": "Patient anzeigen",
-  "newPatient": "Neuer Patient"
-}
diff --git a/public/locales/patients/en/translation.json b/public/locales/patients/en/translation.json
deleted file mode 100644
index c9463a6cdc..0000000000
--- a/public/locales/patients/en/translation.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "label": "Patients",
-  "viewPatients": "View Patients",
-  "viewPatient": "View Patient",
-  "newPatient": "New Patient"
-}
diff --git a/public/locales/patients/es/translation.json b/public/locales/patients/es/translation.json
deleted file mode 100644
index 8cbb4fddce..0000000000
--- a/public/locales/patients/es/translation.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "label": "Pacientes",
-  "viewPatients": "Ver pacientes",
-  "viewPatient": "Ver pacientes",
-  "newPatient": "Nuevo paciente"
-}
diff --git a/public/locales/patients/in/translation.json b/public/locales/patients/in/translation.json
deleted file mode 100644
index 55a9d45ccc..0000000000
--- a/public/locales/patients/in/translation.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "label": "Pasien",
-  "viewPatients": "Lihat Pasien",
-  "viewPatient": "Lihat Pasien",
-  "newPatient": "Pasien Baru"
-}
diff --git a/public/locales/patients/ja/translation.json b/public/locales/patients/ja/translation.json
deleted file mode 100644
index 8e4213e99b..0000000000
--- a/public/locales/patients/ja/translation.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "label": "患者さん",
-  "viewPatients": "患者を見る",
-  "viewPatient": "患者を見る",
-  "newPatient": "新しい患者"
-}
diff --git a/public/locales/patients/pt/translation.json b/public/locales/patients/pt/translation.json
deleted file mode 100644
index a5bfb4eb1e..0000000000
--- a/public/locales/patients/pt/translation.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "label": "Pacientes",
-  "viewPatients": "Exibir pacientes",
-  "viewPatient": "Ver paciente",
-  "newPatient": "Novo Paciente"
-}
diff --git a/public/locales/patients/ru/translation.json b/public/locales/patients/ru/translation.json
deleted file mode 100644
index 05362dd37b..0000000000
--- a/public/locales/patients/ru/translation.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "label": "Пациенты",
-  "viewPatients": "Просмотр пациентов",
-  "viewPatient": "Просмотр пациента",
-  "newPatient": "Новый пациент"
-}
diff --git a/public/locales/patients/zr/translation.json b/public/locales/patients/zr/translation.json
deleted file mode 100644
index d843cbfe4c..0000000000
--- a/public/locales/patients/zr/translation.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "label": "耐心",
-  "viewPatients": "查看患者",
-  "viewPatient": "查看患者",
-  "newPatient": "新病人"
-}
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index c9c3d65ff3..e2eb081194 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -22,17 +22,17 @@ const Navbar = () => {
       }}
       navLinks={[
         {
-          label: t('patients.label'),
+          label: t('patients.label', 'patients'),
           onClick: () => {},
           children: [
             {
-              label: t('actions.list'),
+              label: t('actions.list', 'list'),
               onClick: () => {
                 history.push('/patients')
               },
             },
             {
-              label: t('actions.new'),
+              label: t('actions.new', 'new'),
               onClick: () => {
                 history.push('/patients/new')
               },
diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
index e02ae70d38..355b371846 100644
--- a/src/components/Sidebar.tsx
+++ b/src/components/Sidebar.tsx
@@ -12,7 +12,7 @@ const Sidebar = () => {
         <ul className="nav flex-column">
           <li className="nav-item">
             <Link to="/" className={`nav-link ${path.pathname === '/' ? ' active' : ''}`}>
-              {t('dashboard.label')}
+              {t('dashboard.label', 'dashboard')}
             </Link>
           </li>
           <li className="nav-item">
@@ -21,7 +21,7 @@ const Sidebar = () => {
               className={`nav-link ${path.pathname.includes('patient') ? ' active' : ''}`}
             >
               <Icon icon="patients" />
-              {`  ${t('patients.label')}`}
+              {`  ${t('patients.label', 'patients')}`}
             </Link>
           </li>
         </ul>
diff --git a/src/i18n.tsx b/src/i18n.tsx
index d73fdac9b1..05d6e0815d 100644
--- a/src/i18n.tsx
+++ b/src/i18n.tsx
@@ -1,12 +1,56 @@
 import i18n from 'i18next';
-import Backend from 'i18next-xhr-backend';
+// import Backend from 'i18next-xhr-backend';
 import LanguageDetector from 'i18next-browser-languagedetector';
 import { initReactI18next } from 'react-i18next';
 
+import translationAR from './locales/ar/translation.json';
+import translationDE from './locales/de/translation.json';
+import translationEN from './locales/en/translation.json';
+import translationES from './locales/es/translation.json';
+import translationIN from './locales/in/translation.json';
+import translationJA from './locales/ja/translation.json';
+import translationPT from './locales/pt/translation.json';
+import translationRU from './locales/ru/translation.json';
+import translationZR from './locales/zr/translation.json';
+
+const resources = {
+  ar: {
+    translation: translationAR,
+  },
+  de: {
+    translation: translationDE,
+  },
+  en: {
+    translation: translationEN,
+  },
+  es: {
+    translation: translationES,
+  },
+  in: {
+    translation: translationIN,
+  },
+  ja: {
+    translation: translationJA,
+  },
+  pt: {
+    translation: translationPT,
+  },
+  ru: {
+    translation: translationRU,
+  },
+  zr: {
+    translation: translationZR,
+  },
+};
+
 i18n
   // load translation using xhr -> see /public/locales
   // learn more: https://github.com/i18next/i18next-xhr-backend
-  .use(Backend)
+
+  // SET UP Backend resource
+  // .use(Backend)
+
+
   // detect user language
   // learn more: https://github.com/i18next/i18next-browser-languageDetector
   .use(LanguageDetector)
@@ -17,7 +61,7 @@ i18n
   .init({
     fallbackLng: 'en',
     debug: true,
-
+    resources: resources,
     interpolation: {
       escapeValue: false, // not needed for react as it escapes by default
     },
diff --git a/src/locales/ar/translation.json b/src/locales/ar/translation.json
new file mode 100644
index 0000000000..d0cecd67e0
--- /dev/null
+++ b/src/locales/ar/translation.json
@@ -0,0 +1,22 @@
+{
+  "actions": {
+    "edit": "تصحيح",
+    "save": "حفظ",
+    "cancel": "إلغاء",
+    "new": "الجديد",
+    "list": "قائمة"
+  },
+  "dashboard": {
+    "label": "لوحة القيادة"
+  },
+  "patient": {
+    "firstName": "الاسم الاول",
+    "lastName": "الكنية"
+  },
+  "patients": {
+    "label": "المرضى",
+    "viewPatients": "عرض المرضى",
+    "viewPatient": "عرض المريض",
+    "newPatient": "مريض جديد"
+  }
+}
diff --git a/src/locales/de/translation.json b/src/locales/de/translation.json
new file mode 100644
index 0000000000..cae53d51ef
--- /dev/null
+++ b/src/locales/de/translation.json
@@ -0,0 +1,22 @@
+{
+  "actions": {
+    "edit": "Bearbeiten",
+    "save": "speichern",
+    "cancel": "Stornieren",
+    "new": "Neu",
+    "list": "Liste"
+  },
+  "dashboard": {
+    "label": "لوحة القيادة"
+  },
+  "patient": {
+    "firstName": "Vorname",
+    "lastName": "Nachname"
+  },
+  "patients": {
+    "label": "Patienten",
+    "viewPatients": "Patienten anzeigen",
+    "viewPatient": "Patient anzeigen",
+    "newPatient": "Neuer Patient"
+  }
+}
diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
new file mode 100644
index 0000000000..932b6f1e11
--- /dev/null
+++ b/src/locales/en/translation.json
@@ -0,0 +1,22 @@
+{
+  "actions": {
+    "edit": "Edit",
+    "save": "Save",
+    "cancel": "Cancel",
+    "new": "New",
+    "list": "List"
+  },
+  "dashboard": {
+    "label": "Dashboard"
+  },
+  "patient": {
+    "firstName": "First Name",
+    "lastName": "Last Name"
+  },
+  "patients": {
+    "label": "Patients",
+    "viewPatients": "View Patients",
+    "viewPatient": "View Patient",
+    "newPatient": "New Patient"
+  }
+}
diff --git a/src/locales/es/translation.json b/src/locales/es/translation.json
new file mode 100644
index 0000000000..c7d05fb80b
--- /dev/null
+++ b/src/locales/es/translation.json
@@ -0,0 +1,22 @@
+{
+  "actions": {
+    "edit": "Editar",
+    "save": "Guardar",
+    "cancel": "Cancelar",
+    "new": "Nuevo",
+    "list": "Lista"
+  },
+  "dashboard": {
+    "label": "Panel"
+  },
+  "patient": {
+    "firstName": "Nombre de pila",
+    "lastName": "Apellido"
+  },
+  "patients": {
+    "label": "Pacientes",
+    "viewPatients": "Ver pacientes",
+    "viewPatient": "Ver pacientes",
+    "newPatient": "Nuevo paciente"
+  }
+}
diff --git a/src/locales/in/translation.json b/src/locales/in/translation.json
new file mode 100644
index 0000000000..b5c50662ae
--- /dev/null
+++ b/src/locales/in/translation.json
@@ -0,0 +1,22 @@
+{
+  "actions": {
+    "edit": "Edit",
+    "save": "Menyimpan",
+    "cancel": "Membatalkan",
+    "new": "Baru",
+    "list": "Daftar"
+  },
+  "dashboard": {
+    "label": "Dasbor"
+  },
+  "patient": {
+    "firstName": "Nama depan",
+    "lastName": "Nama keluarga"
+  },
+  "patients": {
+    "label": "Pasien",
+    "viewPatients": "Lihat Pasien",
+    "viewPatient": "Lihat Pasien",
+    "newPatient": "Pasien Baru"
+  }
+}
diff --git a/src/locales/ja/translation.json b/src/locales/ja/translation.json
new file mode 100644
index 0000000000..87506be8ac
--- /dev/null
+++ b/src/locales/ja/translation.json
@@ -0,0 +1,22 @@
+{
+  "actions": {
+    "edit": "編集",
+    "save": "セーブ",
+    "cancel": "キャンセル",
+    "new": "新しい",
+    "list": "リスト"
+  },
+  "dashboard": {
+    "label": "ダッシュボード"
+  },
+  "patient": {
+    "firstName": "ファーストネーム",
+    "lastName": "苗字"
+  },
+  "patients": {
+    "label": "患者さん",
+    "viewPatients": "患者を見る",
+    "viewPatient": "患者を見る",
+    "newPatient": "新しい患者"
+  }
+}
diff --git a/src/locales/pt/translation.json b/src/locales/pt/translation.json
new file mode 100644
index 0000000000..010c287428
--- /dev/null
+++ b/src/locales/pt/translation.json
@@ -0,0 +1,22 @@
+{
+  "actions": {
+    "edit": "Editar",
+    "save": "Salvar",
+    "cancel": "Cancelar",
+    "new": "Novo",
+    "list": "Lista"
+  },
+  "dashboard": {
+    "label": "Painel de controle"
+  },
+  "patient": {
+    "firstName": "Primeiro nome",
+    "lastName": "Último nome"
+  },
+  "patients": {
+    "label": "Pacientes",
+    "viewPatients": "Exibir pacientes",
+    "viewPatient": "Ver paciente",
+    "newPatient": "Novo Paciente"
+  }
+}
diff --git a/src/locales/ru/translation.json b/src/locales/ru/translation.json
new file mode 100644
index 0000000000..3135f6d035
--- /dev/null
+++ b/src/locales/ru/translation.json
@@ -0,0 +1,23 @@
+
+{
+  "actions": {
+    "edit": "редактировать",
+    "save": "Сохранить",
+    "cancel": "Отмена",
+    "new": "новый",
+    "list": "Список"
+  },
+  "dashboard": {
+    "label": "Панель приборов"
+  },
+  "patient": {
+    "firstName": "Имя",
+    "lastName": "Фамилия"
+  },
+  "patients": {
+    "label": "Пациенты",
+    "viewPatients": "Просмотр пациентов",
+    "viewPatient": "Просмотр пациента",
+    "newPatient": "Новый пациент"
+  }
+}
diff --git a/src/locales/zr/translation.json b/src/locales/zr/translation.json
new file mode 100644
index 0000000000..051c16d757
--- /dev/null
+++ b/src/locales/zr/translation.json
@@ -0,0 +1,22 @@
+{
+  "actions": {
+    "edit": "编辑",
+    "save": "保存",
+    "cancel": "取消",
+    "new": "新",
+    "list": "清单"
+  },
+  "dashboard": {
+    "label": "仪表板"
+  },
+  "patient": {
+    "firstName": "名字",
+    "lastName": "姓"
+  },
+  "patients": {
+    "label": "耐心",
+    "viewPatients": "查看患者",
+    "viewPatient": "查看患者",
+    "newPatient": "新病人"
+  }
+}