@carlonicora/nextjs-jsonapi 1.29.2 → 1.29.4

package/dist/{chunk-IJSB4FH6.mjs → chunk-CWY6AL4V.mjs}

@@ -180,6 +180,7 @@ function useDataListRetriever(params) {
   const requestIdRef = useRef(0);
   const abortControllerRef = useRef(null);
   const isFetchingRef = useRef(false);
+  const isPaginatingRef = useRef(false);
   const resolvedType = params.module;
   const resolvedService = ClientAbstractService;
   const parsePageParams = useCallback2((url) => {
@@ -235,7 +236,13 @@ function useDataListRetriever(params) {
   const fetchData = useCallback2(
     async (fetchParams) => {
       if (ready === false) return;
+      if ((fetchParams?.callNext || fetchParams?.callPrevious) && isPaginatingRef.current) {
+        return;
+      }
       if (isFetchingRef.current && !fetchParams?.callNext && !fetchParams?.callPrevious) return;
+      if (fetchParams?.callNext || fetchParams?.callPrevious) {
+        isPaginatingRef.current = true;
+      }
       const thisRequestId = ++requestIdRef.current;
       isFetchingRef.current = true;
       if (stableParams.requiresSearch === true && fetchParams?.isRefine !== true && fetchParams?.isRefresh !== true) {
@@ -299,6 +306,7 @@ function useDataListRetriever(params) {
       } finally {
         if (thisRequestId === requestIdRef.current) {
           isFetchingRef.current = false;
+          isPaginatingRef.current = false;
         }
       }
     },
@@ -1074,10 +1082,10 @@ function AddUserToRoleInternal({ role, refresh }) {
     setUsers(users.filter((u) => u.id !== user.id));
     triggerAssociationToast({
       t,
-      source: t(`types.users`, { count: 1 }),
-      destination: t(`types.roles`, { count: 1 }),
+      source: t(`entities.users`, { count: 1 }),
+      destination: t(`entities.roles`, { count: 1 }),
       source_name: user.name,
-      destination_name: t(`foundations.role.roles`, { role: role.id.replaceAll(`-`, ``) })
+      destination_name: t(`role.roles`, { role: role.id.replaceAll(`-`, ``) })
     });
     refresh();
   }, "addUserToRole");
@@ -1096,8 +1104,8 @@ function AddUserToRoleInternal({ role, refresh }) {
     /* @__PURE__ */ jsx5(
       CommonAssociationTrigger,
       {
-        sourceType: t(`types.users`, { count: 1 }),
-        destinationType: t(`types.roles`, { count: 1 }),
+        sourceType: t(`entities.users`, { count: 1 }),
+        destinationType: t(`entities.roles`, { count: 1 }),
         onTrigger: () => setShow(true)
       }
     ),
@@ -1107,9 +1115,9 @@ function AddUserToRoleInternal({ role, refresh }) {
         show,
         setShow,
         data,
-        source: t(`types.users`, { count: 1 }),
-        destination: t(`types.roles`, { count: 1 }),
-        destinationName: t(`foundations.role.roles`, { role: role.id.replaceAll(`-`, ``) }),
+        source: t(`entities.users`, { count: 1 }),
+        destination: t(`entities.roles`, { count: 1 }),
+        destinationName: t(`role.roles`, { role: role.id.replaceAll(`-`, ``) }),
         children: /* @__PURE__ */ jsx5(UserListInAdd, { data, existingUsers, setSelectedUser: addUserToRole })
       }
     )
@@ -6821,7 +6829,7 @@ function UserAvatarEditor({ user, file, setFile, resetImage, setResetImage }) {
           Image,
           {
             src: file ? URL.createObjectURL(file) : user?.avatar || "",
-            alt: t(`generic.avatar`),
+            alt: t(`common.avatar`),
             width: 200,
             height: 200
           }
@@ -6840,7 +6848,7 @@ function UserAvatarEditor({ user, file, setFile, resetImage, setResetImage }) {
           setFile(null);
           setResetImage(true);
         },
-        children: t(`generic.buttons.remove`)
+        children: t(`ui.buttons.remove`)
       }
     )
   ] });
@@ -6911,8 +6919,8 @@ function UserEditorInternal({ user, propagateChanges, adminCreated, trigger, onR
   }, [company]);
   const formSchema = z.object({
     id: z.uuidv4(),
-    name: z.string().min(1, { message: t(`foundations.user.fields.name.error`) }),
-    email: z.string().min(1, { message: t(`generic.fields.email.error`) }),
+    name: z.string().min(1, { message: t(`user.fields.name.error`) }),
+    email: z.string().min(1, { message: t(`common.fields.email.error`) }),
     password: z.string().optional(),
     title: z.string().optional(),
     bio: z.string().optional(),
@@ -6943,9 +6951,9 @@ function UserEditorInternal({ user, propagateChanges, adminCreated, trigger, onR
         if (existingUser) {
           form.setError("email", {
             type: "manual",
-            message: t(`foundations.user.errors.email_exists`)
+            message: t(`user.errors.email_exists`)
           });
-          errorToast({ title: t(`foundations.user.errors.email_exists`), error: "" });
+          errorToast({ title: t(`user.errors.email_exists`), error: "" });
           return;
         }
       } catch (error) {
@@ -6990,7 +6998,7 @@ function UserEditorInternal({ user, propagateChanges, adminCreated, trigger, onR
         router.push(generateUrl({ page: Modules.User, id: updatedUser.id }));
       }
     } catch (error) {
-      errorToast({ title: user ? t(`generic.errors.update`) : t(`generic.errors.create`), error });
+      errorToast({ title: user ? t(`common.errors.update`) : t(`common.errors.create`), error });
     }
   }, "onSubmit");
   useEffect10(() => {
@@ -7031,7 +7039,7 @@ function UserEditorInternal({ user, propagateChanges, adminCreated, trigger, onR
       {
         className: `flex max-h-[70vh] ${canChangeRoles ? `max-w-[90vw]` : `max-w-3xl`} min-h-3xl max-h-[90vh] flex-col overflow-y-auto`,
         children: [
-          /* @__PURE__ */ jsx53(CommonEditorHeader, { type: t(`types.users`, { count: 1 }), name: user?.name }),
+          /* @__PURE__ */ jsx53(CommonEditorHeader, { type: t(`entities.users`, { count: 1 }), name: user?.name }),
           /* @__PURE__ */ jsx53(Form, { ...form, children: /* @__PURE__ */ jsxs24("form", { onSubmit: form.handleSubmit(onSubmit), className: `flex w-full flex-col gap-y-4`, children: [
             /* @__PURE__ */ jsxs24("div", { className: `flex flex-row gap-x-4`, children: [
               /* @__PURE__ */ jsx53("div", { className: `flex w-40 flex-col justify-start gap-y-2`, children: /* @__PURE__ */ jsx53(
@@ -7050,8 +7058,8 @@ function UserEditorInternal({ user, propagateChanges, adminCreated, trigger, onR
                   {
                     form,
                     id: "name",
-                    name: t(`foundations.user.fields.name.label`),
-                    placeholder: t(`foundations.user.fields.name.placeholder`)
+                    name: t(`user.fields.name.label`),
+                    placeholder: t(`user.fields.name.placeholder`)
                   }
                 ),
                 /* @__PURE__ */ jsx53(
@@ -7059,8 +7067,8 @@ function UserEditorInternal({ user, propagateChanges, adminCreated, trigger, onR
                   {
                     form,
                     id: "email",
-                    name: t(`generic.fields.email.label`),
-                    placeholder: t(`generic.fields.email.placeholder`)
+                    name: t(`common.fields.email.label`),
+                    placeholder: t(`common.fields.email.placeholder`)
                   }
                 ),
                 /* @__PURE__ */ jsx53(
@@ -7068,8 +7076,8 @@ function UserEditorInternal({ user, propagateChanges, adminCreated, trigger, onR
                   {
                     form,
                     id: "phone",
-                    name: t(`foundations.user.fields.phone.label`),
-                    placeholder: t(`foundations.user.fields.phone.placeholder`)
+                    name: t(`user.fields.phone.label`),
+                    placeholder: t(`user.fields.phone.placeholder`)
                   }
                 ),
                 /* @__PURE__ */ jsx53(
@@ -7077,8 +7085,8 @@ function UserEditorInternal({ user, propagateChanges, adminCreated, trigger, onR
                   {
                     form,
                     id: "password",
-                    name: t(`foundations.user.fields.password.label`),
-                    placeholder: t(`foundations.user.fields.password.placeholder`)
+                    name: t(`user.fields.password.label`),
+                    placeholder: t(`user.fields.password.placeholder`)
                   }
                 ),
                 /* @__PURE__ */ jsx53(
@@ -7086,8 +7094,8 @@ function UserEditorInternal({ user, propagateChanges, adminCreated, trigger, onR
                   {
                     form,
                     id: "title",
-                    name: t(`foundations.user.fields.title.label`),
-                    placeholder: t(`foundations.user.fields.title.placeholder`)
+                    name: t(`user.fields.title.label`),
+                    placeholder: t(`user.fields.title.placeholder`)
                   }
                 ),
                 /* @__PURE__ */ jsx53(
@@ -7095,24 +7103,17 @@ function UserEditorInternal({ user, propagateChanges, adminCreated, trigger, onR
                   {
                     form,
                     id: "bio",
-                    name: t(`foundations.user.fields.bio.label`),
-                    placeholder: t(`foundations.user.fields.bio.placeholder`),
+                    name: t(`user.fields.bio.label`),
+                    placeholder: t(`user.fields.bio.placeholder`),
                     className: "min-h-40"
                   }
                 )
               ] }),
               canChangeRoles && /* @__PURE__ */ jsxs24("div", { className: "flex w-1/3 flex-col", children: [
-                canChangeRoles && /* @__PURE__ */ jsx53(FormRoles, { form, id: "roleIds", name: t(`types.roles`, { count: 2 }), roles }),
+                canChangeRoles && /* @__PURE__ */ jsx53(FormRoles, { form, id: "roleIds", name: t(`entities.roles`, { count: 2 }), roles }),
                 !user && /* @__PURE__ */ jsxs24("div", { className: "flex flex-col gap-y-4", children: [
-                  /* @__PURE__ */ jsx53("div", { className: "text-sm font-semibold", children: t(`foundations.user.send_activation_email`) }),
-                  /* @__PURE__ */ jsx53(
-                    FormCheckbox,
-                    {
-                      form,
-                      id: "sendInvitationEmail",
-                      name: t(`foundations.user.send_activation_email`)
-                    }
-                  )
+                  /* @__PURE__ */ jsx53("div", { className: "text-sm font-semibold", children: t(`user.send_activation_email`) }),
+                  /* @__PURE__ */ jsx53(FormCheckbox, { form, id: "sendInvitationEmail", name: t(`user.send_activation_email`) })
                 ] })
               ] })
             ] }),
@@ -7167,7 +7168,7 @@ function CommonAssociationTrigger({
   const t = useTranslations5();
   if (hasDestination)
     return /* @__PURE__ */ jsx54("div", { className: "hover:text-accent cursor-pointer", onClick: onTrigger, children: "Join" });
-  return /* @__PURE__ */ jsx54(Button, { variant: `outline`, size: `sm`, onClick: onTrigger, children: t(`generic.association.label`, {
+  return /* @__PURE__ */ jsx54(Button, { variant: `outline`, size: `sm`, onClick: onTrigger, children: t(`common.association.label`, {
     source: sourceType,
     destination: destinationType
   }) });
@@ -7199,11 +7200,11 @@ function CommonAssociationCommandDialog({
   }, [show, searchTerm]);
   return /* @__PURE__ */ jsxs25(CommandDialog, { open: show, onOpenChange: setShow, children: [
     /* @__PURE__ */ jsxs25(DialogHeader, { className: "flex flex-col items-start p-4 pb-0", children: [
-      /* @__PURE__ */ jsx54(DialogTitle, { children: t(`generic.association.label`, {
+      /* @__PURE__ */ jsx54(DialogTitle, { children: t(`common.association.label`, {
         source,
         destination
       }) }),
-      /* @__PURE__ */ jsx54(DialogDescription, { children: t(`generic.association.description`, {
+      /* @__PURE__ */ jsx54(DialogDescription, { children: t(`common.association.description`, {
         source,
         destination,
         destination_name: destinationName
@@ -7213,13 +7214,13 @@ function CommonAssociationCommandDialog({
       /* @__PURE__ */ jsx54(
         CommandInput,
         {
-          placeholder: t(`generic.search.placeholder`, { type: source }),
+          placeholder: t(`ui.search.placeholder`, { type: source }),
           value: searchTerm,
           onValueChange: setSearchTerm
         }
       ),
       /* @__PURE__ */ jsxs25(CommandList, { className: "mt-3 h-auto max-h-96 min-h-96 max-w-full overflow-y-auto overflow-x-hidden", children: [
-        /* @__PURE__ */ jsx54(CommandEmpty, { children: t(`generic.search.no_results`, { type: source }) }),
+        /* @__PURE__ */ jsx54(CommandEmpty, { children: t(`ui.search.no_results`, { type: source }) }),
         children
       ] })
     ] })
@@ -7229,12 +7230,12 @@ __name(CommonAssociationCommandDialog, "CommonAssociationCommandDialog");
 var triggerAssociationToast = /* @__PURE__ */ __name((params) => {
   if (params.level) {
     toast.message(
-      params.t(`generic.association.label`, {
+      params.t(`common.association.label`, {
         source: params.source,
         destination: params.destination
       }),
       {
-        description: params.t(`generic.association.success_level`, {
+        description: params.t(`common.association.success_level`, {
           source: params.source,
           destination: params.destination,
           source_name: params.source_name,
@@ -7245,12 +7246,12 @@ var triggerAssociationToast = /* @__PURE__ */ __name((params) => {
     );
   } else {
     toast.message(
-      params.t(`generic.association.label`, {
+      params.t(`common.association.label`, {
         source: params.source,
         destination: params.destination
       }),
       {
-        description: params.t(`generic.association.success`, {
+        description: params.t(`common.association.success`, {
           source: params.source,
           destination: params.destination,
           source_name: params.source_name,
@@ -7317,18 +7318,28 @@ function CommonDeleter({ deleteFunction, redirectTo, type, forceShow }) {
       setOpen(false);
       if (redirectTo) router.push(redirectTo);
     } catch (error) {
-      errorToast({ title: t(`generic.errors.delete`), error });
+      errorToast({ title: t(`common.errors.delete`), error });
     }
     setIsDeleting(false);
   }, "handleDelete");
   return /* @__PURE__ */ jsxs27(AlertDialog, { open, onOpenChange: setOpen, children: [
-    forceShow ? null : /* @__PURE__ */ jsx56(AlertDialogTrigger, { children: /* @__PURE__ */ jsx56(Button, { render: /* @__PURE__ */ jsx56("div", {}), nativeButton: false, size: "sm", variant: "ghost", className: "text-muted-foreground hover:text-destructive", children: /* @__PURE__ */ jsx56(Trash2Icon, {}) }) }),
+    forceShow ? null : /* @__PURE__ */ jsx56(AlertDialogTrigger, { children: /* @__PURE__ */ jsx56(
+      Button,
+      {
+        render: /* @__PURE__ */ jsx56("div", {}),
+        nativeButton: false,
+        size: "sm",
+        variant: "ghost",
+        className: "text-muted-foreground hover:text-destructive",
+        children: /* @__PURE__ */ jsx56(Trash2Icon, {})
+      }
+    ) }),
     /* @__PURE__ */ jsxs27(AlertDialogContent, { className: `flex max-h-[70vh] max-w-3xl flex-col overflow-y-auto`, children: [
       /* @__PURE__ */ jsxs27(AlertDialogHeader, { children: [
-        /* @__PURE__ */ jsx56(AlertDialogTitle, { children: t(`generic.delete.title`, { type: t(`types.${type}`, { count: 1 }) }) }),
-        /* @__PURE__ */ jsx56(AlertDialogDescription, { children: t(`generic.delete.subtitle`, { type: t(`types.${type}`, { count: 1 }) }) })
+        /* @__PURE__ */ jsx56(AlertDialogTitle, { children: t(`common.delete.title`, { type: t(`entities.${type}`, { count: 1 }) }) }),
+        /* @__PURE__ */ jsx56(AlertDialogDescription, { children: t(`common.delete.subtitle`, { type: t(`entities.${type}`, { count: 1 }) }) })
       ] }),
-      /* @__PURE__ */ jsx56("div", { className: "text-destructive p-4 text-sm", children: t(`generic.delete.description`, { type: t(`types.${type}`, { count: 1 }) }) }),
+      /* @__PURE__ */ jsx56("div", { className: "text-destructive p-4 text-sm", children: t(`common.delete.description`, { type: t(`entities.${type}`, { count: 1 }) }) }),
       /* @__PURE__ */ jsxs27("div", { className: "flex justify-end", children: [
         /* @__PURE__ */ jsx56(
           Button,
@@ -7338,7 +7349,7 @@ function CommonDeleter({ deleteFunction, redirectTo, type, forceShow }) {
             type: `button`,
             onClick: () => setOpen(false),
             disabled: isDeleting,
-            children: t(`generic.buttons.cancel`)
+            children: t(`ui.buttons.cancel`)
           }
         ),
         /* @__PURE__ */ jsx56(
@@ -7352,9 +7363,9 @@ function CommonDeleter({ deleteFunction, redirectTo, type, forceShow }) {
             variant: "destructive",
             disabled: isDeleting,
             children: isDeleting ? /* @__PURE__ */ jsxs27(Fragment4, { children: [
-              t(`generic.buttons.is_deleting`),
+              t(`ui.buttons.is_deleting`),
               /* @__PURE__ */ jsx56(LoaderCircleIcon, { className: "animate-spin-slow h-5 w-5" })
-            ] }) : t(`generic.buttons.delete`)
+            ] }) : t(`ui.buttons.delete`)
           }
         )
       ] })
@@ -7377,10 +7388,10 @@ function CommonEditorButtons({ isEdit, form, disabled, setOpen }) {
         type: `button`,
         onClick: () => setOpen(false),
         "data-testid": `modal-button-cancel`,
-        children: t(`generic.buttons.cancel`)
+        children: t(`ui.buttons.cancel`)
       }
     ),
-    /* @__PURE__ */ jsx57(Button, { type: "submit", disabled: form.formState.isSubmitting || disabled, "data-testid": `modal-button-create`, children: isEdit ? t(`generic.buttons.confirm_update`) : t(`generic.buttons.confirm_create`) })
+    /* @__PURE__ */ jsx57(Button, { type: "submit", disabled: form.formState.isSubmitting || disabled, "data-testid": `modal-button-create`, children: isEdit ? t(`ui.buttons.confirm_update`) : t(`ui.buttons.confirm_create`) })
   ] });
 }
 __name(CommonEditorButtons, "CommonEditorButtons");
@@ -7391,13 +7402,13 @@ import { jsx as jsx58, jsxs as jsxs29 } from "react/jsx-runtime";
 function CommonEditorHeader({ type, name }) {
   const t = useTranslations7();
   return /* @__PURE__ */ jsxs29(DialogHeader, { children: [
-    /* @__PURE__ */ jsx58(DialogTitle, { children: name ? t(`generic.edit.update.title`, {
+    /* @__PURE__ */ jsx58(DialogTitle, { children: name ? t(`common.edit.update.title`, {
       type
-    }) : t(`generic.edit.create.title`, { type }) }),
-    /* @__PURE__ */ jsx58(DialogDescription, { children: name ? t(`generic.edit.update.description`, {
+    }) : t(`common.edit.create.title`, { type }) }),
+    /* @__PURE__ */ jsx58(DialogDescription, { children: name ? t(`common.edit.update.description`, {
       type,
       name
-    }) : t(`generic.edit.create.description`, {
+    }) : t(`common.edit.create.description`, {
       type
     }) })
   ] });
@@ -7410,7 +7421,7 @@ import { useTranslations as useTranslations8 } from "next-intl";
 import { jsx as jsx59 } from "react/jsx-runtime";
 function CommonEditorTrigger({ isEdit, edit, create }) {
   const t = useTranslations8();
-  return /* @__PURE__ */ jsx59(DialogTrigger, { children: isEdit ? /* @__PURE__ */ jsx59(Button, { render: /* @__PURE__ */ jsx59("div", {}), nativeButton: false, size: "sm", variant: `ghost`, className: "text-muted-foreground", children: /* @__PURE__ */ jsx59(PencilIcon, {}) }) : /* @__PURE__ */ jsx59(Button, { render: /* @__PURE__ */ jsx59("div", {}), nativeButton: false, size: "sm", variant: `outline`, children: create ? create : t(`generic.buttons.create`) }) });
+  return /* @__PURE__ */ jsx59(DialogTrigger, { children: isEdit ? /* @__PURE__ */ jsx59(Button, { render: /* @__PURE__ */ jsx59("div", {}), nativeButton: false, size: "sm", variant: `ghost`, className: "text-muted-foreground", children: /* @__PURE__ */ jsx59(PencilIcon, {}) }) : /* @__PURE__ */ jsx59(Button, { render: /* @__PURE__ */ jsx59("div", {}), nativeButton: false, size: "sm", variant: `outline`, children: create ? create : t(`ui.buttons.create`) }) });
 }
 __name(CommonEditorTrigger, "CommonEditorTrigger");
 
@@ -7738,8 +7749,8 @@ var FileUploader = forwardRef4(
       (acceptedFiles, rejectedFiles) => {
         const files = acceptedFiles;
         if (!files) {
-          toast3.error(t("generic.errors.file"), {
-            description: t("generic.errors.file_large")
+          toast3.error(t("common.errors.file"), {
+            description: t("common.errors.file_large")
           });
           return;
         }
@@ -7756,13 +7767,13 @@ var FileUploader = forwardRef4(
         if (rejectedFiles.length > 0) {
           for (let i = 0; i < rejectedFiles.length; i++) {
             if (rejectedFiles[i].errors[0]?.code === "file-too-large") {
-              toast3.error(t("generic.errors.file"), {
-                description: t(`generic.errors.file_max`, { size: maxSize / 1024 / 1024 })
+              toast3.error(t("common.errors.file"), {
+                description: t(`common.errors.file_max`, { size: maxSize / 1024 / 1024 })
               });
               break;
             }
             if (rejectedFiles[i].errors[0]?.message) {
-              toast3.error(t(`generic.errors.file`), {
+              toast3.error(t(`common.errors.file`), {
                 description: rejectedFiles[i].errors[0].message
               });
               break;
@@ -7871,7 +7882,7 @@ var FileUploaderItem = forwardRef4(
               className: cn("absolute", direction === "rtl" ? "top-1 left-1" : "top-1 right-1"),
               onClick: () => removeFileFromSet(index),
               children: [
-                /* @__PURE__ */ jsx62("span", { className: "sr-only", children: t(`generic.remove_item`, { index }) }),
+                /* @__PURE__ */ jsx62("span", { className: "sr-only", children: t(`common.remove_item`, { index }) }),
                 /* @__PURE__ */ jsx62(RemoveIcon, { className: "hover:stroke-destructive h-4 w-4 duration-200 ease-in-out" })
               ]
             }
@@ -8222,126 +8233,118 @@ function FormDateTime({
       if (onChange) onChange(updatedDate);
     }
   }, "handleTimeChange");
-  return /* @__PURE__ */ jsx66("div", { className: "flex w-full flex-col", children: /* @__PURE__ */ jsx66(
-    FormFieldWrapper,
-    {
-      form,
-      name: id,
-      label: name,
-      children: (field) => /* @__PURE__ */ jsx66("div", { className: "relative flex flex-row", children: /* @__PURE__ */ jsxs36(Popover, { open, onOpenChange: setOpen, modal: true, children: [
-        /* @__PURE__ */ jsxs36("div", { className: "flex w-full flex-row items-center justify-between", children: [
-          /* @__PURE__ */ jsxs36(
-            PopoverTrigger,
+  return /* @__PURE__ */ jsx66("div", { className: "flex w-full flex-col", children: /* @__PURE__ */ jsx66(FormFieldWrapper, { form, name: id, label: name, children: (field) => /* @__PURE__ */ jsx66("div", { className: "relative flex flex-row", children: /* @__PURE__ */ jsxs36(Popover, { open, onOpenChange: setOpen, modal: true, children: [
+    /* @__PURE__ */ jsxs36("div", { className: "flex w-full flex-row items-center justify-between", children: [
+      /* @__PURE__ */ jsxs36(
+        PopoverTrigger,
+        {
+          render: /* @__PURE__ */ jsx66(
+            Button,
             {
-              render: /* @__PURE__ */ jsx66(
-                Button,
-                {
-                  variant: "outline",
-                  className: cn("w-full pl-3 text-left font-normal", !field.value && "text-muted-foreground")
-                }
-              ),
-              children: [
-                field.value ? formatDateTime(field.value) : /* @__PURE__ */ jsx66("span", { children: t(`generic.pick_date_time`) }),
-                /* @__PURE__ */ jsx66(CalendarIcon4, { className: "ml-auto h-4 w-4 opacity-50" })
-              ]
+              variant: "outline",
+              className: cn("w-full pl-3 text-left font-normal", !field.value && "text-muted-foreground")
             }
           ),
-          field.value && allowEmpty !== false && /* @__PURE__ */ jsx66(
-            CircleXIcon3,
-            {
-              className: "text-muted hover:text-destructive ml-2 h-6 w-6 cursor-pointer",
-              onClick: () => {
-                if (onChange) onChange(void 0);
-                form.setValue(id, "");
+          children: [
+            field.value ? formatDateTime(field.value) : /* @__PURE__ */ jsx66("span", { children: t(`common.pick_date_time`) }),
+            /* @__PURE__ */ jsx66(CalendarIcon4, { className: "ml-auto h-4 w-4 opacity-50" })
+          ]
+        }
+      ),
+      field.value && allowEmpty !== false && /* @__PURE__ */ jsx66(
+        CircleXIcon3,
+        {
+          className: "text-muted hover:text-destructive ml-2 h-6 w-6 cursor-pointer",
+          onClick: () => {
+            if (onChange) onChange(void 0);
+            form.setValue(id, "");
+          }
+        }
+      )
+    ] }),
+    /* @__PURE__ */ jsx66(PopoverContent, { className: "w-auto p-4", align: "start", children: /* @__PURE__ */ jsxs36("div", { className: "flex flex-col space-y-4", children: [
+      /* @__PURE__ */ jsx66(
+        Calendar,
+        {
+          mode: "single",
+          selected: field.value,
+          onSelect: (date) => {
+            if (date) {
+              const newDate = new Date(date);
+              if (field.value) {
+                const currentDate = new Date(field.value);
+                newDate.setHours(currentDate.getHours(), currentDate.getMinutes());
+              } else {
+                newDate.setHours(selectedHours, selectedMinutes);
               }
+              form.setValue(id, newDate);
+              if (onChange) onChange(newDate);
+              setSelectedHours(newDate.getHours());
+              setSelectedMinutes(roundToNearestFiveMinutes(newDate.getMinutes()));
             }
-          )
-        ] }),
-        /* @__PURE__ */ jsx66(PopoverContent, { className: "w-auto p-4", align: "start", children: /* @__PURE__ */ jsxs36("div", { className: "flex flex-col space-y-4", children: [
-          /* @__PURE__ */ jsx66(
-            Calendar,
+          },
+          disabled: (date) => minDate && date < minDate ? true : false,
+          locale: dateFnsLocale
+        }
+      ),
+      /* @__PURE__ */ jsxs36("div", { className: "flex flex-row items-end justify-center space-x-4", children: [
+        /* @__PURE__ */ jsxs36("div", { className: "flex flex-col space-y-2", children: [
+          /* @__PURE__ */ jsx66(Label, { htmlFor: "hours-select", children: t(`common.hours`) }),
+          /* @__PURE__ */ jsxs36(
+            Select,
             {
-              mode: "single",
-              selected: field.value,
-              onSelect: (date) => {
-                if (date) {
-                  const newDate = new Date(date);
-                  if (field.value) {
-                    const currentDate = new Date(field.value);
-                    newDate.setHours(currentDate.getHours(), currentDate.getMinutes());
-                  } else {
-                    newDate.setHours(selectedHours, selectedMinutes);
-                  }
-                  form.setValue(id, newDate);
-                  if (onChange) onChange(newDate);
-                  setSelectedHours(newDate.getHours());
-                  setSelectedMinutes(roundToNearestFiveMinutes(newDate.getMinutes()));
-                }
+              value: String(field.value ? new Date(field.value).getHours() : selectedHours),
+              onValueChange: (value) => {
+                if (!value) return;
+                const hours = parseInt(value);
+                setSelectedHours(hours);
+                handleTimeChange(
+                  hours,
+                  field.value ? roundToNearestFiveMinutes(new Date(field.value).getMinutes()) : selectedMinutes
+                );
               },
-              disabled: (date) => minDate && date < minDate ? true : false,
-              locale: dateFnsLocale
+              children: [
+                /* @__PURE__ */ jsx66(SelectTrigger, { id: "hours-select", className: "w-[70px]", children: /* @__PURE__ */ jsx66(SelectValue, {}) }),
+                /* @__PURE__ */ jsx66(SelectContent, { children: hoursOptions.map((option) => /* @__PURE__ */ jsx66(SelectItem, { value: String(option.value), children: option.label }, option.value)) })
+              ]
             }
-          ),
-          /* @__PURE__ */ jsxs36("div", { className: "flex flex-row items-end justify-center space-x-4", children: [
-            /* @__PURE__ */ jsxs36("div", { className: "flex flex-col space-y-2", children: [
-              /* @__PURE__ */ jsx66(Label, { htmlFor: "hours-select", children: t(`generic.hours`) }),
-              /* @__PURE__ */ jsxs36(
-                Select,
-                {
-                  value: String(field.value ? new Date(field.value).getHours() : selectedHours),
-                  onValueChange: (value) => {
-                    if (!value) return;
-                    const hours = parseInt(value);
-                    setSelectedHours(hours);
-                    handleTimeChange(
-                      hours,
-                      field.value ? roundToNearestFiveMinutes(new Date(field.value).getMinutes()) : selectedMinutes
-                    );
-                  },
-                  children: [
-                    /* @__PURE__ */ jsx66(SelectTrigger, { id: "hours-select", className: "w-[70px]", children: /* @__PURE__ */ jsx66(SelectValue, {}) }),
-                    /* @__PURE__ */ jsx66(SelectContent, { children: hoursOptions.map((option) => /* @__PURE__ */ jsx66(SelectItem, { value: String(option.value), children: option.label }, option.value)) })
-                  ]
-                }
-              )
-            ] }),
-            /* @__PURE__ */ jsx66("div", { className: "mb-[9px] text-xl", children: ":" }),
-            /* @__PURE__ */ jsxs36("div", { className: "flex flex-col space-y-2", children: [
-              /* @__PURE__ */ jsx66(Label, { htmlFor: "minutes-select", children: t(`generic.minutes`) }),
-              /* @__PURE__ */ jsxs36(
-                Select,
-                {
-                  value: String(
-                    field.value ? roundToNearestFiveMinutes(new Date(field.value).getMinutes()) : selectedMinutes
-                  ),
-                  onValueChange: (value) => {
-                    if (!value) return;
-                    const minutes = parseInt(value);
-                    setSelectedMinutes(minutes);
-                    handleTimeChange(field.value ? new Date(field.value).getHours() : selectedHours, minutes);
-                  },
-                  children: [
-                    /* @__PURE__ */ jsx66(SelectTrigger, { id: "minutes-select", className: "w-[70px]", children: /* @__PURE__ */ jsx66(SelectValue, {}) }),
-                    /* @__PURE__ */ jsx66(SelectContent, { children: minutesOptions.map((option) => /* @__PURE__ */ jsx66(SelectItem, { value: String(option.value), children: option.label }, option.value)) })
-                  ]
-                }
-              )
-            ] })
-          ] }),
-          /* @__PURE__ */ jsx66(
-            Button,
+          )
+        ] }),
+        /* @__PURE__ */ jsx66("div", { className: "mb-[9px] text-xl", children: ":" }),
+        /* @__PURE__ */ jsxs36("div", { className: "flex flex-col space-y-2", children: [
+          /* @__PURE__ */ jsx66(Label, { htmlFor: "minutes-select", children: t(`common.minutes`) }),
+          /* @__PURE__ */ jsxs36(
+            Select,
             {
-              className: "mt-2",
-              onClick: () => {
-                setOpen(false);
+              value: String(
+                field.value ? roundToNearestFiveMinutes(new Date(field.value).getMinutes()) : selectedMinutes
+              ),
+              onValueChange: (value) => {
+                if (!value) return;
+                const minutes = parseInt(value);
+                setSelectedMinutes(minutes);
+                handleTimeChange(field.value ? new Date(field.value).getHours() : selectedHours, minutes);
               },
-              children: t(`generic.buttons.select_date`)
+              children: [
+                /* @__PURE__ */ jsx66(SelectTrigger, { id: "minutes-select", className: "w-[70px]", children: /* @__PURE__ */ jsx66(SelectValue, {}) }),
+                /* @__PURE__ */ jsx66(SelectContent, { children: minutesOptions.map((option) => /* @__PURE__ */ jsx66(SelectItem, { value: String(option.value), children: option.label }, option.value)) })
+              ]
             }
           )
-        ] }) })
-      ] }) })
-    }
-  ) });
+        ] })
+      ] }),
+      /* @__PURE__ */ jsx66(
+        Button,
+        {
+          className: "mt-2",
+          onClick: () => {
+            setOpen(false);
+          },
+          children: t(`ui.buttons.select_date`)
+        }
+      )
+    ] }) })
+  ] }) }) }) });
 }
 __name(FormDateTime, "FormDateTime");
 
@@ -8363,66 +8366,57 @@ function FormInput({
   isRequired = false
 }) {
   const t = useTranslations10();
-  return /* @__PURE__ */ jsx67("div", { className: "flex w-full flex-col", children: /* @__PURE__ */ jsx67(
-    FormFieldWrapper,
-    {
-      form,
-      name: id,
-      label: name,
-      isRequired,
-      children: (field) => {
-        const handleBlur = /* @__PURE__ */ __name(async (e) => {
-          let value = e.target.value;
-          if (type === "link" && value) {
-            if (!/^https?:\/\//i.test(value)) {
-              value = "https://" + value;
-              field.onChange(value);
-            }
-            try {
-              new URL(value);
-              form.clearErrors(id);
-            } catch (error) {
-              form.setError(id, {
-                type: "validate",
-                message: t(`generic.errors.valid_url`)
-              });
-            }
-          }
-          if (onBlur) await onBlur();
-          field.onBlur();
-        }, "handleBlur");
-        const handleChange = /* @__PURE__ */ __name((e) => {
-          if (type === "number" || type === "currency") {
-            const value = e.target.value.replace(/[^0-9]/g, "");
-            field.onChange(+value);
-            if (onChange) onChange(+value);
-          } else {
-            field.onChange(e.target.value);
-            if (onChange) onChange(e.target.value);
-          }
-        }, "handleChange");
-        const inputProps = {
-          ...field,
-          autoFocus: autoFocus === true,
-          type: type === "number" || type === "currency" ? "number" : type === "password" ? "password" : "text",
-          className: `w-full ${type === "number" || type === "currency" ? "text-end" : ""}`,
-          disabled: disabled === true || form.formState.isSubmitting,
-          placeholder: placeholder || "",
-          onBlur: handleBlur,
-          onKeyDown,
-          onChange: handleChange,
-          "data-testid": testId
-        };
-        if (type === "currency") {
-          return /* @__PURE__ */ jsxs37(InputGroup, { children: [
-            /* @__PURE__ */ jsx67(InputGroupAddon, { children: /* @__PURE__ */ jsx67(InputGroupText, { children: "\u20AC" }) }),
-            /* @__PURE__ */ jsx67(InputGroupInput, { ...inputProps })
-          ] });
+  return /* @__PURE__ */ jsx67("div", { className: "flex w-full flex-col", children: /* @__PURE__ */ jsx67(FormFieldWrapper, { form, name: id, label: name, isRequired, children: (field) => {
+    const handleBlur = /* @__PURE__ */ __name(async (e) => {
+      let value = e.target.value;
+      if (type === "link" && value) {
+        if (!/^https?:\/\//i.test(value)) {
+          value = "https://" + value;
+          field.onChange(value);
         }
-        return /* @__PURE__ */ jsx67(Input, { ...inputProps });
+        try {
+          new URL(value);
+          form.clearErrors(id);
+        } catch (error) {
+          form.setError(id, {
+            type: "validate",
+            message: t(`common.errors.valid_url`)
+          });
+        }
+      }
+      if (onBlur) await onBlur();
+      field.onBlur();
+    }, "handleBlur");
+    const handleChange = /* @__PURE__ */ __name((e) => {
+      if (type === "number" || type === "currency") {
+        const value = e.target.value.replace(/[^0-9]/g, "");
+        field.onChange(+value);
+        if (onChange) onChange(+value);
+      } else {
+        field.onChange(e.target.value);
+        if (onChange) onChange(e.target.value);
       }
+    }, "handleChange");
+    const inputProps = {
+      ...field,
+      autoFocus: autoFocus === true,
+      type: type === "number" || type === "currency" ? "number" : type === "password" ? "password" : "text",
+      className: `w-full ${type === "number" || type === "currency" ? "text-end" : ""}`,
+      disabled: disabled === true || form.formState.isSubmitting,
+      placeholder: placeholder || "",
+      onBlur: handleBlur,
+      onKeyDown,
+      onChange: handleChange,
+      "data-testid": testId
+    };
+    if (type === "currency") {
+      return /* @__PURE__ */ jsxs37(InputGroup, { children: [
+        /* @__PURE__ */ jsx67(InputGroupAddon, { children: /* @__PURE__ */ jsx67(InputGroupText, { children: "\u20AC" }) }),
+        /* @__PURE__ */ jsx67(InputGroupInput, { ...inputProps })
+      ] });
     }
-  ) });
+    return /* @__PURE__ */ jsx67(Input, { ...inputProps });
+  } }) });
 }
 __name(FormInput, "FormInput");
 
@@ -8448,7 +8442,7 @@ var PasswordInput = React12.forwardRef(({ className, type, ...props }, ref) => {
         disabled,
         children: [
           showPassword && !disabled ? /* @__PURE__ */ jsx68(EyeIcon, { className: "h-4 w-4", "aria-hidden": "true" }) : /* @__PURE__ */ jsx68(EyeOffIcon, { className: "h-4 w-4", "aria-hidden": "true" }),
-          /* @__PURE__ */ jsx68("span", { className: "sr-only", children: showPassword ? t(`generic.hide_password`) : t(`generic.show_password`) })
+          /* @__PURE__ */ jsx68("span", { className: "sr-only", children: showPassword ? t(`common.hide_password`) : t(`common.show_password`) })
         ]
       }
     ),
@@ -8971,22 +8965,22 @@ function UserReactivatorInterface({ user, propagateChanges }) {
       setOpen(false);
       propagateChanges(updatedUser);
     } catch (error) {
-      errorToast({ title: t(`generic.errors.error`), error });
+      errorToast({ title: t(`common.errors.error`), error });
     }
   }, "reactivateUser");
   return /* @__PURE__ */ jsxs46(Dialog, { open, onOpenChange: setOpen, children: [
     /* @__PURE__ */ jsx78(DialogTrigger, { children: /* @__PURE__ */ jsxs46(Button, { size: "sm", children: [
       /* @__PURE__ */ jsx78(UserCheckIcon, { className: "mr-3 h-3.5 w-3.5" }),
-      t(`foundations.user.buttons.reactivate`)
+      t(`user.buttons.reactivate`)
     ] }) }),
     /* @__PURE__ */ jsxs46(DialogContent, { className: `flex max-h-[70vh] max-w-3xl flex-col overflow-y-auto`, children: [
       /* @__PURE__ */ jsxs46(DialogHeader, { children: [
-        /* @__PURE__ */ jsx78(DialogTitle, { children: t(`foundations.user.reactivate.title`) }),
-        /* @__PURE__ */ jsx78(DialogDescription, { children: t(`foundations.user.reactivate.subtitle`) })
+        /* @__PURE__ */ jsx78(DialogTitle, { children: t(`user.reactivate.title`) }),
+        /* @__PURE__ */ jsx78(DialogDescription, { children: t(`user.reactivate.subtitle`) })
       ] }),
-      t(`foundations.user.reactivate.description`, { name: user.name }),
+      t(`user.reactivate.description`, { name: user.name }),
       /* @__PURE__ */ jsxs46("div", { className: "flex justify-end", children: [
-        /* @__PURE__ */ jsx78(Button, { className: "mr-2", variant: "outline", type: `button`, onClick: () => setOpen(false), children: t(`generic.buttons.cancel`) }),
+        /* @__PURE__ */ jsx78(Button, { className: "mr-2", variant: "outline", type: `button`, onClick: () => setOpen(false), children: t(`ui.buttons.cancel`) }),
         /* @__PURE__ */ jsx78(
           Button,
           {
@@ -8995,7 +8989,7 @@ function UserReactivatorInterface({ user, propagateChanges }) {
               e.preventDefault();
               reactivateUser();
             },
-            children: t(`foundations.user.buttons.reactivate`)
+            children: t(`user.buttons.reactivate`)
           }
         )
       ] })
@@ -9023,26 +9017,26 @@ function UserResentInvitationEmailInternal({ user }) {
     try {
       await UserService.sendInvitation({ userId: user.id, companyId: user.company.id });
       setOpen(false);
-      toast4.message(t(`foundations.user.resend_activation.email_sent`), {
-        description: t(`foundations.user.resend_activation.email_sent_description`, { email: user.email })
+      toast4.message(t(`user.resend_activation.email_sent`), {
+        description: t(`user.resend_activation.email_sent_description`, { email: user.email })
       });
     } catch (error) {
-      errorToast({ title: t(`generic.errors.error`), error });
+      errorToast({ title: t(`common.errors.error`), error });
     }
   }, "sendInvitationEmail");
   return /* @__PURE__ */ jsxs47(Dialog, { open, onOpenChange: setOpen, children: [
     /* @__PURE__ */ jsxs47(Tooltip2, { children: [
       /* @__PURE__ */ jsx79(TooltipTrigger, { children: /* @__PURE__ */ jsx79(DialogTrigger, { children: /* @__PURE__ */ jsx79(Button, { size: "sm", variant: `ghost`, className: "text-muted-foreground", children: /* @__PURE__ */ jsx79(MailIcon, {}) }) }) }),
-      /* @__PURE__ */ jsx79(TooltipContent, { children: t(`foundations.user.buttons.resend_activation`) })
+      /* @__PURE__ */ jsx79(TooltipContent, { children: t(`user.buttons.resend_activation`) })
     ] }),
     /* @__PURE__ */ jsxs47(DialogContent, { className: `flex max-h-[70vh] max-w-3xl flex-col overflow-y-auto`, children: [
       /* @__PURE__ */ jsxs47(DialogHeader, { children: [
-        /* @__PURE__ */ jsx79(DialogTitle, { children: t(`foundations.user.resend_activation.title`) }),
-        /* @__PURE__ */ jsx79(DialogDescription, { children: t(`foundations.user.resend_activation.subtitle`) })
+        /* @__PURE__ */ jsx79(DialogTitle, { children: t(`user.resend_activation.title`) }),
+        /* @__PURE__ */ jsx79(DialogDescription, { children: t(`user.resend_activation.subtitle`) })
       ] }),
-      t(`foundations.user.resend_activation.description`, { email: user.email }),
+      t(`user.resend_activation.description`, { email: user.email }),
       /* @__PURE__ */ jsxs47("div", { className: "flex justify-end", children: [
-        /* @__PURE__ */ jsx79(Button, { className: "mr-2", variant: "outline", type: `button`, onClick: () => setOpen(false), children: t(`generic.buttons.cancel`) }),
+        /* @__PURE__ */ jsx79(Button, { className: "mr-2", variant: "outline", type: `button`, onClick: () => setOpen(false), children: t(`ui.buttons.cancel`) }),
         /* @__PURE__ */ jsx79(
           Button,
           {
@@ -9051,7 +9045,7 @@ function UserResentInvitationEmailInternal({ user }) {
               e.preventDefault();
               sendInvitationEmail();
             },
-            children: t(`foundations.user.buttons.resend_activation`)
+            children: t(`user.buttons.resend_activation`)
           }
         )
       ] })
@@ -9164,70 +9158,61 @@ function UserSelector({ id, form, label, placeholder, onChange, isRequired = fal
       setOpen(false);
     }, 0);
   }, "setUser");
-  return /* @__PURE__ */ jsx81("div", { className: "flex w-full flex-col", children: /* @__PURE__ */ jsx81(
-    FormFieldWrapper,
-    {
-      form,
-      name: id,
-      label,
-      isRequired,
-      children: (field) => /* @__PURE__ */ jsxs49(Popover, { open, onOpenChange: setOpen, modal: true, children: [
-        /* @__PURE__ */ jsxs49("div", { className: "flex w-full flex-row items-center justify-between", children: [
-          /* @__PURE__ */ jsx81(PopoverTrigger, { className: "w-full", children: /* @__PURE__ */ jsx81("div", { className: "flex w-full flex-row items-center justify-start rounded-md", children: field.value ? /* @__PURE__ */ jsx81(Fragment6, { children: /* @__PURE__ */ jsxs49("div", { className: "flex w-full flex-row items-center justify-start rounded-md border p-2", children: [
-            /* @__PURE__ */ jsx81("div", { className: "*:ring-border *:ring-1", children: /* @__PURE__ */ jsxs49(Avatar, { className: `mr-2 h-6 w-6`, children: [
-              /* @__PURE__ */ jsx81(AvatarImage, { src: field.value?.avatar }),
-              /* @__PURE__ */ jsx81(AvatarFallback, { children: field.value?.name ? field.value?.name.split(" ").map((name) => name.charAt(0).toUpperCase()) : "X" })
-            ] }) }),
-            /* @__PURE__ */ jsx81("span", { className: "", children: field.value?.name ?? "" })
-          ] }) }) : /* @__PURE__ */ jsx81("div", { className: "text-muted-foreground mr-7 flex h-10 w-full flex-row items-center justify-start rounded-md border p-2 text-sm", children: placeholder ?? t(`generic.search.placeholder`, { type: t(`types.users`, { count: 1 }) }) }) }) }),
-          field.value && /* @__PURE__ */ jsx81(
-            CircleX,
-            {
-              className: "text-muted hover:text-destructive ml-2 h-6 w-6 cursor-pointer",
-              onClick: () => setUser()
+  return /* @__PURE__ */ jsx81("div", { className: "flex w-full flex-col", children: /* @__PURE__ */ jsx81(FormFieldWrapper, { form, name: id, label, isRequired, children: (field) => /* @__PURE__ */ jsxs49(Popover, { open, onOpenChange: setOpen, modal: true, children: [
+    /* @__PURE__ */ jsxs49("div", { className: "flex w-full flex-row items-center justify-between", children: [
+      /* @__PURE__ */ jsx81(PopoverTrigger, { className: "w-full", children: /* @__PURE__ */ jsx81("div", { className: "flex w-full flex-row items-center justify-start rounded-md", children: field.value ? /* @__PURE__ */ jsx81(Fragment6, { children: /* @__PURE__ */ jsxs49("div", { className: "flex w-full flex-row items-center justify-start rounded-md border p-2", children: [
+        /* @__PURE__ */ jsx81("div", { className: "*:ring-border *:ring-1", children: /* @__PURE__ */ jsxs49(Avatar, { className: `mr-2 h-6 w-6`, children: [
+          /* @__PURE__ */ jsx81(AvatarImage, { src: field.value?.avatar }),
+          /* @__PURE__ */ jsx81(AvatarFallback, { children: field.value?.name ? field.value?.name.split(" ").map((name) => name.charAt(0).toUpperCase()) : "X" })
+        ] }) }),
+        /* @__PURE__ */ jsx81("span", { className: "", children: field.value?.name ?? "" })
+      ] }) }) : /* @__PURE__ */ jsx81("div", { className: "text-muted-foreground mr-7 flex h-10 w-full flex-row items-center justify-start rounded-md border p-2 text-sm", children: placeholder ?? t(`ui.search.placeholder`, { type: t(`entities.users`, { count: 1 }) }) }) }) }),
+      field.value && /* @__PURE__ */ jsx81(
+        CircleX,
+        {
+          className: "text-muted hover:text-destructive ml-2 h-6 w-6 cursor-pointer",
+          onClick: () => setUser()
+        }
+      )
+    ] }),
+    /* @__PURE__ */ jsx81(PopoverContent, { children: /* @__PURE__ */ jsxs49(Command, { shouldFilter: false, children: [
+      /* @__PURE__ */ jsxs49("div", { className: "relative mb-2 w-full", children: [
+        /* @__PURE__ */ jsx81(SearchIcon2, { className: "text-muted-foreground absolute top-2.5 left-2.5 h-4 w-4" }),
+        /* @__PURE__ */ jsx81(
+          Input,
+          {
+            placeholder: t(`ui.search.placeholder`, { type: t(`entities.users`, { count: 1 }) }),
+            type: "text",
+            className: "w-full pr-8 pl-8",
+            onChange: (e) => setSearchTerm(e.target.value),
+            value: searchTerm
+          }
+        ),
+        isSearching ? /* @__PURE__ */ jsx81(RefreshCwIcon, { className: "text-muted-foreground absolute top-2.5 right-2.5 h-4 w-4 animate-spin" }) : searchTermRef.current ? /* @__PURE__ */ jsx81(
+          XIcon5,
+          {
+            className: `absolute top-2.5 right-2.5 h-4 w-4 ${searchTermRef.current ? "cursor-pointer" : "text-muted-foreground"}`,
+            onClick: () => {
+              setSearchTerm("");
+              search("");
             }
-          )
-        ] }),
-        /* @__PURE__ */ jsx81(PopoverContent, { children: /* @__PURE__ */ jsxs49(Command, { shouldFilter: false, children: [
-          /* @__PURE__ */ jsxs49("div", { className: "relative mb-2 w-full", children: [
-            /* @__PURE__ */ jsx81(SearchIcon2, { className: "text-muted-foreground absolute top-2.5 left-2.5 h-4 w-4" }),
-            /* @__PURE__ */ jsx81(
-              Input,
-              {
-                placeholder: t(`generic.search.placeholder`, { type: t(`types.users`, { count: 1 }) }),
-                type: "text",
-                className: "w-full pr-8 pl-8",
-                onChange: (e) => setSearchTerm(e.target.value),
-                value: searchTerm
-              }
-            ),
-            isSearching ? /* @__PURE__ */ jsx81(RefreshCwIcon, { className: "text-muted-foreground absolute top-2.5 right-2.5 h-4 w-4 animate-spin" }) : searchTermRef.current ? /* @__PURE__ */ jsx81(
-              XIcon5,
-              {
-                className: `absolute top-2.5 right-2.5 h-4 w-4 ${searchTermRef.current ? "cursor-pointer" : "text-muted-foreground"}`,
-                onClick: () => {
-                  setSearchTerm("");
-                  search("");
-                }
-              }
-            ) : /* @__PURE__ */ jsx81(Fragment6, {})
-          ] }),
-          /* @__PURE__ */ jsx81(CommandList, { children: data.data && data.data.length > 0 && data.data.map((user) => /* @__PURE__ */ jsxs49(
-            CommandItem,
-            {
-              className: "cursor-pointer hover:bg-muted data-selected:hover:bg-muted bg-transparent data-selected:bg-transparent",
-              onSelect: () => setUser(user),
-              children: [
-                /* @__PURE__ */ jsx81(UserAvatar, { user, className: `mr-2 h-4 w-4` }),
-                /* @__PURE__ */ jsx81("span", { className: "", children: user.name })
-              ]
-            },
-            user.id
-          )) })
-        ] }) })
-      ] })
-    }
-  ) });
+          }
+        ) : /* @__PURE__ */ jsx81(Fragment6, {})
+      ] }),
+      /* @__PURE__ */ jsx81(CommandList, { children: data.data && data.data.length > 0 && data.data.map((user) => /* @__PURE__ */ jsxs49(
+        CommandItem,
+        {
+          className: "cursor-pointer hover:bg-muted data-selected:hover:bg-muted bg-transparent data-selected:bg-transparent",
+          onSelect: () => setUser(user),
+          children: [
+            /* @__PURE__ */ jsx81(UserAvatar, { user, className: `mr-2 h-4 w-4` }),
+            /* @__PURE__ */ jsx81("span", { className: "", children: user.name })
+          ]
+        },
+        user.id
+      )) })
+    ] }) })
+  ] }) }) });
 }
 __name(UserSelector, "UserSelector");
 
@@ -9245,28 +9230,28 @@ var UserProvider = /* @__PURE__ */ __name(({ children, dehydratedUser }) => {
     const response = [];
     if (hasPermissionToModule({ module: Modules.User, action: "update" /* Update */ })) {
       response.push({
-        name: t(`generic.settings`),
+        name: t(`common.settings`),
         href: generateUrl({ page: `/settings` })
       });
       response.push({
-        name: t(`types.users`, { count: 2 }),
+        name: t(`entities.users`, { count: 2 }),
         href: generateUrl({ page: `/settings`, id: Modules.User.pageUrl })
       });
     }
     if (user)
       response.push({
-        name: `${user.name}${user.isDeleted ? ` (${t(`foundations.user.deleted`)})` : ""}`,
+        name: `${user.name}${user.isDeleted ? ` (${t(`user.deleted`)})` : ""}`,
         href: generateUrl({ page: Modules.User, id: user.id })
       });
     return response;
   }, "breadcrumb");
   const title = /* @__PURE__ */ __name(() => {
     const response = {
-      type: t(`types.users`, { count: user ? 1 : 2 })
+      type: t(`entities.users`, { count: user ? 1 : 2 })
     };
     const functions = [];
     if (user) {
-      response.element = `${user.name}${user.isDeleted ? ` (${t(`foundations.user.deleted`)})` : ""}`;
+      response.element = `${user.name}${user.isDeleted ? ` (${t(`user.deleted`)})` : ""}`;
       if (user.isDeleted) {
         functions.push(/* @__PURE__ */ jsx82(UserReactivator, { user, propagateChanges: setUser }, `UserReactivator`));
       } else {
@@ -9311,7 +9296,7 @@ function UserDetails({ user }) {
   const { title } = useSharedContext();
   let roles = /* @__PURE__ */ jsx83(Fragment7, {});
   if (user.roles && user.roles.length > 0) {
-    roles = /* @__PURE__ */ jsx83("div", { className: "mb-4 w-full", children: /* @__PURE__ */ jsx83("div", { className: "flex flex-wrap gap-2", children: user.roles.map((role, index) => /* @__PURE__ */ jsx83(Link, { href: generateUrl({ page: Modules.Role, id: role.id }), children: /* @__PURE__ */ jsx83(Badge, { className: "mr-2", variant: `default`, children: t(`foundations.role.roles`, { role: role.id.replaceAll(`-`, ``) }) }) }, role.id)) }) });
+    roles = /* @__PURE__ */ jsx83("div", { className: "mb-4 w-full", children: /* @__PURE__ */ jsx83("div", { className: "flex flex-wrap gap-2", children: user.roles.map((role, index) => /* @__PURE__ */ jsx83(Link, { href: generateUrl({ page: Modules.Role, id: role.id }), children: /* @__PURE__ */ jsx83(Badge, { className: "mr-2", variant: `default`, children: t(`role.roles`, { role: role.id.replaceAll(`-`, ``) }) }) }, role.id)) }) });
   }
   return /* @__PURE__ */ jsxs50("div", { className: "flex w-full flex-col gap-y-2", children: [
     user.avatar && /* @__PURE__ */ jsx83("div", { className: "relative aspect-auto w-full max-w-md overflow-hidden rounded-lg", children: /* @__PURE__ */ jsx83(
@@ -9325,11 +9310,11 @@ function UserDetails({ user }) {
       }
     ) }),
     /* @__PURE__ */ jsx83(ContentTitle, { module: Modules.User, type: title.type, element: title.element, functions: title.functions }),
-    user.isDeleted ? /* @__PURE__ */ jsx83("div", { children: /* @__PURE__ */ jsx83(Badge, { variant: "destructive", children: t(`foundations.user.errors.deleted`) }) }) : /* @__PURE__ */ jsx83(Fragment7, { children: !user.isActivated && /* @__PURE__ */ jsx83("div", { children: /* @__PURE__ */ jsx83(Badge, { variant: "destructive", children: t(`foundations.user.errors.inactive`) }) }) }),
+    user.isDeleted ? /* @__PURE__ */ jsx83("div", { children: /* @__PURE__ */ jsx83(Badge, { variant: "destructive", children: t(`user.errors.deleted`) }) }) : /* @__PURE__ */ jsx83(Fragment7, { children: !user.isActivated && /* @__PURE__ */ jsx83("div", { children: /* @__PURE__ */ jsx83(Badge, { variant: "destructive", children: t(`user.errors.inactive`) }) }) }),
     roles,
-    /* @__PURE__ */ jsx83(AttributeElement, { inline: true, title: t(`foundations.user.fields.title.label`), value: user.title }),
-    /* @__PURE__ */ jsx83(AttributeElement, { inline: true, title: t(`generic.fields.email.label`), value: user.email }),
-    /* @__PURE__ */ jsx83(AttributeElement, { inline: false, title: t(`foundations.user.fields.bio.label`), value: user.bio })
+    /* @__PURE__ */ jsx83(AttributeElement, { inline: true, title: t(`user.fields.title.label`), value: user.title }),
+    /* @__PURE__ */ jsx83(AttributeElement, { inline: true, title: t(`common.fields.email.label`), value: user.email }),
+    /* @__PURE__ */ jsx83(AttributeElement, { inline: false, title: t(`user.fields.bio.label`), value: user.bio })
   ] });
 }
 __name(UserDetails, "UserDetails");
@@ -9381,13 +9366,13 @@ function UsersListContainerInternal() {
   if (!hasPermissionToModule({ module: Modules.User, action: "delete" /* Delete */ })) return /* @__PURE__ */ jsx87(CompanyUsersList, {});
   const tabs = [
     {
-      label: t(`types.users`, { count: 2 }),
+      label: t(`entities.users`, { count: 2 }),
       content: /* @__PURE__ */ jsx87(CompanyUsersList, {}),
       modules: [Modules.Company],
       action: "read" /* Read */
     },
     {
-      label: t(`foundations.user.deleted`),
+      label: t(`user.deleted`),
       content: /* @__PURE__ */ jsx87(CompanyUsersList, { isDeleted: true }),
       modules: [Modules.Company],
       action: "update" /* Update */
@@ -9414,7 +9399,7 @@ function AdminUsersListInternal({ company }) {
   return /* @__PURE__ */ jsx88(
     ContentListTable,
     {
-      title: t(`types.users`, { count: 2 }),
+      title: t(`entities.users`, { count: 2 }),
       data,
       fields: ["name" /* name */, "email" /* email */, "createdAt" /* createdAt */],
       tableGeneratorType: Modules.User,
@@ -9456,7 +9441,7 @@ function CompanyUsersList({ isDeleted }) {
       fields: ["name" /* name */, "email" /* email */],
       tableGeneratorType: Modules.User,
       functions,
-      title: t(`types.users`, { count: 2 })
+      title: t(`entities.users`, { count: 2 })
     }
   );
 }
@@ -9505,7 +9490,7 @@ function RelevantUsersList({ id }) {
       data,
       fields: ["name" /* name */, "email" /* email */, "relevance" /* relevance */],
       tableGeneratorType: Modules.User,
-      title: t(`generic.relevant_users`)
+      title: t(`common.relevant_users`)
     }
   );
 }
@@ -9527,7 +9512,7 @@ function RoleUsersList({ role }) {
       data,
       fields: ["name" /* name */, "email" /* email */],
       tableGeneratorType: Modules.User,
-      title: t(`types.users`, { count: 2 })
+      title: t(`entities.users`, { count: 2 })
     }
   );
 }
@@ -9577,7 +9562,7 @@ function UsersList({ data, optionComponents, removeFunction, hideOptions, showRe
       data,
       fields: ["name" /* name */, "email" /* email */],
       tableGeneratorType: Modules.User,
-      title: t(`types.users`, { count: 2 })
+      title: t(`entities.users`, { count: 2 })
     }
   );
 }
@@ -9599,7 +9584,7 @@ function UsersListByContentIds({ contentIds }) {
       data,
       fields: ["name" /* name */, "email" /* email */],
       tableGeneratorType: Modules.User,
-      title: t(`generic.relevant_users`)
+      title: t(`common.relevant_users`)
     }
   );
 }
@@ -9702,11 +9687,11 @@ function TokenStatusIndicator({ className, size = "md", showExtraPages = true })
     }
   }, "getStatusColor");
   const tooltipContent = /* @__PURE__ */ jsxs57("div", { className: "flex flex-col gap-2 p-1", children: [
-    /* @__PURE__ */ jsx99("div", { className: "font-semibold text-sm", children: t("generic.tokens.status", { defaultValue: "Page Status" }) }),
+    /* @__PURE__ */ jsx99("div", { className: "font-semibold text-sm", children: t("billing.tokens.status", { defaultValue: "Page Status" }) }),
     /* @__PURE__ */ jsxs57("div", { className: "flex flex-col gap-1 text-xs", children: [
       /* @__PURE__ */ jsxs57("div", { className: "flex items-center justify-between gap-4", children: [
         /* @__PURE__ */ jsxs57("span", { className: "text-muted-foreground", children: [
-          t("generic.tokens.monthly", { defaultValue: "Monthly Pages" }),
+          t("billing.tokens.monthly", { defaultValue: "Monthly Pages" }),
           ":"
         ] }),
         /* @__PURE__ */ jsxs57("span", { className: cn("font-medium", getStatusColor()), children: [
@@ -9717,7 +9702,7 @@ function TokenStatusIndicator({ className, size = "md", showExtraPages = true })
       ] }),
       /* @__PURE__ */ jsxs57("div", { className: "flex items-center justify-between gap-4", children: [
         /* @__PURE__ */ jsxs57("span", { className: "text-muted-foreground", children: [
-          t("generic.tokens.available", { defaultValue: "Available" }),
+          t("billing.tokens.available", { defaultValue: "Available" }),
           ":"
         ] }),
         /* @__PURE__ */ jsxs57("span", { className: cn("font-medium", getStatusColor()), children: [
@@ -9725,16 +9710,16 @@ function TokenStatusIndicator({ className, size = "md", showExtraPages = true })
           "%"
         ] })
       ] }),
-      /* @__PURE__ */ jsx99(Link2, { href: "/settings/billing?action=subscribe", className: "w-full flex justify-end my-4", children: /* @__PURE__ */ jsx99(Button, { variant: "outline", size: "sm", children: t("generic.tokens.upgrade_plan", { defaultValue: "Upgrade plan" }) }) }),
+      /* @__PURE__ */ jsx99(Link2, { href: "/settings/billing?action=subscribe", className: "w-full flex justify-end my-4", children: /* @__PURE__ */ jsx99(Button, { variant: "outline", size: "sm", children: t("billing.tokens.upgrade_plan", { defaultValue: "Upgrade plan" }) }) }),
       /* @__PURE__ */ jsx99(Separator, {}),
       /* @__PURE__ */ jsxs57("div", { className: "flex items-center justify-between gap-4 pt-1 mt-1", children: [
         /* @__PURE__ */ jsxs57("span", { className: "text-muted-foreground", children: [
-          t("generic.tokens.available_extra", { defaultValue: "Extra Pages" }),
+          t("billing.tokens.available_extra", { defaultValue: "Extra Pages" }),
           ":"
         ] }),
         /* @__PURE__ */ jsx99("span", { className: "font-medium text-blue-500", children: availableExtraTokens })
       ] }),
-      /* @__PURE__ */ jsx99(Link2, { href: "/settings/billing?action=subscribe", className: "w-full flex justify-end my-4", children: /* @__PURE__ */ jsx99(Button, { variant: "outline", size: "sm", children: t("generic.tokens.purchase_extra", { defaultValue: "Purchase additional analysis" }) }) })
+      /* @__PURE__ */ jsx99(Link2, { href: "/settings/billing?action=subscribe", className: "w-full flex justify-end my-4", children: /* @__PURE__ */ jsx99(Button, { variant: "outline", size: "sm", children: t("billing.tokens.purchase_extra", { defaultValue: "Purchase additional analysis" }) }) })
     ] })
   ] });
   return /* @__PURE__ */ jsxs57(Tooltip2, { children: [
@@ -9742,7 +9727,7 @@ function TokenStatusIndicator({ className, size = "md", showExtraPages = true })
       "div",
       {
         className: cn("inline-flex items-center gap-1.5 cursor-default", className),
-        "aria-label": t("generic.tokens.status", { defaultValue: "Page Status" }),
+        "aria-label": t("billing.tokens.status", { defaultValue: "Page Status" }),
         children: [
           getBatteryIcon(),
           /* @__PURE__ */ jsx99("span", { className: cn(textSize, "text-muted-foreground font-medium"), children: availableMonthlyTokens }),
@@ -9877,7 +9862,7 @@ function CompanyConfigurationEditorInternal({ company }) {
       close();
     } catch (error) {
       errorToast({
-        title: t(`generic.errors.update`),
+        title: t(`common.errors.update`),
         error
       });
     }
@@ -9886,7 +9871,7 @@ function CompanyConfigurationEditorInternal({ company }) {
     /* @__PURE__ */ jsx101(DialogTrigger, { children: /* @__PURE__ */ jsx101(Button, { size: "sm", variant: `ghost`, className: "cursor-pointer", children: /* @__PURE__ */ jsx101(Settings2Icon, { className: "h-3.5 w-3.5" }) }) }),
     /* @__PURE__ */ jsxs58(DialogContent, { className: `flex max-h-[70vh] max-w-4xl flex-col overflow-y-auto`, children: [
       /* @__PURE__ */ jsxs58(DialogHeader, { children: [
-        /* @__PURE__ */ jsx101(DialogTitle, { children: t(`types.configurations`, { count: 2 }) }),
+        /* @__PURE__ */ jsx101(DialogTitle, { children: t(`entities.configuration`, { count: 2 }) }),
         /* @__PURE__ */ jsx101(DialogDescription, { className: "text-destructive", children: t(`features.configuration.warning_description`) })
       ] }),
       /* @__PURE__ */ jsx101(Form, { ...form, children: /* @__PURE__ */ jsxs58("form", { onSubmit: form.handleSubmit(onSubmit), className: `flex w-full flex-col gap-y-4`, children: [
@@ -9925,33 +9910,33 @@ function CompanyDeleterInternal({ company }) {
       await CompanyService.delete({ companyId: company.id });
       router.push("/");
     } catch (error) {
-      errorToast({ title: t(`generic.errors.delete`), error });
+      errorToast({ title: t(`common.errors.delete`), error });
     }
     setIsDeleting(false);
   }, "handleDelete");
   return /* @__PURE__ */ jsxs59(AlertDialog, { open, onOpenChange: setOpen, children: [
     /* @__PURE__ */ jsx102(AlertDialogTrigger, { children: /* @__PURE__ */ jsxs59(Button, { size: "sm", variant: "destructive", children: [
       /* @__PURE__ */ jsx102(Trash2Icon2, { className: "mr-3 h-3.5 w-3.5" }),
-      t(`generic.buttons.delete`)
+      t(`ui.buttons.delete`)
     ] }) }),
     /* @__PURE__ */ jsxs59(AlertDialogContent, { className: `flex max-h-[70vh] max-w-3xl flex-col overflow-y-auto`, children: [
       /* @__PURE__ */ jsxs59(AlertDialogHeader, { children: [
-        /* @__PURE__ */ jsx102(AlertDialogTitle, { children: t(`generic.delete.title`, { type: t(`types.companies`, { count: 1 }) }) }),
-        /* @__PURE__ */ jsx102(AlertDialogDescription, { children: t(`generic.delete.subtitle`, { type: t(`types.companies`, { count: 1 }) }) })
+        /* @__PURE__ */ jsx102(AlertDialogTitle, { children: t(`common.delete.title`, { type: t(`entities.companies`, { count: 1 }) }) }),
+        /* @__PURE__ */ jsx102(AlertDialogDescription, { children: t(`common.delete.subtitle`, { type: t(`entities.companies`, { count: 1 }) }) })
       ] }),
-      /* @__PURE__ */ jsx102("div", { className: "text-destructive p-4 text-sm", children: t(`generic.delete.description`, { type: t(`types.companies`, { count: 1 }) }) }),
+      /* @__PURE__ */ jsx102("div", { className: "text-destructive p-4 text-sm", children: t(`common.delete.description`, { type: t(`entities.companies`, { count: 1 }) }) }),
       /* @__PURE__ */ jsxs59("div", { className: "flex w-full flex-col gap-y-2", children: [
-        /* @__PURE__ */ jsx102("div", { children: t(`generic.delete.confirmation`, { type: t(`types.companies`, { count: 1 }) }) }),
+        /* @__PURE__ */ jsx102("div", { children: t(`common.delete.confirmation`, { type: t(`entities.companies`, { count: 1 }) }) }),
         /* @__PURE__ */ jsxs59("div", { className: "flex w-full flex-col", children: [
           /* @__PURE__ */ jsxs59(Label, { className: "flex items-center", children: [
-            t(`foundations.company.fields.name.label`),
+            t(`company.fields.name.label`),
             /* @__PURE__ */ jsx102("span", { className: "text-destructive ml-2 font-semibold", children: "*" })
           ] }),
           /* @__PURE__ */ jsx102(
             Input,
             {
               className: `w-full`,
-              placeholder: t(`foundations.company.fields.name.placeholder`),
+              placeholder: t(`company.fields.name.placeholder`),
               onChange: (e) => setCompanyName(e.target.value)
             }
           )
@@ -9966,7 +9951,7 @@ function CompanyDeleterInternal({ company }) {
             type: `button`,
             onClick: () => setOpen(false),
             disabled: isDeleting,
-            children: t(`generic.buttons.cancel`)
+            children: t(`ui.buttons.cancel`)
           }
         ),
         /* @__PURE__ */ jsx102(
@@ -9980,9 +9965,9 @@ function CompanyDeleterInternal({ company }) {
             variant: "destructive",
             disabled: company.name !== companyName || isDeleting,
             children: isDeleting ? /* @__PURE__ */ jsxs59(Fragment10, { children: [
-              t(`generic.buttons.is_deleting`),
+              t(`ui.buttons.is_deleting`),
               /* @__PURE__ */ jsx102(LoaderCircleIcon2, { className: "animate-spin-slow h-5 w-5" })
-            ] }) : t(`generic.buttons.delete`)
+            ] }) : t(`ui.buttons.delete`)
           }
         )
       ] })
@@ -10022,7 +10007,7 @@ function CompanyEditorInternal({ company, propagateChanges, onRevalidate }) {
   const formSchema = z3.object({
     id: z3.uuidv4(),
     name: z3.string().min(1, {
-      message: t(`foundations.company.fields.name.error`)
+      message: t(`company.fields.name.error`)
     }),
     featureIds: z3.array(z3.string()).optional(),
     moduleIds: z3.array(z3.string()).optional(),
@@ -10072,7 +10057,7 @@ function CompanyEditorInternal({ company, propagateChanges, onRevalidate }) {
       }
     } catch (error) {
       errorToast({
-        title: company ? t(`generic.errors.update`) : t(`generic.errors.create`),
+        title: company ? t(`common.errors.update`) : t(`common.errors.create`),
         error
       });
     }
@@ -10130,7 +10115,7 @@ function CompanyEditorInternal({ company, propagateChanges, onRevalidate }) {
       {
         className: `flex max-h-[70vh] w-full ${isAdministrator || canAccessFeatures ? `max-w-5xl` : `max-w-4xl`} flex-col overflow-y-auto`,
         children: [
-          /* @__PURE__ */ jsx103(CommonEditorHeader, { type: t(`types.companies`, { count: 1 }), name: company?.name }),
+          /* @__PURE__ */ jsx103(CommonEditorHeader, { type: t(`entities.companies`, { count: 1 }), name: company?.name }),
           /* @__PURE__ */ jsx103(Form, { ...form, children: /* @__PURE__ */ jsxs60("form", { onSubmit: form.handleSubmit(onSubmit), className: `flex w-full flex-col gap-y-4`, children: [
             /* @__PURE__ */ jsxs60("div", { className: "flex w-full items-start justify-between gap-x-4", children: [
               /* @__PURE__ */ jsx103("div", { className: `flex w-96 flex-col justify-start gap-y-4`, children: /* @__PURE__ */ jsx103(FileUploader, { value: files, onValueChange: setFiles, dropzoneOptions: dropzone2, className: "w-full p-4", children: /* @__PURE__ */ jsx103(FileInput, { className: "text-neutral-300 outline-dashed", children: /* @__PURE__ */ jsx103("div", { className: "flex w-full flex-col items-center justify-center pt-3 pb-4", children: /* @__PURE__ */ jsx103("div", { className: "flex w-full flex-col items-center justify-center pt-3 pb-4", children: file || company?.logo ? /* @__PURE__ */ jsx103(
@@ -10143,25 +10128,18 @@ function CompanyEditorInternal({ company, propagateChanges, onRevalidate }) {
                 }
               ) : /* @__PURE__ */ jsxs60(Fragment11, { children: [
                 /* @__PURE__ */ jsx103(UploadIcon3, { className: "my-4 h-8 w-8" }),
-                /* @__PURE__ */ jsx103("p", { className: "mb-1 flex w-full text-center text-sm", children: t(`foundations.company.click_drag_logo`) })
+                /* @__PURE__ */ jsx103("p", { className: "mb-1 flex w-full text-center text-sm", children: t(`company.click_drag_logo`) })
               ] }) }) }) }) }) }),
               /* @__PURE__ */ jsx103("div", { className: `flex w-full flex-col justify-start gap-y-4`, children: /* @__PURE__ */ jsx103(
                 FormInput,
                 {
                   form,
                   id: "name",
-                  name: t(`foundations.company.fields.name.label`),
-                  placeholder: t(`foundations.company.fields.name.placeholder`)
+                  name: t(`company.fields.name.label`),
+                  placeholder: t(`company.fields.name.placeholder`)
                 }
               ) }),
-              canAccessFeatures && /* @__PURE__ */ jsx103("div", { className: `flex w-96 flex-col justify-start gap-y-4`, children: /* @__PURE__ */ jsx103(ScrollArea, { className: "h-max", children: /* @__PURE__ */ jsx103(
-                FormFeatures,
-                {
-                  form,
-                  name: t(`foundations.company.features_and_modules`),
-                  features
-                }
-              ) }) })
+              canAccessFeatures && /* @__PURE__ */ jsx103("div", { className: `flex w-96 flex-col justify-start gap-y-4`, children: /* @__PURE__ */ jsx103(ScrollArea, { className: "h-max", children: /* @__PURE__ */ jsx103(FormFeatures, { form, name: t(`company.features_and_modules`), features }) }) })
             ] }),
             /* @__PURE__ */ jsx103(CommonEditorButtons, { form, setOpen, isEdit: !!company })
           ] }) })
@@ -10194,7 +10172,7 @@ function CompaniesList() {
       fields: ["name" /* name */, "createdAt" /* createdAt */],
       tableGeneratorType: Modules.Company,
       functions,
-      title: t(`types.companies`, { count: 2 })
+      title: t(`entities.companies`, { count: 2 })
     }
   );
 }
@@ -10226,7 +10204,7 @@ var CompanyProvider = /* @__PURE__ */ __name(({ children, dehydratedCompany }) =
   }, "breadcrumb");
   const title = /* @__PURE__ */ __name(() => {
     const response = {
-      type: t(`types.companies`, { count: company ? 1 : 2 })
+      type: t(`entities.companies`, { count: company ? 1 : 2 })
     };
     if (company) response.element = company.name;
     const functions = [];
@@ -10272,11 +10250,11 @@ var generateNotificationData = /* @__PURE__ */ __name((params) => {
 function NotificationToast(notification, t, generateUrl, reouter) {
   const data = generateNotificationData({ notification, generateUrl });
   return {
-    title: t(`foundations.notification.${notification.notificationType}.title`),
+    title: t(`notification.${notification.notificationType}.title`),
     description: /* @__PURE__ */ jsxs61("div", { className: `flex w-full flex-row items-center p-2`, children: [
       data.actor ? /* @__PURE__ */ jsx106("div", { className: "flex w-12 max-w-12 px-2", children: /* @__PURE__ */ jsx106(UserAvatar, { user: data.actor, className: "h-8 w-8" }) }) : /* @__PURE__ */ jsx106("div", { className: "flex w-14 max-w-14 px-2" }),
       /* @__PURE__ */ jsxs61("div", { className: "flex w-full flex-col", children: [
-        /* @__PURE__ */ jsx106("p", { className: "text-sm", children: t.rich(`foundations.notification.${notification.notificationType}.description`, {
+        /* @__PURE__ */ jsx106("p", { className: "text-sm", children: t.rich(`notification.${notification.notificationType}.description`, {
           strong: /* @__PURE__ */ __name((chunks) => /* @__PURE__ */ jsx106("strong", { children: chunks }), "strong"),
           actor: data.actor?.name ?? "",
           title: data.title,
@@ -10286,7 +10264,7 @@ function NotificationToast(notification, t, generateUrl, reouter) {
       ] })
     ] }),
     action: data.url ? {
-      label: t(`foundations.notification.${notification.notificationType}.buttons.action`),
+      label: t(`notification.${notification.notificationType}.buttons.action`),
       onClick: /* @__PURE__ */ __name(() => {
         reouter.push(data.url);
       }, "onClick")
@@ -10305,7 +10283,7 @@ function NotificationMenuItem({ notification, closePopover }) {
   const response = /* @__PURE__ */ jsxs61("div", { className: `flex w-full flex-row p-2 ${isRead ? "" : "bg-muted"} items-center`, children: [
     data.actor ? /* @__PURE__ */ jsx106("div", { className: "flex w-12 max-w-12 px-2", children: /* @__PURE__ */ jsx106(UserAvatar, { user: data.actor, className: "h-8 w-8" }) }) : /* @__PURE__ */ jsx106("div", { className: "flex w-14 max-w-14 px-2" }),
     /* @__PURE__ */ jsxs61("div", { className: "flex w-full flex-col", children: [
-      /* @__PURE__ */ jsx106("p", { className: "text-sm", children: t.rich(`foundations.notification.${notification.notificationType}.description`, {
+      /* @__PURE__ */ jsx106("p", { className: "text-sm", children: t.rich(`notification.${notification.notificationType}.description`, {
         strong: /* @__PURE__ */ __name((chunks) => /* @__PURE__ */ jsx106("strong", { children: chunks }), "strong"),
         actor: data.actor?.name ?? "",
         title: data.title,
@@ -10395,13 +10373,13 @@ var NotificationContextProvider = /* @__PURE__ */ __name(({ children }) => {
   const breadcrumb = /* @__PURE__ */ __name(() => {
     const response = [];
     response.push({
-      name: t(`types.notifications`, { count: 2 })
+      name: t(`entities.notifications`, { count: 2 })
     });
     return response;
   }, "breadcrumb");
   const title = /* @__PURE__ */ __name(() => {
     const response = {
-      type: t(`types.notifications`, { count: 2 })
+      type: t(`entities.notifications`, { count: 2 })
     };
     return response;
   }, "title");
@@ -10448,7 +10426,7 @@ var RoleProvider = /* @__PURE__ */ __name(({ children, dehydratedRole }) => {
   const breadcrumb = /* @__PURE__ */ __name(() => {
     const response = [];
     response.push({
-      name: t(`types.roles`, { count: 2 }),
+      name: t(`entities.roles`, { count: 2 }),
       href: generateUrl({ page: Modules.Role })
     });
     if (role)
@@ -10460,7 +10438,7 @@ var RoleProvider = /* @__PURE__ */ __name(({ children, dehydratedRole }) => {
   }, "breadcrumb");
   const title = /* @__PURE__ */ __name(() => {
     const response = {
-      type: t(`types.roles`, { count: role ? 1 : 2 })
+      type: t(`entities.roles`, { count: role ? 1 : 2 })
     };
     const functions = [];
     if (role) {
@@ -10519,7 +10497,7 @@ var CommonProvider = /* @__PURE__ */ __name(({ children }) => {
   }, "breadcrumb");
   const title = /* @__PURE__ */ __name(() => {
     const response = {
-      type: t(`generic.title`)
+      type: t(`common.title`)
     };
     if (company) response.element = company.name;
     return response;
@@ -10810,7 +10788,7 @@ function BreadcrumbNavigation({ items }) {
   const t = useTranslations37();
   const [open, setOpen] = useState33(false);
   return /* @__PURE__ */ jsx111(Breadcrumb, { children: /* @__PURE__ */ jsxs62(BreadcrumbList, { children: [
-    /* @__PURE__ */ jsx111(BreadcrumbItem, { children: /* @__PURE__ */ jsx111(Link, { href: generateUrl({ page: `/` }), children: t(`generic.home`) }) }),
+    /* @__PURE__ */ jsx111(BreadcrumbItem, { children: /* @__PURE__ */ jsx111(Link, { href: generateUrl({ page: `/` }), children: t(`common.home`) }) }),
     items.length > 0 && /* @__PURE__ */ jsx111(BreadcrumbSeparator, {}),
     items.length > ITEMS_TO_DISPLAY ? /* @__PURE__ */ jsxs62(Fragment13, { children: [
       /* @__PURE__ */ jsx111(BreadcrumbItem, { children: items[0].href ? /* @__PURE__ */ jsx111(Link, { href: items[0].href, children: items[0].name }) : /* @__PURE__ */ jsx111(Fragment13, { children: items[0].name }) }),
@@ -10883,13 +10861,13 @@ function Header({ children }) {
                   className: "h-6 w-6",
                   onClick: () => refreshUser(),
                   disabled: isRefreshing,
-                  "aria-label": t("generic.refresh", { defaultValue: "Refresh" })
+                  "aria-label": t("common.refresh", { defaultValue: "Refresh" })
                 }
               ),
               children: /* @__PURE__ */ jsx113(RefreshCwIcon2, { className: `h-3.5 w-3.5 ${isRefreshing ? "animate-spin" : ""}` })
             }
           ),
-          /* @__PURE__ */ jsx113(TooltipContent, { side: "bottom", children: t("generic.refresh", { defaultValue: "Refresh" }) })
+          /* @__PURE__ */ jsx113(TooltipContent, { side: "bottom", children: t("common.refresh", { defaultValue: "Refresh" }) })
         ] })
       ] }),
       children ? children : null
@@ -10972,13 +10950,13 @@ function RecentPagesNavigator() {
     return null;
   }
   return /* @__PURE__ */ jsxs66(DropdownMenu, { children: [
-    /* @__PURE__ */ jsx116(DropdownMenuTrigger, { children: /* @__PURE__ */ jsx116("div", { className: "flex w-full cursor-pointer items-center gap-2", children: state === "collapsed" ? /* @__PURE__ */ jsx116(HistoryIcon, { className: "h-4 w-4" }) : /* @__PURE__ */ jsx116("span", { children: t(`generic.recent_pages`) }) }) }),
+    /* @__PURE__ */ jsx116(DropdownMenuTrigger, { children: /* @__PURE__ */ jsx116("div", { className: "flex w-full cursor-pointer items-center gap-2", children: state === "collapsed" ? /* @__PURE__ */ jsx116(HistoryIcon, { className: "h-4 w-4" }) : /* @__PURE__ */ jsx116("span", { children: t(`common.recent_pages`) }) }) }),
     /* @__PURE__ */ jsxs66(DropdownMenuContent, { align: "start", className: "w-96", children: [
-      /* @__PURE__ */ jsx116(DropdownMenuLabel, { children: t(`generic.recent_pages`) }),
+      /* @__PURE__ */ jsx116(DropdownMenuLabel, { children: t(`common.recent_pages`) }),
       /* @__PURE__ */ jsx116(DropdownMenuSeparator, {}),
       recentPages.map((page, index) => /* @__PURE__ */ jsx116(DropdownMenuItem, { children: /* @__PURE__ */ jsx116(Link, { href: page.url, className: "flex items-center gap-2", children: /* @__PURE__ */ jsxs66("div", { className: "flex flex-col", children: [
         /* @__PURE__ */ jsx116("div", { className: "truncate text-sm", children: page.title }),
-        /* @__PURE__ */ jsx116("div", { className: "text-muted-foreground text-xs font-normal", children: t(`types.${page.moduleType}`, { count: 1 }) })
+        /* @__PURE__ */ jsx116("div", { className: "text-muted-foreground text-xs font-normal", children: t(`entities.${page.moduleType}`, { count: 1 }) })
       ] }) }) }, `${page.url}-${index}`))
     ] })
   ] });
@@ -11141,7 +11119,7 @@ import { jsx as jsx121, jsxs as jsxs71 } from "react/jsx-runtime";
 function AllowedUsersDetails({ showTitle, content }) {
   const t = useTranslations41();
   return /* @__PURE__ */ jsxs71("div", { className: "mb-2 flex w-full flex-col gap-y-2", children: [
-    showTitle && /* @__PURE__ */ jsx121("h3", { className: "text-xs font-semibold", children: t("generic.permissions") }),
+    showTitle && /* @__PURE__ */ jsx121("h3", { className: "text-xs font-semibold", children: t("common.permissions") }),
     /* @__PURE__ */ jsx121("div", { className: "flex w-full items-center justify-start gap-x-4", children: /* @__PURE__ */ jsx121(ContributorsList, { content }) })
   ] });
 }
@@ -11151,7 +11129,7 @@ __name(AllowedUsersDetails, "AllowedUsersDetails");
 import dynamic from "next/dynamic";
 import React15 from "react";
 import { jsx as jsx122 } from "react/jsx-runtime";
-var BlockNoteEditor = dynamic(() => import("./BlockNoteEditor-GNFK7ZVR.mjs"), {
+var BlockNoteEditor = dynamic(() => import("./BlockNoteEditor-G532N3N7.mjs"), {
   ssr: false
 });
 var BlockNoteEditorContainer = React15.memo(/* @__PURE__ */ __name(function EditorContainer(props) {
@@ -11575,7 +11553,7 @@ var useCompanyTableStructure = /* @__PURE__ */ __name((params) => {
     ["name" /* name */]: () => ({
       id: "name",
       accessorKey: "name",
-      header: t(`foundations.user.fields.name.label`),
+      header: t(`user.fields.name.label`),
       cell: /* @__PURE__ */ __name(({ row }) => {
         const company = row.original.jsonApiData;
         return /* @__PURE__ */ jsx130(
@@ -11595,7 +11573,7 @@ var useCompanyTableStructure = /* @__PURE__ */ __name((params) => {
     }),
     ["createdAt" /* createdAt */]: () => cellDate({
       name: "createdAt",
-      title: t(`generic.date.create`)
+      title: t(`common.date.create`)
     })
   };
   const columns = useMemo14(() => {
@@ -11683,7 +11661,7 @@ var useRoleTableStructure = /* @__PURE__ */ __name((params) => {
     ["name" /* name */]: () => ({
       id: "name",
       accessorKey: "name",
-      header: t(`foundations.role.fields.name.label`),
+      header: t(`role.fields.name.label`),
       cell: /* @__PURE__ */ __name(({ row }) => {
         const role = row.original.jsonApiData;
         return /* @__PURE__ */ jsx131(Link, { href: generateUrl({ page: Modules.Role, id: role.id }), children: row.getValue("name") });
@@ -11694,14 +11672,14 @@ var useRoleTableStructure = /* @__PURE__ */ __name((params) => {
     ["description" /* description */]: () => ({
       id: "description",
       accessorKey: "description",
-      header: t(`foundations.role.fields.description.label`),
+      header: t(`role.fields.description.label`),
       cell: /* @__PURE__ */ __name(({ row }) => /* @__PURE__ */ jsx131(Fragment15, { children: row.getValue("description") }), "cell"),
       enableSorting: false,
       enableHiding: false
     }),
     ["createdAt" /* createdAt */]: () => cellDate({
       name: "createdAt",
-      title: t(`generic.date.create`)
+      title: t(`common.date.create`)
     })
   };
   const columns = useMemo16(() => {
@@ -11783,7 +11761,7 @@ var useUserTableStructure = /* @__PURE__ */ __name((params) => {
     ["name" /* name */]: () => ({
       id: "name",
       accessorKey: "name",
-      header: t(`foundations.user.fields.name.label`),
+      header: t(`user.fields.name.label`),
       cell: /* @__PURE__ */ __name(({ row }) => {
         const user = row.original.jsonApiData;
         return /* @__PURE__ */ jsxs74(
@@ -11797,8 +11775,8 @@ var useUserTableStructure = /* @__PURE__ */ __name((params) => {
             children: [
               /* @__PURE__ */ jsx132(UserAvatar, { user }),
               user.name,
-              user.isDeleted ? ` - ${t("foundations.user.errors.deleted")}` : "",
-              !user.isActivated ? ` - ${t("foundations.user.errors.inactive")}` : ""
+              user.isDeleted ? ` - ${t("user.errors.deleted")}` : "",
+              !user.isActivated ? ` - ${t("user.errors.inactive")}` : ""
             ]
           }
         );
@@ -11809,7 +11787,7 @@ var useUserTableStructure = /* @__PURE__ */ __name((params) => {
     ["email" /* email */]: () => ({
       id: "email",
       accessorKey: "email",
-      header: t(`generic.fields.email.label`),
+      header: t(`common.fields.email.label`),
       cell: /* @__PURE__ */ __name(({ row }) => /* @__PURE__ */ jsx132(Fragment16, { children: row.getValue("email") }), "cell"),
       enableSorting: false,
       enableHiding: false
@@ -11817,7 +11795,7 @@ var useUserTableStructure = /* @__PURE__ */ __name((params) => {
     ["relevance" /* relevance */]: () => ({
       id: "relevance",
       accessorKey: "relevance",
-      header: t(`generic.relevance`),
+      header: t(`common.relevance`),
       cell: /* @__PURE__ */ __name(({ row }) => {
         const user = row.original.jsonApiData;
         if (!user.relevance) return /* @__PURE__ */ jsx132(Fragment16, {});
@@ -11844,7 +11822,7 @@ var useUserTableStructure = /* @__PURE__ */ __name((params) => {
     }),
     ["createdAt" /* createdAt */]: () => cellDate({
       name: "createdAt",
-      title: t(`generic.date.create`)
+      title: t(`common.date.create`)
     })
   };
   const columns = useMemo17(() => {
@@ -11881,7 +11859,7 @@ var useContentTableStructure = /* @__PURE__ */ __name((params) => {
     ["name" /* name */]: () => ({
       id: "name",
       accessorKey: "name",
-      header: t(`foundations.content.fields.name.label`),
+      header: t(`content.fields.name.label`),
       cell: /* @__PURE__ */ __name(({ row }) => {
         const content = row.original.jsonApiData;
         const contentModule = content.contentType ? Modules.findByModelName(content.contentType) : void 0;
@@ -11900,7 +11878,7 @@ var useContentTableStructure = /* @__PURE__ */ __name((params) => {
     ["relevance" /* relevance */]: () => ({
       id: "relevance",
       accessorKey: "relevance",
-      header: t(`generic.relevance`),
+      header: t(`common.relevance`),
       cell: /* @__PURE__ */ __name(({ row }) => {
         const content = row.original.jsonApiData;
         if (!content.relevance) return /* @__PURE__ */ jsx133(Fragment17, {});
@@ -11928,7 +11906,7 @@ var useContentTableStructure = /* @__PURE__ */ __name((params) => {
     ["authors" /* authors */]: () => ({
       id: "authors",
       accessorKey: "authors",
-      header: t(`generic.relationships.author.label`),
+      header: t(`common.relationships.author.label`),
       cell: /* @__PURE__ */ __name(({ row }) => {
         const content = row.original.jsonApiData;
         return /* @__PURE__ */ jsx133(ContributorsList, { content });
@@ -11938,11 +11916,11 @@ var useContentTableStructure = /* @__PURE__ */ __name((params) => {
     }),
     ["createdAt" /* createdAt */]: () => cellDate({
       name: "createdAt",
-      title: t(`generic.date.create`)
+      title: t(`common.date.create`)
     }),
     ["updatedAt" /* updatedAt */]: () => cellDate({
       name: "updatedAt",
-      title: t(`generic.date.update`)
+      title: t(`common.date.update`)
     })
   };
   const columns = useMemo18(() => {
@@ -12324,7 +12302,7 @@ function ContentTableSearch({ data }) {
             },
             onFocus: () => setIsFocused(true),
             onBlur: handleBlur,
-            placeholder: t(`generic.search.placeholder_global`),
+            placeholder: t(`ui.search.placeholder_global`),
             type: "text",
             className: "border-border/50 focus-visible:border-border h-10 w-full pr-8 pl-8 text-xs shadow-none focus-visible:ring-0",
             onChange: (e) => setSearchTerm(e.target.value),
@@ -12450,16 +12428,16 @@ function Register() {
   const [showConfirmation, setShowConfirmation] = useState45(false);
   const formSchema = z4.object({
     company: z4.string().min(1, {
-      message: t(`generic.errors.missing_company_name`)
+      message: t(`common.errors.missing_company_name`)
     }),
     name: z4.string().min(1, {
-      message: t("generic.errors.missing_name")
+      message: t("common.errors.missing_name")
     }),
     email: z4.string().email({
-      message: t(`generic.errors.invalid_email`)
+      message: t(`common.errors.invalid_email`)
     }),
-    password: z4.string().min(8, t(`foundations.auth.errors.password_too_short`)).regex(/^(?=.*[0-9])(?=.*[^a-zA-Z0-9]).*$/, {
-      message: t(`foundations.auth.errors.password_invalid_format`)
+    password: z4.string().min(8, t(`auth.errors.password_too_short`)).regex(/^(?=.*[0-9])(?=.*[^a-zA-Z0-9]).*$/, {
+      message: t(`auth.errors.password_invalid_format`)
     })
   });
   const form = useForm4({
@@ -12490,11 +12468,11 @@ function Register() {
     /* @__PURE__ */ jsxs78(CardHeader, { children: [
       /* @__PURE__ */ jsxs78(CardTitle, { className: "text-primary flex flex-col items-center pb-10 text-4xl", children: [
         /* @__PURE__ */ jsx136(Image7, { src: "/logo.webp", alt: "Logo", width: 100, height: 100, priority: true }),
-        t(`foundations.auth.register`)
+        t(`auth.register`)
       ] }),
-      /* @__PURE__ */ jsx136(CardDescription, { className: "text-sm", children: showConfirmation ? /* @__PURE__ */ jsx136(Fragment19, { children: " " }) : /* @__PURE__ */ jsx136(Fragment19, { children: t(`foundations.auth.register_description`) }) })
+      /* @__PURE__ */ jsx136(CardDescription, { className: "text-sm", children: showConfirmation ? /* @__PURE__ */ jsx136(Fragment19, { children: " " }) : /* @__PURE__ */ jsx136(Fragment19, { children: t(`auth.register_description`) }) })
     ] }),
-    showConfirmation ? /* @__PURE__ */ jsx136(CardContent, { children: /* @__PURE__ */ jsx136(CardDescription, { className: "text-center text-xl", children: t("foundations.auth.register_confirmation") }) }) : /* @__PURE__ */ jsx136(Form, { ...form, children: /* @__PURE__ */ jsxs78("form", { onSubmit: form.handleSubmit(onSubmit), children: [
+    showConfirmation ? /* @__PURE__ */ jsx136(CardContent, { children: /* @__PURE__ */ jsx136(CardDescription, { className: "text-center text-xl", children: t("auth.register_confirmation") }) }) : /* @__PURE__ */ jsx136(Form, { ...form, children: /* @__PURE__ */ jsxs78("form", { onSubmit: form.handleSubmit(onSubmit), children: [
       /* @__PURE__ */ jsxs78(CardContent, { children: [
         /* @__PURE__ */ jsx136(
           FormInput,
@@ -12502,8 +12480,8 @@ function Register() {
             isRequired: true,
             form,
             id: "company",
-            name: t(`foundations.company.fields.name.label`),
-            placeholder: t(`foundations.company.fields.name.placeholder`)
+            name: t(`company.fields.name.label`),
+            placeholder: t(`company.fields.name.placeholder`)
           }
         ),
         /* @__PURE__ */ jsx136(
@@ -12512,8 +12490,8 @@ function Register() {
             isRequired: true,
             form,
             id: "name",
-            name: t(`foundations.user.fields.name.label`),
-            placeholder: t(`foundations.user.fields.name.placeholder`)
+            name: t(`user.fields.name.label`),
+            placeholder: t(`user.fields.name.placeholder`)
           }
         ),
         /* @__PURE__ */ jsx136(
@@ -12522,8 +12500,8 @@ function Register() {
             isRequired: true,
             form,
             id: "email",
-            name: t(`generic.fields.email.label`),
-            placeholder: t(`generic.fields.email.placeholder`)
+            name: t(`common.fields.email.label`),
+            placeholder: t(`common.fields.email.placeholder`)
           }
         ),
         /* @__PURE__ */ jsx136(
@@ -12532,11 +12510,11 @@ function Register() {
             isRequired: true,
             form,
             id: "password",
-            name: t(`foundations.user.fields.password.label`),
-            placeholder: t(`foundations.user.fields.password.placeholder`)
+            name: t(`user.fields.password.label`),
+            placeholder: t(`user.fields.password.placeholder`)
           }
         ),
-        /* @__PURE__ */ jsx136(Button, { className: "mt-4 w-full", type: "submit", children: t(`foundations.auth.buttons.register`) })
+        /* @__PURE__ */ jsx136(Button, { className: "mt-4 w-full", type: "submit", children: t(`auth.buttons.register`) })
       ] }),
       /* @__PURE__ */ jsxs78(CardFooter, { className: "flex w-full flex-row justify-between", children: [
         /* @__PURE__ */ jsx136(
@@ -12545,7 +12523,7 @@ function Register() {
             href: "#",
             className: "flex w-full justify-start",
             onClick: () => setComponentType(0 /* Login */),
-            children: t(`foundations.auth.buttons.login`)
+            children: t(`auth.buttons.login`)
           }
         ),
         /* @__PURE__ */ jsx136(
@@ -12554,7 +12532,7 @@ function Register() {
             href: "#",
             className: "flex w-full justify-end",
             onClick: () => setComponentType(1 /* ForgotPassword */),
-            children: t(`foundations.auth.buttons.forgot_password`)
+            children: t(`auth.buttons.forgot_password`)
           }
         )
       ] })
@@ -12638,9 +12616,9 @@ function LandingComponent() {
     /* @__PURE__ */ jsxs79(CardHeader, { className: "mb-4", "data-testid": "page-pre-login-container", children: [
       /* @__PURE__ */ jsxs79(CardTitle, { className: "text-primary flex flex-col items-center gap-y-8 pb-8 text-4xl", children: [
         /* @__PURE__ */ jsx139(Image9, { src: "/logo.webp", alt: "Logo", width: 100, height: 100, priority: true }),
-        t(`generic.title`)
+        t(`common.title`)
       ] }),
-      /* @__PURE__ */ jsx139(CardDescription, { className: "flex w-full justify-center text-center text-sm", children: t(`generic.description`) })
+      /* @__PURE__ */ jsx139(CardDescription, { className: "flex w-full justify-center text-center text-sm", children: t(`common.description`) })
     ] }),
     /* @__PURE__ */ jsxs79(CardFooter, { className: "mt-4 flex w-full flex-col justify-between gap-y-4", children: [
       isInternalAuthEnabled() && /* @__PURE__ */ jsxs79(Fragment20, { children: [
@@ -12650,10 +12628,10 @@ function LandingComponent() {
             href: "#",
             className: "flex w-full justify-start",
             onClick: () => setComponentType(5 /* Register */),
-            children: /* @__PURE__ */ jsx139(Button, { className: "w-full", variant: `default`, children: t(`foundations.auth.buttons.register`) })
+            children: /* @__PURE__ */ jsx139(Button, { className: "w-full", variant: `default`, children: t(`auth.buttons.register`) })
           }
         ),
-        /* @__PURE__ */ jsx139(Link, { href: "#", className: "flex w-full justify-end", onClick: () => setComponentType(0 /* Login */), children: /* @__PURE__ */ jsx139(Button, { className: "w-full", variant: `outline`, "data-testid": "page-login-button-initial-login", children: t(`foundations.auth.buttons.login`) }) })
+        /* @__PURE__ */ jsx139(Link, { href: "#", className: "flex w-full justify-end", onClick: () => setComponentType(0 /* Login */), children: /* @__PURE__ */ jsx139(Button, { className: "w-full", variant: `outline`, "data-testid": "page-login-button-initial-login", children: t(`auth.buttons.login`) }) })
       ] }),
       isDiscordAuthEnabled() && /* @__PURE__ */ jsx139(Link, { href: `${getApiUrl()}auth/discord`, className: "flex w-full justify-end", children: /* @__PURE__ */ jsx139(Button, { className: "w-full", variant: `outline`, "data-testid": "page-login-button-initial-login", children: "Login with Discord" }) })
     ] })
@@ -12684,25 +12662,25 @@ function AcceptInvitation() {
         await AuthService.validateCode(payload);
       } catch (e) {
         setError(e instanceof Error ? e.message : String(e));
-        errorToast({ title: t(`generic.errors.error`), error: e });
+        errorToast({ title: t(`common.errors.error`), error: e });
       }
     }
     __name(validateCode, "validateCode");
     if (params && params.code) {
       validateCode(params.code);
     } else {
-      setError(t(`foundations.auth.errors.invalid_invitation_code`));
+      setError(t(`auth.errors.invalid_invitation_code`));
     }
   }, []);
   const formSchema = z5.object({
     password: z5.string().min(1, {
-      message: t(`foundations.user.fields.password.error`)
+      message: t(`user.fields.password.error`)
     }),
     passwordRetype: z5.string().min(1, {
-      message: t("foundations.auth.errors.password_retype_required")
+      message: t("auth.errors.password_retype_required")
     })
   }).refine((data) => data.password === data.passwordRetype, {
-    message: t("foundations.auth.fields.retype_password.error_not_match"),
+    message: t("auth.fields.retype_password.error_not_match"),
     path: ["passwordRetype"]
   });
   const form = useForm5({
@@ -12721,33 +12699,33 @@ function AcceptInvitation() {
       };
       await AuthService.acceptInvitation(payload);
       setShowConfirmation(true);
-      toast6.success(t("foundations.auth.account_activated"), {
-        description: t("foundations.auth.account_activated_description")
+      toast6.success(t("auth.account_activated"), {
+        description: t("auth.account_activated_description")
       });
       setTimeout(() => {
         setComponentType(0 /* Login */);
         setParams(void 0);
       }, 2e3);
     } catch (e) {
-      errorToast({ title: t(`generic.errors.error`), error });
+      errorToast({ title: t(`common.errors.error`), error });
     }
   }, "onSubmit");
   return /* @__PURE__ */ jsxs80(Fragment21, { children: [
     /* @__PURE__ */ jsxs80(CardHeader, { children: [
       /* @__PURE__ */ jsxs80(CardTitle, { className: "text-primary flex flex-col items-center pb-10 text-4xl", children: [
         /* @__PURE__ */ jsx140(Image10, { src: "/logo.webp", alt: "Logo", width: 100, height: 100, priority: true }),
-        t("foundations.auth.accept_invitation")
+        t("auth.accept_invitation")
       ] }),
-      /* @__PURE__ */ jsx140(CardDescription, { className: "text-center text-sm", children: error ? /* @__PURE__ */ jsx140(Fragment21, { children: t("foundations.auth.errors.activating_account") }) : /* @__PURE__ */ jsx140(Fragment21, { children: t("foundations.auth.select_password") }) })
+      /* @__PURE__ */ jsx140(CardDescription, { className: "text-center text-sm", children: error ? /* @__PURE__ */ jsx140(Fragment21, { children: t("auth.errors.activating_account") }) : /* @__PURE__ */ jsx140(Fragment21, { children: t("auth.select_password") }) })
     ] }),
-    /* @__PURE__ */ jsx140(CardContent, { children: showConfirmation ? /* @__PURE__ */ jsx140(CardDescription, { className: "text-center text-xl", children: t("foundations.auth.activation_description") }) : error ? /* @__PURE__ */ jsx140(CardDescription, { className: "text-center text-xl", children: error }) : /* @__PURE__ */ jsx140(Form, { ...form, children: /* @__PURE__ */ jsxs80("form", { onSubmit: form.handleSubmit(onSubmit), children: [
+    /* @__PURE__ */ jsx140(CardContent, { children: showConfirmation ? /* @__PURE__ */ jsx140(CardDescription, { className: "text-center text-xl", children: t("auth.activation_description") }) : error ? /* @__PURE__ */ jsx140(CardDescription, { className: "text-center text-xl", children: error }) : /* @__PURE__ */ jsx140(Form, { ...form, children: /* @__PURE__ */ jsxs80("form", { onSubmit: form.handleSubmit(onSubmit), children: [
       /* @__PURE__ */ jsx140(
         FormPassword,
         {
           form,
           id: "password",
-          name: t(`foundations.user.fields.password.label`),
-          placeholder: t(`foundations.user.fields.password.placeholder`)
+          name: t(`user.fields.password.label`),
+          placeholder: t(`user.fields.password.placeholder`)
         }
       ),
       /* @__PURE__ */ jsx140(
@@ -12755,11 +12733,11 @@ function AcceptInvitation() {
         {
           form,
           id: "passwordRetype",
-          name: t("foundations.auth.fields.retype_password.label"),
-          placeholder: t(`foundations.auth.fields.retype_password.placeholder`)
+          name: t("auth.fields.retype_password.label"),
+          placeholder: t(`auth.fields.retype_password.placeholder`)
         }
       ),
-      /* @__PURE__ */ jsx140(Button, { className: "mt-4 w-full", type: "submit", children: t("foundations.auth.accept_invitation") })
+      /* @__PURE__ */ jsx140(Button, { className: "mt-4 w-full", type: "submit", children: t("auth.accept_invitation") })
     ] }) }) })
   ] });
 }
@@ -12785,33 +12763,33 @@ function ActivateAccount() {
         await AuthService.activate(payload);
         setShowConfirmation(true);
         setParams(void 0);
-        toast7.success(t("foundations.auth.account_activated"), {
-          description: t("foundations.auth.account_activated_description")
+        toast7.success(t("auth.account_activated"), {
+          description: t("auth.account_activated_description")
         });
         setTimeout(() => {
           setComponentType(0 /* Login */);
         }, 2e3);
       } catch (e) {
         setError(e instanceof Error ? e.message : String(e));
-        errorToast({ title: t(`generic.errors.error`), error: e });
+        errorToast({ title: t(`common.errors.error`), error: e });
       }
     }
     __name(ActivateAccount2, "ActivateAccount");
     if (params && params.code) {
       ActivateAccount2(params.code);
     } else {
-      setError(t(`foundations.auth.errors.invalid_invitation_code`));
+      setError(t(`auth.errors.invalid_invitation_code`));
     }
   }, []);
   return /* @__PURE__ */ jsxs81(Fragment22, { children: [
     /* @__PURE__ */ jsxs81(CardHeader, { children: [
       /* @__PURE__ */ jsxs81(CardTitle, { className: "text-primary flex flex-col items-center pb-10 text-4xl", children: [
         /* @__PURE__ */ jsx141(Image11, { src: "/logo.webp", alt: "Logo", width: 100, height: 100, priority: true }),
-        t("foundations.auth.accept_invitation")
+        t("auth.accept_invitation")
       ] }),
-      /* @__PURE__ */ jsx141(CardDescription, { className: "text-center text-sm", children: error ? /* @__PURE__ */ jsx141(Fragment22, { children: t("foundations.auth.errors.activating_account") }) : /* @__PURE__ */ jsx141(Fragment22, { children: " " }) })
+      /* @__PURE__ */ jsx141(CardDescription, { className: "text-center text-sm", children: error ? /* @__PURE__ */ jsx141(Fragment22, { children: t("auth.errors.activating_account") }) : /* @__PURE__ */ jsx141(Fragment22, { children: " " }) })
     ] }),
-    /* @__PURE__ */ jsx141(CardContent, { children: /* @__PURE__ */ jsx141(CardDescription, { className: "text-center text-xl", children: showConfirmation ? /* @__PURE__ */ jsx141(Fragment22, { children: t("foundations.auth.activation_description") }) : error ? /* @__PURE__ */ jsx141(Fragment22, { children: error }) : /* @__PURE__ */ jsx141(Fragment22, { children: t("foundations.auth.activation_wait") }) }) })
+    /* @__PURE__ */ jsx141(CardContent, { children: /* @__PURE__ */ jsx141(CardDescription, { className: "text-center text-xl", children: showConfirmation ? /* @__PURE__ */ jsx141(Fragment22, { children: t("auth.activation_description") }) : error ? /* @__PURE__ */ jsx141(Fragment22, { children: error }) : /* @__PURE__ */ jsx141(Fragment22, { children: t("auth.activation_wait") }) }) })
   ] });
 }
 __name(ActivateAccount, "ActivateAccount");
@@ -12855,7 +12833,7 @@ function ForgotPassword() {
   const [showConfirmation, setShowConfirmation] = useState50(false);
   const formSchema = z6.object({
     email: z6.string().email({
-      message: t(`generic.errors.invalid_email`)
+      message: t(`common.errors.invalid_email`)
     })
   });
   const form = useForm6({
@@ -12879,23 +12857,23 @@ function ForgotPassword() {
     /* @__PURE__ */ jsxs82(CardHeader, { "data-testid": "page-forgot-password-container", children: [
       /* @__PURE__ */ jsxs82(CardTitle, { className: "text-primary flex flex-col items-center pb-10 text-4xl", children: [
         /* @__PURE__ */ jsx142(Image12, { src: "/logo.webp", alt: "Logo", width: 100, height: 100, priority: true }),
-        t("foundations.auth.forgot_password")
+        t("auth.forgot_password")
       ] }),
-      /* @__PURE__ */ jsx142(CardDescription, { className: "text-sm", children: showConfirmation ? /* @__PURE__ */ jsx142(Fragment23, { children: " " }) : /* @__PURE__ */ jsx142(Fragment23, { children: t(`foundations.auth.add_email_to_reset`) }) })
+      /* @__PURE__ */ jsx142(CardDescription, { className: "text-sm", children: showConfirmation ? /* @__PURE__ */ jsx142(Fragment23, { children: " " }) : /* @__PURE__ */ jsx142(Fragment23, { children: t(`auth.add_email_to_reset`) }) })
     ] }),
-    showConfirmation ? /* @__PURE__ */ jsx142(CardContent, { children: /* @__PURE__ */ jsx142(CardDescription, { className: "text-center text-xl", children: t(`foundations.auth.reset_confirmation`) }) }) : /* @__PURE__ */ jsx142(Form, { ...form, children: /* @__PURE__ */ jsxs82("form", { onSubmit: form.handleSubmit(onSubmit), children: [
+    showConfirmation ? /* @__PURE__ */ jsx142(CardContent, { children: /* @__PURE__ */ jsx142(CardDescription, { className: "text-center text-xl", children: t(`auth.reset_confirmation`) }) }) : /* @__PURE__ */ jsx142(Form, { ...form, children: /* @__PURE__ */ jsxs82("form", { onSubmit: form.handleSubmit(onSubmit), children: [
       /* @__PURE__ */ jsxs82(CardContent, { children: [
         /* @__PURE__ */ jsx142(
           FormInput,
           {
             form,
             id: "email",
-            name: t(`generic.fields.email.label`),
-            placeholder: t(`generic.fields.email.placeholder`),
+            name: t(`common.fields.email.label`),
+            placeholder: t(`common.fields.email.placeholder`),
             testId: "form-forgot-password-input-email"
           }
         ),
-        /* @__PURE__ */ jsx142(Button, { className: "mt-4 w-full", type: "submit", "data-testid": "form-forgot-password-button-reset", children: t(`foundations.auth.buttons.reset_password`) })
+        /* @__PURE__ */ jsx142(Button, { className: "mt-4 w-full", type: "submit", "data-testid": "form-forgot-password-button-reset", children: t(`auth.buttons.reset_password`) })
       ] }),
       /* @__PURE__ */ jsx142(CardFooter, { className: "flex w-full flex-row justify-between", children: /* @__PURE__ */ jsx142(
         Link,
@@ -12904,7 +12882,7 @@ function ForgotPassword() {
           className: "flex w-full justify-end",
           onClick: () => setComponentType(0 /* Login */),
           "data-testid": "form-forgot-password-link-login",
-          children: t(`foundations.auth.buttons.login`)
+          children: t(`auth.buttons.login`)
         }
       ) })
     ] }) })
@@ -12927,9 +12905,9 @@ function Login() {
   const router = useI18nRouter();
   const formSchema = z7.object({
     email: z7.string().email({
-      message: t(`generic.errors.invalid_email`)
+      message: t(`common.errors.invalid_email`)
     }),
-    password: z7.string().min(3, { message: t(`foundations.auth.errors.password_too_short`) })
+    password: z7.string().min(3, { message: t(`auth.errors.password_too_short`) })
   });
   const form = useForm7({
     resolver: zodResolver7(formSchema),
@@ -12948,7 +12926,7 @@ function Login() {
       router.replace(generateUrl({ page: `/` }));
     } catch (e) {
       errorToast({
-        title: t(`generic.errors.error`),
+        title: t(`common.errors.error`),
         error: e
       });
     }
@@ -12957,9 +12935,9 @@ function Login() {
     /* @__PURE__ */ jsxs83(CardHeader, { "data-testid": "page-login-container", children: [
       /* @__PURE__ */ jsxs83(CardTitle, { className: "text-primary flex flex-col items-center pb-10 text-4xl", children: [
         /* @__PURE__ */ jsx143(Image13, { src: "/logo.webp", alt: "Logo", width: 100, height: 100, priority: true }),
-        t("foundations.auth.login")
+        t("auth.login")
       ] }),
-      /* @__PURE__ */ jsx143(CardDescription, { className: "text-sm", children: t(`foundations.auth.login_description`) })
+      /* @__PURE__ */ jsx143(CardDescription, { className: "text-sm", children: t(`auth.login_description`) })
     ] }),
     /* @__PURE__ */ jsx143(Form, { ...form, children: /* @__PURE__ */ jsxs83("form", { onSubmit: form.handleSubmit(onSubmit), children: [
       /* @__PURE__ */ jsx143(CardContent, { children: isInternalAuthEnabled() && /* @__PURE__ */ jsxs83(Fragment24, { children: [
@@ -12969,8 +12947,8 @@ function Login() {
             autoFocus: true,
             form,
             id: "email",
-            name: t(`generic.fields.email.label`),
-            placeholder: t(`generic.fields.email.placeholder`),
+            name: t(`common.fields.email.label`),
+            placeholder: t(`common.fields.email.placeholder`),
             testId: "form-login-input-email"
           }
         ),
@@ -12979,12 +12957,12 @@ function Login() {
           {
             form,
             id: "password",
-            name: t(`foundations.user.fields.password.label`),
-            placeholder: t(`foundations.user.fields.password.placeholder`),
+            name: t(`user.fields.password.label`),
+            placeholder: t(`user.fields.password.placeholder`),
             testId: "form-login-input-password"
           }
         ),
-        /* @__PURE__ */ jsx143(Button, { className: "mt-4 w-full", type: "submit", "data-testid": "form-login-button-submit", children: t(`foundations.auth.login`) })
+        /* @__PURE__ */ jsx143(Button, { className: "mt-4 w-full", type: "submit", "data-testid": "form-login-button-submit", children: t(`auth.login`) })
       ] }) }),
       /* @__PURE__ */ jsxs83(CardFooter, { className: "flex w-full flex-col gap-y-4 mt-4", children: [
         isDiscordAuthEnabled() && /* @__PURE__ */ jsx143(Link, { href: `${getApiUrl()}auth/discord`, className: "flex w-full justify-end", children: /* @__PURE__ */ jsx143(Button, { className: "w-full", variant: `outline`, "data-testid": "page-login-button-initial-login", children: "Login with Discord" }) }),
@@ -12995,7 +12973,7 @@ function Login() {
               href: "#",
               className: "flex w-full justify-start",
               onClick: () => setComponentType(5 /* Register */),
-              children: t(`foundations.auth.register`)
+              children: t(`auth.register`)
             }
           ),
           /* @__PURE__ */ jsx143(
@@ -13005,7 +12983,7 @@ function Login() {
               className: "flex w-full justify-end",
               onClick: () => setComponentType(1 /* ForgotPassword */),
               "data-testid": "form-login-link-forgot-password",
-              children: t(`foundations.auth.forgot_password`)
+              children: t(`auth.forgot_password`)
             }
           )
         ] })
@@ -13084,25 +13062,25 @@ function ResetPassword() {
         await AuthService.validateCode(payload);
       } catch (e) {
         setError(e instanceof Error ? e.message : String(e));
-        errorToast({ title: t(`generic.errors.error`), error: e });
+        errorToast({ title: t(`common.errors.error`), error: e });
       }
     }
     __name(validateResetPasswordCode, "validateResetPasswordCode");
     if (params && params.code) {
       validateResetPasswordCode(params.code);
     } else {
-      setError(t(`foundations.auth.errors.invalid_password_reset_code`));
+      setError(t(`auth.errors.invalid_password_reset_code`));
     }
   }, []);
   const formSchema = z8.object({
     password: z8.string().min(1, {
-      message: t(`foundations.user.fields.password.error`)
+      message: t(`user.fields.password.error`)
     }),
     passwordRetype: z8.string().min(1, {
-      message: t(`foundations.auth.fields.retype_password.error`)
+      message: t(`auth.fields.retype_password.error`)
     })
   }).refine((data) => data.password === data.passwordRetype, {
-    message: t(`foundations.auth.fields.retype_password.error_not_match`),
+    message: t(`auth.fields.retype_password.error_not_match`),
     path: ["passwordRetype"]
   });
   const form = useForm8({
@@ -13121,29 +13099,29 @@ function ResetPassword() {
       };
       await AuthService.resetPassword(payload);
       setShowConfirmation(true);
-      toast8.success(t(`foundations.auth.reset_success`), {
-        description: t(`foundations.auth.reset_success_description`)
+      toast8.success(t(`auth.reset_success`), {
+        description: t(`auth.reset_success_description`)
       });
       setTimeout(() => {
         setComponentType(0 /* Login */);
         setParams(void 0);
       }, 2e3);
     } catch (e) {
-      errorToast({ title: t(`generic.errors.error`), error });
+      errorToast({ title: t(`common.errors.error`), error });
     }
   }, "onSubmit");
   return /* @__PURE__ */ jsxs84(Fragment26, { children: [
     /* @__PURE__ */ jsxs84(CardHeader, { children: [
       /* @__PURE__ */ jsxs84(CardTitle, { className: "text-primary flex flex-col items-center pb-10 text-4xl", children: [
         /* @__PURE__ */ jsx145(Image14, { src: "/logo.webp", alt: "Logo", width: 100, height: 100, priority: true }),
-        t(`foundations.auth.password_reset`)
+        t(`auth.password_reset`)
       ] }),
-      /* @__PURE__ */ jsx145(CardDescription, { className: "text-center text-sm", children: error ? /* @__PURE__ */ jsx145(Fragment26, { children: t(`foundations.auth.errors.password_reset_error`) }) : /* @__PURE__ */ jsx145(Fragment26, { children: t(`foundations.auth.reset_password`) }) })
+      /* @__PURE__ */ jsx145(CardDescription, { className: "text-center text-sm", children: error ? /* @__PURE__ */ jsx145(Fragment26, { children: t(`auth.errors.password_reset_error`) }) : /* @__PURE__ */ jsx145(Fragment26, { children: t(`auth.reset_password`) }) })
     ] }),
-    /* @__PURE__ */ jsx145(CardContent, { children: showConfirmation ? /* @__PURE__ */ jsx145(CardDescription, { className: "text-center text-xl", children: t(`foundations.auth.reset_success_description`) }) : error ? /* @__PURE__ */ jsx145(CardDescription, { className: "text-center text-xl", children: error }) : /* @__PURE__ */ jsx145(Form, { ...form, children: /* @__PURE__ */ jsxs84("form", { onSubmit: form.handleSubmit(onSubmit), children: [
+    /* @__PURE__ */ jsx145(CardContent, { children: showConfirmation ? /* @__PURE__ */ jsx145(CardDescription, { className: "text-center text-xl", children: t(`auth.reset_success_description`) }) : error ? /* @__PURE__ */ jsx145(CardDescription, { className: "text-center text-xl", children: error }) : /* @__PURE__ */ jsx145(Form, { ...form, children: /* @__PURE__ */ jsxs84("form", { onSubmit: form.handleSubmit(onSubmit), children: [
       /* @__PURE__ */ jsx145(FormPassword, { form, id: "password", name: "Password" }),
       /* @__PURE__ */ jsx145(FormPassword, { form, id: "passwordRetype", name: "Retype Password" }),
-      /* @__PURE__ */ jsx145(Button, { className: "mt-4 w-full", type: "submit", children: t(`foundations.auth.buttons.reset_password`) })
+      /* @__PURE__ */ jsx145(Button, { className: "mt-4 w-full", type: "submit", children: t(`auth.buttons.reset_password`) })
     ] }) }) })
   ] });
 }
@@ -13155,7 +13133,7 @@ import { jsx as jsx146, jsxs as jsxs85 } from "react/jsx-runtime";
 function ContentsList({ contentList }) {
   const t = useTranslations54();
   return /* @__PURE__ */ jsxs85("div", { className: "flex min-h-0 w-full flex-col overflow-y-auto", children: [
-    /* @__PURE__ */ jsx146("h2", { className: "text-xl font-semibold", children: t(`foundations.content.news`) }),
+    /* @__PURE__ */ jsx146("h2", { className: "text-xl font-semibold", children: t(`content.news`) }),
     /* @__PURE__ */ jsx146("div", { className: "flex flex-col", children: contentList.map((content) => /* @__PURE__ */ jsx146(ContentsListElement, { content }, content.id)) })
   ] });
 }
@@ -13196,7 +13174,7 @@ function ContentsListById({ contentIds }) {
       data,
       fields: ["name" /* name */, "authors" /* authors */, "updatedAt" /* updatedAt */],
       tableGeneratorType: Modules.Content,
-      title: t(`generic.relevant`)
+      title: t(`common.relevant`)
     }
   );
 }
@@ -13218,7 +13196,7 @@ function RelevantContentsList({ id }) {
       data,
       fields: ["name" /* name */, "authors" /* authors */, "relevance" /* relevance */, "updatedAt" /* updatedAt */],
       tableGeneratorType: Modules.Content,
-      title: t(`generic.relevant`)
+      title: t(`common.relevant`)
     }
   );
 }
@@ -13291,7 +13269,7 @@ function NotificationsList({ archived }) {
     return /* @__PURE__ */ jsx150(Card, { children: /* @__PURE__ */ jsx150(CardContent, { className: "p-0", children: /* @__PURE__ */ jsxs87("div", { className: `flex w-full flex-row items-center p-2`, children: [
       notificationData.actor ? /* @__PURE__ */ jsx150("div", { className: "flex w-12 max-w-12 px-2", children: /* @__PURE__ */ jsx150(Link, { href: generateUrl({ page: Modules.User, id: notificationData.actor.id }), children: /* @__PURE__ */ jsx150(UserAvatar, { user: notificationData.actor, className: "h-8 w-8" }) }) }) : /* @__PURE__ */ jsx150("div", { className: "flex w-14 max-w-14 px-2" }),
       /* @__PURE__ */ jsxs87("div", { className: "flex w-full flex-col", children: [
-        /* @__PURE__ */ jsx150("p", { className: "text-sm", children: t.rich(`foundations.notification.${notification.notificationType}.description`, {
+        /* @__PURE__ */ jsx150("p", { className: "text-sm", children: t.rich(`notification.${notification.notificationType}.description`, {
           strong: /* @__PURE__ */ __name((chunks) => /* @__PURE__ */ jsx150("strong", { children: chunks }), "strong"),
           actor: notificationData.actor?.name ?? "",
           title: notificationData.title
@@ -13299,7 +13277,7 @@ function NotificationsList({ archived }) {
         /* @__PURE__ */ jsx150("div", { className: "text-muted-foreground mt-1 w-full text-xs", children: new Date(notification.createdAt).toLocaleString() })
       ] }),
       /* @__PURE__ */ jsxs87("div", { className: "flex flex-row items-center", children: [
-        notificationData.url ? /* @__PURE__ */ jsx150(Link, { href: notificationData.url, children: /* @__PURE__ */ jsx150(Button, { variant: `outline`, size: `sm`, onClick: (e) => e.stopPropagation(), children: t(`foundations.notification.${notification.notificationType}.buttons.action`) }) }) : /* @__PURE__ */ jsx150(Fragment27, {}),
+        notificationData.url ? /* @__PURE__ */ jsx150(Link, { href: notificationData.url, children: /* @__PURE__ */ jsx150(Button, { variant: `outline`, size: `sm`, onClick: (e) => e.stopPropagation(), children: t(`notification.${notification.notificationType}.buttons.action`) }) }) : /* @__PURE__ */ jsx150(Fragment27, {}),
         !archived && /* @__PURE__ */ jsxs87(Tooltip2, { children: [
           /* @__PURE__ */ jsx150(TooltipTrigger, { children: /* @__PURE__ */ jsx150(
             Button,
@@ -13314,7 +13292,7 @@ function NotificationsList({ archived }) {
               children: /* @__PURE__ */ jsx150(ArchiveIcon, { className: "h-4 w-4 cursor-pointer" })
             }
           ) }),
-          /* @__PURE__ */ jsx150(TooltipContent, { children: t(`foundations.notification.buttons.archive`) })
+          /* @__PURE__ */ jsx150(TooltipContent, { children: t(`notification.buttons.archive`) })
         ] })
       ] })
     ] }) }) }, notification.id);
@@ -13338,11 +13316,11 @@ function NotificationsListContainerContent() {
   }
   const tabs = [
     {
-      label: t(`foundations.notification.inbox`),
+      label: t(`notification.inbox`),
       content: /* @__PURE__ */ jsx151(NotificationsList, { archived: false })
     },
     {
-      label: t(`foundations.notification.archived`),
+      label: t(`notification.archived`),
       content: /* @__PURE__ */ jsx151(NotificationsList, { archived: true })
     }
   ];
@@ -13497,11 +13475,11 @@ function NotificationModalContent({ isOpen, setIsOpen }) {
           className: `h-5 w-5 cursor-pointer ${unreadNotifications ? "text-destructive" : ""} ${isLoading ? "animate-pulse" : ""}`
         }
       ),
-      t(`types.notifications`, { count: 2 })
+      t(`entities.notifications`, { count: 2 })
     ] }) }),
     /* @__PURE__ */ jsx152(PopoverContent, { className: "relative left-10 w-80 border-0 p-0 shadow-none", children: /* @__PURE__ */ jsxs89(Card, { children: [
       /* @__PURE__ */ jsxs89(CardHeader, { className: "p-4", children: [
-        /* @__PURE__ */ jsx152(CardTitle, { children: t(`types.notifications`, { count: 2 }) }),
+        /* @__PURE__ */ jsx152(CardTitle, { children: t(`entities.notifications`, { count: 2 }) }),
         isLoading && /* @__PURE__ */ jsx152("div", { className: "text-muted-foreground text-xs", children: "Loading..." }),
         error && /* @__PURE__ */ jsxs89("div", { className: "text-destructive text-xs", children: [
           "Error: ",
@@ -13509,7 +13487,7 @@ function NotificationModalContent({ isOpen, setIsOpen }) {
         ] })
       ] }),
       /* @__PURE__ */ jsx152(Separator, {}),
-      /* @__PURE__ */ jsx152(ScrollArea, { className: "h-96", children: notifications.length > 0 ? notifications.map((notification) => /* @__PURE__ */ jsx152(Fragment28, { children: generateNotification(notification, () => setIsOpen(false)) }, notification.id)) : /* @__PURE__ */ jsx152("div", { className: "p-4 text-center text-sm text-gray-500", children: t(`foundations.notification.empty`, { count: 2 }) }) })
+      /* @__PURE__ */ jsx152(ScrollArea, { className: "h-96", children: notifications.length > 0 ? notifications.map((notification) => /* @__PURE__ */ jsx152(Fragment28, { children: generateNotification(notification, () => setIsOpen(false)) }, notification.id)) : /* @__PURE__ */ jsx152("div", { className: "p-4 text-center text-sm text-gray-500", children: t(`notification.empty`) }) })
     ] }) })
   ] });
 }
@@ -13534,7 +13512,7 @@ function RoleDetails() {
   const { role } = useRoleContext();
   const t = useTranslations60();
   if (!role) return null;
-  return /* @__PURE__ */ jsx154(Card, { className: "w-full", children: /* @__PURE__ */ jsx154(CardContent, { className: "p-4", children: /* @__PURE__ */ jsx154(AttributeElement, { title: t(`foundations.role.fields.description.label`), value: role.description }) }) });
+  return /* @__PURE__ */ jsx154(Card, { className: "w-full", children: /* @__PURE__ */ jsx154(CardContent, { className: "p-4", children: /* @__PURE__ */ jsx154(AttributeElement, { title: t(`role.fields.description.label`), value: role.description }) }) });
 }
 __name(RoleDetails, "RoleDetails");
 
@@ -13576,8 +13554,8 @@ function FormRoles({ form, id, name, roles }) {
         }
       ),
       /* @__PURE__ */ jsxs91(Tooltip2, { children: [
-        /* @__PURE__ */ jsx156(TooltipTrigger, { children: /* @__PURE__ */ jsx156(FieldLabel, { className: "ml-3 font-normal", children: t(`foundations.role.roles`, { role: role.id.replaceAll(`-`, ``) }) }) }),
-        /* @__PURE__ */ jsx156(TooltipContent, { children: t(`foundations.role.roles_descriptions`, { role: role.id.replaceAll(`-`, ``) }) })
+        /* @__PURE__ */ jsx156(TooltipTrigger, { children: /* @__PURE__ */ jsx156(FieldLabel, { className: "ml-3 font-normal", children: t(`role.roles`, { role: role.id.replaceAll(`-`, ``) }) }) }),
+        /* @__PURE__ */ jsx156(TooltipContent, { children: t(`role.roles_descriptions`, { role: role.id.replaceAll(`-`, ``) }) })
       ] })
     ] }, role.id);
   }) }) }) });
@@ -13615,10 +13593,10 @@ function RemoveUserFromRole({ role, user, refresh }) {
       setOpen(false);
       refresh();
     } catch (error) {
-      errorToast({ title: t(`generic.errors.error`), error });
+      errorToast({ title: t(`common.errors.error`), error });
     }
   }, "remove");
-  const roleName = t(`foundations.role.roles`, { role: role.id.replaceAll(`-`, ``) });
+  const roleName = t(`role.roles`, { role: role.id.replaceAll(`-`, ``) });
   return /* @__PURE__ */ jsxs92(Dialog, { open, onOpenChange: setOpen, children: [
     /* @__PURE__ */ jsx157(
       DialogTrigger,
@@ -13628,18 +13606,18 @@ function RemoveUserFromRole({ role, user, refresh }) {
           e.preventDefault();
           setOpen(true);
         },
-        children: /* @__PURE__ */ jsx157("span", { className: "hover:text-destructive cursor-pointer", children: t(`foundations.role.remove_user.title`) })
+        children: /* @__PURE__ */ jsx157("span", { className: "hover:text-destructive cursor-pointer", children: t(`role.remove_user.title`) })
       }
     ),
     /* @__PURE__ */ jsxs92(DialogContent, { className: `flex max-h-[70vh] max-w-3xl flex-col overflow-y-auto`, children: [
       /* @__PURE__ */ jsxs92(DialogHeader, { children: [
-        /* @__PURE__ */ jsx157(DialogTitle, { children: t(`foundations.role.remove_user.title`) }),
-        /* @__PURE__ */ jsx157(DialogDescription, { children: canRemove ? t(`foundations.role.remove_user.subtitle_allowed`) : t(`foundations.role.remove_user.subtitle_not_allowed`) })
+        /* @__PURE__ */ jsx157(DialogTitle, { children: t(`role.remove_user.title`) }),
+        /* @__PURE__ */ jsx157(DialogDescription, { children: canRemove ? t(`role.remove_user.subtitle_allowed`) : t(`role.remove_user.subtitle_not_allowed`) })
       ] }),
       canRemove ? /* @__PURE__ */ jsxs92(Fragment31, { children: [
-        t(`foundations.role.remove_user.description_allowed`, { role: roleName, user: user.name }),
+        t(`role.remove_user.description_allowed`, { role: roleName, user: user.name }),
         /* @__PURE__ */ jsxs92("div", { className: "flex justify-end", children: [
-          /* @__PURE__ */ jsx157(Button, { className: "mr-2", variant: "outline", type: `button`, onClick: () => setOpen(false), children: t(`generic.buttons.cancel`) }),
+          /* @__PURE__ */ jsx157(Button, { className: "mr-2", variant: "outline", type: `button`, onClick: () => setOpen(false), children: t(`ui.buttons.cancel`) }),
           /* @__PURE__ */ jsx157(
             Button,
             {
@@ -13649,11 +13627,11 @@ function RemoveUserFromRole({ role, user, refresh }) {
                 remove();
               },
               variant: "destructive",
-              children: t(`generic.buttons.confirm_delete`)
+              children: t(`ui.buttons.confirm_delete`)
             }
           )
         ] })
-      ] }) : /* @__PURE__ */ jsx157(Fragment31, { children: t(`foundations.role.remove_user.description_not_allowed`, { role: roleName, user: user.name }) })
+      ] }) : /* @__PURE__ */ jsx157(Fragment31, { children: t(`role.remove_user.description_not_allowed`, { role: roleName, user: user.name }) })
     ] })
   ] });
 }
@@ -13678,14 +13656,14 @@ function UserRoleAdd({ user, refresh }) {
     });
     setRoles(roles.filter((u) => u.id !== role.id));
     toast10.message(
-      t(`generic.association.label`, {
-        source: t(`types.roles`, { count: 1 }),
-        destination: t(`types.users`, { count: 1 })
+      t(`common.association.label`, {
+        source: t(`entities.roles`, { count: 1 }),
+        destination: t(`entities.users`, { count: 1 })
       }),
       {
-        description: t(`generic.association.success`, {
-          source: t(`types.roles`, { count: 1 }),
-          destination: t(`types.users`, { count: 1 }),
+        description: t(`common.association.success`, {
+          source: t(`entities.roles`, { count: 1 }),
+          destination: t(`entities.users`, { count: 1 }),
           source_name: role.name,
           destination_name: user.name
         })
@@ -13714,40 +13692,40 @@ function UserRoleAdd({ user, refresh }) {
   return /* @__PURE__ */ jsxs93(Fragment32, { children: [
     /* @__PURE__ */ jsxs93(Button, { size: "sm", onClick: () => setOpen(true), children: [
       /* @__PURE__ */ jsx158(PlusCircle2, { className: "mr-3 h-3.5 w-3.5" }),
-      t(`generic.association.label`, {
-        source: t(`types.roles`, { count: 1 }),
-        destination: t(`types.users`, { count: 1 })
+      t(`common.association.label`, {
+        source: t(`entities.roles`, { count: 1 }),
+        destination: t(`entities.users`, { count: 1 })
       })
     ] }),
     /* @__PURE__ */ jsxs93(CommandDialog, { open, onOpenChange: setOpen, children: [
-      /* @__PURE__ */ jsx158(DialogTitle, { children: t(`generic.association.label`, {
-        source: t(`types.roles`, { count: 1 }),
-        destination: t(`types.users`, { count: 1 })
+      /* @__PURE__ */ jsx158(DialogTitle, { children: t(`common.association.label`, {
+        source: t(`entities.roles`, { count: 1 }),
+        destination: t(`entities.users`, { count: 1 })
       }) }),
-      /* @__PURE__ */ jsx158(DialogDescription, { children: t(`generic.association.description`, {
-        source: t(`types.roles`, { count: 1 }),
-        destination: t(`types.users`, { count: 1 }),
+      /* @__PURE__ */ jsx158(DialogDescription, { children: t(`common.association.description`, {
+        source: t(`entities.roles`, { count: 1 }),
+        destination: t(`entities.users`, { count: 1 }),
         destination_name: user.name
       }) }),
       /* @__PURE__ */ jsxs93(Command, { shouldFilter: false, children: [
         /* @__PURE__ */ jsx158(
           CommandInput,
           {
-            placeholder: t(`generic.search.placeholder`, { type: t(`types.roles`, { count: 1 }) }),
+            placeholder: t(`ui.search.placeholder`, { type: t(`entities.roles`, { count: 1 }) }),
             value: searchTerm,
             onValueChange: setSearchTerm,
             ref: inputRef
           }
         ),
         /* @__PURE__ */ jsxs93(CommandList, { className: "mt-3 h-auto max-h-96 min-h-96 max-w-full overflow-x-hidden overflow-y-auto", children: [
-          /* @__PURE__ */ jsx158(CommandEmpty, { children: t(`generic.search.no_results`, { type: t(`types.roles`, { count: 1 }) }) }),
+          /* @__PURE__ */ jsx158(CommandEmpty, { children: t(`ui.search.no_results`, { type: t(`entities.roles`, { count: 1 }) }) }),
           roles.map((role) => /* @__PURE__ */ jsx158(
             CommandItem,
             {
               className: "cursor-pointer hover:bg-muted data-selected:hover:bg-muted bg-transparent data-selected:bg-transparent",
               onSelect: () => addUserToRole(role),
               onClick: () => addUserToRole(role),
-              children: t(`foundations.role.roles`, { role: role.id.replaceAll(`-`, ``) })
+              children: t(`role.roles`, { role: role.id.replaceAll(`-`, ``) })
             },
             role.id
           ))
@@ -13774,7 +13752,7 @@ function RolesList() {
       data,
       fields: ["name" /* name */, "description" /* description */],
       tableGeneratorType: Modules.Role,
-      title: t(`types.roles`, { count: 2 })
+      title: t(`entities.roles`, { count: 2 })
     }
   );
 }
@@ -13796,7 +13774,7 @@ function UserRolesList({ user }) {
       data,
       fields: ["name" /* name */, "description" /* description */],
       tableGeneratorType: Modules.Role,
-      title: t(`types.roles`, { count: 2 })
+      title: t(`entities.roles`, { count: 2 })
     }
   );
 }
@@ -15106,4 +15084,4 @@ export {
   useOAuthClients,
   useOAuthClient
 };
-//# sourceMappingURL=chunk-IJSB4FH6.mjs.map
+//# sourceMappingURL=chunk-CWY6AL4V.mjs.map