v2.3.7

* fix: 404 page for undefined events

* remove prev code merge

* add: sorting in available durations

* fix: sort only once

* remove: console logs

Co-authored-by: Guest <guest@pop-os.localdomain>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: alannnc <alannnc@gmail.com>

.github/workflows/add-to-project.yml

@@ -1,22 +0,0 @@
-name: Add bugs to Bug Hunting
-
-on:
-  issues:
-    types:
-      - opened
-      - labeled
-  pull_request:
-    types:
-      - opened
-      - labeled
-
-jobs:
-  add-to-project:
-    name: Add issue to project
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/add-to-project@v0.1.0
-        with:
-          project-url: https://github.com/orgs/calcom/projects/9
-          github-token: ${{ secrets.GH_ACCESS_TOKEN }}
-          labeled:  🙋🏻‍♂️help wanted

apps/web/components/apps/App.tsx

@@ -42,7 +42,7 @@ const Component = ({
 
   const mutation = useAddAppMutation(null, {
     onSuccess: (data) => {
-      if (data.setupPending) return;
+      if (data?.setupPending) return;
       showToast(t("app_successfully_installed"), "success");
     },
     onError: (error) => {
@@ -195,7 +195,7 @@ const Component = ({
         <h4 className="mt-8 font-semibold text-gray-900 ">{t("pricing")}</h4>
         <span>
           {price === 0 ? (
-            "Free"
+            t("free_to_use_apps")
           ) : (
             <>
               {Intl.NumberFormat("en-US", {

apps/web/components/booking/BookingDescription.tsx

@@ -1,6 +1,7 @@
 import { SchedulingType } from "@prisma/client";
 import { FC, ReactNode, useEffect } from "react";
 
+import dayjs from "@calcom/dayjs";
 import { classNames } from "@calcom/lib";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Icon, Badge } from "@calcom/ui";
@@ -41,6 +42,7 @@ interface Props {
 
 const BookingDescription: FC<Props> = (props) => {
   const { profile, eventType, isBookingPage = false, children } = props;
+  const { date: bookingDate } = useRouterQuery("date");
   const { t } = useLocale();
   const { duration, setQuery: setDuration } = useRouterQuery("duration");
   useEffect(() => {
@@ -54,6 +56,21 @@ const BookingDescription: FC<Props> = (props) => {
       }
     }
   }, []);
+  let requiresConfirmation = eventType?.requiresConfirmation;
+  let requiresConfirmationText = t("requires_confirmation");
+  const rcThreshold = eventType?.metadata?.requiresConfirmationThreshold;
+  if (rcThreshold) {
+    if (isBookingPage) {
+      if (dayjs(bookingDate).diff(dayjs(), rcThreshold.unit) > rcThreshold.time) {
+        requiresConfirmation = false;
+      }
+    } else {
+      requiresConfirmationText = t("requires_confirmation_threshold", {
+        ...rcThreshold,
+        unit: rcThreshold.unit.slice(0, -1),
+      });
+    }
+  }
   return (
     <>
       <UserAvatars
@@ -89,16 +106,16 @@ const BookingDescription: FC<Props> = (props) => {
             </div>
           </div>
         )}
-        {eventType?.requiresConfirmation && (
+        {requiresConfirmation && (
           <div
             className={classNames(
-              "flex items-center",
+              "items-top flex",
               isBookingPage && "dark:text-darkgray-600 text-sm font-medium text-gray-600"
             )}>
             <div>
-              <Icon.FiCheckSquare className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4 " />
+              <Icon.FiCheckSquare className="mr-[10px] ml-[2px] inline-block h-4 w-4 " />
             </div>
-            {t("requires_confirmation")}
+            {requiresConfirmationText}
           </div>
         )}
         <AvailableEventLocations

apps/web/components/booking/pages/AvailabilityPage.tsx

@@ -1,7 +1,6 @@
 import { useAutoAnimate } from "@formkit/auto-animate/react";
 import { EventType } from "@prisma/client";
 import * as Popover from "@radix-ui/react-popover";
-import { TFunction } from "next-i18next";
 import { useRouter } from "next/router";
 import { useReducer, useEffect, useMemo, useState } from "react";
 import { Toaster } from "react-hot-toast";
@@ -19,7 +18,6 @@ import {
 } from "@calcom/embed-core/embed-iframe";
 import CustomBranding from "@calcom/lib/CustomBranding";
 import classNames from "@calcom/lib/classNames";
-import { WEBSITE_URL } from "@calcom/lib/constants";
 import getStripeAppData from "@calcom/lib/getStripeAppData";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import useTheme from "@calcom/lib/hooks/useTheme";
@@ -27,15 +25,11 @@ import notEmpty from "@calcom/lib/notEmpty";
 import { getRecurringFreq } from "@calcom/lib/recurringStrings";
 import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
 import { detectBrowserTimeFormat, setIs24hClockInLocalStorage, TimeFormat } from "@calcom/lib/timeFormat";
-import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
 import { trpc } from "@calcom/trpc/react";
 import { Icon, DatePicker } from "@calcom/ui";
 
 import { timeZone as localStorageTimeZone } from "@lib/clock";
-// import { timeZone } from "@lib/clock";
-import { useExposePlanGlobally } from "@lib/hooks/useExposePlanGlobally";
 import useRouterQuery from "@lib/hooks/useRouterQuery";
-import { isBrandingHidden } from "@lib/isBrandingHidden";
 
 import Gates, { Gate, GateState } from "@components/Gates";
 import AvailableTimes from "@components/booking/AvailableTimes";
@@ -48,23 +42,6 @@ import type { AvailabilityPageProps } from "../../../pages/[user]/[type]";
 import type { DynamicAvailabilityPageProps } from "../../../pages/d/[link]/[slug]";
 import type { AvailabilityTeamPageProps } from "../../../pages/team/[slug]/[type]";
 
-// Get router variables
-const GoBackToPreviousPage = ({ t }: { t: TFunction }) => {
-  const router = useRouter();
-  const path = router.asPath.split("/");
-  path.pop(); // Remove the last item (where we currently are)
-  path.shift(); // Removes first item e.g. if we were visitng "/teams/test/30mins" the array will new look like ["teams","test"]
-  const slug = path.join("/");
-  return (
-    <div className="flex h-full flex-col justify-end">
-      <button title={t("profile")} onClick={() => router.replace(`${WEBSITE_URL}/${slug}`)}>
-        <Icon.FiArrowLeft className="dark:text-darkgray-600 h-4 w-4 text-black transition-opacity hover:cursor-pointer" />
-        <p className="sr-only">Go Back</p>
-      </button>
-    </div>
-  );
-};
-
 const useSlots = ({
   eventTypeId,
   eventTypeSlug,
@@ -237,7 +214,7 @@ function TimezoneDropdown({
 
   return (
     <Popover.Root open={isTimeOptionsOpen} onOpenChange={setIsTimeOptionsOpen}>
-      <Popover.Trigger className="min-w-32 dark:text-darkgray-600 radix-state-open:bg-gray-200 dark:radix-state-open:bg-darkgray-200 group relative mb-2 -ml-2 inline-block rounded-md px-2 py-2 text-left text-gray-600">
+      <Popover.Trigger className="min-w-32 dark:text-darkgray-600 radix-state-open:bg-gray-200 dark:radix-state-open:bg-darkgray-200 group relative mb-2 -ml-2 !mt-2 inline-block self-start rounded-md px-2 py-2 text-left text-gray-600">
         <p className="flex items-center text-sm font-medium">
           <Icon.FiGlobe className="min-h-4 min-w-4 mr-[10px] ml-[2px] -mt-[2px] inline-block" />
           {timeZone}
@@ -300,9 +277,6 @@ const AvailabilityPage = ({ profile, eventType, ...restProps }: Props) => {
     setTimeZone(localStorageTimeZone() || dayjs.tz.guess());
   }, []);
 
-  // TODO: Improve this;
-  useExposePlanGlobally(eventType.users.length === 1 ? eventType.users[0].plan : "PRO");
-
   const [recurringEventCount, setRecurringEventCount] = useState(eventType.recurringEvent?.count);
 
   const telemetry = useTelemetry();
@@ -423,12 +397,6 @@ const AvailabilityPage = ({ profile, eventType, ...restProps }: Props) => {
                     {timezoneDropdown}
                   </BookingDescription>
 
-                  {!isEmbed && (
-                    <div className="mt-auto hidden md:block">
-                      <GoBackToPreviousPage t={t} />
-                    </div>
-                  )}
-
                   {/* Temporarily disabled - booking?.startTime && rescheduleUid && (
                     <div>
                       <p
@@ -468,7 +436,7 @@ const AvailabilityPage = ({ profile, eventType, ...restProps }: Props) => {
                 />
               </div>
             </div>
-            {(!eventType.users[0] || !isBrandingHidden(eventType.users[0])) && !isEmbed && <PoweredByCal />}
+            {(!restProps.isBrandingHidden || isEmbed) && <PoweredByCal />}
           </div>
         </main>
       </div>

apps/web/components/booking/pages/BookingPage.tsx

@@ -39,11 +39,11 @@ import { HttpError } from "@calcom/lib/http-error";
 import { getEveryFreqFor } from "@calcom/lib/recurringStrings";
 import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
 import { AddressInput, Button, EmailInput, Form, Icon, PhoneInput, Tooltip } from "@calcom/ui";
+import { Group, RadioField } from "@calcom/ui";
 
 import { asStringOrNull } from "@lib/asStringOrNull";
 import { timeZone } from "@lib/clock";
 import { ensureArray } from "@lib/ensureArray";
-import useMeQuery from "@lib/hooks/useMeQuery";
 import useRouterQuery from "@lib/hooks/useRouterQuery";
 import createBooking from "@lib/mutations/bookings/create-booking";
 import createRecurringBooking from "@lib/mutations/bookings/create-recurring-booking";
@@ -103,7 +103,6 @@ const BookingPage = ({
     {}
   );
   const stripeAppData = getStripeAppData(eventType);
-
   // Define duration now that we support multiple duration eventTypes
   let duration = eventType.length;
   if (queryDuration && !isNaN(Number(queryDuration))) {
@@ -241,7 +240,7 @@ const BookingPage = ({
   const bookingFormSchema = z
     .object({
       name: z.string().min(1),
-      email: z.string().email(),
+      email: z.string().trim().email(),
       phone: z
         .string()
         .refine((val) => isValidPhoneNumber(val))
@@ -745,6 +744,27 @@ const BookingPage = ({
                           </div>
                         </div>
                       )}
+                      {input.options && input.type === EventTypeCustomInputType.RADIO && (
+                        <div className="">
+                          <div className="flex">
+                            <Group
+                              onValueChange={(e) => {
+                                bookingForm.setValue(`customInputs.${input.id}`, e);
+                              }}>
+                              <>
+                                {input.options.map((option, i) => (
+                                  <RadioField
+                                    label={option.label}
+                                    key={`option.${i}.radio`}
+                                    value={option.label}
+                                    id={`option.${i}.radio`}
+                                  />
+                                ))}
+                              </>
+                            </Group>
+                          </div>
+                        </div>
+                      )}
                     </div>
                   ))}
                 {!eventType.disableGuests && guestToggle && (

apps/web/components/dialog/EditLocationDialog.tsx

@@ -297,7 +297,7 @@ export const EditLocationDialog = (props: ISetLocationDialog) => {
                       control={locationFormMethods.control}
                       render={() => (
                         <Select<{ label: string; value: string; icon?: string }>
-                          maxMenuHeight={150}
+                          maxMenuHeight={300}
                           name="location"
                           defaultValue={selection}
                           options={locationOptions}

apps/web/components/eventtype/AvailabilityTab.tsx

@@ -20,12 +20,13 @@ type AvailabilityOption = {
 
 const Option = ({ ...props }: OptionProps<AvailabilityOption>) => {
   const { label, isDefault } = props.data;
+  const { t } = useLocale();
   return (
     <components.Option {...props}>
       <span>{label}</span>
       {isDefault && (
         <Badge variant="blue" className="ml-2">
-          Default
+          {t("default")}
         </Badge>
       )}
     </components.Option>
@@ -34,12 +35,13 @@ const Option = ({ ...props }: OptionProps<AvailabilityOption>) => {
 
 const SingleValue = ({ ...props }: SingleValueProps<AvailabilityOption>) => {
   const { label, isDefault } = props.data;
+  const { t } = useLocale();
   return (
     <components.SingleValue {...props}>
       <span>{label}</span>
       {isDefault && (
         <Badge variant="blue" className="ml-2">
-          Default
+          {t("default")}
         </Badge>
       )}
     </components.SingleValue>

apps/web/components/eventtype/CustomInputTypeForm.tsx

@@ -1,23 +1,33 @@
-import { EventTypeCustomInput, EventTypeCustomInputType } from "@prisma/client";
+import { useAutoAnimate } from "@formkit/auto-animate/react";
+import { EventTypeCustomInputType } from "@prisma/client";
+import type { CustomInputParsed } from "pages/event-types/[type]";
 import { FC } from "react";
-import { Controller, SubmitHandler, useForm, useWatch } from "react-hook-form";
+import { Control, Controller, useFieldArray, useForm, UseFormRegister, useWatch } from "react-hook-form";
 
-import { Button, Select, TextField } from "@calcom/ui";
-
-import { useLocale } from "@lib/hooks/useLocale";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Button, Icon, Label, Select, TextField } from "@calcom/ui";
 
 interface OptionTypeBase {
   label: string;
   value: EventTypeCustomInputType;
+  options?: { label: string; type: string }[];
 }
 
 interface Props {
-  onSubmit: SubmitHandler<IFormInput>;
+  onSubmit: (output: CustomInputParsed) => void;
   onCancel: () => void;
-  selectedCustomInput?: EventTypeCustomInput;
+  selectedCustomInput?: CustomInputParsed;
 }
 
-type IFormInput = EventTypeCustomInput;
+type IFormInput = CustomInputParsed;
+
+/**
+ *  Getting a random ID gives us the option to know WHICH field is changed
+ *  when the user edits a custom field.
+ *  This UUID is only used to check for changes in the UI and not the ID we use in the DB
+ *  There is very very very slim chance that this will cause a collision
+ * */
+const randomId = () => Math.floor(Math.random() * 1000000 + new Date().getTime());
 
 const CustomInputTypeForm: FC<Props> = (props) => {
   const { t } = useLocale();
@@ -26,10 +36,22 @@ const CustomInputTypeForm: FC<Props> = (props) => {
     { value: EventTypeCustomInputType.TEXTLONG, label: t("multiline_text") },
     { value: EventTypeCustomInputType.NUMBER, label: t("number") },
     { value: EventTypeCustomInputType.BOOL, label: t("checkbox") },
+    {
+      value: EventTypeCustomInputType.RADIO,
+      label: t("radio"),
+    },
   ];
+
   const { selectedCustomInput } = props;
-  const defaultValues = selectedCustomInput || { type: inputOptions[0].value };
-  const { register, control, handleSubmit } = useForm<IFormInput>({
+
+  const defaultValues = selectedCustomInput
+    ? { ...selectedCustomInput, id: selectedCustomInput?.id || randomId() }
+    : {
+        id: randomId(),
+        type: EventTypeCustomInputType.TEXT,
+      };
+
+  const { register, control, getValues } = useForm<IFormInput>({
     defaultValues,
   });
   const selectedInputType = useWatch({ name: "type", control });
@@ -40,7 +62,7 @@ const CustomInputTypeForm: FC<Props> = (props) => {
   };
 
   return (
-    <form className="flex flex-col space-y-4">
+    <div className="flex flex-col space-y-4">
       <div>
         <label htmlFor="type" className="block text-sm font-medium text-gray-700">
           {t("input_type")}
@@ -83,6 +105,10 @@ const CustomInputTypeForm: FC<Props> = (props) => {
           {...register("placeholder")}
         />
       )}
+      {selectedInputType === EventTypeCustomInputType.RADIO && (
+        <RadioInputHandler control={control} register={register} />
+      )}
+
       <div className="flex h-5 items-center">
         <input
           id="required"
@@ -111,12 +137,75 @@ const CustomInputTypeForm: FC<Props> = (props) => {
         <Button onClick={onCancel} type="button" color="secondary" className="ltr:mr-2">
           {t("cancel")}
         </Button>
-        <Button onClick={handleSubmit(props.onSubmit)} form="custom-input">
+        <Button
+          type="button"
+          onClick={() => {
+            props.onSubmit(getValues());
+          }}>
           {t("save")}
         </Button>
       </div>
-    </form>
+    </div>
   );
 };
 
+function RadioInputHandler({
+  register,
+  control,
+}: {
+  register: UseFormRegister<IFormInput>;
+  control: Control<IFormInput>;
+}) {
+  const { t } = useLocale();
+  const { fields, append, remove } = useFieldArray<IFormInput>({
+    control,
+    name: "options",
+    shouldUnregister: true,
+  });
+  const [animateRef] = useAutoAnimate<HTMLUListElement>();
+
+  return (
+    <div className="flex flex-col ">
+      <Label htmlFor="radio_options">{t("options")}</Label>
+      <ul
+        className="flex max-h-80 w-full flex-col space-y-1 overflow-y-scroll rounded-md bg-gray-50 p-4"
+        ref={animateRef}>
+        <>
+          {fields.map((option, index) => (
+            <li key={`${option.id}`}>
+              <TextField
+                id={option.id}
+                placeholder={t("enter_option", { index: index + 1 })}
+                addOnFilled={false}
+                label={t("option", { index: index + 1 })}
+                labelSrOnly
+                {...register(`options.${index}.label` as const, { required: true })}
+                addOnSuffix={
+                  <Button
+                    size="icon"
+                    color="minimal"
+                    StartIcon={Icon.FiX}
+                    onClick={() => {
+                      remove(index);
+                    }}
+                  />
+                }
+              />
+            </li>
+          ))}
+          <Button
+            color="minimal"
+            StartIcon={Icon.FiPlus}
+            className="!text-sm !font-medium"
+            onClick={() => {
+              append({ label: "", type: "text" });
+            }}>
+            {t("add_an_option")}
+          </Button>
+        </>
+      </ul>
+    </div>
+  );
+}
+
 export default CustomInputTypeForm;

apps/web/components/eventtype/EditLocationDialog.tsx

@@ -1,371 +0,0 @@
-import { ErrorMessage } from "@hookform/error-message";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { isValidPhoneNumber } from "libphonenumber-js";
-import { Trans } from "next-i18next";
-import { useEffect } from "react";
-import { Controller, useForm, useWatch } from "react-hook-form";
-import { components } from "react-select";
-import { z } from "zod";
-
-import {
-  EventLocationType,
-  getEventLocationType,
-  getHumanReadableLocationValue,
-  getMessageForOrganizer,
-  LocationObject,
-  LocationType,
-} from "@calcom/app-store/locations";
-import { classNames } from "@calcom/lib";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { RouterOutputs, trpc } from "@calcom/trpc/react";
-import { Button, Dialog, DialogContent, Form, Icon, Label, PhoneInput, Select } from "@calcom/ui";
-
-import { QueryCell } from "@lib/QueryCell";
-
-import { LinkText } from "@components/ui/LinkText";
-import CheckboxField from "@components/ui/form/CheckboxField";
-
-type BookingItem = RouterOutputs["viewer"]["bookings"]["get"]["bookings"][number];
-
-type OptionTypeBase = {
-  label: string;
-  value: EventLocationType["type"];
-  disabled?: boolean;
-};
-
-interface ISetLocationDialog {
-  saveLocation: (newLocationType: EventLocationType["type"], details: { [key: string]: string }) => void;
-  selection?: OptionTypeBase;
-  booking?: BookingItem;
-  defaultValues?: LocationObject[];
-  setShowLocationModal: React.Dispatch<React.SetStateAction<boolean>>;
-  isOpenDialog: boolean;
-  setSelectedLocation?: (param: OptionTypeBase | undefined) => void;
-}
-
-const LocationInput = (props: {
-  eventLocationType: EventLocationType;
-  locationFormMethods: ReturnType<typeof useForm>;
-  id: string;
-  required: boolean;
-  placeholder: string;
-  className?: string;
-  defaultValue?: string;
-}): JSX.Element | null => {
-  const { eventLocationType, locationFormMethods, ...remainingProps } = props;
-  if (eventLocationType?.organizerInputType === "text") {
-    return (
-      <input {...locationFormMethods.register(eventLocationType.variable)} type="text" {...remainingProps} />
-    );
-  } else if (eventLocationType?.organizerInputType === "phone") {
-    return (
-      <PhoneInput
-        name={eventLocationType.variable}
-        control={locationFormMethods.control}
-        {...remainingProps}
-      />
-    );
-  }
-  return null;
-};
-
-export const EditLocationDialog = (props: ISetLocationDialog) => {
-  const {
-    saveLocation,
-    selection,
-    booking,
-    setShowLocationModal,
-    isOpenDialog,
-    defaultValues,
-    setSelectedLocation,
-  } = props;
-  const { t } = useLocale();
-  const locationsQuery = trpc.viewer.locationOptions.useQuery();
-
-  useEffect(() => {
-    if (selection) {
-      locationFormMethods.setValue("locationType", selection?.value);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [selection]);
-
-  const locationFormSchema = z.object({
-    locationType: z.string(),
-    phone: z.string().optional(),
-    locationAddress: z.string().optional(),
-    locationLink: z
-      .string()
-      .optional()
-      .superRefine((val, ctx) => {
-        if (
-          eventLocationType &&
-          !eventLocationType.default &&
-          eventLocationType.linkType === "static" &&
-          eventLocationType.urlRegExp
-        ) {
-          const valid = z
-            .string()
-            .regex(new RegExp(eventLocationType.urlRegExp || ""))
-            .safeParse(val).success;
-          if (!valid) {
-            const sampleUrl = eventLocationType.organizerInputPlaceholder;
-            ctx.addIssue({
-              code: z.ZodIssueCode.custom,
-              message: `Invalid URL for ${eventLocationType.label}. ${
-                sampleUrl ? "Sample URL: " + sampleUrl : ""
-              }`,
-            });
-          }
-          return;
-        }
-
-        const valid = z.string().url().optional().safeParse(val).success;
-        if (!valid) {
-          ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            message: `Invalid URL`,
-          });
-        }
-        return;
-      }),
-    displayLocationPublicly: z.boolean().optional(),
-    locationPhoneNumber: z
-      .string()
-      .refine((val) => isValidPhoneNumber(val))
-      .optional(),
-  });
-
-  const locationFormMethods = useForm({
-    mode: "onSubmit",
-    resolver: zodResolver(locationFormSchema),
-  });
-
-  const selectedLocation = useWatch({
-    control: locationFormMethods.control,
-    name: "locationType",
-  });
-
-  const eventLocationType = getEventLocationType(selectedLocation);
-
-  const defaultLocation = defaultValues?.find(
-    (location: { type: EventLocationType["type"] }) => location.type === eventLocationType?.type
-  );
-
-  const LocationOptions = (() => {
-    if (eventLocationType && eventLocationType.organizerInputType && LocationInput) {
-      if (!eventLocationType.variable) {
-        console.error("eventLocationType.variable can't be undefined");
-        return null;
-      }
-
-      return (
-        <div>
-          <div>
-            <Label htmlFor="locationInput">{t(eventLocationType.messageForOrganizer || "")}</Label>
-            <LocationInput
-              locationFormMethods={locationFormMethods}
-              eventLocationType={eventLocationType}
-              id="locationInput"
-              placeholder={t(eventLocationType.organizerInputPlaceholder || "")}
-              required
-              className="block w-full rounded-md border-gray-300 text-sm"
-              // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-              defaultValue={
-                (defaultLocation && defaultLocation[eventLocationType.defaultValueVariable]) || ""
-              }
-            />
-            <ErrorMessage
-              errors={locationFormMethods.formState.errors}
-              name={eventLocationType.variable}
-              className="mt-1 text-sm text-red-500"
-              as="p"
-            />
-          </div>
-          {!booking && (
-            <div className="mt-3">
-              <Controller
-                name="displayLocationPublicly"
-                control={locationFormMethods.control}
-                render={() => (
-                  <CheckboxField
-                    defaultChecked={defaultLocation?.displayLocationPublicly}
-                    description={t("display_location_label")}
-                    onChange={(e) =>
-                      locationFormMethods.setValue("displayLocationPublicly", e.target.checked)
-                    }
-                    informationIconText={t("display_location_info_badge")}
-                  />
-                )}
-              />
-            </div>
-          )}
-        </div>
-      );
-    } else {
-      return <p className="text-sm">{getMessageForOrganizer(selectedLocation, t)}</p>;
-    }
-  })();
-
-  return (
-    <Dialog open={isOpenDialog}>
-      <DialogContent
-        type="creation"
-        Icon={Icon.FiMapPin}
-        title={t("edit_location")}
-        description={!booking ? t("this_input_will_shown_booking_this_event") : undefined}>
-        {booking && (
-          <>
-            <p className="mt-6 mb-2 ml-1 text-sm font-bold text-black">{t("current_location")}:</p>
-            <p className="mb-2 ml-1 text-sm text-black">
-              {getHumanReadableLocationValue(booking.location, t)}
-            </p>
-          </>
-        )}
-        <Form
-          form={locationFormMethods}
-          className="space-y-4"
-          handleSubmit={async (values) => {
-            const { locationType: newLocation, displayLocationPublicly } = values;
-
-            let details = {};
-            if (newLocation === LocationType.AttendeeInPerson) {
-              details = {
-                address: values.locationAddress,
-              };
-            }
-
-            if (newLocation === LocationType.InPerson) {
-              details = {
-                address: values.locationAddress,
-              };
-            }
-            const eventLocationType = getEventLocationType(newLocation);
-
-            // TODO: There can be a property that tells if it is to be saved in `link`
-            if (
-              newLocation === LocationType.Link ||
-              (!eventLocationType?.default && eventLocationType?.linkType === "static")
-            ) {
-              details = { link: values.locationLink };
-            }
-
-            if (newLocation === LocationType.UserPhone) {
-              details = { hostPhoneNumber: values.locationPhoneNumber };
-            }
-
-            if (eventLocationType?.organizerInputType) {
-              details = {
-                ...details,
-                displayLocationPublicly,
-              };
-            }
-
-            saveLocation(newLocation, details);
-            setShowLocationModal(false);
-            setSelectedLocation?.(undefined);
-            locationFormMethods.unregister([
-              "locationType",
-              "locationLink",
-              "locationAddress",
-              "locationPhoneNumber",
-            ]);
-          }}>
-          <QueryCell
-            query={locationsQuery}
-            success={({ data: locationOptions }) => {
-              if (!locationOptions.length) return null;
-              if (booking) {
-                locationOptions.forEach((location) => {
-                  if (location.label === "phone") {
-                    location.options.filter((l) => l.value !== "phone");
-                  }
-                });
-              }
-              return (
-                <Controller
-                  name="locationType"
-                  control={locationFormMethods.control}
-                  render={() => (
-                    <Select<{ label: string; value: string; icon?: string }>
-                      maxMenuHeight={150}
-                      name="location"
-                      defaultValue={selection}
-                      options={locationOptions}
-                      components={{
-                        Option: (props) => (
-                          <components.Option {...props}>
-                            <div className="flex items-center gap-3">
-                              {props.data.icon && (
-                                <img src={props.data.icon} alt="cover" className="h-3.5 w-3.5" />
-                              )}
-                              <span
-                                className={classNames(
-                                  "text-sm font-medium",
-                                  props.isSelected ? "text-white" : "text-gray-900"
-                                )}>
-                                {props.data.label}
-                              </span>
-                            </div>
-                          </components.Option>
-                        ),
-                      }}
-                      formatOptionLabel={(e) => (
-                        <div className="flex items-center gap-2.5">
-                          {e.icon && <img src={e.icon} alt="app-icon" className="h-5 w-5" />}
-                          <span>{e.label}</span>
-                        </div>
-                      )}
-                      formatGroupLabel={(e) => <p className="text-xs font-medium text-gray-600">{e.label}</p>}
-                      isSearchable={false}
-                      onChange={(val) => {
-                        if (val) {
-                          locationFormMethods.setValue("locationType", val.value);
-                          locationFormMethods.unregister([
-                            "locationLink",
-                            "locationAddress",
-                            "locationPhoneNumber",
-                          ]);
-                          locationFormMethods.clearErrors([
-                            "locationLink",
-                            "locationPhoneNumber",
-                            "locationAddress",
-                          ]);
-                          setSelectedLocation?.(val);
-                        }
-                      }}
-                    />
-                  )}
-                />
-              );
-            }}
-          />
-          {selectedLocation && LocationOptions}
-          <div className="mt-5">
-            <p className="text-sm text-gray-400">
-              <Trans i18nKey="cant_find_the_right_video_app_visit_our_app_store">
-                Can&apos;t find the right video app? Visit our
-                <LinkText href="/apps/categories/video" classNameChildren="text-blue-400" target="_blank">
-                  App Store
-                </LinkText>
-                .
-              </Trans>
-            </p>
-          </div>
-          <div className="mt-4 flex justify-end space-x-2">
-            <Button
-              onClick={() => {
-                setShowLocationModal(false);
-                setSelectedLocation?.(undefined);
-                locationFormMethods.unregister("locationType");
-              }}
-              type="button"
-              color="secondary">
-              {t("cancel")}
-            </Button>
-            <Button type="submit">{t("update")}</Button>
-          </div>
-        </Form>
-      </DialogContent>
-    </Dialog>
-  );
-};

apps/web/components/eventtype/EventAdvancedTab.tsx

@@ -1,6 +1,5 @@
-import { EventTypeCustomInput } from "@prisma/client/";
 import Link from "next/link";
-import { EventTypeSetupInfered, FormValues } from "pages/event-types/[type]";
+import type { CustomInputParsed, EventTypeSetupInfered, FormValues } from "pages/event-types/[type]";
 import { useEffect, useState } from "react";
 import { Controller, useFormContext } from "react-hook-form";
 import short from "short-uuid";
@@ -28,6 +27,8 @@ import {
 
 import CustomInputTypeForm from "@components/eventtype/CustomInputTypeForm";
 
+import RequiresConfirmationController from "./RequiresConfirmationController";
+
 const generateHashedLink = (id: number) => {
   const translator = short();
   const seed = `${id}:${new Date().getTime()}`;
@@ -43,11 +44,12 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupInfered
   const [hashedLinkVisible, setHashedLinkVisible] = useState(!!eventType.hashedLink);
   const [redirectUrlVisible, setRedirectUrlVisible] = useState(!!eventType.successRedirectUrl);
   const [hashedUrl, setHashedUrl] = useState(eventType.hashedLink?.link);
-  const [customInputs, setCustomInputs] = useState<EventTypeCustomInput[]>(
+  const [customInputs, setCustomInputs] = useState<CustomInputParsed[]>(
     eventType.customInputs.sort((a, b) => a.id - b.id) || []
   );
-  const [selectedCustomInput, setSelectedCustomInput] = useState<EventTypeCustomInput | undefined>(undefined);
+  const [selectedCustomInput, setSelectedCustomInput] = useState<CustomInputParsed | undefined>(undefined);
   const [selectedCustomInputModalOpen, setSelectedCustomInputModalOpen] = useState(false);
+  const [requiresConfirmation, setRequiresConfirmation] = useState(eventType.requiresConfirmation);
   const placeholderHashedLink = `${CAL_URL}/d/${hashedUrl}/${eventType.slug}`;
 
   const seatsEnabled = formMethods.getValues("seatsPerTimeSlotEnabled");
@@ -101,7 +103,7 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupInfered
         <TextField
           label={t("event_name")}
           type="text"
-          placeholder={t("meeting_with_user")}
+          placeholder={t("meeting_with_user", { attendeeName: eventType.users[0]?.name })}
           defaultValue={eventType.eventName || ""}
           {...formMethods.register("eventName")}
           addOnSuffix={
@@ -125,15 +127,13 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupInfered
           onCheckedChange={(e) => {
             if (e && customInputs.length === 0) {
               // Push a placeholders
-              setSelectedCustomInput(undefined);
               setSelectedCustomInputModalOpen(true);
             } else if (!e) {
-              setCustomInputs([]);
               formMethods.setValue("customInputs", []);
             }
           }}>
           <ul className="my-4 rounded-md border">
-            {customInputs.map((customInput: EventTypeCustomInput, idx: number) => (
+            {customInputs.map((customInput, idx) => (
               <CustomInputItem
                 key={idx}
                 question={customInput.label}
@@ -162,18 +162,11 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupInfered
         </SettingsToggle>
       </div>
       <hr />
-      <Controller
-        name="requiresConfirmation"
-        defaultValue={eventType.requiresConfirmation}
-        render={({ field: { value, onChange } }) => (
-          <SettingsToggle
-            title={t("requires_confirmation")}
-            description={t("requires_confirmation_description")}
-            checked={value}
-            onCheckedChange={(e) => onChange(e)}
-            disabled={seatsEnabled}
-          />
-        )}
+      <RequiresConfirmationController
+        seatsEnabled={seatsEnabled}
+        metadata={eventType.metadata}
+        requiresConfirmation={requiresConfirmation}
+        onRequiresConfirmation={setRequiresConfirmation}
       />
       <hr />
       <Controller
@@ -309,6 +302,7 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupInfered
               if (e) {
                 formMethods.setValue("disableGuests", true);
                 formMethods.setValue("requiresConfirmation", false);
+                setRequiresConfirmation(false);
                 formMethods.setValue("seatsPerTimeSlot", 2);
               } else {
                 formMethods.setValue("seatsPerTimeSlot", null);
@@ -358,7 +352,7 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupInfered
             <TextField
               label={t("event_name")}
               type="text"
-              placeholder={t("meeting_with_user")}
+              placeholder={t("meeting_with_user", { attendeeName: eventType.users[0]?.name })}
               defaultValue={eventType.eventName || ""}
               {...formMethods.register("eventName")}
             />
@@ -391,24 +385,36 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupInfered
               <CustomInputTypeForm
                 selectedCustomInput={selectedCustomInput}
                 onSubmit={(values) => {
-                  const customInput: EventTypeCustomInput = {
+                  const customInput: CustomInputParsed = {
                     id: -1,
                     eventTypeId: -1,
                     label: values.label,
                     placeholder: values.placeholder,
                     required: values.required,
                     type: values.type,
+                    options: values.options,
                   };
-
                   if (selectedCustomInput) {
                     selectedCustomInput.label = customInput.label;
                     selectedCustomInput.placeholder = customInput.placeholder;
                     selectedCustomInput.required = customInput.required;
                     selectedCustomInput.type = customInput.type;
+                    selectedCustomInput.options = customInput.options || undefined;
+                    // Update by id
+                    const inputIndex = customInputs.findIndex((input) => input.id === values.id);
+                    customInputs[inputIndex] = selectedCustomInput;
+                    setCustomInputs(customInputs);
+                    formMethods.setValue("customInputs", customInputs);
                   } else {
-                    setCustomInputs(customInputs.concat(customInput));
-                    formMethods.setValue("customInputs", customInputs.concat(customInput));
+                    const concatted = customInputs.concat({
+                      ...customInput,
+                      options: customInput.options,
+                    });
+                    console.log(concatted);
+                    setCustomInputs(concatted);
+                    formMethods.setValue("customInputs", concatted);
                   }
+
                   setSelectedCustomInputModalOpen(false);
                 }}
                 onCancel={() => {

apps/web/components/eventtype/EventSetupTab.tsx

@@ -33,22 +33,10 @@ export const EventSetupTab = (
   const [selectedLocation, setSelectedLocation] = useState<OptionTypeBase | undefined>(undefined);
   const [multipleDuration, setMultipleDuration] = useState(eventType.metadata.multipleDuration);
 
-  const multipleDurationOptions = [
-    { value: 5, label: t("multiple_duration_mins", { count: 5 }) },
-    { value: 10, label: t("multiple_duration_mins", { count: 10 }) },
-    { value: 15, label: t("multiple_duration_mins", { count: 15 }) },
-    { value: 20, label: t("multiple_duration_mins", { count: 20 }) },
-    { value: 25, label: t("multiple_duration_mins", { count: 25 }) },
-    { value: 30, label: t("multiple_duration_mins", { count: 30 }) },
-    { value: 45, label: t("multiple_duration_mins", { count: 45 }) },
-    { value: 50, label: t("multiple_duration_mins", { count: 50 }) },
-    { value: 60, label: t("multiple_duration_mins", { count: 60 }) },
-    { value: 75, label: t("multiple_duration_mins", { count: 75 }) },
-    { value: 80, label: t("multiple_duration_mins", { count: 80 }) },
-    { value: 90, label: t("multiple_duration_mins", { count: 90 }) },
-    { value: 120, label: t("multiple_duration_mins", { count: 120 }) },
-    { value: 180, label: t("multiple_duration_mins", { count: 180 }) },
-  ];
+  const multipleDurationOptions = [5, 10, 15, 20, 25, 30, 45, 50, 60, 75, 80, 90, 120, 180].map((mins) => ({
+    value: mins,
+    label: t("multiple_duration_mins", { count: mins }),
+  }));
 
   const [selectedMultipleDuration, setSelectedMultipleDuration] = useState<
     MultiValue<{
@@ -142,6 +130,7 @@ export const EventSetupTab = (
         {validLocations.length === 0 && (
           <div className="flex">
             <Select
+              placeholder={t("select")}
               options={locationOptions}
               isSearchable={false}
               className="block w-full min-w-0 flex-1 rounded-sm text-sm"
@@ -224,7 +213,7 @@ export const EventSetupTab = (
       <div className="space-y-8">
         <TextField
           required
-          label={t("Title")}
+          label={t("title")}
           defaultValue={eventType.title}
           {...formMethods.register("title")}
         />
@@ -261,23 +250,24 @@ export const EventSetupTab = (
                 isSearchable={false}
                 className="h-auto !min-h-[36px] text-sm"
                 options={multipleDurationOptions}
+                value={selectedMultipleDuration}
                 onChange={(options) => {
-                  const values = options
-                    .map((opt) => opt.value)
-                    .sort(function (a, b) {
-                      return a - b;
-                    });
+                  let newOptions = [...options];
+                  newOptions = newOptions.sort((a, b) => {
+                    return a?.value - b?.value;
+                  });
+                  const values = newOptions.map((opt) => opt.value);
                   setMultipleDuration(values);
-                  setSelectedMultipleDuration(options);
-                  if (!options.find((opt) => opt.value === defaultDuration?.value)) {
-                    if (options.length > 0) {
-                      setDefaultDuration(options[0]);
+                  setSelectedMultipleDuration(newOptions);
+                  if (!newOptions.find((opt) => opt.value === defaultDuration?.value)) {
+                    if (newOptions.length > 0) {
+                      setDefaultDuration(newOptions[0]);
                     } else {
                       setDefaultDuration(null);
                     }
                   }
-                  if (options.length === 1 && defaultDuration === null) {
-                    setDefaultDuration(options[0]);
+                  if (newOptions.length === 1 && defaultDuration === null) {
+                    setDefaultDuration(newOptions[0]);
                   }
                   formMethods.setValue("metadata.multipleDuration", values);
                 }}

apps/web/components/eventtype/EventTypeSingleLayout.tsx

@@ -67,7 +67,7 @@ function getNavigation(props: {
       name: "availability",
       href: `/event-types/${eventType.id}?tabName=availability`,
       icon: Icon.FiCalendar,
-      info: `Working Hours`, // TODO: Get this from props
+      info: `default_schedule_name`, // TODO: Get this from props
     },
     {
       name: "event_limit_tab_title",

apps/web/components/eventtype/RequiresConfirmationController.tsx

@@ -0,0 +1,156 @@
+import * as RadioGroup from "@radix-ui/react-radio-group";
+import { UnitTypeLongPlural } from "dayjs";
+import { Trans } from "next-i18next";
+import type { FormValues } from "pages/event-types/[type]";
+import { Dispatch, SetStateAction, useEffect, useState } from "react";
+import { Controller, useFormContext } from "react-hook-form";
+import z from "zod";
+
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
+import { Alert, Input, Label, SettingsToggle } from "@calcom/ui";
+
+type RequiresConfirmationControllerProps = {
+  metadata: z.infer<typeof EventTypeMetaDataSchema>;
+  requiresConfirmation: boolean;
+  onRequiresConfirmation: Dispatch<SetStateAction<boolean>>;
+  seatsEnabled: boolean;
+};
+
+export default function RequiresConfirmationController({
+  metadata,
+  requiresConfirmation,
+  onRequiresConfirmation,
+  seatsEnabled,
+}: RequiresConfirmationControllerProps) {
+  const { t } = useLocale();
+  const [requiresConfirmationSetup, setRequiresConfirmationSetup] = useState(
+    metadata?.requiresConfirmationThreshold
+  );
+  const defaultRequiresConfirmationSetup = { time: 30, unit: "minutes" as UnitTypeLongPlural };
+  const formMethods = useFormContext<FormValues>();
+
+  useEffect(() => {
+    if (!requiresConfirmation) {
+      formMethods.setValue("metadata.requiresConfirmationThreshold", undefined);
+    }
+  }, [requiresConfirmation]);
+
+  return (
+    <div className="block items-start sm:flex">
+      <div className={!seatsEnabled ? "w-full" : ""}>
+        {seatsEnabled ? (
+          <Alert severity="warning" title="Seats option doesn't support confirmation requirement" />
+        ) : (
+          <Controller
+            name="requiresConfirmation"
+            control={formMethods.control}
+            render={() => (
+              <SettingsToggle
+                title={t("requires_confirmation")}
+                description={t("requires_confirmation_description")}
+                checked={requiresConfirmation}
+                onCheckedChange={(val) => {
+                  formMethods.setValue("requiresConfirmation", val);
+                  onRequiresConfirmation(val);
+                }}>
+                <RadioGroup.Root
+                  defaultValue={
+                    requiresConfirmation
+                      ? requiresConfirmationSetup === undefined
+                        ? "always"
+                        : "notice"
+                      : undefined
+                  }
+                  onValueChange={(val) => {
+                    if (val === "always") {
+                      formMethods.setValue("requiresConfirmation", true);
+                      onRequiresConfirmation(true);
+                      formMethods.setValue("metadata.requiresConfirmationThreshold", undefined);
+                      setRequiresConfirmationSetup(undefined);
+                    } else if (val === "notice") {
+                      formMethods.setValue("requiresConfirmation", true);
+                      onRequiresConfirmation(true);
+                      formMethods.setValue(
+                        "metadata.requiresConfirmationThreshold",
+                        requiresConfirmationSetup || defaultRequiresConfirmationSetup
+                      );
+                    }
+                  }}>
+                  <div className="-ml-2 flex flex-col flex-wrap justify-start gap-y-2 space-y-2">
+                    <div className="flex items-center">
+                      <RadioGroup.Item
+                        id="always"
+                        value="always"
+                        className="min-w-4 flex h-4 w-4 cursor-pointer items-center rounded-full border border-black bg-white focus:border-2 focus:outline-none ltr:mr-2 rtl:ml-2">
+                        <RadioGroup.Indicator className="relative flex h-4 w-4 items-center justify-center after:block after:h-2 after:w-2 after:rounded-full after:bg-black" />
+                      </RadioGroup.Item>
+                      <Label htmlFor="always" className="!m-0 flex items-center">
+                        {t("always_requires_confirmation")}
+                      </Label>
+                    </div>
+                    <div className="flex items-center">
+                      <RadioGroup.Item
+                        id="notice"
+                        value="notice"
+                        className="min-w-4 flex h-4 w-4 cursor-pointer items-center rounded-full border border-black bg-white focus:border-2 focus:outline-none ltr:mr-2 rtl:ml-2">
+                        <RadioGroup.Indicator className="relative flex h-4 w-4 items-center justify-center after:block after:h-2 after:w-2 after:rounded-full after:bg-black" />
+                      </RadioGroup.Item>
+                      <Label htmlFor="notice" className="!m-0 flex items-center">
+                        <Trans
+                          i18nKey="when_booked_with_less_than_notice"
+                          defaults="When booked with less than <time></time> notice"
+                          components={{
+                            time: (
+                              <div className="mx-2 flex">
+                                <Input
+                                  type="number"
+                                  min={1}
+                                  onChange={(evt) => {
+                                    const val = Number(evt.target?.value);
+                                    setRequiresConfirmationSetup({
+                                      unit:
+                                        requiresConfirmationSetup?.unit ??
+                                        defaultRequiresConfirmationSetup.unit,
+                                      time: val,
+                                    });
+                                    formMethods.setValue("metadata.requiresConfirmationThreshold.time", val);
+                                  }}
+                                  className="!m-0 block w-16 rounded-md border-gray-300 text-sm [appearance:textfield]"
+                                  defaultValue={metadata?.requiresConfirmationThreshold?.time || 30}
+                                />
+                                <select
+                                  onChange={(evt) => {
+                                    const val = evt.target.value as UnitTypeLongPlural;
+                                    setRequiresConfirmationSetup({
+                                      time:
+                                        requiresConfirmationSetup?.time ??
+                                        defaultRequiresConfirmationSetup.time,
+                                      unit: val,
+                                    });
+                                    formMethods.setValue("metadata.requiresConfirmationThreshold.unit", val);
+                                  }}
+                                  className="ml-2 block h-9 rounded-md border-gray-300 py-2 pl-3 pr-10 text-sm focus:outline-none"
+                                  defaultValue={
+                                    metadata?.requiresConfirmationThreshold?.unit ||
+                                    defaultRequiresConfirmationSetup.unit
+                                  }>
+                                  <option value="minutes">{t("minute_timeUnit")}</option>
+                                  <option value="hours">{t("hour_timeUnit")}</option>
+                                </select>
+                              </div>
+                            ),
+                          }}
+                        />
+                      </Label>
+                    </div>
+                  </div>
+                </RadioGroup.Root>
+              </SettingsToggle>
+            )}
+          />
+        )}
+      </div>
+    </div>
+  );
+}

apps/web/components/getting-started/steps-views/UserProfile.tsx

@@ -4,21 +4,20 @@ import { FormEvent, useRef, useState } from "react";
 import { useForm } from "react-hook-form";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { User } from "@calcom/prisma/client";
 import { trpc } from "@calcom/trpc/react";
 import { Button, ImageUploader, showToast, TextArea } from "@calcom/ui";
+import { Avatar } from "@calcom/ui";
 
-import { AvatarSSR } from "@components/ui/AvatarSSR";
-
-interface IUserProfile {
-  user?: User;
-}
+import type { IOnboardingPageProps } from "../../../pages/getting-started/[[...step]]";
 
 type FormData = {
   bio: string;
 };
+interface IUserProfileProps {
+  user: IOnboardingPageProps["user"];
+}
 
-const UserProfile = (props: IUserProfile) => {
+const UserProfile = (props: IUserProfileProps) => {
   const { user } = props;
   const { t } = useLocale();
   const avatarRef = useRef<HTMLInputElement>(null!);
@@ -100,7 +99,14 @@ const UserProfile = (props: IUserProfile) => {
   return (
     <form onSubmit={onSubmit}>
       <div className="flex flex-row items-center justify-start rtl:justify-end">
-        {user && <AvatarSSR user={user} alt="Profile picture" className="h-16 w-16" />}
+        {user && (
+          <Avatar
+            alt={user.username || "user avatar"}
+            gravatarFallbackMd5={user.emailMd5}
+            size="lg"
+            imageSrc={imageSrc}
+          />
+        )}
         <input
           ref={avatarRef}
           type="hidden"

apps/web/components/getting-started/steps-views/UserSettings.tsx

@@ -1,17 +1,18 @@
 import { ArrowRightIcon } from "@heroicons/react/outline";
 import { useState } from "react";
-import { Controller, useForm } from "react-hook-form";
+import { useForm } from "react-hook-form";
 
 import dayjs from "@calcom/dayjs";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { User } from "@calcom/prisma/client";
 import { trpc } from "@calcom/trpc/react";
 import { Button, TimezoneSelect } from "@calcom/ui";
 
-import { UsernameAvailability } from "@components/ui/UsernameAvailability";
+import { UsernameAvailabilityField } from "@components/ui/UsernameAvailability";
+
+import type { IOnboardingPageProps } from "../../../pages/getting-started/[[...step]]";
 
 interface IUserSettingsProps {
-  user: User;
+  user: IOnboardingPageProps["user"];
   nextStep: () => void;
 }
 
@@ -23,11 +24,9 @@ const UserSettings = (props: IUserSettingsProps) => {
     register,
     handleSubmit,
     formState: { errors },
-    control,
   } = useForm({
     defaultValues: {
       name: user?.name || "",
-      username: user?.username || "",
     },
     reValidateMode: "onChange",
   });
@@ -41,39 +40,19 @@ const UserSettings = (props: IUserSettingsProps) => {
   const mutation = trpc.viewer.updateProfile.useMutation({
     onSuccess: onSuccess,
   });
-  const { data: stripeCustomer } = trpc.viewer.stripeCustomer.useQuery();
-  const paymentRequired = stripeCustomer?.isPremium ? !stripeCustomer?.paidForPremium : false;
+
   const onSubmit = handleSubmit((data) => {
-    if (paymentRequired) {
-      return;
-    }
     mutation.mutate({
       name: data.name,
       timeZone: selectedTimeZone,
     });
   });
 
-  const [currentUsername, setCurrentUsername] = useState(user.username || "");
-
   return (
     <form onSubmit={onSubmit}>
       <div className="space-y-6">
         {/* Username textfield */}
-        <Controller
-          control={control}
-          name="username"
-          render={({ field: { value, ref, onChange } }) => (
-            <UsernameAvailability
-              readonly={true}
-              currentUsername={currentUsername}
-              setCurrentUsername={setCurrentUsername}
-              inputUsernameValue={value}
-              usernameRef={ref}
-              setInputUsernameValue={onChange}
-              user={user}
-            />
-          )}
-        />
+        <UsernameAvailabilityField user={user} />
 
         {/* Full name textfield */}
         <div className="w-full">

apps/web/components/pages/eventtypes/CustomInputTypeForm.tsx

@@ -1,134 +0,0 @@
-import { EventTypeCustomInput, EventTypeCustomInputType } from "@prisma/client";
-import React, { FC } from "react";
-import { Controller, SubmitHandler, useForm, useWatch } from "react-hook-form";
-
-import { Button } from "@calcom/ui";
-
-import { useLocale } from "@lib/hooks/useLocale";
-
-import Select from "@components/ui/form/Select";
-
-interface OptionTypeBase {
-  label: string;
-  value: EventTypeCustomInputType;
-}
-
-interface Props {
-  onSubmit: SubmitHandler<IFormInput>;
-  onCancel: () => void;
-  selectedCustomInput?: EventTypeCustomInput;
-}
-
-type IFormInput = EventTypeCustomInput;
-
-const CustomInputTypeForm: FC<Props> = (props) => {
-  const { t } = useLocale();
-  const inputOptions: OptionTypeBase[] = [
-    { value: EventTypeCustomInputType.TEXT, label: t("text") },
-    { value: EventTypeCustomInputType.TEXTLONG, label: t("multiline_text") },
-    { value: EventTypeCustomInputType.NUMBER, label: t("number") },
-    { value: EventTypeCustomInputType.BOOL, label: t("checkbox") },
-  ];
-  const { selectedCustomInput } = props;
-  const defaultValues = selectedCustomInput || { type: inputOptions[0].value };
-  const { register, control, handleSubmit } = useForm<IFormInput>({
-    defaultValues,
-  });
-  const selectedInputType = useWatch({ name: "type", control });
-  const selectedInputOption = inputOptions.find((e) => selectedInputType === e.value);
-
-  const onCancel = () => {
-    props.onCancel();
-  };
-
-  return (
-    <form onSubmit={handleSubmit(props.onSubmit)}>
-      <div className="mb-2">
-        <label htmlFor="type" className="block text-sm font-medium text-gray-700">
-          {t("input_type")}
-        </label>
-        <Controller
-          name="type"
-          control={control}
-          render={({ field }) => (
-            <Select
-              id="type"
-              defaultValue={selectedInputOption}
-              options={inputOptions}
-              isSearchable={false}
-              className="mt-1 mb-2 block w-full min-w-0 flex-1  text-sm"
-              onChange={(option) => option && field.onChange(option.value)}
-              value={selectedInputOption}
-              onBlur={field.onBlur}
-              name={field.name}
-            />
-          )}
-        />
-      </div>
-      <div className="mb-2">
-        <label htmlFor="label" className="block text-sm font-medium text-gray-700">
-          {t("label")}
-        </label>
-        <div className="mt-1">
-          <input
-            type="text"
-            id="label"
-            required
-            className="block w-full rounded-sm border-gray-300 text-sm"
-            defaultValue={selectedCustomInput?.label}
-            {...register("label", { required: true })}
-          />
-        </div>
-      </div>
-      {(selectedInputType === EventTypeCustomInputType.TEXT ||
-        selectedInputType === EventTypeCustomInputType.TEXTLONG) && (
-        <div className="mb-2">
-          <label htmlFor="placeholder" className="block text-sm font-medium text-gray-700">
-            {t("placeholder")}
-          </label>
-          <div className="mt-1">
-            <input
-              type="text"
-              id="placeholder"
-              className="block w-full rounded-sm border-gray-300 text-sm"
-              defaultValue={selectedCustomInput?.placeholder}
-              {...register("placeholder")}
-            />
-          </div>
-        </div>
-      )}
-      <div className="flex h-5 items-center">
-        <input
-          id="required"
-          type="checkbox"
-          className="text-primary-600 focus:ring-primary-500 h-4 w-4 rounded border-gray-300 ltr:mr-2 rtl:ml-2"
-          defaultChecked={selectedCustomInput?.required ?? true}
-          {...register("required")}
-        />
-        <label htmlFor="required" className="block text-sm font-medium text-gray-700">
-          {t("is_required")}
-        </label>
-      </div>
-      <input
-        type="hidden"
-        id="eventTypeId"
-        value={selectedCustomInput?.eventTypeId || -1}
-        {...register("eventTypeId", { valueAsNumber: true })}
-      />
-      <input
-        type="hidden"
-        id="id"
-        value={selectedCustomInput?.id || -1}
-        {...register("id", { valueAsNumber: true })}
-      />
-      <div className="mt-5 flex space-x-2 sm:mt-4">
-        <Button onClick={onCancel} type="button" color="secondary" className="ltr:mr-2">
-          {t("cancel")}
-        </Button>
-        <Button type="submit">{t("save")}</Button>
-      </div>
-    </form>
-  );
-};
-
-export default CustomInputTypeForm;

apps/web/components/schemas/EventReservationSchema.tsx

@@ -0,0 +1,73 @@
+import type { Attendee, Booking, User } from "@prisma/client";
+import type { FC } from "react";
+import { useMemo } from "react";
+import { JsonLd } from "react-schemaorg";
+import type { EventReservation, Person, ReservationStatusType } from "schema-dts";
+
+type EventSchemaUser = Pick<User, "name" | "email">;
+type EventSchemaAttendee = Pick<Attendee, "name" | "email">;
+
+interface EventReservationSchemaInterface {
+  reservationId: Booking["uid"];
+  eventName: Booking["title"];
+  startTime: Booking["startTime"];
+  endTime: Booking["endTime"];
+  organizer: EventSchemaUser | null;
+  attendees: EventSchemaAttendee[];
+  location: Booking["location"];
+  description: Booking["description"];
+  status: Booking["status"];
+}
+
+const EventReservationSchema: FC<EventReservationSchemaInterface> = ({
+  reservationId,
+  eventName,
+  startTime,
+  endTime,
+  organizer,
+  attendees,
+  location,
+  description,
+  status,
+}) => {
+  const reservationStatus = useMemo<ReservationStatusType>(() => {
+    switch (status) {
+      case "ACCEPTED":
+        return "ReservationConfirmed";
+      case "REJECTED":
+      case "CANCELLED":
+        return "ReservationCancelled";
+      case "PENDING":
+        return "ReservationPending";
+      default:
+        return "ReservationHold";
+    }
+  }, [status]);
+
+  return (
+    <JsonLd<EventReservation>
+      item={{
+        "@context": "https://schema.org",
+        "@type": "EventReservation",
+        reservationId,
+        reservationStatus,
+        reservationFor: {
+          "@type": "Event",
+          name: eventName,
+          startDate: startTime.toString(),
+          endDate: endTime.toString(),
+          organizer: organizer
+            ? ({ "@type": "Person", name: organizer.name, email: organizer.email } as Person)
+            : undefined,
+          attendee: attendees?.map(
+            (person) => ({ "@type": "Person", name: person.name, email: person.email } as Person)
+          ),
+          location: location || undefined,
+          description: description || undefined,
+        },
+      }}
+    />
+  );
+};
+
+export default EventReservationSchema;

apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsx

@@ -3,7 +3,7 @@ import { debounce, noop } from "lodash";
 import { useRouter } from "next/router";
 import { RefCallback, useEffect, useMemo, useState } from "react";
 
-import { getPremiumPlanMode, getPremiumPlanPriceValue } from "@calcom/app-store/stripepayment/lib/utils";
+import { getPremiumPlanPriceValue } from "@calcom/app-store/stripepayment/lib/utils";
 import { fetchUsername } from "@calcom/lib/fetchUsername";
 import hasKeyInMetadata from "@calcom/lib/hasKeyInMetadata";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -24,9 +24,7 @@ import {
 } from "@calcom/ui";
 
 export enum UsernameChangeStatusEnum {
-  NORMAL = "NORMAL",
   UPGRADE = "UPGRADE",
-  DOWNGRADE = "DOWNGRADE",
 }
 
 interface ICustomUsernameProps {
@@ -37,43 +35,21 @@ interface ICustomUsernameProps {
   setInputUsernameValue: (value: string) => void;
   onSuccessMutation?: () => void;
   onErrorMutation?: (error: TRPCClientErrorLike<AppRouter>) => void;
-  user: Pick<
-    User,
-    | "username"
-    | "name"
-    | "email"
-    | "bio"
-    | "avatar"
-    | "timeZone"
-    | "weekStart"
-    | "hideBranding"
-    | "theme"
-    | "plan"
-    | "brandColor"
-    | "darkBrandColor"
-    | "timeFormat"
-    | "metadata"
-  >;
+  user: Pick<User, "username" | "metadata">;
   readonly?: boolean;
 }
 
 const obtainNewUsernameChangeCondition = ({
   userIsPremium,
   isNewUsernamePremium,
-  stripeCustomer,
 }: {
   userIsPremium: boolean;
   isNewUsernamePremium: boolean;
   stripeCustomer: RouterOutputs["viewer"]["stripeCustomer"] | undefined;
 }) => {
-  if (!userIsPremium && isNewUsernamePremium && !stripeCustomer?.paidForPremium) {
+  if (!userIsPremium && isNewUsernamePremium) {
     return UsernameChangeStatusEnum.UPGRADE;
   }
-
-  if (userIsPremium && !isNewUsernamePremium && getPremiumPlanMode() === "subscription") {
-    return UsernameChangeStatusEnum.DOWNGRADE;
-  }
-  return UsernameChangeStatusEnum.NORMAL;
 };
 
 const PremiumTextfield = (props: ICustomUsernameProps) => {
@@ -106,7 +82,7 @@ const PremiumTextfield = (props: ICustomUsernameProps) => {
         setIsInputUsernamePremium(data.premium);
         setUsernameIsAvailable(data.available);
       }, 150),
-    []
+    [currentUsername]
   );
 
   useEffect(() => {
@@ -137,7 +113,7 @@ const PremiumTextfield = (props: ICustomUsernameProps) => {
   });
 
   // when current username isn't set - Go to stripe to check what username he wanted to buy and was it a premium and was it paid for
-  const paymentRequired = !currentUsername && stripeCustomer?.isPremium && !stripeCustomer?.paidForPremium;
+  const paymentRequired = !currentUsername && stripeCustomer?.isPremium;
 
   const usernameChangeCondition = obtainNewUsernameChangeCondition({
     userIsPremium: isCurrentUsernamePremium,
@@ -194,7 +170,7 @@ const PremiumTextfield = (props: ICustomUsernameProps) => {
   };
 
   const saveUsername = () => {
-    if (usernameChangeCondition === UsernameChangeStatusEnum.NORMAL) {
+    if (usernameChangeCondition !== UsernameChangeStatusEnum.UPGRADE) {
       updateUsername.mutate({
         username: inputUsernameValue,
       });
@@ -279,14 +255,6 @@ const PremiumTextfield = (props: ICustomUsernameProps) => {
       {paymentMsg}
       {markAsError && <p className="mt-1 text-xs text-red-500">Username is already taken</p>}
 
-      {usernameIsAvailable && (
-        <p className={classNames("mt-1 text-xs text-gray-900")}>
-          {usernameChangeCondition === UsernameChangeStatusEnum.DOWNGRADE && (
-            <>{t("premium_to_standard_username_description")}</>
-          )}
-        </p>
-      )}
-
       <Dialog open={openDialogSaveUsername}>
         <DialogContent>
           <div className="flex flex-row">
@@ -295,13 +263,8 @@ const PremiumTextfield = (props: ICustomUsernameProps) => {
             </div>
             <div className="mb-4 w-full px-4 pt-1">
               <DialogHeader title={t("confirm_username_change_dialog_title")} />
-              {usernameChangeCondition && usernameChangeCondition !== UsernameChangeStatusEnum.NORMAL && (
-                <p className="-mt-4 mb-4 text-sm text-gray-800">
-                  {usernameChangeCondition === UsernameChangeStatusEnum.UPGRADE &&
-                    t("change_username_standard_to_premium")}
-                  {usernameChangeCondition === UsernameChangeStatusEnum.DOWNGRADE &&
-                    t("change_username_premium_to_standard")}
-                </p>
+              {usernameChangeCondition && usernameChangeCondition === UsernameChangeStatusEnum.UPGRADE && (
+                <p className="mb-4 text-sm text-gray-800">{t("change_username_standard_to_premium")}</p>
               )}
 
               <div className="flex w-full flex-wrap rounded-sm bg-gray-100 py-3 text-sm">
@@ -323,8 +286,7 @@ const PremiumTextfield = (props: ICustomUsernameProps) => {
 
           <div className="mt-4 flex flex-row-reverse gap-x-2">
             {/* redirect to checkout */}
-            {(usernameChangeCondition === UsernameChangeStatusEnum.UPGRADE ||
-              usernameChangeCondition === UsernameChangeStatusEnum.DOWNGRADE) && (
+            {usernameChangeCondition === UsernameChangeStatusEnum.UPGRADE && (
               <Button
                 type="button"
                 loading={updateUsername.isLoading}
@@ -336,7 +298,7 @@ const PremiumTextfield = (props: ICustomUsernameProps) => {
               </Button>
             )}
             {/* Normal save */}
-            {usernameChangeCondition === UsernameChangeStatusEnum.NORMAL && (
+            {usernameChangeCondition !== UsernameChangeStatusEnum.UPGRADE && (
               <Button
                 type="button"
                 loading={updateUsername.isLoading}

apps/web/components/ui/UsernameAvailability/UsernameTextfield.tsx

@@ -124,6 +124,7 @@ const UsernameTextfield = (props: ICustomUsernameProps) => {
           <Input
             ref={usernameRef}
             name="username"
+            value={inputUsernameValue}
             autoComplete="none"
             autoCapitalize="none"
             autoCorrect="none"
@@ -133,7 +134,6 @@ const UsernameTextfield = (props: ICustomUsernameProps) => {
                 ? "focus:shadow-0 focus:ring-shadow-0 border-red-500 focus:border-red-500 focus:outline-none focus:ring-0"
                 : ""
             )}
-            defaultValue={currentUsername}
             onChange={(event) => {
               event.preventDefault();
               setInputUsernameValue(event.target.value);

apps/web/components/ui/UsernameAvailability/index.tsx

@@ -1,6 +1,51 @@
+import { useState } from "react";
+import { Controller, useForm } from "react-hook-form";
+
 import { IS_SELF_HOSTED } from "@calcom/lib/constants";
+import { User } from "@calcom/prisma/client";
+import { TRPCClientErrorLike } from "@calcom/trpc/client";
+import { AppRouter } from "@calcom/trpc/server/routers/_app";
 
 import { PremiumTextfield } from "./PremiumTextfield";
 import { UsernameTextfield } from "./UsernameTextfield";
 
 export const UsernameAvailability = IS_SELF_HOSTED ? UsernameTextfield : PremiumTextfield;
+
+interface UsernameAvailabilityFieldProps {
+  onSuccessMutation?: () => void;
+  onErrorMutation?: (error: TRPCClientErrorLike<AppRouter>) => void;
+  user: Pick<User, "username" | "metadata">;
+}
+export const UsernameAvailabilityField = ({
+  onSuccessMutation,
+  onErrorMutation,
+  user,
+}: UsernameAvailabilityFieldProps) => {
+  const [currentUsername, setCurrentUsername] = useState(user.username ?? "");
+  const formMethods = useForm({
+    defaultValues: {
+      username: currentUsername,
+    },
+  });
+
+  return (
+    <Controller
+      control={formMethods.control}
+      name="username"
+      render={({ field: { ref, onChange, value } }) => {
+        return (
+          <UsernameAvailability
+            currentUsername={currentUsername}
+            setCurrentUsername={setCurrentUsername}
+            inputUsernameValue={value}
+            usernameRef={ref}
+            setInputUsernameValue={onChange}
+            onSuccessMutation={onSuccessMutation}
+            onErrorMutation={onErrorMutation}
+            user={user}
+          />
+        );
+      }}
+    />
+  );
+};

apps/web/lib/hooks/useExposePlanGlobally.ts

@@ -1,12 +0,0 @@
-import { UserPlan } from "@prisma/client";
-
-/**
- * TODO: It should be exposed at a single place.
- */
-export function useExposePlanGlobally(plan: UserPlan) {
-  // Don't wait for component to mount. Do it ASAP. Delaying it would delay UI Configuration.
-  if (typeof window !== "undefined") {
-    // This variable is used by embed-iframe to determine if we should allow UI configuration
-    window.CalComPlan = plan;
-  }
-}

apps/web/lib/isBrandingHidden.tsx

@@ -1,5 +1,3 @@
-import { User } from "@prisma/client";
-
-export function isBrandingHidden<TUser extends Pick<User, "hideBranding" | "plan">>(user: TUser) {
-  return user.hideBranding && user.plan !== "FREE";
+export function isBrandingHidden(hideBrandingSetting: boolean, belongsToActiveTeam: boolean) {
+  return belongsToActiveTeam && hideBrandingSetting;
 }

apps/web/lib/withEmbedSsr.tsx

@@ -7,6 +7,29 @@ export type EmbedProps = {
 export default function withEmbedSsr(getServerSideProps: GetServerSideProps) {
   return async (context: GetServerSidePropsContext): Promise<GetServerSidePropsResult<EmbedProps>> => {
     const ssrResponse = await getServerSideProps(context);
+    const embed = context.query.embed;
+
+    if ("redirect" in ssrResponse) {
+      // Use a dummy URL https://base as the fallback base URL so that URL parsing works for relative URLs as well.
+      const destinationUrlObj = new URL(ssrResponse.redirect.destination, "https://base");
+
+      // Make sure that redirect happens to /embed page and pass on embed query param as is for preserving Cal JS API namespace
+      const newDestinationUrl =
+        destinationUrlObj.pathname +
+        "/embed?" +
+        destinationUrlObj.searchParams.toString() +
+        "&embed=" +
+        embed;
+
+      return {
+        ...ssrResponse,
+        redirect: {
+          ...ssrResponse.redirect,
+          destination: newDestinationUrl,
+        },
+      };
+    }
+
     if (!("props" in ssrResponse)) {
       return ssrResponse;
     }

apps/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calcom/web",
-  "version": "2.3.4",
+  "version": "2.3.7",
   "private": true,
   "scripts": {
     "analyze": "ANALYZE=true next build",
@@ -107,12 +107,14 @@
     "react-live-chat-loader": "^2.7.3",
     "react-multi-email": "^0.5.3",
     "react-phone-number-input": "^3.2.7",
+    "react-schemaorg": "^2.0.0",
     "react-select": "^5.4.0",
     "react-timezone-select": "^1.3.2",
     "react-use-intercom": "1.5.1",
     "react-virtualized-auto-sizer": "^1.0.6",
     "react-window": "^1.8.7",
     "rrule": "^2.7.1",
+    "schema-dts": "^1.1.0",
     "short-uuid": "^4.2.0",
     "stripe": "^9.16.0",
     "superjson": "1.9.1",

apps/web/pages/500.tsx

@@ -1,9 +1,12 @@
 import Head from "next/head";
 
 import { APP_NAME, WEBSITE_URL } from "@calcom/lib/constants";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Button } from "@calcom/ui";
 
 export default function Error500() {
+  const { t } = useLocale();
+
   return (
     <div className="flex h-screen">
       <Head>
@@ -24,7 +27,7 @@ export default function Error500() {
           Something went wrong on our end. Get in touch with our support team, and we’ll get it fixed right
           away for you.
         </p>
-        <Button href={`${WEBSITE_URL}/support`}>Contact support</Button>
+        <Button href={`${WEBSITE_URL}/support`}>{t("contact_support")}</Button>
         <Button color="secondary" href="javascript:history.back()" className="ml-2">
           Go back
         </Button>

apps/web/pages/[user].tsx

@@ -28,7 +28,6 @@ import { baseEventTypeSelect } from "@calcom/prisma/selects";
 import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
 import { BadgeCheckIcon, EventTypeDescriptionLazy as EventTypeDescription, Icon } from "@calcom/ui";
 
-import { useExposePlanGlobally } from "@lib/hooks/useExposePlanGlobally";
 import { inferSSRProps } from "@lib/types/inferSSRProps";
 import { EmbedProps } from "@lib/withEmbedSsr";
 
@@ -92,7 +91,6 @@ export default function User(props: inferSSRProps<typeof getServerSideProps> & E
   const shouldAlignCentrally = !isEmbed || shouldAlignCentrallyInEmbed;
   const query = { ...router.query };
   delete query.user; // So it doesn't display in the Link (and make tests fail)
-  useExposePlanGlobally("PRO");
   const nameOrUsername = user.name || user.username || "";
   const telemetry = useTelemetry();
 
@@ -272,7 +270,6 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
       darkBrandColor: true,
       avatar: true,
       theme: true,
-      plan: true,
       away: true,
       verified: true,
       allowDynamicBooking: true,

apps/web/pages/[user]/[type].tsx

@@ -10,8 +10,9 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent";
 import prisma from "@calcom/prisma";
 import { User } from "@calcom/prisma/client";
-import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
+import { EventTypeMetaDataSchema, teamMetadataSchema } from "@calcom/prisma/zod-utils";
 
+import { isBrandingHidden } from "@lib/isBrandingHidden";
 import { inferSSRProps } from "@lib/types/inferSSRProps";
 import { EmbedProps } from "@lib/withEmbedSsr";
 
@@ -71,7 +72,6 @@ async function getUserPageProps(context: GetStaticPropsContext) {
       id: true,
       username: true,
       away: true,
-      plan: true,
       name: true,
       hideBranding: true,
       timeZone: true,
@@ -110,6 +110,11 @@ async function getUserPageProps(context: GetStaticPropsContext) {
           },
         ],
       },
+      teams: {
+        include: {
+          team: true,
+        },
+      },
     },
   });
 
@@ -121,10 +126,10 @@ async function getUserPageProps(context: GetStaticPropsContext) {
     "strikethrough",
   ]);
 
-  if (!user || !user.eventTypes) return { notFound: true };
+  if (!user || !user.eventTypes.length) return { notFound: true };
 
   const [eventType]: (typeof user.eventTypes[number] & {
-    users: Pick<User, "name" | "username" | "hideBranding" | "plan" | "timeZone">[];
+    users: Pick<User, "name" | "username" | "hideBranding" | "timeZone">[];
   })[] = [
     {
       ...user.eventTypes[0],
@@ -133,7 +138,6 @@ async function getUserPageProps(context: GetStaticPropsContext) {
           name: user.name,
           username: user.username,
           hideBranding: user.hideBranding,
-          plan: user.plan,
           timeZone: user.timeZone,
         },
       ],
@@ -150,6 +154,13 @@ async function getUserPageProps(context: GetStaticPropsContext) {
     locations: privacyFilteredLocations(locations),
     descriptionAsSafeHTML: eventType.description ? md.render(eventType.description) : null,
   });
+  // Check if the user you are logging into has any active teams
+  const hasActiveTeam =
+    user.teams.filter((m) => {
+      const metadata = teamMetadataSchema.safeParse(m.team.metadata);
+      if (metadata.success && metadata.data?.subscriptionId) return false;
+      return true;
+    }).length > 0;
 
   return {
     props: {
@@ -167,6 +178,7 @@ async function getUserPageProps(context: GetStaticPropsContext) {
       away: user?.away,
       isDynamic: false,
       trpcState: ssg.dehydrate(),
+      isBrandingHidden: isBrandingHidden(user.hideBranding, hasActiveTeam),
     },
     revalidate: 10, // seconds
   };
@@ -212,7 +224,6 @@ async function getDynamicGroupPageProps(context: GetStaticPropsContext) {
         },
       },
       theme: true,
-      plan: true,
     },
   });
 
@@ -232,7 +243,6 @@ async function getDynamicGroupPageProps(context: GetStaticPropsContext) {
         name: user.name,
         username: user.username,
         hideBranding: user.hideBranding,
-        plan: user.plan,
         timeZone: user.timeZone,
       };
     }),
@@ -262,6 +272,7 @@ async function getDynamicGroupPageProps(context: GetStaticPropsContext) {
       isDynamic: true,
       away: false,
       trpcState: ssg.dehydrate(),
+      isBrandingHidden: false, // I think we should always show branding for dynamic groups - saves us checking every single user
     },
     revalidate: 10, // seconds
   };

apps/web/pages/[user]/book.tsx

@@ -12,7 +12,7 @@ import {
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { bookEventTypeSelect } from "@calcom/prisma";
 import prisma from "@calcom/prisma";
-import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
+import { customInputSchema, EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
 
 import { asStringOrNull, asStringOrThrow } from "@lib/asStringOrNull";
 import getBooking, { GetBookingType } from "@lib/getBooking";
@@ -127,6 +127,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
       periodStartDate: e.periodStartDate?.toString() ?? null,
       periodEndDate: e.periodEndDate?.toString() ?? null,
       schedulingType: null,
+      customInputs: customInputSchema.array().parse(e.customInputs || []),
       users: users.map((u) => ({
         id: u.id,
         name: u.name,

apps/web/pages/_app.tsx

@@ -1,5 +1,6 @@
 import { DefaultSeo } from "next-seo";
 import Head from "next/head";
+import Script from "next/script";
 import superjson from "superjson";
 
 import "@calcom/embed-core/src/embed-iframe";
@@ -36,8 +37,11 @@ function MyApp(props: AppProps) {
     <AppProviders {...props}>
       <DefaultSeo {...seoConfig.defaultNextSeo} />
       <I18nLanguageHandler />
+      <Script
+        id="page-status"
+        dangerouslySetInnerHTML={{ __html: `window.CalComPageStatus = '${pageStatus}'` }}
+      />
       <Head>
-        <script dangerouslySetInnerHTML={{ __html: `window.CalComPageStatus = '${pageStatus}'` }} />
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
       </Head>
       {getLayout(

apps/web/pages/_document.tsx

@@ -1,12 +1,12 @@
 import Document, { DocumentContext, Head, Html, Main, NextScript, DocumentProps } from "next/document";
+import Script from "next/script";
 
 type Props = Record<string, unknown> & DocumentProps;
 
 function toRunBeforeReactOnClient() {
-  const calEmbedMode =
-    location.search.includes("embed=") ||
-    /* Iframe Name */
-    window.name.includes("cal-embed");
+  const calEmbedMode = typeof new URL(document.URL).searchParams.get("embed") === "string";
+  /* Iframe Name */
+  window.name.includes("cal-embed");
 
   window.isEmbed = () => {
     // Once an embed mode always an embed mode
@@ -70,7 +70,9 @@ class MyDocument extends Document<Props> {
           {/* Define isEmbed here so that it can be shared with App(embed-iframe) as well as the following code to change background and hide body
             Persist the embed mode in sessionStorage because query param might get lost during browsing.
           */}
-          <script
+          <Script
+            id="run-before-client"
+            strategy="beforeInteractive"
             dangerouslySetInnerHTML={{
               __html: `(${toRunBeforeReactOnClient.toString()})()`,
             }}

apps/web/pages/api/auth/[...nextauth].tsx

@@ -20,6 +20,7 @@ import { defaultCookies } from "@calcom/lib/default-cookies";
 import rateLimit from "@calcom/lib/rateLimit";
 import { serverConfig } from "@calcom/lib/serverConfig";
 import prisma from "@calcom/prisma";
+import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
 
 import CalComAdapter from "@lib/auth/next-auth-custom-adapter";
 import { randomString } from "@lib/random";
@@ -63,6 +64,11 @@ const providers: Provider[] = [
           password: true,
           twoFactorEnabled: true,
           twoFactorSecret: true,
+          teams: {
+            include: {
+              team: true,
+            },
+          },
         },
       });
 
@@ -116,6 +122,13 @@ const providers: Provider[] = [
         intervalInMs: 60 * 1000, // 1 minute
       });
       await limiter.check(10, user.email); // 10 requests per minute
+      // Check if the user you are logging into has any active teams
+      const hasActiveTeams =
+        user.teams.filter((m) => {
+          const metadata = teamMetadataSchema.safeParse(m.team.metadata);
+          if (metadata.success && metadata.data?.subscriptionId) return false;
+          return true;
+        }).length > 0;
 
       // authentication success- but does it meet the minimum password requirements?
       if (user.role === "ADMIN" && !isPasswordValid(credentials.password, false, true)) {
@@ -125,6 +138,7 @@ const providers: Provider[] = [
           email: user.email,
           name: user.name,
           role: "USER",
+          belongsToActiveTeam: hasActiveTeams,
         };
       }
 
@@ -134,6 +148,7 @@ const providers: Provider[] = [
         email: user.email,
         name: user.name,
         role: user.role,
+        belongsToActiveTeam: hasActiveTeams,
       };
     },
   }),
@@ -272,6 +287,7 @@ export default NextAuth({
           email: user.email,
           role: user.role,
           impersonatedByUID: user?.impersonatedByUID,
+          belongsToActiveTeam: user?.belongsToActiveTeam,
         };
       }
 
@@ -307,6 +323,7 @@ export default NextAuth({
           email: existingUser.email,
           role: existingUser.role,
           impersonatedByUID: token.impersonatedByUID as number,
+          belongsToActiveTeam: token?.belongsToActiveTeam as boolean,
         };
       }
 
@@ -324,6 +341,7 @@ export default NextAuth({
           username: token.username as string,
           role: token.role as UserPermissionRole,
           impersonatedByUID: token.impersonatedByUID as number,
+          belongsToActiveTeam: token?.belongsToActiveTeam as boolean,
         },
       };
       return calendsoSession;

apps/web/pages/api/auth/setup.ts

@@ -46,7 +46,6 @@ async function handler(req: NextApiRequest) {
       name: parsedQuery.data.full_name,
       emailVerified: new Date(),
       locale: "en", // TODO: We should revisit this
-      plan: "PRO",
       identityProvider: IdentityProvider.CAL,
     },
   });

apps/web/pages/api/cron/downgradeUsers.ts

@@ -1,10 +1,5 @@
 import type { NextApiRequest, NextApiResponse } from "next";
 
-import dayjs from "@calcom/dayjs";
-import prisma from "@calcom/prisma";
-
-import { TRIAL_LIMIT_DAYS } from "@lib/config/constants";
-
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   const apiKey = req.headers.authorization || req.query.apiKey;
   if (process.env.CRON_API_KEY !== apiKey) {
@@ -18,35 +13,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 
   /**
    * TODO:
-   * We should add and extra check for non-paying customers in Stripe so we can
-   * downgrade them here.
+   * Remove this endpoint
    */
 
-  await prisma.user.updateMany({
-    data: {
-      plan: "FREE",
-    },
-    where: {
-      plan: "TRIAL",
-      OR: [
-        /**
-         * If the user doesn't have a trial end date,
-         * use the default 14 day trial from creation.
-         */
-        {
-          createdDate: {
-            lt: dayjs().subtract(TRIAL_LIMIT_DAYS, "day").toDate(),
-          },
-          trialEndsAt: null,
-        },
-        /** If it does, then honor the trial end date. */
-        {
-          trialEndsAt: {
-            lt: dayjs().toDate(),
-          },
-        },
-      ],
-    },
-  });
   res.json({ ok: true });
 }

apps/web/pages/api/email.ts

@@ -60,9 +60,10 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   res.setHeader("Content-Type", "text/html");
   res.setHeader("Cache-Control", "no-cache, no-store, private, must-revalidate");
   res.write(
-    renderEmail("AttendeeScheduledEmail", {
-      attendee: evt.attendees[0],
-      calEvent: evt,
+    renderEmail("DisabledAppEmail", {
+      appName: "Stripe",
+      appType: ["payment"],
+      t,
     })
   );
   res.end();

apps/web/pages/api/sync/helpscout/index.ts

@@ -47,7 +47,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     select: {
       username: true,
       id: true,
-      plan: true,
       createdDate: true,
     },
   });
@@ -81,7 +80,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
             ? new Date(lastBooking.booking.createdAt).toLocaleDateString("en-US")
             : "No info"
         }</li>
-        <li><b>Plan:</b>&nbsp;${user.plan}</li>
         <li><b>Account created:</b>&nbsp;${new Date(user.createdDate).toLocaleDateString("en-US")}</li>
       </ul>
     `,

apps/web/pages/api/teams.ts

@@ -1,68 +0,0 @@
-import { MembershipRole } from "@prisma/client";
-import type { NextApiRequest, NextApiResponse } from "next";
-
-import { closeComUpsertTeamUser } from "@calcom/lib/sync/SyncServiceManager";
-import prisma from "@calcom/prisma";
-
-import { getSession } from "@lib/auth";
-import slugify from "@lib/slugify";
-
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  const session = await getSession({ req: req });
-
-  if (!session?.user?.id) {
-    res.status(401).json({ message: "Not authenticated" });
-    return;
-  }
-
-  const ownerUser = await prisma.user.findFirst({
-    where: {
-      id: session.user.id,
-    },
-    select: {
-      id: true,
-      username: true,
-      createdDate: true,
-      name: true,
-      plan: true,
-      email: true,
-    },
-  });
-
-  if (req.method === "POST") {
-    const slug = slugify(req.body.name);
-
-    const nameCollisions = await prisma.team.count({
-      where: {
-        OR: [{ name: req.body.name }, { slug: slug }],
-      },
-    });
-
-    if (nameCollisions > 0) {
-      return res.status(409).json({ errorCode: "TeamNameCollision", message: "Team name already taken." });
-    }
-
-    const createTeam = await prisma.team.create({
-      data: {
-        name: req.body.name,
-        slug: slug,
-      },
-    });
-
-    await prisma.membership.create({
-      data: {
-        teamId: createTeam.id,
-        userId: session.user.id,
-        role: MembershipRole.OWNER,
-        accepted: true,
-      },
-    });
-
-    // Sync Services: Close.com
-    closeComUpsertTeamUser(createTeam, ownerUser, MembershipRole.OWNER);
-
-    return res.status(201).json({ message: "Team created" });
-  }
-
-  res.status(404).json({ message: "Team not found" });
-}

apps/web/pages/api/user/avatar.ts

@@ -1,86 +1,72 @@
 import crypto from "crypto";
 import type { NextApiRequest, NextApiResponse } from "next";
+import { z } from "zod";
 
-import { CAL_URL, WEBAPP_URL } from "@calcom/lib/constants";
 import { getPlaceholderAvatar } from "@calcom/lib/getPlaceholderAvatar";
 import prisma from "@calcom/prisma";
 
 import { defaultAvatarSrc } from "@lib/profile";
 
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  //   const username = req.url?.substring(1, req.url.lastIndexOf("/"));
-  const username = req.query.username as string;
-  const teamname = req.query.teamname as string;
-  let identity;
-  let linksToThisRoute = false;
+const querySchema = z
+  .object({
+    username: z.string(),
+    teamname: z.string(),
+  })
+  .partial();
+
+async function getIdentityData(req: NextApiRequest) {
+  const { username, teamname } = querySchema.parse(req.query);
+
   if (username) {
     const user = await prisma.user.findUnique({
-      where: {
-        username: username,
-      },
-      select: {
-        avatar: true,
-        email: true,
-      },
+      where: { username },
+      select: { avatar: true, email: true },
     });
-    identity = {
+    return {
       name: username,
       email: user?.email,
       avatar: user?.avatar,
     };
-    linksToThisRoute =
-      identity.avatar === `${CAL_URL}/${username}/avatar.png` ||
-      identity.avatar === `${WEBAPP_URL}/${username}/avatar.png`;
-  } else if (teamname) {
-    const team = await prisma.team.findUnique({
-      where: {
-        slug: teamname,
-      },
-      select: {
-        logo: true,
-      },
-    });
-    identity = {
-      name: teamname,
-      shouldDefaultBeNameBased: true,
-      avatar: team?.logo,
-    };
-    linksToThisRoute =
-      identity.avatar === `${CAL_URL}/team/${teamname}/avatar.png` ||
-      identity.avatar === `${WEBAPP_URL}/team/${teamname}/avatar.png`;
   }
-
-  const emailMd5 = crypto
-    .createHash("md5")
-    .update((identity?.email as string) || "guest@example.com")
-    .digest("hex");
-  const img = identity?.avatar;
-  // If image isn't set or links to this route itself, use default avatar
-  if (!img || linksToThisRoute) {
-    let defaultSrc = defaultAvatarSrc({ md5: emailMd5 });
-    if (identity?.shouldDefaultBeNameBased) {
-      defaultSrc = getPlaceholderAvatar(null, identity.name);
-    }
-    res.writeHead(302, {
-      Location: defaultSrc,
+  if (teamname) {
+    const team = await prisma.team.findUnique({
+      where: { slug: teamname },
+      select: { logo: true },
     });
-
-    res.end();
-  } else if (!img.includes("data:image")) {
-    res.writeHead(302, {
-      Location: img,
-    });
-    res.end();
-  } else {
-    const decoded = img
-      .toString()
-      .replace("data:image/png;base64,", "")
-      .replace("data:image/jpeg;base64,", "");
-    const imageResp = Buffer.from(decoded, "base64");
-    res.writeHead(200, {
-      "Content-Type": "image/png",
-      "Content-Length": imageResp.length,
-    });
-    res.end(imageResp);
+    return {
+      name: teamname,
+      email: null,
+      avatar: team?.logo || getPlaceholderAvatar(null, teamname),
+    };
   }
 }
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  const identity = await getIdentityData(req);
+  const img = identity?.avatar;
+  // If image isn't set or links to this route itself, use default avatar
+  if (!img) {
+    res.writeHead(302, {
+      Location: defaultAvatarSrc({
+        md5: crypto
+          .createHash("md5")
+          .update(identity?.email || "guest@example.com")
+          .digest("hex"),
+      }),
+    });
+    return res.end();
+  }
+
+  if (!img.includes("data:image")) {
+    res.writeHead(302, { Location: img });
+    return res.end();
+  }
+
+  const decoded = img.toString().replace("data:image/png;base64,", "").replace("data:image/jpeg;base64,", "");
+  const imageResp = Buffer.from(decoded, "base64");
+  res.writeHead(200, {
+    "Content-Type": "image/png",
+    "Content-Length": imageResp.length,
+  });
+  res.end(imageResp);
+}

apps/web/pages/apps/index.tsx

@@ -1,5 +1,4 @@
-import { useAutoAnimate } from "@formkit/auto-animate/react";
-import { InferGetStaticPropsType, NextPageContext } from "next";
+import { GetServerSideProps, InferGetServerSidePropsType } from "next";
 import { ChangeEventHandler, useState } from "react";
 
 import { getAppRegistry, getAppRegistryWithCredentials } from "@calcom/app-store/_appRegistry";
@@ -31,7 +30,10 @@ function AppsSearch({
   );
 }
 
-export default function Apps({ appStore, categories }: InferGetStaticPropsType<typeof getServerSideProps>) {
+export default function Apps({
+  categories,
+  appStore,
+}: InferGetServerSidePropsType<typeof getServerSideProps>) {
   const { t } = useLocale();
   const [searchText, setSearchText] = useState<string | undefined>(undefined);
 
@@ -42,7 +44,8 @@ export default function Apps({ appStore, categories }: InferGetStaticPropsType<t
       subtitle={t("app_store_description")}
       actions={(className) => (
         <AppsSearch className={className} onChange={(e) => setSearchText(e.target.value)} />
-      )}>
+      )}
+      emptyStore={!appStore.length}>
       {!searchText && (
         <>
           <AppStoreCategories categories={categories} />
@@ -54,7 +57,7 @@ export default function Apps({ appStore, categories }: InferGetStaticPropsType<t
   );
 }
 
-export const getServerSideProps = async (context: NextPageContext) => {
+export const getServerSideProps: GetServerSideProps = async (context) => {
   const ssg = await ssgInit(context);
 
   const session = await getSession(context);
@@ -77,7 +80,6 @@ export const getServerSideProps = async (context: NextPageContext) => {
   }, {} as Record<string, number>);
   return {
     props: {
-      trpcState: ssg.dehydrate(),
       categories: Object.entries(categories)
         .map(([name, count]): { name: AppCategories; count: number } => ({
           name: name as AppCategories,
@@ -87,6 +89,7 @@ export const getServerSideProps = async (context: NextPageContext) => {
           return b.count - a.count;
         }),
       appStore,
+      trpcState: ssg.dehydrate(),
     },
   };
 };

apps/web/pages/auth/setup/index.tsx

@@ -0,0 +1,48 @@
+import { useState } from "react";
+
+import AdminAppsList from "@calcom/features/apps/AdminAppsList";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import prisma from "@calcom/prisma";
+import { inferSSRProps } from "@calcom/types/inferSSRProps";
+import { WizardForm } from "@calcom/ui";
+
+import SetupFormStep1 from "./steps/SetupFormStep1";
+import StepDone from "./steps/StepDone";
+
+export default function Setup(props: inferSSRProps<typeof getServerSideProps>) {
+  const { t } = useLocale();
+  const [isLoadingStep1, setIsLoadingStep1] = useState(false);
+  const shouldDisable = props.userCount !== 0;
+
+  const steps = [
+    {
+      title: t("administrator_user"),
+      description: t("lets_create_first_administrator_user"),
+      content: shouldDisable ? <StepDone /> : <SetupFormStep1 setIsLoading={setIsLoadingStep1} />,
+      isLoading: isLoadingStep1,
+    },
+    {
+      title: t("enable_apps"),
+      description: t("enable_apps_description"),
+      content: <AdminAppsList baseURL="/auth/setup" />,
+      isLoading: false,
+    },
+  ];
+
+  return (
+    <>
+      <main className="flex items-center bg-gray-100 print:h-full">
+        <WizardForm href="/auth/setup" steps={steps} disableNavigation={shouldDisable} />
+      </main>
+    </>
+  );
+}
+
+export const getServerSideProps = async () => {
+  const userCount = await prisma.user.count();
+  return {
+    props: {
+      userCount,
+    },
+  };
+};

apps/web/pages/auth/setup/steps/SetupFormStep1.tsx

@@ -1,34 +1,14 @@
-import { CheckIcon } from "@heroicons/react/solid";
 import { zodResolver } from "@hookform/resolvers/zod";
 import classNames from "classnames";
-import { GetServerSidePropsContext } from "next";
+import { signIn } from "next-auth/react";
 import { useRouter } from "next/router";
-import { useState } from "react";
 import { Controller, FormProvider, useForm } from "react-hook-form";
 import * as z from "zod";
 
 import { isPasswordValid } from "@calcom/lib/auth";
+import { WEBSITE_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import prisma from "@calcom/prisma";
-import { inferSSRProps } from "@calcom/types/inferSSRProps";
-import { EmailField, Label, PasswordField, TextField, WizardForm } from "@calcom/ui";
-
-import { ssrInit } from "@server/lib/ssr";
-
-const StepDone = () => {
-  const { t } = useLocale();
-
-  return (
-    <div className="min-h-36 my-6 flex flex-col items-center justify-center">
-      <div className="flex h-[72px] w-[72px] items-center justify-center rounded-full bg-gray-600 dark:bg-white">
-        <CheckIcon className="inline-block h-10 w-10 text-white dark:bg-white dark:text-gray-600" />
-      </div>
-      <div className="max-w-[420px] text-center">
-        <h2 className="mt-6 mb-1 text-lg font-medium dark:text-gray-300">{t("all_done")}</h2>
-      </div>
-    </div>
-  );
-};
+import { EmailField, Label, PasswordField, TextField } from "@calcom/ui";
 
 const SetupFormStep1 = (props: { setIsLoading: (val: boolean) => void }) => {
   const router = useRouter();
@@ -83,13 +63,19 @@ const SetupFormStep1 = (props: { setIsLoading: (val: boolean) => void }) => {
       },
     });
     if (response.status === 200) {
-      router.replace(`/auth/login?email=${data.email_address.toLowerCase()}`);
+      await signIn("credentials", {
+        redirect: false,
+        callbackUrl: "/",
+        email: data.email_address.toLowerCase(),
+        password: data.password,
+      });
+      router.replace(`/auth/setup?step=2&category=calendar`);
     } else {
       router.replace("/auth/setup");
     }
   }, onError);
 
-  const longWebsiteUrl = process.env.NEXT_PUBLIC_WEBSITE_URL.length > 30;
+  const longWebsiteUrl = WEBSITE_URL.length > 30;
 
   return (
     <FormProvider {...formMethods}>
@@ -201,37 +187,4 @@ const SetupFormStep1 = (props: { setIsLoading: (val: boolean) => void }) => {
   );
 };
 
-export default function Setup(props: inferSSRProps<typeof getServerSideProps>) {
-  const { t } = useLocale();
-  const [isLoadingStep1, setIsLoadingStep1] = useState(false);
-
-  const steps = [
-    {
-      title: t("administrator_user"),
-      description: t("lets_create_first_administrator_user"),
-      content: props.userCount !== 0 ? <StepDone /> : <SetupFormStep1 setIsLoading={setIsLoadingStep1} />,
-      enabled: props.userCount === 0, // to check if the wizard should show buttons to navigate through more steps
-      isLoading: isLoadingStep1,
-    },
-  ];
-
-  return (
-    <>
-      <main className="flex h-screen items-center bg-gray-100 print:h-full">
-        <WizardForm href="/auth/setup" steps={steps} containerClassname="max-w-sm" />
-      </main>
-    </>
-  );
-}
-
-export const getServerSideProps = async (context: GetServerSidePropsContext) => {
-  const ssr = await ssrInit(context);
-  const userCount = await prisma.user.count();
-
-  return {
-    props: {
-      trpcState: ssr.dehydrate(),
-      userCount,
-    },
-  };
-};
+export default SetupFormStep1;

apps/web/pages/auth/setup/steps/StepDone.tsx

@@ -0,0 +1,19 @@
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Icon } from "@calcom/ui";
+
+const StepDone = () => {
+  const { t } = useLocale();
+
+  return (
+    <div className="min-h-36 my-6 flex flex-col items-center justify-center">
+      <div className="flex h-[72px] w-[72px] items-center justify-center rounded-full bg-gray-600 dark:bg-white">
+        <Icon.FiCheck className="inline-block h-10 w-10 text-white dark:bg-white dark:text-gray-600" />
+      </div>
+      <div className="max-w-[420px] text-center">
+        <h2 className="mt-6 mb-1 text-lg font-medium dark:text-gray-300">{t("all_done")}</h2>
+      </div>
+    </div>
+  );
+};
+
+export default StepDone;

apps/web/pages/auth/sso/[provider].tsx

@@ -3,7 +3,7 @@ import { signIn } from "next-auth/react";
 import { useRouter } from "next/router";
 import { useEffect } from "react";
 
-import { getPremiumPlanPrice } from "@calcom/app-store/stripepayment/lib/utils";
+import { getPremiumMonthlyPlanPriceId } from "@calcom/app-store/stripepayment/lib/utils";
 import stripe from "@calcom/features/ee/payments/server/stripe";
 import {
   hostedCal,
@@ -161,7 +161,7 @@ const getStripePremiumUsernameUrl = async ({
     customer: customer.id,
     line_items: [
       {
-        price: getPremiumPlanPrice(),
+        price: getPremiumMonthlyPlanPriceId(),
         quantity: 1,
       },
     ],

apps/web/pages/availability/[schedule].tsx

@@ -29,6 +29,8 @@ import { HttpError } from "@lib/core/http/error";
 import { SelectSkeletonLoader } from "@components/availability/SkeletonLoader";
 import EditableHeading from "@components/ui/EditableHeading";
 
+import { ssgInit } from "@server/lib/ssg";
+
 const querySchema = z.object({
   schedule: stringOrNumber,
 });
@@ -91,7 +93,7 @@ export default function Availability({ schedule }: { schedule: number }) {
   return (
     <Shell
       backPath="/availability"
-      title={data?.schedule.name && data.schedule.name + " | " + t("availability")}
+      title={data?.schedule.name ? data.schedule.name + " | " + t("availability") : t("availability")}
       heading={
         <Controller
           control={form.control}
@@ -209,14 +211,16 @@ export default function Availability({ schedule }: { schedule: number }) {
   );
 }
 
-export const getStaticProps: GetStaticProps = (ctx) => {
+export const getStaticProps: GetStaticProps = async (ctx) => {
   const params = querySchema.safeParse(ctx.params);
+  const ssg = await ssgInit(ctx);
 
   if (!params.success) return { notFound: true };
 
   return {
     props: {
       schedule: params.data.schedule,
+      trpcState: ssg.dehydrate(),
     },
     revalidate: 10, // seconds
   };

apps/web/pages/availability/index.tsx

@@ -1,4 +1,5 @@
 import { useAutoAnimate } from "@formkit/auto-animate/react";
+import { GetServerSidePropsContext } from "next";
 
 import { NewScheduleButton, ScheduleListItem } from "@calcom/features/schedules";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -10,6 +11,8 @@ import { HttpError } from "@lib/core/http/error";
 
 import SkeletonLoader from "@components/availability/SkeletonLoader";
 
+import { ssrInit } from "@server/lib/ssr";
+
 export function AvailabilityList({ schedules }: RouterOutputs["viewer"]["availability"]["list"]) {
   const { t } = useLocale();
   const utils = trpc.useContext();
@@ -45,6 +48,24 @@ export function AvailabilityList({ schedules }: RouterOutputs["viewer"]["availab
     },
   });
 
+  const updateMutation = trpc.viewer.availability.schedule.update.useMutation({
+    onSuccess: async ({ schedule }) => {
+      await utils.viewer.availability.list.invalidate();
+      showToast(
+        t("availability_updated_successfully", {
+          scheduleName: schedule.name,
+        }),
+        "success"
+      );
+    },
+    onError: (err) => {
+      if (err instanceof HttpError) {
+        const message = `${err.statusCode}: ${err.message}`;
+        showToast(message, "error");
+      }
+    },
+  });
+
   // Adds smooth delete button - item fades and old item slides into place
 
   const [animationParentRef] = useAutoAnimate<HTMLUListElement>();
@@ -71,6 +92,7 @@ export function AvailabilityList({ schedules }: RouterOutputs["viewer"]["availab
                 }}
                 key={schedule.id}
                 schedule={schedule}
+                updateDefault={updateMutation.mutate}
                 deleteFunction={deleteMutation.mutate}
               />
             ))}
@@ -93,3 +115,13 @@ export default function AvailabilityPage() {
     </div>
   );
 }
+
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};

apps/web/pages/booking/[uid].tsx

@@ -34,13 +34,14 @@ import { getIs24hClockFromLocalStorage, isBrowserLocale24h } from "@calcom/lib/t
 import { localStorage } from "@calcom/lib/webstorage";
 import prisma, { baseUserSelect } from "@calcom/prisma";
 import { Prisma } from "@calcom/prisma/client";
-import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
+import { customInputSchema, EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
 import { Button, EmailInput, Icon } from "@calcom/ui";
 
 import { timeZone } from "@lib/clock";
 import { inferSSRProps } from "@lib/types/inferSSRProps";
 
 import CancelBooking from "@components/booking/CancelBooking";
+import EventReservationSchema from "@components/schemas/EventReservationSchema";
 import { HeadSeo } from "@components/seo/head-seo";
 
 import { ssrInit } from "@server/lib/ssr";
@@ -56,26 +57,41 @@ function redirectToExternalUrl(url: string) {
 function RedirectionToast({ url }: { url: string }) {
   const [timeRemaining, setTimeRemaining] = useState(10);
   const [isToastVisible, setIsToastVisible] = useState(true);
-  const parsedSuccessUrl = new URL(document.URL);
-  const parsedExternalUrl = new URL(url);
-
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  /* @ts-ignore */ //https://stackoverflow.com/questions/49218765/typescript-and-iterator-type-iterableiteratort-is-not-an-array-type
-  for (const [name, value] of parsedExternalUrl.searchParams.entries()) {
-    parsedSuccessUrl.searchParams.set(name, value);
-  }
-
-  const urlWithSuccessParams =
-    parsedExternalUrl.origin +
-    parsedExternalUrl.pathname +
-    "?" +
-    parsedSuccessUrl.searchParams.toString() +
-    parsedExternalUrl.hash;
 
   const { t } = useLocale();
   const timerRef = useRef<number | null>(null);
+  const router = useRouter();
+  const { cancel: isCancellationMode } = querySchema.parse(router.query);
+  const urlWithSuccessParamsRef = useRef<string | null>();
+  if (isCancellationMode && timerRef.current) {
+    setIsToastVisible(false);
+  }
 
   useEffect(() => {
+    if (!isToastVisible && timerRef.current) {
+      window.clearInterval(timerRef.current);
+    }
+  }, [isToastVisible]);
+
+  useEffect(() => {
+    const parsedExternalUrl = new URL(url);
+
+    const parsedSuccessUrl = new URL(document.URL);
+
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    /* @ts-ignore */ //https://stackoverflow.com/questions/49218765/typescript-and-iterator-type-iterableiteratort-is-not-an-array-type
+    for (const [name, value] of parsedExternalUrl.searchParams.entries()) {
+      parsedSuccessUrl.searchParams.set(name, value);
+    }
+
+    const urlWithSuccessParams =
+      parsedExternalUrl.origin +
+      parsedExternalUrl.pathname +
+      "?" +
+      parsedSuccessUrl.searchParams.toString() +
+      parsedExternalUrl.hash;
+    urlWithSuccessParamsRef.current = urlWithSuccessParams;
+
     timerRef.current = window.setInterval(() => {
       if (timeRemaining > 0) {
         setTimeRemaining((timeRemaining) => {
@@ -89,7 +105,7 @@ function RedirectionToast({ url }: { url: string }) {
     return () => {
       window.clearInterval(timerRef.current as number);
     };
-  }, [timeRemaining, urlWithSuccessParams]);
+  }, [timeRemaining, url]);
 
   if (!isToastVisible) {
     return null;
@@ -112,7 +128,9 @@ function RedirectionToast({ url }: { url: string }) {
               <div className="order-3 mt-2 w-full flex-shrink-0 sm:order-2 sm:mt-0 sm:w-auto">
                 <button
                   onClick={() => {
-                    redirectToExternalUrl(urlWithSuccessParams);
+                    if (urlWithSuccessParamsRef.current) {
+                      redirectToExternalUrl(urlWithSuccessParamsRef.current);
+                    }
                   }}
                   className="flex w-full items-center justify-center rounded-sm border border-transparent bg-white px-4 py-2 text-sm font-medium text-green-600 hover:bg-green-50">
                   {t("continue")}
@@ -123,7 +141,6 @@ function RedirectionToast({ url }: { url: string }) {
                   type="button"
                   onClick={() => {
                     setIsToastVisible(false);
-                    window.clearInterval(timerRef.current as number);
                   }}
                   className="-mr-1 flex rounded-md p-2 hover:bg-green-600 focus:outline-none focus:ring-2 focus:ring-white">
                   <Icon.FiX className="h-6 w-6 text-white" />
@@ -167,21 +184,27 @@ export default function Success(props: SuccessProps) {
   if ((isCancellationMode || changes) && typeof window !== "undefined") {
     window.scrollTo(0, document.body.scrollHeight);
   }
+
   const location: ReturnType<typeof getEventLocationValue> = Array.isArray(props.bookingInfo.location)
-    ? props.bookingInfo.location[0] || ""
-    : props.bookingInfo.location || "";
+    ? props.bookingInfo.location[0]
+    : // If there is no location set then we default to Cal Video
+      "integrations:daily";
 
   if (!location) {
     // Can't use logger.error because it throws error on client. stdout isn't available to it.
     console.error(`No location found `);
   }
 
-  const name = props.bookingInfo?.user?.name;
   const email = props.bookingInfo?.user?.email;
   const status = props.bookingInfo?.status;
   const reschedule = props.bookingInfo.status === BookingStatus.ACCEPTED;
   const cancellationReason = props.bookingInfo.cancellationReason;
 
+  const attendeeName =
+    typeof props?.bookingInfo?.attendees?.[0]?.name === "string"
+      ? props?.bookingInfo?.attendees?.[0]?.name
+      : "Nameless";
+
   const [is24h, setIs24h] = useState(isBrowserLocale24h());
   const { data: session } = useSession();
 
@@ -203,8 +226,6 @@ export default function Success(props: SuccessProps) {
     });
   }
 
-  const attendeeName = typeof name === "string" ? name : "Nameless";
-
   const eventNameObject = {
     attendeeName,
     eventType: props.eventType.title,
@@ -317,6 +338,19 @@ export default function Success(props: SuccessProps) {
 
   return (
     <div className={isEmbed ? "" : "h-screen"} data-testid="success-page">
+      {!isEmbed && (
+        <EventReservationSchema
+          reservationId={bookingInfo.uid}
+          eventName={eventName}
+          startTime={bookingInfo.startTime}
+          endTime={bookingInfo.endTime}
+          organizer={bookingInfo.user}
+          attendees={bookingInfo.attendees}
+          location={locationToDisplay}
+          description={bookingInfo.description}
+          status={status}
+        />
+      )}
       {userIsOwner && !isEmbed && (
         <div className="mt-2 ml-4 -mb-4">
           <Link href={allRemainingBookings ? "/bookings/recurring" : "/bookings/upcoming"}>
@@ -331,7 +365,9 @@ export default function Success(props: SuccessProps) {
       <CustomBranding lightVal={props.profile.brandColor} darkVal={props.profile.darkBrandColor} />
       <main className={classNames(shouldAlignCentrally ? "mx-auto" : "", isEmbed ? "" : "max-w-3xl")}>
         <div className={classNames("overflow-y-auto", isEmbed ? "" : "z-50 ")}>
-          {eventType.successRedirectUrl ? <RedirectionToast url={eventType.successRedirectUrl} /> : null}{" "}
+          {isSuccessBookingPage && !isCancellationMode && eventType.successRedirectUrl ? (
+            <RedirectionToast url={eventType.successRedirectUrl} />
+          ) : null}{" "}
           <div
             className={classNames(
               shouldAlignCentrally ? "text-center" : "",
@@ -454,10 +490,37 @@ export default function Success(props: SuccessProps) {
                     )}
                     {customInputs &&
                       Object.keys(customInputs).map((key) => {
+                        // This breaks if you have two label that are the same.
+                        // TODO: Fix this in another PR
                         const customInput = customInputs[key as keyof typeof customInputs];
+                        const eventTypeCustomFound = eventType.customInputs?.find((ci) => ci.label === key);
                         return (
                           <>
-                            {customInput !== "" && (
+                            {eventTypeCustomFound?.type === "RADIO" && (
+                              <>
+                                <div className="col-span-3 mt-8 border-t pt-8 pr-3 font-medium">
+                                  {eventTypeCustomFound.label}
+                                </div>
+                                <div className="col-span-3 mt-1 mb-2">
+                                  {eventTypeCustomFound.options &&
+                                    eventTypeCustomFound.options.map((option) => {
+                                      const selected = option.label == customInput;
+                                      return (
+                                        <div
+                                          key={option.label}
+                                          className={classNames(
+                                            "flex space-x-1",
+                                            !selected && "text-gray-500"
+                                          )}>
+                                          <p>{option.label}</p>
+                                          <span>{option.label === customInput && "✅"}</span>
+                                        </div>
+                                      );
+                                    })}
+                                </div>
+                              </>
+                            )}
+                            {eventTypeCustomFound?.type !== "RADIO" && customInput !== "" && (
                               <>
                                 <div className="col-span-3 mt-8 border-t pt-8 pr-3 font-medium">{key}</div>
                                 <div className="col-span-3 mt-2 mb-2">
@@ -785,6 +848,7 @@ const getEventTypesFromDB = async (id: number) => {
       requiresConfirmation: true,
       userId: true,
       successRedirectUrl: true,
+      customInputs: true,
       locations: true,
       price: true,
       currency: true,
@@ -794,7 +858,6 @@ const getEventTypesFromDB = async (id: number) => {
           name: true,
           username: true,
           hideBranding: true,
-          plan: true,
           theme: true,
           brandColor: true,
           darkBrandColor: true,
@@ -851,22 +914,25 @@ const handleSeatsEventTypeOnBooking = (
     seatsShowAttendees: boolean | null;
     [x: string | number | symbol]: unknown;
   },
-  booking: Partial<
+  bookingInfo: Partial<
     Prisma.BookingGetPayload<{ include: { attendees: { select: { name: true; email: true } } } }>
   >,
   email: string
 ) => {
   if (eventType?.seatsPerTimeSlot !== null) {
     // @TODO: right now bookings with seats doesn't save every description that its entered by every user
-    delete booking.description;
+    delete bookingInfo.description;
   } else {
     return;
   }
   if (!eventType.seatsShowAttendees) {
-    const attendee = booking?.attendees?.find((a) => a.email === email);
-    booking["attendees"] = attendee ? [attendee] : [];
+    const attendee = bookingInfo?.attendees?.find((a) => {
+      return a.email === email;
+    });
+
+    bookingInfo["attendees"] = attendee ? [attendee] : [];
   }
-  return;
+  return bookingInfo;
 };
 
 export async function getServerSideProps(context: GetServerSidePropsContext) {
@@ -945,7 +1011,11 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
       select: baseUserSelect,
     });
     if (user) {
-      eventTypeRaw.users.push(user);
+      eventTypeRaw.users.push({
+        ...user,
+        avatar: "",
+        allowDynamicBooking: true,
+      });
     }
   }
 
@@ -961,6 +1031,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
     periodEndDate: eventTypeRaw.periodEndDate?.toString() ?? null,
     metadata: EventTypeMetaDataSchema.parse(eventTypeRaw.metadata),
     recurringEvent: parseRecurringEvent(eventTypeRaw.recurringEvent),
+    customInputs: customInputSchema.array().parse(eventTypeRaw.customInputs),
   };
 
   const profile = {
@@ -972,7 +1043,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
     slug: eventType.team?.slug || eventType.users[0]?.username || null,
   };
 
-  if (bookingInfo !== null && email) {
+  if (bookingInfo !== null && email && eventType.seatsPerTimeSlot) {
     handleSeatsEventTypeOnBooking(eventType, bookingInfo, email);
   }
 

apps/web/pages/bookings/[status].tsx

@@ -14,9 +14,18 @@ import { useInViewObserver } from "@lib/hooks/useInViewObserver";
 import BookingListItem from "@components/booking/BookingListItem";
 import SkeletonLoader from "@components/booking/SkeletonLoader";
 
+import { ssgInit } from "@server/lib/ssg";
+
 type BookingListingStatus = RouterInputs["viewer"]["bookings"]["get"]["status"];
 type BookingOutput = RouterOutputs["viewer"]["bookings"]["get"]["bookings"][0];
 
+type RecurringInfo = {
+  recurringEventId: string | null;
+  count: number;
+  firstDate: Date | null;
+  bookings: { [key: string]: Date[] };
+};
+
 const validStatuses = ["upcoming", "recurring", "past", "cancelled", "unconfirmed"] as const;
 
 const descriptionByStatus: Record<BookingListingStatus, string> = {
@@ -73,6 +82,18 @@ export default function Bookings() {
     return true;
   };
 
+  let recurringInfoToday: RecurringInfo | undefined;
+
+  const bookingsToday =
+    query.data?.pages.map((page) =>
+      page.bookings.filter((booking: BookingOutput) => {
+        recurringInfoToday = page.recurringInfo.find(
+          (info) => info.recurringEventId === booking.recurringEventId
+        );
+        return new Date(booking.startTime).toDateString() === new Date().toDateString();
+      })
+    )[0] || [];
+
   const [animationParentRef] = useAutoAnimate<HTMLDivElement>();
 
   return (
@@ -83,45 +104,65 @@ export default function Bookings() {
         )}
         {(query.status === "loading" || query.isPaused) && <SkeletonLoader />}
         {query.status === "success" && !isEmpty && (
-          <div className="pt-2 xl:pt-0">
-            <WipeMyCalActionButton bookingStatus={status} bookingsEmpty={isEmpty} />
-            {/* TODO: add today only for the current day
-            <p className="pb-3 text-xs font-medium leading-4 text-gray-500 uppercase">{t("today")}</p>
-             */}
-
-            <div className="overflow-hidden rounded-md border border-gray-200">
-              <table className="w-full max-w-full table-fixed">
-                <tbody className="divide-y divide-gray-200 bg-white" data-testid="bookings">
-                  {query.data.pages.map((page, index) => (
-                    <Fragment key={index}>
-                      {page.bookings.filter(filterBookings).map((booking: BookingOutput) => {
-                        const recurringInfo = page.recurringInfo.find(
-                          (info) => info.recurringEventId === booking.recurringEventId
-                        );
-                        return (
+          <>
+            {!!bookingsToday.length && status === "upcoming" && (
+              <div className="mb-6 pt-2 xl:pt-0">
+                <WipeMyCalActionButton bookingStatus={status} bookingsEmpty={isEmpty} />
+                <p className="mb-2 text-xs font-medium uppercase leading-4 text-gray-500">{t("today")}</p>
+                <div className="overflow-hidden rounded-md border border-gray-200">
+                  <table className="w-full max-w-full table-fixed">
+                    <tbody className="divide-y divide-gray-200 bg-white">
+                      <Fragment>
+                        {bookingsToday.map((booking: BookingOutput) => (
                           <BookingListItem
                             key={booking.id}
                             listingStatus={status}
-                            recurringInfo={recurringInfo}
+                            recurringInfo={recurringInfoToday}
                             {...booking}
                           />
-                        );
-                      })}
-                    </Fragment>
-                  ))}
-                </tbody>
-              </table>
+                        ))}
+                      </Fragment>
+                    </tbody>
+                  </table>
+                </div>
+              </div>
+            )}
+            <div className="pt-2 xl:pt-0">
+              <p className="mb-2 text-xs font-medium uppercase leading-4 text-gray-500">{t("all")}</p>
+              <div className="overflow-hidden rounded-md border border-gray-200">
+                <table className="w-full max-w-full table-fixed">
+                  <tbody className="divide-y divide-gray-200 bg-white" data-testid="bookings">
+                    {query.data.pages.map((page, index) => (
+                      <Fragment key={index}>
+                        {page.bookings.filter(filterBookings).map((booking: BookingOutput) => {
+                          const recurringInfo = page.recurringInfo.find(
+                            (info) => info.recurringEventId === booking.recurringEventId
+                          );
+                          return (
+                            <BookingListItem
+                              key={booking.id}
+                              listingStatus={status}
+                              recurringInfo={recurringInfo}
+                              {...booking}
+                            />
+                          );
+                        })}
+                      </Fragment>
+                    ))}
+                  </tbody>
+                </table>
+              </div>
+              <div className="p-4 text-center" ref={buttonInView.ref}>
+                <Button
+                  color="minimal"
+                  loading={query.isFetchingNextPage}
+                  disabled={!query.hasNextPage}
+                  onClick={() => query.fetchNextPage()}>
+                  {query.hasNextPage ? t("load_more_results") : t("no_more_results")}
+                </Button>
+              </div>
             </div>
-            <div className="p-4 text-center" ref={buttonInView.ref}>
-              <Button
-                color="minimal"
-                loading={query.isFetchingNextPage}
-                disabled={!query.hasNextPage}
-                onClick={() => query.fetchNextPage()}>
-                {query.hasNextPage ? t("load_more_results") : t("no_more_results")}
-              </Button>
-            </div>
-          </div>
+          </>
         )}
         {query.status === "success" && isEmpty && (
           <div className="flex items-center justify-center pt-2 xl:mx-6 xl:pt-0">
@@ -140,14 +181,16 @@ export default function Bookings() {
   );
 }
 
-export const getStaticProps: GetStaticProps = (ctx) => {
+export const getStaticProps: GetStaticProps = async (ctx) => {
   const params = querySchema.safeParse(ctx.params);
+  const ssg = await ssgInit(ctx);
 
   if (!params.success) return { notFound: true };
 
   return {
     props: {
       status: params.data.status,
+      trpcState: ssg.dehydrate(),
     },
   };
 };

apps/web/pages/d/[link]/[slug].tsx

@@ -90,7 +90,6 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
         },
       },
       theme: true,
-      plan: true,
     },
   });
 
@@ -117,7 +116,6 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
       name: u.name,
       username: u.username,
       hideBranding: u.hideBranding,
-      plan: u.plan,
       timeZone: u.timeZone,
     })),
   });
@@ -158,7 +156,6 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
       away: user.away,
       isDynamicGroup: false,
       profile,
-      plan: user.plan,
       date,
       eventType: eventTypeObject,
       workingHours,
@@ -166,6 +163,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
       previousPage: context.req.headers.referer ?? null,
       booking,
       users: [user.username],
+      isBrandingHidden: user.hideBranding,
     },
   };
 };

apps/web/pages/d/[link]/book.tsx

@@ -4,7 +4,7 @@ import { JSONObject } from "superjson/dist/types";
 import { parseRecurringEvent } from "@calcom/lib";
 import prisma from "@calcom/prisma";
 import { bookEventTypeSelect } from "@calcom/prisma/selects";
-import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
+import { customInputSchema, EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
 
 import { asStringOrNull, asStringOrThrow } from "@lib/asStringOrNull";
 import { inferSSRProps } from "@lib/types/inferSSRProps";
@@ -79,6 +79,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
       ...e,
       periodStartDate: e.periodStartDate?.toString() ?? null,
       periodEndDate: e.periodEndDate?.toString() ?? null,
+      customInputs: customInputSchema.array().parse(e.customInputs || []),
       schedulingType: null,
       users: users.map((u) => ({
         id: u.id,

apps/web/pages/event-types/[type]/index.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
 import { useAutoAnimate } from "@formkit/auto-animate/react";
-import { EventTypeCustomInput, PeriodType, Prisma, SchedulingType } from "@prisma/client";
+import { PeriodType, Prisma, SchedulingType } from "@prisma/client";
 import { GetServerSidePropsContext } from "next";
 import { useRouter } from "next/router";
 import { useState } from "react";
@@ -8,23 +8,24 @@ import { useForm } from "react-hook-form";
 import { z } from "zod";
 
 import { StripeData } from "@calcom/app-store/stripepayment/lib/server";
-import getApps, { getEventTypeAppData, getLocationOptions } from "@calcom/app-store/utils";
+import { getEventTypeAppData, getLocationOptions } from "@calcom/app-store/utils";
 import { EventLocationType, LocationObject } from "@calcom/core/location";
 import { parseBookingLimit, parseRecurringEvent, validateBookingLimitOrder } from "@calcom/lib";
+import getEnabledApps from "@calcom/lib/apps/getEnabledApps";
 import { CAL_URL } from "@calcom/lib/constants";
 import convertToNewDurationType from "@calcom/lib/convertToNewDurationType";
 import findDurationType from "@calcom/lib/findDurationType";
 import getStripeAppData from "@calcom/lib/getStripeAppData";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { HttpError } from "@calcom/lib/http-error";
 import prisma from "@calcom/prisma";
-import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
+import { customInputSchema, EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
 import { trpc } from "@calcom/trpc/react";
 import type { BookingLimit, RecurringEvent } from "@calcom/types/Calendar";
 import { Form, showToast } from "@calcom/ui";
 
 import { asStringOrThrow } from "@lib/asStringOrNull";
 import { getSession } from "@lib/auth";
-import { HttpError } from "@lib/core/http/error";
 import { inferSSRProps } from "@lib/types/inferSSRProps";
 
 import { AvailabilityTab } from "@components/eventtype/AvailabilityTab";
@@ -39,6 +40,7 @@ import { EventTypeSingleLayout } from "@components/eventtype/EventTypeSingleLayo
 import EventWorkflowsTab from "@components/eventtype/EventWorkfowsTab";
 
 import { getTranslation } from "@server/lib/i18n";
+import { ssrInit } from "@server/lib/ssr";
 
 export type FormValues = {
   title: string;
@@ -63,7 +65,7 @@ export type FormValues = {
     displayLocationPublicly?: boolean;
     phone?: string;
   }[];
-  customInputs: EventTypeCustomInput[];
+  customInputs: CustomInputParsed[];
   users: string[];
   schedule: number;
   periodType: PeriodType;
@@ -87,6 +89,8 @@ export type FormValues = {
   bookingLimits?: BookingLimit;
 };
 
+export type CustomInputParsed = typeof customInputSchema._output;
+
 const querySchema = z.object({
   tabName: z
     .enum(["setup", "availability", "apps", "limits", "recurring", "team", "advanced", "workflows"])
@@ -261,6 +265,7 @@ const EventTypePage = (props: inferSSRProps<typeof getServerSideProps>) => {
             recurringEvent,
             locations,
             metadata,
+            customInputs,
             // We don't need to send send these values to the backend
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
             seatsPerTimeSlotEnabled,
@@ -278,7 +283,7 @@ const EventTypePage = (props: inferSSRProps<typeof getServerSideProps>) => {
             if (metadata?.multipleDuration.length < 1) {
               throw new Error(t("event_setup_multiple_duration_error"));
             } else {
-              if (!metadata?.multipleDuration?.includes(input.length)) {
+              if (input.length && !metadata?.multipleDuration?.includes(input.length)) {
                 throw new Error(t("event_setup_multiple_duration_default_error"));
               }
             }
@@ -298,6 +303,7 @@ const EventTypePage = (props: inferSSRProps<typeof getServerSideProps>) => {
             seatsPerTimeSlot,
             seatsShowAttendees,
             metadata,
+            customInputs,
           });
         }}>
         <div ref={animationParentRef} className="space-y-6">
@@ -312,6 +318,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
   const { req, query } = context;
   const session = await getSession({ req });
   const typeParam = parseInt(asStringOrThrow(query.type));
+  const ssr = await ssrInit(context);
 
   if (Number.isNaN(typeParam)) {
     return {
@@ -334,7 +341,6 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
     id: true,
     avatar: true,
     email: true,
-    plan: true,
     locale: true,
     defaultScheduleId: true,
   });
@@ -461,6 +467,9 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
   const credentials = await prisma.credential.findMany({
     where: {
       userId: session.user.id,
+      app: {
+        enabled: true,
+      },
     },
     select: {
       id: true,
@@ -468,6 +477,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
       key: true,
       userId: true,
       appId: true,
+      invalid: true,
     },
   });
 
@@ -495,6 +505,8 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
   // const parsedMetaData = _EventTypeModel.parse(newMetadata);
   const parsedMetaData = newMetadata;
 
+  const parsedCustomInputs = (rawEventType.customInputs || []).map((input) => customInputSchema.parse(input));
+
   const eventType = {
     ...restEventType,
     schedule: rawEventType.schedule?.id || rawEventType.users[0]?.defaultScheduleId || null,
@@ -502,6 +514,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
     bookingLimits: parseBookingLimit(restEventType.bookingLimits),
     locations: locations as unknown as LocationObject[],
     metadata: parsedMetaData,
+    customInputs: parsedCustomInputs,
   };
 
   // backwards compat
@@ -517,7 +530,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
   }
   const currentUser = eventType.users.find((u) => u.id === session.user.id);
   const t = await getTranslation(currentUser?.locale ?? "en", "common");
-  const integrations = getApps(credentials);
+  const integrations = await getEnabledApps(credentials);
   const locationOptions = getLocationOptions(integrations, t);
 
   const eventTypeObject = Object.assign({}, eventType, {
@@ -546,6 +559,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
       team: eventTypeObject.team || null,
       teamMembers,
       currentUserMembership,
+      trpcState: ssr.dehydrate(),
     },
   };
 };

apps/web/pages/event-types/index.tsx

@@ -1,5 +1,5 @@
 import { useAutoAnimate } from "@formkit/auto-animate/react";
-import Head from "next/head";
+import { GetServerSidePropsContext } from "next";
 import Link from "next/link";
 import { useRouter } from "next/router";
 import React, { Fragment, useEffect, useState } from "react";
@@ -38,6 +38,8 @@ import SkeletonLoader from "@components/eventtype/SkeletonLoader";
 import Avatar from "@components/ui/Avatar";
 import AvatarGroup from "@components/ui/AvatarGroup";
 
+import { ssrInit } from "@server/lib/ssr";
+
 type EventTypeGroups = RouterOutputs["viewer"]["eventTypes"]["getByViewer"]["eventTypeGroups"];
 type EventTypeGroupProfile = EventTypeGroups[number]["profile"];
 
@@ -531,9 +533,9 @@ const EventTypeListHeading = ({
         <Link href={teamId ? `/settings/teams/${teamId}/profile` : "/settings/my-account/profile"}>
           <a className="font-bold">{profile?.name || ""}</a>
         </Link>
-        {membershipCount && (
+        {membershipCount && teamId && (
           <span className="relative -top-px text-xs text-neutral-500 ltr:ml-2 rtl:mr-2">
-            <Link href="/settings/teams">
+            <Link href={`/settings/teams/${teamId}/members`}>
               <a>
                 <Badge variant="gray">
                   <Icon.FiUsers className="mr-1 -mt-px inline h-3 w-3" />
@@ -579,12 +581,9 @@ const WithQuery = withQuery(trpc.viewer.eventTypes.getByViewer);
 
 const EventTypesPage = () => {
   const { t } = useLocale();
+
   return (
     <div>
-      <Head>
-        <title>Home | {APP_NAME}</title>
-        <link rel="icon" href="/favicon.ico" />
-      </Head>
       <Shell
         heading={t("event_types_page_title") as string}
         subtitle={t("event_types_page_subtitle") as string}
@@ -622,4 +621,14 @@ const EventTypesPage = () => {
   );
 };
 
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};
+
 export default EventTypesPage;

apps/web/pages/getting-started/[[...step]].tsx

@@ -11,15 +11,14 @@ import { User } from "@calcom/prisma/client";
 import { Button, StepCard, Steps } from "@calcom/ui";
 
 import prisma from "@lib/prisma";
+import { inferSSRProps } from "@lib/types/inferSSRProps";
 
 import { ConnectedCalendars } from "@components/getting-started/steps-views/ConnectCalendars";
 import { SetupAvailability } from "@components/getting-started/steps-views/SetupAvailability";
 import UserProfile from "@components/getting-started/steps-views/UserProfile";
 import { UserSettings } from "@components/getting-started/steps-views/UserSettings";
 
-interface IOnboardingPageProps {
-  user: User;
-}
+export type IOnboardingPageProps = inferSSRProps<typeof getServerSideProps>;
 
 const INITIAL_STEP = "user-settings";
 const steps = ["user-settings", "connected-calendar", "setup-availability", "user-profile"] as const;
@@ -165,7 +164,6 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
       weekStart: true,
       hideBranding: true,
       theme: true,
-      plan: true,
       brandColor: true,
       darkBrandColor: true,
       metadata: true,

apps/web/pages/reschedule/[uid].tsx

@@ -42,6 +42,8 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
   if (!booking) {
     return {
       notFound: true,
+    } as {
+      notFound: true;
     };
   }
 
@@ -49,6 +51,8 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
     // TODO: Show something in UI to let user know that this booking is not rescheduleable.
     return {
       notFound: true,
+    } as {
+      notFound: true;
     };
   }
 
@@ -62,7 +66,6 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
       : booking.user?.username || "rick") /* This shouldn't happen */ +
     "/" +
     eventType?.slug;
-
   return {
     redirect: {
       destination: "/" + eventPage + "?rescheduleUid=" + context.query.uid,

apps/web/pages/reschedule/[uid]/embed.tsx

@@ -0,0 +1,7 @@
+import withEmbedSsr from "@lib/withEmbedSsr";
+
+import { getServerSideProps as _getServerSideProps } from "../[uid]";
+
+export { default } from "../[uid]";
+
+export const getServerSideProps = withEmbedSsr(_getServerSideProps);

apps/web/pages/settings/admin/apps.tsx

@@ -1,14 +0,0 @@
-import { getAdminLayout as getLayout, Meta } from "@calcom/ui";
-
-function AdminAppsView() {
-  return (
-    <>
-      <Meta title="Apps" description="apps_description" />
-      <h1>App listing</h1>
-    </>
-  );
-}
-
-AdminAppsView.getLayout = getLayout;
-
-export default AdminAppsView;

apps/web/pages/settings/admin/apps/[category].tsx

@@ -0,0 +1,31 @@
+import { GetServerSidePropsContext } from "next";
+
+import AdminAppsList from "@calcom/features/apps/AdminAppsList";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { getAdminLayout as getLayout, Meta } from "@calcom/ui";
+
+import { ssrInit } from "@server/lib/ssr";
+
+function AdminAppsView() {
+  const { t } = useLocale();
+  return (
+    <>
+      <Meta title={t("apps")} description={t("apps_description")} />
+      <AdminAppsList baseURL="/settings/admin/apps" className="w-0" />
+    </>
+  );
+}
+
+AdminAppsView.getLayout = getLayout;
+
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};
+
+export default AdminAppsView;

apps/web/pages/settings/admin/impersonation.tsx

@@ -1,16 +1,19 @@
+import { GetServerSidePropsContext } from "next";
 import { signIn } from "next-auth/react";
 import { useRef } from "react";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Button, getAdminLayout as getLayout, Meta, TextField } from "@calcom/ui";
 
+import { ssrInit } from "@server/lib/ssr";
+
 function AdminView() {
   const { t } = useLocale();
   const usernameRef = useRef<HTMLInputElement>(null);
 
   return (
     <>
-      <Meta title="Admin" description="Impersonation" />
+      <Meta title={t("admin")} description={t("impersonation")} />
       <form
         className="mb-6 w-full sm:w-1/2"
         onSubmit={(e) => {
@@ -21,7 +24,7 @@ function AdminView() {
         <div className="flex items-center space-x-2">
           <TextField
             containerClassName="w-full"
-            name="Impersonate User"
+            name={t("user_impersonation_heading")}
             addOnLeading={<>{process.env.NEXT_PUBLIC_WEBSITE_URL}/</>}
             ref={usernameRef}
             hint={t("impersonate_user_tip")}
@@ -36,4 +39,14 @@ function AdminView() {
 
 AdminView.getLayout = getLayout;
 
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};
+
 export default AdminView;

apps/web/pages/settings/admin/index.tsx

@@ -1,5 +1,9 @@
+import { GetServerSidePropsContext } from "next";
+
 import { getAdminLayout as getLayout, Meta } from "@calcom/ui";
 
+import { ssrInit } from "@server/lib/ssr";
+
 function AdminAppsView() {
   return (
     <>
@@ -11,4 +15,14 @@ function AdminAppsView() {
 
 AdminAppsView.getLayout = getLayout;
 
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};
+
 export default AdminAppsView;

apps/web/pages/settings/admin/users.tsx

@@ -1,14 +1,30 @@
+import { GetServerSidePropsContext } from "next";
+
+import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { getAdminLayout as getLayout, Meta } from "@calcom/ui";
 
+import { ssrInit } from "@server/lib/ssr";
+
 function AdminUsersView() {
+  const { t } = useLocale();
   return (
     <>
-      <Meta title="Users" description="users_description" />
-      <h1>Users listing</h1>
+      <Meta title={t("users")} description={t("users_description")} />
+      <h1>{t("users_listing")}</h1>
     </>
   );
 }
 
 AdminUsersView.getLayout = getLayout;
 
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};
+
 export default AdminUsersView;

apps/web/pages/settings/billing/index.tsx

@@ -1,3 +1,4 @@
+import { GetServerSidePropsContext } from "next";
 import { useRouter } from "next/router";
 import { useState } from "react";
 import { HelpScout, useChat } from "react-live-chat-loader";
@@ -8,6 +9,8 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc/react";
 import { Button, getSettingsLayout as getLayout, Icon, Meta } from "@calcom/ui";
 
+import { ssrInit } from "@server/lib/ssr";
+
 interface CtaRowProps {
   title: string;
   description: string;
@@ -33,7 +36,6 @@ const CtaRow = ({ title, description, className, children }: CtaRowProps) => {
 const BillingView = () => {
   const { t } = useLocale();
   const { data: user } = trpc.viewer.me.useQuery();
-  const isPro = user?.plan === "PRO";
   const [, loadChat] = useChat();
   const [showChat, setShowChat] = useState(false);
   const router = useRouter();
@@ -50,21 +52,16 @@ const BillingView = () => {
       <Meta title={t("billing")} description={t("manage_billing_description")} />
       <div className="space-y-6 text-sm sm:space-y-8">
         <CtaRow
-          className={classNames(!isPro && "pointer-events-none opacity-30")}
           title={t("billing_manage_details_title")}
           description={t("billing_manage_details_description")}>
-          <Button
-            color={isPro ? "primary" : "secondary"}
-            href={billingHref}
-            target="_blank"
-            EndIcon={Icon.FiExternalLink}>
+          <Button color="primary" href={billingHref} target="_blank" EndIcon={Icon.FiExternalLink}>
             {t("billing_portal")}
           </Button>
         </CtaRow>
 
         <CtaRow title={t("billing_help_title")} description={t("billing_help_description")}>
           <Button color="secondary" onClick={onContactSupportClick}>
-            {t("billing_help_cta")}
+            {t("contact_support")}
           </Button>
         </CtaRow>
         {showChat && <HelpScout color="#292929" icon="message" horizontalPosition="right" zIndex="1" />}
@@ -75,4 +72,14 @@ const BillingView = () => {
 
 BillingView.getLayout = getLayout;
 
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};
+
 export default BillingView;

apps/web/pages/settings/developer/api-keys.tsx

@@ -1,3 +1,4 @@
+import { GetServerSidePropsContext } from "next";
 import { useState } from "react";
 
 import { TApiKeys } from "@calcom/ee/api-keys/components/ApiKeyListItem";
@@ -18,6 +19,8 @@ import {
   SkeletonLoader,
 } from "@calcom/ui";
 
+import { ssrInit } from "@server/lib/ssr";
+
 const ApiKeysView = () => {
   const { t } = useLocale();
 
@@ -93,4 +96,14 @@ const ApiKeysView = () => {
 
 ApiKeysView.getLayout = getLayout;
 
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};
+
 export default ApiKeysView;

apps/web/pages/settings/my-account/appearance.tsx

@@ -1,3 +1,5 @@
+import { GetServerSidePropsContext } from "next";
+import { useSession } from "next-auth/react";
 import { Controller, useForm } from "react-hook-form";
 
 import { APP_NAME } from "@calcom/lib/constants";
@@ -17,9 +19,12 @@ import {
   Switch,
 } from "@calcom/ui";
 
-const SkeletonLoader = () => {
+import { ssrInit } from "@server/lib/ssr";
+
+const SkeletonLoader = ({ title, description }: { title: string; description: string }) => {
   return (
     <SkeletonContainer>
+      <Meta title={title} description={description} />
       <div className="mt-6 mb-8 space-y-6 divide-y">
         <div className="flex items-center">
           <SkeletonButton className="mr-6 h-32 w-48 rounded-md p-5" />
@@ -41,7 +46,7 @@ const SkeletonLoader = () => {
 
 const AppearanceView = () => {
   const { t } = useLocale();
-
+  const session = useSession();
   const utils = trpc.useContext();
   const { data: user, isLoading } = trpc.viewer.me.useQuery();
 
@@ -68,7 +73,7 @@ const AppearanceView = () => {
     },
   });
 
-  if (isLoading) return <SkeletonLoader />;
+  if (isLoading) return <SkeletonLoader title={t("appearance")} description={t("appearance_description")} />;
 
   if (!user) return null;
 
@@ -85,7 +90,7 @@ const AppearanceView = () => {
           theme: values.theme || null,
         });
       }}>
-      <Meta title="Appearance" description="Manage settings for your booking appearance" />
+      <Meta title={t("appearance")} description={t("appearance_description")} />
       <div className="mb-6 flex items-center text-sm">
         <div>
           <p className="font-semibold">{t("theme")}</p>
@@ -180,6 +185,7 @@ const AppearanceView = () => {
               <div className="flex-none">
                 <Switch
                   id="hideBranding"
+                  disabled={!session.data?.user.belongsToActiveTeam}
                   onCheckedChange={(checked) =>
                     formMethods.setValue("hideBranding", checked, { shouldDirty: true })
                   }
@@ -204,6 +210,16 @@ const AppearanceView = () => {
 
 AppearanceView.getLayout = getLayout;
 
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};
+
 export default AppearanceView;
 interface ThemeLabelProps {
   variant: "light" | "dark" | "system";

apps/web/pages/settings/my-account/calendars.tsx

@@ -1,3 +1,4 @@
+import { GetServerSidePropsContext } from "next";
 import { Trans } from "next-i18next";
 import Link from "next/link";
 import { useRouter } from "next/router";
@@ -22,12 +23,15 @@ import {
   SkeletonButton,
   SkeletonContainer,
   SkeletonText,
+  showToast,
 } from "@calcom/ui";
 
 import { QueryCell } from "@lib/QueryCell";
 
 import { CalendarSwitch } from "@components/settings/CalendarSwitch";
 
+import { ssrInit } from "@server/lib/ssr";
+
 const SkeletonLoader = () => {
   return (
     <SkeletonContainer>
@@ -66,15 +70,17 @@ const CalendarsView = () => {
     async onSettled() {
       await utils.viewer.connectedCalendars.invalidate();
     },
+    onSuccess: async () => {
+      showToast(t("calendar_updated_successfully"), "success");
+    },
+    onError: () => {
+      showToast(t("unexpected_error_try_again"), "error");
+    },
   });
 
   return (
     <>
-      <Meta
-        title="Calendars"
-        description="Configure how your event types interact with your calendars"
-        CTA={<AddCalendarButton />}
-      />
+      <Meta title={t("calendars")} description={t("calendars_description")} CTA={<AddCalendarButton />} />
       <QueryCell
         query={query}
         customLoader={<SkeletonLoader />}
@@ -110,7 +116,7 @@ const CalendarsView = () => {
                 {t("check_for_conflicts")}
               </h4>
               <p className="pb-2 text-sm leading-5 text-gray-600">{t("select_calendars")}</p>
-              <List>
+              <List className="flex flex-col gap-6" noBorderTreatment>
                 {data.connectedCalendars.map((item) => (
                   <Fragment key={item.credentialId}>
                     {item.error && item.error.message && (
@@ -137,7 +143,7 @@ const CalendarsView = () => {
                       />
                     )}
                     {item?.error === undefined && item.calendars && (
-                      <ListItem className="flex-col">
+                      <ListItem className="flex-col rounded-md">
                         <div className="flex w-full flex-1 items-center space-x-3 p-4 rtl:space-x-reverse">
                           {
                             // eslint-disable-next-line @next/next/no-img-element
@@ -164,7 +170,7 @@ const CalendarsView = () => {
                             <DisconnectIntegration
                               trashIcon
                               credentialId={item.credentialId}
-                              buttonProps={{ size: "icon", color: "secondary" }}
+                              buttonProps={{ className: "border border-gray-300" }}
                             />
                           </div>
                         </div>
@@ -172,7 +178,7 @@ const CalendarsView = () => {
                           <p className="px-2 pt-4 text-sm text-neutral-500">
                             {t("toggle_calendars_conflict")}
                           </p>
-                          <ul className="space-y-2 px-2 pt-4">
+                          <ul className="space-y-2 p-4">
                             {item.calendars.map((cal) => (
                               <CalendarSwitch
                                 key={cal.externalId}
@@ -224,4 +230,14 @@ const CalendarsView = () => {
 
 CalendarsView.getLayout = getLayout;
 
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};
+
 export default CalendarsView;

apps/web/pages/settings/my-account/conferencing.tsx

@@ -1,3 +1,4 @@
+import { GetServerSidePropsContext } from "next";
 import { useState } from "react";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -24,9 +25,12 @@ import {
   SkeletonText,
 } from "@calcom/ui";
 
-const SkeletonLoader = () => {
+import { ssrInit } from "@server/lib/ssr";
+
+const SkeletonLoader = ({ title, description }: { title: string; description: string }) => {
   return (
     <SkeletonContainer>
+      <Meta title={title} description={description} />
       <div className="mt-6 mb-8 space-y-6 divide-y">
         <SkeletonText className="h-8 w-full" />
         <SkeletonText className="h-8 w-full" />
@@ -60,18 +64,19 @@ const ConferencingLayout = () => {
   const [deleteAppModal, setDeleteAppModal] = useState(false);
   const [deleteCredentialId, setDeleteCredentialId] = useState<number>(0);
 
-  if (isLoading) return <SkeletonLoader />;
+  if (isLoading)
+    return <SkeletonLoader title={t("conferencing")} description={t("conferencing_description")} />;
 
   return (
     <div className="w-full bg-white sm:mx-0 xl:mt-0">
-      <Meta title="Conferencing" description="Add your favourite video conferencing apps for your meetings" />
+      <Meta title={t("conferencing")} description={t("conferencing_description")} />
       <List>
         {apps?.items &&
           apps.items
             .map((app) => ({ ...app, title: app.title || app.name }))
             .map((app) => (
               <ListItem className="flex-col border-0" key={app.title}>
-                <div className="flex w-full flex-1 items-center space-x-3 pl-1 pt-1 rtl:space-x-reverse">
+                <div className="flex w-full flex-1 items-center space-x-2 p-4 rtl:space-x-reverse">
                   {
                     // eslint-disable-next-line @next/next/no-img-element
                     app.logo && <img className="h-10 w-10" src={app.logo} alt={app.title} />
@@ -128,4 +133,14 @@ const ConferencingLayout = () => {
 
 ConferencingLayout.getLayout = getLayout;
 
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};
+
 export default ConferencingLayout;

apps/web/pages/settings/my-account/general.tsx

@@ -1,3 +1,4 @@
+import { GetServerSidePropsContext } from "next";
 import { useRouter } from "next/router";
 import { useMemo } from "react";
 import { Controller, useForm } from "react-hook-form";
@@ -21,9 +22,12 @@ import {
 import { withQuery } from "@lib/QueryCell";
 import { nameOfDay } from "@lib/core/i18n/weekday";
 
-const SkeletonLoader = () => {
+import { ssrInit } from "@server/lib/ssr";
+
+const SkeletonLoader = ({ title, description }: { title: string; description: string }) => {
   return (
     <SkeletonContainer>
+      <Meta title={title} description={description} />
       <div className="mt-6 mb-8 space-y-6 divide-y">
         <SkeletonText className="h-8 w-full" />
         <SkeletonText className="h-8 w-full" />
@@ -47,14 +51,14 @@ const GeneralQueryView = () => {
   const { t } = useLocale();
 
   const { data: user, isLoading } = trpc.viewer.me.useQuery();
-  if (isLoading) return <SkeletonLoader />;
+  if (isLoading) return <SkeletonLoader title={t("general")} description={t("general_description")} />;
   if (!user) {
     throw new Error(t("something_went_wrong"));
   }
   return (
     <WithQuery
       success={({ data }) => <GeneralView user={user} localeProp={data.locale} />}
-      customLoader={<SkeletonLoader />}
+      customLoader={<SkeletonLoader title={t("general")} description={t("general_description")} />}
     />
   );
 };
@@ -127,7 +131,7 @@ const GeneralView = ({ localeProp, user }: GeneralViewProps) => {
           weekStart: values.weekStart.value,
         });
       }}>
-      <Meta title="General" description="Manage settings for your language and timezone" />
+      <Meta title={t("general")} description={t("general_description")} />
       <Controller
         name="locale"
         render={({ field: { value, onChange } }) => (
@@ -210,4 +214,14 @@ const GeneralView = ({ localeProp, user }: GeneralViewProps) => {
 
 GeneralQueryView.getLayout = getLayout;
 
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};
+
 export default GeneralQueryView;

apps/web/pages/settings/my-account/profile.tsx

@@ -1,7 +1,8 @@
 import { IdentityProvider } from "@prisma/client";
 import crypto from "crypto";
+import { GetServerSidePropsContext } from "next";
 import { signOut } from "next-auth/react";
-import { BaseSyntheticEvent, useEffect, useRef, useState } from "react";
+import { BaseSyntheticEvent, useRef, useState } from "react";
 import { Controller, useForm } from "react-hook-form";
 
 import { ErrorCode } from "@calcom/lib/auth";
@@ -35,11 +36,14 @@ import {
 } from "@calcom/ui";
 
 import TwoFactor from "@components/auth/TwoFactor";
-import { UsernameAvailability } from "@components/ui/UsernameAvailability";
+import { UsernameAvailabilityField } from "@components/ui/UsernameAvailability";
 
-const SkeletonLoader = () => {
+import { ssrInit } from "@server/lib/ssr";
+
+const SkeletonLoader = ({ title, description }: { title: string; description: string }) => {
   return (
     <SkeletonContainer>
+      <Meta title={title} description={description} />
       <div className="mt-6 mb-8 space-y-6 divide-y">
         <div className="flex items-center">
           <SkeletonAvatar className=" h-12 w-12 px-4" />
@@ -59,14 +63,25 @@ interface DeleteAccountValues {
   totpCode: string;
 }
 
+type FormValues = {
+  username: string;
+  avatar: string;
+  name: string;
+  email: string;
+  bio: string;
+};
+
 const ProfileView = () => {
   const { t } = useLocale();
   const utils = trpc.useContext();
-
   const { data: user, isLoading } = trpc.viewer.me.useQuery();
+  const { data: avatar, isLoading: isLoadingAvatar } = trpc.viewer.avatar.useQuery();
   const mutation = trpc.viewer.updateProfile.useMutation({
     onSuccess: () => {
       showToast(t("settings_updated_successfully"), "success");
+      utils.viewer.me.invalidate();
+      utils.viewer.avatar.invalidate();
+      setTempFormValues(null);
     },
     onError: () => {
       showToast(t("error_updating_settings"), "error");
@@ -74,18 +89,14 @@ const ProfileView = () => {
   });
 
   const [confirmPasswordOpen, setConfirmPasswordOpen] = useState(false);
+  const [tempFormValues, setTempFormValues] = useState<FormValues | null>(null);
   const [confirmPasswordErrorMessage, setConfirmPasswordDeleteErrorMessage] = useState("");
+
   const [deleteAccountOpen, setDeleteAccountOpen] = useState(false);
   const [hasDeleteErrors, setHasDeleteErrors] = useState(false);
   const [deleteErrorMessage, setDeleteErrorMessage] = useState("");
-
   const form = useForm<DeleteAccountValues>();
 
-  const emailMd5 = crypto
-    .createHash("md5")
-    .update(user?.email || "example@example.com")
-    .digest("hex");
-
   const onDeleteMeSuccessMutation = async () => {
     await utils.viewer.me.invalidate();
     showToast(t("Your account was deleted"), "success");
@@ -100,7 +111,7 @@ const ProfileView = () => {
 
   const confirmPasswordMutation = trpc.viewer.auth.verifyPassword.useMutation({
     onSuccess() {
-      mutation.mutate(formMethods.getValues());
+      if (tempFormValues) mutation.mutate(tempFormValues);
       setConfirmPasswordOpen(false);
     },
     onError() {
@@ -146,6 +157,7 @@ const ProfileView = () => {
       deleteMeWithoutPasswordMutation.mutate();
     }
   };
+
   const onConfirm = ({ totpCode }: DeleteAccountValues, e: BaseSyntheticEvent | undefined) => {
     e?.preventDefault();
     if (isCALIdentityProviver) {
@@ -156,38 +168,6 @@ const ProfileView = () => {
     }
   };
 
-  const formMethods = useForm({
-    defaultValues: {
-      username: "",
-      avatar: "",
-      name: "",
-      email: "",
-      bio: "",
-    },
-  });
-
-  const {
-    reset,
-    formState: { isSubmitting, isDirty },
-  } = formMethods;
-
-  useEffect(() => {
-    if (user) {
-      reset(
-        {
-          avatar: user?.avatar || "",
-          username: user?.username || "",
-          name: user?.name || "",
-          email: user?.email || "",
-          bio: user?.bio || "",
-        },
-        {
-          keepDirtyValues: true,
-        }
-      );
-    }
-  }, [reset, user]);
-
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const passwordRef = useRef<HTMLInputElement>(null!);
 
@@ -199,143 +179,100 @@ const ProfileView = () => {
     [ErrorCode.InternalServerError]: `${t("something_went_wrong")} ${t("please_try_again_and_contact_us")}`,
     [ErrorCode.ThirdPartyIdentityProviderEnabled]: t("account_created_with_identity_provider"),
   };
-  const onSuccessfulUsernameUpdate = async () => {
-    showToast(t("settings_updated_successfully"), "success");
-    await utils.viewer.me.invalidate();
-  };
 
-  const onErrorInUsernameUpdate = () => {
-    showToast(t("error_updating_settings"), "error");
-  };
+  if (isLoading || !user || isLoadingAvatar || !avatar)
+    return <SkeletonLoader title={t("profile")} description={t("profile_description")} />;
 
-  if (isLoading || !user) return <SkeletonLoader />;
-  const isDisabled = isSubmitting || !isDirty;
+  const defaultValues = {
+    username: user.username || "",
+    avatar: avatar.avatar || "",
+    name: user.name || "",
+    email: user.email || "",
+    bio: user.bio || "",
+  };
 
   return (
     <>
-      <Form
-        form={formMethods}
-        handleSubmit={(values) => {
-          if (values.email !== user?.email && isCALIdentityProviver) {
+      <Meta title={t("profile")} description={t("profile_description", { appName: APP_NAME })} />
+      <ProfileForm
+        key={JSON.stringify(defaultValues)}
+        defaultValues={defaultValues}
+        onSubmit={(values) => {
+          if (values.email !== user.email && isCALIdentityProviver) {
+            setTempFormValues(values);
             setConfirmPasswordOpen(true);
           } else {
             mutation.mutate(values);
           }
-        }}>
-        <Meta title="Profile" description={t("profile_description", { appName: APP_NAME })} />
-        <div className="flex items-center">
-          <Controller
-            control={formMethods.control}
-            name="avatar"
-            render={({ field: { value } }) => (
-              <>
-                <Avatar alt="" imageSrc={value} gravatarFallbackMd5={emailMd5} size="lg" />
-                <div className="ml-4">
-                  <ImageUploader
-                    target="avatar"
-                    id="avatar-upload"
-                    buttonMsg={t("change_avatar")}
-                    handleAvatarChange={(newAvatar) => {
-                      formMethods.setValue("avatar", newAvatar, { shouldDirty: true });
-                    }}
-                    imageSrc={value}
-                  />
-                </div>
-              </>
+        }}
+        extraField={
+          <div className="mt-8">
+            <UsernameAvailabilityField
+              user={user}
+              onSuccessMutation={async () => {
+                showToast(t("settings_updated_successfully"), "success");
+                await utils.viewer.me.invalidate();
+              }}
+              onErrorMutation={() => {
+                showToast(t("error_updating_settings"), "error");
+              }}
+            />
+          </div>
+        }
+      />
+
+      <hr className="my-6  border-neutral-200" />
+
+      <Label>{t("danger_zone")}</Label>
+      {/* Delete account Dialog */}
+      <Dialog open={deleteAccountOpen} onOpenChange={setDeleteAccountOpen}>
+        <DialogTrigger asChild>
+          <Button
+            data-testid="delete-account"
+            color="destructive"
+            className="mt-1 border-2"
+            StartIcon={Icon.FiTrash2}>
+            {t("delete_account")}
+          </Button>
+        </DialogTrigger>
+        <DialogContent
+          title={t("delete_account_modal_title")}
+          description={t("confirm_delete_account_modal", { appName: APP_NAME })}
+          type="creation"
+          Icon={Icon.FiAlertTriangle}>
+          <>
+            <p className="mb-7">{t("delete_account_confirmation_message", { appName: APP_NAME })}</p>
+            {isCALIdentityProviver && (
+              <PasswordField
+                data-testid="password"
+                name="password"
+                id="password"
+                autoComplete="current-password"
+                required
+                label="Password"
+                ref={passwordRef}
+              />
             )}
-          />
-        </div>
-        <div className="mt-8">
-          <Controller
-            control={formMethods.control}
-            name="username"
-            render={({ field: { ref, onChange, value } }) => {
-              return (
-                <UsernameAvailability
-                  currentUsername={user?.username || ""}
-                  inputUsernameValue={value}
-                  usernameRef={ref}
-                  setInputUsernameValue={onChange}
-                  onSuccessMutation={onSuccessfulUsernameUpdate}
-                  onErrorMutation={onErrorInUsernameUpdate}
-                  user={user}
-                />
-              );
-            }}
-          />
-        </div>
-        <div className="mt-8">
-          <TextField label={t("full_name")} {...formMethods.register("name")} />
-        </div>
-        <div className="mt-8">
-          <TextField label={t("email")} hint={t("change_email_hint")} {...formMethods.register("email")} />
-        </div>
-        <div className="mt-8">
-          <TextField label={t("about")} hint={t("bio_hint")} {...formMethods.register("bio")} />
-        </div>
 
-        <Button
-          disabled={isDisabled}
-          color="primary"
-          className="mt-8"
-          type="submit"
-          loading={mutation.isLoading}>
-          {t("update")}
-        </Button>
+            {user?.twoFactorEnabled && isCALIdentityProviver && (
+              <Form handleSubmit={onConfirm} className="pb-4" form={form}>
+                <TwoFactor center={false} />
+              </Form>
+            )}
 
-        <hr className="my-6  border-neutral-200" />
-
-        <Label>{t("danger_zone")}</Label>
-        {/* Delete account Dialog */}
-        <Dialog open={deleteAccountOpen} onOpenChange={setDeleteAccountOpen}>
-          <DialogTrigger asChild>
-            <Button
-              data-testid="delete-account"
-              color="destructive"
-              className="mt-1 border-2"
-              StartIcon={Icon.FiTrash2}>
-              {t("delete_account")}
-            </Button>
-          </DialogTrigger>
-          <DialogContent
-            title={t("delete_account_modal_title")}
-            description={t("confirm_delete_account_modal", { appName: APP_NAME })}
-            type="creation"
-            Icon={Icon.FiAlertTriangle}>
-            <>
-              <p className="mb-7">{t("delete_account_confirmation_message", { appName: APP_NAME })}</p>
-              {isCALIdentityProviver && (
-                <PasswordField
-                  data-testid="password"
-                  name="password"
-                  id="password"
-                  autoComplete="current-password"
-                  required
-                  label="Password"
-                  ref={passwordRef}
-                />
-              )}
-
-              {user?.twoFactorEnabled && isCALIdentityProviver && (
-                <Form handleSubmit={onConfirm} className="pb-4" form={form}>
-                  <TwoFactor center={false} />
-                </Form>
-              )}
-
-              {hasDeleteErrors && <Alert severity="error" title={deleteErrorMessage} />}
-              <DialogFooter>
-                <Button
-                  color="primary"
-                  data-testid="delete-account-confirm"
-                  onClick={(e) => onConfirmButton(e)}>
-                  {t("delete_my_account")}
-                </Button>
-                <DialogClose />
-              </DialogFooter>
-            </>
-          </DialogContent>
-        </Dialog>
-      </Form>
+            {hasDeleteErrors && <Alert severity="error" title={deleteErrorMessage} />}
+            <DialogFooter>
+              <Button
+                color="primary"
+                data-testid="delete-account-confirm"
+                onClick={(e) => onConfirmButton(e)}>
+                {t("delete_my_account")}
+              </Button>
+              <DialogClose />
+            </DialogFooter>
+          </>
+        </DialogContent>
+      </Dialog>
 
       {/* If changing email, confirm password */}
       <Dialog open={confirmPasswordOpen} onOpenChange={setConfirmPasswordOpen}>
@@ -369,6 +306,83 @@ const ProfileView = () => {
   );
 };
 
+const ProfileForm = ({
+  defaultValues,
+  onSubmit,
+  extraField,
+}: {
+  defaultValues: FormValues;
+  onSubmit: (values: FormValues) => void;
+  extraField?: React.ReactNode;
+}) => {
+  const { t } = useLocale();
+  const emailMd5 = crypto
+    .createHash("md5")
+    .update(defaultValues.email || "example@example.com")
+    .digest("hex");
+
+  const formMethods = useForm<FormValues>({
+    defaultValues,
+  });
+
+  const {
+    formState: { isSubmitting, isDirty },
+  } = formMethods;
+
+  const isDisabled = isSubmitting || !isDirty;
+
+  return (
+    <Form form={formMethods} handleSubmit={onSubmit}>
+      <div className="flex items-center">
+        <Controller
+          control={formMethods.control}
+          name="avatar"
+          render={({ field: { value } }) => (
+            <>
+              <Avatar alt="" imageSrc={value} gravatarFallbackMd5={emailMd5} size="lg" />
+              <div className="ml-4">
+                <ImageUploader
+                  target="avatar"
+                  id="avatar-upload"
+                  buttonMsg={t("change_avatar")}
+                  handleAvatarChange={(newAvatar) => {
+                    formMethods.setValue("avatar", newAvatar, { shouldDirty: true });
+                  }}
+                  imageSrc={value || undefined}
+                />
+              </div>
+            </>
+          )}
+        />
+      </div>
+      {extraField}
+      <div className="mt-8">
+        <TextField label={t("full_name")} {...formMethods.register("name")} />
+      </div>
+      <div className="mt-8">
+        <TextField label={t("email")} hint={t("change_email_hint")} {...formMethods.register("email")} />
+      </div>
+      <div className="mt-8">
+        <TextField label={t("about")} hint={t("bio_hint")} {...formMethods.register("bio")} />
+      </div>
+
+      <Button disabled={isDisabled} color="primary" className="mt-8" type="submit">
+        {t("update")}
+      </Button>
+    </Form>
+  );
+};
+
 ProfileView.getLayout = getLayout;
 
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};
+
 export default ProfileView;

apps/web/pages/settings/security/impersonation.tsx

@@ -1,3 +1,4 @@
+import { GetServerSidePropsContext } from "next";
 import { useForm } from "react-hook-form";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -13,6 +14,8 @@ import {
   Switch,
 } from "@calcom/ui";
 
+import { ssrInit } from "@server/lib/ssr";
+
 const ProfileImpersonationView = () => {
   const { t } = useLocale();
   const utils = trpc.useContext();
@@ -39,7 +42,7 @@ const ProfileImpersonationView = () => {
 
   return (
     <>
-      <Meta title="Impersonation Settings" description="" />
+      <Meta title={t("impersonation")} description={t("impersonation_description")} />
       <Form
         form={formMethods}
         handleSubmit={({ disableImpersonation }) => {
@@ -74,4 +77,14 @@ const ProfileImpersonationView = () => {
 
 ProfileImpersonationView.getLayout = getLayout;
 
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};
+
 export default ProfileImpersonationView;

apps/web/pages/settings/security/password.tsx

@@ -1,4 +1,5 @@
 import { IdentityProvider } from "@prisma/client";
+import { GetServerSidePropsContext } from "next";
 import { Trans } from "next-i18next";
 import { useForm } from "react-hook-form";
 
@@ -7,6 +8,8 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc/react";
 import { Button, Form, getSettingsLayout as getLayout, Meta, PasswordField, showToast } from "@calcom/ui";
 
+import { ssrInit } from "@server/lib/ssr";
+
 type ChangePasswordFormValues = {
   oldPassword: string;
   newPassword: string;
@@ -92,4 +95,14 @@ const PasswordView = () => {
 
 PasswordView.getLayout = getLayout;
 
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};
+
 export default PasswordView;

apps/web/pages/settings/security/sso.tsx

@@ -1 +1,15 @@
+import { GetServerSidePropsContext } from "next";
+
+import { ssrInit } from "@server/lib/ssr";
+
 export { default } from "@calcom/features/ee/sso/page/user-sso-view";
+
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};

apps/web/pages/settings/security/two-factor-auth.tsx

@@ -1,12 +1,37 @@
+import { GetServerSidePropsContext } from "next";
 import { useState } from "react";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc/react";
-import { Badge, getSettingsLayout as getLayout, Loader, Meta, Switch } from "@calcom/ui";
+import {
+  Badge,
+  getSettingsLayout as getLayout,
+  Meta,
+  Switch,
+  SkeletonButton,
+  SkeletonContainer,
+  SkeletonText,
+} from "@calcom/ui";
 
 import DisableTwoFactorModal from "@components/settings/DisableTwoFactorModal";
 import EnableTwoFactorModal from "@components/settings/EnableTwoFactorModal";
 
+import { ssrInit } from "@server/lib/ssr";
+
+const SkeletonLoader = ({ title, description }: { title: string; description: string }) => {
+  return (
+    <SkeletonContainer>
+      <Meta title={title} description={description} />
+      <div className="mt-6 mb-8 space-y-6 divide-y">
+        <div className="flex items-center">
+          <SkeletonButton className="mr-6 h-8 w-20 rounded-md p-5" />
+          <SkeletonText className="h-8 w-full" />
+        </div>
+      </div>
+    </SkeletonContainer>
+  );
+};
+
 const TwoFactorAuthView = () => {
   const utils = trpc.useContext();
 
@@ -16,11 +41,11 @@ const TwoFactorAuthView = () => {
   const [enableModalOpen, setEnableModalOpen] = useState(false);
   const [disableModalOpen, setDisableModalOpen] = useState(false);
 
-  if (isLoading) return <Loader />;
+  if (isLoading) return <SkeletonLoader title={t("2fa")} description={t("2fa_description")} />;
 
   return (
     <>
-      <Meta title="Two-Factor Authentication" description="Manage settings for your account passwords" />
+      <Meta title={t("2fa")} description={t("2fa_description")} />
       <div className="mt-6 flex items-start space-x-4">
         <Switch
           checked={user?.twoFactorEnabled}
@@ -35,7 +60,7 @@ const TwoFactorAuthView = () => {
               {user?.twoFactorEnabled ? t("enabled") : t("disabled")}
             </Badge>
           </div>
-          <p className="text-sm text-gray-600">Add an extra layer of security to your account.</p>
+          <p className="text-sm text-gray-600">{t("add_an_extra_layer_of_security")}</p>
         </div>
       </div>
 
@@ -68,4 +93,14 @@ const TwoFactorAuthView = () => {
 
 TwoFactorAuthView.getLayout = getLayout;
 
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};
+
 export default TwoFactorAuthView;

apps/web/pages/settings/teams/[id]/appearance.tsx

@@ -1 +1,15 @@
+import { GetServerSidePropsContext } from "next";
+
+import { ssrInit } from "@server/lib/ssr";
+
 export { default } from "@calcom/features/ee/teams/pages/team-appearance-view";
+
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};

apps/web/pages/settings/teams/[id]/billing.tsx

@@ -1 +1,15 @@
+import { GetServerSidePropsContext } from "next";
+
+import { ssrInit } from "@server/lib/ssr";
+
 export { default } from "@calcom/features/ee/teams/pages/team-billing-view";
+
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};

apps/web/pages/settings/teams/[id]/members.tsx

@@ -1 +1,15 @@
+import { GetServerSidePropsContext } from "next";
+
+import { ssrInit } from "@server/lib/ssr";
+
 export { default } from "@calcom/features/ee/teams/pages/team-members-view";
+
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};

apps/web/pages/settings/teams/[id]/profile.tsx

@@ -1 +1,15 @@
+import { GetServerSidePropsContext } from "next";
+
+import { ssrInit } from "@server/lib/ssr";
+
 export { default } from "@calcom/features/ee/teams/pages/team-profile-view";
+
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};

apps/web/pages/settings/teams/[id]/sso.tsx

@@ -1 +1,15 @@
+import { GetServerSidePropsContext } from "next";
+
+import { ssrInit } from "@server/lib/ssr";
+
 export { default } from "@calcom/features/ee/sso/page/teams-sso-view";
+
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};

apps/web/pages/settings/teams/new/index.tsx

@@ -1,14 +1,19 @@
+import { GetServerSidePropsContext } from "next";
 import Head from "next/head";
 
 import { CreateANewTeamForm } from "@calcom/features/ee/teams/components";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { getWizardLayout as getLayout } from "@calcom/ui";
 
+import { ssrInit } from "@server/lib/ssr";
+
 const CreateNewTeamPage = () => {
+  const { t } = useLocale();
   return (
     <>
       <Head>
-        <title>Create a new Team</title>
-        <meta name="description" content="Create a new team to ease your organisational booking" />
+        <title>{t("create_new_team")}</title>
+        <meta name="description" content={t("create_new_team_description")} />
       </Head>
       <CreateANewTeamForm />
     </>
@@ -17,4 +22,14 @@ const CreateNewTeamPage = () => {
 
 CreateNewTeamPage.getLayout = getLayout;
 
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};
+
 export default CreateNewTeamPage;

apps/web/pages/team/[slug].tsx

@@ -1,4 +1,3 @@
-import { UserPlan } from "@prisma/client";
 import classNames from "classnames";
 import { GetServerSidePropsContext } from "next";
 import Link from "next/link";
@@ -14,7 +13,6 @@ import { getTeamWithMembers } from "@calcom/lib/server/queries/teams";
 import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
 import { Avatar, Button, EventTypeDescription, Icon } from "@calcom/ui";
 
-import { useExposePlanGlobally } from "@lib/hooks/useExposePlanGlobally";
 import { useToggleQuery } from "@lib/hooks/useToggleQuery";
 import { inferSSRProps } from "@lib/types/inferSSRProps";
 
@@ -27,7 +25,6 @@ function TeamPage({ team }: TeamPageProps) {
   useTheme();
   const showMembers = useToggleQuery("members");
   const { t } = useLocale();
-  useExposePlanGlobally("PRO");
   const isEmbed = useIsEmbed();
   const telemetry = useTelemetry();
   const router = useRouter();
@@ -137,10 +134,6 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
 
   if (!team) return { notFound: true } as { notFound: true };
 
-  const members = team.members.filter((member) => member.plan !== UserPlan.FREE);
-
-  team.members = members ?? [];
-
   team.eventTypes = team.eventTypes.map((type) => ({
     ...type,
     users: type.users.map((user) => ({

apps/web/pages/team/[slug]/[type].tsx

@@ -1,4 +1,3 @@
-import { UserPlan } from "@prisma/client";
 import { GetServerSidePropsContext } from "next";
 
 import { privacyFilteredLocations, LocationObject } from "@calcom/core/location";
@@ -43,6 +42,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
       name: true,
       slug: true,
       logo: true,
+      hideBranding: true,
       eventTypes: {
         where: {
           slug: typeParam,
@@ -59,7 +59,6 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
               username: true,
               timeZone: true,
               hideBranding: true,
-              plan: true,
               brandColor: true,
               darkBrandColor: true,
             },
@@ -129,7 +128,6 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
       name: user.name,
       username: user.username,
       hideBranding: user.hideBranding,
-      plan: user.plan,
       timeZone: user.timeZone,
     })),
   });
@@ -143,8 +141,6 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
 
   return {
     props: {
-      // Team is always pro
-      plan: "PRO" as UserPlan,
       profile: {
         name: team.name || team.slug,
         slug: team.slug,
@@ -160,6 +156,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
       previousPage: context.req.headers.referer ?? null,
       booking,
       trpcState: ssg.dehydrate(),
+      isBrandingHidden: team.hideBranding,
     },
   };
 };

apps/web/pages/team/[slug]/book.tsx

@@ -4,7 +4,7 @@ import { JSONObject } from "superjson/dist/types";
 import { LocationObject, privacyFilteredLocations } from "@calcom/app-store/locations";
 import { parseRecurringEvent } from "@calcom/lib";
 import prisma from "@calcom/prisma";
-import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
+import { customInputSchema, EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
 
 import { asStringOrNull, asStringOrThrow } from "@lib/asStringOrNull";
 import getBooking, { GetBookingType } from "@lib/getBooking";
@@ -96,6 +96,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
       metadata: EventTypeMetaDataSchema.parse(eventType.metadata || {}),
       periodStartDate: e.periodStartDate?.toString() ?? null,
       periodEndDate: e.periodEndDate?.toString() ?? null,
+      customInputs: customInputSchema.array().parse(e.customInputs || []),
       users: eventType.users.map((u) => ({
         id: u.id,
         name: u.name,

apps/web/pages/teams/index.tsx

@@ -1,8 +1,12 @@
+import { GetServerSidePropsContext } from "next";
+
 import { TeamsListing } from "@calcom/features/ee/teams/components";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Button, Icon, Shell } from "@calcom/ui";
 
+import { ssrInit } from "@server/lib/ssr";
+
 function Teams() {
   const { t } = useLocale();
   return (
@@ -22,4 +26,14 @@ function Teams() {
 
 Teams.requiresLicense = false;
 
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};
+
 export default Teams;

apps/web/pages/workflows/index.tsx

@@ -1 +1,15 @@
+import { GetServerSidePropsContext } from "next";
+
+import { ssrInit } from "@server/lib/ssr";
+
 export { default } from "@calcom/features/ee/workflows/pages/index";
+
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const ssr = await ssrInit(context);
+
+  return {
+    props: {
+      trpcState: ssr.dehydrate(),
+    },
+  };
+};

apps/web/playwright/booking-pages.e2e.ts

@@ -13,7 +13,7 @@ test.describe.configure({ mode: "parallel" });
 
 test.describe("free user", () => {
   test.beforeEach(async ({ page, users }) => {
-    const free = await users.create({ plan: "FREE" });
+    const free = await users.create();
     await page.goto(`/${free.username}`);
   });
   test.afterEach(async ({ users }) => {

apps/web/playwright/change-username.e2e.ts

@@ -1,8 +1,5 @@
 import { expect } from "@playwright/test";
-import { UserPlan } from "@prisma/client";
 
-import { getFreePlanPrice, getProPlanPrice } from "@calcom/app-store/stripepayment/lib/utils";
-import dayjs from "@calcom/dayjs";
 import stripe from "@calcom/features/ee/payments/server/stripe";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 
@@ -27,7 +24,7 @@ test.describe("Change username on settings", () => {
 
   /** TODO: Find out why it's timing out */
   test.fixme("User can change username", async ({ page, users, prisma }) => {
-    const user = await users.create({ plan: UserPlan.TRIAL });
+    const user = await users.create();
 
     await user.login();
     // Try to go homepage
@@ -50,28 +47,13 @@ test.describe("Change username on settings", () => {
     expect(newUpdatedUser.username).toBe("demousernamex");
   });
 
-  test("User trial can update to PREMIUM username", async ({ page, users }, testInfo) => {
+  test("User can update to PREMIUM username", async ({ page, users }, testInfo) => {
     // eslint-disable-next-line playwright/no-skipped-test
     test.skip(!IS_STRIPE_ENABLED, "It should only run if Stripe is installed");
     test.skip(IS_SELF_HOSTED, "It shouldn't run on self hosted");
 
-    const user = await users.create({ plan: UserPlan.TRIAL });
-    const customer = await stripe.customers.create({ email: `${user?.username}@example.com` });
-    await stripe.subscriptionSchedules.create({
-      customer: customer.id,
-      start_date: "now",
-      end_behavior: "release",
-      phases: [
-        {
-          items: [{ price: getProPlanPrice() }],
-          trial_end: dayjs().add(14, "day").unix(),
-          end_date: dayjs().add(14, "day").unix(),
-        },
-        {
-          items: [{ price: getFreePlanPrice() }],
-        },
-      ],
-    });
+    const user = await users.create();
+    await stripe.customers.create({ email: `${user?.username}@example.com` });
 
     await user.login();
     await page.goto("/settings/my-account/profile");
@@ -97,50 +79,4 @@ test.describe("Change username on settings", () => {
 
     await expect(page).toHaveURL(/.*checkout.stripe.com/);
   });
-
-  test("User PRO can update to PREMIUM username", async ({ page, users }, testInfo) => {
-    // eslint-disable-next-line playwright/no-skipped-test
-    test.skip(!IS_STRIPE_ENABLED, "It should only run if Stripe is installed");
-    test.skip(IS_SELF_HOSTED, "It shouldn't run on self hosted");
-    const user = await users.create({ plan: UserPlan.PRO });
-    const customer = await stripe.customers.create({ email: `${user?.username}@example.com` });
-    const paymentMethod = await stripe.paymentMethods.create({
-      type: "card",
-      card: {
-        number: "4242424242424242",
-        cvc: "123",
-        exp_month: 12,
-        exp_year: 2040,
-      },
-    });
-    await stripe.paymentMethods.attach(paymentMethod.id, { customer: customer.id });
-    await stripe.subscriptions.create({
-      customer: customer.id,
-      items: [{ price: getProPlanPrice() }],
-    });
-
-    await user.login();
-    await page.goto("/settings/profile");
-
-    // Change username from normal to premium
-    const usernameInput = page.locator("[data-testid=username-input]");
-
-    await usernameInput.fill(`xx${testInfo.workerIndex}`);
-
-    // Click on save button
-    await page.click('button[type="submit"]');
-
-    // Validate modal text fields
-    const currentUsernameText = page.locator("[data-testid=current-username]").innerText();
-    const newUsernameText = page.locator("[data-testid=new-username]").innerText();
-
-    expect(currentUsernameText).not.toBe(newUsernameText);
-
-    // Click on Go to billing
-    await page.click("[data-testid=go-to-billing]", { timeout: 300 });
-
-    await page.waitForLoadState();
-
-    await expect(page).toHaveURL(/.*billing.stripe.com/);
-  });
 });

apps/web/playwright/dynamic-booking-pages.e2e.ts

@@ -10,7 +10,7 @@ import {
 test("dynamic booking", async ({ page, users }) => {
   const pro = await users.create();
   await pro.login();
-  const free = await users.create({ plan: "FREE" });
+  const free = await users.create({ username: "free" });
   await page.goto(`/${pro.username}+${free.username}`);
 
   await test.step("book an event first day in next month", async () => {

apps/web/playwright/event-types.e2e.ts

@@ -120,37 +120,7 @@ test.describe("Event Types tests", () => {
       });
       await page.locator("[data-testid=update-eventtype]").click();
       const toast = await page.waitForSelector("div[class*='data-testid-toast-success']");
-      await expect(toast).toBeTruthy();
-    });
-  });
-
-  test.describe("free user", () => {
-    test.beforeEach(async ({ page, users }) => {
-      const free = await users.create({ plan: "FREE" });
-      await free.login();
-      await page.goto("/event-types");
-      // We wait until loading is finished
-      await page.waitForSelector('[data-testid="event-types"]');
-    });
-
-    test("has at least 2 events where first is enabled", async ({ page }) => {
-      const $eventTypes = page.locator("[data-testid=event-types] > li a");
-      const count = await $eventTypes.count();
-      expect(count).toBeGreaterThanOrEqual(2);
-    });
-
-    test("edit first event", async ({ page }) => {
-      const $eventTypes = page.locator("[data-testid=event-types] > li a");
-      const firstEventTypeElement = $eventTypes.first();
-      await firstEventTypeElement.click();
-      await page.waitForNavigation({
-        url: (url) => {
-          return !!url.pathname.match(/\/event-types\/.+/);
-        },
-      });
-      await page.locator("[data-testid=update-eventtype]").click();
-      const toast = await page.waitForSelector("div[class*='data-testid-toast-success']");
-      await expect(toast).toBeTruthy();
+      expect(toast).toBeTruthy();
     });
   });
 });

apps/web/playwright/fixtures/users.ts

@@ -1,6 +1,6 @@
 import type { Page, WorkerInfo } from "@playwright/test";
 import type Prisma from "@prisma/client";
-import { Prisma as PrismaType, UserPlan } from "@prisma/client";
+import { Prisma as PrismaType } from "@prisma/client";
 import { hash } from "bcryptjs";
 
 import dayjs from "@calcom/dayjs";
@@ -238,7 +238,7 @@ const createUserFixture = (user: UserWithIncludes, page: Page) => {
   };
 };
 
-type CustomUserOptsKeys = "username" | "password" | "plan" | "completedOnboarding" | "locale" | "name";
+type CustomUserOptsKeys = "username" | "password" | "completedOnboarding" | "locale" | "name";
 type CustomUserOpts = Partial<Pick<Prisma.User, CustomUserOptsKeys>> & { timeZone?: TimeZoneEnum };
 
 // creates the actual user in the db.
@@ -247,13 +247,10 @@ const createUser = async (
   opts?: CustomUserOpts | null
 ): Promise<PrismaType.UserCreateInput> => {
   // build a unique name for our user
-  const uname = `${opts?.username ?? opts?.plan?.toLocaleLowerCase() ?? UserPlan.PRO.toLowerCase()}-${
-    workerInfo.workerIndex
-  }-${Date.now()}`;
+  const uname = `${opts?.username}-${workerInfo.workerIndex}-${Date.now()}`;
   return {
     username: uname,
-    name: opts?.name === undefined ? (opts?.plan ?? UserPlan.PRO).toUpperCase() : opts?.name,
-    plan: opts?.plan ?? UserPlan.PRO,
+    name: opts?.name,
     email: `${uname}@example.com`,
     password: await hashPassword(uname),
     emailVerified: new Date(),

apps/web/playwright/login.e2e.ts

@@ -1,5 +1,4 @@
 import { expect } from "@playwright/test";
-import { UserPlan } from "@prisma/client";
 
 import { login } from "./fixtures/users";
 import { test } from "./lib/fixtures";
@@ -13,10 +12,10 @@ test.describe("user can login & logout succesfully", async () => {
   test.afterAll(async ({ users }) => {
     await users.deleteAll();
   });
-  test("login flow TRAIL user & logout using dashboard", async ({ page, users }) => {
+  test("login flow user & logout using dashboard", async ({ page, users }) => {
     // log in trail user
     await test.step("Log in", async () => {
-      const user = await users.create({ plan: UserPlan.TRIAL });
+      const user = await users.create();
       await user.login();
 
       const shellLocator = page.locator(`[data-testid=dashboard-shell]`);
@@ -24,11 +23,6 @@ test.describe("user can login & logout succesfully", async () => {
       // expects the home page for an authorized user
       await page.goto("/");
       await expect(shellLocator).toBeVisible();
-
-      // Asserts to read the tested plan
-      const planLocator = shellLocator.locator(`[data-testid=plan-trial]`);
-      await expect(planLocator).toBeVisible();
-      await expect(planLocator).toHaveText("-TRIAL");
     });
 
     //
@@ -64,27 +58,6 @@ test.describe("Login and logout tests", () => {
     await expect(page.locator(`[data-testid=login-form]`)).toBeVisible();
   });
 
-  // Test login with all plans
-  const plans = [UserPlan.PRO, UserPlan.FREE];
-  plans.forEach((plan) => {
-    test(`Should login with a ${plan} account`, async ({ page, users }) => {
-      // Create user and login
-      const user = await users.create({ plan });
-      await user.login();
-
-      const shellLocator = page.locator(`[data-testid=dashboard-shell]`);
-
-      // expects the home page for an authorized user
-      await page.goto("/");
-      await expect(shellLocator).toBeVisible();
-
-      // Asserts to read the tested plan
-      const planLocator = shellLocator.locator(`[data-testid=plan-${plan.toLowerCase()}]`);
-      await expect(planLocator).toBeVisible();
-      await expect(planLocator).toHaveText(`-${plan}`);
-    });
-  });
-
   test.describe("Login flow validations", async () => {
     test("Should warn when user does not exist", async ({ page }) => {
       const alertMessage = (await localize("en"))("no_account_exists");

apps/web/playwright/onboarding.e2e.ts

@@ -1,6 +1,5 @@
 /* eslint-disable playwright/no-skipped-test */
 import { expect } from "@playwright/test";
-import { UserPlan } from "@prisma/client";
 
 import { test } from "./lib/fixtures";
 
@@ -9,7 +8,7 @@ test.describe.configure({ mode: "serial" });
 test.describe("Onboarding", () => {
   test.describe("Onboarding v2", () => {
     test("Onboarding Flow", async ({ page, users }) => {
-      const user = await users.create({ plan: UserPlan.TRIAL, completedOnboarding: false, name: null });
+      const user = await users.create({ completedOnboarding: false, name: null });
       await user.login();
 
       // tests whether the user makes it to /getting-started

apps/web/playwright/webhook.e2e.ts

@@ -65,6 +65,8 @@ test("add webhook & test that creating an event triggers a webhook call", async
   body.payload.additionalInformation = dynamic;
   body.payload.requiresConfirmation = dynamic;
   body.payload.eventTypeId = dynamic;
+  body.payload.videoCallData = dynamic;
+  body.payload.appsStatus = dynamic;
 
   // if we change the shape of our webhooks, we can simply update this by clicking `u`
   // console.log("BODY", body);

apps/web/playwright/webhook.e2e.ts-snapshots/webhookResponse--calcom-web.txt

@@ -1 +1 @@
-{"triggerEvent":"BOOKING_CREATED","createdAt":"[redacted/dynamic]","payload":{"type":"30 min","title":"30 min between PRO and Test Testson","description":"","additionalNotes":"","customInputs":{},"startTime":"[redacted/dynamic]","endTime":"[redacted/dynamic]","organizer":{"name":"PRO","email":"[redacted/dynamic]","timeZone":"[redacted/dynamic]","language":"[redacted/dynamic]"},"attendees":[{"email":"test@example.com","name":"Test Testson","timeZone":"[redacted/dynamic]","language":"[redacted/dynamic]"}],"location":"[redacted/dynamic]","destinationCalendar":null,"hideCalendarNotes":false,"requiresConfirmation":"[redacted/dynamic]","eventTypeId":"[redacted/dynamic]","seatsShowAttendees":false,"uid":"[redacted/dynamic]","eventTitle":"30 min","eventDescription":null,"price":0,"currency":"usd","length":30,"bookingId":"[redacted/dynamic]","metadata":{},"status":"ACCEPTED","additionalInformation":"[redacted/dynamic]"}}
+{"triggerEvent":"BOOKING_CREATED","createdAt":"[redacted/dynamic]","payload":{"type":"30 min","title":"30 min between Nameless and Test Testson","description":"","additionalNotes":"","customInputs":{},"startTime":"[redacted/dynamic]","endTime":"[redacted/dynamic]","organizer":{"name":"Nameless","email":"[redacted/dynamic]","timeZone":"[redacted/dynamic]","language":"[redacted/dynamic]"},"attendees":[{"email":"test@example.com","name":"Test Testson","timeZone":"[redacted/dynamic]","language":"[redacted/dynamic]"}],"location":"[redacted/dynamic]","destinationCalendar":null,"hideCalendarNotes":false,"requiresConfirmation":"[redacted/dynamic]","eventTypeId":"[redacted/dynamic]","seatsShowAttendees":false,"uid":"[redacted/dynamic]","videoCallData":"[redacted/dynamic]","appsStatus":"[redacted/dynamic]","eventTitle":"30 min","eventDescription":null,"price":0,"currency":"usd","length":30,"bookingId":"[redacted/dynamic]","metadata":{},"status":"ACCEPTED","additionalInformation":"[redacted/dynamic]"}}

apps/web/public/static/locales/ar/common.json

@@ -16,8 +16,8 @@
   "event_request_cancelled": "تم إلغاء حدثك المُجَدْوَل",
   "organizer": "المنظِّم",
   "need_to_reschedule_or_cancel": "هل تحتاج إلى إعادة جدولة أو إلغاء؟",
-  "cancellation_reason": "سبب الإلغاء",
-  "cancellation_reason_placeholder": "ما سبب الإلغاء؟ (اختياري)",
+  "cancellation_reason": "سبب الإلغاء (اختياري)",
+  "cancellation_reason_placeholder": "لماذا تلغي؟",
   "rejection_reason": "سبب الرفض",
   "rejection_reason_title": "رفض طلب الحجز؟",
   "rejection_reason_description": "هل أنت متأكد من رغبتك في رفض الحجز؟ سنقوم بإبلاغ الشخص الذي حاول الحجز. يمكنك تقديم سبب أدناه.",
@@ -109,7 +109,7 @@
   "upgrade_to_per_seat": "الترقية إلى \"كل مقعد بشكل منفرد\"",
   "team_upgrade_seats_details": "من بين {{memberCount}} من الأعضاء في فريقك، لم يتم الدفع مقابل {{unpaidCount}} من المقاعد. بما أن سعر المقعد ${{seatPrice}} شهريًا، تبلغ التكلفة الإجمالية المقدرة لعضويتك ${{totalCost}} شهريًا.",
   "team_upgrade_banner_description": "شكراً لك على تجربة خطة الفريق الجديدة التي نقدمها. لقد لاحظنا أن فريقك \"{{teamName}}\" بحاجة إلى الترقية.",
-  "team_upgrade_banner_action": "الترقية هنا",
+  "team_upgrade_banner_action": "قم بالترقية هنا",
   "team_upgraded_successfully": "تمت ترقية فريقك بنجاح!",
   "use_link_to_reset_password": "استخدم الرابط أدناه لإعادة تعيين كلمة المرور",
   "hey_there": "مرحبًا،",
@@ -419,7 +419,7 @@
   "forgotten_secret_description": "إذا فقدت هذا السر أو نسيته، يمكنك تغييره، ولكن ضع في اعتبارك أن جميع التكاملات التي تستخدم هذا السر ستحتاج إلى تحديث",
   "current_incorrect_password": "كلمة المرور الحالية غير صحيحة",
   "password_hint_caplow": "مزيج من الحروف الكبيرة والحروف الصغيرة",
-  "password_hint_min": "7 أحرف كحد أدنى",
+  "password_hint_min": "8 أحرف كحد أدنى",
   "password_hint_num": "يحتوي على رقم واحد على الأقل",
   "invalid_password_hint": "يجب أن تتألف كلمة المرور على الأقل من 7 أحرف، ورقم واحد على الأقل، ومزيج من الحروف الكبيرة والصغيرة",
   "incorrect_password": "كلمة المرور غير صحيحة.",
@@ -653,7 +653,7 @@
   "show_advanced_settings": "عرض الإعدادات المتقدمة",
   "event_name": "اسم الحدث",
   "event_name_tooltip": "الاسم الذي سيظهر في التقاويم",
-  "meeting_with_user": "الاجتماع مع {ATTENDEE}",
+  "meeting_with_user": "الاجتماع مع {{attendeeName}}",
   "additional_inputs": "مدخلات إضافية",
   "additional_input_description": "يتطلب من المجدول إدخال مدخلات إضافية قبل تأكيد الحجز",
   "label": "العلامة",
@@ -784,7 +784,7 @@
   "analytics": "التحليلات",
   "empty_installed_apps_headline": "لم يتم تثبيت أي تطبيق",
   "empty_installed_apps_description": "تعطيك التطبيقات القدرة على تعزيز سير عملك وتحسين الجدولة في حياتك بشدة.",
-  "empty_installed_apps_button": "استكشف App Store أو قم بالتثبيت من التطبيقات أدناه",
+  "empty_installed_apps_button": "تصفح متجر التطبيقات",
   "manage_your_connected_apps": "إدارة تطبيقاتك المثبتة أو تغيير الإعدادات",
   "browse_apps": "استعراض التطبيقات",
   "features": "الميزات",
@@ -1108,6 +1108,7 @@
   "incorrect_2fa": "رمز المصادقة الثنائية غير صحيح",
   "which_event_type_apply": "ما نوع الحدث الذي سينطبق عليه هذا؟",
   "no_workflows_description": "تعمل سير العمل على تمكين أتمتة إرسال الإشعارات والتذكيرات التي تمكنك من بناء عمليات حول الأحداث الخاصة بك.",
+  "timeformat_profile_hint": "هذا إعداد داخلي، ولن يؤثر على كيفية عرض الأوقات على صفحات الحجز العامة لديك أو لدى أي شخص يقوم بحجزك.",
   "create_workflow": "إنشاء سير عمل",
   "do_this": "افعل هذا",
   "turn_off": "إيقاف التشغيل",
@@ -1115,7 +1116,6 @@
   "error_updating_settings": "خطأ في تحديث الإعدادات",
   "personal_cal_url": "عنوان {{appName}} URL الخاص بي",
   "bio_hint": "اكتب بضع جمل عن نفسك، والتي ستظهر على صفحة عنوان Url الشخصية لديك.",
-  "timeformat_profile_hint": "هذا إعداد داخلي، ولن يؤثر على كيفية عرض الأوقات على صفحات الحجز العامة لديك أو لدى أي شخص يقوم بحجزك.",
   "delete_account_modal_title": "حذف الحساب",
   "confirm_delete_account_modal": "هل أنت متأكد من أنك تريد حذف حساب {{appName}} الخاص بك؟",
   "delete_my_account": "حذف حسابي",
@@ -1130,7 +1130,7 @@
   "removes_cal_branding": "إزالة أي علامات تجارية ذات صلة بـ{{appName}} ، أي 'تم تشغيلها من قبل {{appName}}.'",
   "profile_picture": "صورة الملف الشخصي",
   "upload": "تحميل",
-  "add_profile_photo": "إضافة صورة ملف تعريفي",
+  "add_profile_photo": "إضافة صورة الملف الشخصي",
   "web3": "Web3",
   "rainbow_token_gated": "يتم فتح هذا النوع من الأحداث برمز مميز.",
   "rainbow_connect_wallet_gate": "قم بربط محفظتك إذا كنت تملك <1>{{name}}</1> (<3>{{symbol}}</3>).",
@@ -1229,7 +1229,7 @@
   "exchange_compression": "ضغط Gzip",
   "routing_forms_description": "يمكنك رؤية جميع النماذج والتوجيهات التي أنشأتها هنا.",
   "routing_forms_send_email_owner": "إرسال رسالة إلكترونية إلى المالك",
-  "routing_forms_send_email_owner_description": "يرسل رسالة إلكترونية إلى المالك عند يتم تقديم الاستمارة",
+  "routing_forms_send_email_owner_description": "يرسل رسالة بريد إلكتروني إلى المالك عند إرسال النموذج",
   "add_new_form": "إضافة استمارة جديدة",
   "form_description": "قم بإنشاء النموذج الخاص بك لتوجيه صاحب حجز",
   "copy_link_to_form": "نسخ الرابط إلى النموذج",
@@ -1324,7 +1324,7 @@
   "saml_config_updated_successfully": "تم تحديث تهيئة SAML بنجاح",
   "saml_configuration": "تكوين SAML",
   "delete_saml_configuration": "حذف تكوين SAML",
-  "delete_saml_configuration_confirmation_message": "هل تريد بالتأكيد حذف تكوين SAML؟ لن يتمكن بعد الآن أعضاء فريقك الذين يستخدمون تسجيل الدخول عبر SAML من الوصول إلى {{appName}}.",
+  "delete_saml_configuration_confirmation_message": "هل تريد بالتأكيد حذف تكوين SAML؟ لن يتمكن بعد الآن أعضاء فريقك الذين يستخدمون تسجيل الدخول عبر SAML من الوصول إلى Cal.com.",
   "confirm_delete_saml_configuration": "نعم، احذف تكوين SAML",
   "saml_not_configured_yet": "لم يتم تكوين SAML حتى الآن",
   "saml_configuration_description": "يُرجى لصق بيانات تعريف SAML المقدمة من مزود الهوية في مربع النص أدناه لتحديث تكوين SAML.",
@@ -1342,15 +1342,15 @@
   "limit_future_bookings_description": "الحد من عدد مرات حجز هذا الحدث في المستقبل",
   "no_event_types": "لا يوجد إعداد لأنواع الأحداث",
   "no_event_types_description": "لم يتم إعداد أي نوع من الأحداث لك من قِبل {{name}}.",
-  "billing_frequency": "تواتر الفواتير",
-  "monthly": "شهرياً",
-  "yearly": "سنوياً",
+  "billing_frequency": "تواتر إصدار الفواتير",
+  "monthly": "شهريًا",
+  "yearly": "سنويًا",
   "checkout": "الدفع",
   "your_team_disbanded_successfully": "تم حل فريقك بنجاح",
   "error_creating_team": "خطأ في إنشاء فريق",
   "you": "أنت",
-  "send_email": "إرسال رسالة إلكترونية",
-  "member_already_invited": "تم بالفعل دعوة العضو",
+  "send_email": "إرسال بريد إلكتروني",
+  "member_already_invited": "تمت دعوة العضو بالفعل",
   "enter_email_or_username": "أدخل بريد إلكتروني أو اسم مستخدم",
   "team_name_taken": "هذا الاسم مأخوذ بالفعل",
   "must_enter_team_name": "يجب إدخال اسم فريق",
@@ -1360,15 +1360,15 @@
   "number_sms_notifications": "رقم الهاتف (إشعارات الرسائل النصية)",
   "attendee_email_workflow": "اسم الحاضر",
   "attendee_email_info": "البريد الإلكتروني للشخص الحجز",
-  "invalid_credential": "أوه لا! يبدو أن الصلاحية انتهت أو تم إلغاؤها. الرجاء إعادة التثبيت مرة أخرى.",
+  "invalid_credential": "لا! يبدو أن الصلاحية انتهت أو تم إلغاؤها. يرجى إعادة التثبيت مرة أخرى.",
   "choose_common_schedule_team_event": "اختر جدولاً زمنياً مشتركاً",
-  "choose_common_schedule_team_event_description": "قم بتمكين هذا إذا كنت ترغب في استخدام جدول زمني مشترك بين المضيفين. عند تعطيل هذا الخيار، سيتم حجز كل مضيف على أساس جدوله الافتراضي.",
+  "choose_common_schedule_team_event_description": "قم بتمكين هذا الخيار إذا كنت ترغب في استخدام جدول زمني مشترك بين المضيفين. عند تعطيل هذا الخيار، سيتم حجز كل مضيف على أساس جدوله الافتراضي.",
   "reason": "السبب",
   "sender_id": "معرّف المرسل",
-  "sender_id_error_message": "فقط الحروف والأرقام والمسافات مسموح بها (بحد أقصى 11 مِحرَفاً)",
+  "sender_id_error_message": "يسمح بالحروف والأرقام والمسافات فقط (بحد أقصى 11 حرفًا)",
   "test_routing_form": "اختبار استمارة إعادة التوجيه",
   "test_preview": "اختبار المعاينة",
   "route_to": "التوجيه إلى",
-  "test_preview_description": "اختبار نموذج التوجيه الخاص بك من دون تقديم أي بيانات",
+  "test_preview_description": "اختبار نموذج التوجيه الخاص بك دون تقديم أي بيانات",
   "test_routing": "اختبار التوجيه"
 }

apps/web/public/static/locales/cs/common.json

@@ -17,7 +17,7 @@
   "organizer": "Organizátor",
   "need_to_reschedule_or_cancel": "Přeplánovat nebo zrušit?",
   "cancellation_reason": "Důvod zrušení",
-  "cancellation_reason_placeholder": "Proč rušíte? (nepovinné)",
+  "cancellation_reason_placeholder": "Proč rušíte?\n",
   "rejection_reason": "Důvod odmítnutí",
   "rejection_reason_title": "Odmítnout žádost o rezervaci?",
   "rejection_reason_description": "Opravdu chcete rezervaci odmítnout? Osobě, která se váš čas pokusila rezervovat, dáme vědět. Níž můžete uvést důvod.",
@@ -653,7 +653,7 @@
   "show_advanced_settings": "Zobrazit pokročilá nastavení",
   "event_name": "Název události",
   "event_name_tooltip": "Název, který se zobrazí v kalendářích",
-  "meeting_with_user": "Schůzka s {ATTENDEE}",
+  "meeting_with_user": "Schůzka s {{attendeeName}}",
   "additional_inputs": "Další pole",
   "additional_input_description": "Před potvrzením rezervace vyžadovat od plánující osoby zadání dalších vstupů",
   "label": "Popisek",
@@ -736,6 +736,7 @@
   "toggle_calendars_conflict": "Zapněte kalendáře, u kterých chcete mít přehled o konfliktech a zabránit dvojí rezervaci.",
   "select_destination_calendar": "Vytvořit události v",
   "connect_additional_calendar": "Připojit další kalendář",
+  "calendar_updated_successfully": "Kalendář byl úspěšně aktualizován",
   "conferencing": "Konference",
   "calendar": "Kalendář",
   "payments": "Platby",
@@ -1108,6 +1109,7 @@
   "incorrect_2fa": "Nesprávný kód dvoufázového ověření",
   "which_event_type_apply": "Na jaký typ události se to bude vztahovat?",
   "no_workflows_description": "Pracovní postupy umožňují jednoduchou automatizaci zasílání oznámení a připomínek, což vám umožní vytvářet procesy v souvislosti s vašimi událostmi.",
+  "timeformat_profile_hint": "Jedná se o interní nastavení, které nemá vliv na to, jak se vám nebo komukoli, kdo vás rezervuje, na veřejných rezervačních stránkách zobrazují časy.",
   "create_workflow": "Vytvoření pracovního postupu",
   "do_this": "Provést",
   "turn_off": "Vypnout",
@@ -1115,7 +1117,6 @@
   "error_updating_settings": "Chyba při aktualizaci nastavení",
   "personal_cal_url": "Moje osobní adresa URL {{appName}}",
   "bio_hint": "Několik vět o vás. Obsah se zobrazí se na vaší osobní stránce URL.",
-  "timeformat_profile_hint": "Jedná se o interní nastavení, které nemá vliv na to, jak se vám nebo komukoli, kdo vás rezervuje, na veřejných rezervačních stránkách zobrazují časy.",
   "delete_account_modal_title": "Odstranit účet",
   "confirm_delete_account_modal": "Opravdu chcete odstranit svůj účet {{appName}}?",
   "delete_my_account": "Odstranit můj účet",
@@ -1350,17 +1351,17 @@
   "error_creating_team": "Chyba při vytváření týmu",
   "you": "Vy",
   "send_email": "Odeslat e-mail",
-  "member_already_invited": "Člen byl již pozván",
+  "member_already_invited": "Člen byl už pozván",
   "enter_email_or_username": "Zadejte e-mail nebo uživatelské jméno",
-  "team_name_taken": "Toto jméno je již obsazeno",
+  "team_name_taken": "Toto jméno je už obsazeno",
   "must_enter_team_name": "Musíte zadat název týmu",
   "team_url_required": "Musíte zadat adresu URL týmu",
-  "team_url_taken": "Tato adresa URL je již obsazená",
+  "team_url_taken": "Tato adresa URL je už obsazená",
   "team_publish": "Zveřejnit tým",
   "number_sms_notifications": "Číslo telefonu (SMS oznámení)",
   "attendee_email_workflow": "E-mail účastníka",
   "attendee_email_info": "E-mail osoby provádějící rezervaci",
-  "invalid_credential": "Ale ne! Zdá se, že platnost oprávnění vypršela nebo byla zrušena. Proveďte prosím novou instalaci.",
+  "invalid_credential": "Ale ne! Zdá se, že platnost oprávnění vypršela nebo byla zrušena. Proveďte  novou instalaci.",
   "choose_common_schedule_team_event": "Vyberte společný plán",
   "choose_common_schedule_team_event_description": "Tuto možnost povolte, pokud chcete používat společný plán mezi hostiteli. Při zakázání této možnosti bude každý hostitel rezervován na základě svého výchozího plánu.",
   "reason": "Důvod",
@@ -1368,7 +1369,7 @@
   "sender_id_error_message": "Povolena jsou pouze písmena, číslice a mezery (max. 11 znaků)",
   "test_routing_form": "Test směrovacího formuláře",
   "test_preview": "Testovací náhled",
-  "route_to": "Směrovat kam:",
+  "route_to": "Směrovat na",
   "test_preview_description": "Otestujte svůj směrovací formulář bez odeslání jakýchkoli dat",
   "test_routing": "Test směrování"
 }

apps/web/public/static/locales/de/common.json

@@ -6,9 +6,7 @@
   "second_other": "{{count}} Sekunden",
   "upgrade_now": "Jetzt upgraden",
   "accept_invitation": "Einladung annehmen",
-  "calcom_explained": "{{appName}} ist die Open Source Calendly Alternative, die Ihnen die Kontrolle über Ihre eigenen Daten, Workflow und Erscheinungsbild gibt.",
   "have_any_questions": "Haben Sie Fragen? Wir sind hier um Ihnen zu helfen.",
-  "reset_password_subject": "{{appName}}: Anleitung zum Zurücksetzen des Passworts",
   "event_declined_subject": "Abgelehnt: {{eventType}} mit {{name}} am {{date}}",
   "event_cancelled_subject": "Abgesagt: {{eventType}} mit {{name}} am {{date}}",
   "event_request_declined": "Ihre Event-Anfrage wurde abgelehnt",
@@ -16,7 +14,7 @@
   "event_request_cancelled": "Ihr geplanter Termin wurde abgesagt",
   "organizer": "Organisator",
   "need_to_reschedule_or_cancel": "Möchten Sie einen neuen Termin finden oder absagen?",
-  "cancellation_reason": "Grund für Ihre Absage",
+  "cancellation_reason": "Grund für Ihre Absage (optional)",
   "cancellation_reason_placeholder": "Warum sagen Sie ab? (optional)",
   "rejection_reason": "Grund für die Ablehnung",
   "rejection_reason_title": "Die Buchungsanfrage ablehnen?",
@@ -55,20 +53,20 @@
   "load_more_results": "Weitere Ergebnisse laden",
   "integration_meeting_id": "{{integrationName}} Termin-ID: {{meetingId}}",
   "confirmed_event_type_subject": "Bestätigt: {{eventType}} mit {{name}} am {{date}}",
-  "new_event_request": "Neue Event-Anfrage: {{attendeeName}} - {{date}} - {{eventType}}",
+  "new_event_request": "Neue Termin-Anfrage: {{attendeeName}} - {{date}} - {{eventType}}",
   "confirm_or_reject_request": "Anfrage bestätigen oder ablehnen",
   "check_bookings_page_to_confirm_or_reject": "Überprüfen Sie Ihre Buchungsseite, um die Buchung zu bestätigen oder abzulehnen.",
-  "event_awaiting_approval": "Ein neues Event wartet auf Ihre Bestätigung",
-  "event_awaiting_approval_recurring": "Ein wiederkehrender Termin wartet auf Ihre Genehmigung",
+  "event_awaiting_approval": "Ein neuer Termin wartet auf Ihre Bestätigung",
+  "event_awaiting_approval_recurring": "Ein wiederkehrender Termin wartet auf Ihre Bestätigung",
   "someone_requested_an_event": "Jemand hat eine Buchungsanfrage gestellt.",
   "someone_requested_password_reset": "Jemand hat einen Link angefordert, um Ihr Passwort zu ändern.",
   "password_reset_instructions": "Wenn Sie dies nicht angefordert haben, können Sie diese E-Mail sicher ignorieren und Ihr Passwort wird nicht geändert.",
   "event_awaiting_approval_subject": "Warte auf Bestätigung: {{eventType}} mit {{name}} um {{date}}",
-  "event_still_awaiting_approval": "Ein Event wartet noch auf Ihre Bestätigung",
+  "event_still_awaiting_approval": "Ein Termin wartet noch auf Ihre Bestätigung",
   "booking_submitted_subject": "Buchung eingereicht: {{eventType}} mit {{name}} am {{date}}",
   "your_meeting_has_been_booked": "Dein Termin wurde gebucht",
   "event_type_has_been_rescheduled_on_time_date": "Ihr {{eventType}} mit {{name}} wurde auf {{time}} ({{timeZone}}) am {{date}} verschoben.",
-  "event_has_been_rescheduled": "Ihr Event wurde verschoben.",
+  "event_has_been_rescheduled": "Ihr Termin wurde verschoben.",
   "request_reschedule_title_attendee": "Anfrage zur Neuplanung Ihrer Buchung",
   "request_reschedule_subtitle": "{{organizer}} hat die Buchung storniert und Sie gebeten, eine andere Zeit auszuwählen.",
   "request_reschedule_title_organizer": "Sie haben {{attendee}} zur Neuplanung aufgefordert",
@@ -76,7 +74,7 @@
   "rescheduled_event_type_subject": "Anfrage für Neuplanung gesendet: {{eventType}} mit {{name}} am {{date}}",
   "requested_to_reschedule_subject_attendee": "Aktion erforderlich - Neuplanung: Bitte buchen Sie eine neue Zeit für „{{eventType}}“ mit {{name}}",
   "reschedule_reason": "Grund für die Neuplanung",
-  "hi_user_name": "Hi {{userName}}",
+  "hi_user_name": "Hallo {{userName}}",
   "ics_event_title": "{{eventType}} mit {{name}}",
   "new_event_subject": "Neuer Termin: {{attendeeName}} - {{date}} - {{eventType}}",
   "join_by_entrypoint": "{{entryPoint}} beitreten",
@@ -99,9 +97,7 @@
   "join_team": "Team beitreten",
   "manage_this_team": "Dieses Team verwalten",
   "team_info": "Informationen zum Team",
-  "request_another_invitation_email": "Falls Sie {{toEmail}} lieber nicht als Ihre {{appName}}-E-Mail verwenden möchten oder bereits über ein {{appName}}-Konto verfügen, fordern Sie bitte eine weitere Einladung zu dieser E-Mail an.",
   "you_have_been_invited": "Sie wurden eingeladen, dem Team {{teamName}} beizutreten",
-  "user_invited_you": "{{user}} hat Sie eingeladen, dem Team {{teamName}} beizutreten",
   "hidden_team_member_title": "Sie sind in diesem Team ausgeblendet",
   "hidden_team_member_message": "Ihre Teammitgliedschaft ist nicht bezahlt, entweder upgraden Sie Ihren Account auf Pro oder lassen den Team-Organisator wissen, dass er für Ihren Platz im Team bezahlen kann.",
   "hidden_team_owner_message": "Sie benötigen einen Pro-Account um die Teamfunktionen zu verweden. Sie werden dem Team nicht angezeigt, bis der Account upgegradet wurde.",
@@ -113,8 +109,6 @@
   "team_upgraded_successfully": "Das Update für Ihr Team war erfolgreich!",
   "use_link_to_reset_password": "Benutzen Sie den Link, um Ihr Passwort zurückzusetzen",
   "hey_there": "Hallo,",
-  "forgot_your_password_calcom": "Passwort vergessen? - {{appName}}",
-  "delete_webhook_confirmation_message": "Sind Sie sicher, dass Sie diesen Webhook löschen möchten? Sie werden keine {{appName}} Termindaten mehr erhalten.",
   "confirm_delete_webhook": "Ja, Webhook löschen",
   "edit_webhook": "Webhook bearbeiten",
   "delete_webhook": "Webhook löschen",
@@ -124,7 +118,7 @@
   "webhook_response": "Webhook-Antwort",
   "webhook_test": "Webhook-Test",
   "manage_your_webhook": "Webhook verwalten",
-  "webhook_created_successfully": "Webhook erfolgreich aktualisiert!",
+  "webhook_created_successfully": "Webhook erfolgreich erstellt!",
   "webhook_updated_successfully": "Webhook erfolgreich aktualisiert!",
   "webhook_removed_successfully": "Webhook erfolgreich entfernt!",
   "payload_template": "Payload Vorlage",
@@ -148,7 +142,7 @@
   "install_another": "Weitere installieren",
   "until": "bis",
   "powered_by": "betrieben von",
-  "unavailable": "Unverfügbar",
+  "unavailable": "Nicht verfügbar",
   "set_work_schedule": "Arbeitszeiten festlegen",
   "change_bookings_availability": "Verfügbarkeit für Buchungen ändern",
   "select": "Auswählen...",
@@ -184,15 +178,14 @@
   "register": "Registrieren",
   "page_doesnt_exist": "Diese Seite existiert nicht.",
   "check_spelling_mistakes_or_go_back": "Prüfen Sie auf Rechtschreibfehler oder gehen Sie zur vorherigen Seite zurück.",
-  "404_page_not_found": "404: Diese Seite konnte nicht gefunden werden.",
+  "404_page_not_found": "Fehler 404: Diese Seite konnte nicht gefunden werden.",
   "getting_started": "Los geht's",
   "15min_meeting": "15 Minuten Termin",
   "30min_meeting": "30 Minuten Termin",
   "secret": "Passwort",
   "leave_blank_to_remove_secret": "Leer lassen, um Passwort zu entfernen",
-  "webhook_secret_key_description": "Stellen Sie sicher, dass Ihr Server aus Sicherheitsgründen nur die erwarteten {{appName}}-Anfragen empfängt",
   "secret_meeting": "Geheimer Termin",
-  "login_instead": "Stattdessen anmelden",
+  "login_instead": "Stattdessen einloggen",
   "already_have_an_account": "Haben Sie bereits ein Konto?",
   "create_account": "Konto erstellen",
   "confirm_password": "Passwort bestätigen",
@@ -234,13 +227,11 @@
   "details": "Details",
   "welcome": "Willkommen",
   "welcome_back": "Willkommen zurück",
-  "welcome_to_calcom": "Willkommen bei {{appName}}",
   "welcome_instructions": "Wie ist Ihr Name und in welcher Zeitzone sind Sie? Dies kann später bearbeitet werden.",
   "connect_caldav": "Mit CalDav-Server verbinden",
   "credentials_stored_and_encrypted": "Ihre Zugangsdaten werden verschlüsselt gespeichert.",
   "connect": "Verbinden",
   "try_for_free": "Kostenlos testen",
-  "create_booking_link_with_calcom": "Erstellen Sie Ihren eigenen Buchungslink mit {{appName}}",
   "who": "Wer",
   "what": "Was",
   "when": "Wann",
@@ -249,7 +240,7 @@
   "add_another_calendar": "Einen weiteren Kalender hinzufügen",
   "other": "Sonstige",
   "emailed_you_and_attendees": "Wir haben Ihnen und den anderen Teilnehmern eine Einladung zum Kalender mit allen Details zugeschickt.",
-  "emailed_you_and_attendees_recurring": "Wir haben Ihnn und den anderen Teilnemern eine Kalendereinladung für den ersten Termin dieses wiederkehrendem Ereignisses gesendet.",
+  "emailed_you_and_attendees_recurring": "Wir haben Ihnn und den anderen Teilnemern eine Kalendereinladung für den ersten Termin dieser wiederkehrenden Termins gesendet.",
   "emailed_you_and_any_other_attendees": "Wir haben Ihnen und allen anderen Teilnehmer diesen Informationen per E-Mail geschickt.",
   "needs_to_be_confirmed_or_rejected": "Ihre Buchung muss noch bestätigt oder abgelehnt werden.",
   "needs_to_be_confirmed_or_rejected_recurring": "Ihr wiederkehrender Termin muss noch bestätigt oder abgelehnt werden.",
@@ -327,8 +318,8 @@
   "start_time": "Beginn",
   "end_time": "Ende",
   "buffer_time": "Pufferzeit",
-  "before_event": "Vor dem Ereignis",
-  "after_event": "Nach dem Event",
+  "before_event": "Vor dem Termin",
+  "after_event": "Nach dem Termin",
   "event_buffer_default": "Keine Pufferzeit",
   "buffer": "Puffer",
   "your_day_starts_at": "Ihr Tag beginnt um",
@@ -346,37 +337,33 @@
   "dark": "Dunkel",
   "automatically_adjust_theme": "Theme automatisch basierend auf den Einstellungen des Teilnehmers anpassen",
   "user_dynamic_booking_disabled": "Einige der Benutzer in der Gruppe haben derzeit dynamische Gruppenbuchungen deaktiviert",
-  "allow_dynamic_booking_tooltip": "Gruppenbuchungslinks, die dynamisch durch Hinzufügen mehrerer Benutzernamen mit einem '+' erstellt werden können. Beispiel: '{{appName}}/bailey+peer'",
   "allow_dynamic_booking": "Ermöglichen Sie es den Teilnehmenden, Sie über dynamische Gruppenbuchungen zu buchen",
-  "email": "Email",
-  "email_placeholder": "jdoe@example.com",
+  "email": "E-Mail",
+  "email_placeholder": "max@example.com",
   "full_name": "Vollständiger Name",
   "browse_api_documentation": "Durchsuchen Sie unsere API Dokumentation",
   "leverage_our_api": "Nutzen Sie unsere API für die volle Kontrolle und Anpassbarkeit.",
   "create_webhook": "Webhook erstellen",
   "booking_cancelled": "Termin abgesagt",
   "booking_rescheduled": "Termin verlegt",
-  "booking_created": "Buchung erstellt",
+  "booking_created": "Termin erstellt",
   "meeting_ended": "Meeting beendet",
   "form_submitted": "Formular gesendet",
-  "event_triggers": "Ereignis-Auslöser",
+  "event_triggers": "Event-Auslöser",
   "subscriber_url": "Subscriber-URL",
   "create_new_webhook": "Einen neuen Webhook erstellen",
   "webhooks": "Webhooks",
-  "team_webhooks": "Team Webhooks",
+  "team_webhooks": "Team-Webhooks",
   "create_new_webhook_to_account": "Erstellen Sie einen neuen Webhook in Ihrem Account",
   "new_webhook": "Neuer Webhook",
-  "receive_cal_meeting_data": "Erhalte {{appName}} Termindaten unter einer bestimmten URL in Echtzeit, wenn ein Termin geplant oder abgesagt wird.",
-  "receive_cal_event_meeting_data": "Erhalte {{appName}} Termindaten unter einer bestimmten URL in Echtzeit, wenn ein Ereignis geplant oder abgesagt wird.",
-  "responsive_fullscreen_iframe": "Responsives Vollbild-iframe",
+  "responsive_fullscreen_iframe": "Responsives Vollbild-iFrame",
   "loading": "Wird geladen...",
   "deleting": "Lösche...",
-  "standard_iframe": "Standard iframe",
+  "standard_iframe": "Standard iFrame",
   "developer": "Entwickler",
   "manage_developer_settings": "Verwalten Sie Ihre Entwicklereinstellungen.",
-  "iframe_embed": "iframe Embed",
-  "embed_calcom": "Der einfachste Weg, {{appName}} auf Ihrer Website einzubinden.",
-  "integrate_using_embed_or_webhooks": "Integrieren Sie {{appName}} in Ihre Website mit unseren Einbettungs-Optionen oder erhalten Sie Buchungsdaten mit Webhooks.",
+  "iframe_embed": "iFrame-Einbettung",
+  "integrate_using_embed_or_webhooks": "Integrieren Sie Cal.com in Ihre Website mit unseren Einbettungs-Optionen oder erhalten Sie Buchungsdaten mit Webhooks.",
   "schedule_a_meeting": "Termin planen",
   "view_and_manage_billing_details": "Ihre Rechnungsdetails ansehen und verwalten",
   "view_and_edit_billing_details": "Rechnungsdaten ansehen, bearbeiten oder Abonnement kündigen.",
@@ -419,7 +406,7 @@
   "forgotten_secret_description": "Wenn Sie dieses Passwort verloren oder vergessen haben, können Sie es ändern. Bitte beachten Sie, dass alle Integrationen, die dieses Geheimnis nutzen, aktualisiert werden müssen",
   "current_incorrect_password": "Aktuelles Passwort ist falsch",
   "password_hint_caplow": "Mischung aus Groß- und Kleinbuchstaben",
-  "password_hint_min": "Mindestens 7 Zeichen lang",
+  "password_hint_min": "Mindestens 8 Zeichen lang",
   "password_hint_num": "Enthält mindestens 1 Zahl",
   "invalid_password_hint": "Das Passwort muss mindestens 7 Zeichen lang sein und mindestens eine Nummer beinhalten, sowie eine Mischung aus Groß- und Kleinbuchstaben sein",
   "incorrect_password": "Passwort ist falsch",
@@ -495,7 +482,7 @@
   "members": "Mitglieder",
   "member": "Mitglied",
   "owner": "Inhaber",
-  "admin": "Admin",
+  "admin": "Administrator",
   "administrator_user": "Administrator Benutzer",
   "lets_create_first_administrator_user": "Lass uns als erstes den Administrator Benutzer anlegen.",
   "new_member": "Neues Mitglied",
@@ -507,8 +494,6 @@
   "invite_new_member_description": "Hinweis: Dies wird <1>einen zusätzlichen Platz(15 $/m)</1> in Ihrem Abonnement kosten.",
   "invite_new_team_member": "Laden Sie jemanden in Ihr Team ein.",
   "change_member_role": "Rolle des Teammitglieds ändern",
-  "disable_cal_branding": "{{appName}} Werbung deaktivieren",
-  "disable_cal_branding_description": "Verstecken Sie {{appName}} Werbung auf Ihren öffentlichen Seiten.",
   "danger_zone": "Achtung",
   "back": "Zurück",
   "cancel": "Abbrechen",
@@ -582,7 +567,7 @@
   "web3_metamask_added": "Metamask erfolgreich hinzugefügt",
   "web3_metamask_disconnected": "Metamask erfolgreich getrennt",
   "hours": "Stunden",
-  "your_email": "Ihre Emailadresse",
+  "your_email": "Ihre E-Mail-Adresse",
   "change_avatar": "Profilbild ändern",
   "language": "Sprache",
   "timezone": "Zeitzone",
@@ -605,8 +590,8 @@
   "max": "Maximal",
   "single_theme": "Einzelnes Theme",
   "brand_color": "Markenfarbe",
-  "light_brand_color": "Brand Farbe (Helles Theme)",
-  "dark_brand_color": "Brand Farbe (Dunkles Theme)",
+  "light_brand_color": "Markenfarbe (Helles Theme)",
+  "dark_brand_color": "Markenfarbe (Dunkles Theme)",
   "file_not_named": "Datei heißt nicht [idOrSlug]/[user]",
   "create_team": "Team anlegen",
   "name": "Name",
@@ -619,18 +604,18 @@
   "teams": "Teams",
   "team": "Team",
   "team_billing": "Abrechnung der Teams",
+  "team_billing_description": "Verwalte die Abrechungen deines Teams",
   "upgrade_to_flexible_pro_title": "Wir haben die Abrechnung für Teams geändert",
   "upgrade_to_flexible_pro_message": "Es gibt Mitglieder in Ihrem Team ohne Lizenz. Upgraden Sie Ihren Pro-Plan um fehlende Lizenzen abzudecken.",
   "changed_team_billing_info": "Ab Januar 2022 berechnen wir pro Sitzplatz für Teammitglieder. Mitglieder deines Teams, die Pro kostenlos hatten, sind jetzt in einer 14 Tage Testphase. Sobald die Testversion abläuft, werden diese Mitglieder vor Ihrem Team verborgen, es sei denn, Sie upgraden jetzt.",
   "create_manage_teams_collaborative": "Erstellen und verwalten Sie Teams, um kollaborative Funktionen zu nutzen.",
   "only_available_on_pro_plan": "Diese Funktion ist nur im Pro Plan verfügbar",
-  "remove_cal_branding_description": "Um die {{appName}} Werbung von Ihren Buchungsseiten zu entfernen, müssen Sie auf ein Pro-Konto upgraden.",
   "edit_profile_info_description": "Bearbeiten Sie Ihre Profilinformationen, welche bei Ihrem Cal-Link angezeigt werden.",
   "change_email_tip": "Möglicherweise müssen Sie sich aus- und einloggen, um die Änderung wirksam zu machen.",
   "little_something_about": "Ein wenig über sich selbst.",
   "profile_updated_successfully": "Profil erfolgreich aktualisiert",
   "your_user_profile_updated_successfully": "Ihr Benutzerprofil wurde erfolgreich aktualisiert.",
-  "user_cannot_found_db": "Benutzer scheint eingeloggt zu sein, kann aber nicht in db gefunden werden",
+  "user_cannot_found_db": "Benutzer scheint eingeloggt zu sein, kann aber nicht in der Datenbank gefunden werden",
   "embed_and_webhooks": "Einbetten & Webhooks",
   "enabled": "Aktiviert",
   "disabled": "Deaktiviert",
@@ -646,18 +631,18 @@
   "error": "Fehler",
   "at_least_characters_one": "Bitte geben Sie wenigstens ein Zeichen ein",
   "at_least_characters_other": "Bitte geben Sie mindestens {{count}} Zeichen ein",
-  "team_logo": "Team Logo",
+  "team_logo": "Team-Logo",
   "add_location": "Standort hinzufügen",
-  "attendees": "TeilnehmerInnen",
-  "add_attendees": "TeilnehmerInnen hinzufügen",
+  "attendees": "Teilnehmende",
+  "add_attendees": "Teilnehmende hinzufügen",
   "show_advanced_settings": "Erweiterte Einstellungen anzeigen",
-  "event_name": "Termin Name",
+  "event_name": "Termin-Name",
   "event_name_tooltip": "Der Name, der in Kalendern angezeigt wird",
-  "meeting_with_user": "Meeting mit {ATTENDEE}",
+  "meeting_with_user": "Meeting mit {{attendeeName}}",
   "additional_inputs": "Zusätzliche Notizen",
   "additional_input_description": "Erfordert die Eingabe zusätzlicher Eingaben durch den Planer vor der Buchungsbestätigung",
   "label": "Bezeichnung",
-  "placeholder": "Placeholder",
+  "placeholder": "Platzhalter",
   "type": "Typ",
   "edit": "Bearbeiten",
   "add_input": "Eingabe hinzufügen",
@@ -673,21 +658,13 @@
   "private_link_label": "Privater Link",
   "private_link_hint": "Ihr privater Link wird nach jeder Nutzung neu generiert",
   "copy_private_link": "Privaten Link kopieren",
-  "private_link_description": "Erzeuge einen privaten Link um einen Link zu teilen, der deinen {{appName}} Benutzername nicht preisgibt",
-  "invitees_can_schedule": "Teilnehmer können folgendes buchen",
+  "invitees_can_schedule": "Teilnehmende können folgendes buchen",
   "date_range": "Datumszeitraum",
   "calendar_days": "Kalendertage",
   "business_days": "Werktage",
   "set_address_place": "Adresse oder Ort festlegen",
   "set_link_meeting": "Einen Link zum Termin setzen",
-  "cal_invitee_phone_number_scheduling": "{{appName}} wird Ihren Teilnehmer bitten, vor der Planung eine Telefonnummer einzugeben.",
-  "cal_provide_google_meet_location": "{{appName}} wird einen Google Meet Termin zur Verfügung stellen.",
-  "cal_provide_zoom_meeting_url": "{{appName}} stellt eine Zoom Termin-URL zur Verfügung.",
-  "cal_provide_tandem_meeting_url": "{{appName}} stellt eine Tandem Termin-URL zur Verfügung.",
-  "cal_provide_video_meeting_url": "{{appName}} stellt eine tägliche Video-Termin-URL zur Verfügung.",
-  "cal_provide_jitsi_meeting_url": "{{appName}} stellt eine Jitsi Meet URL zur Verfügung.",
-  "cal_provide_huddle01_meeting_url": "{{appName}} stellt eine tägliche Huddle01-Web3-Termin-URL zur Verfügung.",
-  "cal_provide_teams_meeting_url": "{{appName}} stellt eine MS Teams Termin-URL zur Verfügung. HINWEIS: Sie brauchen ein berufliches- oder Schulkonto.",
+  "cal_provide_jitsi_meeting_url": "Cal stellt eine Jitsi Meet URL zur Verfügung.",
   "require_payment": "Zahlung erforderlich",
   "commission_per_transaction": "Provision pro Transaktion",
   "event_type_updated_successfully_description": "Ihr Termintyp wurde erfolgreich aktualisiert.",
@@ -697,7 +674,7 @@
   "within_date_range": "Innerhalb eines Zeitraums",
   "indefinitely_into_future": "Auf unbestimmte Zeit in die Zukunft",
   "add_new_custom_input_field": "Neues individuelles Eingabefeld hinzufügen",
-  "quick_chat": "Quick Chat",
+  "quick_chat": "Schneller Chat",
   "add_new_team_event_type": "Neuen Termintyp hinzufügen",
   "add_new_event_type": "Neuen Termintyp hinzufügen",
   "new_event_type_to_book_description": "Erstellen Sie einen neuen Termintyp, mit dem Personen Zeiten buchen können.",
@@ -710,9 +687,10 @@
   "confirm_delete_event_type": "Ja, Termintyp löschen",
   "delete_account": "Account löschen",
   "confirm_delete_account": "Ja, Account löschen",
-  "delete_account_confirmation_message": "Sind Sie sicher, dass Sie ihren {{appName}} Account löschen wollen? Sie können dann nicht mehr über Ihre geteilten Links gebucht werden und und alle Einstellungen gehen verloren.",
   "integrations": "Integrationen",
   "apps": "Apps",
+  "apps_description": "Hier findest du eine Auflistung deiner Apps",
+  "apps_listing": "App-Liste",
   "category_apps": "{{category}} Apps",
   "app_store": "App Store",
   "app_store_description": "Verbindet Menschen, Technologie und den Arbeitsplatz.",
@@ -732,7 +710,7 @@
   "embed_your_calendar": "Fügen Sie Ihren Kalender in Ihre Webseite ein",
   "connect_your_favourite_apps": "Verbinden Sie Ihre Lieblings-Apps.",
   "automation": "Automatisierung",
-  "configure_how_your_event_types_interact": "Konfigurieren Sie, wie Ihre Event-Typen mit Ihren Kalendern interagieren sollen.",
+  "configure_how_your_event_types_interact": "Konfigurieren Sie, wie Ihre Termin-Typen mit Ihren Kalendern interagieren sollen.",
   "toggle_calendars_conflict": "Wechseln Sie die Kalender in denen nach Konflikten gesucht werden sollen, um Doppelbuchungen zu vermeiden.",
   "select_destination_calendar": "Erstelle Termine im",
   "connect_additional_calendar": "Zusätzlichen Kalender verbinden",
@@ -748,7 +726,7 @@
   "set_as_away": "Stelle deinen Status auf Abwesend",
   "set_as_free": "Abwesenheitsstatus deaktivieren",
   "user_away": "Dieser Benutzer ist derzeit abwesend.",
-  "user_away_description": "Die Person, mi der Sie einen Termin buchen wollen, ist zur Zeit abwesend und akzeptiert daher keine neuen Buchungen.",
+  "user_away_description": "Die Person, mit der Sie einen Termin buchen wollen, ist zur Zeit abwesend und akzeptiert daher keine neuen Buchungen.",
   "meet_people_with_the_same_tokens": "Triff Leute mit den selben Token",
   "only_book_people_and_allow": "Nur Buchungen von Personen erlauben, die die gleichen Token, DAOs oder NFTs teilen.",
   "account_created_with_identity_provider": "Ihr Konto wurde mit einem Identitäts-Anbieter erstellt.",
@@ -773,6 +751,8 @@
   "no_category_apps_description_calendar": "Fügen Sie eine Kalender-App hinzu, in der nach Konflikten gesucht werden soll, um Doppelbuchungen zu vermeiden",
   "no_category_apps_description_conferencing": "Versuchen Sie, eine Konferenz-App hinzuzufügen, um Videoanrufe mit Ihren Kunden zu integrieren",
   "no_category_apps_description_payment": "Fügen Sie eine Zahlungs-App hinzu, um die Transaktion zwischen Ihnen und Ihren Kunden zu erleichtern",
+  "no_category_apps_description_analytics": "Fügen Sie eine Analyse-App für Ihre Buchungsseiten hinzu",
+  "no_category_apps_description_automation": "Fügen Sie eine Automatisierungs-App hinzu, die verwendet werden soll",
   "no_category_apps_description_other": "Füge jede beliebige andere Art von App hinzu, um alle möglichen Dinge zu tun",
   "installed_app_calendar_description": "Legen Sie den/die Kalender in denen nach Konflikten gesucht werden sollen fest, um Doppelbuchungen zu vermeiden.",
   "installed_app_conferencing_description": "Fügen Sie Ihre liebsten Videokonferenz-Apps für Ihre Meetings hinzu",
@@ -783,7 +763,7 @@
   "analytics": "Analyse",
   "empty_installed_apps_headline": "Keine Apps installiert",
   "empty_installed_apps_description": "Apps erlauben es Ihnen, Ihren Arbeitsfluss zu verbessern und Ihre Planung viel besser zu gestalten.",
-  "empty_installed_apps_button": "Entdecken Sie den App Store",
+  "empty_installed_apps_button": "Durchsuchen Sie den App Store",
   "manage_your_connected_apps": "Verwalten Sie Ihre installierten Apps oder ändern Sie die Einstellungen",
   "browse_apps": "Apps durchsuchen",
   "features": "Funktionen",
@@ -809,7 +789,6 @@
   "enterprise_license_description": "Um diese Funktion zu aktivieren, holen Sie sich einen Deployment-Schlüssel von der {{consoleUrl}}-Konsole und fügen Sie ihn als CALCOM_LICENSE_KEY zu Ihrer .env hinzu. Wenn Ihr Team bereits eine Lizenz hat, wenden Sie sich bitte an {{supportMail}} für Hilfe.",
   "missing_license": "Lizenz fehlt",
   "signup_requires": "Kommerzielle Lizenz erforderlich",
-  "signup_requires_description": "{{companyName}} bietet zur Zeit keine kostenlose Open-Source-Version der Anmeldeseite an. Um vollen Zugriff auf die Registrierungskomponenten zu erhalten, müssen Sie eine kommerzielle Lizenz erwerben. Für den persönlichen Gebrauch empfehlen wir die Prisma Data Platform oder jede andere Postgres-Schnittstelle zur Erstellung von Accounts.",
   "next_steps": "Nächste Schritte",
   "acquire_commercial_license": "Eine kommerzielle Lizenz erwerben",
   "the_infrastructure_plan": "Der Infrastrukturplan ist nutzungsbasiert und bietet Startup-freundliche Discounts an.",
@@ -825,11 +804,11 @@
   "set_calendar": "Legen Sie fest, wo neue Events hinzugefügt werden sollen, wenn Sie ausgebucht sind.",
   "delete_schedule": "Verfügbarkeitsplan löschen",
   "schedule_created_successfully": "{{scheduleName}} -Verfügbarkeitsplan erfolgreich erstellt",
-  "availability_updated_successfully": "Verfügbarkeit erfolgreich aktualisiert",
+  "availability_updated_successfully": "Verfügbarkeitsplan erfolgreich aktualisiert",
   "schedule_deleted_successfully": "Verfügbarkeitsplan erfolgreich gelöscht",
   "default_schedule_name": "Arbeitszeiten",
   "new_schedule_heading": "Erstelle einen Verfügbarkeitsplan",
-  "new_schedule_description": "Das Erstellen von Verfügbarkeitsplan sorgt dafür, dass Ihre Verfügbarkeit bei mehreren Termintypen genutzt werden kann.",
+  "new_schedule_description": "Das Erstellen eines Verfügbarkeitsplan sorgt dafür, dass Ihre Verfügbarkeit bei mehreren Termintypen genutzt werden kann.",
   "requires_ownership_of_a_token": "Erfordert Besitz eines Tokens, das zu der folgenden Adresse gehört:",
   "example_name": "Max Mustermann",
   "time_format": "Zeitformat",
@@ -899,9 +878,9 @@
   "user_impersonation_description": "Erlaubt es unserem Support-Team, sich vorübergehend mit Ihrem Konto anzumelden, um jegliche Probleme, die Sie gemeldet haben, schneller zu lösen.",
   "team_impersonation_description": "Ermöglicht den Team-Administratoren, sich vorübergehend als Sie einzuloggen.",
   "impersonate_user_tip": "Alle Verwendungen dieser Funktion werden geprüft.",
-  "impersonating_user_warning": "Imitiere den User {{user}}.",
+  "impersonating_user_warning": "Imitiere den Account {{user}}.",
   "impersonating_stop_instructions": "<0>Klicke hier um zu stoppen </0>.",
-  "event_location_changed": "Aktualisiert - Ihr Ereignis hat den Standort geändert",
+  "event_location_changed": "Aktualisiert - Ihr Termin hat den Standort geändert",
   "location_changed_event_type_subject": "Ort geändert: {{eventType}} mit {{name}} am {{date}}",
   "current_location": "Aktueller Ort",
   "user_phone": "Ihre Telefonnummer",
@@ -911,23 +890,18 @@
   "update_location": "Ort aktualisieren",
   "location_updated": "Ort aktualisiert",
   "email_validation_error": "Das sieht nicht wie eine E-Mail-Adresse aus",
-  "place_where_cal_widget_appear": "Kopieren Sie diesen Code in ihr HTML wo ihr {{appName}}-Widget erscheinen soll.",
   "create_update_react_component": "Erstellen oder Aktualisieren einer existierenden Reaktionskomponente wie unten gezeigt.",
   "copy_code": "Code kopieren",
   "code_copied": "Code kopiert!",
-  "how_you_want_add_cal_site": "Wie möchten Sie {{appName}} zu Ihrer Website hinzufügen?",
-  "choose_ways_put_cal_site": "Wählen Sie eine der folgenden Möglichkeiten, {{appName}} auf Ihrer Website zu integrieren.",
   "setting_up_zapier": "Einrichtung Ihrer Zapier-Integration",
   "generate_api_key": "Api Key generieren",
-  "generate_api_key_description": "Generieren Sie einen API-Schlüssel für {{appName}} auf",
   "your_unique_api_key": "Ihr eindeutiger API-Key",
-  "copy_safe_api_key": "Kopieren Sie diesen API-Key und speichern Sie ihn an einem sicheren Ort. Wenn Sie diesen Key verlieren, müssen Sie einen neuen generieren.",
-  "zapier_setup_instructions": "<0>Gehen Sie zu: <1>Zapier-Einladungs-Link</1></0><1>Logge Sie sich in Ihr Zapier-Konto ein und erstelle einen neuen Zap.</1><2>Wählen Sie {{appName}} als ihre Trigger-App aus. Wählen Sie auch ein Auslöserereignis.</2><3>Wähle Sie ihr Konto aus und geben dann ihren eindeutigen API-Key ein.</3><4>Teste Sie den Trigger.</4><5>Alles fertig!</5>",
+  "copy_safe_api_key": "Kopieren Sie diesen API-Schlüssel und speichern Sie ihn an einem sicheren Ort. Wenn Sie diesen Schlüssel verlieren, müssen Sie einen neuen generieren.",
+  "zapier_setup_instructions": "<0>Gehen Sie zu: <1>Zapier-Einladungs-Link</1></0><1>Logge Sie sich in Ihr Zapier-Konto ein und erstelle einen neuen Zap.</1><2>Wählen Sie Cal.com als ihre Trigger-App aus. Wählen Sie auch ein Auslöserereignis.</2><3>Wähle Sie ihr Konto aus und geben dann ihren eindeutigen API-Key ein.</3><4>Teste Sie den Trigger.</4><5>Alles fertig!</5>",
   "install_zapier_app": "Bitte installieren Sie zuerst die Zapier-App im App Store.",
   "connect_apple_server": "Mit Apple-Server verbinden",
   "connect_caldav_server": "Mit CalDav-Server verbinden",
   "calendar_url": "Kalender-URL",
-  "apple_server_generate_password": "Generieren Sie ein App-spezifisches Passwort für {{appName}} unter",
   "credentials_stored_encrypted": "Ihre Zugangsdaten werden verschlüsselt gespeichert.",
   "it_stored_encrypted": "Er wird gespeichert und verschlüsselt.",
   "go_to_app_store": "Zum App Store",
@@ -944,7 +918,7 @@
   "share_feedback": "Feedback teilen",
   "resources": "Ressourcen",
   "support_documentation": "Support Dokumentation",
-  "developer_documentation": "Entwickler Dokumentation",
+  "developer_documentation": "Entwickler-Dokumentation",
   "get_in_touch": "Kontakt aufnehmen",
   "contact_support": "Support kontaktieren",
   "feedback": "Feedback",
@@ -956,7 +930,7 @@
   "nevermind": "Egal",
   "go_to": "Gehe zu: ",
   "zapier_invite_link": "Zapier Einladungs-Link",
-  "meeting_url_provided_after_confirmed": "Eine Temrin-URL wird angelegt, sobald die Buchung bestätigt wurde.",
+  "meeting_url_provided_after_confirmed": "Eine Termin-URL wird angelegt, sobald der Termin bestätigt wurde.",
   "attendees_name": "Teilnehmername",
   "dynamically_display_attendee_or_organizer": "Zeigt dynamisch entweder Ihnen den Namen Ihres Teilnehmers bzw. Ihrer Teilnehmerin an oder zeigt Ihrem/Ihrer Teilnehmerin Ihren Namen an",
   "event_location": "Ort des Ereignisses",
@@ -970,7 +944,7 @@
   "number_provided": "Telefonnummer wird angegeben",
   "before_event_trigger": "vor Beginn des Termins",
   "event_cancelled_trigger": "wenn das Ereignis abgesagt wird",
-  "new_event_trigger": "wenn ein neues Ereignis gebucht wird",
+  "new_event_trigger": "wenn ein neer Termin gebucht wird",
   "email_host_action": "E-Mail an den Veranstalter senden",
   "email_attendee_action": "E-Mail an Teilnehmer senden",
   "sms_attendee_action": "SMS an Teilnehmer senden",
@@ -1045,7 +1019,7 @@
   "invalid_input": "Ungültige Eingabe",
   "broken_video_action": "Wir konnten den <1>{{location}}</1> Meeting-Link nicht zu Ihrem geplanten Ereignis hinzufügen. Kontaktieren Sie Ihre Eingeladenen oder aktualisieren Sie Ihr Kalenderereignis, um die Einzelheiten hinzuzufügen. Sie können entweder <3> Ihren Standort im Ereignistyp ändern</3> oder <5>die App entfernen und erneut hinzufügen.</5>",
   "broken_calendar_action": "Wir konnten Ihren <1>{{calendar}}</1> nicht aktualisieren. <2> Bitte überprüfen Sie die Kalendereinstellungen oder entfernen Sie Ihren Kalender und fügen Sie Ihren Kalender erneut hinzu </2>",
-  "attendee_name": "Teilnehmername",
+  "attendee_name": "Name des Teilnehmenden",
   "broken_integration": "Defekte Integration",
   "problem_adding_video_link": "Beim Hinzufügen eines Video-Links ist ein Problem aufgetreten",
   "problem_updating_calendar": "Es gab ein Problem beim Aktualisieren Ihres Kalenders",
@@ -1097,38 +1071,35 @@
   "connect_your_calendar_and_link": "Sie können Ihren Kalender von <1>hier</1> verbinden.",
   "default_calendar_selected": "Standardkalender",
   "hide_from_profile": "Im Profil ausblenden",
-  "event_setup_tab_title": "Event-Einrichtung",
+  "event_setup_tab_title": "Termin-Einrichtung",
   "event_limit_tab_title": "Limits",
   "event_limit_tab_description": "Wie oft können Sie gebucht werden",
   "event_advanced_tab_description": "Kalendereinstellungen & mehr...",
   "event_advanced_tab_title": "Erweitert",
-  "select_which_cal": "Wählen Sie den Kalender aus, zu dem Buchungen hinzugefügt werden sollen",
-  "custom_event_name": "Eigener Ereignisname",
-  "custom_event_name_description": "Erstellen Sie benutzerdefinierte Ereignisnamen, die im Kalenderereignis angezeigt werden sollen",
+  "select_which_cal": "Wählen Sie den Kalender aus, zu dem Termine hinzugefügt werden sollen",
+  "custom_event_name": "Eigener Terminname",
+  "custom_event_name_description": "Erstellen Sie benutzerdefinierte Terminnamen, die im Kalendereintrag angezeigt werden sollen",
   "2fa_required": "Zwei-Faktor-Authentifizierung erforderlich",
   "incorrect_2fa": "Falscher Zwei-Faktor-Authentifizierungscode",
-  "which_event_type_apply": "Auf welchen Ereignistyp wird dies angewandt?",
+  "which_event_type_apply": "Auf welchen Termintyp wird dies angewandt?",
   "no_workflows_description": "Workflows ermöglichen die einfache Automatisierung des Versands von Benachrichtigungen und Erinnerungen, so dass Sie Prozesse rund um Ihre Ereignisse erstellen können.",
+  "timeformat_profile_hint": "Dies ist eine interne Einstellung und hat keinen Einfluss darauf, wie die Zeiten auf den öffentlichen Buchungsseiten für Sie oder jemanden, der Sie buchen möchte, angezeigt werden.",
   "create_workflow": "Einen Workflow erstellen",
   "do_this": "Mache dies",
   "turn_off": "Abschalten",
   "settings_updated_successfully": "Einstellungen erfolgreich aktualisiert",
   "error_updating_settings": "Fehler beim Aktualisieren der Einstellungen",
-  "personal_cal_url": "Meine persönliche {{appName}} URL",
-  "bio_hint": "Schreiben Sie eine kurze Beschreibung, welche auf Ihrer persönlichen Url-Seite erscheinen wird.",
-  "timeformat_profile_hint": "Dies ist eine interne Einstellung und hat keinen Einfluss darauf, wie die Zeiten auf den öffentlichen Buchungsseiten für Sie oder jemanden, der Sie buchen möchte, angezeigt werden.",
+  "bio_hint": "Schreiben Sie eine kurze Beschreibung, welche auf Ihrer persönlichen Profil-Seite erscheinen wird.",
   "delete_account_modal_title": "Account löschen",
-  "confirm_delete_account_modal": "Sind Sie sicher, dass Sie Ihr {{appName}}-Konto löschen möchten?",
   "delete_my_account": "Meinen Account löschen",
   "start_of_week": "Wochenstart",
   "select_calendars": "Wählen Sie aus, in welchen Kalendern Sie nach Konflikten suchen wollen, um Doppelbuchungen zu vermeiden.",
   "check_for_conflicts": "Auf Konflikte prüfen",
-  "adding_events_to": "Ereignisse hinzufügen zu",
+  "adding_events_to": "Termine hinzufügen zu",
   "follow_system_preferences": "Systemeinstellungen folgen",
   "custom_brand_colors": "Eigene Marken-Farben",
   "customize_your_brand_colors": "Passen Sie Ihre eigene Markenfarbe auf Ihrer Buchungsseite an.",
   "pro": "Pro",
-  "removes_cal_branding": "Entfernt alle {{appName}}-bezogenen Markenzeichen, z.B. \"Powered by {{appName}}.\"",
   "profile_picture": "Profilbild",
   "upload": "Upload",
   "add_profile_photo": "Profilbild hinzufügen",
@@ -1155,8 +1126,11 @@
   "invoices": "Rechnungen",
   "embeds": "Embeds",
   "impersonation": "Benutzeridentitätswechsel",
+  "impersonation_description": "Einstellungen um Benutzeridentitätswechsel zu verwalten",
   "users": "Benutzer",
   "profile_description": "Einstellungen für Ihr {{appName}} Profil verwalten",
+  "users_description": "Hier findest du eine Auflistung aller Benutzer",
+  "users_listing": "Benutzerliste",
   "general_description": "Einstellungen für Ihre Sprache und Zeitzone verwalten",
   "calendars_description": "Konfigurieren Sie, wie Ihre Event-Typen mit Ihren Kalendern interagieren sollen",
   "appearance_description": "Einstellungen für Ihre Buchungsdarstellung verwalten",
@@ -1194,7 +1168,6 @@
   "create_your_first_form": "Erstellen Sie Ihr erstes Formular",
   "create_your_first_form_description": "Mithilfe von Leitungsformularen können Sie qualifizierende Fragen stellen und zur richtigen Person oder zum richtigen Veranstaltungstyp weiterleiten.",
   "create_your_first_webhook": "Erstellen Sie Ihren ersten Webhook",
-  "create_your_first_webhook_description": "Mit Webhooks können Sie Meetingdaten in Echtzeit erhalten, sobald etwas auf {{appName}} passiert.",
   "for_a_maximum_of": "Für maximal",
   "event_one": "Ereignis",
   "event_other": "Ereignisse",
@@ -1210,7 +1183,6 @@
   "workflow_example_4": "Eine Erinnerung per SMS an die Teilnehmer verschicken, 24 Stunden bevor das Event startet",
   "workflow_example_5": "Benutzerdefinierte E-Mail senden, wenn der Termin zum Moderieren neu geplant wird",
   "workflow_example_6": "Benutzerdefinierte SMS senden, wenn der Termin zum Moderieren gebucht wird",
-  "welcome_to_cal_header": "Willkommen bei {{appName}}!",
   "edit_form_later_subtitle": "Sie können dies später bearbeiten.",
   "connect_calendar_later": "Ich verbinde meinen Kalender später",
   "set_my_availability_later": "Ich werde meine Verfügbarkeit später festlegen",
@@ -1220,7 +1192,6 @@
   "booking_appearance": "Darstellung der Buchungsseite",
   "appearance_team_description": "Einstellungen für die Buchungsdarstellung Ihres Teams verwalten",
   "only_owner_change": "Nur der Besitzer dieses Teams kann Änderungen an den Buchungen des Teams vornehmen ",
-  "team_disable_cal_branding_description": "Entfernt alle {{appName}}-bezogenen Markenzeichen, z.B. 'Powered by {{appName}}.'",
   "invited_by_team": "{{teamName}} hat Sie eingeladen, dem Team als {{role}} beizutreten",
   "token_invalid_expired": "Token ist entweder ungültig oder abgelaufen.",
   "exchange_add": "Mit Microsoft Exchange verbinden",
@@ -1229,7 +1200,7 @@
   "exchange_authentication_ntlm": "NTLM-Authentifizierung",
   "exchange_compression": "GZip-Kompression",
   "routing_forms_description": "Hier sehen Sie alle Formulare und Weiterleitungen, die Sie erstellt haben.",
-  "routing_forms_send_email_owner": "E-Mail an Besitzer senden",
+  "routing_forms_send_email_owner": "E-Mail an Eigentümer senden",
   "routing_forms_send_email_owner_description": "Sendet eine E-Mail an den Eigentümer, wenn das Formular abgeschickt wird",
   "add_new_form": "Neues Formular hinzufügen",
   "form_description": "Erstellen Sie Ihr Formular, um einen Bucher zu anzuleiten",
@@ -1240,13 +1211,11 @@
   "theme_dark": "Dunkel",
   "theme_system": "Systemstandard",
   "add_a_team": "Team hinzufügen",
-  "add_webhook_description": "Erhalten Sie Meetingdaten in Echtzeit, wenn etwas auf {{appName}} passiert",
   "triggers_when": "Löst aus, wenn",
   "test_webhook": "Bitte führen Sie einen Pingtest vor der Erstellung durch.",
   "enable_webhook": "Webhook aktivieren",
   "add_webhook": "Webhook hinzufügen",
   "webhook_edited_successfully": "Webhook gespeichert",
-  "webhooks_description": "Erhalten Sie Meetingdaten in Echtzeit, wenn etwas auf {{appName}} passiert",
   "api_keys_description": "Generieren Sie API-Schlüssel für den Zugriff auf Ihren eigenen Account",
   "new_api_key": "Neuer API-Schlüssel",
   "active": "Aktiv",
@@ -1255,21 +1224,19 @@
   "embeds_title": "HTML iframe-Einbettung",
   "embeds_description": "Alle Event-Typen auf Ihrer Website einbetten",
   "create_first_api_key": "Erstellen Sie Ihren ersten API-Schlüssel",
-  "create_first_api_key_description": "API-Schlüssel erlauben es anderen Apps, mit {{appName}} zu kommunizieren",
   "back_to_signin": "Zurück zur Anmeldung",
   "reset_link_sent": "Zurücksetzungslink gesendet",
   "password_reset_email": "Eine E-Mail mit Anweisungen zum Zurücksetzen Ihres Passworts ist auf dem Weg zu {{email}}.",
+  "password_reset_leading": "Falls Sie nicht bald eine E-Mail erhalten, überprüfen Sie, ob die eingegebene E-Mail-Adresse korrekt ist. Überprüfen Sie außerdem Ihren Spam-Ordner oder wenden Sie sich an den Support, wenn das Problem weiterhin besteht.",
   "password_updated": "Passwort aktualisiert!",
   "pending_payment": "Zahlung ausstehend",
   "confirmation_page_rainbow": "Sperren Sie Ihr Ereignis hinter Tokens oder NFTs auf Ethereum, Polygon und mehr.",
-  "not_on_cal": "Nicht auf {{appName}}",
   "no_calendar_installed": "Kein Kalender installiert",
   "no_calendar_installed_description": "Sie haben noch keinen Ihrer Kalender verbunden",
   "add_a_calendar": "Kalender hinzufügen",
   "change_email_hint": "Möglicherweise müssen Sie sich aus- und einloggen, um jegliche Änderung wirksam zu machen",
   "confirm_password_change_email": "Bitte bestätigen Sie Ihr Passwort, bevor Sie Ihre E-Mail-Adresse ändern",
   "seats": "Plätze",
-  "every_app_published": "Jede App, die im {{appName}} App Store veröffentlicht wird, ist Open Source und gründlich durch Peer Reviews getestet. {{companyName}} unterstützt oder zertifiziert diese Apps jedoch nicht, es sei denn, sie werden von {{appName}} veröffentlicht. Wenn Sie auf unangemessene Inhalte oder Verhaltensweisen stoßen, melden Sie diese bitte.",
   "report_app": "App melden",
   "limit_booking_frequency": "Buchungsfrequenz begrenzen",
   "limit_booking_frequency_description": "Begrenzen, wie oft dieses Ereignis gebucht werden kann",
@@ -1324,7 +1291,7 @@
   "saml_config_updated_successfully": "SAML-Konfiguration erfolgreich aktualisiert",
   "saml_configuration": "SAML-Einstellungen",
   "delete_saml_configuration": "SAML-Konfiguration löschen",
-  "delete_saml_configuration_confirmation_message": "Sind Sie sicher, dass Sie die SAML-Konfiguration löschen möchten? Ihre Teammitglieder, die SAML-Login verwenden, können nicht mehr auf {{appName}} zugreifen.",
+  "delete_saml_configuration_confirmation_message": "Sind Sie sicher, dass Sie die SAML-Konfiguration löschen möchten? Ihre Teammitglieder, die SAML-Login verwenden, können nicht mehr auf Cal.com zugreifen.",
   "confirm_delete_saml_configuration": "Ja, SAML-Einstellungen löschen",
   "saml_not_configured_yet": "SAML wurde noch nicht konfiguriert",
   "saml_configuration_description": "Bitte fügen Sie die SAML-Metadaten Ihres SAML-Anbieters in die Textbox ein, um Ihre SAML-Konfiguration zu aktualisieren.",
@@ -1337,12 +1304,11 @@
   "saml_sp_acs_url_copied": "ACS-URL kopiert!",
   "saml_sp_entity_id_copied": "SP-Entitäts-ID kopiert!",
   "saml_btn_configure": "Konfigurieren",
-  "kbar_search_placeholder": "Geben Sie einen Befehl ein oder suchen Sie..."
   "add_calendar": "Kalender hinzufügen",
-  "limit_future_bookings": "Zukünftige Buchungen begrenzen",
-  "limit_future_bookings_description": "Begrenzt, wie weit in die Zukunft dieses Ereignis gebucht werden kann",
-  "no_event_types": "Keine Ereignistypen eingerichtet",
-  "no_event_types_description": "{{name}} hat keine für Sie buchbaren Ereignistypen eingerichtet.",
+  "limit_future_bookings": "Zukünftige Termine begrenzen",
+  "limit_future_bookings_description": "Begrenzt, wie weit in die Zukunft dieser Termin gebucht werden kann",
+  "no_event_types": "Keine Termintypen eingerichtet",
+  "no_event_types_description": "{{name}} hat keine für Sie buchbaren Termintypen eingerichtet.",
   "billing_frequency": "Rechnungshäufigkeit",
   "monthly": "Monatlich",
   "yearly": "Jährlich",
@@ -1354,22 +1320,23 @@
   "member_already_invited": "Mitglied wurde bereits eingeladen",
   "enter_email_or_username": "E-Mail oder Benutzername eingeben",
   "team_name_taken": "Dieser Name ist bereits vergeben",
-  "must_enter_team_name": "Teamname muss eingegeben werden",
+  "must_enter_team_name": "Team-Name muss eingegeben werden",
   "team_url_required": "Team-URL muss eingegeben werden",
   "team_url_taken": "Diese URL ist bereits vergeben",
   "team_publish": "Team veröffentlichen",
   "number_sms_notifications": "Telefonnummer (SMS-Benachrichtigungen)",
   "attendee_email_workflow": "Teilnehmer E-Mail",
   "attendee_email_info": "Die E-Mail-Adresse der buchenden Person",
-  "invalid_credential": "Oh nein! Es sieht so aus, als ob die Berechtigung abgelaufen sind oder entzogen wurden. Bitte erneut installieren.",
+  "kbar_search_placeholder": "Geben Sie einen Befehl ein oder suchen Sie...",
+  "invalid_credential": "Oh nein! Es sieht so aus, als ob die Berechtigung abgelaufen ist oder entzogen wurden. Bitte erneut installieren.",
   "choose_common_schedule_team_event": "Gemeinsamen Zeitplan auswählen",
   "choose_common_schedule_team_event_description": "Aktivieren Sie dies, wenn Sie einen gemeinsamen Zeitplan zwischen Hosts verwenden möchten. Wenn deaktiviert, ist jeder Host basierend auf seinen Standardplan buchbar.",
   "reason": "Grund",
   "sender_id": "Absender-ID",
   "sender_id_error_message": "Nur Buchstaben, Zahlen und Leerzeichen erlaubt (max. 11 Zeichen)",
-  "test_routing_form": "Testleitungsformular",
-  "test_preview": "Testvorschau",
-  "route_to": "Route zu",
-  "test_preview_description": "Testen Sie Ihr Leitungsformular, ohne Daten zu senden",
+  "test_routing_form": "Testweiterleitungsformular",
+  "test_preview": "Vorschau testen",
+  "route_to": "Weiterleiten zu",
+  "test_preview_description": "Testen Sie Ihr Weiterleitungsformular, ohne Daten zu senden",
   "test_routing": "Testweiterleitung"
 }

apps/web/public/static/locales/en/common.json

@@ -466,14 +466,14 @@
   "booking_confirmation": "Confirm your {{eventTypeTitle}} with {{profileName}}",
   "booking_reschedule_confirmation": "Reschedule your {{eventTypeTitle}} with {{profileName}}",
   "in_person_meeting": "In-person meeting",
-  "attendeeInPerson":"In Person (Attendee Address)",
-  "inPerson":"In Person (Organizer Address)",
+  "attendeeInPerson": "In Person (Attendee Address)",
+  "inPerson": "In Person (Organizer Address)",
   "link_meeting": "Link meeting",
   "phone_call": "Attendee Phone Number",
   "your_number": "Your phone number",
   "phone_number": "Phone Number",
   "attendee_phone_number": "Attendee Phone Number",
-  "organizer_phone_number" :"Organizer Phone Number",
+  "organizer_phone_number": "Organizer Phone Number",
   "host_phone_number": "Your Phone Number",
   "enter_phone_number": "Enter phone number",
   "reschedule": "Reschedule",
@@ -629,6 +629,7 @@
   "teams": "Teams",
   "team": "Team",
   "team_billing": "Team Billing",
+  "team_billing_description": "Manage billing for your team",
   "upgrade_to_flexible_pro_title": "We've changed billing for teams",
   "upgrade_to_flexible_pro_message": "There are members in your team without a seat. Upgrade your pro plan to cover missing seats.",
   "changed_team_billing_info": "As of January 2022 we charge on a per-seat basis for team members. Members of your team who had PRO for free are now on a 14 day trial. Once their trial expires these members will be hidden from your team unless you upgrade now.",
@@ -663,7 +664,7 @@
   "show_advanced_settings": "Show advanced settings",
   "event_name": "Event Name",
   "event_name_tooltip": "The name that will appear in calendars",
-  "meeting_with_user": "Meeting with {ATTENDEE}",
+  "meeting_with_user": "Meeting with {{attendeeName}}",
   "additional_inputs": "Additional Inputs",
   "additional_input_description": "Require scheduler to input additional inputs prior the booking is confirmed",
   "label": "Label",
@@ -704,6 +705,7 @@
   "hide_event_type": "Hide event type",
   "edit_location": "Edit location",
   "into_the_future": "into the future",
+  "when_booked_with_less_than_notice": "When booked with less than <time></time> notice",
   "within_date_range": "Within a date range",
   "indefinitely_into_future": "Indefinitely into the future",
   "add_new_custom_input_field": "Add new custom input field",
@@ -723,6 +725,8 @@
   "delete_account_confirmation_message": "Are you sure you want to delete your {{appName}} account? Anyone who you've shared your account link with will no longer be able to book using it and any preferences you have saved will be lost.",
   "integrations": "Integrations",
   "apps": "Apps",
+  "apps_description": "Here you can find a list of your apps",
+  "apps_listing": "App listing",
   "category_apps": "{{category}} apps",
   "app_store": "App Store",
   "app_store_description": "Connecting people, technology and the workplace.",
@@ -746,6 +750,7 @@
   "toggle_calendars_conflict": "Toggle the calendars you want to check for conflicts to prevent double bookings.",
   "select_destination_calendar": "Create events on",
   "connect_additional_calendar": "Connect additional calendar",
+  "calendar_updated_successfully":"Calendar updated successfully",
   "conferencing": "Conferencing",
   "calendar": "Calendar",
   "payments": "Payments",
@@ -909,7 +914,7 @@
   "impersonate": "Impersonate",
   "user_impersonation_heading": "User Impersonation",
   "user_impersonation_description": "Allows our support team to temporarily sign in as you to help us quickly resolve any issues you report to us.",
-  "team_impersonation_description": "Allows your team members to temporarily sign in as you.",
+  "team_impersonation_description": "Allows your team Owners/Admins to temporarily sign in as you.",
   "allow_booker_to_select_duration": "Allow booker to select duration",
   "impersonate_user_tip": "All uses of this feature is audited.",
   "impersonating_user_warning": "Impersonating username \"{{user}}\".",
@@ -935,7 +940,7 @@
   "generate_api_key_description": "Generate an API key to use with {{appName}} at",
   "your_unique_api_key": "Your unique API key",
   "copy_safe_api_key": "Copy this API key and save it somewhere safe. If you lose this key you have to generate a new one.",
-  "zapier_setup_instructions": "<0>Log into your Zapier account and create a new Zap.</0><1>Select {{appName}} as your Trigger app. Also choose a Trigger event.</1><2>Choose your account and then enter your Unique API Key.</2><3>Test your Trigger.</3><4>You're set!</4>",
+  "zapier_setup_instructions": "<0>Log into your Zapier account and create a new Zap.</0><1>Select Cal.com as your Trigger app. Also choose a Trigger event.</1><2>Choose your account and then enter your Unique API Key.</2><3>Test your Trigger.</3><4>You're set!</4>",
   "install_zapier_app": "Please first install the Zapier App in the app store.",
   "connect_apple_server": "Connect to Apple Server",
   "connect_caldav_server": "Connect to CalDav (Beta)",
@@ -1028,6 +1033,9 @@
   "error_removing_app": "Error removing app",
   "web_conference": "Web conference",
   "requires_confirmation": "Requires confirmation",
+  "always_requires_confirmation": "Always",
+  "requires_confirmation_threshold": "Requires confirmation if booked with < {{time}} $t({{unit}}_timeUnit) notice",
+  "may_require_confirmation": "May require confirmation",
   "nr_event_type_one": "{{count}} event type",
   "nr_event_type_other": "{{count}} event types",
   "add_action": "Add action",
@@ -1125,6 +1133,7 @@
   "incorrect_2fa": "Incorrect two factor authentication code",
   "which_event_type_apply": "Which event type will this apply to?",
   "no_workflows_description": "Workflows enable simple automation to send notifications & reminders enabling you to build processes around your events.",
+  "timeformat_profile_hint": "This is an internal setting and will not affect how times are displayed on public booking pages for you or anyone booking you.",
   "create_workflow": "Create a workflow",
   "do_this": "Do this",
   "turn_off": "Turn off",
@@ -1170,12 +1179,15 @@
   "invoices": "Invoices",
   "embeds": "Embeds",
   "impersonation": "Impersonation",
+  "impersonation_description": "Settings to manage user impersonation",
   "users": "Users",
   "profile_description": "Manage settings for your {{appName}} profile",
+  "users_description": "Here you can find a list of all users",
+  "users_listing": "User listing",
   "general_description": "Manage settings for your language and timezone",
   "calendars_description": "Configure how your event types interact with your calendars",
   "appearance_description": "Manage settings for your booking appearance",
-  "conferencing_description": "Manage your video conferencing apps for your meetings",
+  "conferencing_description": "Add your favourite video conferencing apps for your meetings",
   "password_description": "Manage settings for your account passwords",
   "2fa_description": "Manage settings for your account passwords",
   "we_just_need_basic_info": "We just need some basic info to get your profile setup.",
@@ -1376,17 +1388,58 @@
   "number_sms_notifications": "Phone number (SMS\u00a0notifications)",
   "attendee_email_workflow": "Attendee email",
   "attendee_email_info": "The person booking's email",
+  "kbar_search_placeholder": "Type a command or search...",
+  "free_to_use_apps": "Free",
+  "enterprise_license": "This is an enterprise feature",
+  "enterprise_license_description": "To enable this feature, get a deployment key at {{consoleUrl}} console and add it to your .env as CALCOM_LICENSE_KEY. If your team already has a license, please contact {{supportMail}} for help.",
   "invalid_credential": "Oh no! Looks like permission expired or was revoked. Please reinstall again.",
   "choose_common_schedule_team_event": "Choose a common schedule",
   "choose_common_schedule_team_event_description": "Enable this if you want to use a common schedule between hosts. When disabled, each host will be booked based on their default schedule.",
   "reason": "Reason",
   "sender_id": "Sender ID",
-  "sender_id_error_message":"Only letters, numbers and spaces allowed (max. 11 characters)",
+  "sender_id_error_message": "Only letters, numbers and spaces allowed (max. 11 characters)",
   "test_routing_form": "Test Routing Form",
   "test_preview": "Test Preview",
   "route_to": "Route to",
   "test_preview_description": "Test your routing form without submitting any data",
   "test_routing": "Test Routing",
+  "payment_app_disabled": "An admin has disabled a payment app",
+  "edit_event_type": "Edit event type",
+  "collective_scheduling": "Collective Scheduling",
+  "make_it_easy_to_book": "Make it easy to book your team when everyone is available.",
+  "find_the_best_person": "Find the best person available and cycle through your team.",
+  "fixed_round_robin": "Fixed round robin",
+  "add_one_fixed_attendee": "Add one fixed attendee and round robin through a number of attendees.",
+  "calcom_is_better_with_team": "Cal.com is better with teams",
+  "add_your_team_members": "Add your team members to your event types. Use collective scheduling to include everyone or find the most suitable person with round robin scheduling.",
   "booking_limit_reached":"Booking Limit for this event type has been reached",
-  "fill_this_field": "Please fill in this field"
+  "admin_has_disabled": "An admin has disabled {{appName}}",
+  "disabled_app_affects_event_type": "An admin has disabled {{appName}} which affects your event type {{eventType}}",
+  "disable_payment_app": "The admin has disabled {{appName}} which affects your event type {{title}}. Attendees are still able to book this type of event but will not be prompted to pay. You may hide hide the event type to prevent this until your admin renables your payment method.",
+  "payment_disabled_still_able_to_book": "Attendees are still able to book this type of event but will not be prompted to pay. You may hide hide the event type to prevent this until your admin reenables your payment method.",
+  "app_disabled_with_event_type": "The admin has disabled {{appName}} which affects your event type {{title}}.",
+  "app_disabled_video": "The admin has disabled {{appName}} which may affect your event types. If you have event types with {{appName}} as the location then it will default to Cal Video.",
+  "app_disabled_subject": "{{appName}} has been disabled",
+  "navigate_installed_apps": "Go to installed apps",
+  "disabled_calendar": "If you have another calendar installed new bookings will be added to it. If not then connect a new calendar so you do not miss any new bookings.",
+  "enable_apps": "Enable Apps",
+  "enable_apps_description": "Enable apps that users can integrate with Cal.com",
+  "app_is_enabled": "{{appName}} is enabled",
+  "app_is_disabled": "{{appName}} is disabled",
+  "keys_have_been_saved": "Keys have been saved",
+  "disable_app": "Disable App",
+  "disable_app_description": "Disabling this app could cause problems with how your users interact with Cal",
+  "edit_keys": "Edit Keys",
+  "apps_description": "Enable apps for your instance of Cal",
+  "no_available_apps": "There are no available apps",
+  "no_available_apps_description": "Please ensure there are apps in your deployment under 'packages/app-store'",
+  "no_apps": "There are no apps enabled in this instance of Cal",
+  "apps_settings": "Apps settings",
+  "fill_this_field": "Please fill in this field",
+  "options": "Options",
+  "enter_option": "Enter Option {{index}}",
+  "add_an_option": "Add an option",
+  "radio": "Radio",
+  "kbar_search_placeholder" : "Start typing to search",
+  "set_as_default": "Set as default"
 }

apps/web/public/static/locales/es/common.json

@@ -16,8 +16,8 @@
   "event_request_cancelled": "Tu evento programado fue cancelado",
   "organizer": "Organizador",
   "need_to_reschedule_or_cancel": "¿Necesita reprogramar o cancelar?",
-  "cancellation_reason": "Motivo de la cancelación",
-  "cancellation_reason_placeholder": "¿Por qué razón estás cancelando? (opcional)",
+  "cancellation_reason": "Motivo de la cancelación (opcional)",
+  "cancellation_reason_placeholder": "¿Por qué razón está cancelando?",
   "rejection_reason": "Motivo del rechazo",
   "rejection_reason_title": "¿Rechazar la solicitud de reserva?",
   "rejection_reason_description": "¿Estás seguro de que deseas rechazar la reserva? Le haremos saber a la persona que ha intentado reservar. Puedes indicar una razón a continuación.",
@@ -101,7 +101,7 @@
   "team_info": "Información del equipo",
   "request_another_invitation_email": "Si prefiere no utilizar {{toEmail}} como su correo electrónico de {{appName}} o ya tiene una cuenta de {{appName}}, por favor solicite otra invitación a ese email.",
   "you_have_been_invited": "Has sido invitado a unirte al equipo {{teamName}}",
-  "user_invited_you": "{{user}} te invitó a unirte al equipo {{teamName}}",
+  "user_invited_you": "{{user}} te invitó a unirte al equipo {{team}}",
   "hidden_team_member_title": "Estás oculto en este equipo",
   "hidden_team_member_message": "No está paga tu plaza, actualiza a PRO o infórmale al propietario del equipo para que pague tu plaza.",
   "hidden_team_owner_message": "Necesitas una cuenta Pro para gestionar equipos, permanecerás oculto hasta que se realice la mejora.",
@@ -316,6 +316,7 @@
   "past_bookings": "Sus reservas pasadas aparecerán aquí.",
   "cancelled_bookings": "Las reservas canceladas aparecerán aquí.",
   "unconfirmed_bookings": "Las reservas sin confirmar aparecerán aquí.",
+  "unconfirmed_bookings_tooltip": "Reservas sin confirmar",
   "on": "en",
   "and": "y",
   "calendar_shows_busy_between": "Tu calendario te muestra como ocupado entre",
@@ -503,7 +504,7 @@
   "add_team_members_description": "Invitar a otros a unirse a tu equipo",
   "add_team_member": "Añadir miembro del equipo",
   "invite_new_member": "Invitar a un nuevo miembro",
-  "invite_new_member_description": "Nota: Esto costará <1>un asiento adicional ($15/m)</1> en su suscripción.",
+  "invite_new_member_description": "Nota: Esto costará <1>un cupo adicional ($15/m)</1> en su suscripción.",
   "invite_new_team_member": "Invita a alguien a tu equipo.",
   "change_member_role": "Cambiar rol del miembro del equipo",
   "disable_cal_branding": "Desactivar marca de {{appName}}",
@@ -534,7 +535,7 @@
   "open_options": "Abrir Opciones",
   "copy_link": "Copiar Enlace",
   "share": "Compartir",
-  "share_event": "¿Quieres reservar mi {{appName}} o enviarme tu enlace?",
+  "share_event": "¿Quieres reservar mi Cal o enviarme tu enlace?",
   "copy_link_team": "Copiar enlace al equipo",
   "leave_team": "Abandonar equipo",
   "confirm_leave_team": "Sí, abandonar equipo",
@@ -652,7 +653,7 @@
   "show_advanced_settings": "Mostrar Opciones Avanzadas",
   "event_name": "Nombre del Evento",
   "event_name_tooltip": "Nombre que aparecerá en los calendarios",
-  "meeting_with_user": "Reunión con {ATTENDEE}",
+  "meeting_with_user": "Reunión con {{attendeeName}}",
   "additional_inputs": "Campos Adicionales",
   "additional_input_description": "Requerir que el planificador introduzca entradas adicionales antes de confirmar la reserva",
   "label": "Etiqueta",
@@ -684,7 +685,7 @@
   "cal_provide_zoom_meeting_url": "{{appName}} proporcionará una URL de reunión de Zoom.",
   "cal_provide_tandem_meeting_url": "{{appName}} proporcionará una URL de reunión de Tandem.",
   "cal_provide_video_meeting_url": "{{appName}} proporcionará una URL de reunión de Daily Video.",
-  "cal_provide_jitsi_meeting_url": "{{appName}} proporcionará una URL de reunión de Jitsi Meet.",
+  "cal_provide_jitsi_meeting_url": "Cal proporcionará una URL de reunión de Jitsi Meet.",
   "cal_provide_huddle01_meeting_url": "{{appName}} proporcionará una URL de reunión de Huddle01 Web3 Video.",
   "cal_provide_teams_meeting_url": "{{appName}} proporcionará una URL de reunión de MS Teams. NOTA: DEBE TENER UNA CUENTA DE TRABAJO O DE EDUCACIÓN",
   "require_payment": "Requiere Pago",
@@ -838,6 +839,7 @@
   "redirect_success_booking": "Redirigir al reservar ",
   "you_are_being_redirected": "Serás redirigido a {{ url }} en $t(second, {\"count\": {{seconds}} }).",
   "external_redirect_url": "https://example.com/redirect-to-my-success-page",
+  "redirect_url_description": "Redirija a una URL personalizada después de una reserva exitosa",
   "duplicate": "Duplicar",
   "offer_seats": "Ofrecer plazas",
   "offer_seats_description": "Ofrecer plazas para las reservas (desactiva las reservas de invitados y las optativas)",
@@ -1106,6 +1108,7 @@
   "incorrect_2fa": "Código de autenticación de dos factores incorrecto",
   "which_event_type_apply": "¿A qué tipo de evento se aplicará esto?",
   "no_workflows_description": "Los flujos de trabajo permiten una automatización simple para enviar notificaciones y recordatorios que le permiten crear procesos para sus eventos.",
+  "timeformat_profile_hint": "Esta es una configuración interna y no afectará la manera en que se muestran los horarios en las páginas de reservas públicas para usted o para cualquier persona que lo solicite.",
   "create_workflow": "Crear un flujo de trabajo",
   "do_this": "Hacer esto",
   "turn_off": "Apagar",
@@ -1113,7 +1116,6 @@
   "error_updating_settings": "Error al actualizar la configuración",
   "personal_cal_url": "Mi URL personal de {{appName}}",
   "bio_hint": "Algunas frases sobre usted, esta información aparecerá en la página de su URL personal.",
-  "timeformat_profile_hint": "Esta es una configuración interna y no afectará la manera en que se muestran los horarios en las páginas de reservas públicas para usted o para cualquier persona que lo solicite.",
   "delete_account_modal_title": "Eliminar cuenta",
   "confirm_delete_account_modal": "¿Está seguro que desea eliminar su cuenta de {{appName}}?",
   "delete_my_account": "Eliminar mi cuenta",
@@ -1169,6 +1171,8 @@
   "connect_conference_apps": "Conectar aplicaciones de conferencia",
   "connect_calendar_apps": "Conectar aplicaciones de calendario",
   "connect_payment_apps": "Conectar aplicaciones de pago",
+  "connect_automation_apps": "Conecte aplicaciones de automatización",
+  "connect_analytics_apps": "Conecte aplicaciones de análisis",
   "connect_other_apps": "Conectar otras aplicaciones",
   "current_step_of_total": "Paso {{currentStep}} de {{maxSteps}}",
   "add_variable": "Añadir variable",
@@ -1224,8 +1228,8 @@
   "exchange_authentication_ntlm": "Autenticación NTLM",
   "exchange_compression": "Compresión GZip",
   "routing_forms_description": "Aquí puedes ver todos los formularios y rutas que has creado.",
-  "routing_forms_send_email_owner": "Enviar email al propietario",
-  "routing_forms_send_email_owner_description": "Envía un correo electrónico al propietario cuando se envía el formulario",
+  "routing_forms_send_email_owner": "Enviar correo electrónico al propietario",
+  "routing_forms_send_email_owner_description": "Mande un correo electrónico al propietario cuando se envía el formulario",
   "add_new_form": "Añadir formulario nuevo",
   "form_description": "Crea tu formulario para dirigirlo a un agente de reservas",
   "copy_link_to_form": "Copiar enlace al formulario",
@@ -1320,7 +1324,7 @@
   "saml_config_updated_successfully": "Configuración de SAML actualizada correctamente",
   "saml_configuration": "Configuración SAML",
   "delete_saml_configuration": "Eliminar configuración SAML",
-  "delete_saml_configuration_confirmation_message": "¿Estás seguro de que deseas eliminar la configuración SAML? Los miembros de tu equipo que utilicen el inicio de sesión SAML ya no podrán acceder a {{appName}}.",
+  "delete_saml_configuration_confirmation_message": "¿Estás seguro de que deseas eliminar la configuración SAML? Los miembros de tu equipo que utilicen el inicio de sesión SAML ya no podrán acceder a Cal.com.",
   "confirm_delete_saml_configuration": "Sí, eliminar la configuración SAML",
   "saml_not_configured_yet": "SAML no está configurado aún",
   "saml_configuration_description": "Pega los metadatos SAML de tu Proveedor de Identidad en el cuadro de texto de abajo para actualizar tu configuración SAML.",
@@ -1357,8 +1361,8 @@
   "attendee_email_workflow": "Correo electrónico del asistente",
   "attendee_email_info": "El correo electrónico de la persona que reserva",
   "invalid_credential": "¡Oh no! Parece que el permiso ha caducado o se ha revocado. Vuelva a instalarlo.",
-  "choose_common_schedule_team_event": "Elija un horario común",
-  "choose_common_schedule_team_event_description": "Habilite esto si desea utilizar un cronograma común entre anfitriones. Cuando esté desactivado, cada anfitrión se reservará con base en su horario predeterminado.",
+  "choose_common_schedule_team_event": "Elige un horario común para todos",
+  "choose_common_schedule_team_event_description": "Habilite esto si desea utilizar un cronograma común entre anfitriones. Cuando esté desactivado, cada anfitrión se reservará en relación a su horario predeterminado.",
   "reason": "Motivo",
   "sender_id": "ID del remitente",
   "sender_id_error_message": "Sólo se permiten letras, números y espacios (máx. 11 caracteres)",

apps/web/public/static/locales/fr/common.json

@@ -101,7 +101,7 @@
   "team_info": "Informations sur l'équipe",
   "request_another_invitation_email": "Si vous préférez ne pas utiliser {{toEmail}} comme votre adresse e-mail {{appName}} ou si vous avez déjà un compte {{appName}}, veuillez demander une autre invitation à cette adresse.",
   "you_have_been_invited": "Vous avez été invité à rejoindre l'équipe {{teamName}}",
-  "user_invited_you": "{{user}} vous a invité à rejoindre l'équipe {{teamName}}",
+  "user_invited_you": "{{user}} vous a invité à rejoindre l'équipe {{team}}",
   "hidden_team_member_title": "Vous êtes caché dans cette équipe",
   "hidden_team_member_message": "Votre place n'est pas payée, passez en version Pro ou faites savoir au propriétaire de l'équipe qu'il peut payer votre place.",
   "hidden_team_owner_message": "Vous avez besoin d'un compte pro pour utiliser les équipes, vous êtes caché jusqu'à ce que vous mettiez à niveau.",
@@ -535,7 +535,7 @@
   "open_options": "Ouvrir les options",
   "copy_link": "Copier le lien vers l'événement",
   "share": "Partager",
-  "share_event": "Voulez-vous réserver mon {{appName}} ou m'envoyer votre lien ?",
+  "share_event": "Voulez-vous réserver mon cal ou m'envoyer votre lien ?",
   "copy_link_team": "Copier le lien vers l'équipe",
   "leave_team": "Quitter l'équipe",
   "confirm_leave_team": "Oui, quitter l'équipe",
@@ -653,7 +653,7 @@
   "show_advanced_settings": "Afficher les paramètres avancés",
   "event_name": "Nom de l'événement",
   "event_name_tooltip": "Le nom qui apparaîtra dans les calendriers",
-  "meeting_with_user": "Rendez-vous avec {ATTENDEE}",
+  "meeting_with_user": "Rendez-vous avec {{attendeeName}}",
   "additional_inputs": "Entrées additionnelles",
   "additional_input_description": "Exiger que le planificateur saisisse des entrées supplémentaires avant que la réservation soit confirmée",
   "label": "Libellé",
@@ -685,7 +685,7 @@
   "cal_provide_zoom_meeting_url": "{{appName}} fournira une URL de réunion Zoom.",
   "cal_provide_tandem_meeting_url": "{{appName}} fournira une URL de réunion Tandem.",
   "cal_provide_video_meeting_url": "{{appName}} fournira une URL de réunion Daily video.",
-  "cal_provide_jitsi_meeting_url": "{{appName}} fournira une URL de réunion Jitsi Meet.",
+  "cal_provide_jitsi_meeting_url": "Cal fournira une URL de réunion Jitsi Meet.",
   "cal_provide_huddle01_meeting_url": "{{appName}} fournira une URL de réunion Huddle01 web3 video.",
   "cal_provide_teams_meeting_url": "{{appName}} fournira une URL de réunion MS Teams. NOTE : IL FAUT AVOIR UN COMPTE PROFESSIONNEL OU SCOLAIRE",
   "require_payment": "Exiger un paiement",
@@ -1108,6 +1108,7 @@
   "incorrect_2fa": "Code d'authentification à deux facteurs incorrect",
   "which_event_type_apply": "À quel type d'événement s'appliquera-t-il ?",
   "no_workflows_description": "Les workflows permettent une automatisation simple pour envoyer des notifications et des rappels vous permettant de construire des processus autour de vos événements.",
+  "timeformat_profile_hint": "Ceci est un paramètre interne et n'affectera pas la façon dont les heures sont affichées sur les pages publiques de réservation pour vous ou toute personne qui réserve votre temps.",
   "create_workflow": "Créer un workflow",
   "do_this": "Effectuer ceci",
   "turn_off": "Désactiver",
@@ -1115,7 +1116,6 @@
   "error_updating_settings": "Erreur lors de la mise à jour des paramètres",
   "personal_cal_url": "Mon URL {{appName}} personnelle",
   "bio_hint": "Quelques phrases à propos de vous. Ces informations apparaîtront sur votre page d'url personnelle.",
-  "timeformat_profile_hint": "Ceci est un paramètre interne et n'affectera pas la façon dont les heures sont affichées sur les pages publiques de réservation pour vous ou toute personne qui réserve votre temps.",
   "delete_account_modal_title": "Supprimer le compte",
   "confirm_delete_account_modal": "Êtes-vous sûr de vouloir supprimer votre compte {{appName}} ?",
   "delete_my_account": "Supprimer mon compte",
@@ -1258,6 +1258,7 @@
   "back_to_signin": "Retour à la connexion",
   "reset_link_sent": "Lien de réinitialisation envoyé",
   "password_reset_email": "Un e-mail est transmis vers {{email}} avec les instructions pour réinitialiser votre mot de passe.",
+  "password_reset_leading": "Si vous ne recevez pas de courriel bientôt, vérifiez que l'adresse e-mail que vous avez saisie est correcte, vérifiez votre dossier spam ou contactez le support si le problème persiste.",
   "password_updated": "Mot de passe mis à jour !",
   "pending_payment": "Paiement en attente",
   "confirmation_page_rainbow": "Le jeton limite l'accès à votre événement en fonction des jetons ou des NFT sur Ethereum, Polygone et plus encore.",
@@ -1323,7 +1324,7 @@
   "saml_config_updated_successfully": "Configuration SAML mise à jour",
   "saml_configuration": "Configuration SAML",
   "delete_saml_configuration": "Supprimer la configuration SAML",
-  "delete_saml_configuration_confirmation_message": "Êtes-vous sûr de vouloir supprimer la configuration SAML ? Les membres de votre équipe qui utilisent la connexion SAML ne pourront plus accéder à {{appName}}.",
+  "delete_saml_configuration_confirmation_message": "Êtes-vous sûr de vouloir supprimer la configuration SAML ? Les membres de votre équipe qui utilisent la connexion SAML ne pourront plus accéder à Cal.com.",
   "confirm_delete_saml_configuration": "Oui, supprimer la configuration SAML",
   "saml_not_configured_yet": "SAML non configuré pour l'instant",
   "saml_configuration_description": "Veuillez coller les métadonnées SAML de votre fournisseur d'identité dans la zone de texte ci-dessous pour mettre à jour votre configuration SAML.",

apps/web/public/static/locales/he/common.json

@@ -16,8 +16,8 @@
   "event_request_cancelled": "האירוע המתוכנן בוטל",
   "organizer": "מארגן",
   "need_to_reschedule_or_cancel": "רוצה לקבוע מועד חדש או לבטל?",
-  "cancellation_reason": "הסיבה לביטול",
-  "cancellation_reason_placeholder": "מדוע בחרת לבטל? (אופציונלי)",
+  "cancellation_reason": "הסיבה לביטול (לא חובה)",
+  "cancellation_reason_placeholder": "מדוע בחרת לבטל? (לא חובה)",
   "rejection_reason": "הסיבה לדחייה",
   "rejection_reason_title": "לדחות את בקשת ההזמנה?",
   "rejection_reason_description": "בטוח שברצונך לדחות את ההזמנה? אנחנו ניידע את האדם שניסה להזמין. יש לך אפשרות להוסיף את הסיבה לדחייה למטה.",
@@ -108,7 +108,7 @@
   "link_expires": "נ.ב. תוקף הקישור יפוג תוך {{expiresIn}} שעות.",
   "upgrade_to_per_seat": "שדרג למינוי לפי מקום",
   "team_upgrade_seats_details": "לא התבצע תשלום עבור {{unpaidCount}} מקומות מתוך {{memberCount}} חברי הצוות שלך. תמורת ${{seatPrice}} לחודש למקום, עלות המינוי הכוללת המשוערת שלך היא ${{totalCost}} לחודש.",
-  "team_upgrade_banner_description": "אנחנו מודים לך על שניסית את החבילה החדשה שלנו לצוותים. שמנו לב שהצוות שלך, \"{{teamName}}\", זקוק לשדרוג.",
+  "team_upgrade_banner_description": "אנחנו מודים לך על כך שניסית את החבילה החדשה שלנו לצוותים. שמנו לב שהצוות שלך, \"{{teamName}}\", זקוק לשדרוג.",
   "team_upgrade_banner_action": "כאן משדרגים",
   "team_upgraded_successfully": "הצוות שלך שודרג בהצלחה!",
   "use_link_to_reset_password": "נא להשתמש בקישור הבא כדי לאפס את הסיסמה",
@@ -419,7 +419,7 @@
   "forgotten_secret_description": "אם שכחת או איבדת את הסוד, יש לך אפשרות לשנות אותו, אבל חשוב לזכור שיהיה צורך לעדכן את כל השילובים שבהם נעשה שימוש בסוד זה",
   "current_incorrect_password": "הסיסמה הנוכחית שגויה",
   "password_hint_caplow": "שילוב של אותיות רישיות וקטנות",
-  "password_hint_min": "באורך של 7 תווים לפחות",
+  "password_hint_min": "באורך 8 תווים לפחות",
   "password_hint_num": "לכלול לפחות ספרה אחת",
   "invalid_password_hint": "הסיסמה חייבת להיות באורך של 7 תווים לפחות ולכלול לפחות ספרה אחת ושילוב של אותיות רישיות וקטנות",
   "incorrect_password": "הסיסמה שגויה.",
@@ -653,7 +653,7 @@
   "show_advanced_settings": "הצגת הגדרות מתקדמות",
   "event_name": "שם האירוע",
   "event_name_tooltip": "השם שיופיע בלוחות השנה",
-  "meeting_with_user": "פגישה עם {ATTENDEE}",
+  "meeting_with_user": "פגישה עם {{attendeeName}}",
   "additional_inputs": "אפשרויות קלט נוספות",
   "additional_input_description": "לדרוש מכלי התזמון להוסיף פרטים לפני אישור ההזמנה",
   "label": "תווית",
@@ -784,7 +784,7 @@
   "analytics": "ניתוח נתונים",
   "empty_installed_apps_headline": "אין אפליקציות מותקנות",
   "empty_installed_apps_description": "אפליקציות מאפשרות לך לשפר משמעותית את תהליכי העבודה שלך ואת תהליך קביעת המועדים.",
-  "empty_installed_apps_button": "נא לעיין ב-App Store או להתקין מהאפליקציות שלהלן",
+  "empty_installed_apps_button": "נא לעיין ב-App Store",
   "manage_your_connected_apps": "ניהול האפליקציות המותקנות שלך או שינוי הגדרות",
   "browse_apps": "עיון באפליקציות",
   "features": "תכונות",
@@ -924,7 +924,7 @@
   "zapier_setup_instructions": "<0>התחבר/י לחשבון Zapier שלך וצור/י Zap חדש.</0><1>בחר/י את {{appName}} כאפליקציית ה-Trigger. בנוסף, בחר/י אירוע Trigger.</1><2>בחר/י את החשבון שלך ולאחר מכן הזן/י את מפתח ה-API הייחודי שלך.</2><3>בדוק/י את ה-Trigger.</3><4>וזהו, הכל מוכן!</4>",
   "install_zapier_app": "תחילה עליך להוריד את אפליקציית Zapier מה-App Store ולהתקין אותה.",
   "connect_apple_server": "חיבור לשרת Apple",
-  "connect_caldav_server": "חיבור לשרת CalDav",
+  "connect_caldav_server": "חיבור לשרת CalDav (בטא)",
   "calendar_url": "כתובת ה-URL של לוח השנה",
   "apple_server_generate_password": "צור סיסמה ספציפית לאפליקציה כדי להשתמש ב-{{appName}} ב:",
   "credentials_stored_encrypted": "פרטי הכניסה שלך יישמרו ויוצפנו.",
@@ -1108,6 +1108,7 @@
   "incorrect_2fa": "קוד שגוי של אימות בשני גורמים",
   "which_event_type_apply": "על איזה סוג אירוע זה יחול?",
   "no_workflows_description": "תהליכי עבודה מאפשרים שימוש באוטומציה פשוטה לשליחת עדכונים ותזכורות, כך שאת/ה יכול/ה לתכנן תהליכים שקשורים לאירועים שלך.",
+  "timeformat_profile_hint": "זוהי הגדרה פנימית שלא תשפיע על אופן התצוגה של תאריכים ושעות בדפים של הזמנות ציבוריות עבורך או עבור מי שמבצע הזמנות בשמך.",
   "create_workflow": "יצירת תהליך עבודה",
   "do_this": "יש לבצע את הפעולה הזו",
   "turn_off": "השבתה",
@@ -1115,7 +1116,6 @@
   "error_updating_settings": "שגיאה במהלך עדכון ההגדרות",
   "personal_cal_url": "כתובת ה-URL של ה-{{appName}} האישי שלי",
   "bio_hint": "מספר משפטים אודותיך. המידע הזה יופיע בדף ה-URL האישי שלך.",
-  "timeformat_profile_hint": "זוהי הגדרה פנימית שלא תשפיע על אופן התצוגה של תאריכים ושעות בדפים של הזמנות ציבוריות עבורך או עבור מי שמבצע הזמנות בשמך.",
   "delete_account_modal_title": "מחיקת חשבון",
   "confirm_delete_account_modal": "בטוח שברצונך למחוק את חשבון {{appName}} שלך?",
   "delete_my_account": "מחיקת החשבון שלי",
@@ -1229,7 +1229,7 @@
   "exchange_compression": "דחיסת GZip",
   "routing_forms_description": "כאן ניתן לצפות בכל הטפסים והנתיבים שיצרת.",
   "routing_forms_send_email_owner": "שליחת דוא\"ל לבעלים",
-  "routing_forms_send_email_owner_description": "שליחת דוא\"ל לבעלים כשהטופס נשלח",
+  "routing_forms_send_email_owner_description": "דוא\"ל נשלח לבעלים לאחר שליחת הטופס",
   "add_new_form": "הוספת טופס חדש",
   "form_description": "צור/י טופס משלך כדי לנתב אל מזמין/ה",
   "copy_link_to_form": "להעתיק את הקישור לטופס",
@@ -1324,7 +1324,7 @@
   "saml_config_updated_successfully": "תצורת SAML עודכנה בהצלחה",
   "saml_configuration": "תצורת SAML",
   "delete_saml_configuration": "מחיקת תצורת SAML",
-  "delete_saml_configuration_confirmation_message": "בטוח שברצונך למחוק את תצורת SAML? חברי הצוות שלך שנכנסים אמצעות SAML לא יוכלו יותר לגשת ל-{{appName}}.",
+  "delete_saml_configuration_confirmation_message": "בטוח שברצונך למחוק את תצורת SAML? חברי הצוות שלך שנכנסים אמצעות SAML לא יוכלו יותר לגשת ל-Cal.com.",
   "confirm_delete_saml_configuration": "כן, אני רוצה למחוק את תצורת SAML",
   "saml_not_configured_yet": "SAML עדיין לא הוגדר",
   "saml_configuration_description": "יש להדביק את המטא-נתונים של SAML מספק הזהויות בתיבת הטקסט הבאה כדי לעדכן את תצורת SAML.",
@@ -1341,11 +1341,11 @@
   "limit_future_bookings": "הגבלת הזמנות עתידיות",
   "limit_future_bookings_description": "הגבלת התאריך הרחוק ביותר בעתיד שעד אליו ניתן להזמין את האירוע הזה",
   "no_event_types": "לא הוגדר אף סוג אירוע",
-  "no_event_types_description": "{{name}} לא הגדיר/ה אף סוג אירוע שבאפשרותך להזמין.",
+  "no_event_types_description": "לא הוגדר על ידי {{name}} אף סוג אירוע שבאפשרותך להזמין.",
   "billing_frequency": "תדירות חיוב",
   "monthly": "אחת לחודש",
   "yearly": "אחת לשנה",
-  "checkout": "קופה",
+  "checkout": "תשלום",
   "your_team_disbanded_successfully": "פיזור הצוות שלך בוצע בהצלחה",
   "error_creating_team": "אירעה שגיאה במהלך יצירת הצוות",
   "you": "את/ה",
@@ -1364,11 +1364,11 @@
   "choose_common_schedule_team_event": "בחירת לוח זמנים משותף",
   "choose_common_schedule_team_event_description": "יש להפעיל אפשרות זו אם רוצים להשתמש בלוח זמנים משותף בין המארחים. אם האפשרות הזו מבוטלת, כל מארח יוזמן לפי לוח הזמנים המשמש כברירת המחדל שלו.",
   "reason": "סיבה",
-  "sender_id": "מזהה שולח/ת",
+  "sender_id": "מזהה השולח/ת",
   "sender_id_error_message": "מותר להשתמש רק באותיות, במספרים וברווחים (לכל היותר 11 תווים)",
   "test_routing_form": "בדיקת טופס ניתוב",
-  "test_preview": "תצוגה מקדימה של הבדיקה",
+  "test_preview": "בדיקת התצוגה המקדימה",
   "route_to": "ניתוב אל",
-  "test_preview_description": "בדיקת טופס הניתוב שלך בלי לשלוח נתונים",
+  "test_preview_description": "לבדוק את טופס הניתוב שלך בלי לשלוח נתונים",
   "test_routing": "בדיקת ניתוב"
 }

apps/web/public/static/locales/it/common.json

@@ -16,8 +16,8 @@
   "event_request_cancelled": "Il tuo evento programmato è stato cancellato",
   "organizer": "Organizzatore",
   "need_to_reschedule_or_cancel": "È necessario riprogrammare o annullare?",
-  "cancellation_reason": "Motivo dell'annullamento",
-  "cancellation_reason_placeholder": "Perché stai annullando? (facoltativo)",
+  "cancellation_reason": "Motivo dell'annullamento (facoltativo)",
+  "cancellation_reason_placeholder": "Perché stai annullando?",
   "rejection_reason": "Motivo del rifiuto",
   "rejection_reason_title": "Rifiutare la richiesta di prenotazione?",
   "rejection_reason_description": "Sei sicuro di voler rifiutare la prenotazione? Informeremo la persona che ha cercato di prenotare. Puoi indicare il motivo qui sotto.",
@@ -419,7 +419,7 @@
   "forgotten_secret_description": "Nel caso la parola segreta venga persa o dimenticata, è possibile cambiarla, ma tieni presente che tutte le integrazioni che la utilizzano dovranno essere aggiornate",
   "current_incorrect_password": "La password attuale non è corretta",
   "password_hint_caplow": "Combinazione di caratteri maiuscoli e minuscoli",
-  "password_hint_min": "La lunghezza minima è di 7 caratteri",
+  "password_hint_min": "La lunghezza minima è di 8 caratteri",
   "password_hint_num": "Deve contenere almeno 1 numero",
   "invalid_password_hint": "La password deve avere una lunghezza minima di 7 caratteri e deve contenere almeno 1 numero e una combinazione di caratteri maiuscoli e minuscoli",
   "incorrect_password": "La password non è corretta.",
@@ -504,7 +504,7 @@
   "add_team_members_description": "Invita altri utenti a unirsi al tuo team",
   "add_team_member": "Aggiungi un membro del team",
   "invite_new_member": "Invita un nuovo membro",
-  "invite_new_member_description": "Nota: il <1>costo di un posto aggiuntivo (15$/m)</1> verrà addebitato sul tuo abbonamento.",
+  "invite_new_member_description": "Nota: Sul tuo abbonamento verrà addebitato <1>un posto aggiuntivo (15$/m)</1>.",
   "invite_new_team_member": "Invita qualcuno nel tuo team.",
   "change_member_role": "Cambia il ruolo del membro del team",
   "disable_cal_branding": "Disabilita il branding {{appName}}",
@@ -601,7 +601,7 @@
   "monthly_other": "mesi",
   "yearly_one": "anno",
   "yearly_other": "anni",
-  "plus_more": "altri {{count}}",
+  "plus_more": "Altri {{count}}",
   "max": "Max",
   "single_theme": "Tema Singolo",
   "brand_color": "Colore del Marchio",
@@ -653,7 +653,7 @@
   "show_advanced_settings": "Mostra impostazioni avanzate",
   "event_name": "Nome Dell'Evento",
   "event_name_tooltip": "Il nome che apparirà nei calendari",
-  "meeting_with_user": "Riunione con {ATTENDEE}",
+  "meeting_with_user": "Riunione con {{attendeeName}}",
   "additional_inputs": "Input Aggiuntivi",
   "additional_input_description": "Chiedi al creatore del programma di inserire dei campi di input aggiuntivi prima che la prenotazione sia confermata",
   "label": "Etichetta",
@@ -784,7 +784,7 @@
   "analytics": "Analisi",
   "empty_installed_apps_headline": "Nessuna app installata",
   "empty_installed_apps_description": "Le app consentono di ottimizzare il flusso di lavoro e di migliorare significativamente la pianificazione.",
-  "empty_installed_apps_button": "Esplora l'App Store o installa dalle app sottostanti",
+  "empty_installed_apps_button": "Esplora l'App Store",
   "manage_your_connected_apps": "Gestisci le app installate o modifica le impostazioni",
   "browse_apps": "Sfoglia app",
   "features": "Funzionalità",
@@ -1108,6 +1108,7 @@
   "incorrect_2fa": "Codice di autenticazione a due fattori errato",
   "which_event_type_apply": "A quale tipo di evento si applicherà?",
   "no_workflows_description": "I flussi di lavoro attivano una semplice automazione per inviare notifiche e promemoria che ti consentono di creare processi per i tuoi eventi.",
+  "timeformat_profile_hint": "Questa è un'impostazione interna e non influenzerà il modo in cui gli orari sono visualizzati nelle pagine di prenotazione pubbliche a te e a chiunque faccia una prenotazione.",
   "create_workflow": "Crea un flusso di lavoro",
   "do_this": "Esegui questa operazione",
   "turn_off": "Disattiva",
@@ -1115,7 +1116,6 @@
   "error_updating_settings": "Errore durante l'aggiornamento delle impostazioni",
   "personal_cal_url": "Il mio URL personale di {{appName}}",
   "bio_hint": "Scrivi qualcosa di te. Queste informazioni appariranno nella tua pagina personale.",
-  "timeformat_profile_hint": "Questa è un'impostazione interna e non influenzerà il modo in cui gli orari sono visualizzati nelle pagine di prenotazione pubbliche a te e a chiunque faccia una prenotazione.",
   "delete_account_modal_title": "Elimina account",
   "confirm_delete_account_modal": "Eliminare il tuo account {{appName}}?",
   "delete_my_account": "Elimina il mio account",
@@ -1258,6 +1258,7 @@
   "back_to_signin": "Torna alla pagina di accesso",
   "reset_link_sent": "Link per la reimpostazione inviato",
   "password_reset_email": "Un'e-mail con le istruzioni per reimpostare la password è stata inviata all'indirizzo {{email}}.",
+  "password_reset_leading": "Se un'e-mail non ti dovesse arrivare a breve, assicurati che l'indirizzo specificato sia corretto e controlla la cartella della posta indesiderata. Se il problema persiste, contatta l'assistenza clienti.",
   "password_updated": "Password aggiornata!",
   "pending_payment": "Pagamento in sospeso",
   "confirmation_page_rainbow": "Proteggi i tuoi eventi con token o NFT su Ethereum, Polygon e altri.",
@@ -1323,7 +1324,7 @@
   "saml_config_updated_successfully": "Configurazione SAML aggiornata correttamente",
   "saml_configuration": "Configurazione SAML",
   "delete_saml_configuration": "Elimina configurazione SAML",
-  "delete_saml_configuration_confirmation_message": "Sei sicuro di voler eliminare la configurazione SAML? I membri del tuo team che utilizzano l'accesso SAML non saranno più in grado di accedere a {{appName}}.",
+  "delete_saml_configuration_confirmation_message": "Sei sicuro di voler eliminare la configurazione SAML? I membri del tuo team che utilizzano l'accesso SAML non saranno più in grado di accedere a Cal.com.",
   "confirm_delete_saml_configuration": "Sì, elimina configurazione SAML",
   "saml_not_configured_yet": "SAML non ancora configurato",
   "saml_configuration_description": "Per aggiornare la configurazione SAML, incolla nella casella sottostante i metadati SAML forniti dal tuo provider di identità.",
@@ -1344,16 +1345,16 @@
   "billing_frequency": "Frequenza di fatturazione",
   "monthly": "Mensile",
   "yearly": "Annuale",
-  "checkout": "Checkout",
+  "checkout": "Pagamento",
   "your_team_disbanded_successfully": "Il tuo team è stato sciolto correttamente",
   "error_creating_team": "Errore durante la creazione del team",
   "you": "Tu",
   "send_email": "Invia e-mail",
   "member_already_invited": "Membro già invitato",
   "enter_email_or_username": "Immettere un indirizzo e-mail o un nome utente",
-  "team_name_taken": "Nome già occupato",
-  "must_enter_team_name": "Immettere un nome del team",
-  "team_url_required": "Immettere un URL del team",
+  "team_name_taken": "Nome già utilizzato",
+  "must_enter_team_name": "Necessario immettere un nome per il team",
+  "team_url_required": "Immettere un URL per il team",
   "team_url_taken": "URL già occupato",
   "team_publish": "Pubblica team",
   "number_sms_notifications": "Numero di telefono (notifiche SMS)",

apps/web/public/static/locales/ja/common.json

@@ -16,8 +16,8 @@
   "event_request_cancelled": "スケジュールされていた予定がキャンセルされました",
   "organizer": "主催者",
   "need_to_reschedule_or_cancel": "再スケジュールまたはキャンセルが必要ですか？",
-  "cancellation_reason": "キャンセルの理由",
-  "cancellation_reason_placeholder": "キャンセルが必要な理由を教えてください (任意)",
+  "cancellation_reason": "キャンセルの理由 (オプション)",
+  "cancellation_reason_placeholder": "キャンセルが必要な理由をお教えください",
   "rejection_reason": "拒否の理由",
   "rejection_reason_title": "予約のリクエストを拒否しますか？",
   "rejection_reason_description": "この予約を拒否してよろしいですか？予約を試みたユーザーに通知を送ります。拒否の理由は、下にご記入いただけます。",
@@ -108,7 +108,7 @@
   "link_expires": "追記: 有効期限は {{expiresIn}} 時間後に切れます。",
   "upgrade_to_per_seat": "座席ごとにアップグレードする",
   "team_upgrade_seats_details": "あなたのチームに所属する {{memberCount}} 人のメンバーのうち、{{unpaidCount}} 名分のライセンスが未払いとなっています。ライセンスごとの料金は、${{seatPrice}} / 月ですので、あなたのメンバーシップの合計金額は、${{totalCost}} / 月になると予想されます。",
-  "team_upgrade_banner_description": "新しいチームプランをお試しいただきありがとうございます。あなたのチーム「{{teamName}}」はアップグレードが必要なようです。",
+  "team_upgrade_banner_description": "新しいチームプランをお試しいただき、ありがとうございます。あなたのチーム「{{teamName}}」には、アップグレードが必要なようです。",
   "team_upgrade_banner_action": "アップグレードはこちら",
   "team_upgraded_successfully": "チームのアップグレードが正常に完了しました！",
   "use_link_to_reset_password": "以下のリンクを使用してパスワードをリセットしてください",
@@ -235,7 +235,7 @@
   "welcome": "ようこそ",
   "welcome_back": "おかえりなさい",
   "welcome_to_calcom": "{{appName}} へようこそ",
-  "welcome_instructions": "{{appName}} でご使用になるお名前とタイムゾーンを教えてください。これらは後から編集できます。",
+  "welcome_instructions": "Cal.com でご使用になるお名前とタイムゾーンを教えてください。これらは後から編集できます。",
   "connect_caldav": "CalDav (ベータ版) に接続",
   "credentials_stored_and_encrypted": "認証情報は保存され暗号化されます。",
   "connect": "接続",
@@ -419,7 +419,7 @@
   "forgotten_secret_description": "このシークレットを紛失または忘れた場合は変更が可能です。しかしこのシークレットを使っている連携はすべて最新のものにする必要があります",
   "current_incorrect_password": "現在のパスワードが正しくありません",
   "password_hint_caplow": "アルファベットの大文字と小文字を両方使用してください",
-  "password_hint_min": "7 文字以上入力してください",
+  "password_hint_min": "8 文字以上入力してください",
   "password_hint_num": "少なくとも 1 文字は数字を含めてください",
   "invalid_password_hint": "パスワードには少なくとも 1 文字以上数字を含め、アルファベットの大文字と小文字を両方使用した上で 7 文字以上の長さに設定してください",
   "incorrect_password": "パスワードが正しくありません。",
@@ -504,7 +504,7 @@
   "add_team_members_description": "他のユーザーをチームに招待する",
   "add_team_member": "チームメンバーを追加",
   "invite_new_member": "新しいチームメンバーを招待",
-  "invite_new_member_description": "注意：これによりサブスクリプションに<1>追加座席分（月15ドル）の費用が加算されます。</1>",
+  "invite_new_member_description": "注: これにより、サブスクリプションに<1>追加の座席料金 (15 米ドル/メンバー) が加算されます。</1>",
   "invite_new_team_member": "チームに誰かを招待する。",
   "change_member_role": "チームメンバーの役割を変更する",
   "disable_cal_branding": "{{appName}} のブランディングを無効化",
@@ -601,7 +601,7 @@
   "monthly_other": "月",
   "yearly_one": "年",
   "yearly_other": "年",
-  "plus_more": "{{count}} 回以上",
+  "plus_more": "あと {{count}} 回",
   "max": "最大",
   "single_theme": "シングルテーマ",
   "brand_color": "ブランドカラー",
@@ -653,7 +653,7 @@
   "show_advanced_settings": "詳細設定を表示",
   "event_name": "イベント名",
   "event_name_tooltip": "カレンダーに表示される名前",
-  "meeting_with_user": "{ATTENDEE} とのミーティング",
+  "meeting_with_user": "{{attendeeName}} とのミーティング",
   "additional_inputs": "追加入力",
   "additional_input_description": "予約確認前にスケジュール設定者の追加入力が必要です",
   "label": "ラベル",
@@ -685,7 +685,7 @@
   "cal_provide_zoom_meeting_url": "{{appName}} は Zoom ミーティングの URLを提供する。",
   "cal_provide_tandem_meeting_url": "{{appName}} は Tandem ミーティングの URL を提供する。",
   "cal_provide_video_meeting_url": "{{appName}} はビデオミーティングの URL を提供する。",
-  "cal_provide_jitsi_meeting_url": "{{appName}} は Jitsi Meet の URL を提供する。",
+  "cal_provide_jitsi_meeting_url": "Cal は Jitsi Meet の URL を提供する。",
   "cal_provide_huddle01_meeting_url": "{{appName}} は Huddle01 web3 ビデオミーティングの URL を提供する。",
   "cal_provide_teams_meeting_url": "{{appName}} は、MS Teams のミーティングの URL を提供する。注: 職場や学校のアカウントが必要です。",
   "require_payment": "有料",
@@ -784,7 +784,7 @@
   "analytics": "分析",
   "empty_installed_apps_headline": "アプリがインストールされていません",
   "empty_installed_apps_description": "アプリを使えば、ワークフローの質を高め、スケジュールライフを大幅に改善することができます。",
-  "empty_installed_apps_button": "App Store で探す",
+  "empty_installed_apps_button": "App Store を見る",
   "manage_your_connected_apps": "インストール済みアプリの管理や設定の変更を行う",
   "browse_apps": "アプリを閲覧",
   "features": "特徴",
@@ -1108,6 +1108,7 @@
   "incorrect_2fa": "不正な二要素認証コード",
   "which_event_type_apply": "これはどのイベントタイプに適用されますか？",
   "no_workflows_description": "ワークフローを使用すると通知やリマインダーの送信を簡単に自動化することができ、イベントに関するプロセスを構築することができます。",
+  "timeformat_profile_hint": "これは内部設定であり、あなたやあなたを予約した人の公開予約ページの時間表示には影響しません。",
   "create_workflow": "ワークフローを作成",
   "do_this": "これを実行する",
   "turn_off": "オフにする",
@@ -1115,7 +1116,6 @@
   "error_updating_settings": "設定の更新中にエラーが発生しました",
   "personal_cal_url": "私の個人 {{appName}} URL",
   "bio_hint": "あなたに関する簡潔な説明。これはあなたの個人 URL ページに表示されます。",
-  "timeformat_profile_hint": "これは内部設定であり、あなたやあなたを予約した人の公開予約ページの時間表示には影響しません。",
   "delete_account_modal_title": "アカウントを削除する",
   "confirm_delete_account_modal": "{{appName}} アカウントを削除してもよろしいですか？",
   "delete_my_account": "アカウントを削除する",
@@ -1229,7 +1229,7 @@
   "exchange_compression": "GZip 圧縮",
   "routing_forms_description": "作成したすべてのフォームとルートをここで確認できます。",
   "routing_forms_send_email_owner": "所有者にメールを送信",
-  "routing_forms_send_email_owner_description": "フォーム送信時に所有者にメールを送信します",
+  "routing_forms_send_email_owner_description": "フォームの送信時に所有者にメールを送信します",
   "add_new_form": "新しいフォームを追加",
   "form_description": "予約者をルーティングするフォームを作成します",
   "copy_link_to_form": "フォームへのリンクをコピー",
@@ -1296,7 +1296,7 @@
   "fetching_calendars_error": "カレンダーの取得中にエラーが発生しました。<1>もう一度お試しいただく</1>か、カスタマーサポートまでお問い合わせください。",
   "calendar_connection_fail": "カレンダーの接続に失敗しました",
   "booking_confirmation_success": "正常に予約を確認しました",
-  "booking_rejection_success": "正常に予約を拒否しました",
+  "booking_rejection_success": "予約を正常に拒否しました",
   "booking_confirmation_fail": "予約の確認に失敗しました",
   "we_wont_show_again": "次回から表示しない",
   "couldnt_update_timezone": "タイムゾーンを更新できませんでした",
@@ -1324,7 +1324,7 @@
   "saml_config_updated_successfully": "SAML の構成が正常に更新されました",
   "saml_configuration": "SAML の構成",
   "delete_saml_configuration": "SAML の構成を削除する",
-  "delete_saml_configuration_confirmation_message": "SAML の構成を本当に削除してよろしいですか？SAML を使用してログインしているチームメンバーは、{{appName}} にアクセスすることができなくなります。",
+  "delete_saml_configuration_confirmation_message": "SAML の構成を本当に削除してよろしいですか？SAML を使用してログインしているチームメンバーは、Cal.com にアクセスすることができなくなります。",
   "confirm_delete_saml_configuration": "はい。SAML の構成を削除します",
   "saml_not_configured_yet": "SAML がまだ構成されていません",
   "saml_configuration_description": "SAML の構成を更新するには、以下のテキストボックスに ID プロバイダーから提供されている SAML のメタデータを貼り付けてください。",
@@ -1342,33 +1342,33 @@
   "limit_future_bookings_description": "今後いつまでこのイベントを予約できるかを設定します",
   "no_event_types": "イベントタイプは設定されていません",
   "no_event_types_description": "{{name}}はあなたが予約するイベントのタイプを設定していません。",
-  "billing_frequency": "請求頻度",
-  "monthly": "月ごと",
-  "yearly": "年ごと",
-  "checkout": "精算",
-  "your_team_disbanded_successfully": "チームは正常に解散しました",
+  "billing_frequency": "請求の頻度",
+  "monthly": "毎月",
+  "yearly": "毎年",
+  "checkout": "チェックアウト",
+  "your_team_disbanded_successfully": "チームは正常に解散されました",
   "error_creating_team": "チームの作成中にエラーが発生しました",
   "you": "あなた",
   "send_email": "メールを送信",
   "member_already_invited": "メンバーは既に招待されています",
   "enter_email_or_username": "メールアドレスまたはユーザー名を入力してください",
   "team_name_taken": "この名前は既に使用されています",
-  "must_enter_team_name": "チーム名を入力する必要があります",
-  "team_url_required": "チームの URL を入力する必要があります",
+  "must_enter_team_name": "チーム名の入力は必須です",
+  "team_url_required": "チームの URL の入力は必須です",
   "team_url_taken": "この URL は既に使用されています",
   "team_publish": "チームを公開",
   "number_sms_notifications": "電話番号（SMS 通知）",
   "attendee_email_workflow": "出席者のメールアドレス",
   "attendee_email_info": "予約者のメールアドレス",
-  "invalid_credential": "おっと！許可が期限切れになったか、取り消されたようです。もう一度インストールし直してください。",
+  "invalid_credential": "アクセス許可の有効期限が切れたか、取り消されたようです。もう一度インストールしてください。",
   "choose_common_schedule_team_event": "共通のスケジュールを選択",
-  "choose_common_schedule_team_event_description": "ホスト間で共通のスケジュールを使用する場合は、これを有効にします。無効にすると、各ホストはデフォルトのスケジュールに基づいて予約されます。",
+  "choose_common_schedule_team_event_description": "ホスト間で共通のスケジュールを使用する場合には、これを有効にしてください。無効にすると、各ホストに対してはデフォルトのスケジュールに基づいて予約が行われます。",
   "reason": "理由",
   "sender_id": "送信者 ID",
-  "sender_id_error_message": "文字、数字、スペースのみ使用できます（最大 11 文字）",
+  "sender_id_error_message": "文字、数字、スペースのみが使用可能です (最大 11 文字)",
   "test_routing_form": "ルーティングフォームをテスト",
-  "test_preview": "テストプレビュー",
-  "route_to": "ルート先",
+  "test_preview": "プレビューをテスト",
+  "route_to": "ルーティング先",
   "test_preview_description": "データを送信せずにルーティングフォームをテストします",
   "test_routing": "ルーティングをテスト"
 }