From 2fcba062cf35a8118c5c34b23f9578fa49230cf4 Mon Sep 17 00:00:00 2001
From: Lucas Bruno <69604366+lucasbrunozup@users.noreply.github.com>
Date: Thu, 1 Oct 2020 13:09:44 -0300
Subject: [PATCH] Organizing i18n values in frontend (#30)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Rewrite i18n values for external pages and dashsboard screen

* Adjusting i18 values in repositories screen

* 🛠️  Adjusting redirect routes when the call is external of manager (#19)

* Hotfix/fixing redirect and output bigger (#21)

* Fixing redirect in email template reset-password

* Fixing code output when exists many content and bad read

* Fixing fmt and set total output to down

* Hotfix/unique names (#28)

* Adding unique names migration

* Adding validations to unique names and unity tests

* Fixing swagger in horusec-analytics (#27)

* Add i18n values to enUS

Co-authored-by: Wilian Gabriel <63816070+wiliansilvazup@users.noreply.github.com>
Co-authored-by: nathanmartinszup <63246935+nathanmartinszup@users.noreply.github.com>
---
 .../src/components/Dialog/index.tsx           |   2 +-
 .../src/components/Select/index.tsx           |   2 +-
 .../src/components/SideMenu/index.tsx         |  10 +-
 horusec-manager/src/config/i18n/enUS.json     | 280 ++++++++++-------
 horusec-manager/src/config/i18n/ptBR.json     | 284 +++++++++++-------
 .../External/CreateAccount/Password/index.tsx |  36 ++-
 .../External/CreateAccount/UserInfo/index.tsx |  16 +-
 .../src/pages/External/Login/index.tsx        |  14 +-
 .../RecoveryPassword/CheckCode/index.tsx      |  14 +-
 .../RecoveryPassword/NewPassword/index.tsx    |  36 ++-
 .../RecoveryPassword/SendEmail/index.tsx      |  16 +-
 .../src/pages/Internal/Company/Add/index.tsx  |  14 +-
 .../src/pages/Internal/Company/Edit/index.tsx |  14 +-
 .../src/pages/Internal/Company/List/index.tsx |  18 +-
 .../Dashboard/AllVulnerabilities/index.tsx    |   4 +-
 .../Internal/Home/Dashboard/Filters/index.tsx |   8 +-
 .../Home/Dashboard/TotalDevelopers/index.tsx  |   2 +-
 .../Dashboard/TotalRepositories/index.tsx     |   2 +-
 .../VulnerabilitiesByDeveloper/index.tsx      |   6 +-
 .../VulnerabilitiesByLanguage/index.tsx       |   6 +-
 .../VulnerabilitiesByRepository/index.tsx     |   6 +-
 .../VulnerabilitiesDetails/index.tsx          |  26 +-
 .../VulnerabilitiesTimeLine/index.tsx         |   6 +-
 .../Internal/Home/Repositories/Add/index.tsx  |  14 +-
 .../Internal/Home/Repositories/Edit/index.tsx |  14 +-
 .../Home/Repositories/Invite/index.tsx        |  26 +-
 .../Repositories/Tokens/Add/Sucess/index.tsx  |  11 +-
 .../Home/Repositories/Tokens/Add/index.tsx    |  12 +-
 .../Home/Repositories/Tokens/index.tsx        |  24 +-
 .../Internal/Home/Repositories/index.tsx      |  34 ++-
 .../pages/Internal/Home/Users/Edit/index.tsx  |   4 +-
 .../Internal/Home/Users/Invite/index.tsx      |   4 +-
 32 files changed, 566 insertions(+), 399 deletions(-)

diff --git a/horusec-manager/src/components/Dialog/index.tsx b/horusec-manager/src/components/Dialog/index.tsx
index 1da2de54a..76be6ccee 100644
--- a/horusec-manager/src/components/Dialog/index.tsx
+++ b/horusec-manager/src/components/Dialog/index.tsx
@@ -73,7 +73,7 @@ const Dialog: React.FC<DialogProps> = ({
             <Styled.ButtonsWrapper>
               {hasCancel ? (
                 <Button
-                  text={t('CANCEL')}
+                  text={t('GENERAL.CANCEL')}
                   width={105}
                   height={35}
                   rounded={!defaultButton}
diff --git a/horusec-manager/src/components/Select/index.tsx b/horusec-manager/src/components/Select/index.tsx
index 2cc5667a8..0ac3f7e20 100644
--- a/horusec-manager/src/components/Select/index.tsx
+++ b/horusec-manager/src/components/Select/index.tsx
@@ -85,7 +85,7 @@ const Select: React.FC<Props> = ({
         width={width}
       >
         <Styled.CurrentValue>
-          {currentValue ? currentValue[keyLabel] : t('SELECT')}
+          {currentValue ? currentValue[keyLabel] : t('GENERAL.SELECT')}
         </Styled.CurrentValue>
 
         <Styled.OptionsList
diff --git a/horusec-manager/src/components/SideMenu/index.tsx b/horusec-manager/src/components/SideMenu/index.tsx
index 33c3c1375..de036852a 100644
--- a/horusec-manager/src/components/SideMenu/index.tsx
+++ b/horusec-manager/src/components/SideMenu/index.tsx
@@ -33,20 +33,20 @@ const SideMenu: React.FC = () => {
 
   const routes: InternalRoute[] = [
     {
-      name: t('DASHBOARD'),
+      name: t('SIDE_MENU.DASHBOARD'),
       icon: 'list',
       type: 'route',
       path: '/home/dashboard',
       subRoutes: [
         {
-          name: t('ORGANIZATION'),
+          name: t('SIDE_MENU.ORGANIZATION'),
           icon: 'grid',
           path: '/home/dashboard/organization',
           type: 'subRoute',
           adminOnly: true,
         },
         {
-          name: t('REPOSITORIES'),
+          name: t('SIDE_MENU.REPOSITORIES'),
           icon: 'columns',
           path: '/home/dashboard/repositories',
           type: 'subRoute',
@@ -54,13 +54,13 @@ const SideMenu: React.FC = () => {
       ],
     },
     {
-      name: t('REPOSITORIES'),
+      name: t('SIDE_MENU.REPOSITORIES'),
       icon: 'columns',
       path: '/home/repositories',
       type: 'route',
     },
     {
-      name: t('ORGANIZATION_USERS'),
+      name: t('SIDE_MENU.ORGANIZATION_USERS'),
       icon: 'grid',
       path: '/home/organization-users',
       type: 'route',
diff --git a/horusec-manager/src/config/i18n/enUS.json b/horusec-manager/src/config/i18n/enUS.json
index baf17fb20..f391a53ca 100644
--- a/horusec-manager/src/config/i18n/enUS.json
+++ b/horusec-manager/src/config/i18n/enUS.json
@@ -1,114 +1,158 @@
 {
-  "EMAIL": "E-mail",
-  "PASSWORD": "Password",
-  "FORGOT_PASS": "Forgot password?",
-  "LOGIN": "Log in",
-  "NO_ACCOUNT": "Don't have an account? Register",
-  "INVALID_EMAIL": "Invalid email",
-  "CONFIRM_PASS": "Confirm password",
-  "NAME": "Name",
-  "REGISTER": "Register",
-  "BACK_LOGIN": "Back to login",
-  "CREATE_ACCOUNT": "Create your Horusec account",
-  "RECOVERY_PASS": "For your security, enter the email registered to reset your password",
-  "SEND_CODE_EMAIL": "Send code to email",
-  "TYPE_THE_CODE": "Enter the code entered in your registered email. The code is valid for 10 minutes and must be used 1x.",
-  "CHECK_CODE": "Check code",
-  "CODE": "Code",
-  "CREATE_NEW_PASS": "Create your new password:",
-  "UPDATE_PASS": "Update password",
-  "NEXT": "Next",
-  "PASSWORD_REQUIREMENTS": "For your security, the password must contain at least:",
-  "MIN_CHARACTERS": "From 8 characters",
-  "ALPHA_REQUIREMENTS": "1 capital letter and 1 lowercase letter",
-  "NO_EQUALS": "It cannot be the same:",
-  "USER_NAME": "User name",
-  "NUMBER_REQUIREMENT": "1 number",
-  "INVALID_CODE": "Invalid Code",
-  "INVALID_PASS": "Invalid Password",
-  "INVALID_NAME": "invalid Name",
-  "INVALID_CONFIRM_PASS": "Passwords are not the same.",
-  "SPECIAL_CHARACTER": "1 character special ( !@#$*_.-)",
-  "ERROR_LOGIN": "Check your email and password and try again.",
-  "UNCONFIRMED_EMAIL": "The email has not yet been confirmed.",
-  "GENERIC_ERROR": "Something unexpected happened, try again.",
-  "INVALID_RECOVERY_CODE": "Invalid recovery code.",
-  "CANCEL": "Cancel",
-  "YES": "Sim",
-  "SAVE": "Save",
-  "CONFIRM": "Okay, all right.",
-  "SUCCESS_SEND_EMAIL": "A password recovery code has been sent to your email.",
-  "SUCCESS_CREATE_ACCOUNT": "An email has been sent to verify your account.",
-  "EMAIL_IN_USE": "The informed email is already in use.",
-  "SUCCESS_ALTER_PASS": "Your password has been changed successfully.",
-  "SELECT_ORGANIZATION": "Select a organization",
-  "ADD_ORGANIZATION": "Add a organization",
-  "NO_ORGANIZATIONS": "No organizations found",
-  "EDIT": "Edit",
-  "REMOVE": "Delete",
-  "TYPE_ORGANIZATION_NAME": "Enter the organization name below:",
-  "ORGANIZATION_NAME": "Organization name",
-  "INVALID_ORGANIZATION_NAME": "Invalid organization name",
-  "EDIT_ORGANIZATION_NAME": "Edit your organization name",
-  "CONFIRM_DELETE_ORGANIZATION": "Do you really want to delete the organization ",
-  "DASHBOARD": "Dashboard",
-  "REPOSITORIES": "Repositories",
-  "REPOSITORY": "Repository",
-  "ORGANIZATION_USERS": "Organization users",
-  "ORGANIZATION": "Organization",
-  "START_DATE": "Start date",
-  "FINAL_DATE": "Final date",
-  "APPLY": "Apply",
-  "TOTAL_DEVELOPERS": "Total developers",
-  "TOTAL_REPOSITORIES": "Total repositories",
-  "SELECT": "Select",
-  "ALL_VULNERABILITIES": "All vulnerabilities",
-  "CHART_NO_DATA": "No data for the selected period",
-  "VULNERABILITIES_BY_DEV": "Vulnerabilities by developer",
-  "VULNERABILITIES_BY_LANG": "Vulnerabilities by language",
-  "VULNERABILITIES_BY_REPO": "Vulnerabilities by repository",
-  "VULNERABILITY_TIMELINE": "Vulnerability timeline",
-  "VULNERABILITY_DETAILS": "Vulnerability details",
-  "LANGUAGE":  "Language",
-  "SEVERITY": "Severiry",
-  "AUTHOR": "Author",
-  "DESCRIPTION": "Description",
-  "FILE": "File",
-  "LINE": "Line",
-  "NEXT_PAGE": "Next",
-  "PREVIOUS_PAGE": "Previous",
-  "SEARCH_REPO": "Search repositories by name",
-  "CREATE_REPO": "Create repository",
-  "ACTION": "Action",
-  "DELETE": "Delete",
-  "INVITE": "Invite",
-  "TOKENS": "Tokens",
-  "NO_REPOSITORIES": "There are no corresponding repositories for this company.",
-  "CREATE_NEW_REPO": "Create a new repository below:",
-  "NAME_REPO": "Repository name",
-  "DESCRIPTION_REPO": "Repository description",
-  "CONFIRM_DELETE_REPO": "Do you really want to delete the repository? This action cannot be undone.",
-  "EDIT_REPO": "Edit repository",
-  "EDIT_REPO_BELOW": "Edit the repository below:",
-  "ADD_TOKEN": "Add token",
-  "EXPIRES": "Expires in:",
-  "TOKEN": "Token",
-  "NO_TOKENS": "There are no registered tokens for this repository.",
-  "CONFIRM_DELETE_TOKEN": "Do you really want to delete the token? This action cannot be undone.",
-  "CREATE_NEW_TOKEN": "Add new token",
-  "CREATE_TOKEN_BELOW": "Enter the description for the new token:",
-  "INVALID_DESCRIPTION": "Invalid description",
-  "TOKEN_SUCCESS": "Token created successfully!",
-  "TOKEN_INFO": "This token grants you access to perform analyzes for the selected repository! Save him somewhere safe and don't share!",
-  "INVITE_TO_REPOSITORY": "Invite to repository",
-  "INVITE_USER_BELOW": "Invite a user to the repository below:",
-  "SEARCH_USER_EMAIL_BELOW": "Search for user by email",
-  "PERMISSION": "Permission",
-  "USER": "User",
-  "NO_USERS_TO_INVITE": "There are no matching users to be invited.",
-  "MEMBER": "Member",
-  "ADMIN": "Administrator",
+  "LOGIN_SCREEN": {
+    "EMAIL": "Email",
+    "PASSWORD": "Password",
+    "FORGOT_PASS": "Forgot password?",
+    "SUBMIT": "Log in",
+    "NO_ACCOUNT": "Don't have an account? Register",
+    "INVALID_EMAIL": "Invalid email",
+    "INVALID_PASS": "Enter password"
+  },
+
+  "RECOVERY_PASS_SCREEN": {
+    "INPUT_EMAIL": "For your security, enter the registered email to reset your password",
+    "EMAIL": "Email",
+    "CODE": "Code",
+    "INVALID_EMAIL": "Invalid email",
+    "INVALID_CODE": "Enter a code",
+    "CHECK_CODE": "Check code",
+    "SUBMIT": "Send code to email",
+    "BACK": "Back to login",
+    "SUCCESS": "A password recovery code has been sent to your email.",
+    "CONFIRM": "Ok, I got it.",
+    "TYPE_THE_CODE": "Enter the code entered in your registered email. The code is valid for 10 minutes and must be used 1x.",
+    "CREATE_NEW_PASS": "Create your new password:",
+    "PASSWORD_REQUIREMENTS": "For your security, the password must contain at least:",
+    "MIN_CHARACTERS": "From 8 characters",
+    "ALPHA_REQUIREMENTS": "1 uppercase and 1 lowercase letter",
+    "NUMBER_REQUIREMENT": "1 number",
+    "SPECIAL_CHARACTER": "1 special character (!@#$*_.-)",
+    "NO_EQUALS": "It can't be the same:",
+    "USER_NAME": "User",
+    "PASSWORD": "Password",
+    "INVALID_PASS": "Enter password",
+    "CONFIRM_PASS": "Confirm password",
+    "INVALID_CONFIRM_PASS": "Passwords are not the same.",
+    "SUCCESS_ALTER_PASS": "Your password has been changed successfully",
+    "UPDATE_PASS": "Update password",
+    "INVALID_RECOVERY_CODE": "Invalid recovery code."
+  },
+
+  "CREATE_ACCOUNT_SCREEN": {
+    "CREATE_ACCOUNT": "Create your Horusec account",
+    "EMAIL": "Email",
+    "NAME": "Name",
+    "NEXT": "Next",
+    "BACK": "Back to login",
+    "INVALID_NAME": "Enter the name",
+    "INVALID_EMAIL": "Invalid email",
+    "CREATE_NEW_PASS": "Create your new password:",
+    "PASSWORD_REQUIREMENTS": "For your security, the password must contain at least:",
+    "MIN_CHARACTERS": "From 8 characters",
+    "ALPHA_REQUIREMENTS": "1 uppercase and 1 lowercase letter",
+    "NUMBER_REQUIREMENT": "1 number",
+    "SPECIAL_CHARACTER": "1 special character (!@#$*_.-)",
+    "NO_EQUALS": "It cannot be the same:",
+    "USER_NAME": "User",
+    "PASSWORD": "Password",
+    "INVALID_PASS": "Enter password",
+    "CONFIRM_PASS": "Confirm password",
+    "INVALID_CONFIRM_PASS": "Passwords are not the same.",
+    "SUBMIT": "Register",
+    "CONFIRM": "Ok, I got it.",
+    "SUCCESS_CREATE_ACCOUNT": "An email has been sent to verify your account."
+  },
+
+  "COMPANY_SCREEN": {
+    "SELECT_ORGANIZATION": "Select an organization",
+    "ADD_ORGANIZATION": "Add an organization",
+    "NO_ORGANIZATIONS": "No organization found",
+    "YES": "Sim",
+    "CONFIRM_DELETE_ORGANIZATION": "Do you really want to delete the organization ",
+    "EDIT": "Edit",
+    "REMOVE": "Delete",
+    "TYPE_ORGANIZATION_NAME": "Enter the name of the organization below:",
+    "ORGANIZATION_NAME": "Organization name",
+    "INVALID_ORGANIZATION_NAME": "Invalid organization name.",
+    "CANCEL": "Cancel",
+    "SAVE": "Save",
+    "EDIT_ORGANIZATION_NAME": "Edit the organization name"
+  },
+
+  "DASHBOARD_SCREEN": {
+    "START_DATE": "Start date",
+    "FINAL_DATE": "Final date",
+    "APPLY": "Apply",
+    "TOTAL_DEVELOPERS": "Total developers",
+    "TOTAL_REPOSITORIES": "Total repositories",
+    "ALL_VULNERABILITIES": "All vulnerabilities",
+    "REPOSITORY": "Repository",
+    "CHART_NO_DATA": "No data for the selected period",
+    "VULNERABILITIES_BY_LANG": "Language vulnerabilities",
+    "VULNERABILITIES_BY_DEV": "Vulnerabilities by developer",
+    "VULNERABILITIES_BY_REPO": "Vulnerabilities by repository",
+    "VULNERABILITY_TIMELINE": "Vulnerability timeline",
+    "VULNERABILITY_DETAILS": "Vulnerability details",
+    "LANGUAGE": "Language",
+    "SEVERITY": "Severity",
+    "AUTHOR": "Author",
+    "DESCRIPTION": "Description",
+    "FILE": "Archive",
+    "LINE": "Line",
+    "NEXT_PAGE": "Next",
+    "PREVIOUS_PAGE": "Previous",
+    "CODE": "Code"
+  },
+
+  "REPOSITORIES_SCREEN": {
+    "SEARCH_REPO": "Search repositories by name",
+    "CREATE_REPO": "Create repository",
+    "TITLE": "Repositories",
+    "NAME": "Name",
+    "DESCRIPTION": "Description",
+    "ACTION": "Action",
+    "NO_REPOSITORIES": "There are no corresponding repositories for this organization.",
+    "DELETE": "Delete",
+    "EDIT": "Edit",
+    "INVITE": "Invite",
+    "TOKENS": "Tokens",
+    "CONFIRM_DELETE_REPO": "Do you really want to delete the repository? This action cannot be undone.",
+    "YES": "Yes",
+    "CREATE_NEW_REPO": "Create a new repository below:",
+    "NAME_REPO": "Repository name",
+    "INVALID_NAME": "Enter the name",
+    "DESCRIPTION_REPO": "Repository description",
+    "SAVE": "Save",
+    "EDIT_REPO": "Edit repository",
+    "EDIT_REPO_BELOW": "Edit the repository below:",
+    "INVITE_TO_REPOSITORY": "Invite to the repository",
+    "INVITE_USER_BELOW": "Invite a user to the repository below:",
+    "SEARCH_USER_EMAIL_BELOW": "Search for user by email",
+    "USER": "User",
+    "EMAIL": "Email",
+    "PERMISSION": "Permission",
+    "NO_USERS_TO_INVITE": "There are no matching users to be invited.",
+    "ADD_TOKEN": "Add Token",
+    "TOKEN": "Token",
+    "NO_TOKENS": "There are no registered tokens for this repository.",
+    "EXPIRES": "Expires in:",
+    "CONFIRM_DELETE_TOKEN": "Do you really want to delete this token? This action cannot be undone.",
+    "CREATE_NEW_TOKEN": "Add new token",
+    "INVALID_DESCRIPTION": "Invalid description",
+    "CREATE_TOKEN_BELOW": "Enter the description for the new token:",
+    "TOKEN_INFO": "This token grants you access to perform analyzes for the selected repository! Save it in a safe place and don't share it!",
+    "TOKEN_SUCCESS": "Token created successfully!",
+    "CONFIRM": "Ok, I got it."
+  },
+
+  "GENERAL": {
+    "SELECT": "Select",
+    "CANCEL": "Cancel"
+  },
+
   "PERMISSIONS": {
+    "ADMIN": "Administrator",
+    "MEMBER": "Member",
     "TITLE": "Permissions",
     "REPOSITORY": {
       "ADMIN": "Administrator permissions allow you to perform on the repository:",
@@ -131,6 +175,7 @@
       }
     }
   },
+
   "USERS_SCREEN": {
     "TITLE": "Users",
     "SEARCH": "Search by email",
@@ -138,7 +183,7 @@
     "EDIT_USER": "Edit User",
     "EDIT_SUBTITLE": "Edit the user below:",
     "INVITE_SUBTITLE": "Invite a new user below:",
-    "EMAIL": "E-mail",
+    "EMAIL": "Email",
     "INVALID_EMAIL": "Invalid email",
     "CONFIRM_DELETE": "Do you really want to delete this user? This action cannot be undone.",
     "YES": "Yes",
@@ -146,7 +191,7 @@
     "TABLE": {
       "EMPTY": "There are no matching users for this organization",
       "USER": "User",
-      "EMAIL": "E-mail",
+      "EMAIL": "Email",
       "PERMISSION": "Permission",
       "ACTION": "Action",
       "DELETE": "Delete",
@@ -157,12 +202,21 @@
       }
     }
   },
+
+  "SIDE_MENU": {
+    "DASHBOARD": "Dashboard",
+    "REPOSITORIES": "Repositories",
+    "ORGANIZATION": "Organization",
+    "REPOSITORY": "Repository",
+    "ORGANIZATION_USERS": "Organization users"
+  },
+
   "API_ERRORS": {
     "GENERIC_ERROR": "Something unexpected happened, try again.",
     "ERROR_LOGIN": "Check your email and password and try again.",
-    "UNCONFIRMED_EMAIL":"The email has not yet been confirmed.",
+    "UNCONFIRMED_EMAIL": "The email has not yet been confirmed.",
     "INVALID_RECOVERY_CODE": "Invalid recovery code.",
-    "EMAIL_IN_USE":"The informed email is already in use.",
+    "EMAIL_IN_USE": "The informed email is already in use.",
     "NO_RECORDS": "There are no corresponding records for the reported data.",
     "ALREADY_IN_COMPANY": "This user is already part of this organization."
   }
diff --git a/horusec-manager/src/config/i18n/ptBR.json b/horusec-manager/src/config/i18n/ptBR.json
index fade0cfb3..0e9c9948a 100644
--- a/horusec-manager/src/config/i18n/ptBR.json
+++ b/horusec-manager/src/config/i18n/ptBR.json
@@ -1,114 +1,158 @@
 {
-  "EMAIL": "E-mail",
-  "PASSWORD": "Senha",
-  "FORGOT_PASS": "Esqueceu a senha?",
-  "LOGIN": "Entrar",
-  "NO_ACCOUNT": "Não tem conta? Cadastre-se",
-  "INVALID_EMAIL": "E-mail inválido",
-  "CONFIRM_PASS": "Confirmar senha",
-  "NAME": "Nome",
-  "REGISTER": "Cadastrar",
-  "BACK_LOGIN": "Voltar para o login",
-  "CREATE_ACCOUNT": "Crie sua conta Horusec",
-  "RECOVERY_PASS": "Para sua segurança, digite o e-mail cadastrado para redefinir sua senha",
-  "SEND_CODE_EMAIL": "Enviar código para o e-mail",
-  "TYPE_THE_CODE": "Digite o código informado no seu e-mail cadastrado. O código é válido por 10 minutos e deve ser utilizado 1x.",
-  "CHECK_CODE": "Verificar código",
-  "CODE": "Código",
-  "CREATE_NEW_PASS": "Crie sua nova senha:",
-  "UPDATE_PASS": "Atualizar senha",
-  "NEXT": "Avançar",
-  "PASSWORD_REQUIREMENTS": "Para a sua segurança, a senha deve conter no mínimo:",
-  "MIN_CHARACTERS": "A partir de 8 caracteres",
-  "ALPHA_REQUIREMENTS": "1 letra maiúscula e 1 minúscula",
-  "NO_EQUALS": "Não pode ser igual:",
-  "USER_NAME": "Usuário",
-  "NUMBER_REQUIREMENT": "1 número",
-  "INVALID_CODE": "Informe um código",
-  "INVALID_PASS": "Informe a senha",
-  "INVALID_NAME": "Informe o nome",
-  "INVALID_CONFIRM_PASS": "As senhas não são iguais.",
-  "SPECIAL_CHARACTER": "1 caractere especial ( !@#$*_.-)",
-  "ERROR_LOGIN": "Verifique seu e-mail e senha e tente novamente.",
-  "UNCONFIRMED_EMAIL": "O e-mail ainda não foi confirmado.",
-  "GENERIC_ERROR": "Algo inesperado aconteceu, tente novamente.",
-  "INVALID_RECOVERY_CODE": "Códido de recuperação inválido.",
-  "CANCEL": "Cancelar",
-  "YES": "Sim",
-  "SAVE": "Salvar",
-  "CONFIRM": "Ok, entendi.",
-  "SUCCESS_SEND_EMAIL": "Foi enviado para seu e-mail um código para a recuperação de senha.",
-  "SUCCESS_CREATE_ACCOUNT": "Foi enviado um e-mail para verficação da sua conta.",
-  "EMAIL_IN_USE": "O e-mail informado já esta em uso.",
-  "SUCCESS_ALTER_PASS": "Sua senha foi alterada com sucesso",
-  "SELECT_ORGANIZATION": "Selecione uma organização",
-  "ADD_ORGANIZATION": "Adicione uma organização",
-  "NO_ORGANIZATIONS": "Nenhuma organização foi encontrada",
-  "EDIT": "Editar",
-  "REMOVE": "Excluir",
-  "TYPE_ORGANIZATION_NAME": "Digite o nome da organização abaixo:",
-  "ORGANIZATION_NAME": "Nome da organização",
-  "INVALID_ORGANIZATION_NAME": "Nome da organização inválido.",
-  "EDIT_ORGANIZATION_NAME": "Edite o nome da organização",
-  "CONFIRM_DELETE_ORGANIZATION": "Deseja realmente deletar a organização ",
-  "DASHBOARD": "Dashboard",
-  "REPOSITORIES": "Repositórios",
-  "REPOSITORY": "Repositório",
-  "ORGANIZATION_USERS": "Usuários da organização",
-  "ORGANIZATION": "Organização",
-  "START_DATE": "Data de início",
-  "FINAL_DATE": "Data final",
-  "APPLY": "Aplicar",
-  "TOTAL_DEVELOPERS": "Total de desenvolvedores",
-  "TOTAL_REPOSITORIES": "Total de repositórios",
-  "SELECT": "Selecione",
-  "ALL_VULNERABILITIES": "Todas as vulnerabilidades",
-  "CHART_NO_DATA": "Sem dados para o período selecionado",
-  "VULNERABILITIES_BY_DEV": "Vulnerabilidades por desenvolvedor",
-  "VULNERABILITIES_BY_LANG": "Vulnerabilidades por linguagem",
-  "VULNERABILITIES_BY_REPO": "Vulnerabilidades por repositório",
-  "VULNERABILITY_TIMELINE": "Linha do tempo de vunerabilidade",
-  "VULNERABILITY_DETAILS": "Detalhes das vunerabiliadade",
-  "LANGUAGE": "Linguagem",
-  "SEVERITY": "Severidade",
-  "AUTHOR": "Autor",
-  "DESCRIPTION": "Descrição",
-  "FILE": "Arquivo",
-  "LINE": "Linha",
-  "NEXT_PAGE": "Próximo",
-  "PREVIOUS_PAGE": "Anterior",
-  "SEARCH_REPO": "Pesquisar repositórios por nome",
-  "CREATE_REPO": "Criar repositório",
-  "ACTION": "Ação",
-  "DELETE": "Deletar",
-  "INVITE": "Convidar",
-  "TOKENS": "Tokens",
-  "NO_REPOSITORIES": "Não há repositórios correspondentes, para esta organização.",
-  "CREATE_NEW_REPO": "Crie um novo repositório abaixo:",
-  "NAME_REPO": "Nome do repositório",
-  "DESCRIPTION_REPO": "Descrição do repositório",
-  "CONFIRM_DELETE_REPO": "Deseja realmente deletar o repositório? Essa ação não poderá ser desfeita.",
-  "EDIT_REPO": "Editar repositório",
-  "EDIT_REPO_BELOW": "Edite o repositório abaixo:",
-  "ADD_TOKEN": "Adicionar Token",
-  "EXPIRES": "Expira em:",
-  "TOKEN": "Token",
-  "NO_TOKENS": "Não há tokens registrados para este repositório.",
-  "CONFIRM_DELETE_TOKEN": "Deseja realmente deletar este token? Essa ação não poderá ser desfeita.",
-  "CREATE_NEW_TOKEN": "Adicionar novo token ",
-  "CREATE_TOKEN_BELOW": "Insira a descrição para o novo token:",
-  "INVALID_DESCRIPTION": "Descrição inválida",
-  "TOKEN_SUCCESS": "Token criado com sucesso!",
-  "TOKEN_INFO": "Este token lhe concede acesso a realizar análises para o repositório selecionado! Salve ele em um lugar seguro e não compartilhe!",
-  "INVITE_TO_REPOSITORY": "Convidar para o repositório",
-  "INVITE_USER_BELOW": "Convide um usuário para o repositorio abaixo:",
-  "SEARCH_USER_EMAIL_BELOW": "Pesquisar usuário pelo e-mail",
-  "PERMISSION": "Permissão",
-  "USER": "Usuário",
-  "NO_USERS_TO_INVITE": "Não há usuários correspondentes para serem convidados.",
-  "MEMBER": "Membro",
-  "ADMIN": "Administrador",
+  "LOGIN_SCREEN": {
+    "EMAIL": "Email",
+    "PASSWORD": "Senha",
+    "FORGOT_PASS": "Esqueceu a senha?",
+    "SUBMIT": "Entrar",
+    "NO_ACCOUNT": "Não tem conta? Cadastre-se",
+    "INVALID_EMAIL": "Email inválido",
+    "INVALID_PASS": "Informe a senha"
+  },
+
+  "RECOVERY_PASS_SCREEN": {
+    "INPUT_EMAIL": "Para sua segurança, digite o email cadastrado para redefinir sua senha",
+    "EMAIL": "Email",
+    "CODE": "Código",
+    "INVALID_EMAIL": "Email inválido",
+    "INVALID_CODE": "Informe um código",
+    "CHECK_CODE": "Verificar código",
+    "SUBMIT": "Enviar código para o email",
+    "BACK": "Voltar para o login",
+    "SUCCESS": "Foi enviado para seu email um código para a recuperação de senha.",
+    "CONFIRM": "Ok, entendi.",
+    "TYPE_THE_CODE": "Digite o código informado no seu email cadastrado. O código é válido por 10 minutos e deve ser utilizado 1x.",
+    "CREATE_NEW_PASS": "Crie sua nova senha:",
+    "PASSWORD_REQUIREMENTS": "Para a sua segurança, a senha deve conter no mínimo:",
+    "MIN_CHARACTERS": "A partir de 8 caracteres",
+    "ALPHA_REQUIREMENTS": "1 letra maiúscula e 1 minúscula",
+    "NUMBER_REQUIREMENT": "1 número",
+    "SPECIAL_CHARACTER": "1 caractere especial ( !@#$*_.-)",
+    "NO_EQUALS": "Não pode ser igual:",
+    "USER_NAME": "Usuário",
+    "PASSWORD": "Senha",
+    "INVALID_PASS": "Informe a senha",
+    "CONFIRM_PASS": "Confirmar senha",
+    "INVALID_CONFIRM_PASS": "As senhas não são iguais.",
+    "SUCCESS_ALTER_PASS": "Sua senha foi alterada com sucesso",
+    "UPDATE_PASS": "Atualizar senha",
+    "INVALID_RECOVERY_CODE": "Código de recuperação inválido."
+  },
+
+  "CREATE_ACCOUNT_SCREEN": {
+    "CREATE_ACCOUNT": "Crie sua conta Horusec",
+    "EMAIL": "Email",
+    "NAME": "Nome",
+    "NEXT": "Avançar",
+    "BACK": "Voltar para o login",
+    "INVALID_NAME": "Informe o nome",
+    "INVALID_EMAIL": "Email inválido",
+    "CREATE_NEW_PASS": "Crie sua nova senha:",
+    "PASSWORD_REQUIREMENTS": "Para a sua segurança, a senha deve conter no mínimo:",
+    "MIN_CHARACTERS": "A partir de 8 caracteres",
+    "ALPHA_REQUIREMENTS": "1 letra maiúscula e 1 minúscula",
+    "NUMBER_REQUIREMENT": "1 número",
+    "SPECIAL_CHARACTER": "1 caractere especial ( !@#$*_.-)",
+    "NO_EQUALS": "Não pode ser igual:",
+    "USER_NAME": "Usuário",
+    "PASSWORD": "Senha",
+    "INVALID_PASS": "Informe a senha",
+    "CONFIRM_PASS": "Confirmar senha",
+    "INVALID_CONFIRM_PASS": "As senhas não são iguais.",
+    "SUBMIT": "Cadastrar",
+    "CONFIRM": "Ok, entendi.",
+    "SUCCESS_CREATE_ACCOUNT": "Foi enviado um email para verificação da sua conta."
+  },
+
+  "COMPANY_SCREEN": {
+    "SELECT_ORGANIZATION": "Selecione uma organização",
+    "ADD_ORGANIZATION": "Adicione uma organização",
+    "NO_ORGANIZATIONS": "Nenhuma organização foi encontrada",
+    "YES": "Sim",
+    "CONFIRM_DELETE_ORGANIZATION": "Deseja realmente deletar a organização ",
+    "EDIT": "Editar",
+    "REMOVE": "Excluir",
+    "TYPE_ORGANIZATION_NAME": "Digite o nome da organização abaixo:",
+    "ORGANIZATION_NAME": "Nome da organização",
+    "INVALID_ORGANIZATION_NAME": "Nome da organização inválido.",
+    "CANCEL": "Cancelar",
+    "SAVE": "Salvar",
+    "EDIT_ORGANIZATION_NAME": "Edite o nome da organização"
+  },
+
+  "DASHBOARD_SCREEN": {
+    "START_DATE": "Data de início",
+    "FINAL_DATE": "Data final",
+    "APPLY": "Aplicar",
+    "TOTAL_DEVELOPERS": "Total de desenvolvedores",
+    "TOTAL_REPOSITORIES": "Total de repositórios",
+    "ALL_VULNERABILITIES": "Todas as vulnerabilidades",
+    "REPOSITORY": "Repositório",
+    "CHART_NO_DATA": "Sem dados para o período selecionado",
+    "VULNERABILITIES_BY_LANG": "Vulnerabilidades por linguagem",
+    "VULNERABILITIES_BY_DEV": "Vulnerabilidades por desenvolvedor",
+    "VULNERABILITIES_BY_REPO": "Vulnerabilidades por repositório",
+    "VULNERABILITY_TIMELINE": "Linha do tempo de vulnerabilidade",
+    "VULNERABILITY_DETAILS": "Detalhes das vulnerabilidade",
+    "LANGUAGE": "Linguagem",
+    "SEVERITY": "Severidade",
+    "AUTHOR": "Autor",
+    "DESCRIPTION": "Descrição",
+    "FILE": "Arquivo",
+    "LINE": "Linha",
+    "NEXT_PAGE": "Próximo",
+    "PREVIOUS_PAGE": "Anterior",
+    "CODE": "Código"
+  },
+
+  "REPOSITORIES_SCREEN": {
+    "SEARCH_REPO": "Pesquisar repositórios por nome",
+    "CREATE_REPO": "Criar repositório",
+    "TITLE": "Repositórios",
+    "NAME": "Nome",
+    "DESCRIPTION": "Descrição",
+    "ACTION": "Ação",
+    "NO_REPOSITORIES": "Não há repositórios correspondentes, para esta organização.",
+    "DELETE": "Deletar",
+    "EDIT": "Editar",
+    "INVITE": "Convidar",
+    "TOKENS": "Tokens",
+    "CONFIRM_DELETE_REPO": "Deseja realmente deletar o repositório? Essa ação não poderá ser desfeita.",
+    "YES": "Sim",
+    "CREATE_NEW_REPO": "Crie um novo repositório abaixo:",
+    "NAME_REPO": "Nome do repositório",
+    "INVALID_NAME": "Informe o nome",
+    "DESCRIPTION_REPO": "Descrição do repositório",
+    "SAVE": "Salvar",
+    "EDIT_REPO": "Editar repositório",
+    "EDIT_REPO_BELOW": "Edite o repositório abaixo:",
+    "INVITE_TO_REPOSITORY": "Convidar para o repositório",
+    "INVITE_USER_BELOW": "Convide um usuário para o repositorio abaixo:",
+    "SEARCH_USER_EMAIL_BELOW": "Pesquisar usuário pelo email",
+    "USER": "Usuário",
+    "EMAIL": "Email",
+    "PERMISSION": "Permissão",
+    "NO_USERS_TO_INVITE": "Não há usuários correspondentes para serem convidados.",
+    "ADD_TOKEN": "Adicionar Token",
+    "TOKEN": "Token",
+    "NO_TOKENS": "Não há tokens registrados para este repositório.",
+    "EXPIRES": "Expira em:",
+    "CONFIRM_DELETE_TOKEN": "Deseja realmente deletar este token? Essa ação não poderá ser desfeita.",
+    "CREATE_NEW_TOKEN": "Adicionar novo token ",
+    "INVALID_DESCRIPTION": "Descrição inválida",
+    "CREATE_TOKEN_BELOW": "Insira a descrição para o novo token:",
+    "TOKEN_INFO": "Este token lhe concede acesso a realizar análises para o repositório selecionado! Salve ele em um lugar seguro e não compartilhe!",
+    "TOKEN_SUCCESS": "Token criado com sucesso!",
+    "CONFIRM": "Ok, entendi."
+  },
+
+  "GENERAL": {
+    "SELECT": "Selecione",
+    "CANCEL": "Cancelar"
+  },
+
   "PERMISSIONS": {
+    "ADMIN": "Administrador",
+    "MEMBER": "Membro",
     "TITLE": "Permissões",
     "REPOSITORY": {
       "ADMIN": "As permissões de Administrador permitem realizar no repositório:",
@@ -131,6 +175,7 @@
       }
     }
   },
+
   "USERS_SCREEN": {
     "TITLE": "Usuários",
     "SEARCH": "Pesquisar por email",
@@ -138,15 +183,15 @@
     "EDIT_USER": "Editar usuário",
     "EDIT_SUBTITLE": "Edite o usuário abaixo:",
     "INVITE_SUBTITLE": "Convide um novo usuário abaixo:",
-    "EMAIL": "E-mail",
-    "INVALID_EMAIL": "E-mail inválido",
+    "EMAIL": "Email",
+    "INVALID_EMAIL": "Email inválido",
     "CONFIRM_DELETE": "Deseja realmente deletar este usuário? Essa ação não poderá ser desfeita.",
     "YES": "Sim",
     "SAVE": "Salvar",
     "TABLE": {
       "EMPTY": "Não há usuarios correspondentes para esta organização",
       "USER": "Usuário",
-      "EMAIL": "E-mail",
+      "EMAIL": "Email",
       "PERMISSION": "Permissão",
       "ACTION": "Ação",
       "DELETE": "Deletar",
@@ -157,12 +202,21 @@
       }
     }
   },
+
+  "SIDE_MENU": {
+    "DASHBOARD": "Dashboard",
+    "REPOSITORIES": "Repositórios",
+    "ORGANIZATION": "Organização",
+    "REPOSITORY": "Repositório",
+    "ORGANIZATION_USERS": "Usuários da organização"
+  },
+
   "API_ERRORS": {
     "GENERIC_ERROR": "Algo inesperado aconteceu, tente novamente.",
-    "ERROR_LOGIN": "Verifique seu e-mail e senha e tente novamente.",
-    "UNCONFIRMED_EMAIL":"O e-mail ainda não foi confirmado.",
+    "ERROR_LOGIN": "Verifique seu email e senha e tente novamente.",
+    "UNCONFIRMED_EMAIL": "O email ainda não foi confirmado.",
     "INVALID_RECOVERY_CODE": "Código de recuperação inválido.",
-    "EMAIL_IN_USE":"O e-mail informado já esta em uso.",
+    "EMAIL_IN_USE": "O email informado já esta em uso.",
     "NO_RECORDS": "Não há registros correspondentes para os dados informados.",
     "ALREADY_IN_COMPANY": "Este usuário já faz parte desta organização."
   }
diff --git a/horusec-manager/src/pages/External/CreateAccount/Password/index.tsx b/horusec-manager/src/pages/External/CreateAccount/Password/index.tsx
index ea962c5c5..e807b5722 100644
--- a/horusec-manager/src/pages/External/CreateAccount/Password/index.tsx
+++ b/horusec-manager/src/pages/External/CreateAccount/Password/index.tsx
@@ -72,48 +72,52 @@ function PasswordForm() {
 
   return (
     <>
-      <Styled.SubTitle>{t('CREATE_NEW_PASS')}</Styled.SubTitle>
+      <Styled.SubTitle>
+        {t('CREATE_ACCOUNT_SCREEN.CREATE_NEW_PASS')}
+      </Styled.SubTitle>
 
       <Styled.PassRequirements>
-        <Styled.Info>{t('PASSWORD_REQUIREMENTS')}</Styled.Info>
+        <Styled.Info>
+          {t('CREATE_ACCOUNT_SCREEN.PASSWORD_REQUIREMENTS')}
+        </Styled.Info>
 
         <Styled.Item isInvalid={passValidations.minCharacters}>
-          {t('MIN_CHARACTERS')}
+          {t('CREATE_ACCOUNT_SCREEN.MIN_CHARACTERS')}
         </Styled.Item>
 
         <Styled.Item isInvalid={passValidations.alpha}>
-          {t('ALPHA_REQUIREMENTS')}
+          {t('CREATE_ACCOUNT_SCREEN.ALPHA_REQUIREMENTS')}
         </Styled.Item>
 
         <Styled.Item isInvalid={passValidations.number}>
-          {t('NUMBER_REQUIREMENT')}
+          {t('CREATE_ACCOUNT_SCREEN.NUMBER_REQUIREMENT')}
         </Styled.Item>
 
         <Styled.Item isInvalid={passValidations.characterSpecial}>
-          {t('SPECIAL_CHARACTER')}
+          {t('CREATE_ACCOUNT_SCREEN.SPECIAL_CHARACTER')}
         </Styled.Item>
 
-        <Styled.Info>{t('NO_EQUALS')}</Styled.Info>
+        <Styled.Info>{t('CREATE_ACCOUNT_SCREEN.NO_EQUALS')}</Styled.Info>
 
-        <Styled.Item>{t('USER_NAME')}</Styled.Item>
+        <Styled.Item>{t('CREATE_ACCOUNT_SCREEN.USER_NAME')}</Styled.Item>
       </Styled.PassRequirements>
 
       <Styled.Form onSubmit={handleSubmit}>
         <Styled.Field
           onChangeValue={(field: Field) => handlePasswordValue(field)}
-          label={t('PASSWORD')}
+          label={t('CREATE_ACCOUNT_SCREEN.PASSWORD')}
           name="password"
           type="password"
-          invalidMessage={t('INVALID_PASS')}
+          invalidMessage={t('CREATE_ACCOUNT_SCREEN.INVALID_PASS')}
           validation={isEmptyString}
         />
 
         <Styled.Field
-          label={t('CONFIRM_PASS')}
+          label={t('CREATE_ACCOUNT_SCREEN.CONFIRM_PASS')}
           onChangeValue={(field: Field) => setConfirmPass(field)}
           name="confirm-pass"
           type="password"
-          invalidMessage={t('INVALID_CONFIRM_PASS')}
+          invalidMessage={t('CREATE_ACCOUNT_SCREEN.INVALID_CONFIRM_PASS')}
           validation={validateEqualsPassword}
         />
 
@@ -126,7 +130,7 @@ function PasswordForm() {
             passValidations.minCharacters ||
             passValidations.number
           }
-          text={t('REGISTER')}
+          text={t('CREATE_ACCOUNT_SCREEN.SUBMIT')}
           type="submit"
           isLoading={isLoading}
           rounded
@@ -134,7 +138,7 @@ function PasswordForm() {
 
         <Styled.BackToLogin
           onClick={() => history.push('/login')}
-          text={t('BACK_LOGIN')}
+          text={t('CREATE_ACCOUNT_SCREEN.BACK')}
           outline
           rounded
         />
@@ -142,8 +146,8 @@ function PasswordForm() {
 
       <Dialog
         isVisible={successDialogVisible}
-        confirmText={t('CONFIRM')}
-        message={t('SUCCESS_CREATE_ACCOUNT')}
+        confirmText={t('CREATE_ACCOUNT_SCREEN.CONFIRM')}
+        message={t('CREATE_ACCOUNT_SCREEN.SUCCESS_CREATE_ACCOUNT')}
         onConfirm={() => history.push('/login')}
       />
     </>
diff --git a/horusec-manager/src/pages/External/CreateAccount/UserInfo/index.tsx b/horusec-manager/src/pages/External/CreateAccount/UserInfo/index.tsx
index fa0c025e9..c0708c3db 100644
--- a/horusec-manager/src/pages/External/CreateAccount/UserInfo/index.tsx
+++ b/horusec-manager/src/pages/External/CreateAccount/UserInfo/index.tsx
@@ -43,37 +43,39 @@ function UserInfoForm({ onNextStep }: UserInfoProps) {
 
   return (
     <>
-      <Styled.SubTitle>{t('CREATE_ACCOUNT')}</Styled.SubTitle>
+      <Styled.SubTitle>
+        {t('CREATE_ACCOUNT_SCREEN.CREATE_ACCOUNT')}
+      </Styled.SubTitle>
 
       <Styled.Form onSubmit={handleSubmit}>
         <Styled.Field
           onChangeValue={(field: Field) => setUsername(field)}
-          label={t('NAME')}
+          label={t('CREATE_ACCOUNT_SCREEN.NAME')}
           name="username"
           type="username"
-          invalidMessage={t('INVALID_NAME')}
+          invalidMessage={t('CREATE_ACCOUNT_SCREEN.INVALID_NAME')}
           validation={isEmptyString}
         />
 
         <Styled.Field
-          label={t('EMAIL')}
+          label={t('CREATE_ACCOUNT_SCREEN.EMAIL')}
           onChangeValue={(field: Field) => setEmail(field)}
           name="email"
           type="text"
-          invalidMessage={t('INVALID_EMAIL')}
+          invalidMessage={t('CREATE_ACCOUNT_SCREEN.INVALID_EMAIL')}
           validation={isValidEmail}
         />
 
         <Styled.Submit
           isDisabled={!email.isValid || !username.isValid}
-          text={t('NEXT')}
+          text={t('CREATE_ACCOUNT_SCREEN.NEXT')}
           type="submit"
           rounded
         />
 
         <Styled.BackToLogin
           onClick={() => history.push('/login')}
-          text={t('BACK_LOGIN')}
+          text={t('CREATE_ACCOUNT_SCREEN.BACK')}
           outline
           rounded
         />
diff --git a/horusec-manager/src/pages/External/Login/index.tsx b/horusec-manager/src/pages/External/Login/index.tsx
index 148552e1c..d82bbad01 100644
--- a/horusec-manager/src/pages/External/Login/index.tsx
+++ b/horusec-manager/src/pages/External/Login/index.tsx
@@ -48,31 +48,31 @@ function LoginScreen() {
     <ExternalLayout>
       <Styled.Form onSubmit={handleSubmit}>
         <Styled.Field
-          label={t('EMAIL')}
+          label={t('LOGIN_SCREEN.EMAIL')}
           name="email"
           type="text"
           onChangeValue={(field: Field) => setEmail(field)}
-          invalidMessage={t('INVALID_EMAIL')}
+          invalidMessage={t('LOGIN_SCREEN.INVALID_EMAIL')}
           validation={isValidEmail}
         />
 
         <Styled.Field
-          label={t('PASSWORD')}
+          label={t('LOGIN_SCREEN.PASSWORD')}
           name="password"
           type="password"
           onChangeValue={(field: Field) => setPassword(field)}
           validation={isEmptyString}
-          invalidMessage={t('INVALID_PASS')}
+          invalidMessage={t('LOGIN_SCREEN.INVALID_PASS')}
         />
 
         <Styled.ForgotPass onClick={() => history.push('/recovery-password')}>
-          {t('FORGOT_PASS')}
+          {t('LOGIN_SCREEN.FORGOT_PASS')}
         </Styled.ForgotPass>
 
         <Styled.Submit
           isDisabled={!password.isValid || !email.isValid}
           isLoading={loginInProgress}
-          text={t('LOGIN')}
+          text={t('LOGIN_SCREEN.SUBMIT')}
           type="submit"
           rounded
         />
@@ -80,7 +80,7 @@ function LoginScreen() {
         <Styled.Register
           onClick={() => history.push('/create-account')}
           outline
-          text={t('NO_ACCOUNT')}
+          text={t('LOGIN_SCREEN.NO_ACCOUNT')}
           rounded
         />
       </Styled.Form>
diff --git a/horusec-manager/src/pages/External/RecoveryPassword/CheckCode/index.tsx b/horusec-manager/src/pages/External/RecoveryPassword/CheckCode/index.tsx
index 0e4db87bc..f07f318d6 100644
--- a/horusec-manager/src/pages/External/RecoveryPassword/CheckCode/index.tsx
+++ b/horusec-manager/src/pages/External/RecoveryPassword/CheckCode/index.tsx
@@ -67,15 +67,17 @@ function CheckCode() {
   return (
     <ExternalLayout>
       <>
-        <Styled.SubTitle>{t('TYPE_THE_CODE')}</Styled.SubTitle>
+        <Styled.SubTitle>
+          {t('RECOVERY_PASS_SCREEN.TYPE_THE_CODE')}
+        </Styled.SubTitle>
 
         <Styled.Form onSubmit={handleSubmit}>
           <Styled.Field
-            label={t('EMAIL')}
+            label={t('RECOVERY_PASS_SCREEN.EMAIL')}
             name="email"
             type="text"
             onChangeValue={(value: Field) => setEmail(value)}
-            invalidMessage={t('INVALID_EMAIL')}
+            invalidMessage={t('RECOVERY_PASS_SCREEN.INVALID_EMAIL')}
             validation={isValidEmail}
             initialValue={email.value}
           />
@@ -85,21 +87,21 @@ function CheckCode() {
             name="code"
             type="text"
             onChangeValue={(value: Field) => setCode(value)}
-            invalidMessage={t('INVALID_CODE')}
+            invalidMessage={t('RECOVERY_PASS_SCREEN.INVALID_CODE')}
             validation={isEmptyString}
             initialValue={code.value}
           />
 
           <Styled.Submit
             isDisabled={!code.isValid}
-            text={t('CHECK_CODE')}
+            text={t('RECOVERY_PASS_SCREEN.CHECK_CODE')}
             type="submit"
             rounded
           />
 
           <Styled.BackToLogin
             onClick={() => history.push('/login')}
-            text={t('BACK_LOGIN')}
+            text={t('RECOVERY_PASS_SCREEN.BACK')}
             rounded
             outline
           />
diff --git a/horusec-manager/src/pages/External/RecoveryPassword/NewPassword/index.tsx b/horusec-manager/src/pages/External/RecoveryPassword/NewPassword/index.tsx
index 5cfb295fa..54df002c0 100644
--- a/horusec-manager/src/pages/External/RecoveryPassword/NewPassword/index.tsx
+++ b/horusec-manager/src/pages/External/RecoveryPassword/NewPassword/index.tsx
@@ -97,48 +97,52 @@ function NewPasswordScreen() {
   return (
     <ExternalLayout>
       <>
-        <Styled.SubTitle>{t('CREATE_NEW_PASS')}</Styled.SubTitle>
+        <Styled.SubTitle>
+          {t('RECOVERY_PASS_SCREEN.CREATE_NEW_PASS')}
+        </Styled.SubTitle>
 
         <Styled.PassRequirements>
-          <Styled.Info>{t('PASSWORD_REQUIREMENTS')}</Styled.Info>
+          <Styled.Info>
+            {t('RECOVERY_PASS_SCREEN.PASSWORD_REQUIREMENTS')}
+          </Styled.Info>
 
           <Styled.Item isInvalid={passValidations.minCharacters}>
-            {t('MIN_CHARACTERS')}
+            {t('RECOVERY_PASS_SCREEN.MIN_CHARACTERS')}
           </Styled.Item>
 
           <Styled.Item isInvalid={passValidations.alpha}>
-            {t('ALPHA_REQUIREMENTS')}
+            {t('RECOVERY_PASS_SCREEN.ALPHA_REQUIREMENTS')}
           </Styled.Item>
 
           <Styled.Item isInvalid={passValidations.number}>
-            {t('NUMBER_REQUIREMENT')}
+            {t('RECOVERY_PASS_SCREEN.NUMBER_REQUIREMENT')}
           </Styled.Item>
 
           <Styled.Item isInvalid={passValidations.characterSpecial}>
-            {t('SPECIAL_CHARACTER')}
+            {t('RECOVERY_PASS_SCREEN.SPECIAL_CHARACTER')}
           </Styled.Item>
 
-          <Styled.Info>{t('NO_EQUALS')}</Styled.Info>
+          <Styled.Info>{t('RECOVERY_PASS_SCREEN.NO_EQUALS')}</Styled.Info>
 
-          <Styled.Item>{t('USER_NAME')}</Styled.Item>
+          <Styled.Item>{t('RECOVERY_PASS_SCREEN.USER_NAME')}</Styled.Item>
         </Styled.PassRequirements>
 
         <Styled.Form onSubmit={handleSubmit}>
           <Styled.Field
             onChangeValue={(field: Field) => handlePasswordValue(field)}
-            label={t('PASSWORD')}
+            label={t('RECOVERY_PASS_SCREEN.PASSWORD')}
             name="password"
             type="password"
-            invalidMessage={t('INVALID_PASS')}
+            invalidMessage={t('RECOVERY_PASS_SCREEN.INVALID_PASS')}
             validation={isEmptyString}
           />
 
           <Styled.Field
-            label={t('CONFIRM_PASS')}
+            label={t('RECOVERY_PASS_SCREEN.CONFIRM_PASS')}
             onChangeValue={(field: Field) => setConfirmPass(field)}
             name="confirm-pass"
             type="password"
-            invalidMessage={t('INVALID_CONFIRM_PASS')}
+            invalidMessage={t('RECOVERY_PASS_SCREEN.INVALID_CONFIRM_PASS')}
             validation={validateEqualsPassword}
           />
 
@@ -151,14 +155,14 @@ function NewPasswordScreen() {
               passValidations.minCharacters ||
               passValidations.number
             }
-            text={t('REGISTER')}
+            text={t('RECOVERY_PASS_SCREEN.UPDATE_PASS')}
             type="submit"
             rounded
           />
 
           <Styled.BackToLogin
             onClick={() => history.push('/login')}
-            text={t('BACK_LOGIN')}
+            text={t('RECOVERY_PASS_SCREEN.BACK')}
             rounded
             outline
           />
@@ -166,8 +170,8 @@ function NewPasswordScreen() {
 
         <Dialog
           isVisible={successDialogVisible}
-          confirmText={t('BACK_LOGIN')}
-          message={t('SUCCESS_ALTER_PASS')}
+          confirmText={t('RECOVERY_PASS_SCREEN.BACK')}
+          message={t('RECOVERY_PASS_SCREEN.SUCCESS_ALTER_PASS')}
           onConfirm={() => history.push('/login')}
         />
       </>
diff --git a/horusec-manager/src/pages/External/RecoveryPassword/SendEmail/index.tsx b/horusec-manager/src/pages/External/RecoveryPassword/SendEmail/index.tsx
index c7ef44163..bbbd064fd 100644
--- a/horusec-manager/src/pages/External/RecoveryPassword/SendEmail/index.tsx
+++ b/horusec-manager/src/pages/External/RecoveryPassword/SendEmail/index.tsx
@@ -57,22 +57,24 @@ function SendEmailScreen() {
   return (
     <ExternalLayout>
       <>
-        <Styled.SubTitle>{t('RECOVERY_PASS')}</Styled.SubTitle>
+        <Styled.SubTitle>
+          {t('RECOVERY_PASS_SCREEN.INPUT_EMAIL')}
+        </Styled.SubTitle>
 
         <Styled.Form onSubmit={handleSubmit}>
           <Styled.Field
             onChangeValue={(field: Field) => setEmail(field)}
-            label={t('EMAIL')}
+            label={t('RECOVERY_PASS_SCREEN.EMAIL')}
             name="email"
             type="email"
-            invalidMessage={t('INVALID_EMAIL')}
+            invalidMessage={t('RECOVERY_PASS_SCREEN.INVALID_EMAIL')}
             validation={emailValidator}
           />
 
           <Styled.Submit
             isLoading={isLoading}
             isDisabled={!email.isValid}
-            text={t('SEND_CODE_EMAIL')}
+            text={t('RECOVERY_PASS_SCREEN.SUBMIT')}
             type="submit"
             rounded
           />
@@ -80,15 +82,15 @@ function SendEmailScreen() {
           <Styled.BackToLogin
             onClick={() => history.push('/login')}
             outline
-            text={t('BACK_LOGIN')}
+            text={t('RECOVERY_PASS_SCREEN.BACK')}
             rounded
           />
         </Styled.Form>
 
         <Dialog
           isVisible={successDialogVisible}
-          confirmText={t('CONFIRM')}
-          message={t('SUCCESS_SEND_EMAIL')}
+          confirmText={t('RECOVERY_PASS_SCREEN.CONFIRM')}
+          message={t('RECOVERY_PASS_SCREEN.SUCCESS')}
           onConfirm={() => history.push('/login')}
         />
       </>
diff --git a/horusec-manager/src/pages/Internal/Company/Add/index.tsx b/horusec-manager/src/pages/Internal/Company/Add/index.tsx
index e88ef2c0f..df2bb7818 100644
--- a/horusec-manager/src/pages/Internal/Company/Add/index.tsx
+++ b/horusec-manager/src/pages/Internal/Company/Add/index.tsx
@@ -42,24 +42,26 @@ function AddCompany() {
 
   return (
     <>
-      <Styled.Title>{t('ADD_ORGANIZATION')}</Styled.Title>
+      <Styled.Title>{t('COMPANY_SCREEN.ADD_ORGANIZATION')}</Styled.Title>
 
-      <Styled.SubTitle>{t('TYPE_ORGANIZATION_NAME')}</Styled.SubTitle>
+      <Styled.SubTitle>
+        {t('COMPANY_SCREEN.TYPE_ORGANIZATION_NAME')}
+      </Styled.SubTitle>
 
       <Styled.Form onSubmit={handleSubmit}>
         <Input
           name="companyName"
-          label={t('ORGANIZATION_NAME')}
+          label={t('COMPANY_SCREEN.ORGANIZATION_NAME')}
           width="100%"
           onChangeValue={(field: Field) => setCompanyName(field)}
           validation={isEmptyString}
-          invalidMessage={t('INVALID_ORGANIZATION_NAME')}
+          invalidMessage={t('COMPANY_SCREEN.INVALID_ORGANIZATION_NAME')}
         />
 
         <Styled.OptionsWrapper>
           <Styled.Btn
             outline
-            text={t('CANCEL')}
+            text={t('COMPANY_SCREEN.CANCEL')}
             width={100}
             height={40}
             onClick={() => history.push('/organization')}
@@ -69,7 +71,7 @@ function AddCompany() {
             isDisabled={!companyName.isValid}
             isLoading={isLoading}
             type="submit"
-            text={t('SAVE')}
+            text={t('COMPANY_SCREEN.SAVE')}
             width={100}
             height={40}
           />
diff --git a/horusec-manager/src/pages/Internal/Company/Edit/index.tsx b/horusec-manager/src/pages/Internal/Company/Edit/index.tsx
index d99656183..bdb72357b 100644
--- a/horusec-manager/src/pages/Internal/Company/Edit/index.tsx
+++ b/horusec-manager/src/pages/Internal/Company/Edit/index.tsx
@@ -58,25 +58,27 @@ function EditCompany({
 
   return (
     <>
-      <Styled.Title>{t('EDIT_ORGANIZATION_NAME')}</Styled.Title>
+      <Styled.Title>{t('COMPANY_SCREEN.EDIT_ORGANIZATION_NAME')}</Styled.Title>
 
-      <Styled.SubTitle>{t('TYPE_ORGANIZATION_NAME')}</Styled.SubTitle>
+      <Styled.SubTitle>
+        {t('COMPANY_SCREEN.TYPE_ORGANIZATION_NAME')}
+      </Styled.SubTitle>
 
       <Styled.Form onSubmit={handleSubmit}>
         <Input
           name="companyName"
-          label={t('ORGANIZATION_NAME')}
+          label={t('COMPANY_SCREEN.ORGANIZATION_NAME')}
           width="100%"
           onChangeValue={(field: Field) => setCompanyName(field)}
           validation={isEmptyString}
-          invalidMessage={t('INVALID_ORGANIZATION_NAME')}
+          invalidMessage={t('COMPANY_SCREEN.INVALID_ORGANIZATION_NAME')}
           initialValue={companyName.value}
         />
 
         <Styled.OptionsWrapper>
           <Styled.Btn
             outline
-            text={t('CANCEL')}
+            text={t('COMPANY_SCREEN.CANCEL')}
             width={100}
             height={40}
             onClick={() => history.push('/organization')}
@@ -86,7 +88,7 @@ function EditCompany({
             isDisabled={!companyName.isValid}
             isLoading={isLoading}
             type="submit"
-            text={t('SAVE')}
+            text={t('COMPANY_SCREEN.SAVE')}
             width={100}
             height={40}
           />
diff --git a/horusec-manager/src/pages/Internal/Company/List/index.tsx b/horusec-manager/src/pages/Internal/Company/List/index.tsx
index 9fe05af98..5b9728794 100644
--- a/horusec-manager/src/pages/Internal/Company/List/index.tsx
+++ b/horusec-manager/src/pages/Internal/Company/List/index.tsx
@@ -48,13 +48,15 @@ function ListCompanies() {
 
   return (
     <>
-      <Styled.Title>{t('SELECT_ORGANIZATION')}</Styled.Title>
+      <Styled.Title>{t('COMPANY_SCREEN.SELECT_ORGANIZATION')}</Styled.Title>
 
       <Styled.OptionsWrapper>
         <Styled.AddCompanyBtn onClick={() => history.push('/organization/add')}>
           <Icon name="add" size="16px" />
 
-          <Styled.TextBtn>{t('ADD_ORGANIZATION')}</Styled.TextBtn>
+          <Styled.TextBtn>
+            {t('COMPANY_SCREEN.ADD_ORGANIZATION')}
+          </Styled.TextBtn>
         </Styled.AddCompanyBtn>
 
         <Styled.SearchWrapper>
@@ -78,7 +80,9 @@ function ListCompanies() {
 
           {filteredCompanies.length <= 0 && !isLoading ? (
             <Styled.NoItem>
-              <Styled.ItemText>{t('NO_ORGANIZATIONS')}</Styled.ItemText>
+              <Styled.ItemText>
+                {t('COMPANY_SCREEN.NO_ORGANIZATIONS')}
+              </Styled.ItemText>
             </Styled.NoItem>
           ) : null}
 
@@ -108,13 +112,13 @@ function ListCompanies() {
                     })
                   }
                 >
-                  {t('EDIT')}
+                  {t('COMPANY_SCREEN.EDIT')}
                 </Styled.SettingsItem>
 
                 <Styled.SettingsItem
                   onClick={() => setCompanyToDelete(company)}
                 >
-                  {t('REMOVE')}
+                  {t('COMPANY_SCREEN.REMOVE')}
                 </Styled.SettingsItem>
               </Styled.Settings>
             </Styled.Item>
@@ -126,8 +130,8 @@ function ListCompanies() {
         hasCancel
         defaultButton
         isVisible={companyToDelete}
-        confirmText={t('YES')}
-        message={`${t('CONFIRM_DELETE_ORGANIZATION')} ${
+        confirmText={t('COMPANY_SCREEN.YES')}
+        message={`${t('COMPANY_SCREEN.CONFIRM_DELETE_ORGANIZATION')} ${
           companyToDelete?.name
         } ?`}
         onConfirm={() => {
diff --git a/horusec-manager/src/pages/Internal/Home/Dashboard/AllVulnerabilities/index.tsx b/horusec-manager/src/pages/Internal/Home/Dashboard/AllVulnerabilities/index.tsx
index ec0feb647..74026a044 100644
--- a/horusec-manager/src/pages/Internal/Home/Dashboard/AllVulnerabilities/index.tsx
+++ b/horusec-manager/src/pages/Internal/Home/Dashboard/AllVulnerabilities/index.tsx
@@ -41,7 +41,7 @@ const AllVulnerabilities: React.FC<Props> = ({ filters }) => {
 
   const options: ApexOptions = {
     noData: {
-      text: t('CHART_NO_DATA'),
+      text: t('DASHBOARD_SCREEN.CHART_NO_DATA'),
       style: {
         color: colors.chart.legend,
       },
@@ -116,7 +116,7 @@ const AllVulnerabilities: React.FC<Props> = ({ filters }) => {
   return (
     <div className="block max-space">
       <Styled.Wrapper>
-        <Styled.Title>{t('ALL_VULNERABILITIES')}</Styled.Title>
+        <Styled.Title>{t('DASHBOARD_SCREEN.ALL_VULNERABILITIES')}</Styled.Title>
 
         <Styled.LoadingWrapper isLoading={isLoading}>
           <Icon name="loading" size="200px" className="loading" />
diff --git a/horusec-manager/src/pages/Internal/Home/Dashboard/Filters/index.tsx b/horusec-manager/src/pages/Internal/Home/Dashboard/Filters/index.tsx
index 53430fd68..7ebe63405 100644
--- a/horusec-manager/src/pages/Internal/Home/Dashboard/Filters/index.tsx
+++ b/horusec-manager/src/pages/Internal/Home/Dashboard/Filters/index.tsx
@@ -70,7 +70,7 @@ const Filters: React.FC<FilterProps> = ({ type, onApply }) => {
       <Styled.CalendarWrapper>
         <Calendar
           initialDate={filters.initialDate}
-          title={t('START_DATE')}
+          title={t('DASHBOARD_SCREEN.START_DATE')}
           onChangeValue={(date: Date) =>
             setFilters({ ...filters, initialDate: date })
           }
@@ -79,7 +79,7 @@ const Filters: React.FC<FilterProps> = ({ type, onApply }) => {
 
       <Styled.CalendarWrapper>
         <Calendar
-          title={t('FINAL_DATE')}
+          title={t('DASHBOARD_SCREEN.FINAL_DATE')}
           onChangeValue={(date: Date) =>
             setFilters({ ...filters, finalDate: date })
           }
@@ -91,7 +91,7 @@ const Filters: React.FC<FilterProps> = ({ type, onApply }) => {
           keyLabel="name"
           width="200px"
           options={repositories}
-          title={t('REPOSITORY')}
+          title={t('DASHBOARD_SCREEN.REPOSITORY')}
           onChangeValue={(value) =>
             setFilters({ ...filters, repositoryID: value.repositoryID })
           }
@@ -99,7 +99,7 @@ const Filters: React.FC<FilterProps> = ({ type, onApply }) => {
       ) : null}
 
       <Styled.ApplyButton
-        text={t('APPLY')}
+        text={t('DASHBOARD_SCREEN.APPLY')}
         rounded
         width={78}
         onClick={() => onApply(filters)}
diff --git a/horusec-manager/src/pages/Internal/Home/Dashboard/TotalDevelopers/index.tsx b/horusec-manager/src/pages/Internal/Home/Dashboard/TotalDevelopers/index.tsx
index 239c276c3..2b2f08c2f 100644
--- a/horusec-manager/src/pages/Internal/Home/Dashboard/TotalDevelopers/index.tsx
+++ b/horusec-manager/src/pages/Internal/Home/Dashboard/TotalDevelopers/index.tsx
@@ -53,7 +53,7 @@ const TotalDevelopers: React.FC<Props> = ({ filters }) => {
       <Counter
         value={total}
         isLoading={isLoading}
-        title={t('TOTAL_DEVELOPERS')}
+        title={t('DASHBOARD_SCREEN.TOTAL_DEVELOPERS')}
       />
     </div>
   );
diff --git a/horusec-manager/src/pages/Internal/Home/Dashboard/TotalRepositories/index.tsx b/horusec-manager/src/pages/Internal/Home/Dashboard/TotalRepositories/index.tsx
index 29376bf2e..a3577a353 100644
--- a/horusec-manager/src/pages/Internal/Home/Dashboard/TotalRepositories/index.tsx
+++ b/horusec-manager/src/pages/Internal/Home/Dashboard/TotalRepositories/index.tsx
@@ -53,7 +53,7 @@ const TotalRepositories: React.FC<Props> = ({ filters }) => {
       <Counter
         value={total}
         isLoading={isLoading}
-        title={t('TOTAL_REPOSITORIES')}
+        title={t('DASHBOARD_SCREEN.TOTAL_REPOSITORIES')}
       />
     </div>
   );
diff --git a/horusec-manager/src/pages/Internal/Home/Dashboard/VulnerabilitiesByDeveloper/index.tsx b/horusec-manager/src/pages/Internal/Home/Dashboard/VulnerabilitiesByDeveloper/index.tsx
index 764ebf816..07b4e32df 100644
--- a/horusec-manager/src/pages/Internal/Home/Dashboard/VulnerabilitiesByDeveloper/index.tsx
+++ b/horusec-manager/src/pages/Internal/Home/Dashboard/VulnerabilitiesByDeveloper/index.tsx
@@ -46,7 +46,7 @@ const VulnerabilitiesByDeveloper: React.FC<Props> = ({ filters }) => {
     },
     colors: Object.values(colors.vulnerabilities),
     noData: {
-      text: t('CHART_NO_DATA'),
+      text: t('DASHBOARD_SCREEN.CHART_NO_DATA'),
       style: {
         color: colors.chart.legend,
       },
@@ -112,7 +112,9 @@ const VulnerabilitiesByDeveloper: React.FC<Props> = ({ filters }) => {
   return (
     <div className="block max-space">
       <Styled.Wrapper>
-        <Styled.Title>{t('VULNERABILITIES_BY_DEV')}</Styled.Title>
+        <Styled.Title>
+          {t('DASHBOARD_SCREEN.VULNERABILITIES_BY_DEV')}
+        </Styled.Title>
 
         <Styled.LoadingWrapper isLoading={isLoading}>
           <Icon name="loading" size="200px" className="loading" />
diff --git a/horusec-manager/src/pages/Internal/Home/Dashboard/VulnerabilitiesByLanguage/index.tsx b/horusec-manager/src/pages/Internal/Home/Dashboard/VulnerabilitiesByLanguage/index.tsx
index a7aa73e90..46f5f51cb 100644
--- a/horusec-manager/src/pages/Internal/Home/Dashboard/VulnerabilitiesByLanguage/index.tsx
+++ b/horusec-manager/src/pages/Internal/Home/Dashboard/VulnerabilitiesByLanguage/index.tsx
@@ -44,7 +44,7 @@ const VulnerabilitiesByLanguage: React.FC<Props> = ({ filters }) => {
       size: 0,
     },
     noData: {
-      text: t('CHART_NO_DATA'),
+      text: t('DASHBOARD_SCREEN.CHART_NO_DATA'),
       style: {
         color: colors.chart.legend,
       },
@@ -122,7 +122,9 @@ const VulnerabilitiesByLanguage: React.FC<Props> = ({ filters }) => {
   return (
     <div className="block max-space">
       <Styled.Wrapper>
-        <Styled.Title>{t('VULNERABILITIES_BY_LANG')}</Styled.Title>
+        <Styled.Title>
+          {t('DASHBOARD_SCREEN.VULNERABILITIES_BY_LANG')}
+        </Styled.Title>
 
         <Styled.LoadingWrapper isLoading={isLoading}>
           <Icon name="loading" size="200px" className="loading" />
diff --git a/horusec-manager/src/pages/Internal/Home/Dashboard/VulnerabilitiesByRepository/index.tsx b/horusec-manager/src/pages/Internal/Home/Dashboard/VulnerabilitiesByRepository/index.tsx
index 7f2610c23..fd0d7d55d 100644
--- a/horusec-manager/src/pages/Internal/Home/Dashboard/VulnerabilitiesByRepository/index.tsx
+++ b/horusec-manager/src/pages/Internal/Home/Dashboard/VulnerabilitiesByRepository/index.tsx
@@ -46,7 +46,7 @@ const VulnerabilitiesByRepository: React.FC<Props> = ({ filters }) => {
     },
     colors: Object.values(colors.vulnerabilities),
     noData: {
-      text: t('CHART_NO_DATA'),
+      text: t('DASHBOARD_SCREEN.CHART_NO_DATA'),
       style: {
         color: colors.chart.legend,
       },
@@ -112,7 +112,9 @@ const VulnerabilitiesByRepository: React.FC<Props> = ({ filters }) => {
   return (
     <div className="block max-space">
       <Styled.Wrapper>
-        <Styled.Title>{t('VULNERABILITIES_BY_REPO')}</Styled.Title>
+        <Styled.Title>
+          {t('DASHBOARD_SCREEN.VULNERABILITIES_BY_REPO')}
+        </Styled.Title>
 
         <Styled.LoadingWrapper isLoading={isLoading}>
           <Icon name="loading" size="200px" className="loading" />
diff --git a/horusec-manager/src/pages/Internal/Home/Dashboard/VulnerabilitiesDetails/index.tsx b/horusec-manager/src/pages/Internal/Home/Dashboard/VulnerabilitiesDetails/index.tsx
index 3ea25bea4..b3e74a7ea 100644
--- a/horusec-manager/src/pages/Internal/Home/Dashboard/VulnerabilitiesDetails/index.tsx
+++ b/horusec-manager/src/pages/Internal/Home/Dashboard/VulnerabilitiesDetails/index.tsx
@@ -127,7 +127,9 @@ const VulnerabilitiesDetails: React.FC<Props> = ({ filters }) => {
   return (
     <div className="max-space">
       <Styled.Wrapper>
-        <Styled.Title>{t('VULNERABILITY_DETAILS')}</Styled.Title>
+        <Styled.Title>
+          {t('DASHBOARD_SCREEN.VULNERABILITY_DETAILS')}
+        </Styled.Title>
 
         <Styled.LoadingWrapper isLoading={isLoading}>
           <Icon name="loading" size="200px" className="loading" />
@@ -135,18 +137,20 @@ const VulnerabilitiesDetails: React.FC<Props> = ({ filters }) => {
 
         <Styled.Table>
           <Styled.Head>
-            <Styled.Column>{t('LANGUAGE')}</Styled.Column>
-            <Styled.Column>{t('SEVERITY')}</Styled.Column>
-            <Styled.Column>{t('AUTHOR')}</Styled.Column>
-            <Styled.Column>{t('DESCRIPTION')}</Styled.Column>
-            <Styled.Column>{t('FILE')}</Styled.Column>
-            <Styled.Column>{t('LINE')}</Styled.Column>
-            <Styled.Column>{t('CODE')}</Styled.Column>
+            <Styled.Column>{t('DASHBOARD_SCREEN.LANGUAGE')}</Styled.Column>
+            <Styled.Column>{t('DASHBOARD_SCREEN.SEVERITY')}</Styled.Column>
+            <Styled.Column>{t('DASHBOARD_SCREEN.AUTHOR')}</Styled.Column>
+            <Styled.Column>{t('DASHBOARD_SCREEN.DESCRIPTION')}</Styled.Column>
+            <Styled.Column>{t('DASHBOARD_SCREEN.FILE')}</Styled.Column>
+            <Styled.Column>{t('DASHBOARD_SCREEN.LINE')}</Styled.Column>
+            <Styled.Column>{t('DASHBOARD_SCREEN.CODE')}</Styled.Column>
           </Styled.Head>
 
           <Styled.Body>
             {!dataValues || dataValues.length <= 0 ? (
-              <Styled.EmptyText>{t('CHART_NO_DATA')}</Styled.EmptyText>
+              <Styled.EmptyText>
+                {t('DASHBOARD_SCREEN.CHART_NO_DATA')}
+              </Styled.EmptyText>
             ) : null}
 
             {dataValues.map((item, index) => (
@@ -185,13 +189,13 @@ const VulnerabilitiesDetails: React.FC<Props> = ({ filters }) => {
           {dataValues && dataValues.length > 0 ? (
             <Styled.Pagination>
               <Styled.Button onClick={() => handlePagination('previous')}>
-                {t('PREVIOUS_PAGE')}
+                {t('DASHBOARD_SCREEN.PREVIOUS_PAGE')}
               </Styled.Button>
               <Styled.CurrentPage>
                 {pagination.currentPage} / {pagination.totalPages}
               </Styled.CurrentPage>
               <Styled.Button onClick={() => handlePagination('next')}>
-                {t('NEXT_PAGE')}
+                {t('DASHBOARD_SCREEN.NEXT_PAGE')}
               </Styled.Button>
             </Styled.Pagination>
           ) : null}
diff --git a/horusec-manager/src/pages/Internal/Home/Dashboard/VulnerabilitiesTimeLine/index.tsx b/horusec-manager/src/pages/Internal/Home/Dashboard/VulnerabilitiesTimeLine/index.tsx
index 7fd8dd845..29525f23b 100644
--- a/horusec-manager/src/pages/Internal/Home/Dashboard/VulnerabilitiesTimeLine/index.tsx
+++ b/horusec-manager/src/pages/Internal/Home/Dashboard/VulnerabilitiesTimeLine/index.tsx
@@ -46,7 +46,7 @@ const VulnerabilitiesTimeLine: React.FC<Props> = ({ filters }) => {
     },
     colors: Object.values(colors.vulnerabilities),
     noData: {
-      text: t('CHART_NO_DATA'),
+      text: t('DASHBOARD_SCREEN.CHART_NO_DATA'),
       style: {
         color: colors.chart.legend,
       },
@@ -112,7 +112,9 @@ const VulnerabilitiesTimeLine: React.FC<Props> = ({ filters }) => {
   return (
     <div className="block max-space">
       <Styled.Wrapper>
-        <Styled.Title>{t('VULNERABILITY_TIMELINE')}</Styled.Title>
+        <Styled.Title>
+          {t('DASHBOARD_SCREEN.VULNERABILITY_TIMELINE')}
+        </Styled.Title>
 
         <Styled.LoadingWrapper isLoading={isLoading}>
           <Icon name="loading" size="200px" className="loading" />
diff --git a/horusec-manager/src/pages/Internal/Home/Repositories/Add/index.tsx b/horusec-manager/src/pages/Internal/Home/Repositories/Add/index.tsx
index f1090b0ea..21b1a9e90 100644
--- a/horusec-manager/src/pages/Internal/Home/Repositories/Add/index.tsx
+++ b/horusec-manager/src/pages/Internal/Home/Repositories/Add/index.tsx
@@ -72,13 +72,13 @@ const AddRepository: React.FC<Props> = ({ isVisible, onCancel, onConfirm }) => {
   return (
     <Dialog
       isVisible={isVisible}
-      message={t('CREATE_REPO')}
+      message={t('REPOSITORIES_SCREEN.CREATE_REPO')}
       onCancel={() => {
         onCancel();
         resetFields();
       }}
       onConfirm={handleConfirmSave}
-      confirmText={t('SAVE')}
+      confirmText={t('REPOSITORIES_SCREEN.SAVE')}
       disableConfirm={!name.isValid}
       disabledColor={colors.button.disableInDark}
       loadingConfirm={isLoading}
@@ -86,12 +86,14 @@ const AddRepository: React.FC<Props> = ({ isVisible, onCancel, onConfirm }) => {
       defaultButton
       hasCancel
     >
-      <Styled.SubTitle>{t('CREATE_NEW_REPO')}</Styled.SubTitle>
+      <Styled.SubTitle>
+        {t('REPOSITORIES_SCREEN.CREATE_NEW_REPO')}
+      </Styled.SubTitle>
 
       <Styled.Form onSubmit={handleConfirmSave}>
         <Styled.Field
-          label={t('NAME_REPO')}
-          invalidMessage={t('INVALID_NAME')}
+          label={t('REPOSITORIES_SCREEN.NAME_REPO')}
+          invalidMessage={t('REPOSITORIES_SCREEN.INVALID_NAME')}
           onChangeValue={(field: Field) => setName(field)}
           validation={isEmptyString}
           name="name"
@@ -100,7 +102,7 @@ const AddRepository: React.FC<Props> = ({ isVisible, onCancel, onConfirm }) => {
         />
 
         <Styled.Field
-          label={t('DESCRIPTION_REPO')}
+          label={t('REPOSITORIES_SCREEN.DESCRIPTION_REPO')}
           onChangeValue={(field: Field) => setDescription(field)}
           name="description"
           type="text"
diff --git a/horusec-manager/src/pages/Internal/Home/Repositories/Edit/index.tsx b/horusec-manager/src/pages/Internal/Home/Repositories/Edit/index.tsx
index ee1a1fdfb..7661b03ce 100644
--- a/horusec-manager/src/pages/Internal/Home/Repositories/Edit/index.tsx
+++ b/horusec-manager/src/pages/Internal/Home/Repositories/Edit/index.tsx
@@ -85,10 +85,10 @@ const EditRepository: React.FC<Props> = ({
   return (
     <Dialog
       isVisible={isVisible}
-      message={t('EDIT_REPO')}
+      message={t('REPOSITORIES_SCREEN.EDIT_REPO')}
       onCancel={onCancel}
       onConfirm={handleConfirmSave}
-      confirmText={t('SAVE')}
+      confirmText={t('REPOSITORIES_SCREEN.SAVE')}
       disableConfirm={!name.isValid}
       disabledColor={colors.button.disableInDark}
       loadingConfirm={isLoading}
@@ -96,12 +96,14 @@ const EditRepository: React.FC<Props> = ({
       defaultButton
       hasCancel
     >
-      <Styled.SubTitle>{t('EDIT_REPO_BELOW')}</Styled.SubTitle>
+      <Styled.SubTitle>
+        {t('REPOSITORIES_SCREEN.EDIT_REPO_BELOW')}
+      </Styled.SubTitle>
 
       <Styled.Form onSubmit={handleConfirmSave}>
         <Styled.Field
-          label={t('NAME_REPO')}
-          invalidMessage={t('INVALID_NAME')}
+          label={t('REPOSITORIES_SCREEN.NAME_REPO')}
+          invalidMessage={t('REPOSITORIES_SCREEN.INVALID_NAME')}
           onChangeValue={(field: Field) => setName(field)}
           validation={isEmptyString}
           name="name"
@@ -111,7 +113,7 @@ const EditRepository: React.FC<Props> = ({
         />
 
         <Styled.Field
-          label={t('DESCRIPTION_REPO')}
+          label={t('REPOSITORIES_SCREEN.DESCRIPTION_REPO')}
           onChangeValue={(field: Field) => setDescription(field)}
           name="description"
           type="text"
diff --git a/horusec-manager/src/pages/Internal/Home/Repositories/Invite/index.tsx b/horusec-manager/src/pages/Internal/Home/Repositories/Invite/index.tsx
index d9652efc3..fbe14f86c 100644
--- a/horusec-manager/src/pages/Internal/Home/Repositories/Invite/index.tsx
+++ b/horusec-manager/src/pages/Internal/Home/Repositories/Invite/index.tsx
@@ -53,11 +53,11 @@ const InviteToRepository: React.FC<Props> = ({
 
   const roles = [
     {
-      name: t('ADMIN'),
+      name: t('PERMISSIONS.ADMIN'),
       value: 'admin',
     },
     {
-      name: t('MEMBER'),
+      name: t('PERMISSIONS.MEMBER'),
       value: 'member',
     },
   ];
@@ -175,15 +175,19 @@ const InviteToRepository: React.FC<Props> = ({
     <Styled.Background>
       <Styled.Wrapper>
         <Styled.Header>
-          <Styled.Title>{t('INVITE_TO_REPOSITORY')}</Styled.Title>
+          <Styled.Title>
+            {t('REPOSITORIES_SCREEN.INVITE_TO_REPOSITORY')}
+          </Styled.Title>
 
           <Styled.Close name="close" size="24px" onClick={onClose} />
         </Styled.Header>
 
-        <Styled.SubTitle>{t('INVITE_USER_BELOW')}</Styled.SubTitle>
+        <Styled.SubTitle>
+          {t('REPOSITORIES_SCREEN.INVITE_USER_BELOW')}
+        </Styled.SubTitle>
 
         <SearchBar
-          placeholder={t('SEARCH_USER_EMAIL_BELOW')}
+          placeholder={t('REPOSITORIES_SCREEN.SEARCH_USER_EMAIL_BELOW')}
           onSearch={(value) => onSearchUser(value)}
         />
 
@@ -193,15 +197,17 @@ const InviteToRepository: React.FC<Props> = ({
           </Styled.LoadingWrapper>
 
           <Styled.Head>
-            <Styled.Column>{t('ACTION')}</Styled.Column>
-            <Styled.Column>{t('USER')}</Styled.Column>
-            <Styled.Column>{t('EMAIL')}</Styled.Column>
-            <Styled.Column>{t('PERMISSION')}</Styled.Column>
+            <Styled.Column>{t('REPOSITORIES_SCREEN.ACTION')}</Styled.Column>
+            <Styled.Column>{t('REPOSITORIES_SCREEN.USER')}</Styled.Column>
+            <Styled.Column>{t('REPOSITORIES_SCREEN.EMAIL')}</Styled.Column>
+            <Styled.Column>{t('REPOSITORIES_SCREEN.PERMISSION')}</Styled.Column>
           </Styled.Head>
 
           <Styled.Body>
             {!filteredUserAccounts || filteredUserAccounts.length <= 0 ? (
-              <Styled.EmptyText>{t('NO_USERS_TO_INVITE')}</Styled.EmptyText>
+              <Styled.EmptyText>
+                {t('REPOSITORIES_SCREEN.NO_USERS_TO_INVITE')}
+              </Styled.EmptyText>
             ) : null}
 
             {filteredUserAccounts.map((account) => (
diff --git a/horusec-manager/src/pages/Internal/Home/Repositories/Tokens/Add/Sucess/index.tsx b/horusec-manager/src/pages/Internal/Home/Repositories/Tokens/Add/Sucess/index.tsx
index f07dbdafb..72d7f2024 100644
--- a/horusec-manager/src/pages/Internal/Home/Repositories/Tokens/Add/Sucess/index.tsx
+++ b/horusec-manager/src/pages/Internal/Home/Repositories/Tokens/Add/Sucess/index.tsx
@@ -35,7 +35,7 @@ const SuccessAddToken: React.FC<Props> = ({ tokenValue, onConfirm }) => {
         <Styled.Head>
           <Icon name="lock" size="24px" />
 
-          <Styled.Title>{t('TOKEN_SUCCESS')}</Styled.Title>
+          <Styled.Title>{t('REPOSITORIES_SCREEN.TOKEN_SUCCESS')}</Styled.Title>
         </Styled.Head>
 
         <Styled.TokenWrapper isCopy={isCopied} onClick={setCopied}>
@@ -44,9 +44,14 @@ const SuccessAddToken: React.FC<Props> = ({ tokenValue, onConfirm }) => {
           <Icon name="copy" size="20px" className="copy" />
         </Styled.TokenWrapper>
 
-        <Styled.Info>{t('TOKEN_INFO')}</Styled.Info>
+        <Styled.Info>{t('REPOSITORIES_SCREEN.TOKEN_INFO')}</Styled.Info>
 
-        <Button text={t('CONFIRM')} rounded width={110} onClick={onConfirm} />
+        <Button
+          text={t('REPOSITORIES_SCREEN.CONFIRM')}
+          rounded
+          width={110}
+          onClick={onConfirm}
+        />
       </Styled.Wrapper>
     </Styled.Background>
   );
diff --git a/horusec-manager/src/pages/Internal/Home/Repositories/Tokens/Add/index.tsx b/horusec-manager/src/pages/Internal/Home/Repositories/Tokens/Add/index.tsx
index 649afcb13..43b5b879e 100644
--- a/horusec-manager/src/pages/Internal/Home/Repositories/Tokens/Add/index.tsx
+++ b/horusec-manager/src/pages/Internal/Home/Repositories/Tokens/Add/index.tsx
@@ -83,13 +83,13 @@ const AddToken: React.FC<Props> = ({
     <>
       <Dialog
         isVisible={isVisible}
-        message={t('CREATE_NEW_TOKEN')}
+        message={t('REPOSITORIES_SCREEN.CREATE_NEW_TOKEN')}
         onCancel={() => {
           onCancel();
           resetFields();
         }}
         onConfirm={handleConfirmSave}
-        confirmText={t('SAVE')}
+        confirmText={t('REPOSITORIES_SCREEN.SAVE')}
         disableConfirm={!description.isValid}
         disabledColor={colors.button.disableInDark}
         loadingConfirm={isLoading}
@@ -97,11 +97,13 @@ const AddToken: React.FC<Props> = ({
         defaultButton
         hasCancel
       >
-        <Styled.SubTitle>{t('CREATE_TOKEN_BELOW')}</Styled.SubTitle>
+        <Styled.SubTitle>
+          {t('REPOSITORIES_SCREEN.CREATE_TOKEN_BELOW')}
+        </Styled.SubTitle>
 
         <Styled.Field
-          label={t('DESCRIPTION')}
-          invalidMessage={t('INVALID_DESCRIPTION')}
+          label={t('REPOSITORIES_SCREEN.DESCRIPTION')}
+          invalidMessage={t('REPOSITORIES_SCREEN.INVALID_DESCRIPTION')}
           onChangeValue={(field: Field) => setDescription(field)}
           validation={isEmptyString}
           name="description"
diff --git a/horusec-manager/src/pages/Internal/Home/Repositories/Tokens/index.tsx b/horusec-manager/src/pages/Internal/Home/Repositories/Tokens/index.tsx
index ba01d0098..b637e3927 100644
--- a/horusec-manager/src/pages/Internal/Home/Repositories/Tokens/index.tsx
+++ b/horusec-manager/src/pages/Internal/Home/Repositories/Tokens/index.tsx
@@ -105,13 +105,13 @@ const Tokens: React.FC<Props> = ({
     <Styled.Background>
       <Styled.Wrapper>
         <Styled.Header>
-          <Styled.Title>{t('TOKENS')}</Styled.Title>
+          <Styled.Title>{t('REPOSITORIES_SCREEN.TOKENS')}</Styled.Title>
 
           <Styled.Close name="close" size="24px" onClick={onClose} />
         </Styled.Header>
 
         <Button
-          text={t('ADD_TOKEN')}
+          text={t('REPOSITORIES_SCREEN.ADD_TOKEN')}
           rounded
           width={150}
           icon="plus"
@@ -124,15 +124,19 @@ const Tokens: React.FC<Props> = ({
           </Styled.LoadingWrapper>
 
           <Styled.Head>
-            <Styled.Column>{t('TOKEN')}</Styled.Column>
-            <Styled.Column>{t('DESCRIPTION')}</Styled.Column>
-            <Styled.Column>{t('EXPIRES')}</Styled.Column>
-            <Styled.Column>{t('ACTION')}</Styled.Column>
+            <Styled.Column>{t('REPOSITORIES_SCREEN.TOKEN')}</Styled.Column>
+            <Styled.Column>
+              {t('REPOSITORIES_SCREEN.DESCRIPTION')}
+            </Styled.Column>
+            <Styled.Column>{t('REPOSITORIES_SCREEN.EXPIRES')}</Styled.Column>
+            <Styled.Column>{t('REPOSITORIES_SCREEN.ACTION')}</Styled.Column>
           </Styled.Head>
 
           <Styled.Body>
             {!tokens || tokens.length <= 0 ? (
-              <Styled.EmptyText>{t('NO_TOKENS')}</Styled.EmptyText>
+              <Styled.EmptyText>
+                {t('REPOSITORIES_SCREEN.NO_TOKENS')}
+              </Styled.EmptyText>
             ) : null}
 
             {tokens.map((token) => (
@@ -150,7 +154,7 @@ const Tokens: React.FC<Props> = ({
                     rounded
                     outline
                     opaque
-                    text={t('DELETE')}
+                    text={t('REPOSITORIES_SCREEN.DELETE')}
                     width={90}
                     height={30}
                     icon="delete"
@@ -164,8 +168,8 @@ const Tokens: React.FC<Props> = ({
       </Styled.Wrapper>
 
       <Dialog
-        message={t('CONFIRM_DELETE_TOKEN')}
-        confirmText={t('YES')}
+        message={t('REPOSITORIES_SCREEN.CONFIRM_DELETE_TOKEN')}
+        confirmText={t('REPOSITORIES_SCREEN.YES')}
         loadingConfirm={deleteIsLoading}
         defaultButton
         hasCancel
diff --git a/horusec-manager/src/pages/Internal/Home/Repositories/index.tsx b/horusec-manager/src/pages/Internal/Home/Repositories/index.tsx
index 499657fff..012b0b64b 100644
--- a/horusec-manager/src/pages/Internal/Home/Repositories/index.tsx
+++ b/horusec-manager/src/pages/Internal/Home/Repositories/index.tsx
@@ -56,8 +56,8 @@ const Repositories: React.FC = () => {
     repositoryService
       .getAll(companyID)
       .then((result) => {
-        setRepositories(result.data.content);
-        setFilteredRepos(result.data.content);
+        setRepositories(result?.data?.content);
+        setFilteredRepos(result?.data?.content);
       })
       .catch((err) => {
         dispatchMessage(err?.response?.data);
@@ -102,13 +102,13 @@ const Repositories: React.FC = () => {
     <Styled.Wrapper>
       <Styled.Options>
         <SearchBar
-          placeholder={t('SEARCH_REPO')}
+          placeholder={t('REPOSITORIES_SCREEN.SEARCH_REPO')}
           onSearch={(value) => onSearchRepository(value)}
         />
 
         {isAdminOfCompany() ? (
           <Button
-            text={t('CREATE_REPO')}
+            text={t('REPOSITORIES_SCREEN.CREATE_REPO')}
             rounded
             width={180}
             icon="plus"
@@ -122,18 +122,22 @@ const Repositories: React.FC = () => {
           <Icon name="loading" size="200px" className="loading" />
         </Styled.LoadingWrapper>
 
-        <Styled.Title>{t('REPOSITORIES')}</Styled.Title>
+        <Styled.Title>{t('REPOSITORIES_SCREEN.TITLE')}</Styled.Title>
 
         <Styled.Table>
           <Styled.Head>
-            <Styled.Column>{t('NAME')}</Styled.Column>
-            <Styled.Column>{t('DESCRIPTION')}</Styled.Column>
-            <Styled.Column>{t('ACTION')}</Styled.Column>
+            <Styled.Column>{t('REPOSITORIES_SCREEN.NAME')}</Styled.Column>
+            <Styled.Column>
+              {t('REPOSITORIES_SCREEN.DESCRIPTION')}
+            </Styled.Column>
+            <Styled.Column>{t('REPOSITORIES_SCREEN.ACTION')}</Styled.Column>
           </Styled.Head>
 
           <Styled.Body>
             {!filteredRepos || filteredRepos.length <= 0 ? (
-              <Styled.EmptyText>{t('NO_REPOSITORIES')}</Styled.EmptyText>
+              <Styled.EmptyText>
+                {t('REPOSITORIES_SCREEN.NO_REPOSITORIES')}
+              </Styled.EmptyText>
             ) : null}
 
             {filteredRepos.map((repo) => (
@@ -148,7 +152,7 @@ const Repositories: React.FC = () => {
                       rounded
                       outline
                       opaque
-                      text={t('DELETE')}
+                      text={t('REPOSITORIES_SCREEN.DELETE')}
                       width={90}
                       height={30}
                       icon="delete"
@@ -159,7 +163,7 @@ const Repositories: React.FC = () => {
                       outline
                       rounded
                       opaque
-                      text={t('EDIT')}
+                      text={t('REPOSITORIES_SCREEN.EDIT')}
                       width={90}
                       height={30}
                       icon="edit"
@@ -171,7 +175,7 @@ const Repositories: React.FC = () => {
                         outline
                         rounded
                         opaque
-                        text={t('INVITE')}
+                        text={t('REPOSITORIES_SCREEN.INVITE')}
                         width={90}
                         height={30}
                         icon="users"
@@ -183,7 +187,7 @@ const Repositories: React.FC = () => {
                       outline
                       rounded
                       opaque
-                      text={t('TOKENS')}
+                      text={t('REPOSITORIES_SCREEN.TOKENS')}
                       width={90}
                       height={30}
                       icon="lock"
@@ -198,8 +202,8 @@ const Repositories: React.FC = () => {
       </Styled.Content>
 
       <Dialog
-        message={t('CONFIRM_DELETE_REPO')}
-        confirmText={t('YES')}
+        message={t('REPOSITORIES_SCREEN.CONFIRM_DELETE_REPO')}
+        confirmText={t('REPOSITORIES_SCREEN.YES')}
         loadingConfirm={deleteIsLoading}
         defaultButton
         hasCancel
diff --git a/horusec-manager/src/pages/Internal/Home/Users/Edit/index.tsx b/horusec-manager/src/pages/Internal/Home/Users/Edit/index.tsx
index a94f9e273..7aabd5a75 100644
--- a/horusec-manager/src/pages/Internal/Home/Users/Edit/index.tsx
+++ b/horusec-manager/src/pages/Internal/Home/Users/Edit/index.tsx
@@ -47,11 +47,11 @@ const EditUserRole: React.FC<Props> = ({
 
   const roles: Role[] = [
     {
-      name: t('ADMIN'),
+      name: t('PERMISSIONS.ADMIN'),
       value: 'admin',
     },
     {
-      name: t('MEMBER'),
+      name: t('PERMISSIONS.MEMBER'),
       value: 'member',
     },
   ];
diff --git a/horusec-manager/src/pages/Internal/Home/Users/Invite/index.tsx b/horusec-manager/src/pages/Internal/Home/Users/Invite/index.tsx
index 2b9a3a9f8..ad9f7ae75 100644
--- a/horusec-manager/src/pages/Internal/Home/Users/Invite/index.tsx
+++ b/horusec-manager/src/pages/Internal/Home/Users/Invite/index.tsx
@@ -48,11 +48,11 @@ const InviteToCompany: React.FC<Props> = ({
 
   const roles: Role[] = [
     {
-      name: t('ADMIN'),
+      name: t('PERMISSIONS.ADMIN'),
       value: 'admin',
     },
     {
-      name: t('MEMBER'),
+      name: t('PERMISSIONS.MEMBER'),
       value: 'member',
     },
   ];