EPMRPP-97602 || fix conflicts

reportportal · Jan 14, 2025 · f293f4b · f293f4b
1 parent e0492e6
commit f293f4b
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 349 deletions.
diff --git a/app/localization/translated/be.json b/app/localization/translated/be.json
@@ -2189,21 +2189,5 @@
   "launchPatternAnalysisModal.title": "Патэрн-аналіз запускаў",
   "notFoundPage.oops": "Упс. Здаецца, Вы згубіліся.",
   "notFoundPage.pageNotExist": "Старонка, якую Вы шукаеце, не існуе.",
-  "notFoundPage.toHome": "Забярыце мяне адсюль",
-  "usersGrid.accountTypeGithub": "Github",
-  "usersGrid.accountTypeInternal": "Унутраны",
-  "usersGrid.accountTypeLdap": "Ldap",
-  "usersGrid.accountTypeSaml": "Saml",
-  "usersGrid.accountTypeScim": "SCIM",
-  "usersGrid.accountTypeUpsa": "UPSA",
-  "usersGrid.contains": "Змяшчае",
-  "usersGrid.email": "Эл. пошта",
-  "usersGrid.lastLogin": "Апошні ўваход",
-  "usersGrid.name": "Iмя",
-  "usersGrid.project": "Праект",
-  "usersGrid.role": "Роль",
-  "usersGrid.roleAdmin": "Адмін",
-  "usersGrid.roleNonAdmin": "Не Адмін",
-  "usersGrid.type": "Тып",
-  "usersGrid.user": "Лагін"
+  "notFoundPage.toHome": "Забярыце мяне адсюль"
 }
diff --git a/app/localization/translated/es.json b/app/localization/translated/es.json
@@ -2189,21 +2189,5 @@
   "launchPatternAnalysisModal.title": "Análisis de patrones de ejecuciones",
   "notFoundPage.oops": "Ups. Página no encontrada.",
   "notFoundPage.pageNotExist": "La página que busca no existe.",
-  "notFoundPage.toHome": "Llévame de aquí",
-  "usersGrid.accountTypeGithub": "Github",
-  "usersGrid.accountTypeInternal": "Interno",
-  "usersGrid.accountTypeLdap": "Ldap",
-  "usersGrid.accountTypeSaml": "Saml",
-  "usersGrid.accountTypeScim": "SCIM",
-  "usersGrid.accountTypeUpsa": "UPSA",
-  "usersGrid.contains": "Contiene",
-  "usersGrid.email": "Correo electrónico",
-  "usersGrid.lastLogin": "Último acceso",
-  "usersGrid.name": "Nombre",
-  "usersGrid.project": "Proyecto",
-  "usersGrid.role": "Rol",
-  "usersGrid.roleAdmin": "Admin",
-  "usersGrid.roleNonAdmin": "No Admin",
-  "usersGrid.type": "Tipo",
-  "usersGrid.user": "Usuario"
+  "notFoundPage.toHome": "Llévame de aquí"
 }
diff --git a/app/localization/translated/ru.json b/app/localization/translated/ru.json
@@ -2189,21 +2189,5 @@
   "launchPatternAnalysisModal.title": "Паттерн-анализ запусков",
   "notFoundPage.oops": "Упс. Страница не найдена.",
   "notFoundPage.pageNotExist": "Страница, которую Вы ищете, не существует.",
-  "notFoundPage.toHome": "Заберите меня отсюда",
-  "usersGrid.accountTypeGithub": "Github",
-  "usersGrid.accountTypeInternal": "Внутренний",
-  "usersGrid.accountTypeLdap": "Ldap",
-  "usersGrid.accountTypeSaml": "Saml",
-  "usersGrid.accountTypeScim": "SCIM",
-  "usersGrid.accountTypeUpsa": "UPSA",
-  "usersGrid.contains": "Содержит",
-  "usersGrid.email": "Эл. почта",
-  "usersGrid.lastLogin": "Последний вход",
-  "usersGrid.name": "Имя",
-  "usersGrid.project": "Проект",
-  "usersGrid.role": "Роль",
-  "usersGrid.roleAdmin": "Админ",
-  "usersGrid.roleNonAdmin": "Не Админ",
-  "usersGrid.type": "Тип",
-  "usersGrid.user": "Логин"
+  "notFoundPage.toHome": "Заберите меня отсюда"
 }
diff --git a/app/localization/translated/uk.json b/app/localization/translated/uk.json
@@ -2189,21 +2189,5 @@
   "launchPatternAnalysisModal.title": "Патерн-аналіз запусків",
   "notFoundPage.oops": "Упс. Сторінка не знайдена.",
   "notFoundPage.pageNotExist": "Сторінка, яку Ви шукаєте, не існує.",
-  "notFoundPage.toHome": "Заберіть мене звідси",
-  "usersGrid.accountTypeGithub": "На GitHub",
-  "usersGrid.accountTypeInternal": "Внутрішній",
-  "usersGrid.accountTypeLdap": "У LDAP",
-  "usersGrid.accountTypeSaml": "Saml",
-  "usersGrid.accountTypeScim": "SCIM",
-  "usersGrid.accountTypeUpsa": "УПСА",
-  "usersGrid.contains": "Містить",
-  "usersGrid.email": "Ел. пошта",
-  "usersGrid.lastLogin": "Останній вхід",
-  "usersGrid.name": "Ім’я",
-  "usersGrid.project": "Проект",
-  "usersGrid.role": "Роль",
-  "usersGrid.roleAdmin": "Адмін",
-  "usersGrid.roleNonAdmin": "Не Адмін",
-  "usersGrid.type": "Тип",
-  "usersGrid.user": "Логін"
+  "notFoundPage.toHome": "Заберіть мене звідси"
 }
diff --git a/app/localization/translated/zh.json b/app/localization/translated/zh.json
@@ -2189,21 +2189,5 @@
   "launchPatternAnalysisModal.title": "模板分析测试任务",
   "notFoundPage.oops": "哎呀，看起来您迷路了。",
   "notFoundPage.pageNotExist": "您要查找的页面不存在。",
-  "notFoundPage.toHome": "带我离开这里",
-  "usersGrid.accountTypeGithub": "Github",
-  "usersGrid.accountTypeInternal": "内部",
-  "usersGrid.accountTypeLdap": "Ldap",
-  "usersGrid.accountTypeSaml": "Saml",
-  "usersGrid.accountTypeScim": "SCIM",
-  "usersGrid.accountTypeUpsa": "UPSA",
-  "usersGrid.contains": "包含",
-  "usersGrid.email": "电子邮箱",
-  "usersGrid.lastLogin": "上次登录",
-  "usersGrid.name": "姓名",
-  "usersGrid.project": "项目",
-  "usersGrid.role": "角色",
-  "usersGrid.roleAdmin": "管理",
-  "usersGrid.roleNonAdmin": "非管理",
-  "usersGrid.type": "类型",
-  "usersGrid.user": "登录"
+  "notFoundPage.toHome": "带我离开这里"
 }
diff --git a/app/src/pages/admin/allUsersPage/usersToolbar/usersEntities.jsx b/app/src/pages/admin/allUsersPage/usersToolbar/usersEntities.jsx