Open source CapCut alternative.
TypeScript
feat(site): sell Plus, Pro, and Max plans [rebuild]
David Lede17583f8be8
diff --git a/site/.env.example b/site/.env.exampleindex 8026bd10..2eac2858 100644--- a/site/.env.example+++ b/site/.env.example@@ -36,15 +36,8 @@ DONKEY_DEV_AUTH_BYPASS=1# path above.GEMINI_API_KEY="replace-with-gemini-api-key"-# Stripe. The Pro subscription plus one-time credit top-ups run through-# STRIPE_SECRET_KEY and the /api/billing/webhook endpoint (signed by-# STRIPE_WEBHOOK_SECRET).-# STRIPE_PRO_PRICE_ID — recurring price for the Donkey Pro app plan; the-# included monthly inference allowance equals this price (a $20/mo plan-# includes $20 of inference), read straight from the price's amount.STRIPE_SECRET_KEY="replace-with-stripe-secret-key"STRIPE_WEBHOOK_SECRET="replace-with-stripe-webhook-signing-secret"-STRIPE_PRO_PRICE_ID="replace-with-stripe-pro-price-id"STRIPE_PORTAL_CONFIGURATION_ID="replace-with-stripe-portal-configuration-id"# PostHog analytics (client-side project key; public by design, inlined at build).diff --git a/site/src/app/[locale]/cut/_components/landing/CutPricing.tsx b/site/src/app/[locale]/cut/_components/landing/CutPricing.tsxindex f516605a..c6f4a511 100644--- a/site/src/app/[locale]/cut/_components/landing/CutPricing.tsx+++ b/site/src/app/[locale]/cut/_components/landing/CutPricing.tsx@@ -13,7 +13,7 @@ export function CutPricing() {const appHref = useAppEntryHref();const t = useTranslations("landing.pricing");- // Both plan CTAs enter the app, so gate them the same way as the hero: a+ // Every plan CTA enters the app, so gate them the same way as the hero: a// signed-out click lands on sign-in first, then returns to the app target.const plans = useCutPricingPlans().map((plan) => ({...plan,@@ -41,7 +41,7 @@ export function CutPricing() {style={{marginTop: 48,display: "grid",- gridTemplateColumns: isDesktop ? "1fr 1fr" : "1fr",+ gridTemplateColumns: isDesktop ? "repeat(auto-fit, minmax(260px, 1fr))" : "1fr",alignItems: "stretch",gap: 24,}}@@ -50,9 +50,6 @@ export function CutPricing() {<PricingPlanCard key={plan.name} plan={plan} />))}</div>- <p className="mt-6 text-[15px] leading-[1.55] text-foreground/70">- {t("footnote")}- </p></section>);}diff --git a/site/src/app/[locale]/cut/_components/landing/cutPricingPlans.ts b/site/src/app/[locale]/cut/_components/landing/cutPricingPlans.tsindex adff1b14..42de7ec8 100644--- a/site/src/app/[locale]/cut/_components/landing/cutPricingPlans.ts+++ b/site/src/app/[locale]/cut/_components/landing/cutPricingPlans.ts@@ -1,38 +1,65 @@import { useLocale, useTranslations } from "next-intl";import type { PricingPlan } from "@/app/_components/landing/pricingPlans";+import type { CardColor } from "@/app/_components/landing/theme";import { promotionCovers, type AllowancePromotion } from "@/lib/billing/allowance-promotion";-import { creditsPerDollar, formatCreditCount } from "@/lib/credits/format-credits";+import { PAID_PLANS, PLAN_TERMS, RECOMMENDED_PLAN, type PaidPlan } from "@/lib/billing/plans";+import { formatCreditCount } from "@/lib/credits/format-credits";import { formatUsdPlain } from "@/lib/credits/format-usd";-// What Pro costs and what it gets you, in one place: the landing card below-// and the welcome sequence's last slide both read it, so the price can't say-// two different things in two parts of the product.-export const CUT_PRO = {- // The plan price in USD a month. The included AI allowance equals it.- monthlyDollars: 20,- storageGb: 100,-};-// The Free plan's cloud storage, as its card states it.const FREE_STORAGE_MB = 250;-/** Pro in the reader's language: the line under its name, the price, and- * what it adds. The landing card sits beside the Free card and opens with a- * line pointing at it; nothing else does, so that line isn't in here. */-export function useCutPro(): { body: string; price: string; features: string[] } {- const t = useTranslations("common.proPlan");+// A plan's bullet: its credits lead, the plan below it is folded into one+// line, and the rest are checks.+export type PlanFeature = { kind: "credits" | "inherits" | "check"; text: string };++export type PlanCopy = {+ plan: PaidPlan;+ name: string;+ body: string;+ // "$20/month"; `amount` and `cadence` split it for a large figure.+ price: string;+ amount: string;+ cadence: string;+ features: PlanFeature[];+};++/** Every paid plan in the reader's language, cheapest first: the landing+ * cards, the welcome sequence and the upgrade modal all read it, so a plan+ * can't say two different things in two parts of the product. */+export function useCutPlans(): PlanCopy[] {+ const t = useTranslations("common.plans");const locale = useLocale();- const credits = formatCreditCount(CUT_PRO.monthlyDollars * creditsPerDollar, locale);- return {- body: t("body"),- price: t("price", { price: formatUsdPlain(String(CUT_PRO.monthlyDollars), locale) }),- features: [- t("storage", { gb: CUT_PRO.storageGb }),- t("credits", { credits }),- t("generation"),- ],- };+ return PAID_PLANS.map((plan, i) => {+ const terms = PLAN_TERMS[plan];+ const below = i > 0 ? PLAN_TERMS[PAID_PLANS[i - 1]] : null;+ const amount = formatUsdPlain(String(terms.monthlyDollars), locale);+ const features: PlanFeature[] = [+ { kind: "credits", text: t("credits", { credits: formatCreditCount(terms.monthlyCredits, locale) }) },+ ...(below ? [{ kind: "inherits" as const, text: t("everythingIn", { plan: below.name }) }] : []),+ { kind: "check", text: t("storage", { gb: terms.storageGb }) },+ ...(terms.unlimitedProjects && !below?.unlimitedProjects+ ? [{ kind: "check" as const, text: t("unlimitedProjects") }]+ : []),+ ...(below ? [{ kind: "check" as const, text: t("renders", { count: terms.rendersPerDay }) }] : []),+ ...(below ? [] : [{ kind: "check" as const, text: t("generation") }]),+ ];+ return {+ plan,+ name: terms.name,+ body: t("body", { plan }),+ price: t("price", { price: amount }),+ amount,+ cadence: t("perMonth"),+ features,+ };+ });+}++/** One plan's copy. */+export function useCutPlan(plan: PaidPlan): PlanCopy {+ return useCutPlans().find((copy) => copy.plan === plan)!;}// The allowance promotion as the Pro card states it, while a period starting@@ -44,18 +71,24 @@ export function activeProPromotion(): { allowanceDollars: number; multiplier: number; lastDay: string | null } | null {if (!promotionCovers(promotion, now)) return null;return {- allowanceDollars: CUT_PRO.monthlyDollars * promotion.multiplier,+ allowanceDollars: PLAN_TERMS.pro.monthlyDollars * promotion.multiplier,multiplier: promotion.multiplier,lastDay: promotion.lastDay,};}-// Cut's two tiers: the editor itself is free and local; Pro adds monthly AI-// generation credits.+// Cut's tiers: the editor itself is free and local; each paid plan adds+// monthly AI generation credits and cloud storage.+const PLAN_COLORS: Record<PaidPlan, { color: CardColor; tapeColor: CardColor }> = {+ plus: { color: "cream", tapeColor: "mint" },+ pro: { color: "coral", tapeColor: "yellow" },+ max: { color: "cream", tapeColor: "pink" },+};+export function useCutPricingPlans(): PricingPlan[] {const t = useTranslations("landing.plans");const locale = useLocale();- const pro = useCutPro();+ const plans = useCutPlans();return [{action: {@@ -76,20 +109,26 @@ export function useCutPricingPlans(): PricingPlan[] {price: formatUsdPlain("0", locale),tapeColor: "coral",},- {+ ...plans.map((copy, i): PricingPlan => ({action: {href: "/app/settings",kind: "link",- label: t("pro.cta"),+ label: t("paid.cta", { plan: copy.name }),},- body: pro.body,- color: "coral",- detail: t("pro.detail"),- features: [t("pro.everythingInFree"), ...pro.features],- name: "Pro",- price: pro.price,- tapeColor: "yellow",- tapePosition: "right",- },+ body: copy.body,+ ...PLAN_COLORS[copy.plan],+ detail: t("paid.detail", { plan: copy.plan }),+ // The first plan names what it adds to Free after its credits, the way+ // each higher plan names the one under it.+ features: [+ copy.features[0].text,+ ...(i === 0 ? [t("paid.everythingInFree")] : []),+ ...copy.features.slice(1).map((feature) => feature.text),+ ],+ name: copy.name,+ price: copy.amount,+ cadence: copy.cadence,+ ...(copy.plan === RECOMMENDED_PLAN ? { tapePosition: "right" as const } : {}),+ })),];}diff --git a/site/src/app/[locale]/cut/app/(home)/settings/_components/ProCard.tsx b/site/src/app/[locale]/cut/app/(home)/settings/_components/ProCard.tsxindex 91c3a9f2..54944b6c 100644--- a/site/src/app/[locale]/cut/app/(home)/settings/_components/ProCard.tsx+++ b/site/src/app/[locale]/cut/app/(home)/settings/_components/ProCard.tsx@@ -6,7 +6,6 @@ import {useIntroOffer,useOpenBillingPortal,useProSubscription,- useStartCheckout,} from "@/queries/billing";import { Badge } from "@/components/ui/badge";import { Button } from "@/components/ui/button";@@ -19,11 +18,13 @@ import {CardTitle,} from "@/components/ui/card";import { Skeleton } from "@/components/ui/skeleton";-import { activeProPromotion, CUT_PRO, useCutPro } from "@/app/[locale]/cut/_components/landing/cutPricingPlans";+import { activeProPromotion, useCutPlan } from "@/app/[locale]/cut/_components/landing/cutPricingPlans";import { useApiErrorText } from "@/app/[locale]/cut/app/(home)/settings/_components/useApiErrorText";import { useIntroTerms } from "@/cut/components/IntroOffer";-import { minutesLeft, useCreditLifeClause, useFormatDeadline } from "@/cut/components/SubscribeBonusPill";+import { useCreditLifeClause, useFormatDeadline } from "@/cut/components/SubscribeBonusPill";+import { openUpgrade } from "@/cut/lib/upgrade";import { track } from "@/lib/analytics";+import { PAID_PLANS, PLAN_TERMS } from "@/lib/billing/plans";import { creditCountLabel, creditsFromDollars, creditsPerDollar, formatCreditCount, formatCredits } from "@/lib/credits/format-credits";import type { Locale } from "@/i18n/locales";import { useSubscribeBonus } from "@/queries/credits";@@ -39,7 +40,7 @@ export function ProCard() {const t = useTranslations("settings.pro");const locale = useLocale();const format = useFormatter();- const proPlan = useCutPro();+ const proPlan = useCutPlan("pro");const apiErrorText = useApiErrorText();// The promotion's last day, the way the card names it.@@ -50,7 +51,6 @@ export function ProCard() {const formatDeadline = useFormatDeadline();const creditLifeClause = useCreditLifeClause();const pro = useProSubscription();- const checkout = useStartCheckout();const portal = useOpenBillingPortal();const bonus = useSubscribeBonus();const config = useAccountConfig({ enabled: true });@@ -72,6 +72,7 @@ export function ProCard() {const data = pro.data;const isActive = data?.isActive ?? false;+ const plan = data?.plan ?? null;const offer = bonus.data;const offerOpen = offer?.status === "open";@@ -79,7 +80,7 @@ export function ProCard() {<Card><CardHeader><CardTitle className="flex items-center gap-3">- {t("title")}+ {plan ? t("titlePlan", { plan: PLAN_TERMS[plan].name }) : t("title")}{isActive && data ? (<Badge variant="default">{t("status", { status: data.status ?? "" })}</Badge>) : null}@@ -94,12 +95,12 @@ export function ProCard() {day: lastDayLabel(promotion.lastDay),allowance: allowanceCredits(promotion.allowanceDollars, locale),multiplier: format.number(promotion.multiplier),- usual: allowanceCredits(CUT_PRO.monthlyDollars, locale),+ usual: allowanceCredits(PLAN_TERMS.pro.monthlyDollars, locale),}): t("promotionOpen", {allowance: allowanceCredits(promotion.allowanceDollars, locale),multiplier: format.number(promotion.multiplier),- usual: allowanceCredits(CUT_PRO.monthlyDollars, locale),+ usual: allowanceCredits(PLAN_TERMS.pro.monthlyDollars, locale),})}</CardContent>) : null}@@ -156,6 +157,9 @@ export function ProCard() {</CardContent>) : null}<CardFooter className="gap-3">+ {plan !== PAID_PLANS[PAID_PLANS.length - 1] ? (+ <Button onClick={() => openUpgrade("plans")}>{isActive ? t("upgrade") : t("seePlans")}</Button>+ ) : null}{isActive ? (<Buttondisabled={portal.isPending}@@ -169,30 +173,9 @@ export function ProCard() {>{portal.isPending ? t("opening") : t("manage")}</Button>- ) : (- <Button- disabled={checkout.isPending}- onClick={() => {- track("pro_checkout_started");- if (offer && offerOpen) {- track("subscribe_bonus_checkout_started", {- dollars: Number(offer.dollars),- minutesLeft: minutesLeft(offer.closesAt, Date.now()),- source: "settings",- });- }- checkout.mutate(undefined, {- onSuccess: (result) => window.location.assign(result.url),- });- }}- >- {checkout.isPending ? t("starting") : t("subscribe")}- </Button>- )}- {checkout.isError || portal.isError ? (- <span className="text-sm text-destructive">- {apiErrorText(checkout.error ?? portal.error, t("unavailable"))}- </span>+ ) : null}+ {portal.isError ? (+ <span className="text-sm text-destructive">{apiErrorText(portal.error, t("unavailable"))}</span>) : null}</CardFooter></Card>diff --git a/site/src/app/[locale]/cut/app/(home)/settings/page.tsx b/site/src/app/[locale]/cut/app/(home)/settings/page.tsxindex cb33ae82..fbd41cf5 100644--- a/site/src/app/[locale]/cut/app/(home)/settings/page.tsx+++ b/site/src/app/[locale]/cut/app/(home)/settings/page.tsx@@ -4,8 +4,8 @@ import { CreditsCard } from "@/app/[locale]/cut/app/(home)/settings/_components/import { ProCard } from "@/app/[locale]/cut/app/(home)/settings/_components/ProCard";import { SettingsGuard } from "@/cut/components/SettingsGuard";-// Cut's billing page: the Pro subscription that carries the monthly AI-// credits, plus the credit balance and top-ups.+// Cut's billing page: the subscription that carries the monthly AI credits,+// plus the credit balance.export default function CutBillingPage() {return (<SettingsGuard>diff --git a/site/src/app/_components/landing/LandingPrimitives.tsx b/site/src/app/_components/landing/LandingPrimitives.tsxindex fe35c6e1..6b0dbf3b 100644--- a/site/src/app/_components/landing/LandingPrimitives.tsx+++ b/site/src/app/_components/landing/LandingPrimitives.tsx@@ -115,6 +115,9 @@ type PillButtonProps = {onClick?: () => void | Promise<void>;size?: ButtonSize;variant?: ButtonVariant;+ // "full" stretches the pill across its container, so a row of cards shares+ // one button size whatever each label says.+ width?: "fit" | "full";};export function PillButton({@@ -125,6 +128,7 @@ export function PillButton({onClick,size = "md",variant = "primary",+ width = "fit",}: PillButtonProps) {const sizes: Record<ButtonSize, CSSProperties> = {sm: { padding: "8px 16px", fontSize: 14 },@@ -159,6 +163,7 @@ export function PillButton({transition: "transform 0.15s ease, opacity 0.15s ease",...sizes[size],...variants[variant],+ ...(width === "full" ? { boxSizing: "border-box", width: "100%" } : {}),};if (href && !disabled) {diff --git a/site/src/app/_components/landing/PricingPlanCard.tsx b/site/src/app/_components/landing/PricingPlanCard.tsxindex 403dcf16..4e68557b 100644--- a/site/src/app/_components/landing/PricingPlanCard.tsx+++ b/site/src/app/_components/landing/PricingPlanCard.tsx@@ -18,7 +18,7 @@ export function PricingPlanCard({ plan }: Props) {const action = plan.action;const button = (- <PillButton href={action.href} variant="dark">+ <PillButton href={action.href} variant="dark" width="full">{action.label}</PillButton>);@@ -52,6 +52,11 @@ export function PricingPlanCard({ plan }: Props) {>{plan.price}</span>+ {plan.cadence ? (+ <span style={{ fontWeight: 600, fontSize: 16, opacity: 0.7 }}>+ {plan.cadence}+ </span>+ ) : null}</div><divstyle={{diff --git a/site/src/app/_components/landing/pricingPlans.ts b/site/src/app/_components/landing/pricingPlans.tsindex c3421504..f1510cc2 100644--- a/site/src/app/_components/landing/pricingPlans.ts+++ b/site/src/app/_components/landing/pricingPlans.ts@@ -16,7 +16,9 @@ export type PricingPlan = {detail: string;features: string[];name: string;+ // The figure, large ("$20"), and what it is per, small beside it ("/month").price: string;+ cadence?: string;tapeColor: CardColor;tapePosition?: "left" | "right" | "center";};diff --git a/site/src/app/api/billing/checkout/route.ts b/site/src/app/api/billing/checkout/route.tsindex cd696784..703afa44 100644--- a/site/src/app/api/billing/checkout/route.ts+++ b/site/src/app/api/billing/checkout/route.ts@@ -1,4 +1,5 @@import { NextResponse } from "next/server";+import Stripe from "stripe";import { z } from "zod";import { requestLocale } from "@/i18n/requestLocale";@@ -6,7 +7,8 @@ import { auth } from "@/lib/auth";import { introCouponId } from "@/lib/billing/intro-offer";import { introCoupon, readIntroOffer } from "@/lib/billing/intro-offer-server";import { metaCheckoutMetadata, trackCheckoutStarted } from "@/lib/billing/meta-checkout";-import { proPriceId } from "@/lib/billing/pro-subscription";+import { PAID_PLANS, PLAN_TERMS, planRank, type PaidPlan } from "@/lib/billing/plans";+import { getActiveSubscription, readPlanPrices, subscriptionPlan, type PlanPrices } from "@/lib/billing/pro-subscription";import { STRIPE_LOCALE } from "@/lib/billing/stripe-locale";import { ensureStripeCustomer, getStripe } from "@/lib/billing/stripe";import { contextFromRequest } from "@/lib/config/effective";@@ -18,13 +20,19 @@ import {withDonkeyAuth,} from "@/lib/donkey-api-auth";-// A checkout opened from an offer's claim link names the offer by its token,-// so the credit that lands is the one the dialog described. No body is a-// checkout from anywhere else.-const bodySchema = z.object({ offerToken: z.string().min(1).optional() }).strict();+// The plan to buy, Pro when unnamed. A checkout opened from an offer's claim+// link names the offer by its token, so the credit that lands is the one the+// dialog described.+const bodySchema = z+ .object({ offerToken: z.string().min(1).optional(), plan: z.enum(PAID_PLANS).optional() })+ .strict();-// Start a Stripe Checkout session for a Pro subscription. This route keeps its-// getSession call because it needs the user's email/name.+const HTTP_CONFLICT = 409;+const HTTP_PAYMENT_REQUIRED = 402;++// Start a Stripe Checkout session for a plan, or move a running subscription+// up to it. This route keeps its getSession call because it needs the user's+// email/name.export const POST = withDonkeyAuth(async (request) => {const session = await auth.api.getSession({ headers: request.headers });if (!session) {@@ -36,25 +44,35 @@ export const POST = withDonkeyAuth(async (request) => {return NextResponse.json({ error: "Invalid request" }, { status: 400 });}const namedOfferId = parsed.data.offerToken ? verifyCreditOfferToken(parsed.data.offerToken) : null;+ const plan = parsed.data.plan ?? "pro";// A not-yet-configured price stays a 404 (not 401) so the landing card does// not treat it as a sign-in prompt.- const priceId = proPriceId();+ const prices = await readPlanPrices();+ const priceId = prices[plan];if (!priceId) {return notFoundResponse();}+ // An account already on a plan moves up in place: a second subscription+ // would double-bill it.+ const current = await getActiveSubscription(session.user.id);+ if (current) {+ return upgradeInPlace(current, plan, prices, request.nextUrl.origin);+ }+const customerId = await ensureStripeCustomer({email: session.user.email,name: session.user.name,userId: session.user.id,});- // A checkout started while an offer for subscribing is open carries the+ // A Pro checkout started while an offer for subscribing is open carries the// offer, so the webhook lands the credit on the subscription it creates.- const offer = await openOfferForSubscribing(session.user.id, namedOfferId);- // An account inside its intro window checks out with the discount already- // on. Stripe takes either a discount or a promotion code field, never both.- const intro = await readIntroOffer(await contextFromRequest(request));+ const offer = plan === "pro" ? await openOfferForSubscribing(session.user.id, namedOfferId) : null;+ // An account inside its intro window checks out of Pro with the discount+ // already on. Stripe takes either a discount or a promotion code field,+ // never both.+ const intro = plan === "pro" ? await readIntroOffer(await contextFromRequest(request)) : null;const pricing = intro? { discounts: [{ coupon: await introCoupon(intro) }] }: { allow_promotion_codes: true };@@ -67,7 +85,7 @@ export const POST = withDonkeyAuth(async (request) => {customer: customerId,line_items: [{ price: priceId, quantity: 1 }],locale: STRIPE_LOCALE[requestLocale(request)],- metadata: metaCheckoutMetadata(request.headers),+ metadata: { ...metaCheckoutMetadata(request.headers), plan: PLAN_TERMS[plan].name },mode: "subscription",subscription_data: {metadata: {@@ -86,6 +104,55 @@ export const POST = withDonkeyAuth(async (request) => {);}- trackCheckoutStarted(checkout.id, "Pro", request.headers, session.user);+ trackCheckoutStarted(checkout.id, PLAN_TERMS[plan].name, request.headers, session.user);return NextResponse.json({ url: checkout.url });});++// Swap the subscription's plan line to a higher plan. The period restarts+// now, so the new plan's credits land at once, and Stripe charges the+// difference on the spot; a card that fails leaves the old plan in place.+async function upgradeInPlace(+ current: { planKey: string; stripeSubscriptionId: string | null; cancelAt: Date | null },+ plan: PaidPlan,+ prices: PlanPrices,+ origin: string,+): Promise<Response> {+ const currentRank = planRank(PAID_PLANS.find((p) => p === current.planKey) ?? "pro");+ if (planRank(plan) <= currentRank || !current.stripeSubscriptionId) {+ return NextResponse.json(+ { error: "plan_not_an_upgrade", message: "This account is already on this plan or a higher one." },+ { status: HTTP_CONFLICT },+ );+ }++ const stripe = getStripe();+ const subscription = await stripe.subscriptions.retrieve(current.stripeSubscriptionId);+ const line = subscriptionPlan(subscription, prices);+ if (!line) {+ return NextResponse.json(+ { error: "plan_not_an_upgrade", message: "This account is already on this plan or a higher one." },+ { status: HTTP_CONFLICT },+ );+ }++ try {+ await stripe.subscriptions.update(subscription.id, {+ billing_cycle_anchor: "now",+ // Moving up keeps the plan: a scheduled cancel is lifted.+ ...(current.cancelAt ? { cancel_at: "" as const } : {}),+ cancel_at_period_end: false,+ items: [{ id: line.item.id, price: prices[plan]! }],+ payment_behavior: "error_if_incomplete",+ proration_behavior: "always_invoice",+ });+ } catch (e) {+ if (e instanceof Stripe.errors.StripeCardError) {+ return NextResponse.json(+ { error: "upgrade_payment_failed", message: e.message },+ { status: HTTP_PAYMENT_REQUIRED },+ );+ }+ throw e;+ }+ return NextResponse.json({ url: `${origin}/app/settings?checkout=success` });+}diff --git a/site/src/app/api/billing/pro/route.ts b/site/src/app/api/billing/pro/route.tsindex a511d59c..0fd7eae0 100644--- a/site/src/app/api/billing/pro/route.ts+++ b/site/src/app/api/billing/pro/route.ts@@ -1,11 +1,12 @@import { NextResponse } from "next/server";-import { getActiveProSubscription, scheduledProEnd } from "@/lib/billing/pro-subscription";+import { isPaidPlan } from "@/lib/billing/plans";+import { getActiveSubscription, scheduledProEnd } from "@/lib/billing/pro-subscription";import { creditMicrosToString, zeroCreditMicros } from "@/lib/credits/amounts";import { withDonkeyAuth } from "@/lib/donkey-api-auth";import { prisma } from "@/lib/prisma";-// Pro subscription status for the settings UI, plus how much of this period's+// The account's plan and subscription status for the settings UI, plus how much of this period's// included allowance is left — the remaining balance on the active// "pro_subscription" grant(s).export const GET = withDonkeyAuth(async (request) => {@@ -13,7 +14,7 @@ export const GET = withDonkeyAuth(async (request) => {const now = new Date();const [subscription, grants] = await Promise.all([- getActiveProSubscription(userId),+ getActiveSubscription(userId),prisma.userCreditGrant.findMany({select: { originalAmountMicros: true, remainingAmountMicros: true },where: {@@ -47,6 +48,8 @@ export const GET = withDonkeyAuth(async (request) => {// When a scheduled cancel ends Pro; null while the plan renews.endsAt: subscription ? (scheduledProEnd(subscription)?.toISOString() ?? null) : null,isActive: Boolean(subscription),+ // A row from before the ladder carries "pro".+ plan: subscription ? (isPaidPlan(subscription.planKey) ? subscription.planKey : "pro") : null,monthlyAllowance: subscription? creditMicrosToString(monthlyAllowanceMicros): null,diff --git a/site/src/app/api/billing/webhook/route.ts b/site/src/app/api/billing/webhook/route.tsindex 811af21a..7f840530 100644--- a/site/src/app/api/billing/webhook/route.ts+++ b/site/src/app/api/billing/webhook/route.ts@@ -1,25 +1,22 @@import { NextResponse } from "next/server";import type Stripe from "stripe";-import {- handleAutoReloadPaymentFailed,- handleAutoReloadPaymentSucceeded,- handleCreditTopUpCheckout,- handleCreditTopUpPaymentSucceeded,-} from "@/lib/billing/credit-purchases";+import { handleCreditPaymentSucceeded } from "@/lib/billing/credit-purchases";import { trackCheckoutPurchase } from "@/lib/billing/meta-checkout";import {- subscriptionIsPro,+ readPlanPrices,+ subscriptionPlan,syncProSubscription,} from "@/lib/billing/pro-subscription";import { getStripe, stripeId } from "@/lib/billing/stripe";import { notFoundResponse } from "@/lib/donkey-api-auth";-// Pro is the only subscription product; ignore any other Stripe subscription-// that reaches these webhook events.+// Plus, Pro and Max are the subscription products; ignore any other Stripe+// subscription that reaches these webhook events.async function syncSubscription(subscription: Stripe.Subscription) {- if (subscriptionIsPro(subscription)) {- await syncProSubscription(subscription);+ const line = subscriptionPlan(subscription, await readPlanPrices());+ if (line) {+ await syncProSubscription(subscription, line);}}@@ -61,27 +58,18 @@ export async function POST(request: Request) {if (subscriptionId) {const subscription = await stripe.subscriptions.retrieve(subscriptionId);await syncSubscription(subscription);- } else {- // A one-time credit top-up (mode=payment) has no subscription.- await handleCreditTopUpCheckout(stripe, checkoutSession);}trackCheckoutPurchase(checkoutSession);break;}case "checkout.session.async_payment_succeeded": {- // A delayed payment method settled; the credits land through- // payment_intent.succeeded, and the purchase is reported here.+ // A delayed payment method settled; the purchase is reported here.trackCheckoutPurchase(event.data.object);break;}case "payment_intent.succeeded": {- // Each handler no-ops unless the PaymentIntent's kind matches, so both run.- await handleAutoReloadPaymentSucceeded(event.data.object);- await handleCreditTopUpPaymentSucceeded(event.data.object);- break;- }- case "payment_intent.payment_failed": {- await handleAutoReloadPaymentFailed(event.data.object);+ // A credit purchase charged before purchases were retired.+ await handleCreditPaymentSucceeded(event.data.object);break;}case "customer.subscription.created":diff --git a/site/src/app/api/credits/offers/claim/route.ts b/site/src/app/api/credits/offers/claim/route.tsindex 51271b05..1d2b7587 100644--- a/site/src/app/api/credits/offers/claim/route.ts+++ b/site/src/app/api/credits/offers/claim/route.ts@@ -2,7 +2,7 @@ import { NextResponse } from "next/server";import { z } from "zod";import { requestLocale } from "@/i18n/requestLocale";-import { getActiveProSubscription } from "@/lib/billing/pro-subscription";+import { getActiveSubscription } from "@/lib/billing/pro-subscription";import { creditMicrosToString } from "@/lib/credits/amounts";import { formatCredits } from "@/lib/credits/format-credits";import { getCreditBalance } from "@/lib/credits/inference";@@ -48,7 +48,7 @@ export const GET = withDonkeyAuth(async (request) => {if (!offer || !claim) return notFoundResponse();if (offer.userId !== request.donkey.userId) return forbiddenResponse();if (!offer.claimedAt && !creditOfferOpen(offer, new Date())) return goneResponse();- if (!offer.claimedAt && claim === "subscribe" && (await getActiveProSubscription(offer.userId))) {+ if (!offer.claimedAt && claim === "subscribe" && (await getActiveSubscription(offer.userId))) {return proHeldResponse();}return NextResponse.json({diff --git a/site/src/clients/chatgpt/server/projects.ts b/site/src/clients/chatgpt/server/projects.tsindex 9a164670..ec3edfa3 100644--- a/site/src/clients/chatgpt/server/projects.ts+++ b/site/src/clients/chatgpt/server/projects.ts@@ -1,7 +1,7 @@import type { Prisma } from "@/generated/prisma/client";import { prisma } from "@/lib/prisma";import { getCreditBalance } from "@/lib/credits/inference";-import { getActiveProSubscription } from "@/lib/billing/pro-subscription";+import { getActiveSubscription } from "@/lib/billing/pro-subscription";import { cloudProjectsFull } from "@/lib/billing/project-limit-server";import { isDonkeySuperUser } from "@/lib/super-user";import { normalizeAspect, type ProjectDoc } from "@/cut/lib/types";@@ -549,14 +549,14 @@ export function projectTools(usageBytes(identity.userId),cutLimitsFor(identity.userId),isDonkeySuperUser(identity.userId),- getActiveProSubscription(identity.userId),+ getActiveSubscription(identity.userId),]);const view = emptyProjectView();view.account = {credits: credits.balance,storageBytes: bytes,storageQuotaBytes: limits.storageBytes,- plan: superUser ? "unlimited" : pro ? "pro" : "free",+ plan: superUser ? "unlimited" : (pro?.planKey ?? "free"),};return { view, playback: null };},diff --git a/site/src/cut/components/CreditsPill.tsx b/site/src/cut/components/CreditsPill.tsxindex 22e3a251..0225e42e 100644--- a/site/src/cut/components/CreditsPill.tsx+++ b/site/src/cut/components/CreditsPill.tsx@@ -3,19 +3,18 @@// The top bar's balance: what the account can still spend on hosted work —// chat, generation, voice — so a session can be planned around it. Reads as a// number; clicking it opens the plan card with the exact balance and the way-// into Pro.+// to a bigger plan.import { useEffect } from "react";-import Link from "next/link";import { useQueryClient } from "@tanstack/react-query";-import { Loader2, Zap } from "lucide-react";+import { Zap } from "lucide-react";import { useLocale, useTranslations } from "next-intl";import { Button } from "@/components/ui/button";import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";import { useEngineUser } from "@/cut/lib/backend/hooks";import { useHostedBalance, useInvalidateOnSettle } from "@/cut/lib/hosted";-import { useCutBase } from "@/cut/lib/nav";-import { useUpgradeToPro } from "@/cut/lib/proUpgrade";+import { openUpgrade } from "@/cut/lib/upgrade";import { track } from "@/lib/analytics";+import { PAID_PLANS, PLAN_TERMS } from "@/lib/billing/plans";import { compactCredits, creditsFromDollars, formatCreditCount, formatCredits } from "@/lib/credits/format-credits";import { CREDITS_PILL_FLAG } from "@/lib/feature-flags";import { useProSubscription } from "@/queries/billing";@@ -62,8 +61,9 @@ function BalancePill() {const balance = useCreditBalance();useLiveCreditBalance();// Background work — renders, cloud jobs — charges without a call from this- // tab, and a top-up happens on another page; a slow poll keeps the number- // honest between them, and a focus refetch catches the trip back from billing.+ // tab, and a plan's credits land from another page; a slow poll keeps the+ // number honest between them, and a focus refetch catches the trip back from+ // billing.useEffect(() => {const id = setInterval(() => {if (document.visibilityState !== "visible") return;@@ -98,31 +98,22 @@ function BalancePill() {);}-// Mounted only while the card is open, so the plan query runs on demand. A-// free account is sold Pro; a Pro account already pays, so its button goes to-// billing, where credits are bought.+// Mounted only while the card is open, so the plan query runs on demand. Any+// account below the top plan gets the way up: the plans side by side.function PlanCard({ balance }: { balance: string }) {const t = useTranslations("billing");const locale = useLocale();- const base = useCutBase();- const pro = useProSubscription();- const upgrade = useUpgradeToPro();- const isPro = pro.data?.isActive === true;+ const subscription = useProSubscription();+ const plan = subscription.data?.plan ?? null;return (<div className="text-sm"><div className="flex items-center justify-between gap-3 px-4 py-3">- <span className="font-semibold">{isPro ? "Pro" : t("creditsPill.free")}</span>- {pro.data &&- (isPro ? (- <Button size="sm" render={<Link href={`${base}/settings`} />}>- {t("buyCredits")}- </Button>- ) : (- <Button size="sm" disabled={upgrade.isPending} onClick={upgrade.start}>- {upgrade.isPending && <Loader2 className="animate-spin" data-icon="inline-start" />}- {t("creditsPill.upgrade")}- </Button>- ))}+ <span className="font-semibold">{plan ? PLAN_TERMS[plan].name : t("creditsPill.free")}</span>+ {subscription.data && plan !== PAID_PLANS[PAID_PLANS.length - 1] ? (+ <Button size="sm" onClick={() => openUpgrade("plans")}>+ {t("creditsPill.upgrade")}+ </Button>+ ) : null}</div><div className="flex items-center gap-2.5 border-t border-border px-4 py-3"><Zap className="size-4 text-muted-foreground" />diff --git a/site/src/cut/components/IntroOffer.tsx b/site/src/cut/components/IntroOffer.tsxindex 33abb933..1bc68e4f 100644--- a/site/src/cut/components/IntroOffer.tsx+++ b/site/src/cut/components/IntroOffer.tsx@@ -1,11 +1,8 @@"use client";-// The intro discount as every Pro surface states it: the terms in one line,-// and a wall's banner that becomes the offer's picture while it is open.-import type { LucideIcon } from "lucide-react";+// The intro discount as every Pro surface states it: the terms in one line.import { useLocale, useTranslations } from "next-intl";-import type { OfferBanner } from "@/cut/components/OfferDialog";import type { Locale } from "@/i18n/locales";import { formatUsdPlain } from "@/lib/credits/format-usd";import type { IntroOffer } from "@/queries/billing";@@ -28,17 +25,3 @@ export function useIntroTerms(): (offer: IntroOffer) => string {price: priceLabel(offer.introCents, locale),});}--/** A wall's banner: a quiet bar with the wall's icon, half the height of an- * offer's picture. With an offer open the wall is a promotion, so it takes- * the offer's picture and the countdown over it. */-export function wallBanner(Icon: LucideIcon, offer: IntroOffer | null | undefined): OfferBanner | React.ReactNode {- if (offer) {- return "subscribe";- }- return (- <div className="flex aspect-[16/3] w-full items-center bg-neutral-800 px-6 dark:bg-neutral-700">- <Icon className="size-7 text-white" strokeWidth={1.5} />- </div>- );-}diff --git a/site/src/cut/components/NavStorage.tsx b/site/src/cut/components/NavStorage.tsxindex e60bed16..9d20c719 100644--- a/site/src/cut/components/NavStorage.tsx+++ b/site/src/cut/components/NavStorage.tsx@@ -1,12 +1,12 @@"use client";-// The free tier's cloud storage row, pinned above the account row: how much+// The cloud storage row for free and Plus accounts, pinned above the account row: how much// of the quota this account has used, and the one thing that buys more. The// quota belongs to the account, not to the backend the app happens to be// running against, so this shows in local mode too — a local editor still has-// cloud projects, and the number is the same either way. Pro accounts see-// nothing here — 100 GB is enough that a meter would only take up room.-import { Cloud, Loader2 } from "lucide-react";+// cloud projects, and the number is the same either way. Pro and Max see+// nothing here; their storage leaves the meter little to say.+import { Cloud } from "lucide-react";import { useLocale, useTranslations } from "next-intl";import {Tooltip,@@ -15,7 +15,7 @@ import {TooltipTrigger,} from "@/components/ui/tooltip";import { useCloudUsage } from "@/cut/lib/backend/hooks";-import { useUpgradeToPro } from "@/cut/lib/proUpgrade";+import { openUpgrade } from "@/cut/lib/upgrade";import { cn } from "@/lib/utils";import { useProSubscription } from "@/queries/billing";import { formatBytes } from "@/lib/bytes";@@ -24,14 +24,14 @@ import { usageLabel } from "./StoragePill";export function NavStorage() {const t = useTranslations("home.navStorage");const locale = useLocale();- const upgrade = useUpgradeToPro();const pro = useProSubscription();// The meter has to move as media lands, so this reader polls. Both faces wait- // on billing, so a Pro account never sees the block flash in front of it.- const free = pro.data?.isActive === false;- const usage = useCloudUsage(free, { poll: true });+ // on billing, so a paying account never sees the block flash in front of it.+ // Free and Plus have quotas small enough to fill.+ const metered = pro.data !== undefined && (pro.data.plan === null || pro.data.plan === "plus");+ const usage = useCloudUsage(metered, { poll: true });- if (!free) return null;+ if (!metered) return null;const u = usage.data;if (!u || u.quotaBytes === null) return null;@@ -45,20 +45,18 @@ export function NavStorage() {<buttontype="button"className="group flex cursor-pointer items-center justify-between gap-2 rounded-lg px-2 py-2 text-xs transition-colors hover:bg-muted disabled:opacity-50"- disabled={upgrade.isPending}- onClick={upgrade.start}+ onClick={() => openUpgrade("plans")}/>}><span className="flex items-center gap-1.5 text-muted-foreground"><Cloud className="size-4" />- <span className={cn("tabular-nums", frac >= 1 && "text-destructive")}>+ <span className={cn("tabular-nums whitespace-nowrap", frac >= 1 && "text-destructive")}>{usageLabel(u.bytes, u.quotaBytes, locale)}</span></span>- <span className="flex items-center gap-1.5 group-hover:underline">- {upgrade.isPending && <Loader2 className="size-3 animate-spin" />}- {t("get100")}+ <span className="whitespace-nowrap group-hover:underline">+ {t("upgrade")}</span></TooltipTrigger><TooltipContent>{t("upgradeTip")}</TooltipContent>diff --git a/site/src/cut/components/OfferDialog.tsx b/site/src/cut/components/OfferDialog.tsxindex 8ce99e58..31122169 100644--- a/site/src/cut/components/OfferDialog.tsx+++ b/site/src/cut/components/OfferDialog.tsx@@ -8,7 +8,7 @@import Image from "next/image";import { useFormatter, useTranslations } from "next-intl";import { useEffect, useState } from "react";-import { useCutPro } from "@/app/[locale]/cut/_components/landing/cutPricingPlans";+import { useCutPlan } from "@/app/[locale]/cut/_components/landing/cutPricingPlans";import { Button } from "@/components/ui/button";import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from "@/components/ui/dialog";@@ -69,7 +69,7 @@ export type OfferCopy = { body: string; terms: string | null };export function useOfferCopy() {const t = useTranslations("billing");const format = useFormatter();- const pro = useCutPro();+ const pro = useCutPlan("pro");// How long the credit lasts once it lands; null when it keeps forever.const creditValidity = (offer: { expiresAt: string | null; lifetimeDays: number | null }): string | null => {diff --git a/site/src/cut/components/OfferSticker.tsx b/site/src/cut/components/OfferSticker.tsxnew file mode 100644index 00000000..8c626d7b--- /dev/null+++ b/site/src/cut/components/OfferSticker.tsx@@ -0,0 +1,55 @@+"use client";++// The intro offer as a sticker: the time left ticking on top, the discount+// large under it. Onboarding pins the yellow one over the Pro card's corner;+// the plans modal sets the blue one beside the Pro column's heading.+import { useTranslations } from "next-intl";++import { countdownParts, useNow } from "@/cut/components/OfferDialog";+import { cn } from "@/lib/utils";+import type { IntroOffer } from "@/queries/billing";++export type StickerTone = "yellow" | "blue";++const TONE: Record<StickerTone, string> = {+ // The landing's ink and yellow, with its hard shadow.+ yellow: "size-[104px] border-2 border-ink bg-[#F5D875] text-ink shadow-[4px_4px_0_#0F0E0D]",+ // The modal's accent; white on it reads at 4.7:1 in either theme.+ blue: "size-[88px] bg-[#0071e3] text-white shadow-lg shadow-[#0071e3]/30",+};++export function OfferSticker({+ offer,+ tone,+ className,+}: {+ offer: IntroOffer;+ tone: StickerTone;+ // Where it sits and how it lands.+ className?: string;+}) {+ const t = useTranslations("billing.plans");+ const now = useNow();+ const { hours, minutes, seconds } = countdownParts(offer.endsAt, now);+ const large = tone === "yellow";++ return (+ <div+ className={cn(+ "flex rotate-6 flex-col items-center justify-center rounded-xl tabular-nums",+ TONE[tone],+ className,+ )}+ >+ <span className={cn("leading-none font-bold", large ? "text-[17px]" : "text-sm")}>+ {hours}:{minutes}:{seconds}+ </span>+ <span className={cn("mt-1.5 leading-none font-black tracking-tight", large ? "text-[34px]" : "text-[28px]")}>+ {t("stickerPercent", { percent: offer.percentOff })}+ </span>+ <span className={cn("mt-0.5 leading-none font-bold tracking-wide uppercase", large ? "text-[12px]" : "text-[11px]")}>+ {t("stickerOff")}+ </span>+ </div>+ );+}diff --git a/site/src/cut/components/PlansDialog.tsx b/site/src/cut/components/PlansDialog.tsxnew file mode 100644index 00000000..8467b500--- /dev/null+++ b/site/src/cut/components/PlansDialog.tsx@@ -0,0 +1,254 @@+"use client";++// The plan ladder side by side: every wall that sells a plan — out of credits,+// the project limit, storage, the pill's Upgrade — opens this. Pro is marked+// the best value; the plan an account holds, and the ones under it, cannot+// be bought again.+import { useEffect, useRef } from "react";+import { ArrowLeft, Check, Loader2, Sparkles } from "lucide-react";+import { useLocale, useTranslations } from "next-intl";++import { useApiErrorText } from "@/app/[locale]/cut/app/(home)/settings/_components/useApiErrorText";+import { useCutPlans, type PlanCopy, type PlanFeature } from "@/app/[locale]/cut/_components/landing/cutPricingPlans";+import { Button } from "@/components/ui/button";+import { Dialog, DialogBody, DialogContent, DialogDescription, DialogHeader, DialogTitle } from "@/components/ui/dialog";+import { priceLabel } from "@/cut/components/IntroOffer";+import { OfferSticker } from "@/cut/components/OfferSticker";+import { usePlanCheckout } from "@/cut/lib/proUpgrade";+import { track } from "@/lib/analytics";+import { planRank, RECOMMENDED_PLAN, type PaidPlan } from "@/lib/billing/plans";+import { cn } from "@/lib/utils";+import { useIntroOffer, useProSubscription, type IntroOffer } from "@/queries/billing";++// The accent blue. The fill carries white text at 4.7:1; the light-theme text+// shade reads on white, the dark one on the dark popover.+const BLUE_FILL = "bg-[#0071e3] text-white hover:bg-[#0077ed]";+const BLUE_TEXT = "text-[#0062c4] dark:text-[#4aa3ff]";++export type PlansSource = "credits" | "projects" | "storage" | "plans";++export function PlansDialog({+ source,+ title,+ body,+ notice,+ onClose,+}: {+ // What raised it, for analytics.+ source: PlansSource;+ // The headline: one short line.+ title: React.ReactNode;+ // A small line under it, for the detail.+ body?: React.ReactNode;+ // A warning under the message, such as storage about to be reclaimed.+ notice?: React.ReactNode;+ onClose: () => void;+}) {+ const t = useTranslations("billing.plans");+ const tBilling = useTranslations("billing");+ const apiErrorText = useApiErrorText();+ const plans = useCutPlans();+ const subscription = useProSubscription();+ const current = subscription.data?.plan ?? null;+ const intro = useIntroOffer({ enabled: subscription.data?.isActive === false });+ const checkout = usePlanCheckout();+ // Held until the plan is known, so no column opens buyable and then locks.+ const ready = subscription.isSuccess && (current !== null || !intro.isPending);++ // Opening focuses the card itself, so no plan's button starts out looking+ // picked; Tab moves into the plans.+ const popup = useRef<HTMLDivElement>(null);+ const tracked = useRef(false);+ useEffect(() => {+ if (!ready || tracked.current) {+ return;+ }+ tracked.current = true;+ track("upgrade_dialog_shown", {+ reason: source,+ pro: current !== null,+ plan: current ?? "free",+ intro: intro.data?.percentOff ?? 0,+ });+ }, [ready, source, current, intro.data]);++ return (+ <Dialog open={ready} onOpenChange={(open) => !open && onClose()}>+ <DialogContent ref={popup} initialFocus={popup} className="gap-0 overflow-hidden p-0 sm:max-w-[60rem]">+ {/* A wash of the accent behind the heading. */}+ <div className="bg-gradient-to-b from-[#0071e3]/12 to-transparent px-6 pt-9 pb-7 text-center dark:from-[#0a84ff]/18 sm:px-10">+ <DialogHeader className="items-center gap-2">+ <DialogTitle className="text-2xl leading-tight font-semibold tracking-tight text-balance sm:text-[28px]">+ {title}+ </DialogTitle>+ {body ? (+ <DialogDescription className="max-w-xl text-base text-muted-foreground">{body}</DialogDescription>+ ) : null}+ {notice ? <p className="max-w-xl text-sm text-destructive">{notice}</p> : null}+ </DialogHeader>+ </div>+ <DialogBody className="mx-0 px-6 pt-1 pb-2 sm:px-10">+ <div className="grid gap-10 md:grid-cols-3 md:gap-0 md:divide-x md:divide-border">+ {plans.map((copy) => (+ <PlanColumn+ key={copy.plan}+ copy={copy}+ current={current}+ offer={copy.plan === "pro" ? (intro.data ?? null) : null}+ pendingPlan={checkout.pendingPlan}+ onPick={checkout.start}+ />+ ))}+ </div>+ </DialogBody>+ <div className="px-6 pt-5 pb-6 text-center text-xs text-muted-foreground sm:px-10">+ {checkout.error ? (+ <p className="mb-2 text-sm text-destructive">+ {apiErrorText(checkout.error, tBilling("billingUnavailable"))}+ </p>+ ) : null}+ {t("footer")}+ </div>+ </DialogContent>+ </Dialog>+ );+}++function PlanColumn({+ copy,+ current,+ offer,+ pendingPlan,+ onPick,+}: {+ copy: PlanCopy;+ current: PaidPlan | null;+ // The intro discount, on the column it applies to.+ offer: IntroOffer | null;+ pendingPlan: PaidPlan | null;+ onPick: (plan: PaidPlan) => void;+}) {+ const t = useTranslations("billing.plans");+ const recommended = copy.plan === RECOMMENDED_PLAN;+ const held = planRank(copy.plan) <= planRank(current);++ return (+ <section className="relative flex flex-col md:px-7 md:first:pl-0 md:last:pr-0">+ {/* An open offer's sticker sits beside the heading, which makes room. */}+ {offer ? <OfferSticker offer={offer} tone="blue" className="absolute top-0 right-0 md:right-7" /> : null}+ <div className={cn("flex h-7 items-center gap-2", offer && "pr-24")}>+ <h3 className="text-lg font-semibold">{copy.name}</h3>+ {recommended ? (+ <span className={cn("rounded-full px-2.5 py-0.5 text-xs font-semibold", BLUE_FILL)}>+ {t("bestValue")}+ </span>+ ) : null}+ </div>+ <p className={cn("mt-1 min-h-10 text-sm leading-snug text-muted-foreground", offer && "pr-24")}>{copy.body}</p>++ <Price copy={copy} offer={offer} />++ <PlanButton+ copy={copy}+ current={current}+ held={held}+ recommended={recommended}+ pending={pendingPlan === copy.plan}+ busy={pendingPlan !== null}+ onPick={onPick}+ />++ <ul className="mt-6 flex flex-col gap-3 text-sm">+ {copy.features.map((feature) => (+ <li key={feature.text} className="flex items-start gap-2.5">+ <FeatureIcon kind={feature.kind} accent={recommended} />+ <span className={cn(feature.kind === "credits" && "font-medium")}>{feature.text}</span>+ </li>+ ))}+ </ul>+ </section>+ );+}++// The monthly price, large; an open intro offer shows its discounted first+// months beside the struck list price, and what follows them.+function Price({ copy, offer }: { copy: PlanCopy; offer: IntroOffer | null }) {+ const t = useTranslations("billing.plans");+ const locale = useLocale();+ return (+ <div className="mt-4">+ <div className="flex items-baseline gap-1.5">+ <span className="text-4xl font-semibold tracking-tight tabular-nums">+ {offer ? priceLabel(offer.introCents, locale) : copy.amount}+ </span>+ {offer ? (+ <span className="text-lg font-medium text-muted-foreground line-through tabular-nums">{copy.amount}</span>+ ) : null}+ <span className="text-sm text-muted-foreground">{copy.cadence}</span>+ </div>+ <div className={cn("mt-1 text-xs font-medium", offer ? BLUE_TEXT : "text-muted-foreground")}>+ {offer+ ? t("introThen", { months: offer.months, price: priceLabel(offer.priceCents, locale) })+ : t("billedMonthly")}+ </div>+ </div>+ );+}++function PlanButton({+ copy,+ current,+ held,+ recommended,+ pending,+ busy,+ onPick,+}: {+ copy: PlanCopy;+ current: PaidPlan | null;+ held: boolean;+ recommended: boolean;+ pending: boolean;+ busy: boolean;+ onPick: (plan: PaidPlan) => void;+}) {+ const t = useTranslations("billing.plans");+ const shape = "mt-5 h-11 w-full rounded-full text-[15px] font-semibold";++ // The plan held, or one under it: shown, never bought.+ if (held) {+ return (+ <Button+ variant="ghost"+ disabled+ className={cn(shape, "bg-muted/60 text-muted-foreground/70 disabled:opacity-100 dark:bg-muted/40")}+ >+ {copy.plan === current ? <Check data-icon="inline-start" /> : null}+ {copy.plan === current ? t("current") : t("get", { plan: copy.name })}+ </Button>+ );+ }++ return (+ <Button+ variant={recommended ? "default" : "outline"}+ disabled={busy}+ onClick={() => onPick(copy.plan)}+ className={cn(shape, recommended && BLUE_FILL)}+ >+ {pending ? <Loader2 className="animate-spin" data-icon="inline-start" /> : null}+ {current === null ? t("get", { plan: copy.name }) : t("upgrade", { plan: copy.name })}+ </Button>+ );+}++function FeatureIcon({ kind, accent }: { kind: PlanFeature["kind"]; accent: boolean }) {+ const tone = accent ? BLUE_TEXT : "text-muted-foreground";+ if (kind === "credits") {+ return <Sparkles className={cn("mt-0.5 size-4", accent ? BLUE_TEXT : "text-foreground")} />;+ }+ if (kind === "inherits") {+ return <ArrowLeft className="mt-0.5 size-4 text-muted-foreground" />;+ }+ return <Check className={cn("mt-0.5 size-4", tone)} />;+}diff --git a/site/src/cut/components/StoragePill.tsx b/site/src/cut/components/StoragePill.tsxindex 9b3d5bc0..a21f646e 100644--- a/site/src/cut/components/StoragePill.tsx+++ b/site/src/cut/components/StoragePill.tsx@@ -49,22 +49,23 @@ function CloudStoragePill() {const t = useTranslations("billing.storagePill");const locale = useLocale();const pro = useProSubscription();+ // Free and Plus have quotas small enough to fill, so they carry the meter.+ const metered = pro.data !== undefined && (pro.data.plan === null || pro.data.plan === "plus");// The meter has to move as media lands, so this reader is the polling one.- const usage = useCloudUsage(pro.data?.isActive === false, { poll: true });+ const usage = useCloudUsage(metered, { poll: true });const portal = useOpenBillingPortal();const config = useAccountConfig({ enabled: true });if (!pro.data) return null;- if (pro.data.isActive) {- const end = pro.data.endsAt;- if (!end) return null;- const days = daysUntil(end);- // The config read can fail without taking the pill with it: the registry- // default stands in until an override arrives.- const daysBefore =- config.data?.settings.proEndingNotice.daysBefore ?? SETTINGS.proEndingNotice.default.daysBefore;- if (days >= daysBefore) return null;+ // A plan set to cancel counts down its last days in place of the meter.+ const end = pro.data.isActive ? pro.data.endsAt : null;+ const days = end ? daysUntil(end) : null;+ // The config read can fail without taking the pill with it: the registry+ // default stands in until an override arrives.+ const daysBefore =+ config.data?.settings.proEndingNotice.daysBefore ?? SETTINGS.proEndingNotice.default.daysBefore;+ if (days !== null && days < daysBefore) {return (<PillTooltip message={t("cancelTooltip")}><TooltipTrigger@@ -87,6 +88,7 @@ function CloudStoragePill() {);}+ if (!metered) return null;const u = usage.data;if (!u || u.quotaBytes === null) return null;const frac = u.bytes / u.quotaBytes;diff --git a/site/src/cut/components/StorageUpgradeDialog.tsx b/site/src/cut/components/StorageUpgradeDialog.tsxindex 503c5745..124696f5 100644--- a/site/src/cut/components/StorageUpgradeDialog.tsx+++ b/site/src/cut/components/StorageUpgradeDialog.tsx@@ -1,10 +1,9 @@"use client";// The storage-quota wall's face: opens when an upload is rejected for space-// anywhere in the app, or when the top bar's pill is clicked, and sells the-// Pro storage tier — or just explains, when the account already has it.+// anywhere in the app, or when the top bar's pill is clicked, and lays out the+// plans with more room — or just explains, on the plan with the most.import { useEffect, useState } from "react";-import { HardDrive, Loader2 } from "lucide-react";import { useLocale, useTranslations } from "next-intl";import { Button } from "@/components/ui/button";import {@@ -14,9 +13,7 @@ import {DialogHeader,DialogTitle,} from "@/components/ui/dialog";-import { useIntroTerms, wallBanner } from "./IntroOffer";-import { OfferButton, OfferDialog, OfferDismiss } from "./OfferDialog";-import { useUpgradeToPro } from "@/cut/lib/proUpgrade";+import { PlansDialog } from "./PlansDialog";import {clearStorageQuotaWall,emitStorageQuota,@@ -25,7 +22,8 @@ import {} from "@/cut/lib/storageQuota";import { daysUntil } from "@/cut/lib/time";import { track } from "@/lib/analytics";-import { useIntroOffer, useProSubscription } from "@/queries/billing";+import { PAID_PLANS } from "@/lib/billing/plans";+import { useProSubscription } from "@/queries/billing";import { useCloudUsage } from "@/cut/lib/backend/hooks";import { onOperationFailure } from "@/cut/lib/operationFailure";import { formatBytes } from "@/lib/bytes";@@ -60,11 +58,8 @@ export function StorageUpgradeDialog() {function OpenDialog({ detail, onClose }: { detail: StorageQuotaDetail; onClose: () => void }) {const t = useTranslations("billing");const locale = useLocale();- const introTerms = useIntroTerms();- const pro = useProSubscription();- const upgrade = useUpgradeToPro();- const isPro = pro.data?.isActive === true;- const intro = useIntroOffer({ enabled: pro.data?.isActive === false });+ const subscription = useProSubscription();+ const onTopPlan = subscription.data?.plan === PAID_PLANS[PAID_PLANS.length - 1];// A wall raised by a queued render carries no numbers — it failed in the// worker, hours from the request. The account's own meter fills them in, so// every wall says how full the account is.@@ -86,10 +81,10 @@ function OpenDialog({ detail, onClose }: { detail: StorageQuotaDetail; onClose:: t("storage.graceDays", { bytes: formatBytes(detail.grace.overBytes, locale), days: graceDays }): null;- // An account that already has Pro is being told something, not sold- // something: the offer card's picture and its full-width buy button belong- // to the upgrade, so the plain dialog carries this one.- if (isPro) {+ // An account on the plan with the most room is being told something, not+ // sold something, so the plain dialog carries this one.+ if (!subscription.data) return null;+ if (onTopPlan) {return (<Dialog open onOpenChange={(open) => !open && onClose()}><DialogContent className="sm:max-w-sm">@@ -111,22 +106,12 @@ function OpenDialog({ detail, onClose }: { detail: StorageQuotaDetail; onClose:}return (- <OfferDialog- open- onOpenChange={(open) => !open && onClose()}- banner={wallBanner(HardDrive, intro.data)}- closesAt={intro.data?.endsAt}- title={title}- body={meter ? t("storage.bodyUsed", meter) : t("storage.body")}- terms={intro.data ? introTerms(intro.data) : t("storage.freeUpTerms")}- error={grace}- cta={- <OfferButton disabled={upgrade.isPending} onClick={upgrade.start}>- {upgrade.isPending && <Loader2 className="animate-spin" data-icon="inline-start" />}- {t("upgradeToPro")}- </OfferButton>- }- secondary={<OfferDismiss onClick={onClose}>{t("notNow")}</OfferDismiss>}+ <PlansDialog+ source="storage"+ title={detail.source === "pill" ? t("storage.moreTitle") : t("storage.fullTitle")}+ body={used}+ notice={grace}+ onClose={onClose}/>);}diff --git a/site/src/cut/components/UpgradeDialog.tsx b/site/src/cut/components/UpgradeDialog.tsxindex e2a54798..0da75783 100644--- a/site/src/cut/components/UpgradeDialog.tsx+++ b/site/src/cut/components/UpgradeDialog.tsx@@ -1,171 +1,65 @@"use client";-// The wall a free account meets at a paid limit: one project past the free-// count, or a request that ran out of credits. Both sell Pro. A Pro account-// that runs out is sent to buy credits.-import { useLocale, useTranslations } from "next-intl";+// The wall an account meets at a paid limit — a request that ran out of+// credits, one project past the free count — or the plans it asks to see.+// Each opens the plan ladder with words for why it is up.+import { useFormatter, useTranslations } from "next-intl";import { useEffect, useState } from "react";-import { useRouter } from "next/navigation";-import { FolderPlus, Loader2, Zap } from "lucide-react";-import { CUT_PRO, useCutPro } from "@/app/[locale]/cut/_components/landing/cutPricingPlans";-import { useIntroTerms, wallBanner } from "@/cut/components/IntroOffer";-import { OfferButton, OfferDialog, OfferDismiss, preloadBanner } from "@/cut/components/OfferDialog";-import { useCutBase } from "@/cut/lib/nav";+import { PlansDialog } from "@/cut/components/PlansDialog";import { onOperationFailure } from "@/cut/lib/operationFailure";-import { useUpgradeToPro } from "@/cut/lib/proUpgrade";import { onUpgrade, openUpgrade, type UpgradeReason } from "@/cut/lib/upgrade";-import { track } from "@/lib/analytics";-import { creditCountLabel, creditsPerDollar } from "@/lib/credits/format-credits";-import { useAccountConfig } from "@/queries/accountConfig";-import { useIntroOffer, useProSubscription } from "@/queries/billing";+import { PAID_PLANS, PLAN_TERMS } from "@/lib/billing/plans";+import { useProSubscription } from "@/queries/billing";export function UpgradeDialog() {const [reason, setReason] = useState<UpgradeReason | null>(null);- const config = useAccountConfig({ enabled: true });- const creditsMode = config.data?.settings.outOfCreditsUpsell.mode ?? "off";useEffect(() => onUpgrade(setReason), []);- // A request refused for credits raises the wall while the setting asks for- // it; otherwise the inline notice where the request failed is the answer.- useEffect(() => {- if (creditsMode !== "dialog") {- return;- }- return onOperationFailure((failure) => {- if (failure.code === "insufficient_credits" || failure.code === "insufficient_credits_for_generation") {- openUpgrade("credits");- }- });- }, [creditsMode]);+ // A request refused for credits always raises the plans.+ useEffect(+ () =>+ onOperationFailure((failure) => {+ if (failure.code === "insufficient_credits" || failure.code === "insufficient_credits_for_generation") {+ openUpgrade("credits");+ }+ }),+ [],+ );if (!reason) {return null;}- return (- <OpenDialog- reason={reason}- projectLimit={config.data?.settings.freeProjectLimit.projects ?? null}- onClose={() => setReason(null)}- />- );+ return <OpenDialog reason={reason} onClose={() => setReason(null)} />;}-// Split so the billing reads only run while the dialog is up.-function OpenDialog({- reason,- projectLimit,- onClose,-}: {- reason: UpgradeReason;- projectLimit: number | null;- onClose: () => void;-}) {+// Split so the billing read only runs while the dialog is up.+function OpenDialog({ reason, onClose }: { reason: UpgradeReason; onClose: () => void }) {const t = useTranslations("billing");- const locale = useLocale();- const introTerms = useIntroTerms();- const { price } = useCutPro();- const pro = useProSubscription();- const isPro = pro.data?.isActive === true;- const intro = useIntroOffer({ enabled: pro.data?.isActive === false });- const upgrade = useUpgradeToPro();- const base = useCutBase();- const router = useRouter();- const ready = pro.isSuccess && (isPro || !intro.isPending);-- // Either picture may head the card: credits for a Pro account, the offer's- // while an intro discount is open. Both load beside the billing reads.- useEffect(() => {- void preloadBanner("credits");- void preloadBanner("subscribe");- }, []);-- useEffect(() => {- if (!ready) {- return;- }- track("upgrade_dialog_shown", { reason, pro: isPro, intro: intro.data?.percentOff ?? 0 });- }, [ready, reason, isPro, intro.data]);-- // Held until the plan is known, so the card never opens on the wrong pitch.- if (!ready) {- return null;- }+ const format = useFormatter();+ const subscription = useProSubscription();+ const plan = subscription.data?.plan ?? null;+ const periodEnd = subscription.data?.currentPeriodEnd ?? null;- const close = (open: boolean) => {- if (!open) {- onClose();+ // Out of credits: a free account is asked to pick a plan; a paying one is+ // told a bigger plan lands credits today, and when its own refill comes.+ const outOfCredits = () => {+ if (!plan || !periodEnd) {+ return { title: t("plans.freeOutTitle") };}+ const words = { plan: PLAN_TERMS[plan].name, date: format.dateTime(new Date(periodEnd), { day: "numeric", month: "long" }) };+ return plan === PAID_PLANS[PAID_PLANS.length - 1]+ ? { title: t("plans.topOutTitle", words) }+ : { title: t("plans.paidOutTitle"), body: t("plans.paidOutBody", words) };};- if (isPro) {- return (- <OfferDialog- open- onOpenChange={close}- banner="credits"- title={t("upgrade.outOfCredits")}- body={t("upgrade.proOutBody")}- cta={- <OfferButton- onClick={() => {- onClose();- router.push(`${base}/settings`);- }}- >- {t("buyCredits")}- </OfferButton>- }- secondary={<OfferDismiss onClick={onClose}>{t("notNow")}</OfferDismiss>}- />- );- }-- const offer = intro.data ?? null;- const credits = creditCountLabel(CUT_PRO.monthlyDollars * creditsPerDollar, locale);- const wall =- reason === "projects"- ? {- icon: FolderPlus,- title: t("upgrade.projectsTitle"),- body: projectLimit- ? t("upgrade.projectsBody", { count: projectLimit })- : t("upgrade.projectsBodyStarter"),- }- : {- icon: Zap,- title: t("upgrade.outOfCredits"),- // An open offer prices Pro on its terms line.- body: offer- ? t("upgrade.creditsBodyOffer", { credits })- : t("upgrade.creditsBody", { credits, price }),- };-- // The terms line: an open offer's terms, else the price on the projects- // wall. The credits wall names the price in its message, so it has none.- const terms = offer- ? introTerms(offer)- : reason === "projects"- ? t("upgrade.proPrice", { price })- : undefined;+ const wall: { title: string; body?: string } =+ reason === "credits"+ ? outOfCredits()+ : reason === "projects"+ ? { title: t("upgrade.projectsTitle"), body: t("upgrade.projectsBody") }+ : { title: t("plans.chooseTitle"), body: t("plans.chooseBody") };- return (- <OfferDialog- open- onOpenChange={close}- banner={wallBanner(wall.icon, offer)}- closesAt={offer?.endsAt}- title={wall.title}- body={wall.body}- terms={terms}- cta={- <OfferButton disabled={upgrade.isPending} onClick={upgrade.start}>- {upgrade.isPending && <Loader2 className="animate-spin" data-icon="inline-start" />}- {t("upgradeToPro")}- </OfferButton>- }- secondary={<OfferDismiss onClick={onClose}>{t("notNow")}</OfferDismiss>}- />- );+ return <PlansDialog source={reason} {...wall} onClose={onClose} />;}diff --git a/site/src/cut/components/onboarding/onboarding.css b/site/src/cut/components/onboarding/onboarding.cssindex c25cf684..832c9a47 100644--- a/site/src/cut/components/onboarding/onboarding.css+++ b/site/src/cut/components/onboarding/onboarding.css@@ -35,8 +35,33 @@animation: onboarding-tape-shake 700ms ease-in-out 250ms both;}+/* The offer sticker lands with the same wobble and comes to rest tilted. */+@keyframes onboarding-sticker-shake {+ 0% {+ rotate: 6deg;+ }+ 20% {+ rotate: -6deg;+ }+ 45% {+ rotate: 12deg;+ }+ 70% {+ rotate: 2deg;+ }+ 100% {+ rotate: 6deg;+ }+}++.onboarding-sticker-shake {+ rotate: 6deg;+ animation: onboarding-sticker-shake 700ms ease-in-out 250ms both;+}+@media (prefers-reduced-motion: reduce) {- .onboarding-tape-shake {+ .onboarding-tape-shake,+ .onboarding-sticker-shake {animation: none;}}diff --git a/site/src/cut/components/onboarding/slides/Plans.tsx b/site/src/cut/components/onboarding/slides/Plans.tsxindex 05622dde..9bb2ee5e 100644--- a/site/src/cut/components/onboarding/slides/Plans.tsx+++ b/site/src/cut/components/onboarding/slides/Plans.tsx@@ -1,32 +1,40 @@"use client";-import { Check } from "lucide-react";+import { ArrowLeft, Check, Loader2, Sparkles } from "lucide-react";import { useLocale, useTranslations } from "next-intl";import { TapedCard } from "@/app/_components/landing/LandingPrimitives";-import { useCutPro } from "@/app/[locale]/cut/_components/landing/cutPricingPlans";+import type { CardColor } from "@/app/_components/landing/theme";+import { useCutPlans, type PlanCopy, type PlanFeature } from "@/app/[locale]/cut/_components/landing/cutPricingPlans";import { Button } from "@/components/ui/button";import { priceLabel } from "@/cut/components/IntroOffer";-import { countdownParts, useNow } from "@/cut/components/OfferDialog";-import { useUpgradeToPro } from "@/cut/lib/proUpgrade";+import { OfferSticker } from "@/cut/components/OfferSticker";+import { usePlanCheckout } from "@/cut/lib/proUpgrade";+import { RECOMMENDED_PLAN, type PaidPlan } from "@/lib/billing/plans";import { useIntroOffer, type IntroOffer } from "@/queries/billing";import "../onboarding.css";-// The sequence's last word: Pro is the offer, free is the default, and the-// benefits sit in the card so nobody has to take the price on faith. It's the-// landing's own Pro card — same taped coral frame, same ringed check bullets —-// so the offer looks the same wherever it's met. Checkout is the one the-// storage wall and the billing page start. While the intro offer is open the-// card prices the discount and counts down to its end.+// The landing's own card colors, so a plan looks the same wherever it's met.+const PLAN_CARD: Record<PaidPlan, { color: CardColor; tapeColor: CardColor }> = {+ plus: { color: "cream", tapeColor: "mint" },+ pro: { color: "coral", tapeColor: "yellow" },+ max: { color: "cream", tapeColor: "pink" },+};++// The sequence's last word: the paid plans side by side, Pro marked the best+// value, and free the default under them. The benefits sit in each card so+// nobody has to take a price on faith. Checkout is the one the upgrade modal+// starts. While the intro offer is open the Pro card prices the discount and+// counts down to its end.export function PlansSlide({ onSkipPro }: { onSkipPro: () => void }) {const t = useTranslations("onboarding.plans");- const plan = useCutPro();- const pro = useUpgradeToPro();+ const plans = useCutPlans();+ const checkout = usePlanCheckout();const offer = useIntroOffer().data ?? null;return (- <div className="mx-auto w-full max-w-[520px]">+ <div className="mx-auto w-full max-w-[1040px]"><h2 className="text-center text-[clamp(24px,3vw,32px)] leading-[1.1] font-semibold tracking-[-0.02em]">{t("title")}</h2>@@ -34,54 +42,17 @@ export function PlansSlide({ onSkipPro }: { onSkipPro: () => void }) {{t("subtitle")}</p>- <div className="mt-8">- <TapedCard- color="coral"- tapeColor="yellow"- tapePosition="right"- tapeClassName="onboarding-tape-shake"- >- <div className="p-7 md:p-9">- <div className="text-[22px] font-semibold">Pro</div>- {offer ? (- <IntroPrice offer={offer} />- ) : (- <>- <div className="mt-4 text-[clamp(34px,4.4vw,48px)] leading-[0.95] font-semibold">- {plan.price}- </div>- <div className="mt-2.5 text-[13px] font-semibold text-[#201715]">- {t("forIndividuals")}- </div>- </>- )}- <p className="mt-5 text-[15px] leading-[1.55] text-[#1a1a1a]">- {plan.body}- </p>-- <div className="mt-6 grid gap-2.5">- {plan.features.map((feature) => (- <div- key={feature}- className="flex items-center gap-2.5 text-[14px] font-semibold"- >- <span className="inline-flex size-6 shrink-0 items-center justify-center rounded-full border-2 border-ink bg-white">- <Check size={14} />- </span>- {feature}- </div>- ))}- </div>-- <Button- onClick={pro.start}- disabled={pro.isPending}- className="mt-7 h-11 rounded-full bg-ink px-6 text-[15px] text-white hover:bg-ink/90"- >- {offer ? t("getProOff", { percent: offer.percentOff }) : t("getPro")}- </Button>- </div>- </TapedCard>+ <div className="mt-8 grid items-stretch gap-5 md:grid-cols-3">+ {plans.map((copy) => (+ <PlanCard+ key={copy.plan}+ copy={copy}+ offer={copy.plan === "pro" ? offer : null}+ pending={checkout.pendingPlan === copy.plan}+ busy={checkout.pendingPlan !== null}+ onPick={() => checkout.start(copy.plan)}+ />+ ))}</div><div className="mt-5 text-right">@@ -97,29 +68,108 @@ export function PlansSlide({ onSkipPro }: { onSkipPro: () => void }) {);}-// The discounted price beside the struck-through one, what it covers, and-// the time left to take it.+function PlanCard({+ copy,+ offer,+ pending,+ busy,+ onPick,+}: {+ copy: PlanCopy;+ offer: IntroOffer | null;+ pending: boolean;+ busy: boolean;+ onPick: () => void;+}) {+ const t = useTranslations("onboarding.plans");+ const recommended = copy.plan === RECOMMENDED_PLAN;++ return (+ <TapedCard+ color={PLAN_CARD[copy.plan].color}+ // An open offer's sticker takes the tape's corner.+ tapeColor={offer ? undefined : PLAN_CARD[copy.plan].tapeColor}+ fill+ tapePosition="right"+ tapeClassName={recommended ? "onboarding-tape-shake" : undefined}+ >+ {offer ? (+ <OfferSticker offer={offer} tone="yellow" className="onboarding-sticker-shake absolute -top-4 -right-4 z-10" />+ ) : null}+ <div className="flex h-full flex-col p-6 md:p-7">+ <div className="flex items-center gap-2">+ <div className="text-[22px] font-semibold">{copy.name}</div>+ {recommended ? (+ <span className="rounded-full bg-ink px-2.5 py-0.5 text-[12px] font-semibold text-white">+ {t("bestValue")}+ </span>+ ) : null}+ </div>+ {offer ? (+ <IntroPrice offer={offer} />+ ) : (+ <div className="mt-4 flex items-baseline gap-1.5">+ <span className="text-[clamp(34px,4vw,44px)] leading-[0.95] font-semibold">{copy.amount}</span>+ <span className="text-[14px] font-semibold text-[#201715]/70">{copy.cadence}</span>+ </div>+ )}+ <p className="mt-4 text-[15px] leading-[1.5] text-[#1a1a1a]">{copy.body}</p>++ <div className="mt-5 grid gap-2.5">+ {copy.features.map((feature) => (+ <div key={feature.text} className="flex items-center gap-2.5 text-[14px] font-semibold text-[#1a1a1a]">+ <span className="inline-flex size-6 shrink-0 items-center justify-center rounded-full border-2 border-ink bg-white">+ <FeatureIcon kind={feature.kind} />+ </span>+ {feature.text}+ </div>+ ))}+ </div>++ {/* The buttons line up across the row whatever each card holds. */}+ <div className="mt-auto pt-7">+ <Button+ onClick={onPick}+ disabled={busy}+ className="h-11 w-full rounded-full px-6 text-[15px] bg-ink text-white hover:bg-ink/90"+ >+ {pending ? <Loader2 className="animate-spin" data-icon="inline-start" /> : null}+ {offer ? t("getProOff", { percent: offer.percentOff }) : t("getPlan", { plan: copy.name })}+ </Button>+ </div>+ </div>+ </TapedCard>+ );+}++function FeatureIcon({ kind }: { kind: PlanFeature["kind"] }) {+ if (kind === "credits") {+ return <Sparkles size={13} />;+ }+ if (kind === "inherits") {+ return <ArrowLeft size={13} />;+ }+ return <Check size={14} />;+}++// The discounted price beside the struck-through one, and what it covers.function IntroPrice({ offer }: { offer: IntroOffer }) {const t = useTranslations("onboarding.plans");const locale = useLocale();- const now = useNow();return (<><div className="mt-4 flex items-baseline gap-3">- <span className="text-[clamp(34px,4.4vw,48px)] leading-[0.95] font-semibold">+ <span className="text-[clamp(34px,4vw,44px)] leading-[0.95] font-semibold">{priceLabel(offer.introCents, locale)}</span>- <span className="text-[22px] font-semibold text-[#201715]/40 line-through decoration-2">+ <span className="text-[20px] font-semibold text-[#201715]/40 line-through decoration-2">{priceLabel(offer.priceCents, locale)}</span></div><div className="mt-2.5 text-[13px] font-semibold text-[#201715]">{t("covers", { months: offer.months, price: priceLabel(offer.priceCents, locale) })}</div>- <div className="mt-4 inline-flex rounded-full bg-ink px-3 py-1 text-[12px] font-semibold text-white tabular-nums">- {t("endsIn", { percent: offer.percentOff, ...countdownParts(offer.endsAt, now) })}- </div></>);}diff --git a/site/src/cut/lib/pi/donkeyStream.ts b/site/src/cut/lib/pi/donkeyStream.tsindex 420338a3..cdc65571 100644--- a/site/src/cut/lib/pi/donkeyStream.ts+++ b/site/src/cut/lib/pi/donkeyStream.ts@@ -211,7 +211,7 @@ async function requestError((v): v is string => typeof v === "string" && v.length > 0);if (res.status === 402)- return message ?? "You're out of Donkey credits — top up to keep generating.";+ return message ?? "You're out of Donkey credits. Plus, Pro, and Max add credits every month.";return message ?? "Gemini request failed.";}diff --git a/site/src/cut/lib/proUpgrade.ts b/site/src/cut/lib/proUpgrade.tsindex cffefd6b..6e2c50a3 100644--- a/site/src/cut/lib/proUpgrade.ts+++ b/site/src/cut/lib/proUpgrade.ts@@ -1,28 +1,29 @@"use client";-// One way into Pro checkout, shared by every surface that sells storage.-import { useCutBase } from "@/cut/lib/nav";+// One way into plan checkout, shared by every surface that sells a plan. A+// free account leaves for Stripe; an account already on a plan moves up in+// place and lands back on settings.+import { useState } from "react";++import type { PaidPlan } from "@/lib/billing/plans";import { track } from "@/lib/analytics";import { useStartCheckout } from "@/queries/billing";-export function useUpgradeToPro() {+export function usePlanCheckout() {const checkout = useStartCheckout();- const base = useCutBase();+ const [pendingPlan, setPendingPlan] = useState<PaidPlan | null>(null);- const start = () => {- track("pro_checkout_started");- void (async () => {- try {- const { url } = await checkout.mutateAsync();- window.location.assign(url);- } catch {- // Checkout can't start (an unconfigured plan 404s); the billing page- // carries the same subscribe action, so send them there rather than- // leaving the button dead.- window.location.assign(`${base}/settings`);- }- })();+ const start = (plan: PaidPlan) => {+ track("pro_checkout_started", { plan });+ setPendingPlan(plan);+ checkout.mutate(+ { plan },+ {+ onSuccess: ({ url }) => window.location.assign(url),+ onError: () => setPendingPlan(null),+ },+ );};- return { start, isPending: checkout.isPending };+ return { start, pendingPlan, error: checkout.error };}diff --git a/site/src/cut/lib/projectLimit.ts b/site/src/cut/lib/projectLimit.tsindex 07ecef5b..a0dbcda7 100644--- a/site/src/cut/lib/projectLimit.ts+++ b/site/src/cut/lib/projectLimit.ts@@ -1,10 +1,11 @@-// The free plan's project limit, checked before any new project is made: the+// The free project limit, checked before any new project is made: the// projects home, the sidebar, a file dropped on the home, a duplicate, and// the ChatGPT card all ask here first. A move keeps the count, so it never// asks.import type { QueryClient } from "@tanstack/react-query";import { track } from "@/lib/analytics";+import { PLAN_TERMS } from "@/lib/billing/plans";import { countedProjects, projectLimitFull } from "@/lib/billing/project-limit";import { accountConfigQueryKey, fetchAccountConfig } from "@/queries/accountConfig";import { fetchProSubscription, proSubscriptionQueryKey } from "@/queries/billing";@@ -28,8 +29,9 @@ export async function newProjectAllowed(client: QueryClient): Promise<boolean> {return true;}- const pro = await client.ensureQueryData({ queryKey: proSubscriptionQueryKey, queryFn: fetchProSubscription });- if (pro.isActive) {+ // Plus keeps the free limit; Pro and Max lift it.+ const subscription = await client.ensureQueryData({ queryKey: proSubscriptionQueryKey, queryFn: fetchProSubscription });+ if (subscription.plan && PLAN_TERMS[subscription.plan].unlimitedProjects) {return true;}diff --git a/site/src/cut/lib/upgrade.ts b/site/src/cut/lib/upgrade.tsindex 40971e46..714f81b5 100644--- a/site/src/cut/lib/upgrade.ts+++ b/site/src/cut/lib/upgrade.ts@@ -1,6 +1,7 @@-// The upgrade wall's signal: what a free account just ran into. The dialog-// listens; anything that hits a paid limit raises it.-export type UpgradeReason = "projects" | "credits";+// The upgrade wall's signal: what an account just ran into, or "plans" when+// it asked to see them. The dialog listens; anything that hits a paid limit+// raises it.+export type UpgradeReason = "projects" | "credits" | "plans";const listeners = new Set<(reason: UpgradeReason) => void>();diff --git a/site/src/cut/server/cloud/limits.test.ts b/site/src/cut/server/cloud/limits.test.tsnew file mode 100644index 00000000..44a54723--- /dev/null+++ b/site/src/cut/server/cloud/limits.test.ts@@ -0,0 +1,32 @@+import { describe, expect, test } from "bun:test";++import { cutLimitsForTier, FREE_STORAGE_BYTES } from "./limits";++const GB = 1024 ** 3;++describe("cutLimitsForTier", () => {+ test("each plan holds its own storage", () => {+ expect(cutLimitsForTier({ superUser: false, plan: null }).storageBytes).toBe(FREE_STORAGE_BYTES);+ expect(cutLimitsForTier({ superUser: false, plan: "plus" }).storageBytes).toBe(10 * GB);+ expect(cutLimitsForTier({ superUser: false, plan: "pro" }).storageBytes).toBe(100 * GB);+ expect(cutLimitsForTier({ superUser: false, plan: "max" }).storageBytes).toBe(500 * GB);+ });++ test("Plus keeps the free render cap; Max raises Pro's", () => {+ const free = cutLimitsForTier({ superUser: false, plan: null });+ expect(cutLimitsForTier({ superUser: false, plan: "plus" }).renderJobsPerDay).toBe(free.renderJobsPerDay);+ expect(cutLimitsForTier({ superUser: false, plan: "max" }).renderJobsPerDay).toBeGreaterThan(+ cutLimitsForTier({ superUser: false, plan: "pro" }).renderJobsPerDay ?? 0,+ );+ });++ test("an unknown plan key reads as Pro", () => {+ expect(cutLimitsForTier({ superUser: false, plan: "legacy" })).toEqual(+ cutLimitsForTier({ superUser: false, plan: "pro" }),+ );+ });++ test("super users are unlimited", () => {+ expect(cutLimitsForTier({ superUser: true, plan: null }).storageBytes).toBeNull();+ });+});diff --git a/site/src/cut/server/cloud/limits.ts b/site/src/cut/server/cloud/limits.tsindex 57d22c4f..9d79449f 100644--- a/site/src/cut/server/cloud/limits.ts+++ b/site/src/cut/server/cloud/limits.ts@@ -1,4 +1,5 @@-import { getActiveProSubscription } from "@/lib/billing/pro-subscription";+import { PLAN_TERMS, isPaidPlan, type PaidPlan } from "@/lib/billing/plans";+import { getActiveSubscription } from "@/lib/billing/pro-subscription";import { isDonkeySuperUser } from "@/lib/super-user";import { prisma } from "@/lib/prisma";@@ -52,13 +53,28 @@ const FREE: CutLimits = {liveTurns: 4,titlesPerDay: 300,};+const GB = 1024 ** 3;+// Plus buys credits and storage; its other caps are the free ones.+const PLUS: CutLimits = {+ ...FREE,+ storageBytes: PLAN_TERMS.plus.storageGb * GB,+ renderJobsPerDay: PLAN_TERMS.plus.rendersPerDay,+};const PRO: CutLimits = {- storageBytes: 100 * 1024 ** 3,- renderJobsPerDay: 200,+ storageBytes: PLAN_TERMS.pro.storageGb * GB,+ renderJobsPerDay: PLAN_TERMS.pro.rendersPerDay,liveJobs: 32,liveTurns: 8,titlesPerDay: 2000,};+const MAX: CutLimits = {+ storageBytes: PLAN_TERMS.max.storageGb * GB,+ renderJobsPerDay: PLAN_TERMS.max.rendersPerDay,+ liveJobs: 48,+ liveTurns: 12,+ titlesPerDay: 5000,+};+const PLAN_LIMITS: Record<PaidPlan, CutLimits> = { plus: PLUS, pro: PRO, max: MAX };const UNLIMITED: CutLimits = {storageBytes: null,renderJobsPerDay: null,@@ -67,15 +83,19 @@ const UNLIMITED: CutLimits = {titlesPerDay: null,};-/** The limits an account's tier earns. Super users are unlimited. */-export function cutLimitsForTier(tier: { superUser: boolean; pro: boolean }): CutLimits {+/** The limits an account's tier earns: its plan's, or free's without one.+ * Super users are unlimited. A row with a plan key this build doesn't know+ * reads as Pro, the plan every row was before the ladder. */+export function cutLimitsForTier(tier: { superUser: boolean; plan: string | null }): CutLimits {if (tier.superUser) return UNLIMITED;- return tier.pro ? PRO : FREE;+ if (tier.plan === null) return FREE;+ return isPaidPlan(tier.plan) ? PLAN_LIMITS[tier.plan] : PRO;}export async function cutLimitsFor(userId: string): Promise<CutLimits> {if (await isDonkeySuperUser(userId)) return UNLIMITED;- return cutLimitsForTier({ superUser: false, pro: !!(await getActiveProSubscription(userId)) });+ const subscription = await getActiveSubscription(userId);+ return cutLimitsForTier({ superUser: false, plan: subscription?.planKey ?? null });}/** 429 when the account already has as many asked-for jobs in flight as itsdiff --git a/site/src/cut/server/cloud/transcribe.ts b/site/src/cut/server/cloud/transcribe.tsindex 2cbb3da9..2b911d15 100644--- a/site/src/cut/server/cloud/transcribe.ts+++ b/site/src/cut/server/cloud/transcribe.ts@@ -12,7 +12,7 @@ import {recordInferenceUsage,requireInferenceCredits,} from "@/lib/credits/inference";-import { getActiveProSubscription } from "@/lib/billing/pro-subscription";+import { getActiveSubscription } from "@/lib/billing/pro-subscription";import { prisma } from "@/lib/prisma";import {defaultGeminiClientFactory,@@ -66,7 +66,7 @@ export const freeTranscriptionExhausted = "free_transcription_exhausted";* records, so the allowance can overshoot by the posts-in-flight few —* bounded and cheap, like the credit preflight's own concurrency window. */async function withinFreeAllowance(userId: string, sweep: boolean): Promise<boolean> {- const pro = await getActiveProSubscription(userId);+ const pro = await getActiveSubscription(userId);const now = new Date();const monthStart = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), 1));const windowStart = pro?.currentPeriodStart ?? monthStart;@@ -82,7 +82,8 @@ async function withinFreeAllowance(userId: string, sweep: boolean): Promise<bool},});const total = used.reduce((n, u) => n + u._count._all, 0);- const cap = pro ? PRO_FREE_CHUNKS : FREE_CHUNKS;+ // Pro and Max carry the two hours; Plus and free accounts the half hour.+ const cap = pro && pro.planKey !== "plus" ? PRO_FREE_CHUNKS : FREE_CHUNKS;if (total >= cap) return false;if (!sweep) return true;const sweepUsed = used.find((u) => u.requestKind === SWEEP_KIND)?._count._all ?? 0;diff --git a/site/src/i18n/messages/.source-lock.json b/site/src/i18n/messages/.source-lock.jsonindex 347ee39e..f4c8fdb9 100644--- a/site/src/i18n/messages/.source-lock.json+++ b/site/src/i18n/messages/.source-lock.json@@ -42,9 +42,7 @@"de/billing": {"notNow": "e45714907316","ok": "9ce3bd4224c8",- "upgradeToPro": "24de9364ba97","subscribeToPro": "77785efef3b4",- "buyCredits": "ce006bc7744a","billingUnavailable": "b186f7f39298","offer.validThrough": "0ecf12b0c552","offer.validFor": "8dde1c13cfdc",@@ -54,14 +52,8 @@"offer.subscribeBody": "de520fd661e2","offer.expiresIn": "ae427d76aab6","intro.terms": "6fd1d29c8cca",- "upgrade.outOfCredits": "a1c38f13783e",- "upgrade.proOutBody": "55cf18e9d9fb",- "upgrade.projectsTitle": "3c02b43eeb51",- "upgrade.creditsBody": "c60ee9be065e",- "upgrade.creditsBodyOffer": "1d1fcc02a91f",- "upgrade.proPrice": "776102c2605a",- "upgrade.projectsBodyStarter": "eba35817c210",- "upgrade.projectsBody": "d723067b1c34",+ "upgrade.projectsTitle": "3b2453ea91ca",+ "upgrade.projectsBody": "6244aa81df3b","claim.expiredTitle": "349a90d6289c","claim.alreadyProTitle": "ea2ea0a9f54c","claim.invalidTitle": "6e3dbedfd827",@@ -83,9 +75,7 @@"storage.graceToday": "f6aac6ab0664","storage.graceDays": "ed6cc54e50ac","storage.proBody": "e71312927238",- "storage.body": "1f9a45b220d1",- "storage.bodyUsed": "b2a86c5e78ce",- "storage.freeUpTerms": "fdb880aa4c8f",+ "storage.moreTitle": "2693c538224e","subscribeBonus.daysLeft": "cd68d04927cc","subscribeBonus.hoursLeft": "e13c0d72cf69","subscribeBonus.minutesLeft": "689650c998da",@@ -100,7 +90,22 @@"storagePill.ends": "445ab1de8416","storagePill.graceTooltip": "7bfa641106ac","storagePill.fullTooltip": "327df386b081",- "storagePill.usedTooltip": "eada16a687e5"+ "storagePill.usedTooltip": "eada16a687e5",+ "plans.chooseTitle": "12a7bc47d455",+ "plans.chooseBody": "c3edcf7d57ac",+ "plans.freeOutTitle": "4deef711ff02",+ "plans.paidOutTitle": "05ce2485705c",+ "plans.paidOutBody": "18f057593944",+ "plans.topOutTitle": "713a8c79ed21",+ "plans.bestValue": "8173c2a946f1",+ "plans.billedMonthly": "cad51bd43867",+ "plans.introThen": "49e300236000",+ "plans.stickerPercent": "e5544c338932",+ "plans.stickerOff": "da7a68734367",+ "plans.get": "36572be917c8",+ "plans.upgrade": "413370c98be7",+ "plans.current": "ec5cfba8f01b",+ "plans.footer": "38d6bda2e5b1"},"de/chat": {"panel.signInToChat": "8b2dd174b118",@@ -128,7 +133,7 @@"panel.suggestions.rewriteSubtitles": "2cee64e1073c","panel.suggestions.writeCaption": "01a1a3898f85","panel.workingEllipsis": "13b7bfcac438",- "panel.insufficientCredits": "e15f6be1ed5d",+ "panel.insufficientCredits": "5235be5a36d8","panel.dropToAttach": "38abf08e4d2e","panel.composerPlaceholder": "791258063545","panel.dictate": "3eaff69c9844",@@ -221,7 +226,7 @@"dictation.dictate": "3eaff69c9844","searchSuggestions.frameTitle": "bbb64126903f","hostedError.insufficientCredits": "9b9a2f420125",- "hostedError.insufficientCreditsReload": "7e6fd639cae5",+ "hostedError.insufficientCreditsReload": "773bec8a334f","hostedError.failed": "254aaf43068e"},"de/chatgpt": {@@ -319,17 +324,20 @@"pagination.nextLabel": "fd7164f9ddd6","pagination.morePages": "1fd2b5b554e8","dialog.close": "bbfa773e5a63",- "proPlan.body": "b7bf628ebb51",- "proPlan.price": "b165a8f90133",- "proPlan.storage": "d4e5dec4a8ce",- "proPlan.credits": "7df8b6d4a682",- "proPlan.generation": "7376fe93be16",+ "plans.body": "57d21eaacba0",+ "plans.price": "b165a8f90133",+ "plans.perMonth": "ab0cc392942e",+ "plans.storage": "d4e5dec4a8ce",+ "plans.credits": "7df8b6d4a682",+ "plans.generation": "7376fe93be16",+ "plans.unlimitedProjects": "fe488690362a",+ "plans.renders": "72b9acc487f5",+ "plans.everythingIn": "f67ac7338f1b","apiErrors.checkout_no_url": "d53bd869274d",- "apiErrors.credit_amount_out_of_range": "73902c89a404",- "apiErrors.auto_reload_invalid": "efb00868e5ca",- "apiErrors.no_payment_method": "6ba414ee3707","apiErrors.unsupported_image_type": "73cf38d0e3e1","apiErrors.image_too_large": "3fdb4028f18f",+ "apiErrors.plan_not_an_upgrade": "d968260313e6",+ "apiErrors.upgrade_payment_failed": "9f81fe318848","languageSaveFailed": "8d8a247bafe6","languageBlocked": "6cdf84383309"},@@ -1275,9 +1283,9 @@"navUser.onboarding": "c71537942e9f","navUser.runLocally": "a3c522448148","navUser.logOut": "6e78c91f5a05",- "navStorage.get100": "1c95a5e683f0",- "navStorage.upgradeTip": "780df3699385",- "navStorage.grace": "cd66ff3d4893",+ "navStorage.upgrade": "a6f47e00e036",+ "navStorage.upgradeTip": "731c972614a2",+ "navStorage.grace": "016a3d7bf5b2","justNow": "a7f8e7cc0d43"},"de/inspector": {@@ -2085,7 +2093,6 @@"worksWith.body": "59ab665df233","pricing.title": "5cb23e5648fb","pricing.body": "e0d25a257d31",- "pricing.footnote": "ff131f212105","plans.free.name": "75f527181b57","plans.free.detail": "7ccd8cfc31fd","plans.free.body": "e2f7606c3f63",@@ -2094,9 +2101,9 @@"plans.free.storage": "f335e7a25f8f","plans.free.tools": "21e7962cf954","plans.free.subscriptions": "5d318bd27003",- "plans.pro.detail": "5997b57ace53",- "plans.pro.cta": "c3a96fb81821",- "plans.pro.everythingInFree": "b6017dd40013",+ "plans.paid.detail": "588d1e6cd282",+ "plans.paid.cta": "36572be917c8",+ "plans.paid.everythingInFree": "b6017dd40013","local.title": "3345a1fc0d10","local.body": "02b546b1aaf5","local.cta": "752ca6a6cb88",@@ -2520,11 +2527,10 @@"credits.expires": "49370980c228","plans.title": "c0c6a5e91743","plans.subtitle": "e0d25a257d31",- "plans.forIndividuals": "5997b57ace53",- "plans.getPro": "c3a96fb81821",+ "plans.bestValue": "8173c2a946f1",+ "plans.getPlan": "36572be917c8","plans.getProOff": "295f4fc9c6f1","plans.continueFree": "d7f2a5d8710f",- "plans.endsIn": "a0da0d2c6400","plans.covers": "42fa1aae2a8e"},"de/panels": {@@ -2800,8 +2806,9 @@"header.profileTitle": "ff4fc0276e96","header.billingTitle": "abaec4522bf6","header.billingDescription": "914fef3051a9",- "pro.title": "f1c8c102c152",- "pro.description": "5495817fa21c",+ "pro.title": "ae2f98a099fe",+ "pro.titlePlan": "15d51cbc1b2e",+ "pro.description": "a745bfad7b2a","pro.status": "5b62812ab4f0","pro.promotionUntil": "27fdb4c20e00","pro.promotionOpen": "087aa0c46d34",@@ -2815,28 +2822,12 @@"pro.introDeadline": "ae6031e0a246","pro.opening": "b1b8530bbd68","pro.manage": "a8f311cad04a",- "pro.starting": "e5f58095ac29",- "pro.subscribe": "77785efef3b4","pro.unavailable": "b186f7f39298",+ "pro.seePlans": "5942a8e34b50",+ "pro.upgrade": "a6f47e00e036","credits.title": "bfac50d6424b",- "credits.description": "9a94cfb3dd3d",+ "credits.description": "7fccc8a12022","credits.available": "adba40120954",- "credits.buy": "ce006bc7744a",- "credits.preset": "eddfd9501d05",- "credits.customLabel": "bfac50d6424b",- "credits.starting": "e5f58095ac29",- "credits.buyFor": "b3ad4667116f",- "credits.buyPlain": "7ceca51fcafe",- "credits.checkoutFailed": "8682339e2e39",- "credits.autoReload": "0c7bc417cacd",- "credits.fallsBelow": "0864eacba85f",- "credits.unit": "66c22fad3a99",- "credits.thenBuy": "794326edc420",- "credits.saving": "56a2285c5b11",- "credits.save": "efc007a393f6",- "credits.saveFailed": "a4b714385ae0",- "credits.lastFailed": "635e42ddf409",- "credits.needsCard": "d97d0a162d3a","profile.loadFailed": "bdfbfbff7008","profile.changePicture": "dfad18d203c4","profile.emailVerified": "82f47c3d4dd2",@@ -3081,9 +3072,7 @@"es/billing": {"notNow": "e45714907316","ok": "9ce3bd4224c8",- "upgradeToPro": "24de9364ba97","subscribeToPro": "77785efef3b4",- "buyCredits": "ce006bc7744a","billingUnavailable": "b186f7f39298","offer.validThrough": "0ecf12b0c552","offer.validFor": "8dde1c13cfdc",@@ -3093,14 +3082,8 @@"offer.subscribeBody": "de520fd661e2","offer.expiresIn": "ae427d76aab6","intro.terms": "6fd1d29c8cca",- "upgrade.outOfCredits": "a1c38f13783e",- "upgrade.proOutBody": "55cf18e9d9fb",- "upgrade.projectsTitle": "3c02b43eeb51",- "upgrade.creditsBody": "c60ee9be065e",- "upgrade.creditsBodyOffer": "1d1fcc02a91f",- "upgrade.proPrice": "776102c2605a",- "upgrade.projectsBodyStarter": "eba35817c210",- "upgrade.projectsBody": "d723067b1c34",+ "upgrade.projectsTitle": "3b2453ea91ca",+ "upgrade.projectsBody": "6244aa81df3b","claim.expiredTitle": "349a90d6289c","claim.alreadyProTitle": "ea2ea0a9f54c","claim.invalidTitle": "6e3dbedfd827",@@ -3122,9 +3105,7 @@"storage.graceToday": "f6aac6ab0664","storage.graceDays": "ed6cc54e50ac","storage.proBody": "e71312927238",- "storage.body": "1f9a45b220d1",- "storage.bodyUsed": "b2a86c5e78ce",- "storage.freeUpTerms": "fdb880aa4c8f",+ "storage.moreTitle": "2693c538224e","subscribeBonus.daysLeft": "cd68d04927cc","subscribeBonus.hoursLeft": "e13c0d72cf69","subscribeBonus.minutesLeft": "689650c998da",@@ -3139,7 +3120,22 @@"storagePill.ends": "445ab1de8416","storagePill.graceTooltip": "7bfa641106ac","storagePill.fullTooltip": "327df386b081",- "storagePill.usedTooltip": "eada16a687e5"+ "storagePill.usedTooltip": "eada16a687e5",+ "plans.chooseTitle": "12a7bc47d455",+ "plans.chooseBody": "c3edcf7d57ac",+ "plans.freeOutTitle": "4deef711ff02",+ "plans.paidOutTitle": "05ce2485705c",+ "plans.paidOutBody": "18f057593944",+ "plans.topOutTitle": "713a8c79ed21",+ "plans.bestValue": "8173c2a946f1",+ "plans.billedMonthly": "cad51bd43867",+ "plans.introThen": "49e300236000",+ "plans.stickerPercent": "e5544c338932",+ "plans.stickerOff": "da7a68734367",+ "plans.get": "36572be917c8",+ "plans.upgrade": "413370c98be7",+ "plans.current": "ec5cfba8f01b",+ "plans.footer": "38d6bda2e5b1"},"es/chat": {"panel.signInToChat": "8b2dd174b118",@@ -3167,7 +3163,7 @@"panel.suggestions.rewriteSubtitles": "2cee64e1073c","panel.suggestions.writeCaption": "01a1a3898f85","panel.workingEllipsis": "13b7bfcac438",- "panel.insufficientCredits": "e15f6be1ed5d",+ "panel.insufficientCredits": "5235be5a36d8","panel.dropToAttach": "38abf08e4d2e","panel.composerPlaceholder": "791258063545","panel.dictate": "3eaff69c9844",@@ -3260,7 +3256,7 @@"dictation.dictate": "3eaff69c9844","searchSuggestions.frameTitle": "bbb64126903f","hostedError.insufficientCredits": "9b9a2f420125",- "hostedError.insufficientCreditsReload": "7e6fd639cae5",+ "hostedError.insufficientCreditsReload": "773bec8a334f","hostedError.failed": "254aaf43068e"},"es/chatgpt": {@@ -3358,17 +3354,20 @@"pagination.nextLabel": "fd7164f9ddd6","pagination.morePages": "1fd2b5b554e8","dialog.close": "bbfa773e5a63",- "proPlan.body": "b7bf628ebb51",- "proPlan.price": "b165a8f90133",- "proPlan.storage": "d4e5dec4a8ce",- "proPlan.credits": "7df8b6d4a682",- "proPlan.generation": "7376fe93be16",+ "plans.body": "57d21eaacba0",+ "plans.price": "b165a8f90133",+ "plans.perMonth": "ab0cc392942e",+ "plans.storage": "d4e5dec4a8ce",+ "plans.credits": "7df8b6d4a682",+ "plans.generation": "7376fe93be16",+ "plans.unlimitedProjects": "fe488690362a",+ "plans.renders": "72b9acc487f5",+ "plans.everythingIn": "f67ac7338f1b","apiErrors.checkout_no_url": "d53bd869274d",- "apiErrors.credit_amount_out_of_range": "73902c89a404",- "apiErrors.auto_reload_invalid": "efb00868e5ca",- "apiErrors.no_payment_method": "6ba414ee3707","apiErrors.unsupported_image_type": "73cf38d0e3e1","apiErrors.image_too_large": "3fdb4028f18f",+ "apiErrors.plan_not_an_upgrade": "d968260313e6",+ "apiErrors.upgrade_payment_failed": "9f81fe318848","languageSaveFailed": "8d8a247bafe6","languageBlocked": "6cdf84383309"},@@ -4314,9 +4313,9 @@"navUser.onboarding": "c71537942e9f","navUser.runLocally": "a3c522448148","navUser.logOut": "6e78c91f5a05",- "navStorage.get100": "1c95a5e683f0",- "navStorage.upgradeTip": "780df3699385",- "navStorage.grace": "cd66ff3d4893",+ "navStorage.upgrade": "a6f47e00e036",+ "navStorage.upgradeTip": "731c972614a2",+ "navStorage.grace": "016a3d7bf5b2","justNow": "a7f8e7cc0d43"},"es/inspector": {@@ -5124,7 +5123,6 @@"worksWith.body": "59ab665df233","pricing.title": "5cb23e5648fb","pricing.body": "e0d25a257d31",- "pricing.footnote": "ff131f212105","plans.free.name": "75f527181b57","plans.free.detail": "7ccd8cfc31fd","plans.free.body": "e2f7606c3f63",@@ -5133,9 +5131,9 @@"plans.free.storage": "f335e7a25f8f","plans.free.tools": "21e7962cf954","plans.free.subscriptions": "5d318bd27003",- "plans.pro.detail": "5997b57ace53",- "plans.pro.cta": "c3a96fb81821",- "plans.pro.everythingInFree": "b6017dd40013",+ "plans.paid.detail": "588d1e6cd282",+ "plans.paid.cta": "36572be917c8",+ "plans.paid.everythingInFree": "b6017dd40013","local.title": "3345a1fc0d10","local.body": "02b546b1aaf5","local.cta": "752ca6a6cb88",@@ -5559,11 +5557,10 @@"credits.expires": "49370980c228","plans.title": "c0c6a5e91743","plans.subtitle": "e0d25a257d31",- "plans.forIndividuals": "5997b57ace53",- "plans.getPro": "c3a96fb81821",+ "plans.bestValue": "8173c2a946f1",+ "plans.getPlan": "36572be917c8","plans.getProOff": "295f4fc9c6f1","plans.continueFree": "d7f2a5d8710f",- "plans.endsIn": "a0da0d2c6400","plans.covers": "42fa1aae2a8e"},"es/panels": {@@ -5839,8 +5836,9 @@"header.profileTitle": "ff4fc0276e96","header.billingTitle": "abaec4522bf6","header.billingDescription": "914fef3051a9",- "pro.title": "f1c8c102c152",- "pro.description": "5495817fa21c",+ "pro.title": "ae2f98a099fe",+ "pro.titlePlan": "15d51cbc1b2e",+ "pro.description": "a745bfad7b2a","pro.status": "5b62812ab4f0","pro.promotionUntil": "27fdb4c20e00","pro.promotionOpen": "087aa0c46d34",@@ -5854,28 +5852,12 @@"pro.introDeadline": "ae6031e0a246","pro.opening": "b1b8530bbd68","pro.manage": "a8f311cad04a",- "pro.starting": "e5f58095ac29",- "pro.subscribe": "77785efef3b4","pro.unavailable": "b186f7f39298",+ "pro.seePlans": "5942a8e34b50",+ "pro.upgrade": "a6f47e00e036","credits.title": "bfac50d6424b",- "credits.description": "9a94cfb3dd3d",+ "credits.description": "7fccc8a12022","credits.available": "adba40120954",- "credits.buy": "ce006bc7744a",- "credits.preset": "eddfd9501d05",- "credits.customLabel": "bfac50d6424b",- "credits.starting": "e5f58095ac29",- "credits.buyFor": "b3ad4667116f",- "credits.buyPlain": "7ceca51fcafe",- "credits.checkoutFailed": "8682339e2e39",- "credits.autoReload": "0c7bc417cacd",- "credits.fallsBelow": "0864eacba85f",- "credits.unit": "66c22fad3a99",- "credits.thenBuy": "794326edc420",- "credits.saving": "56a2285c5b11",- "credits.save": "efc007a393f6",- "credits.saveFailed": "a4b714385ae0",- "credits.lastFailed": "635e42ddf409",- "credits.needsCard": "d97d0a162d3a","profile.loadFailed": "bdfbfbff7008","profile.changePicture": "dfad18d203c4","profile.emailVerified": "82f47c3d4dd2",@@ -6120,9 +6102,7 @@"fr/billing": {"notNow": "e45714907316","ok": "9ce3bd4224c8",- "upgradeToPro": "24de9364ba97","subscribeToPro": "77785efef3b4",- "buyCredits": "ce006bc7744a","billingUnavailable": "b186f7f39298","offer.validThrough": "0ecf12b0c552","offer.validFor": "8dde1c13cfdc",@@ -6132,14 +6112,8 @@"offer.subscribeBody": "de520fd661e2","offer.expiresIn": "ae427d76aab6","intro.terms": "6fd1d29c8cca",- "upgrade.outOfCredits": "a1c38f13783e",- "upgrade.proOutBody": "55cf18e9d9fb",- "upgrade.projectsTitle": "3c02b43eeb51",- "upgrade.creditsBody": "c60ee9be065e",- "upgrade.creditsBodyOffer": "1d1fcc02a91f",- "upgrade.proPrice": "776102c2605a",- "upgrade.projectsBodyStarter": "eba35817c210",- "upgrade.projectsBody": "d723067b1c34",+ "upgrade.projectsTitle": "3b2453ea91ca",+ "upgrade.projectsBody": "6244aa81df3b","claim.expiredTitle": "349a90d6289c","claim.alreadyProTitle": "ea2ea0a9f54c","claim.invalidTitle": "6e3dbedfd827",@@ -6161,9 +6135,7 @@"storage.graceToday": "f6aac6ab0664","storage.graceDays": "ed6cc54e50ac","storage.proBody": "e71312927238",- "storage.body": "1f9a45b220d1",- "storage.bodyUsed": "b2a86c5e78ce",- "storage.freeUpTerms": "fdb880aa4c8f",+ "storage.moreTitle": "2693c538224e","subscribeBonus.daysLeft": "cd68d04927cc","subscribeBonus.hoursLeft": "e13c0d72cf69","subscribeBonus.minutesLeft": "689650c998da",@@ -6178,7 +6150,22 @@"storagePill.ends": "445ab1de8416","storagePill.graceTooltip": "7bfa641106ac","storagePill.fullTooltip": "327df386b081",- "storagePill.usedTooltip": "eada16a687e5"+ "storagePill.usedTooltip": "eada16a687e5",+ "plans.chooseTitle": "12a7bc47d455",+ "plans.chooseBody": "c3edcf7d57ac",+ "plans.freeOutTitle": "4deef711ff02",+ "plans.paidOutTitle": "05ce2485705c",+ "plans.paidOutBody": "18f057593944",+ "plans.topOutTitle": "713a8c79ed21",+ "plans.bestValue": "8173c2a946f1",+ "plans.billedMonthly": "cad51bd43867",+ "plans.introThen": "49e300236000",+ "plans.stickerPercent": "e5544c338932",+ "plans.stickerOff": "da7a68734367",+ "plans.get": "36572be917c8",+ "plans.upgrade": "413370c98be7",+ "plans.current": "ec5cfba8f01b",+ "plans.footer": "38d6bda2e5b1"},"fr/chat": {"panel.signInToChat": "8b2dd174b118",@@ -6206,7 +6193,7 @@"panel.suggestions.rewriteSubtitles": "2cee64e1073c","panel.suggestions.writeCaption": "01a1a3898f85","panel.workingEllipsis": "13b7bfcac438",- "panel.insufficientCredits": "e15f6be1ed5d",+ "panel.insufficientCredits": "5235be5a36d8","panel.dropToAttach": "38abf08e4d2e","panel.composerPlaceholder": "791258063545","panel.dictate": "3eaff69c9844",@@ -6299,7 +6286,7 @@"dictation.dictate": "3eaff69c9844","searchSuggestions.frameTitle": "bbb64126903f","hostedError.insufficientCredits": "9b9a2f420125",- "hostedError.insufficientCreditsReload": "7e6fd639cae5",+ "hostedError.insufficientCreditsReload": "773bec8a334f","hostedError.failed": "254aaf43068e"},"fr/chatgpt": {@@ -6397,17 +6384,20 @@"pagination.nextLabel": "fd7164f9ddd6","pagination.morePages": "1fd2b5b554e8","dialog.close": "bbfa773e5a63",- "proPlan.body": "b7bf628ebb51",- "proPlan.price": "b165a8f90133",- "proPlan.storage": "d4e5dec4a8ce",- "proPlan.credits": "7df8b6d4a682",- "proPlan.generation": "7376fe93be16",+ "plans.body": "57d21eaacba0",+ "plans.price": "b165a8f90133",+ "plans.perMonth": "ab0cc392942e",+ "plans.storage": "d4e5dec4a8ce",+ "plans.credits": "7df8b6d4a682",+ "plans.generation": "7376fe93be16",+ "plans.unlimitedProjects": "fe488690362a",+ "plans.renders": "72b9acc487f5",+ "plans.everythingIn": "f67ac7338f1b","apiErrors.checkout_no_url": "d53bd869274d",- "apiErrors.credit_amount_out_of_range": "73902c89a404",- "apiErrors.auto_reload_invalid": "efb00868e5ca",- "apiErrors.no_payment_method": "6ba414ee3707","apiErrors.unsupported_image_type": "73cf38d0e3e1","apiErrors.image_too_large": "3fdb4028f18f",+ "apiErrors.plan_not_an_upgrade": "d968260313e6",+ "apiErrors.upgrade_payment_failed": "9f81fe318848","languageSaveFailed": "8d8a247bafe6","languageBlocked": "6cdf84383309"},@@ -7353,9 +7343,9 @@"navUser.onboarding": "c71537942e9f","navUser.runLocally": "a3c522448148","navUser.logOut": "6e78c91f5a05",- "navStorage.get100": "1c95a5e683f0",- "navStorage.upgradeTip": "780df3699385",- "navStorage.grace": "cd66ff3d4893",+ "navStorage.upgrade": "a6f47e00e036",+ "navStorage.upgradeTip": "731c972614a2",+ "navStorage.grace": "016a3d7bf5b2","justNow": "a7f8e7cc0d43"},"fr/inspector": {@@ -8163,7 +8153,6 @@"worksWith.body": "59ab665df233","pricing.title": "5cb23e5648fb","pricing.body": "e0d25a257d31",- "pricing.footnote": "ff131f212105","plans.free.name": "75f527181b57","plans.free.detail": "7ccd8cfc31fd","plans.free.body": "e2f7606c3f63",@@ -8172,9 +8161,9 @@"plans.free.storage": "f335e7a25f8f","plans.free.tools": "21e7962cf954","plans.free.subscriptions": "5d318bd27003",- "plans.pro.detail": "5997b57ace53",- "plans.pro.cta": "c3a96fb81821",- "plans.pro.everythingInFree": "b6017dd40013",+ "plans.paid.detail": "588d1e6cd282",+ "plans.paid.cta": "36572be917c8",+ "plans.paid.everythingInFree": "b6017dd40013","local.title": "3345a1fc0d10","local.body": "02b546b1aaf5","local.cta": "752ca6a6cb88",@@ -8598,11 +8587,10 @@"credits.expires": "49370980c228","plans.title": "c0c6a5e91743","plans.subtitle": "e0d25a257d31",- "plans.forIndividuals": "5997b57ace53",- "plans.getPro": "c3a96fb81821",+ "plans.bestValue": "8173c2a946f1",+ "plans.getPlan": "36572be917c8","plans.getProOff": "295f4fc9c6f1","plans.continueFree": "d7f2a5d8710f",- "plans.endsIn": "a0da0d2c6400","plans.covers": "42fa1aae2a8e"},"fr/panels": {@@ -8878,8 +8866,9 @@"header.profileTitle": "ff4fc0276e96","header.billingTitle": "abaec4522bf6","header.billingDescription": "914fef3051a9",- "pro.title": "f1c8c102c152",- "pro.description": "5495817fa21c",+ "pro.title": "ae2f98a099fe",+ "pro.titlePlan": "15d51cbc1b2e",+ "pro.description": "a745bfad7b2a","pro.status": "5b62812ab4f0","pro.promotionUntil": "27fdb4c20e00","pro.promotionOpen": "087aa0c46d34",@@ -8893,28 +8882,12 @@"pro.introDeadline": "ae6031e0a246","pro.opening": "b1b8530bbd68","pro.manage": "a8f311cad04a",- "pro.starting": "e5f58095ac29",- "pro.subscribe": "77785efef3b4","pro.unavailable": "b186f7f39298",+ "pro.seePlans": "5942a8e34b50",+ "pro.upgrade": "a6f47e00e036","credits.title": "bfac50d6424b",- "credits.description": "9a94cfb3dd3d",+ "credits.description": "7fccc8a12022","credits.available": "adba40120954",- "credits.buy": "ce006bc7744a",- "credits.preset": "eddfd9501d05",- "credits.customLabel": "bfac50d6424b",- "credits.starting": "e5f58095ac29",- "credits.buyFor": "b3ad4667116f",- "credits.buyPlain": "7ceca51fcafe",- "credits.checkoutFailed": "8682339e2e39",- "credits.autoReload": "0c7bc417cacd",- "credits.fallsBelow": "0864eacba85f",- "credits.unit": "66c22fad3a99",- "credits.thenBuy": "794326edc420",- "credits.saving": "56a2285c5b11",- "credits.save": "efc007a393f6",- "credits.saveFailed": "a4b714385ae0",- "credits.lastFailed": "635e42ddf409",- "credits.needsCard": "d97d0a162d3a","profile.loadFailed": "bdfbfbff7008","profile.changePicture": "dfad18d203c4","profile.emailVerified": "82f47c3d4dd2",@@ -9159,9 +9132,7 @@"ja/billing": {"notNow": "e45714907316","ok": "9ce3bd4224c8",- "upgradeToPro": "24de9364ba97","subscribeToPro": "77785efef3b4",- "buyCredits": "ce006bc7744a","billingUnavailable": "b186f7f39298","offer.validThrough": "0ecf12b0c552","offer.validFor": "8dde1c13cfdc",@@ -9171,14 +9142,8 @@"offer.subscribeBody": "de520fd661e2","offer.expiresIn": "ae427d76aab6","intro.terms": "6fd1d29c8cca",- "upgrade.outOfCredits": "a1c38f13783e",- "upgrade.proOutBody": "55cf18e9d9fb",- "upgrade.projectsTitle": "3c02b43eeb51",- "upgrade.creditsBody": "c60ee9be065e",- "upgrade.creditsBodyOffer": "1d1fcc02a91f",- "upgrade.proPrice": "776102c2605a",- "upgrade.projectsBodyStarter": "eba35817c210",- "upgrade.projectsBody": "d723067b1c34",+ "upgrade.projectsTitle": "3b2453ea91ca",+ "upgrade.projectsBody": "6244aa81df3b","claim.expiredTitle": "349a90d6289c","claim.alreadyProTitle": "ea2ea0a9f54c","claim.invalidTitle": "6e3dbedfd827",@@ -9200,9 +9165,7 @@"storage.graceToday": "f6aac6ab0664","storage.graceDays": "ed6cc54e50ac","storage.proBody": "e71312927238",- "storage.body": "1f9a45b220d1",- "storage.bodyUsed": "b2a86c5e78ce",- "storage.freeUpTerms": "fdb880aa4c8f",+ "storage.moreTitle": "2693c538224e","subscribeBonus.daysLeft": "cd68d04927cc","subscribeBonus.hoursLeft": "e13c0d72cf69","subscribeBonus.minutesLeft": "689650c998da",@@ -9217,7 +9180,22 @@"storagePill.ends": "445ab1de8416","storagePill.graceTooltip": "7bfa641106ac","storagePill.fullTooltip": "327df386b081",- "storagePill.usedTooltip": "eada16a687e5"+ "storagePill.usedTooltip": "eada16a687e5",+ "plans.chooseTitle": "12a7bc47d455",+ "plans.chooseBody": "c3edcf7d57ac",+ "plans.freeOutTitle": "4deef711ff02",+ "plans.paidOutTitle": "05ce2485705c",+ "plans.paidOutBody": "18f057593944",+ "plans.topOutTitle": "713a8c79ed21",+ "plans.bestValue": "8173c2a946f1",+ "plans.billedMonthly": "cad51bd43867",+ "plans.introThen": "49e300236000",+ "plans.stickerPercent": "e5544c338932",+ "plans.stickerOff": "da7a68734367",+ "plans.get": "36572be917c8",+ "plans.upgrade": "413370c98be7",+ "plans.current": "ec5cfba8f01b",+ "plans.footer": "38d6bda2e5b1"},"ja/chat": {"panel.signInToChat": "8b2dd174b118",@@ -9245,7 +9223,7 @@"panel.suggestions.rewriteSubtitles": "2cee64e1073c","panel.suggestions.writeCaption": "01a1a3898f85","panel.workingEllipsis": "13b7bfcac438",- "panel.insufficientCredits": "e15f6be1ed5d",+ "panel.insufficientCredits": "5235be5a36d8","panel.dropToAttach": "38abf08e4d2e","panel.composerPlaceholder": "791258063545","panel.dictate": "3eaff69c9844",@@ -9338,7 +9316,7 @@"dictation.dictate": "3eaff69c9844","searchSuggestions.frameTitle": "bbb64126903f","hostedError.insufficientCredits": "9b9a2f420125",- "hostedError.insufficientCreditsReload": "7e6fd639cae5",+ "hostedError.insufficientCreditsReload": "773bec8a334f","hostedError.failed": "254aaf43068e"},"ja/chatgpt": {@@ -9436,17 +9414,20 @@"pagination.nextLabel": "fd7164f9ddd6","pagination.morePages": "1fd2b5b554e8","dialog.close": "bbfa773e5a63",- "proPlan.body": "b7bf628ebb51",- "proPlan.price": "b165a8f90133",- "proPlan.storage": "d4e5dec4a8ce",- "proPlan.credits": "7df8b6d4a682",- "proPlan.generation": "7376fe93be16",+ "plans.body": "57d21eaacba0",+ "plans.price": "b165a8f90133",+ "plans.perMonth": "ab0cc392942e",+ "plans.storage": "d4e5dec4a8ce",+ "plans.credits": "7df8b6d4a682",+ "plans.generation": "7376fe93be16",+ "plans.unlimitedProjects": "fe488690362a",+ "plans.renders": "72b9acc487f5",+ "plans.everythingIn": "f67ac7338f1b","apiErrors.checkout_no_url": "d53bd869274d",- "apiErrors.credit_amount_out_of_range": "73902c89a404",- "apiErrors.auto_reload_invalid": "efb00868e5ca",- "apiErrors.no_payment_method": "6ba414ee3707","apiErrors.unsupported_image_type": "73cf38d0e3e1","apiErrors.image_too_large": "3fdb4028f18f",+ "apiErrors.plan_not_an_upgrade": "d968260313e6",+ "apiErrors.upgrade_payment_failed": "9f81fe318848","languageSaveFailed": "8d8a247bafe6","languageBlocked": "6cdf84383309"},@@ -10392,9 +10373,9 @@"navUser.onboarding": "c71537942e9f","navUser.runLocally": "a3c522448148","navUser.logOut": "6e78c91f5a05",- "navStorage.get100": "1c95a5e683f0",- "navStorage.upgradeTip": "780df3699385",- "navStorage.grace": "cd66ff3d4893",+ "navStorage.upgrade": "a6f47e00e036",+ "navStorage.upgradeTip": "731c972614a2",+ "navStorage.grace": "016a3d7bf5b2","justNow": "a7f8e7cc0d43"},"ja/inspector": {@@ -11202,7 +11183,6 @@"worksWith.body": "59ab665df233","pricing.title": "5cb23e5648fb","pricing.body": "e0d25a257d31",- "pricing.footnote": "ff131f212105","plans.free.name": "75f527181b57","plans.free.detail": "7ccd8cfc31fd","plans.free.body": "e2f7606c3f63",@@ -11211,9 +11191,9 @@"plans.free.storage": "f335e7a25f8f","plans.free.tools": "21e7962cf954","plans.free.subscriptions": "5d318bd27003",- "plans.pro.detail": "5997b57ace53",- "plans.pro.cta": "c3a96fb81821",- "plans.pro.everythingInFree": "b6017dd40013",+ "plans.paid.detail": "588d1e6cd282",+ "plans.paid.cta": "36572be917c8",+ "plans.paid.everythingInFree": "b6017dd40013","local.title": "3345a1fc0d10","local.body": "02b546b1aaf5","local.cta": "752ca6a6cb88",@@ -11637,11 +11617,10 @@"credits.expires": "49370980c228","plans.title": "c0c6a5e91743","plans.subtitle": "e0d25a257d31",- "plans.forIndividuals": "5997b57ace53",- "plans.getPro": "c3a96fb81821",+ "plans.bestValue": "8173c2a946f1",+ "plans.getPlan": "36572be917c8","plans.getProOff": "295f4fc9c6f1","plans.continueFree": "d7f2a5d8710f",- "plans.endsIn": "a0da0d2c6400","plans.covers": "42fa1aae2a8e"},"ja/panels": {@@ -11917,8 +11896,9 @@"header.profileTitle": "ff4fc0276e96","header.billingTitle": "abaec4522bf6","header.billingDescription": "914fef3051a9",- "pro.title": "f1c8c102c152",- "pro.description": "5495817fa21c",+ "pro.title": "ae2f98a099fe",+ "pro.titlePlan": "15d51cbc1b2e",+ "pro.description": "a745bfad7b2a","pro.status": "5b62812ab4f0","pro.promotionUntil": "27fdb4c20e00","pro.promotionOpen": "087aa0c46d34",@@ -11932,28 +11912,12 @@"pro.introDeadline": "ae6031e0a246","pro.opening": "b1b8530bbd68","pro.manage": "a8f311cad04a",- "pro.starting": "e5f58095ac29",- "pro.subscribe": "77785efef3b4","pro.unavailable": "b186f7f39298",+ "pro.seePlans": "5942a8e34b50",+ "pro.upgrade": "a6f47e00e036","credits.title": "bfac50d6424b",- "credits.description": "9a94cfb3dd3d",+ "credits.description": "7fccc8a12022","credits.available": "adba40120954",- "credits.buy": "ce006bc7744a",- "credits.preset": "eddfd9501d05",- "credits.customLabel": "bfac50d6424b",- "credits.starting": "e5f58095ac29",- "credits.buyFor": "b3ad4667116f",- "credits.buyPlain": "7ceca51fcafe",- "credits.checkoutFailed": "8682339e2e39",- "credits.autoReload": "0c7bc417cacd",- "credits.fallsBelow": "0864eacba85f",- "credits.unit": "66c22fad3a99",- "credits.thenBuy": "794326edc420",- "credits.saving": "56a2285c5b11",- "credits.save": "efc007a393f6",- "credits.saveFailed": "a4b714385ae0",- "credits.lastFailed": "635e42ddf409",- "credits.needsCard": "d97d0a162d3a","profile.loadFailed": "bdfbfbff7008","profile.changePicture": "dfad18d203c4","profile.emailVerified": "82f47c3d4dd2",@@ -12198,9 +12162,7 @@"ko/billing": {"notNow": "e45714907316","ok": "9ce3bd4224c8",- "upgradeToPro": "24de9364ba97","subscribeToPro": "77785efef3b4",- "buyCredits": "ce006bc7744a","billingUnavailable": "b186f7f39298","offer.validThrough": "0ecf12b0c552","offer.validFor": "8dde1c13cfdc",@@ -12210,14 +12172,8 @@"offer.subscribeBody": "de520fd661e2","offer.expiresIn": "ae427d76aab6","intro.terms": "6fd1d29c8cca",- "upgrade.outOfCredits": "a1c38f13783e",- "upgrade.proOutBody": "55cf18e9d9fb",- "upgrade.projectsTitle": "3c02b43eeb51",- "upgrade.creditsBody": "c60ee9be065e",- "upgrade.creditsBodyOffer": "1d1fcc02a91f",- "upgrade.proPrice": "776102c2605a",- "upgrade.projectsBodyStarter": "eba35817c210",- "upgrade.projectsBody": "d723067b1c34",+ "upgrade.projectsTitle": "3b2453ea91ca",+ "upgrade.projectsBody": "6244aa81df3b","claim.expiredTitle": "349a90d6289c","claim.alreadyProTitle": "ea2ea0a9f54c","claim.invalidTitle": "6e3dbedfd827",@@ -12239,9 +12195,7 @@"storage.graceToday": "f6aac6ab0664","storage.graceDays": "ed6cc54e50ac","storage.proBody": "e71312927238",- "storage.body": "1f9a45b220d1",- "storage.bodyUsed": "b2a86c5e78ce",- "storage.freeUpTerms": "fdb880aa4c8f",+ "storage.moreTitle": "2693c538224e","subscribeBonus.daysLeft": "cd68d04927cc","subscribeBonus.hoursLeft": "e13c0d72cf69","subscribeBonus.minutesLeft": "689650c998da",@@ -12256,7 +12210,22 @@"storagePill.ends": "445ab1de8416","storagePill.graceTooltip": "7bfa641106ac","storagePill.fullTooltip": "327df386b081",- "storagePill.usedTooltip": "eada16a687e5"+ "storagePill.usedTooltip": "eada16a687e5",+ "plans.chooseTitle": "12a7bc47d455",+ "plans.chooseBody": "c3edcf7d57ac",+ "plans.freeOutTitle": "4deef711ff02",+ "plans.paidOutTitle": "05ce2485705c",+ "plans.paidOutBody": "18f057593944",+ "plans.topOutTitle": "713a8c79ed21",+ "plans.bestValue": "8173c2a946f1",+ "plans.billedMonthly": "cad51bd43867",+ "plans.introThen": "49e300236000",+ "plans.stickerPercent": "e5544c338932",+ "plans.stickerOff": "da7a68734367",+ "plans.get": "36572be917c8",+ "plans.upgrade": "413370c98be7",+ "plans.current": "ec5cfba8f01b",+ "plans.footer": "38d6bda2e5b1"},"ko/chat": {"panel.signInToChat": "8b2dd174b118",@@ -12284,7 +12253,7 @@"panel.suggestions.rewriteSubtitles": "2cee64e1073c","panel.suggestions.writeCaption": "01a1a3898f85","panel.workingEllipsis": "13b7bfcac438",- "panel.insufficientCredits": "e15f6be1ed5d",+ "panel.insufficientCredits": "5235be5a36d8","panel.dropToAttach": "38abf08e4d2e","panel.composerPlaceholder": "791258063545","panel.dictate": "3eaff69c9844",@@ -12377,7 +12346,7 @@"dictation.dictate": "3eaff69c9844","searchSuggestions.frameTitle": "bbb64126903f","hostedError.insufficientCredits": "9b9a2f420125",- "hostedError.insufficientCreditsReload": "7e6fd639cae5",+ "hostedError.insufficientCreditsReload": "773bec8a334f","hostedError.failed": "254aaf43068e"},"ko/chatgpt": {@@ -12475,17 +12444,20 @@"pagination.nextLabel": "fd7164f9ddd6","pagination.morePages": "1fd2b5b554e8","dialog.close": "bbfa773e5a63",- "proPlan.body": "b7bf628ebb51",- "proPlan.price": "b165a8f90133",- "proPlan.storage": "d4e5dec4a8ce",- "proPlan.credits": "7df8b6d4a682",- "proPlan.generation": "7376fe93be16",+ "plans.body": "57d21eaacba0",+ "plans.price": "b165a8f90133",+ "plans.perMonth": "ab0cc392942e",+ "plans.storage": "d4e5dec4a8ce",+ "plans.credits": "7df8b6d4a682",+ "plans.generation": "7376fe93be16",+ "plans.unlimitedProjects": "fe488690362a",+ "plans.renders": "72b9acc487f5",+ "plans.everythingIn": "f67ac7338f1b","apiErrors.checkout_no_url": "d53bd869274d",- "apiErrors.credit_amount_out_of_range": "73902c89a404",- "apiErrors.auto_reload_invalid": "efb00868e5ca",- "apiErrors.no_payment_method": "6ba414ee3707","apiErrors.unsupported_image_type": "73cf38d0e3e1","apiErrors.image_too_large": "3fdb4028f18f",+ "apiErrors.plan_not_an_upgrade": "d968260313e6",+ "apiErrors.upgrade_payment_failed": "9f81fe318848","languageSaveFailed": "8d8a247bafe6","languageBlocked": "6cdf84383309"},@@ -13431,9 +13403,9 @@"navUser.onboarding": "c71537942e9f","navUser.runLocally": "a3c522448148","navUser.logOut": "6e78c91f5a05",- "navStorage.get100": "1c95a5e683f0",- "navStorage.upgradeTip": "780df3699385",- "navStorage.grace": "cd66ff3d4893",+ "navStorage.upgrade": "a6f47e00e036",+ "navStorage.upgradeTip": "731c972614a2",+ "navStorage.grace": "016a3d7bf5b2","justNow": "a7f8e7cc0d43"},"ko/inspector": {@@ -14241,7 +14213,6 @@"worksWith.body": "59ab665df233","pricing.title": "5cb23e5648fb","pricing.body": "e0d25a257d31",- "pricing.footnote": "ff131f212105","plans.free.name": "75f527181b57","plans.free.detail": "7ccd8cfc31fd","plans.free.body": "e2f7606c3f63",@@ -14250,9 +14221,9 @@"plans.free.storage": "f335e7a25f8f","plans.free.tools": "21e7962cf954","plans.free.subscriptions": "5d318bd27003",- "plans.pro.detail": "5997b57ace53",- "plans.pro.cta": "c3a96fb81821",- "plans.pro.everythingInFree": "b6017dd40013",+ "plans.paid.detail": "588d1e6cd282",+ "plans.paid.cta": "36572be917c8",+ "plans.paid.everythingInFree": "b6017dd40013","local.title": "3345a1fc0d10","local.body": "02b546b1aaf5","local.cta": "752ca6a6cb88",@@ -14676,11 +14647,10 @@"credits.expires": "49370980c228","plans.title": "c0c6a5e91743","plans.subtitle": "e0d25a257d31",- "plans.forIndividuals": "5997b57ace53",- "plans.getPro": "c3a96fb81821",+ "plans.bestValue": "8173c2a946f1",+ "plans.getPlan": "36572be917c8","plans.getProOff": "295f4fc9c6f1","plans.continueFree": "d7f2a5d8710f",- "plans.endsIn": "a0da0d2c6400","plans.covers": "42fa1aae2a8e"},"ko/panels": {@@ -14956,8 +14926,9 @@"header.profileTitle": "ff4fc0276e96","header.billingTitle": "abaec4522bf6","header.billingDescription": "914fef3051a9",- "pro.title": "f1c8c102c152",- "pro.description": "5495817fa21c",+ "pro.title": "ae2f98a099fe",+ "pro.titlePlan": "15d51cbc1b2e",+ "pro.description": "a745bfad7b2a","pro.status": "5b62812ab4f0","pro.promotionUntil": "27fdb4c20e00","pro.promotionOpen": "087aa0c46d34",@@ -14971,28 +14942,12 @@"pro.introDeadline": "ae6031e0a246","pro.opening": "b1b8530bbd68","pro.manage": "a8f311cad04a",- "pro.starting": "e5f58095ac29",- "pro.subscribe": "77785efef3b4","pro.unavailable": "b186f7f39298",+ "pro.seePlans": "5942a8e34b50",+ "pro.upgrade": "a6f47e00e036","credits.title": "bfac50d6424b",- "credits.description": "9a94cfb3dd3d",+ "credits.description": "7fccc8a12022","credits.available": "adba40120954",- "credits.buy": "ce006bc7744a",- "credits.preset": "eddfd9501d05",- "credits.customLabel": "bfac50d6424b",- "credits.starting": "e5f58095ac29",- "credits.buyFor": "b3ad4667116f",- "credits.buyPlain": "7ceca51fcafe",- "credits.checkoutFailed": "8682339e2e39",- "credits.autoReload": "0c7bc417cacd",- "credits.fallsBelow": "0864eacba85f",- "credits.unit": "66c22fad3a99",- "credits.thenBuy": "794326edc420",- "credits.saving": "56a2285c5b11",- "credits.save": "efc007a393f6",- "credits.saveFailed": "a4b714385ae0",- "credits.lastFailed": "635e42ddf409",- "credits.needsCard": "d97d0a162d3a","profile.loadFailed": "bdfbfbff7008","profile.changePicture": "dfad18d203c4","profile.emailVerified": "82f47c3d4dd2",@@ -15237,9 +15192,7 @@"pt-BR/billing": {"notNow": "e45714907316","ok": "9ce3bd4224c8",- "upgradeToPro": "24de9364ba97","subscribeToPro": "77785efef3b4",- "buyCredits": "ce006bc7744a","billingUnavailable": "b186f7f39298","offer.validThrough": "0ecf12b0c552","offer.validFor": "8dde1c13cfdc",@@ -15249,14 +15202,8 @@"offer.subscribeBody": "de520fd661e2","offer.expiresIn": "ae427d76aab6","intro.terms": "6fd1d29c8cca",- "upgrade.outOfCredits": "a1c38f13783e",- "upgrade.proOutBody": "55cf18e9d9fb",- "upgrade.projectsTitle": "3c02b43eeb51",- "upgrade.creditsBody": "c60ee9be065e",- "upgrade.creditsBodyOffer": "1d1fcc02a91f",- "upgrade.proPrice": "776102c2605a",- "upgrade.projectsBodyStarter": "eba35817c210",- "upgrade.projectsBody": "d723067b1c34",+ "upgrade.projectsTitle": "3b2453ea91ca",+ "upgrade.projectsBody": "6244aa81df3b","claim.expiredTitle": "349a90d6289c","claim.alreadyProTitle": "ea2ea0a9f54c","claim.invalidTitle": "6e3dbedfd827",@@ -15278,9 +15225,7 @@"storage.graceToday": "f6aac6ab0664","storage.graceDays": "ed6cc54e50ac","storage.proBody": "e71312927238",- "storage.body": "1f9a45b220d1",- "storage.bodyUsed": "b2a86c5e78ce",- "storage.freeUpTerms": "fdb880aa4c8f",+ "storage.moreTitle": "2693c538224e","subscribeBonus.daysLeft": "cd68d04927cc","subscribeBonus.hoursLeft": "e13c0d72cf69","subscribeBonus.minutesLeft": "689650c998da",@@ -15295,7 +15240,22 @@"storagePill.ends": "445ab1de8416","storagePill.graceTooltip": "7bfa641106ac","storagePill.fullTooltip": "327df386b081",- "storagePill.usedTooltip": "eada16a687e5"+ "storagePill.usedTooltip": "eada16a687e5",+ "plans.chooseTitle": "12a7bc47d455",+ "plans.chooseBody": "c3edcf7d57ac",+ "plans.freeOutTitle": "4deef711ff02",+ "plans.paidOutTitle": "05ce2485705c",+ "plans.paidOutBody": "18f057593944",+ "plans.topOutTitle": "713a8c79ed21",+ "plans.bestValue": "8173c2a946f1",+ "plans.billedMonthly": "cad51bd43867",+ "plans.introThen": "49e300236000",+ "plans.stickerPercent": "e5544c338932",+ "plans.stickerOff": "da7a68734367",+ "plans.get": "36572be917c8",+ "plans.upgrade": "413370c98be7",+ "plans.current": "ec5cfba8f01b",+ "plans.footer": "38d6bda2e5b1"},"pt-BR/chat": {"panel.signInToChat": "8b2dd174b118",@@ -15323,7 +15283,7 @@"panel.suggestions.rewriteSubtitles": "2cee64e1073c","panel.suggestions.writeCaption": "01a1a3898f85","panel.workingEllipsis": "13b7bfcac438",- "panel.insufficientCredits": "e15f6be1ed5d",+ "panel.insufficientCredits": "5235be5a36d8","panel.dropToAttach": "38abf08e4d2e","panel.composerPlaceholder": "791258063545","panel.dictate": "3eaff69c9844",@@ -15416,7 +15376,7 @@"dictation.dictate": "3eaff69c9844","searchSuggestions.frameTitle": "bbb64126903f","hostedError.insufficientCredits": "9b9a2f420125",- "hostedError.insufficientCreditsReload": "7e6fd639cae5",+ "hostedError.insufficientCreditsReload": "773bec8a334f","hostedError.failed": "254aaf43068e"},"pt-BR/chatgpt": {@@ -15514,17 +15474,20 @@"pagination.nextLabel": "fd7164f9ddd6","pagination.morePages": "1fd2b5b554e8","dialog.close": "bbfa773e5a63",- "proPlan.body": "b7bf628ebb51",- "proPlan.price": "b165a8f90133",- "proPlan.storage": "d4e5dec4a8ce",- "proPlan.credits": "7df8b6d4a682",- "proPlan.generation": "7376fe93be16",+ "plans.body": "57d21eaacba0",+ "plans.price": "b165a8f90133",+ "plans.perMonth": "ab0cc392942e",+ "plans.storage": "d4e5dec4a8ce",+ "plans.credits": "7df8b6d4a682",+ "plans.generation": "7376fe93be16",+ "plans.unlimitedProjects": "fe488690362a",+ "plans.renders": "72b9acc487f5",+ "plans.everythingIn": "f67ac7338f1b","apiErrors.checkout_no_url": "d53bd869274d",- "apiErrors.credit_amount_out_of_range": "73902c89a404",- "apiErrors.auto_reload_invalid": "efb00868e5ca",- "apiErrors.no_payment_method": "6ba414ee3707","apiErrors.unsupported_image_type": "73cf38d0e3e1","apiErrors.image_too_large": "3fdb4028f18f",+ "apiErrors.plan_not_an_upgrade": "d968260313e6",+ "apiErrors.upgrade_payment_failed": "9f81fe318848","languageSaveFailed": "8d8a247bafe6","languageBlocked": "6cdf84383309"},@@ -16470,9 +16433,9 @@"navUser.onboarding": "c71537942e9f","navUser.runLocally": "a3c522448148","navUser.logOut": "6e78c91f5a05",- "navStorage.get100": "1c95a5e683f0",- "navStorage.upgradeTip": "780df3699385",- "navStorage.grace": "cd66ff3d4893",+ "navStorage.upgrade": "a6f47e00e036",+ "navStorage.upgradeTip": "731c972614a2",+ "navStorage.grace": "016a3d7bf5b2","justNow": "a7f8e7cc0d43"},"pt-BR/inspector": {@@ -17280,7 +17243,6 @@"worksWith.body": "59ab665df233","pricing.title": "5cb23e5648fb","pricing.body": "e0d25a257d31",- "pricing.footnote": "ff131f212105","plans.free.name": "75f527181b57","plans.free.detail": "7ccd8cfc31fd","plans.free.body": "e2f7606c3f63",@@ -17289,9 +17251,9 @@"plans.free.storage": "f335e7a25f8f","plans.free.tools": "21e7962cf954","plans.free.subscriptions": "5d318bd27003",- "plans.pro.detail": "5997b57ace53",- "plans.pro.cta": "c3a96fb81821",- "plans.pro.everythingInFree": "b6017dd40013",+ "plans.paid.detail": "588d1e6cd282",+ "plans.paid.cta": "36572be917c8",+ "plans.paid.everythingInFree": "b6017dd40013","local.title": "3345a1fc0d10","local.body": "02b546b1aaf5","local.cta": "752ca6a6cb88",@@ -17715,11 +17677,10 @@"credits.expires": "49370980c228","plans.title": "c0c6a5e91743","plans.subtitle": "e0d25a257d31",- "plans.forIndividuals": "5997b57ace53",- "plans.getPro": "c3a96fb81821",+ "plans.bestValue": "8173c2a946f1",+ "plans.getPlan": "36572be917c8","plans.getProOff": "295f4fc9c6f1","plans.continueFree": "d7f2a5d8710f",- "plans.endsIn": "a0da0d2c6400","plans.covers": "42fa1aae2a8e"},"pt-BR/panels": {@@ -17995,8 +17956,9 @@"header.profileTitle": "ff4fc0276e96","header.billingTitle": "abaec4522bf6","header.billingDescription": "914fef3051a9",- "pro.title": "f1c8c102c152",- "pro.description": "5495817fa21c",+ "pro.title": "ae2f98a099fe",+ "pro.titlePlan": "15d51cbc1b2e",+ "pro.description": "a745bfad7b2a","pro.status": "5b62812ab4f0","pro.promotionUntil": "27fdb4c20e00","pro.promotionOpen": "087aa0c46d34",@@ -18010,28 +17972,12 @@"pro.introDeadline": "ae6031e0a246","pro.opening": "b1b8530bbd68","pro.manage": "a8f311cad04a",- "pro.starting": "e5f58095ac29",- "pro.subscribe": "77785efef3b4","pro.unavailable": "b186f7f39298",+ "pro.seePlans": "5942a8e34b50",+ "pro.upgrade": "a6f47e00e036","credits.title": "bfac50d6424b",- "credits.description": "9a94cfb3dd3d",+ "credits.description": "7fccc8a12022","credits.available": "adba40120954",- "credits.buy": "ce006bc7744a",- "credits.preset": "eddfd9501d05",- "credits.customLabel": "bfac50d6424b",- "credits.starting": "e5f58095ac29",- "credits.buyFor": "b3ad4667116f",- "credits.buyPlain": "7ceca51fcafe",- "credits.checkoutFailed": "8682339e2e39",- "credits.autoReload": "0c7bc417cacd",- "credits.fallsBelow": "0864eacba85f",- "credits.unit": "66c22fad3a99",- "credits.thenBuy": "794326edc420",- "credits.saving": "56a2285c5b11",- "credits.save": "efc007a393f6",- "credits.saveFailed": "a4b714385ae0",- "credits.lastFailed": "635e42ddf409",- "credits.needsCard": "d97d0a162d3a","profile.loadFailed": "bdfbfbff7008","profile.changePicture": "dfad18d203c4","profile.emailVerified": "82f47c3d4dd2",@@ -18276,9 +18222,7 @@"zh-CN/billing": {"notNow": "e45714907316","ok": "9ce3bd4224c8",- "upgradeToPro": "24de9364ba97","subscribeToPro": "77785efef3b4",- "buyCredits": "ce006bc7744a","billingUnavailable": "b186f7f39298","offer.validThrough": "0ecf12b0c552","offer.validFor": "8dde1c13cfdc",@@ -18288,14 +18232,8 @@"offer.subscribeBody": "de520fd661e2","offer.expiresIn": "ae427d76aab6","intro.terms": "6fd1d29c8cca",- "upgrade.outOfCredits": "a1c38f13783e",- "upgrade.proOutBody": "55cf18e9d9fb",- "upgrade.projectsTitle": "3c02b43eeb51",- "upgrade.creditsBody": "c60ee9be065e",- "upgrade.creditsBodyOffer": "1d1fcc02a91f",- "upgrade.proPrice": "776102c2605a",- "upgrade.projectsBodyStarter": "eba35817c210",- "upgrade.projectsBody": "d723067b1c34",+ "upgrade.projectsTitle": "3b2453ea91ca",+ "upgrade.projectsBody": "6244aa81df3b","claim.expiredTitle": "349a90d6289c","claim.alreadyProTitle": "ea2ea0a9f54c","claim.invalidTitle": "6e3dbedfd827",@@ -18317,9 +18255,7 @@"storage.graceToday": "f6aac6ab0664","storage.graceDays": "ed6cc54e50ac","storage.proBody": "e71312927238",- "storage.body": "1f9a45b220d1",- "storage.bodyUsed": "b2a86c5e78ce",- "storage.freeUpTerms": "fdb880aa4c8f",+ "storage.moreTitle": "2693c538224e","subscribeBonus.daysLeft": "cd68d04927cc","subscribeBonus.hoursLeft": "e13c0d72cf69","subscribeBonus.minutesLeft": "689650c998da",@@ -18334,7 +18270,22 @@"storagePill.ends": "445ab1de8416","storagePill.graceTooltip": "7bfa641106ac","storagePill.fullTooltip": "327df386b081",- "storagePill.usedTooltip": "eada16a687e5"+ "storagePill.usedTooltip": "eada16a687e5",+ "plans.chooseTitle": "12a7bc47d455",+ "plans.chooseBody": "c3edcf7d57ac",+ "plans.freeOutTitle": "4deef711ff02",+ "plans.paidOutTitle": "05ce2485705c",+ "plans.paidOutBody": "18f057593944",+ "plans.topOutTitle": "713a8c79ed21",+ "plans.bestValue": "8173c2a946f1",+ "plans.billedMonthly": "cad51bd43867",+ "plans.introThen": "49e300236000",+ "plans.stickerPercent": "e5544c338932",+ "plans.stickerOff": "da7a68734367",+ "plans.get": "36572be917c8",+ "plans.upgrade": "413370c98be7",+ "plans.current": "ec5cfba8f01b",+ "plans.footer": "38d6bda2e5b1"},"zh-CN/chat": {"panel.signInToChat": "8b2dd174b118",@@ -18362,7 +18313,7 @@"panel.suggestions.rewriteSubtitles": "2cee64e1073c","panel.suggestions.writeCaption": "01a1a3898f85","panel.workingEllipsis": "13b7bfcac438",- "panel.insufficientCredits": "e15f6be1ed5d",+ "panel.insufficientCredits": "5235be5a36d8","panel.dropToAttach": "38abf08e4d2e","panel.composerPlaceholder": "791258063545","panel.dictate": "3eaff69c9844",@@ -18455,7 +18406,7 @@"dictation.dictate": "3eaff69c9844","searchSuggestions.frameTitle": "bbb64126903f","hostedError.insufficientCredits": "9b9a2f420125",- "hostedError.insufficientCreditsReload": "7e6fd639cae5",+ "hostedError.insufficientCreditsReload": "773bec8a334f","hostedError.failed": "254aaf43068e"},"zh-CN/chatgpt": {@@ -18553,17 +18504,20 @@"pagination.nextLabel": "fd7164f9ddd6","pagination.morePages": "1fd2b5b554e8","dialog.close": "bbfa773e5a63",- "proPlan.body": "b7bf628ebb51",- "proPlan.price": "b165a8f90133",- "proPlan.storage": "d4e5dec4a8ce",- "proPlan.credits": "7df8b6d4a682",- "proPlan.generation": "7376fe93be16",+ "plans.body": "57d21eaacba0",+ "plans.price": "b165a8f90133",+ "plans.perMonth": "ab0cc392942e",+ "plans.storage": "d4e5dec4a8ce",+ "plans.credits": "7df8b6d4a682",+ "plans.generation": "7376fe93be16",+ "plans.unlimitedProjects": "fe488690362a",+ "plans.renders": "72b9acc487f5",+ "plans.everythingIn": "f67ac7338f1b","apiErrors.checkout_no_url": "d53bd869274d",- "apiErrors.credit_amount_out_of_range": "73902c89a404",- "apiErrors.auto_reload_invalid": "efb00868e5ca",- "apiErrors.no_payment_method": "6ba414ee3707","apiErrors.unsupported_image_type": "73cf38d0e3e1","apiErrors.image_too_large": "3fdb4028f18f",+ "apiErrors.plan_not_an_upgrade": "d968260313e6",+ "apiErrors.upgrade_payment_failed": "9f81fe318848","languageSaveFailed": "8d8a247bafe6","languageBlocked": "6cdf84383309"},@@ -19509,9 +19463,9 @@"navUser.onboarding": "c71537942e9f","navUser.runLocally": "a3c522448148","navUser.logOut": "6e78c91f5a05",- "navStorage.get100": "1c95a5e683f0",- "navStorage.upgradeTip": "780df3699385",- "navStorage.grace": "cd66ff3d4893",+ "navStorage.upgrade": "a6f47e00e036",+ "navStorage.upgradeTip": "731c972614a2",+ "navStorage.grace": "016a3d7bf5b2","justNow": "a7f8e7cc0d43"},"zh-CN/inspector": {@@ -20319,7 +20273,6 @@"worksWith.body": "59ab665df233","pricing.title": "5cb23e5648fb","pricing.body": "e0d25a257d31",- "pricing.footnote": "ff131f212105","plans.free.name": "75f527181b57","plans.free.detail": "7ccd8cfc31fd","plans.free.body": "e2f7606c3f63",@@ -20328,9 +20281,9 @@"plans.free.storage": "f335e7a25f8f","plans.free.tools": "21e7962cf954","plans.free.subscriptions": "5d318bd27003",- "plans.pro.detail": "5997b57ace53",- "plans.pro.cta": "c3a96fb81821",- "plans.pro.everythingInFree": "b6017dd40013",+ "plans.paid.detail": "588d1e6cd282",+ "plans.paid.cta": "36572be917c8",+ "plans.paid.everythingInFree": "b6017dd40013","local.title": "3345a1fc0d10","local.body": "02b546b1aaf5","local.cta": "752ca6a6cb88",@@ -20754,11 +20707,10 @@"credits.expires": "49370980c228","plans.title": "c0c6a5e91743","plans.subtitle": "e0d25a257d31",- "plans.forIndividuals": "5997b57ace53",- "plans.getPro": "c3a96fb81821",+ "plans.bestValue": "8173c2a946f1",+ "plans.getPlan": "36572be917c8","plans.getProOff": "295f4fc9c6f1","plans.continueFree": "d7f2a5d8710f",- "plans.endsIn": "a0da0d2c6400","plans.covers": "42fa1aae2a8e"},"zh-CN/panels": {@@ -21034,8 +20986,9 @@"header.profileTitle": "ff4fc0276e96","header.billingTitle": "abaec4522bf6","header.billingDescription": "914fef3051a9",- "pro.title": "f1c8c102c152",- "pro.description": "5495817fa21c",+ "pro.title": "ae2f98a099fe",+ "pro.titlePlan": "15d51cbc1b2e",+ "pro.description": "a745bfad7b2a","pro.status": "5b62812ab4f0","pro.promotionUntil": "27fdb4c20e00","pro.promotionOpen": "087aa0c46d34",@@ -21049,28 +21002,12 @@"pro.introDeadline": "ae6031e0a246","pro.opening": "b1b8530bbd68","pro.manage": "a8f311cad04a",- "pro.starting": "e5f58095ac29",- "pro.subscribe": "77785efef3b4","pro.unavailable": "b186f7f39298",+ "pro.seePlans": "5942a8e34b50",+ "pro.upgrade": "a6f47e00e036","credits.title": "bfac50d6424b",- "credits.description": "9a94cfb3dd3d",+ "credits.description": "7fccc8a12022","credits.available": "adba40120954",- "credits.buy": "ce006bc7744a",- "credits.preset": "eddfd9501d05",- "credits.customLabel": "bfac50d6424b",- "credits.starting": "e5f58095ac29",- "credits.buyFor": "b3ad4667116f",- "credits.buyPlain": "7ceca51fcafe",- "credits.checkoutFailed": "8682339e2e39",- "credits.autoReload": "0c7bc417cacd",- "credits.fallsBelow": "0864eacba85f",- "credits.unit": "66c22fad3a99",- "credits.thenBuy": "794326edc420",- "credits.saving": "56a2285c5b11",- "credits.save": "efc007a393f6",- "credits.saveFailed": "a4b714385ae0",- "credits.lastFailed": "635e42ddf409",- "credits.needsCard": "d97d0a162d3a","profile.loadFailed": "bdfbfbff7008","profile.changePicture": "dfad18d203c4","profile.emailVerified": "82f47c3d4dd2",diff --git a/site/src/i18n/messages/de/billing.json b/site/src/i18n/messages/de/billing.jsonindex 47f3383c..f6ab7d70 100644--- a/site/src/i18n/messages/de/billing.json+++ b/site/src/i18n/messages/de/billing.json@@ -1,9 +1,7 @@{"notNow": "Nicht jetzt","ok": "OK",- "upgradeToPro": "Upgrade auf Pro","subscribeToPro": "Pro abonnieren",- "buyCredits": "Credits kaufen","billingUnavailable": "Abrechnung ist gerade nicht verfügbar.","offer": {"validThrough": "Zusätzliche Credits sind gültig bis {date}.",@@ -18,14 +16,8 @@"terms": "{months, plural, one {{percent} % Rabatt: {price} für deinen ersten Monat, danach {full}/Monat.} other {{percent} % Rabatt: {price}/Monat für deine ersten # Monate, danach {full}/Monat.}}"},"upgrade": {- "outOfCredits": "Du hast keine Credits mehr",- "proOutBody": "Deine Pro-Credits für diesen Monat sind aufgebraucht. Kaufe mehr, um weiter zu generieren.",- "projectsTitle": "Upgrade für mehr Projekte",- "creditsBody": "Upgrade auf Pro und erhalte jeden Monat {credits} sowie 100 GB Cloud-Speicher für {price}.",- "creditsBodyOffer": "Upgrade auf Pro und erhalte jeden Monat {credits} sowie 100 GB Cloud-Speicher.",- "proPrice": "Pro kostet {price}.",- "projectsBodyStarter": "Im kostenlosen Tarif bleibt dein Starter-Projekt erhalten. Mit Pro erstellst du so viele, wie du brauchst.",- "projectsBody": "Im kostenlosen Tarif bleibt neben deinem Starter-Projekt {count, plural, one {# weiteres Projekt} other {# weitere Projekte}} erhalten. Mit Pro erstellst du so viele, wie du brauchst."+ "projectsTitle": "Hol dir unbegrenzte Projekte",+ "projectsBody": "Pro und Max haben kein Projektlimit."},"claim": {"expiredTitle": "Dieses Angebot ist abgelaufen",@@ -51,9 +43,7 @@"graceToday": "Dein Pro-Abo ist abgelaufen. Deine ältesten Cloud-Projekte werden heute gelöscht, sofern du kein Upgrade durchführst oder {bytes} freigibst.","graceDays": "Dein Pro-Abo ist abgelaufen. Deine ältesten Cloud-Projekte werden in {days, plural, one {# Tag} other {# Tagen}} gelöscht, sofern du kein Upgrade durchführst oder {bytes} freigibst.","proBody": "Gib Speicherplatz frei, indem du nicht mehr benötigte Projekte oder Medien löschst.",- "body": "Pro enthält 100 GB Cloud-Speicher.",- "bodyUsed": "Du hast {used} von {quota} belegt. Pro enthält 100 GB Cloud-Speicher.",- "freeUpTerms": "Oder gib Speicherplatz frei, indem du nicht mehr benötigte Projekte und Medien löschst."+ "moreTitle": "Hol dir mehr Cloud-Speicher"},"subscribeBonus": {"daysLeft": "{count}d übrig",@@ -75,5 +65,22 @@"graceTooltip": "Dein Pro-Abo ist abgelaufen und du hast das kostenlose Limit überschritten. Führe ein Upgrade durch oder gib Speicherplatz frei, bevor deine ältesten Projekte gelöscht werden.","fullTooltip": "Dein Cloud-Speicher ist voll. Führe ein Upgrade durch oder gib Speicherplatz frei, um weiter hochzuladen.","usedTooltip": "{used} von {quota} Cloud-Speicher belegt."+ },+ "plans": {+ "chooseTitle": "Wähle deinen Plan",+ "chooseBody": "Jeder Plan bringt dir monatlich KI-Guthaben und mehr Cloud-Speicher.",+ "freeOutTitle": "Wähle ein Abo, um weiter zu generieren",+ "paidOutTitle": "Upgrade noch heute für mehr Credits",+ "paidOutBody": "Deine {plan}-Credits werden am {date} aufgeladen.",+ "topOutTitle": "Deine {plan}-Credits werden am {date} aufgeladen",+ "bestValue": "Bestes Angebot",+ "billedMonthly": "Monatliche Abrechnung",+ "introThen": "{months, plural, one {Erster Monat, danach {price}/Monat} other {Erste # Monate, danach {price}/Monat}}",+ "stickerPercent": "{percent}%",+ "stickerOff": "Rabatt",+ "get": "{plan} holen",+ "upgrade": "Upgrade auf {plan}",+ "current": "Aktueller Plan",+ "footer": "Preise in USD. Pläne verlängern sich monatlich, bis du kündigst. Bei einem Upgrade wird die Differenz heute berechnet."}}diff --git a/site/src/i18n/messages/de/chat.json b/site/src/i18n/messages/de/chat.jsonindex 1829b842..f9ef1080 100644--- a/site/src/i18n/messages/de/chat.json+++ b/site/src/i18n/messages/de/chat.json@@ -27,7 +27,7 @@"writeCaption": "Post-Beschreibung + Tags verfassen"},"workingEllipsis": "Wird bearbeitet…",- "insufficientCredits": "Nicht genügend Guthaben – <link>Guthaben aufladen</link>",+ "insufficientCredits": "Nicht genügend Guthaben – <link>Pläne ansehen</link>","dropToAttach": "Zum Anhängen ablegen","composerPlaceholder": "Frag etwas zu deinem Video oder sag mir, was geändert werden soll… @ verweist auf Dateien, Ordner und Notizen","dictate": "Diktieren",@@ -140,7 +140,7 @@},"hostedError": {"insufficientCredits": "Nicht genügend Guthaben",- "insufficientCreditsReload": "Nicht genügend Guthaben, <link>hier aufladen</link>",+ "insufficientCreditsReload": "Nicht genügend Guthaben, <link>Pläne ansehen</link>","failed": "Fehlgeschlagen."}}diff --git a/site/src/i18n/messages/de/common.json b/site/src/i18n/messages/de/common.jsonindex 19182239..41f4e6ea 100644--- a/site/src/i18n/messages/de/common.json+++ b/site/src/i18n/messages/de/common.json@@ -27,20 +27,23 @@"dialog": {"close": "Schließen"},- "proPlan": {- "body": "Generiere Rich Media mit KI.",+ "plans": {+ "body": "{plan, select, plus {Teste KI-Generierung für ein kleines Budget.} pro {Generiere vielfältige Medien mit KI.} other {Für intensive KI-Generierung, jeden Monat.}}","price": "{price}/Monat",+ "perMonth": "/Monat","storage": "{gb, number} GB Cloud-Speicher","credits": "{credits} KI-Credits jeden Monat",- "generation": "Bild-, Video-, Voiceover- und Musikgenerierung"+ "generation": "Generierung von Bildern, Videos, Voiceover und Musik",+ "unlimitedProjects": "Unbegrenzte Projekte",+ "renders": "{count, number} Exporte und Importe pro Tag",+ "everythingIn": "Alles aus {plan}"},"apiErrors": {"checkout_no_url": "Stripe hat keine URL zurückgegeben.",- "credit_amount_out_of_range": "Wähle zwischen {min} und {max}, in vollen Tausendern.",- "auto_reload_invalid": "Gib enabled, thresholdDollars und amountDollars an.",- "no_payment_method": "Kaufe einmalig Credits, um eine Karte zu speichern, und aktiviere dann das automatische Aufladen.","unsupported_image_type": "Nicht unterstütztes Bildformat.",- "image_too_large": "Bild zu groß."+ "image_too_large": "Bild zu groß.",+ "plan_not_an_upgrade": "Dieses Konto nutzt bereits diesen oder einen höheren Plan.",+ "upgrade_payment_failed": "Deine Karte wurde abgelehnt, daher wurde dein Plan nicht geändert. Aktualisiere deine Karte unter Abrechnung und versuche es erneut."},"languageSaveFailed": "Deine Sprache konnte nicht gespeichert werden. Versuch es noch einmal.","languageBlocked": "Dieser Browser speichert keine Cookies, daher kann die Sprache nicht geändert werden."diff --git a/site/src/i18n/messages/de/home.json b/site/src/i18n/messages/de/home.jsonindex 176c9d12..ff322ed4 100644--- a/site/src/i18n/messages/de/home.json+++ b/site/src/i18n/messages/de/home.json@@ -260,9 +260,9 @@"logOut": "Abmelden"},"navStorage": {- "get100": "100 GB holen",- "upgradeTip": "Upgrade für 100 GB + KI-Credits",- "grace": "Dein Pro-Abo ist abgelaufen. Mach ein Upgrade oder gib {size} frei, bevor deine ältesten Projekte gelöscht werden."+ "upgrade": "Upgrade",+ "upgradeTip": "Sieh dir Pläne mit mehr Speicherplatz und KI-Credits an",+ "grace": "Dein Abo ist abgelaufen. Mach ein Upgrade oder gib {size} frei, bevor deine ältesten Projekte gelöscht werden."},"justNow": "gerade eben"}diff --git a/site/src/i18n/messages/de/landing.json b/site/src/i18n/messages/de/landing.jsonindex b8ec5c0e..35e82340 100644--- a/site/src/i18n/messages/de/landing.json+++ b/site/src/i18n/messages/de/landing.json@@ -20,8 +20,7 @@},"pricing": {"title": "Einfache <italic>Preise</italic>",- "body": "Der Editor ist kostenlos. Zahle nur für KI-generierte Medien.",- "footnote": "* Guthaben für KI-generierte Inhalte kannst du jederzeit nachkaufen."+ "body": "Der Editor ist kostenlos. Zahle nur für KI-generierte Medien."},"plans": {"free": {@@ -34,9 +33,9 @@"tools": "Import, Export und lokale Transkription","subscriptions": "Verbinde dein Claude- oder Codex-Abo"},- "pro": {- "detail": "Für Einzelpersonen",- "cta": "Pro holen",+ "paid": {+ "detail": "{plan, select, plus {Zum Einstieg} pro {Bester Wert} other {Für intensives Generieren}}",+ "cta": "{plan} holen","everythingInFree": "Alles aus Free"}},diff --git a/site/src/i18n/messages/de/onboarding.json b/site/src/i18n/messages/de/onboarding.jsonindex 055a1251..8ef5f54a 100644--- a/site/src/i18n/messages/de/onboarding.json+++ b/site/src/i18n/messages/de/onboarding.json@@ -51,11 +51,10 @@"plans": {"title": "Einfache Preise","subtitle": "Der Editor ist kostenlos. Zahle nur für KI-generierte Medien.",- "forIndividuals": "Für Einzelpersonen",- "getPro": "Pro holen",+ "bestValue": "Bester Wert",+ "getPlan": "Hol dir {plan}","getProOff": "{percent} % Rabatt auf Pro sichern","continueFree": "Kostenlos weitermachen",- "endsIn": "{percent} % Rabatt endet in {hours}h {minutes}m {seconds}s","covers": "{months, plural, one {Für deinen ersten Monat, danach {price}/Monat} other {Pro Monat für deine ersten # Monate, danach {price}/Monat}}"}}diff --git a/site/src/i18n/messages/de/settings.json b/site/src/i18n/messages/de/settings.jsonindex c2129fa1..405b41ba 100644--- a/site/src/i18n/messages/de/settings.json+++ b/site/src/i18n/messages/de/settings.json@@ -17,8 +17,9 @@"billingDescription": "Dein Abo und dein Credit-Guthaben."},"pro": {- "title": "Donkey Pro",- "description": "Ein monatliches Nutzungskontingent, das sich jeden Monat erneuert – du kannst jederzeit zusätzliche Credits kaufen.",+ "title": "Tarif",+ "titlePlan": "Donkey {plan}",+ "description": "Ein monatliches Nutzungskontingent, das jeden Monat zurückgesetzt wird.","status": "{status, select, active {aktiv} trialing {Testphase} past_due {überfällig} canceled {gekündigt} incomplete {unvollständig} unpaid {unbezahlt} other {{status}}}","promotionUntil": "<b>Hol dir Pro bis zum {day}</b> und jeder Monat, der bis dahin beginnt, enthält {allowance}, {multiplier}× so viel wie die üblichen {usual}.","promotionOpen": "Jeder Monat enthält aktuell {allowance}, {multiplier}× so viel wie die üblichen {usual}.",@@ -32,30 +33,14 @@"introDeadline": "{terms} Abonniere bis zum {deadline}.","opening": "Wird geöffnet…","manage": "Abrechnung verwalten",- "starting": "Wird gestartet…",- "subscribe": "Pro abonnieren",- "unavailable": "Abrechnung ist momentan nicht verfügbar."+ "unavailable": "Abrechnung ist momentan nicht verfügbar.",+ "seePlans": "Tarife ansehen",+ "upgrade": "Upgraden"},"credits": {"title": "Credits",- "description": "Nutzungsbasiertes Guthaben für die Donkey-App. Jederzeit nachkaufbar.",- "available": "Verfügbares Guthaben",- "buy": "Credits kaufen",- "preset": "{credits} · {price}",- "customLabel": "Credits",- "starting": "Wird gestartet…",- "buyFor": "Für {price} kaufen",- "buyPlain": "Kaufen",- "checkoutFailed": "Checkout konnte nicht gestartet werden. Versuch es gleich noch einmal.",- "autoReload": "Automatisch aufladen, wenn das Guthaben zur Neige geht",- "fallsBelow": "Wenn das Guthaben fällt unter",- "unit": "Credits",- "thenBuy": "automatisch kaufen",- "saving": "Wird gespeichert…",- "save": "Speichern",- "saveFailed": "Automatisches Aufladen konnte nicht gespeichert werden. Versuch es gleich noch einmal.",- "lastFailed": "Letztes automatisches Aufladen fehlgeschlagen: {error}",- "needsCard": "Automatisches Aufladen erfordert eine gespeicherte Karte. <buy>Kaufe einmalig Credits</buy>, um eine zu hinterlegen, und aktiviere dies dann."+ "description": "Dein Guthaben für KI-Funktionen. Plus, Pro und Max laden jeden Monat Credits auf.",+ "available": "Verfügbares Guthaben"},"profile": {"loadFailed": "Dein Profil konnte nicht geladen werden.",diff --git a/site/src/i18n/messages/en/billing.json b/site/src/i18n/messages/en/billing.jsonindex e7fe8d98..5270eba6 100644--- a/site/src/i18n/messages/en/billing.json+++ b/site/src/i18n/messages/en/billing.json@@ -1,9 +1,7 @@{"notNow": "Not now","ok": "OK",- "upgradeToPro": "Upgrade to Pro","subscribeToPro": "Subscribe to Pro",- "buyCredits": "Buy credits","billingUnavailable": "Billing is unavailable right now.","offer": {"validThrough": "Extra credits are valid through {date}.",@@ -18,14 +16,8 @@"terms": "{months, plural, one {{percent}% off: {price} for your first month, then {full}/month.} other {{percent}% off: {price}/month for your first # months, then {full}/month.}}"},"upgrade": {- "outOfCredits": "You're out of credits",- "proOutBody": "This month's Pro credits are spent. Buy more to keep generating.",- "projectsTitle": "Upgrade to make more projects",- "creditsBody": "Upgrade to Pro and get {credits} every month and 100 GB of cloud storage for {price}.",- "creditsBodyOffer": "Upgrade to Pro and get {credits} every month and 100 GB of cloud storage.",- "proPrice": "Pro is {price}.",- "projectsBodyStarter": "The free plan keeps your starter project. Pro makes as many as you need.",- "projectsBody": "The free plan keeps {count, plural, one {# project} other {# projects}} besides your starter. Pro makes as many as you need."+ "projectsTitle": "Get unlimited projects",+ "projectsBody": "Pro and Max have no project limit."},"claim": {"expiredTitle": "This offer has expired",@@ -51,9 +43,7 @@"graceToday": "Your Pro plan ended. Your oldest cloud projects will be deleted today unless you upgrade or free {bytes}.","graceDays": "Your Pro plan ended. Your oldest cloud projects will be deleted in {days, plural, one {# day} other {# days}} unless you upgrade or free {bytes}.","proBody": "Free up space by deleting projects or media you no longer need.",- "body": "Pro includes 100 GB of cloud storage.",- "bodyUsed": "You've used {used} of {quota}. Pro includes 100 GB of cloud storage.",- "freeUpTerms": "Or free up space by deleting projects and media you no longer need."+ "moreTitle": "Get more cloud storage"},"subscribeBonus": {"daysLeft": "{count}d left",@@ -75,5 +65,22 @@"graceTooltip": "Your Pro plan ended and you're over the free limit. Upgrade or free up space before your oldest projects are deleted.","fullTooltip": "You've run out of cloud storage. Upgrade or free up space to keep uploading.","usedTooltip": "{used} of {quota} of cloud storage used."+ },+ "plans": {+ "chooseTitle": "Choose your plan",+ "chooseBody": "Every plan adds AI credits each month and more cloud storage.",+ "freeOutTitle": "Pick a plan to keep generating",+ "paidOutTitle": "Upgrade for more credits today",+ "paidOutBody": "Your {plan} credits refill on {date}.",+ "topOutTitle": "Your {plan} credits refill on {date}",+ "bestValue": "Best value",+ "billedMonthly": "Billed monthly",+ "introThen": "{months, plural, one {First month, then {price}/month} other {First # months, then {price}/month}}",+ "stickerPercent": "{percent}%",+ "stickerOff": "off",+ "get": "Get {plan}",+ "upgrade": "Upgrade to {plan}",+ "current": "Current plan",+ "footer": "Prices in USD. Plans renew monthly until you cancel. Moving up a plan charges the difference today."}}diff --git a/site/src/i18n/messages/en/chat.json b/site/src/i18n/messages/en/chat.jsonindex b885b55a..8795b242 100644--- a/site/src/i18n/messages/en/chat.json+++ b/site/src/i18n/messages/en/chat.json@@ -27,7 +27,7 @@"writeCaption": "Write my post caption + tags"},"workingEllipsis": "Working…",- "insufficientCredits": "Insufficient credits — <link>reload credits</link>",+ "insufficientCredits": "Insufficient credits — <link>see plans</link>","dropToAttach": "Drop to attach","composerPlaceholder": "Ask about your video, or tell me what to change… @ references files, folders, and notes","dictate": "Dictate",@@ -140,7 +140,7 @@},"hostedError": {"insufficientCredits": "Insufficient credits",- "insufficientCreditsReload": "Insufficient credits, <link>reload here</link>",+ "insufficientCreditsReload": "Insufficient credits, <link>see plans</link>","failed": "Failed."}}diff --git a/site/src/i18n/messages/en/common.json b/site/src/i18n/messages/en/common.jsonindex 04d49112..9d239a39 100644--- a/site/src/i18n/messages/en/common.json+++ b/site/src/i18n/messages/en/common.json@@ -27,20 +27,23 @@"dialog": {"close": "Close"},- "proPlan": {- "body": "Generate rich media with AI.",+ "plans": {+ "body": "{plan, select, plus {Try AI generation on a small budget.} pro {Generate rich media with AI.} other {For heavy AI generation, every month.}}","price": "{price}/month",+ "perMonth": "/month","storage": "{gb, number} GB of cloud storage","credits": "{credits} AI credits every month",- "generation": "Image, video, voiceover, and music generation"+ "generation": "Image, video, voiceover, and music generation",+ "unlimitedProjects": "Unlimited projects",+ "renders": "{count, number} exports and imports a day",+ "everythingIn": "Everything in {plan}"},"apiErrors": {"checkout_no_url": "Stripe did not return a URL.",- "credit_amount_out_of_range": "Choose between {min} and {max}, in whole thousands.",- "auto_reload_invalid": "Provide enabled, thresholdDollars, and amountDollars.",- "no_payment_method": "Buy credits once to save a card, then turn on auto-reload.","unsupported_image_type": "Unsupported image type.",- "image_too_large": "Image too large."+ "image_too_large": "Image too large.",+ "plan_not_an_upgrade": "This account is already on this plan or a higher one.",+ "upgrade_payment_failed": "Your card was declined, so your plan didn't change. Update your card in billing and try again."},"languageSaveFailed": "Couldn't save your language. Try again.","languageBlocked": "This browser isn't saving cookies, so the language can't change."diff --git a/site/src/i18n/messages/en/home.json b/site/src/i18n/messages/en/home.jsonindex 221b8c39..dc57f5f3 100644--- a/site/src/i18n/messages/en/home.json+++ b/site/src/i18n/messages/en/home.json@@ -260,9 +260,9 @@"logOut": "Log out"},"navStorage": {- "get100": "Get 100 GB",- "upgradeTip": "Upgrade for 100 GB + AI credits",- "grace": "Your Pro plan ended. Upgrade or free {size} before your oldest projects are deleted."+ "upgrade": "Upgrade",+ "upgradeTip": "See plans with more storage and AI credits",+ "grace": "Your plan ended. Upgrade or free {size} before your oldest projects are deleted."},"justNow": "just now"}diff --git a/site/src/i18n/messages/en/landing.json b/site/src/i18n/messages/en/landing.jsonindex 887de97b..1d58c6d4 100644--- a/site/src/i18n/messages/en/landing.json+++ b/site/src/i18n/messages/en/landing.json@@ -20,8 +20,7 @@},"pricing": {"title": "Simple <italic>pricing</italic>",- "body": "The editor is free. Pay only for AI generated media.",- "footnote": "* Buy credits for AI generated content at any time."+ "body": "The editor is free. Pay only for AI generated media."},"plans": {"free": {@@ -34,9 +33,9 @@"tools": "Import, export, and local transcription","subscriptions": "Connect your Claude or Codex subscription"},- "pro": {- "detail": "For individuals",- "cta": "Get Pro",+ "paid": {+ "detail": "{plan, select, plus {To get started} pro {Best value} other {For heavy generation}}",+ "cta": "Get {plan}","everythingInFree": "Everything in Free"}},diff --git a/site/src/i18n/messages/en/onboarding.json b/site/src/i18n/messages/en/onboarding.jsonindex d486bca6..feaf97d4 100644--- a/site/src/i18n/messages/en/onboarding.json+++ b/site/src/i18n/messages/en/onboarding.json@@ -51,11 +51,10 @@"plans": {"title": "Simple pricing","subtitle": "The editor is free. Pay only for AI generated media.",- "forIndividuals": "For individuals",- "getPro": "Get Pro",+ "bestValue": "Best value",+ "getPlan": "Get {plan}","getProOff": "Get {percent}% off Pro","continueFree": "Continue with free",- "endsIn": "{percent}% off ends in {hours}h {minutes}m {seconds}s","covers": "{months, plural, one {For your first month, then {price}/month} other {Per month for your first # months, then {price}/month}}"}}diff --git a/site/src/i18n/messages/en/settings.json b/site/src/i18n/messages/en/settings.jsonindex 5af1cdb5..a7486b1a 100644--- a/site/src/i18n/messages/en/settings.json+++ b/site/src/i18n/messages/en/settings.json@@ -17,8 +17,9 @@"billingDescription": "Your subscription and credit balance."},"pro": {- "title": "Donkey Pro",- "description": "A monthly usage allowance that resets each month — you can still buy credits any time.",+ "title": "Plan",+ "titlePlan": "Donkey {plan}",+ "description": "A monthly usage allowance that resets each month.","status": "{status, select, active {active} trialing {trialing} past_due {past_due} canceled {canceled} incomplete {incomplete} unpaid {unpaid} other {{status}}}","promotionUntil": "<b>Get Pro by {day}</b> and every month that starts by then includes {allowance}, {multiplier}× the usual {usual}.","promotionOpen": "Every month currently includes {allowance}, {multiplier}× the usual {usual}.",@@ -32,30 +33,14 @@"introDeadline": "{terms} Subscribe by {deadline}.","opening": "Opening…","manage": "Manage billing",- "starting": "Starting…",- "subscribe": "Subscribe to Pro",- "unavailable": "Billing is unavailable right now."+ "unavailable": "Billing is unavailable right now.",+ "seePlans": "See plans",+ "upgrade": "Upgrade"},"credits": {"title": "Credits",- "description": "Pay-as-you-go balance for the Donkey app. Buy more any time.",- "available": "Available balance",- "buy": "Buy credits",- "preset": "{credits} · {price}",- "customLabel": "Credits",- "starting": "Starting…",- "buyFor": "Buy for {price}",- "buyPlain": "Buy",- "checkoutFailed": "Couldn't start checkout. Try again in a moment.",- "autoReload": "Auto-reload when my balance runs low",- "fallsBelow": "When balance falls below",- "unit": "credits",- "thenBuy": "automatically buy",- "saving": "Saving…",- "save": "Save",- "saveFailed": "Couldn't save auto-reload. Try again in a moment.",- "lastFailed": "Last auto-reload failed: {error}",- "needsCard": "Auto-reload needs a saved card. <buy>Buy credits once</buy> to save one, then turn this on."+ "description": "Your balance for AI features. Plus, Pro, and Max add credits every month.",+ "available": "Available balance"},"profile": {"loadFailed": "Couldn't load your profile.",diff --git a/site/src/i18n/messages/es/billing.json b/site/src/i18n/messages/es/billing.jsonindex 3a4126ea..970a32ba 100644--- a/site/src/i18n/messages/es/billing.json+++ b/site/src/i18n/messages/es/billing.json@@ -1,9 +1,7 @@{"notNow": "Ahora no","ok": "Aceptar",- "upgradeToPro": "Mejora a Pro","subscribeToPro": "Suscríbete a Pro",- "buyCredits": "Comprar créditos","billingUnavailable": "La facturación no está disponible en este momento.","offer": {"validThrough": "Los créditos extra son válidos hasta el {date}.",@@ -18,14 +16,8 @@"terms": "{months, plural, one {{percent}% de descuento: {price} tu primer mes, luego {full}/mes.} other {{percent}% de descuento: {price}/mes durante tus primeros # meses, luego {full}/mes.}}"},"upgrade": {- "outOfCredits": "Te quedaste sin créditos",- "proOutBody": "Se agotaron los créditos Pro de este mes. Compra más para seguir generando.",- "projectsTitle": "Mejora a Pro para crear más proyectos",- "creditsBody": "Mejora a Pro y obtén {credits} cada mes y 100 GB de almacenamiento en la nube por {price}.",- "creditsBodyOffer": "Mejora a Pro y obtén {credits} cada mes y 100 GB de almacenamiento en la nube.",- "proPrice": "Pro cuesta {price}.",- "projectsBodyStarter": "El plan gratuito conserva tu proyecto inicial. Con Pro puedes crear todos los que necesites.",- "projectsBody": "El plan gratuito conserva {count, plural, one {# proyecto} other {# proyectos}} además del inicial. Con Pro puedes crear todos los que necesites."+ "projectsTitle": "Obtén proyectos ilimitados",+ "projectsBody": "Pro y Max no tienen límite de proyectos."},"claim": {"expiredTitle": "Esta oferta ha expirado",@@ -51,9 +43,7 @@"graceToday": "Tu plan Pro terminó. Tus proyectos más antiguos en la nube se eliminarán hoy a menos que mejores tu plan o liberes {bytes}.","graceDays": "Tu plan Pro terminó. Tus proyectos más antiguos en la nube se eliminarán en {days, plural, one {# día} other {# días}} a menos que mejores tu plan o liberes {bytes}.","proBody": "Libera espacio eliminando proyectos o multimedia que ya no necesites.",- "body": "Pro incluye 100 GB de almacenamiento en la nube.",- "bodyUsed": "Has usado {used} de {quota}. Pro incluye 100 GB de almacenamiento en la nube.",- "freeUpTerms": "O libera espacio eliminando proyectos y multimedia que ya no necesites."+ "moreTitle": "Obtén más almacenamiento en la nube"},"subscribeBonus": {"daysLeft": "Quedan {count} d",@@ -75,5 +65,22 @@"graceTooltip": "Tu plan Pro terminó y superaste el límite gratuito. Mejora tu plan o libera espacio antes de que se eliminen tus proyectos más antiguos.","fullTooltip": "Te quedaste sin almacenamiento en la nube. Mejora tu plan o libera espacio para seguir subiendo archivos.","usedTooltip": "{used} de {quota} de almacenamiento en la nube usado."+ },+ "plans": {+ "chooseTitle": "Elige tu plan",+ "chooseBody": "Cada plan añade créditos de IA al mes y más almacenamiento en la nube.",+ "freeOutTitle": "Elige un plan para seguir generando",+ "paidOutTitle": "Mejora tu plan para obtener más créditos hoy",+ "paidOutBody": "Tus créditos de {plan} se recargan el {date}.",+ "topOutTitle": "Tus créditos de {plan} se recargan el {date}",+ "bestValue": "Mejor valor",+ "billedMonthly": "Facturación mensual",+ "introThen": "{months, plural, one {Primer mes, luego {price}/mes} other {Primeros # meses, luego {price}/mes}}",+ "stickerPercent": "{percent} %",+ "stickerOff": "de descuento",+ "get": "Obtener {plan}",+ "upgrade": "Mejorar a {plan}",+ "current": "Plan actual",+ "footer": "Precios en USD. Los planes se renuevan cada mes hasta que canceles. Al mejorar de plan se cobra la diferencia hoy."}}diff --git a/site/src/i18n/messages/es/chat.json b/site/src/i18n/messages/es/chat.jsonindex 9e7f0310..bac55133 100644--- a/site/src/i18n/messages/es/chat.json+++ b/site/src/i18n/messages/es/chat.json@@ -27,7 +27,7 @@"writeCaption": "Escribir pie de publicación + etiquetas"},"workingEllipsis": "Trabajando…",- "insufficientCredits": "Créditos insuficientes — <link>recargar créditos</link>",+ "insufficientCredits": "Créditos insuficientes — <link>ver planes</link>","dropToAttach": "Suelta para adjuntar","composerPlaceholder": "Pregunta sobre tu video o dime qué cambiar… @ hace referencia a archivos, carpetas y notas","dictate": "Dictar",@@ -140,7 +140,7 @@},"hostedError": {"insufficientCredits": "Créditos insuficientes",- "insufficientCreditsReload": "Créditos insuficientes, <link>recarga aquí</link>",+ "insufficientCreditsReload": "Créditos insuficientes, <link>ver planes</link>","failed": "Error."}}diff --git a/site/src/i18n/messages/es/common.json b/site/src/i18n/messages/es/common.jsonindex ba407f39..467be067 100644--- a/site/src/i18n/messages/es/common.json+++ b/site/src/i18n/messages/es/common.json@@ -27,20 +27,23 @@"dialog": {"close": "Cerrar"},- "proPlan": {- "body": "Genera contenido multimedia con IA.",+ "plans": {+ "body": "{plan, select, plus {Prueba la generación con IA con bajo presupuesto.} pro {Genera multimedia enriquecida con IA.} other {Para generación intensiva con IA, cada mes.}}","price": "{price}/mes",+ "perMonth": "/mes","storage": "{gb, number} GB de almacenamiento en la nube","credits": "{credits} créditos de IA cada mes",- "generation": "Generación de imagen, video, voz en off y música"+ "generation": "Generación de imagen, video, locución y música",+ "unlimitedProjects": "Proyectos ilimitados",+ "renders": "{count, number} exportaciones e importaciones al día",+ "everythingIn": "Todo lo incluido en {plan}"},"apiErrors": {"checkout_no_url": "Stripe no devolvió una URL.",- "credit_amount_out_of_range": "Elige entre {min} y {max}, en miles enteros.",- "auto_reload_invalid": "Proporciona enabled, thresholdDollars y amountDollars.",- "no_payment_method": "Compra créditos una vez para guardar una tarjeta y luego activa la recarga automática.","unsupported_image_type": "Tipo de imagen no compatible.",- "image_too_large": "Imagen demasiado grande."+ "image_too_large": "Imagen demasiado grande.",+ "plan_not_an_upgrade": "Esta cuenta ya tiene este plan o uno superior.",+ "upgrade_payment_failed": "Tu tarjeta fue rechazada, así que tu plan no cambió. Actualiza tu tarjeta en facturación e inténtalo de nuevo."},"languageSaveFailed": "No se pudo guardar tu idioma. Inténtalo de nuevo.","languageBlocked": "Este navegador no guarda cookies, así que no se puede cambiar el idioma."diff --git a/site/src/i18n/messages/es/home.json b/site/src/i18n/messages/es/home.jsonindex 3d7112a0..d61a4e3b 100644--- a/site/src/i18n/messages/es/home.json+++ b/site/src/i18n/messages/es/home.json@@ -260,9 +260,9 @@"logOut": "Cerrar sesión"},"navStorage": {- "get100": "Obtén 100 GB",- "upgradeTip": "Mejora tu plan para 100 GB + créditos de IA",- "grace": "Tu plan Pro terminó. Mejora tu plan o libera {size} antes de que se eliminen tus proyectos más antiguos."+ "upgrade": "Mejorar",+ "upgradeTip": "Mira los planes con más almacenamiento y créditos de IA",+ "grace": "Tu plan terminó. Mejora tu plan o libera {size} antes de que se eliminen tus proyectos más antiguos."},"justNow": "ahora mismo"}diff --git a/site/src/i18n/messages/es/landing.json b/site/src/i18n/messages/es/landing.jsonindex c9a8b4ef..b19670f1 100644--- a/site/src/i18n/messages/es/landing.json+++ b/site/src/i18n/messages/es/landing.json@@ -20,8 +20,7 @@},"pricing": {"title": "Precios <italic>simples</italic>",- "body": "El editor es gratis. Paga solo por la multimedia generada con IA.",- "footnote": "* Compra créditos para contenido generado con IA en cualquier momento."+ "body": "El editor es gratis. Paga solo por la multimedia generada con IA."},"plans": {"free": {@@ -34,10 +33,10 @@"tools": "Importación, exportación y transcripción local","subscriptions": "Conecta tu suscripción a Claude o Codex"},- "pro": {- "detail": "Para creadores individuales",- "cta": "Obtén Pro",- "everythingInFree": "Todo lo incluido en Gratis"+ "paid": {+ "detail": "{plan, select, plus {Para empezar} pro {La mejor opción} other {Para generación intensiva}}",+ "cta": "Obtén {plan}",+ "everythingInFree": "Todo lo incluido en Free"}},"local": {diff --git a/site/src/i18n/messages/es/onboarding.json b/site/src/i18n/messages/es/onboarding.jsonindex 37ccc244..fe0d0122 100644--- a/site/src/i18n/messages/es/onboarding.json+++ b/site/src/i18n/messages/es/onboarding.json@@ -51,11 +51,10 @@"plans": {"title": "Precios simples","subtitle": "El editor es gratis. Paga solo por multimedia generada por IA.",- "forIndividuals": "Para uso individual",- "getPro": "Obtén Pro",+ "bestValue": "Mejor opción",+ "getPlan": "Obtén {plan}","getProOff": "Obtén {percent}% de descuento en Pro","continueFree": "Continuar gratis",- "endsIn": "{percent}% de descuento termina en {hours}h {minutes}m {seconds}s","covers": "{months, plural, one {Durante tu primer mes, luego {price}/mes} other {Al mes durante tus primeros # meses, luego {price}/mes}}"}}diff --git a/site/src/i18n/messages/es/settings.json b/site/src/i18n/messages/es/settings.jsonindex 2b03621d..71a92cbe 100644--- a/site/src/i18n/messages/es/settings.json+++ b/site/src/i18n/messages/es/settings.json@@ -17,8 +17,9 @@"billingDescription": "Tu suscripción y saldo de créditos."},"pro": {- "title": "Donkey Pro",- "description": "Un límite de uso mensual que se renueva cada mes; aún puedes comprar créditos en cualquier momento.",+ "title": "Plan",+ "titlePlan": "Donkey {plan}",+ "description": "Una cuota de uso mensual que se restablece cada mes.","status": "{status, select, active {activo} trialing {en prueba} past_due {vencido} canceled {cancelado} incomplete {incompleto} unpaid {sin pagar} other {{status}}}","promotionUntil": "<b>Obtén Pro antes del {day}</b> y cada mes que comience para entonces incluirá {allowance}, {multiplier}× lo habitual ({usual}).","promotionOpen": "Actualmente, cada mes incluye {allowance}, {multiplier}× lo habitual ({usual}).",@@ -32,30 +33,14 @@"introDeadline": "{terms} Suscríbete antes del {deadline}.","opening": "Abriendo…","manage": "Administrar facturación",- "starting": "Iniciando…",- "subscribe": "Suscribirse a Pro",- "unavailable": "La facturación no está disponible en este momento."+ "unavailable": "La facturación no está disponible en este momento.",+ "seePlans": "Ver planes",+ "upgrade": "Mejorar plan"},"credits": {"title": "Créditos",- "description": "Saldo prepagado para la app Donkey. Compra más en cualquier momento.",- "available": "Saldo disponible",- "buy": "Comprar créditos",- "preset": "{credits} · {price}",- "customLabel": "Créditos",- "starting": "Iniciando…",- "buyFor": "Comprar por {price}",- "buyPlain": "Comprar",- "checkoutFailed": "No se pudo iniciar el pago. Inténtalo de nuevo en un momento.",- "autoReload": "Recargar automáticamente cuando mi saldo esté bajo",- "fallsBelow": "Cuando el saldo baje de",- "unit": "créditos",- "thenBuy": "comprar automáticamente",- "saving": "Guardando…",- "save": "Guardar",- "saveFailed": "No se pudo guardar la recarga automática. Inténtalo de nuevo en un momento.",- "lastFailed": "Falló la última recarga automática: {error}",- "needsCard": "La recarga automática requiere una tarjeta guardada. <buy>Compra créditos una vez</buy> para guardar una y luego activa esta opción."+ "description": "Tu saldo para funciones de IA. Plus, Pro y Max agregan créditos cada mes.",+ "available": "Saldo disponible"},"profile": {"loadFailed": "No se pudo cargar tu perfil.",diff --git a/site/src/i18n/messages/fr/billing.json b/site/src/i18n/messages/fr/billing.jsonindex 78467e67..b1a21902 100644--- a/site/src/i18n/messages/fr/billing.json+++ b/site/src/i18n/messages/fr/billing.json@@ -1,9 +1,7 @@{"notNow": "Pas maintenant","ok": "OK",- "upgradeToPro": "Passer à Pro","subscribeToPro": "S'abonner à Pro",- "buyCredits": "Acheter des crédits","billingUnavailable": "La facturation est indisponible pour le moment.","offer": {"validThrough": "Les crédits supplémentaires sont valables jusqu'au {date}.",@@ -18,14 +16,8 @@"terms": "{months, plural, one {-{percent} % : {price} le premier mois, puis {full}/mois.} other {-{percent} % : {price}/mois les # premiers mois, puis {full}/mois.}}"},"upgrade": {- "outOfCredits": "Vous n'avez plus de crédits",- "proOutBody": "Les crédits Pro de ce mois sont épuisés. Achetez-en pour continuer à générer.",- "projectsTitle": "Passez à Pro pour créer plus de projets",- "creditsBody": "Passez à Pro pour obtenir {credits} chaque mois et 100 GB de stockage cloud pour {price}.",- "creditsBodyOffer": "Passez à Pro pour obtenir {credits} chaque mois et 100 GB de stockage cloud.",- "proPrice": "Pro est à {price}.",- "projectsBodyStarter": "Le forfait gratuit conserve votre projet de départ. Pro en crée autant que nécessaire.",- "projectsBody": "Le forfait gratuit conserve {count, plural, one {# projet} other {# projets}} en plus de votre projet de départ. Pro en crée autant que nécessaire."+ "projectsTitle": "Obtenez des projets illimités",+ "projectsBody": "Pro et Max n'ont aucune limite de projets."},"claim": {"expiredTitle": "Cette offre a expiré",@@ -51,9 +43,7 @@"graceToday": "Votre forfait Pro a pris fin. Vos projets cloud les plus anciens seront supprimés aujourd'hui, sauf si vous passez à l'offre supérieure ou libérez {bytes}.","graceDays": "Votre forfait Pro a pris fin. Vos projets cloud les plus anciens seront supprimés dans {days, plural, one {# jour} other {# jours}}, sauf si vous passez à l'offre supérieure ou libérez {bytes}.","proBody": "Libérez de l'espace en supprimant les projets ou médias dont vous n'avez plus besoin.",- "body": "Pro inclut 100 GB de stockage cloud.",- "bodyUsed": "Vous avez utilisé {used} sur {quota}. Pro inclut 100 GB de stockage cloud.",- "freeUpTerms": "Ou libérez de l'espace en supprimant les projets et médias dont vous n'avez plus besoin."+ "moreTitle": "Obtenez plus d'espace de stockage cloud"},"subscribeBonus": {"daysLeft": "{count} j restants",@@ -75,5 +65,22 @@"graceTooltip": "Votre forfait Pro a pris fin et vous dépassez la limite gratuite. Passez à l'offre supérieure ou libérez de l'espace avant la suppression de vos plus anciens projets.","fullTooltip": "Vous n'avez plus d'espace de stockage cloud. Passez à l'offre supérieure ou libérez de l'espace pour continuer à importer.","usedTooltip": "{used} sur {quota} de stockage cloud utilisé."+ },+ "plans": {+ "chooseTitle": "Choisissez votre forfait",+ "chooseBody": "Chaque forfait ajoute des crédits IA par mois et plus de stockage cloud.",+ "freeOutTitle": "Choisissez un forfait pour continuer à générer",+ "paidOutTitle": "Passez au niveau supérieur pour plus de crédits dès aujourd'hui",+ "paidOutBody": "Vos crédits {plan} seront renouvelés le {date}.",+ "topOutTitle": "Vos crédits {plan} seront renouvelés le {date}",+ "bestValue": "Meilleure offre",+ "billedMonthly": "Facturé mensuellement",+ "introThen": "{months, plural, one {Premier mois, puis {price}/mois} other {# premiers mois, puis {price}/mois}}",+ "stickerPercent": "{percent} %",+ "stickerOff": "de réduction",+ "get": "Obtenir {plan}",+ "upgrade": "Passer à {plan}",+ "current": "Forfait actuel",+ "footer": "Prix en USD. Renouvellement mensuel automatique jusqu'à résiliation. Passer à un forfait supérieur facture la différence aujourd'hui."}}diff --git a/site/src/i18n/messages/fr/chat.json b/site/src/i18n/messages/fr/chat.jsonindex e1412709..640e4748 100644--- a/site/src/i18n/messages/fr/chat.json+++ b/site/src/i18n/messages/fr/chat.json@@ -27,7 +27,7 @@"writeCaption": "Rédiger la légende et les tags"},"workingEllipsis": "Traitement…",- "insufficientCredits": "Crédits insuffisants — <link>recharger des crédits</link>",+ "insufficientCredits": "Crédits insuffisants — <link>voir les forfaits</link>","dropToAttach": "Déposer pour joindre","composerPlaceholder": "Posez une question sur votre vidéo ou demandez une modification… @ référence les fichiers, dossiers et notes","dictate": "Dicter",@@ -140,7 +140,7 @@},"hostedError": {"insufficientCredits": "Crédits insuffisants",- "insufficientCreditsReload": "Crédits insuffisants, <link>rechargez ici</link>",+ "insufficientCreditsReload": "Crédits insuffisants, <link>voir les forfaits</link>","failed": "Échec."}}diff --git a/site/src/i18n/messages/fr/common.json b/site/src/i18n/messages/fr/common.jsonindex adbad214..0c9fbc18 100644--- a/site/src/i18n/messages/fr/common.json+++ b/site/src/i18n/messages/fr/common.json@@ -27,20 +27,23 @@"dialog": {"close": "Fermer"},- "proPlan": {- "body": "Générez des médias enrichis avec l'IA.",+ "plans": {+ "body": "{plan, select, plus {Testez la génération par IA avec un petit budget.} pro {Générez des médias riches grâce à l'IA.} other {Pour une utilisation intensive de l'IA, chaque mois.}}","price": "{price}/mois",+ "perMonth": "/mois","storage": "{gb, number} GB de stockage cloud",- "credits": "{credits} crédits IA chaque mois",- "generation": "Génération d'images, de vidéos, de voix off et de musique"+ "credits": "{credits} crédits IA par mois",+ "generation": "Génération d'images, de vidéos, de voix off et de musique",+ "unlimitedProjects": "Projets illimités",+ "renders": "{count, number} exportations et importations par jour",+ "everythingIn": "Tout ce qui est inclus dans {plan}"},"apiErrors": {"checkout_no_url": "Stripe n'a pas renvoyé d'URL.",- "credit_amount_out_of_range": "Choisissez entre {min} et {max}, par milliers entiers.",- "auto_reload_invalid": "Indiquez enabled, thresholdDollars et amountDollars.",- "no_payment_method": "Achetez des crédits une fois pour enregistrer une carte, puis activez le rechargement automatique.","unsupported_image_type": "Type d'image non pris en charge.",- "image_too_large": "Image trop volumineuse."+ "image_too_large": "Image trop volumineuse.",+ "plan_not_an_upgrade": "Ce compte bénéficie déjà de ce forfait ou d'un forfait supérieur.",+ "upgrade_payment_failed": "Votre carte a été refusée, votre forfait n'a donc pas changé. Mettez à jour votre carte dans la facturation et réessayez."},"languageSaveFailed": "Impossible d'enregistrer votre langue. Réessayez.","languageBlocked": "Ce navigateur n'enregistre pas les cookies, la langue ne peut donc pas être modifiée."diff --git a/site/src/i18n/messages/fr/home.json b/site/src/i18n/messages/fr/home.jsonindex 26f13054..f05b2424 100644--- a/site/src/i18n/messages/fr/home.json+++ b/site/src/i18n/messages/fr/home.json@@ -260,9 +260,9 @@"logOut": "Se déconnecter"},"navStorage": {- "get100": "Obtenir 100 GB",- "upgradeTip": "Mettez à niveau pour 100 GB + crédits IA",- "grace": "Votre forfait Pro a expiré. Mettez à niveau ou libérez {size} avant la suppression de vos plus anciens projets."+ "upgrade": "Mettre à niveau",+ "upgradeTip": "Voir les forfaits avec plus de stockage et de crédits IA",+ "grace": "Votre forfait a pris fin. Mettez à niveau ou libérez {size} avant que vos plus anciens projets ne soient supprimés."},"justNow": "à l'instant"}diff --git a/site/src/i18n/messages/fr/landing.json b/site/src/i18n/messages/fr/landing.jsonindex 46e52a0d..faebb09b 100644--- a/site/src/i18n/messages/fr/landing.json+++ b/site/src/i18n/messages/fr/landing.json@@ -20,8 +20,7 @@},"pricing": {"title": "Tarification <italic>simple</italic>",- "body": "L'éditeur est gratuit. Ne payez que pour les médias générés par IA.",- "footnote": "* Achetez des crédits pour les contenus générés par IA à tout moment."+ "body": "L'éditeur est gratuit. Ne payez que pour les médias générés par IA."},"plans": {"free": {@@ -34,9 +33,9 @@"tools": "Import, export et transcription locale","subscriptions": "Connectez votre abonnement Claude ou Codex"},- "pro": {- "detail": "Pour les indépendants",- "cta": "Passer à Pro",+ "paid": {+ "detail": "{plan, select, plus {Pour commencer} pro {Meilleur rapport qualité-prix} other {Pour une génération intensive}}",+ "cta": "Obtenir {plan}","everythingInFree": "Tout ce qui est inclus dans Gratuit"}},diff --git a/site/src/i18n/messages/fr/onboarding.json b/site/src/i18n/messages/fr/onboarding.jsonindex 9d0e81e4..a22f8f16 100644--- a/site/src/i18n/messages/fr/onboarding.json+++ b/site/src/i18n/messages/fr/onboarding.json@@ -51,11 +51,10 @@"plans": {"title": "Tarifs simples","subtitle": "L'éditeur est gratuit. Ne payez que pour les médias générés par IA.",- "forIndividuals": "Pour les particuliers",- "getPro": "Passer à Pro",+ "bestValue": "Meilleure offre",+ "getPlan": "Obtenir {plan}","getProOff": "Obtenez {percent} % de réduction sur Pro","continueFree": "Continuer avec la version gratuite",- "endsIn": "-{percent} % se termine dans {hours}h {minutes}m {seconds}s","covers": "{months, plural, one {Pour votre premier mois, puis {price}/mois} other {Par mois pendant vos # premiers mois, puis {price}/mois}}"}}diff --git a/site/src/i18n/messages/fr/settings.json b/site/src/i18n/messages/fr/settings.jsonindex 33123337..cbd63e5d 100644--- a/site/src/i18n/messages/fr/settings.json+++ b/site/src/i18n/messages/fr/settings.json@@ -17,8 +17,9 @@"billingDescription": "Votre abonnement et votre solde de crédits."},"pro": {- "title": "Donkey Pro",- "description": "Un quota d'utilisation mensuel réinitialisé chaque mois — vous pouvez acheter des crédits à tout moment.",+ "title": "Forfait",+ "titlePlan": "Donkey {plan}",+ "description": "Un quota d'utilisation mensuel réinitialisé chaque mois.","status": "{status, select, active {actif} trialing {en essai} past_due {en retard} canceled {annulé} incomplete {incomplet} unpaid {impayé} other {{status}}}","promotionUntil": "<b>Passez à Pro avant le {day}</b> et chaque mois commençant d'ici là inclura {allowance}, soit {multiplier}× le volume habituel ({usual}).","promotionOpen": "Chaque mois inclut actuellement {allowance}, soit {multiplier}× le volume habituel ({usual}).",@@ -32,30 +33,14 @@"introDeadline": "{terms} Abonnez-vous avant le {deadline}.","opening": "Ouverture…","manage": "Gérer la facturation",- "starting": "Démarrage…",- "subscribe": "S'abonner à Pro",- "unavailable": "La facturation est indisponible pour le moment."+ "unavailable": "La facturation est indisponible pour le moment.",+ "seePlans": "Voir les forfaits",+ "upgrade": "Mettre à niveau"},"credits": {"title": "Crédits",- "description": "Solde prépayé pour l'application Donkey. Achetez-en à tout moment.",- "available": "Solde disponible",- "buy": "Acheter des crédits",- "preset": "{credits} · {price}",- "customLabel": "Crédits",- "starting": "Démarrage…",- "buyFor": "Acheter pour {price}",- "buyPlain": "Acheter",- "checkoutFailed": "Impossible de lancer le paiement. Réessayez dans un instant.",- "autoReload": "Recharger automatiquement quand mon solde est bas",- "fallsBelow": "Quand le solde passe sous",- "unit": "crédits",- "thenBuy": "acheter automatiquement",- "saving": "Enregistrement…",- "save": "Enregistrer",- "saveFailed": "Impossible d'enregistrer le rechargement automatique. Réessayez dans un instant.",- "lastFailed": "Échec du dernier rechargement automatique : {error}",- "needsCard": "Le rechargement automatique requiert une carte enregistrée. <buy>Achetez des crédits une fois</buy> pour en enregistrer une, puis activez cette option."+ "description": "Votre solde pour les fonctionnalités IA. Plus, Pro et Max ajoutent des crédits chaque mois.",+ "available": "Solde disponible"},"profile": {"loadFailed": "Impossible de charger votre profil.",diff --git a/site/src/i18n/messages/ja/billing.json b/site/src/i18n/messages/ja/billing.jsonindex d949279d..fc1eb676 100644--- a/site/src/i18n/messages/ja/billing.json+++ b/site/src/i18n/messages/ja/billing.json@@ -1,9 +1,7 @@{"notNow": "今はしない","ok": "OK",- "upgradeToPro": "Proにアップグレード","subscribeToPro": "Proに登録",- "buyCredits": "クレジットを購入","billingUnavailable": "現在、お支払いはご利用いただけません。","offer": {"validThrough": "追加クレジットの有効期限は{date}までです。",@@ -18,14 +16,8 @@"terms": "{months, plural, other {{percent}%オフ:最初の#か月は{price}/月、その後は{full}/月。}}"},"upgrade": {- "outOfCredits": "クレジットがなくなりました",- "proOutBody": "今月のProクレジットを使い切りました。生成を続けるにはクレジットを購入してください。",- "projectsTitle": "アップグレードしてさらにプロジェクトを作成",- "creditsBody": "Proにアップグレードすると、{price}で毎月{credits}と100 GBのクラウドストレージをご利用いただけます。",- "creditsBodyOffer": "Proにアップグレードすると、毎月{credits}と100 GBのクラウドストレージをご利用いただけます。",- "proPrice": "Proは{price}です。",- "projectsBodyStarter": "無料プランで保持できるのはスタータープロジェクトのみです。Proなら必要なだけ作成できます。",- "projectsBody": "無料プランではスタータープロジェクトのほかに{count, plural, other {#個のプロジェクト}}を保持できます。Proなら必要なだけ作成できます。"+ "projectsTitle": "プロジェクトを無制限に作成",+ "projectsBody": "ProとMaxにはプロジェクト数の上限がありません。"},"claim": {"expiredTitle": "このオファーは期限切れです",@@ -51,9 +43,7 @@"graceToday": "Proプランが終了しました。アップグレードするか{bytes}の空き容量を確保しない限り、最も古いクラウドプロジェクトは本日削除されます。","graceDays": "Proプランが終了しました。アップグレードするか{bytes}の空き容量を確保しない限り、最も古いクラウドプロジェクトは{days, plural, other {#日後}}に削除されます。","proBody": "不要になったプロジェクトやメディアを削除して空き容量を増やしてください。",- "body": "Proには100 GBのクラウドストレージが含まれます。",- "bodyUsed": "{quota}中{used}を使用しています。Proには100 GBのクラウドストレージが含まれます。",- "freeUpTerms": "または、不要になったプロジェクトやメディアを削除して空き容量を増やしてください。"+ "moreTitle": "クラウドストレージを増量"},"subscribeBonus": {"daysLeft": "残り{count}日",@@ -75,5 +65,22 @@"graceTooltip": "Proプランが終了し、無料の上限を超えています。最も古いプロジェクトが削除される前に、アップグレードするか空き容量を確保してください。","fullTooltip": "クラウドストレージの空き容量がなくなりました。アップロードを続けるには、アップグレードするか空き容量を確保してください。","usedTooltip": "クラウドストレージ{quota}のうち{used}を使用しています。"+ },+ "plans": {+ "chooseTitle": "プランの選択",+ "chooseBody": "すべてのプランに毎月のAIクレジットと追加のクラウドストレージが含まれます。",+ "freeOutTitle": "生成を続けるにはプランを選択",+ "paidOutTitle": "アップグレードして今すぐクレジットを追加",+ "paidOutBody": "{plan}のクレジットは{date}に補充されます。",+ "topOutTitle": "{plan}のクレジットは{date}に補充されます",+ "bestValue": "最もお得",+ "billedMonthly": "月額請求",+ "introThen": "{months, plural, other {最初の#か月、その後は{price}/月}}",+ "stickerPercent": "{percent}%",+ "stickerOff": "OFF",+ "get": "{plan}を入手",+ "upgrade": "{plan}にアップグレード",+ "current": "現在のプラン",+ "footer": "価格は米ドル表記です。プランは解約するまで毎月更新されます。上位プランに変更する場合、本日差額が請求されます。"}}diff --git a/site/src/i18n/messages/ja/chat.json b/site/src/i18n/messages/ja/chat.jsonindex 1b610a2d..b8c645d3 100644--- a/site/src/i18n/messages/ja/chat.json+++ b/site/src/i18n/messages/ja/chat.json@@ -27,7 +27,7 @@"writeCaption": "投稿キャプションとタグを作成"},"workingEllipsis": "処理中…",- "insufficientCredits": "クレジット残高不足 — <link>クレジットをチャージ</link>",+ "insufficientCredits": "クレジット不足 — <link>プランを見る</link>","dropToAttach": "ドロップして添付","composerPlaceholder": "動画について質問するか、変更内容を指示… @でファイル、フォルダ、ノートを参照","dictate": "音声入力",@@ -140,7 +140,7 @@},"hostedError": {"insufficientCredits": "クレジット残高不足",- "insufficientCreditsReload": "クレジット残高不足です。<link>こちらからチャージしてください</link>",+ "insufficientCreditsReload": "クレジット不足、<link>プランを見る</link>","failed": "失敗しました。"}}diff --git a/site/src/i18n/messages/ja/common.json b/site/src/i18n/messages/ja/common.jsonindex 4fab726e..912c2309 100644--- a/site/src/i18n/messages/ja/common.json+++ b/site/src/i18n/messages/ja/common.json@@ -27,20 +27,23 @@"dialog": {"close": "閉じる"},- "proPlan": {- "body": "AIでリッチメディアを生成。",+ "plans": {+ "body": "{plan, select, plus {予算を抑えてAI生成をお試し。} pro {AIでリッチなメディアを生成。} other {毎月本格的にAI生成を利用する方に。}}","price": "{price}/月",- "storage": "クラウドストレージ {gb, number} GB",- "credits": "毎月 {credits} AIクレジット",- "generation": "画像、動画、ナレーション、音楽の生成"+ "perMonth": "/月",+ "storage": "{gb, number} GBのクラウドストレージ",+ "credits": "毎月{credits} AIクレジット",+ "generation": "画像、動画、ボイスオーバー、音楽の生成",+ "unlimitedProjects": "プロジェクト無制限",+ "renders": "1日あたり{count, number}回の書き出しと読み込み",+ "everythingIn": "{plan}のすべての機能"},"apiErrors": {"checkout_no_url": "Stripe から URL が返されませんでした。",- "credit_amount_out_of_range": "{min} から {max} の間で、1,000単位で指定してください。",- "auto_reload_invalid": "enabled、thresholdDollars、amountDollars を指定してください。",- "no_payment_method": "カードを保存するためにクレジットを1度購入してから、自動チャージを有効にしてください。","unsupported_image_type": "サポートされていない画像形式です。",- "image_too_large": "画像が大きすぎます。"+ "image_too_large": "画像が大きすぎます。",+ "plan_not_an_upgrade": "このアカウントはすでにこのプラン、または上位プランをご利用中です。",+ "upgrade_payment_failed": "カードの支払いが拒否されたため、プランは変更されませんでした。請求設定でカード情報を更新し、もう一度お試しください。"},"languageSaveFailed": "言語を保存できませんでした。もう一度お試しください。","languageBlocked": "このブラウザではCookieが保存されないため、言語を変更できません。"diff --git a/site/src/i18n/messages/ja/home.json b/site/src/i18n/messages/ja/home.jsonindex 4fb2e6f2..101694e7 100644--- a/site/src/i18n/messages/ja/home.json+++ b/site/src/i18n/messages/ja/home.json@@ -260,9 +260,9 @@"logOut": "ログアウト"},"navStorage": {- "get100": "100 GB を入手",- "upgradeTip": "アップグレードで 100 GB + AI クレジット",- "grace": "Pro プランが終了しました。最も古いプロジェクトが削除される前に、アップグレードするか {size} の空き容量を確保してください。"+ "upgrade": "アップグレード",+ "upgradeTip": "より多くのストレージとAIクレジットを利用できるプランを見る",+ "grace": "プランの有効期限が切れました。最も古いプロジェクトが削除される前に、アップグレードするか{size}の空き容量を確保してください。"},"justNow": "たった今"}diff --git a/site/src/i18n/messages/ja/landing.json b/site/src/i18n/messages/ja/landing.jsonindex 1f9f2216..a74ed17d 100644--- a/site/src/i18n/messages/ja/landing.json+++ b/site/src/i18n/messages/ja/landing.json@@ -20,8 +20,7 @@},"pricing": {"title": "シンプルな<italic>料金プラン</italic>",- "body": "エディターは無料です。料金が発生するのはAI生成メディアの利用時のみです。",- "footnote": "※ AI生成コンテンツ用のクレジットはいつでも購入できます。"+ "body": "エディターは無料です。料金が発生するのはAI生成メディアの利用時のみです。"},"plans": {"free": {@@ -34,10 +33,10 @@"tools": "インポート、書き出し、ローカル文字起こし","subscriptions": "ClaudeやCodexのサブスクリプションと連携"},- "pro": {- "detail": "個人向け",- "cta": "Proを始める",- "everythingInFree": "Freeの全機能"+ "paid": {+ "detail": "{plan, select, plus {まずはここから} pro {最もお得} other {大量の生成向け}}",+ "cta": "{plan}を入手",+ "everythingInFree": "Freeプランの全機能"}},"local": {diff --git a/site/src/i18n/messages/ja/onboarding.json b/site/src/i18n/messages/ja/onboarding.jsonindex bd68d5da..201ad310 100644--- a/site/src/i18n/messages/ja/onboarding.json+++ b/site/src/i18n/messages/ja/onboarding.json@@ -51,11 +51,10 @@"plans": {"title": "シンプルな料金プラン","subtitle": "エディターは無料。AI生成メディアにのみお支払いいただけます。",- "forIndividuals": "個人向け",- "getPro": "Proを利用",+ "bestValue": "最もお得",+ "getPlan": "{plan}を入手","getProOff": "Proを{percent}%オフで利用","continueFree": "無料で続ける",- "endsIn": "{percent}%オフの終了まであと{hours}時間{minutes}分{seconds}秒","covers": "{months, plural, other {最初の#か月間の月額、以降は{price}/月}}"}}diff --git a/site/src/i18n/messages/ja/settings.json b/site/src/i18n/messages/ja/settings.jsonindex da7dabff..b63ec98d 100644--- a/site/src/i18n/messages/ja/settings.json+++ b/site/src/i18n/messages/ja/settings.json@@ -17,8 +17,9 @@"billingDescription": "サブスクリプションとクレジット残高。"},"pro": {- "title": "Donkey Pro",- "description": "毎月リセットされる月間使用枠です。クレジットはいつでも追加購入できます。",+ "title": "プラン",+ "titlePlan": "Donkey {plan}",+ "description": "毎月リセットされる月間利用枠です。","status": "{status, select, active {アクティブ} trialing {トライアル中} past_due {支払い遅延} canceled {キャンセル済み} incomplete {未完了} unpaid {未払い} other {{status}}}","promotionUntil": "<b>{day}までにProに登録</b>すると、それまでに開始するすべての月で通常の{usual}の{multiplier}倍となる{allowance}が付与されます。","promotionOpen": "現在、毎月通常の{usual}の{multiplier}倍となる{allowance}が付与されます。",@@ -32,30 +33,14 @@"introDeadline": "{terms} {deadline}までにご登録ください。","opening": "開いています…","manage": "請求の管理",- "starting": "開始中…",- "subscribe": "Proに登録",- "unavailable": "現在、請求機能を利用できません。"+ "unavailable": "現在、請求機能を利用できません。",+ "seePlans": "プランを見る",+ "upgrade": "アップグレード"},"credits": {"title": "クレジット",- "description": "Donkeyアプリの都度払い残高です。いつでも追加購入できます。",- "available": "利用可能残高",- "buy": "クレジットを購入",- "preset": "{credits} · {price}",- "customLabel": "クレジット",- "starting": "処理中…",- "buyFor": "{price}で購入",- "buyPlain": "購入",- "checkoutFailed": "チェックアウトを開始できませんでした。しばらくしてからもう一度お試しください。",- "autoReload": "残高不足時に自動リチャージ",- "fallsBelow": "残高が以下を下回った場合",- "unit": "クレジット",- "thenBuy": "自動購入する額",- "saving": "保存中…",- "save": "保存",- "saveFailed": "自動リチャージを保存できませんでした。しばらくしてからもう一度お試しください。",- "lastFailed": "前回の自動リチャージに失敗しました: {error}",- "needsCard": "自動リチャージには保存済みのカードが必要です。<buy>クレジットを一度購入</buy>してカードを登録してから有効にしてください。"+ "description": "AI機能用の残高です。Plus、Pro、Maxプランでは毎月クレジットが付与されます。",+ "available": "利用可能残高"},"profile": {"loadFailed": "プロフィールを読み込めませんでした。",diff --git a/site/src/i18n/messages/ko/billing.json b/site/src/i18n/messages/ko/billing.jsonindex fcb95537..eeef39c9 100644--- a/site/src/i18n/messages/ko/billing.json+++ b/site/src/i18n/messages/ko/billing.json@@ -1,9 +1,7 @@{"notNow": "나중에","ok": "확인",- "upgradeToPro": "Pro로 업그레이드","subscribeToPro": "Pro 구독",- "buyCredits": "크레딧 구매","billingUnavailable": "지금은 결제 기능을 이용할 수 없어요.","offer": {"validThrough": "추가 크레딧은 {date}까지 유효해요.",@@ -18,14 +16,8 @@"terms": "{months, plural, other {{percent}% 할인: 첫 #개월간 {price}/월, 이후 {full}/월.}}"},"upgrade": {- "outOfCredits": "크레딧이 모두 소진되었어요",- "proOutBody": "이번 달 Pro 크레딧을 모두 사용했어요. 계속 생성하려면 크레딧을 더 구매하세요.",- "projectsTitle": "프로젝트를 더 만들려면 업그레이드하세요",- "creditsBody": "Pro로 업그레이드하면 {price}에 매월 {credits}과 100 GB의 클라우드 스토리지를 이용할 수 있어요.",- "creditsBodyOffer": "Pro로 업그레이드하고 매월 {credits}과 100 GB의 클라우드 스토리지를 받으세요.",- "proPrice": "Pro는 {price}예요.",- "projectsBodyStarter": "무료 플랜에서는 스타터 프로젝트만 유지할 수 있어요. Pro에서는 원하는 만큼 만들 수 있어요.",- "projectsBody": "{count, plural, other {무료 플랜에서는 스타터 프로젝트 외에 프로젝트를 #개 유지할 수 있어요. Pro에서는 원하는 만큼 만들 수 있어요.}}"+ "projectsTitle": "무제한 프로젝트 이용하기",+ "projectsBody": "Pro 및 Max 요금제는 프로젝트 제한이 없어요."},"claim": {"expiredTitle": "만료된 혜택이에요",@@ -51,9 +43,7 @@"graceToday": "Pro 요금제가 종료되었어요. 업그레이드하거나 {bytes}를 확보하지 않으면 가장 오래된 클라우드 프로젝트가 오늘 삭제돼요.","graceDays": "Pro 요금제가 종료되었어요. 업그레이드하거나 {bytes}를 확보하지 않으면 가장 오래된 클라우드 프로젝트가 {days, plural, other {#일 후에}} 삭제돼요.","proBody": "더 이상 필요 없는 프로젝트나 미디어를 삭제해 공간을 확보하세요.",- "body": "Pro에는 100 GB의 클라우드 스토리지가 포함되어 있어요.",- "bodyUsed": "{quota} 중 {used}를 사용했어요. Pro에는 100 GB의 클라우드 스토리지가 포함되어 있어요.",- "freeUpTerms": "또는 더 이상 필요 없는 프로젝트와 미디어를 삭제해 공간을 확보하세요."+ "moreTitle": "클라우드 저장 공간 추가하기"},"subscribeBonus": {"daysLeft": "{count}일 남음",@@ -75,5 +65,22 @@"graceTooltip": "Pro 요금제가 종료되어 무료 용량을 초과했어요. 가장 오래된 프로젝트가 삭제되기 전에 업그레이드하거나 공간을 확보하세요.","fullTooltip": "클라우드 저장 공간이 부족해요. 계속 업로드하려면 업그레이드하거나 공간을 확보하세요.","usedTooltip": "클라우드 스토리지 {quota} 중 {used}를 사용 중이에요."+ },+ "plans": {+ "chooseTitle": "요금제 선택",+ "chooseBody": "모든 요금제에서 매달 AI 크레딧과 추가 클라우드 저장 공간을 제공해요.",+ "freeOutTitle": "계속 생성하려면 요금제를 선택하세요",+ "paidOutTitle": "업그레이드하고 오늘 크레딧을 더 받으세요",+ "paidOutBody": "{plan} 크레딧은 {date}에 다시 충전돼요.",+ "topOutTitle": "{plan} 크레딧 충전일: {date}",+ "bestValue": "최고 혜택",+ "billedMonthly": "매월 청구",+ "introThen": "{months, plural, other {첫 #개월 이용 후 월 {price}}}",+ "stickerPercent": "{percent}%",+ "stickerOff": "할인",+ "get": "{plan} 선택",+ "upgrade": "{plan}(으)로 업그레이드",+ "current": "현재 요금제",+ "footer": "가격은 USD 기준이에요. 직접 취소하기 전까지 요금제가 매달 자동 갱신돼요. 더 높은 요금제로 변경하면 오늘 차액이 결제돼요."}}diff --git a/site/src/i18n/messages/ko/chat.json b/site/src/i18n/messages/ko/chat.jsonindex 8c54af04..8e082bb8 100644--- a/site/src/i18n/messages/ko/chat.json+++ b/site/src/i18n/messages/ko/chat.json@@ -27,7 +27,7 @@"writeCaption": "게시물 캡션 및 태그 작성"},"workingEllipsis": "작업 중…",- "insufficientCredits": "크레딧 부족 — <link>크레딧 충전</link>",+ "insufficientCredits": "크레딧 부족 — <link>요금제 보기</link>","dropToAttach": "여기에 놓아 첨부","composerPlaceholder": "동영상에 대해 질문하거나 변경할 내용을 알려주세요… @를 입력해 파일, 폴더, 메모 참조","dictate": "음성 입력",@@ -140,7 +140,7 @@},"hostedError": {"insufficientCredits": "크레딧 부족",- "insufficientCreditsReload": "크레딧이 부족해요. <link>여기서 충전하세요</link>",+ "insufficientCreditsReload": "크레딧 부족, <link>요금제 보기</link>","failed": "실패했어요."}}diff --git a/site/src/i18n/messages/ko/common.json b/site/src/i18n/messages/ko/common.jsonindex f2bee0a9..e0bf2c0a 100644--- a/site/src/i18n/messages/ko/common.json+++ b/site/src/i18n/messages/ko/common.json@@ -27,20 +27,23 @@"dialog": {"close": "닫기"},- "proPlan": {- "body": "AI로 풍부한 미디어를 생성해 보세요.",+ "plans": {+ "body": "{plan, select, plus {부담 없는 예산으로 AI 생성을 체험해 보세요.} pro {AI로 풍부한 미디어를 생성해 보세요.} other {매달 대량의 AI 생성을 위해.}}","price": "{price}/월",- "storage": "{gb, number}GB 클라우드 저장 공간",+ "perMonth": "/월",+ "storage": "클라우드 스토리지 {gb, number} GB","credits": "매월 AI 크레딧 {credits}개",- "generation": "이미지, 동영상, 음성 더빙 및 음악 생성"+ "generation": "이미지, 비디오, 음성 및 음악 생성",+ "unlimitedProjects": "무제한 프로젝트",+ "renders": "하루 내보내기 및 가져오기 {count, number}회",+ "everythingIn": "{plan}의 모든 기능"},"apiErrors": {"checkout_no_url": "Stripe에서 URL을 반환하지 않았어요.",- "credit_amount_out_of_range": "1,000단위로 {min}에서 {max} 사이를 선택해 주세요.",- "auto_reload_invalid": "enabled, thresholdDollars, amountDollars를 입력해 주세요.",- "no_payment_method": "카드를 저장하려면 먼저 크레딧을 1회 구매한 뒤 자동 충전을 켜 주세요.","unsupported_image_type": "지원하지 않는 이미지 형식이에요.",- "image_too_large": "이미지가 너무 커요."+ "image_too_large": "이미지가 너무 커요.",+ "plan_not_an_upgrade": "이 계정은 이미 이 플랜 또는 더 높은 플랜을 이용 중이에요.",+ "upgrade_payment_failed": "카드가 승인 거부되어 플랜이 변경되지 않았어요. 결제 정보에서 카드를 업데이트하고 다시 시도해 주세요."},"languageSaveFailed": "언어를 저장하지 못했어요. 다시 시도해 주세요.","languageBlocked": "이 브라우저에서 쿠키가 저장되지 않아 언어를 변경할 수 없어요."diff --git a/site/src/i18n/messages/ko/home.json b/site/src/i18n/messages/ko/home.jsonindex b0ef8b15..c056abcd 100644--- a/site/src/i18n/messages/ko/home.json+++ b/site/src/i18n/messages/ko/home.json@@ -260,9 +260,9 @@"logOut": "로그아웃"},"navStorage": {- "get100": "100 GB 받기",- "upgradeTip": "업그레이드하고 100 GB + AI 크레딧 받기",- "grace": "Pro 플랜이 만료되었어요. 가장 오래된 프로젝트가 삭제되기 전에 업그레이드하거나 {size}를 확보하세요."+ "upgrade": "업그레이드",+ "upgradeTip": "더 많은 저장 공간과 AI 크레딧이 제공되는 플랜을 확인해 보세요",+ "grace": "플랜이 종료되었어요. 가장 오래된 프로젝트가 삭제되기 전에 업그레이드하거나 {size}의 공간을 확보해 주세요."},"justNow": "방금 전"}diff --git a/site/src/i18n/messages/ko/landing.json b/site/src/i18n/messages/ko/landing.jsonindex 55b03f07..a61e43ed 100644--- a/site/src/i18n/messages/ko/landing.json+++ b/site/src/i18n/messages/ko/landing.json@@ -20,8 +20,7 @@},"pricing": {"title": "단순한 <italic>요금제</italic>",- "body": "편집기는 무료예요. AI로 생성하는 미디어에 대해서만 결제하세요.",- "footnote": "* AI 생성 콘텐츠용 크레딧은 언제든지 구매할 수 있어요."+ "body": "편집기는 무료예요. AI로 생성하는 미디어에 대해서만 결제하세요."},"plans": {"free": {@@ -34,10 +33,10 @@"tools": "가져오기, 내보내기 및 온디바이스 텍스트 변환","subscriptions": "보유한 Claude 또는 Codex 구독 연동"},- "pro": {- "detail": "개인용 플랜",- "cta": "Pro 시작하기",- "everythingInFree": "Free 플랜의 모든 기능 포함"+ "paid": {+ "detail": "{plan, select, plus {시작하기에 적합} pro {최고의 가성비} other {대량 생성용}}",+ "cta": "{plan} 시작하기",+ "everythingInFree": "Free 플랜의 모든 기능"}},"local": {diff --git a/site/src/i18n/messages/ko/onboarding.json b/site/src/i18n/messages/ko/onboarding.jsonindex 8cbbcd23..c9e30f14 100644--- a/site/src/i18n/messages/ko/onboarding.json+++ b/site/src/i18n/messages/ko/onboarding.json@@ -51,11 +51,10 @@"plans": {"title": "단순한 요금제","subtitle": "편집기는 무료예요. AI로 생성하는 미디어에 대해서만 결제하세요.",- "forIndividuals": "개인용",- "getPro": "Pro 시작하기",+ "bestValue": "최고 혜택",+ "getPlan": "{plan} 시작하기","getProOff": "Pro {percent}% 할인받기","continueFree": "무료로 계속하기",- "endsIn": "{percent}% 할인 종료까지 {hours}시간 {minutes}분 {seconds}초","covers": "{months, plural, other {첫 #개월 동안 적용되며, 이후 월 {price}}}"}}diff --git a/site/src/i18n/messages/ko/settings.json b/site/src/i18n/messages/ko/settings.jsonindex 16a272e5..4e024df8 100644--- a/site/src/i18n/messages/ko/settings.json+++ b/site/src/i18n/messages/ko/settings.json@@ -17,8 +17,9 @@"billingDescription": "구독 및 크레딧 잔액이에요."},"pro": {- "title": "Donkey Pro",- "description": "매월 초기화되는 월간 사용 한도예요. 언제든 크레딧을 추가 구매할 수 있어요.",+ "title": "요금제",+ "titlePlan": "Donkey {plan}",+ "description": "매월 초기화되는 월간 사용 한도예요.","status": "{status, select, active {활성} trialing {체험 중} past_due {결제 연체} canceled {취소됨} incomplete {미완료} unpaid {미납} other {{status}}}","promotionUntil": "<b>{day}까지 Pro를 구독하면</b> 그때까지 시작되는 모든 달에 평소 {usual}의 {multiplier}배인 {allowance}이 제공돼요.","promotionOpen": "현재 매월 평소 {usual}의 {multiplier}배인 {allowance}이 제공돼요.",@@ -32,30 +33,14 @@"introDeadline": "{terms} {deadline}까지 구독하세요.","opening": "여는 중…","manage": "결제 관리",- "starting": "시작하는 중…",- "subscribe": "Pro 구독",- "unavailable": "지금은 결제 기능을 이용할 수 없어요."+ "unavailable": "지금은 결제 기능을 이용할 수 없어요.",+ "seePlans": "요금제 보기",+ "upgrade": "업그레이드"},"credits": {"title": "크레딧",- "description": "Donkey 앱에서 사용하는 종량제 잔액이에요. 언제든 추가 구매할 수 있어요.",- "available": "사용 가능한 잔액",- "buy": "크레딧 구매",- "preset": "{credits} · {price}",- "customLabel": "크레딧",- "starting": "시작하는 중…",- "buyFor": "{price}에 구매",- "buyPlain": "구매",- "checkoutFailed": "결제를 시작하지 못했어요. 잠시 후 다시 시도해 주세요.",- "autoReload": "잔액 부족 시 자동 충전",- "fallsBelow": "잔액이 다음 미만일 때",- "unit": "크레딧",- "thenBuy": "자동 구매",- "saving": "저장 중…",- "save": "저장",- "saveFailed": "자동 충전 설정을 저장하지 못했어요. 잠시 후 다시 시도해 주세요.",- "lastFailed": "최근 자동 충전 실패: {error}",- "needsCard": "자동 충전을 사용하려면 저장된 카드가 필요해요. <buy>크레딧을 한 번 구매</buy>하여 카드를 저장한 후 이 기능을 켜주세요."+ "description": "AI 기능 이용을 위한 잔여 크레딧이에요. Plus, Pro, Max 요금제에서는 매달 크레딧이 충전돼요.",+ "available": "사용 가능한 잔액"},"profile": {"loadFailed": "프로필을 불러오지 못했어요.",diff --git a/site/src/i18n/messages/pt-BR/billing.json b/site/src/i18n/messages/pt-BR/billing.jsonindex 983662af..24e0c768 100644--- a/site/src/i18n/messages/pt-BR/billing.json+++ b/site/src/i18n/messages/pt-BR/billing.json@@ -1,9 +1,7 @@{"notNow": "Agora não","ok": "OK",- "upgradeToPro": "Fazer upgrade para o Pro","subscribeToPro": "Assinar o Pro",- "buyCredits": "Comprar créditos","billingUnavailable": "O faturamento não está disponível no momento.","offer": {"validThrough": "Os créditos extras são válidos até {date}.",@@ -18,14 +16,8 @@"terms": "{months, plural, one {{percent}% de desconto: {price} no primeiro mês, depois {full}/mês.} other {{percent}% de desconto: {price}/mês nos primeiros # meses, depois {full}/mês.}}"},"upgrade": {- "outOfCredits": "Seus créditos acabaram",- "proOutBody": "Os créditos do Pro deste mês acabaram. Compre mais para continuar gerando.",- "projectsTitle": "Faça upgrade para criar mais projetos",- "creditsBody": "Faça upgrade para o Pro e receba {credits} todo mês e 100 GB de armazenamento em nuvem por {price}.",- "creditsBodyOffer": "Faça upgrade para o Pro e receba {credits} todo mês e 100 GB de armazenamento em nuvem.",- "proPrice": "O Pro custa {price}.",- "projectsBodyStarter": "O plano gratuito mantém seu projeto inicial. O Pro permite criar quantos você precisar.",- "projectsBody": "O plano gratuito mantém {count, plural, one {# projeto} other {# projetos}} além do seu inicial. O Pro permite criar quantos você precisar."+ "projectsTitle": "Tenha projetos ilimitados",+ "projectsBody": "O Pro e o Max não têm limite de projetos."},"claim": {"expiredTitle": "Esta oferta expirou",@@ -51,9 +43,7 @@"graceToday": "Seu plano Pro expirou. Seus projetos mais antigos na nuvem serão excluídos hoje, a menos que faça upgrade ou libere {bytes}.","graceDays": "Seu plano Pro expirou. Seus projetos mais antigos na nuvem serão excluídos em {days, plural, one {# dia} other {# dias}}, a menos que faça upgrade ou libere {bytes}.","proBody": "Libere espaço excluindo projetos ou mídias que não usa mais.",- "body": "O Pro inclui 100 GB de armazenamento na nuvem.",- "bodyUsed": "Você usou {used} de {quota}. O Pro inclui 100 GB de armazenamento na nuvem.",- "freeUpTerms": "Ou libere espaço excluindo projetos e mídias que não usa mais."+ "moreTitle": "Obtenha mais armazenamento em nuvem"},"subscribeBonus": {"daysLeft": "{count}d restantes",@@ -75,5 +65,22 @@"graceTooltip": "Seu plano Pro expirou e você ultrapassou o limite gratuito. Faça upgrade ou libere espaço antes que seus projetos mais antigos sejam excluídos.","fullTooltip": "Seu armazenamento na nuvem acabou. Faça upgrade ou libere espaço para continuar fazendo upload.","usedTooltip": "{used} de {quota} de armazenamento em nuvem usado."+ },+ "plans": {+ "chooseTitle": "Escolha seu plano",+ "chooseBody": "Cada plano adiciona créditos de IA todo mês e mais armazenamento na nuvem.",+ "freeOutTitle": "Escolha um plano para continuar gerando",+ "paidOutTitle": "Faça upgrade para ter mais créditos hoje",+ "paidOutBody": "Seus créditos do {plan} serão renovados em {date}.",+ "topOutTitle": "Seus créditos do {plan} serão renovados em {date}",+ "bestValue": "Melhor custo-benefício",+ "billedMonthly": "Cobrado mensalmente",+ "introThen": "{months, plural, one {Primeiro mês, depois {price}/mês} other {Primeiros # meses, depois {price}/mês}}",+ "stickerPercent": "{percent}%",+ "stickerOff": "OFF",+ "get": "Obter {plan}",+ "upgrade": "Fazer upgrade para o {plan}",+ "current": "Plano atual",+ "footer": "Preços em USD. Os planos se renovam mensalmente até você cancelar. Mudar para um plano superior cobra a diferença hoje."}}diff --git a/site/src/i18n/messages/pt-BR/chat.json b/site/src/i18n/messages/pt-BR/chat.jsonindex 400abfe4..e39627b6 100644--- a/site/src/i18n/messages/pt-BR/chat.json+++ b/site/src/i18n/messages/pt-BR/chat.json@@ -27,7 +27,7 @@"writeCaption": "Escrever legenda do post + tags"},"workingEllipsis": "Processando…",- "insufficientCredits": "Créditos insuficientes — <link>recarregar créditos</link>",+ "insufficientCredits": "Créditos insuficientes — <link>ver planos</link>","dropToAttach": "Solte para anexar","composerPlaceholder": "Pergunte sobre seu vídeo ou diga o que mudar… @ referencia arquivos, pastas e notas","dictate": "Ditar",@@ -140,7 +140,7 @@},"hostedError": {"insufficientCredits": "Créditos insuficientes",- "insufficientCreditsReload": "Créditos insuficientes, <link>recarregue aqui</link>",+ "insufficientCreditsReload": "Créditos insuficientes, <link>ver planos</link>","failed": "Falhou."}}diff --git a/site/src/i18n/messages/pt-BR/common.json b/site/src/i18n/messages/pt-BR/common.jsonindex 5de84832..daf37458 100644--- a/site/src/i18n/messages/pt-BR/common.json+++ b/site/src/i18n/messages/pt-BR/common.json@@ -27,20 +27,23 @@"dialog": {"close": "Fechar"},- "proPlan": {- "body": "Gere mídias avançadas com IA.",+ "plans": {+ "body": "{plan, select, plus {Experimente a geração por IA gastando pouco.} pro {Gere mídias avançadas com IA.} other {Para geração pesada por IA todo mês.}}","price": "{price}/mês",- "storage": "{gb, number} GB de armazenamento na nuvem",+ "perMonth": "/mês",+ "storage": "{gb, number} GB de armazenamento em nuvem","credits": "{credits} créditos de IA todo mês",- "generation": "Geração de imagem, vídeo, narração e música"+ "generation": "Geração de imagem, vídeo, locução e música",+ "unlimitedProjects": "Projetos ilimitados",+ "renders": "{count, number} exportações e importações por dia",+ "everythingIn": "Tudo do plano {plan}"},"apiErrors": {"checkout_no_url": "A Stripe não retornou uma URL.",- "credit_amount_out_of_range": "Escolha entre {min} e {max}, em milhares inteiros.",- "auto_reload_invalid": "Informe enabled, thresholdDollars e amountDollars.",- "no_payment_method": "Compre créditos uma vez para salvar um cartão e, depois, ative a recarga automática.","unsupported_image_type": "Tipo de imagem não suportado.",- "image_too_large": "Imagem grande demais."+ "image_too_large": "Imagem grande demais.",+ "plan_not_an_upgrade": "Esta conta já está neste plano ou em um superior.",+ "upgrade_payment_failed": "Seu cartão foi recusado, portanto seu plano não mudou. Atualize o cartão no faturamento e tente novamente."},"languageSaveFailed": "Não foi possível salvar seu idioma. Tente novamente.","languageBlocked": "Este navegador não está salvando cookies, então o idioma não pode ser alterado."diff --git a/site/src/i18n/messages/pt-BR/home.json b/site/src/i18n/messages/pt-BR/home.jsonindex d643c915..b296dfb7 100644--- a/site/src/i18n/messages/pt-BR/home.json+++ b/site/src/i18n/messages/pt-BR/home.json@@ -260,9 +260,9 @@"logOut": "Sair"},"navStorage": {- "get100": "Obter 100 GB",- "upgradeTip": "Faça upgrade para 100 GB + créditos de IA",- "grace": "Seu plano Pro terminou. Faça upgrade ou libere {size} antes que seus projetos mais antigos sejam excluídos."+ "upgrade": "Fazer upgrade",+ "upgradeTip": "Veja planos com mais armazenamento e créditos de IA",+ "grace": "Seu plano expirou. Faça upgrade ou libere {size} antes que seus projetos mais antigos sejam excluídos."},"justNow": "agora mesmo"}diff --git a/site/src/i18n/messages/pt-BR/landing.json b/site/src/i18n/messages/pt-BR/landing.jsonindex 5fd52ed8..203b2095 100644--- a/site/src/i18n/messages/pt-BR/landing.json+++ b/site/src/i18n/messages/pt-BR/landing.json@@ -20,8 +20,7 @@},"pricing": {"title": "Preços <italic>simples</italic>",- "body": "O editor é gratuito. Pague apenas pelas mídias geradas por IA.",- "footnote": "* Compre créditos para conteúdo gerado por IA a qualquer momento."+ "body": "O editor é gratuito. Pague apenas pelas mídias geradas por IA."},"plans": {"free": {@@ -34,10 +33,10 @@"tools": "Importação, exportação e transcrição local","subscriptions": "Conecte sua assinatura do Claude ou Codex"},- "pro": {- "detail": "Para uso individual",- "cta": "Assinar o Pro",- "everythingInFree": "Tudo do Gratuito"+ "paid": {+ "detail": "{plan, select, plus {Para começar} pro {Melhor custo-benefício} other {Para geração intensa}}",+ "cta": "Obter {plan}",+ "everythingInFree": "Tudo do plano Gratuito"}},"local": {diff --git a/site/src/i18n/messages/pt-BR/onboarding.json b/site/src/i18n/messages/pt-BR/onboarding.jsonindex 5568cbf3..57340507 100644--- a/site/src/i18n/messages/pt-BR/onboarding.json+++ b/site/src/i18n/messages/pt-BR/onboarding.json@@ -51,11 +51,10 @@"plans": {"title": "Preços simples","subtitle": "O editor é grátis. Pague apenas por mídias geradas por IA.",- "forIndividuals": "Para uso individual",- "getPro": "Assinar o Pro",+ "bestValue": "Melhor custo-benefício",+ "getPlan": "Obter {plan}","getProOff": "Garanta {percent}% de desconto no Pro","continueFree": "Continuar grátis",- "endsIn": "{percent}% de desconto acaba em {hours}h {minutes}m {seconds}s","covers": "{months, plural, one {No seu primeiro mês, depois {price}/mês} other {Por mês nos seus primeiros # meses, depois {price}/mês}}"}}diff --git a/site/src/i18n/messages/pt-BR/settings.json b/site/src/i18n/messages/pt-BR/settings.jsonindex 0744bfad..a6ae4b25 100644--- a/site/src/i18n/messages/pt-BR/settings.json+++ b/site/src/i18n/messages/pt-BR/settings.json@@ -17,8 +17,9 @@"billingDescription": "Sua assinatura e saldo de créditos."},"pro": {- "title": "Donkey Pro",- "description": "Um limite mensal de uso renovado a cada mês — você ainda pode comprar créditos a qualquer momento.",+ "title": "Plano",+ "titlePlan": "Donkey {plan}",+ "description": "Um limite mensal de uso que se renova a cada mês.","status": "{status, select, active {ativo} trialing {em teste} past_due {em atraso} canceled {cancelado} incomplete {incompleto} unpaid {não pago} other {{status}}}","promotionUntil": "<b>Assine o Pro até {day}</b> e cada mês iniciado até lá incluirá {allowance}, {multiplier}× o habitual de {usual}.","promotionOpen": "Atualmente, cada mês inclui {allowance}, {multiplier}× o habitual de {usual}.",@@ -32,30 +33,14 @@"introDeadline": "{terms} Assine até {deadline}.","opening": "Abrindo…","manage": "Gerenciar faturamento",- "starting": "Iniciando…",- "subscribe": "Assinar o Pro",- "unavailable": "O faturamento não está disponível no momento."+ "unavailable": "O faturamento não está disponível no momento.",+ "seePlans": "Ver planos",+ "upgrade": "Fazer upgrade"},"credits": {"title": "Créditos",- "description": "Saldo pré-pago para o app Donkey. Compre mais a qualquer momento.",- "available": "Saldo disponível",- "buy": "Comprar créditos",- "preset": "{credits} · {price}",- "customLabel": "Créditos",- "starting": "Iniciando…",- "buyFor": "Comprar por {price}",- "buyPlain": "Comprar",- "checkoutFailed": "Não foi possível iniciar o checkout. Tente novamente em instantes.",- "autoReload": "Recarregar automaticamente quando o saldo estiver baixo",- "fallsBelow": "Quando o saldo ficar abaixo de",- "unit": "créditos",- "thenBuy": "comprar automaticamente",- "saving": "Salvando…",- "save": "Salvar",- "saveFailed": "Não foi possível salvar a recarga automática. Tente novamente em instantes.",- "lastFailed": "A última recarga automática falhou: {error}",- "needsCard": "A recarga automática precisa de um cartão salvo. <buy>Compre créditos uma vez</buy> para salvar um e depois ative este recurso."+ "description": "Seu saldo para recursos de IA. Plus, Pro e Max adicionam créditos a cada mês.",+ "available": "Saldo disponível"},"profile": {"loadFailed": "Não foi possível carregar seu perfil.",diff --git a/site/src/i18n/messages/zh-CN/billing.json b/site/src/i18n/messages/zh-CN/billing.jsonindex 108845ac..aaf0bfc7 100644--- a/site/src/i18n/messages/zh-CN/billing.json+++ b/site/src/i18n/messages/zh-CN/billing.json@@ -1,9 +1,7 @@{"notNow": "暂不","ok": "确定",- "upgradeToPro": "升级到 Pro","subscribeToPro": "订阅 Pro",- "buyCredits": "购买积分","billingUnavailable": "结算服务当前不可用。","offer": {"validThrough": "额外积分有效期至 {date}。",@@ -18,14 +16,8 @@"terms": "{months, plural, other {立享 {percent}% 优惠:前 # 个月 {price}/月,之后 {full}/月。}}"},"upgrade": {- "outOfCredits": "你的积分已用尽",- "proOutBody": "本月的 Pro 积分已用完。购买更多积分以继续生成。",- "projectsTitle": "升级以创建更多项目",- "creditsBody": "升级到 Pro,每月可获 {credits} 和 100 GB 云存储空间,只需 {price}。",- "creditsBodyOffer": "升级到 Pro,每月可获 {credits} 和 100 GB 云存储空间。",- "proPrice": "Pro 价格为 {price}。",- "projectsBodyStarter": "免费方案仅保留你的初始项目。Pro 则可随心创建任意数量的项目。",- "projectsBody": "除初始项目外,免费方案还可保留 {count, plural, other {# 个项目}}。Pro 则可随心创建任意数量的项目。"+ "projectsTitle": "获取无限制项目",+ "projectsBody": "Pro 和 Max 没有项目数量限制。"},"claim": {"expiredTitle": "此优惠已过期",@@ -51,9 +43,7 @@"graceToday": "你的 Pro 方案已结束。除非升级或释放 {bytes} 空间,否则你最早的云端项目将于今天被删除。","graceDays": "你的 Pro 方案已结束。除非升级或释放 {bytes} 空间,否则你最早的云端项目将在 {days, plural, other {# 天}}后被删除。","proBody": "删除不再需要的项目或媒体以释放空间。",- "body": "Pro 包含 100 GB 云存储空间。",- "bodyUsed": "已使用 {quota} 中的 {used}。Pro 包含 100 GB 云存储空间。",- "freeUpTerms": "或者删除不再需要的项目和媒体以释放空间。"+ "moreTitle": "获取更多云存储空间"},"subscribeBonus": {"daysLeft": "还剩 {count} 天",@@ -75,5 +65,22 @@"graceTooltip": "你的 Pro 方案已结束,且已超出免费额度。请在最早的项目被删除前升级或释放空间。","fullTooltip": "云存储空间已用尽。请升级或释放空间以继续上传。","usedTooltip": "已使用 {quota} 云存储空间中的 {used}。"+ },+ "plans": {+ "chooseTitle": "选择方案",+ "chooseBody": "每个方案每月均提供 AI 积分和更多云存储空间。",+ "freeOutTitle": "选择方案以继续生成",+ "paidOutTitle": "立即升级以获取更多积分",+ "paidOutBody": "你的 {plan} 积分将于 {date} 充值补满。",+ "topOutTitle": "你的 {plan} 积分将于 {date} 充值补满",+ "bestValue": "超值推荐",+ "billedMonthly": "按月计费",+ "introThen": "{months, plural, other {前 # 个月,之后 {price}/月}}",+ "stickerPercent": "{percent}%",+ "stickerOff": "优惠",+ "get": "获取 {plan}",+ "upgrade": "升级到 {plan}",+ "current": "当前方案",+ "footer": "价格以美元计。方案按月自动续费,直至取消。升级方案今日将收取差价。"}}diff --git a/site/src/i18n/messages/zh-CN/chat.json b/site/src/i18n/messages/zh-CN/chat.jsonindex efdea24a..35158e96 100644--- a/site/src/i18n/messages/zh-CN/chat.json+++ b/site/src/i18n/messages/zh-CN/chat.json@@ -27,7 +27,7 @@"writeCaption": "生成帖子文案和标签"},"workingEllipsis": "处理中…",- "insufficientCredits": "积分不足——<link>充值积分</link>",+ "insufficientCredits": "额度不足 —— <link>查看方案</link>","dropToAttach": "拖放即可添加","composerPlaceholder": "询问关于视频的问题,或告诉我需要修改什么… 输入 @ 引用文件、文件夹和笔记","dictate": "听写",@@ -140,7 +140,7 @@},"hostedError": {"insufficientCredits": "积分不足",- "insufficientCreditsReload": "积分不足,<link>在此充值</link>",+ "insufficientCreditsReload": "额度不足,<link>查看方案</link>","failed": "失败。"}}diff --git a/site/src/i18n/messages/zh-CN/common.json b/site/src/i18n/messages/zh-CN/common.jsonindex 6a230651..a256497d 100644--- a/site/src/i18n/messages/zh-CN/common.json+++ b/site/src/i18n/messages/zh-CN/common.json@@ -27,20 +27,23 @@"dialog": {"close": "关闭"},- "proPlan": {- "body": "利用 AI 生成富媒体内容。",+ "plans": {+ "body": "{plan, select, plus {低预算体验 AI 生成。} pro {用 AI 生成丰富媒体。} other {适合每月大量 AI 生成需求。}}","price": "{price}/月",+ "perMonth": "/月","storage": "{gb, number} GB 云存储空间",- "credits": "每月 {credits} 点 AI 额度",- "generation": "图像、视频、配音与音乐生成"+ "credits": "每月 {credits} 点 AI 积分",+ "generation": "图像、视频、配音和音乐生成",+ "unlimitedProjects": "不限项目数量",+ "renders": "每天 {count, number} 次导出与导入",+ "everythingIn": "包含 {plan} 的全部功能"},"apiErrors": {"checkout_no_url": "Stripe 未返回 URL。",- "credit_amount_out_of_range": "请选择 {min} 到 {max} 之间,且为整千数。",- "auto_reload_invalid": "请提供 enabled、thresholdDollars 和 amountDollars。",- "no_payment_method": "购买一次点数以保存银行卡,然后即可开启自动充值。","unsupported_image_type": "不支持的图片格式。",- "image_too_large": "图片过大。"+ "image_too_large": "图片过大。",+ "plan_not_an_upgrade": "该账号已在使用此方案或更高级方案。",+ "upgrade_payment_failed": "你的银行卡被拒,方案未作更改。请在账单中更新银行卡并重试。"},"languageSaveFailed": "无法保存语言设置。请重试。","languageBlocked": "此浏览器未保存 Cookie,因此无法更改语言。"diff --git a/site/src/i18n/messages/zh-CN/home.json b/site/src/i18n/messages/zh-CN/home.jsonindex 1eb1f2f1..ee97287b 100644--- a/site/src/i18n/messages/zh-CN/home.json+++ b/site/src/i18n/messages/zh-CN/home.json@@ -260,9 +260,9 @@"logOut": "退出登录"},"navStorage": {- "get100": "获取 100 GB",- "upgradeTip": "升级获取 100 GB + AI 积分",- "grace": "你的 Pro 计划已到期。请在最早的项目被删除前升级或释放 {size} 空间。"+ "upgrade": "升级",+ "upgradeTip": "查看包含更多存储空间和 AI 积分的方案",+ "grace": "你的方案已到期。请在最早的项目被删除前升级或释放 {size} 空间。"},"justNow": "刚刚"}diff --git a/site/src/i18n/messages/zh-CN/landing.json b/site/src/i18n/messages/zh-CN/landing.jsonindex e65cd2ec..3390b5a2 100644--- a/site/src/i18n/messages/zh-CN/landing.json+++ b/site/src/i18n/messages/zh-CN/landing.json@@ -20,8 +20,7 @@},"pricing": {"title": "价格<italic>简单透明</italic>",- "body": "编辑器完全免费,仅对 AI 生成的媒体内容按需付费。",- "footnote": "* 可随时购买积分用于生成 AI 内容。"+ "body": "编辑器完全免费,仅对 AI 生成的媒体内容按需付费。"},"plans": {"free": {@@ -34,10 +33,10 @@"tools": "导入、导出及本地转录","subscriptions": "关联你的 Claude 或 Codex 订阅"},- "pro": {- "detail": "面向个人创作者",- "cta": "获取 Pro",- "everythingInFree": "包含免费版的全部功能"+ "paid": {+ "detail": "{plan, select, plus {新手入门} pro {超值首选} other {适合高频生成}}",+ "cta": "获取 {plan}",+ "everythingInFree": "包含免费版的所有功能"}},"local": {diff --git a/site/src/i18n/messages/zh-CN/onboarding.json b/site/src/i18n/messages/zh-CN/onboarding.jsonindex 50abc459..67fa8b04 100644--- a/site/src/i18n/messages/zh-CN/onboarding.json+++ b/site/src/i18n/messages/zh-CN/onboarding.json@@ -51,11 +51,10 @@"plans": {"title": "简单明了的定价","subtitle": "编辑器完全免费,仅为 AI 生成的媒体内容付费。",- "forIndividuals": "个人版",- "getPro": "获取 Pro",+ "bestValue": "最超值",+ "getPlan": "获取 {plan}","getProOff": "立享 {percent}% 优惠升级 Pro","continueFree": "继续使用免费版",- "endsIn": "{percent}% 优惠剩余时间:{hours}小时 {minutes}分 {seconds}秒","covers": "{months, plural, other {前 # 个月每月此价格,之后 {price}/月}}"}}diff --git a/site/src/i18n/messages/zh-CN/settings.json b/site/src/i18n/messages/zh-CN/settings.jsonindex 1ee50b6a..13ea9c56 100644--- a/site/src/i18n/messages/zh-CN/settings.json+++ b/site/src/i18n/messages/zh-CN/settings.json@@ -17,8 +17,9 @@"billingDescription": "你的订阅和点数余额。"},"pro": {- "title": "Donkey Pro",- "description": "每月重置的使用额度——你仍可随时购买点数。",+ "title": "方案",+ "titlePlan": "Donkey {plan}",+ "description": "每月重置的使用额度。","status": "{status, select, active {有效} trialing {试用中} past_due {已逾期} canceled {已取消} incomplete {未完成} unpaid {未支付} other {{status}}}","promotionUntil": "<b>在 {day} 前开通 Pro</b>,在此之前开始的每个月均包含 {allowance},是平时 {usual} 的 {multiplier} 倍。","promotionOpen": "目前每个月均包含 {allowance},是平时 {usual} 的 {multiplier} 倍。",@@ -32,30 +33,14 @@"introDeadline": "{terms} 请在 {deadline} 前订阅。","opening": "正在打开…","manage": "管理账单",- "starting": "正在启动…",- "subscribe": "订阅 Pro",- "unavailable": "账单服务目前不可用。"+ "unavailable": "账单服务目前不可用。",+ "seePlans": "查看方案",+ "upgrade": "升级"},"credits": {"title": "点数",- "description": "Donkey 应用程序的按需付费余额。可随时购买更多。",- "available": "可用余额",- "buy": "购买点数",- "preset": "{credits} · {price}",- "customLabel": "点数",- "starting": "正在启动…",- "buyFor": "以 {price} 购买",- "buyPlain": "购买",- "checkoutFailed": "无法发起结账。请稍后重试。",- "autoReload": "余额不足时自动充值",- "fallsBelow": "当余额低于",- "unit": "点数",- "thenBuy": "自动购买",- "saving": "正在保存…",- "save": "保存",- "saveFailed": "无法保存自动充值设置。请稍后重试。",- "lastFailed": "上次自动充值失败:{error}",- "needsCard": "自动充值需要保存的银行卡。<buy>先购买一次点数</buy>以保存卡片,然后即可开启此功能。"+ "description": "用于 AI 功能的额度余额。Plus、Pro 和 Max 每月都会增加额度。",+ "available": "可用余额"},"profile": {"loadFailed": "无法加载个人资料。",diff --git a/site/src/lib/analytics.ts b/site/src/lib/analytics.tsindex 098dca16..c84982c1 100644--- a/site/src/lib/analytics.ts+++ b/site/src/lib/analytics.ts@@ -33,7 +33,7 @@ export type AnalyticsEvents = {cut_credits_pill_clicked: { credits: number; dollars: number };cut_storage_upgrade_shown: { source: "quota-413" | "render" | "pill" };// The upgrade wall at a free limit; intro is the open discount's percent, 0 for none.- upgrade_dialog_shown: { reason: "projects" | "credits"; pro: boolean; intro: number };+ upgrade_dialog_shown: { reason: "projects" | "credits" | "storage" | "plans"; pro: boolean; plan: string; intro: number };project_limit_hit: { limit: number };cut_grace_banner_shown: void;// First exposure to an experiment variant; the same value rides every@@ -63,14 +63,8 @@ export type AnalyticsEvents = {subscribe_bonus_offered: { dollars: number };subscribe_bonus_checkout_started: { dollars: number; minutesLeft: number; source: "editor" | "settings" | "email" };// Billing (settings).- pro_checkout_started: void;+ pro_checkout_started: { plan: string } | void;billing_portal_opened: void;- credits_checkout_started: { amountDollars: number };- credit_auto_reload_saved: {- enabled: boolean;- thresholdDollars: number;- amountDollars: number;- };};// Binds this browser's events to the signed-in account and records the appdiff --git a/site/src/lib/billing/meta-checkout.ts b/site/src/lib/billing/meta-checkout.tsindex c66748f8..2b7669ef 100644--- a/site/src/lib/billing/meta-checkout.ts+++ b/site/src/lib/billing/meta-checkout.ts@@ -1,6 +1,7 @@import type Stripe from "stripe";import { DONKEYCUT_CANONICAL } from "@/cut/lib/hosts";+import type { PlanTerms } from "@/lib/billing/plans";import { metaBrowser, type MetaBrowser, trackMetaEvent } from "@/lib/meta/conversions";// A purchase completes in Stripe's webhook, far from the browser that paid.@@ -28,7 +29,8 @@ const CENTS_PER_DOLLAR = 100;// checkout.session.async_payment_succeeded.const CONVERTED: ReadonlySet<Stripe.Checkout.Session["payment_status"]> = new Set(["paid", "no_payment_required"]);-export type CheckoutProduct = "Pro" | "Credits";+// The plan a checkout sells, by its display name.+export type CheckoutProduct = PlanTerms["name"];/** The browser behind a checkout request, as checkout session metadata. */export function metaCheckoutMetadata(headers: Headers): Record<string, string> {@@ -74,7 +76,9 @@ export function trackCheckoutPurchase(session: Stripe.Checkout.Session): void {ip: metadata[METADATA_KEYS.ip],userAgent: metadata[METADATA_KEYS.userAgent],},- content: session.mode === "subscription" ? "Pro" : "Credits",+ // The plan the checkout named; a credit purchase begun before they were+ // retired settles as "Credits".+ content: session.metadata?.plan ?? (session.mode === "subscription" ? "Pro" : "Credits"),id: `checkout-${session.id}`,name: "Purchase",url: CHECKOUT_PAGE,diff --git a/site/src/lib/billing/plans.ts b/site/src/lib/billing/plans.tsnew file mode 100644index 00000000..83bf54c9--- /dev/null+++ b/site/src/lib/billing/plans.ts@@ -0,0 +1,42 @@+// The paid plans and what each one buys, in one place: checkout, the webhook+// grant, the storage and project limits, and every card that sells a plan+// read these, so a price can't say two things in two parts of the product.+// Client-safe: no server imports.++// Cheapest first; a plan's place in this list is its rank.+export const PAID_PLANS = ["plus", "pro", "max"] as const;+export type PaidPlan = (typeof PAID_PLANS)[number];++export type PlanTerms = {+ // The display name, the same in every language.+ name: string;+ monthlyDollars: number;+ // The AI credits each billing period starts with.+ monthlyCredits: number;+ storageGb: number;+ // Whether the free project limit is lifted.+ unlimitedProjects: boolean;+ // Exports, URL imports and conversions a day (cut/server/cloud/limits.ts).+ rendersPerDay: number;+};++// Credits are charged at provider cost plus 30%, so a period's credits cost+// Donkey about 0.77 of their face value when spent in full. Max's 60,000+// credits come to ~$46 of provider cost against its $49 price.+export const PLAN_TERMS: Record<PaidPlan, PlanTerms> = {+ plus: { name: "Plus", monthlyDollars: 5, monthlyCredits: 5_000, storageGb: 10, unlimitedProjects: false, rendersPerDay: 10 },+ pro: { name: "Pro", monthlyDollars: 20, monthlyCredits: 20_000, storageGb: 100, unlimitedProjects: true, rendersPerDay: 200 },+ max: { name: "Max", monthlyDollars: 49, monthlyCredits: 60_000, storageGb: 500, unlimitedProjects: true, rendersPerDay: 500 },+};++// The plan every upsell marks as the best value.+export const RECOMMENDED_PLAN: PaidPlan = "pro";++export function isPaidPlan(value: unknown): value is PaidPlan {+ return typeof value === "string" && (PAID_PLANS as readonly string[]).includes(value);+}++/** Where a plan sits on the ladder: free is 0, Plus 1, Pro 2, Max 3. */+export function planRank(plan: PaidPlan | null): number {+ return plan === null ? 0 : PAID_PLANS.indexOf(plan) + 1;+}diff --git a/site/src/lib/billing/pro-subscription.test.ts b/site/src/lib/billing/pro-subscription.test.tsindex d2d4236a..ffb8f3f7 100644--- a/site/src/lib/billing/pro-subscription.test.ts+++ b/site/src/lib/billing/pro-subscription.test.ts@@ -1,7 +1,7 @@import { describe, expect, test } from "bun:test";import type Stripe from "stripe";-import { scheduledProEnd, subscriptionCancelAt } from "@/lib/billing/pro-subscription";+import { planAllowanceMicros, scheduledProEnd, subscriptionCancelAt, subscriptionPlan } from "@/lib/billing/pro-subscription";const PERIOD_START = 1_767_225_600; // 2026-01-01T00:00:00Zconst PERIOD_END = 1_769_904_000; // 2026-02-01T00:00:00Z@@ -62,3 +62,31 @@ describe("scheduledProEnd", () => {expect(scheduledProEnd({ cancelAt: null, cancelAtPeriodEnd: false, currentPeriodEnd })).toBeNull();});});++describe("subscriptionPlan", () => {+ const prices = { plus: "price_plus", pro: "price_pro", max: "price_max" };+ const withPrice = (id: string) =>+ subscription({+ items: { data: [{ current_period_end: PERIOD_END, current_period_start: PERIOD_START, price: { id } }] },+ } as unknown as Partial<Stripe.Subscription>);++ test("names the plan its price sells", () => {+ expect(subscriptionPlan(withPrice("price_plus"), prices)?.plan).toBe("plus");+ expect(subscriptionPlan(withPrice("price_pro"), prices)?.plan).toBe("pro");+ expect(subscriptionPlan(withPrice("price_max"), prices)?.plan).toBe("max");+ });++ test("a price no plan sells is no plan", () => {+ expect(subscriptionPlan(withPrice("price_other"), prices)).toBeNull();+ expect(subscriptionPlan(withPrice("price_pro"), { ...prices, pro: null })).toBeNull();+ });+});++describe("planAllowanceMicros", () => {+ // 1,000 credits a dollar; a dollar is a million micros.+ test("grants each plan's credits", () => {+ expect(planAllowanceMicros("plus")).toBe(BigInt(5_000_000));+ expect(planAllowanceMicros("pro")).toBe(BigInt(20_000_000));+ expect(planAllowanceMicros("max")).toBe(BigInt(60_000_000));+ });+});diff --git a/site/src/lib/billing/pro-subscription.ts b/site/src/lib/billing/pro-subscription.tsindex 47de324a..387023db 100644--- a/site/src/lib/billing/pro-subscription.ts+++ b/site/src/lib/billing/pro-subscription.ts@@ -7,16 +7,15 @@ import {} from "@/lib/billing/stripe";import { promotedAllowanceMicros } from "@/lib/billing/allowance-promotion";import { getGlobalSetting } from "@/lib/config/effective";-import { creditMicrosPerCent, zeroCreditMicros } from "@/lib/credits/amounts";+import { PAID_PLANS, PLAN_TERMS, type PaidPlan } from "@/lib/billing/plans";+import { creditStringToMicros, zeroCreditMicros } from "@/lib/credits/amounts";+import { creditsPerDollar } from "@/lib/credits/format-credits";import { grantCredits } from "@/lib/credits/inference";import { claimOfferBySubscribing, SUBSCRIBE_BONUS_METADATA_KEY } from "@/lib/credits/subscribe-bonus-claim";import { prisma } from "@/lib/prisma";-// Donkey Pro: the Mac app subscription.-export const proPlanKey = "pro";--// Stripe subscription statuses that include the Pro allowance, as a list so a-// database filter can reuse it.+// Stripe subscription statuses that include a plan's allowance, as a list so+// a database filter can reuse it.export const ACTIVE_PRO_STATUSES = ["active", "trialing"] as const;const activeStatuses = new Set<string>(ACTIVE_PRO_STATUSES);@@ -53,24 +52,25 @@ export function scheduledProEnd(subscription: ProEndAnchor): Date | null {return subscription.cancelAtPeriodEnd ? subscription.currentPeriodEnd : null;}-export function proPriceId(): string | undefined {- return process.env.STRIPE_PRO_PRICE_ID || undefined;+// Each plan's recurring Stripe price, from the planPrices setting.+export type PlanPrices = Record<PaidPlan, string | null>;++export function readPlanPrices(): Promise<PlanPrices> {+ return getGlobalSetting("planPrices");}-// The included monthly inference allowance equals the Pro plan price: a $20/mo-// plan includes $20 of app inference each period. Read straight from the-// recurring price's unit_amount (cents) — no separate metadata to configure.-export function allowanceMicrosFromPrice(- price: Stripe.Price | null | undefined,-): bigint {- const cents = price?.unit_amount;- if (typeof cents === "number" && Number.isFinite(cents) && cents > 0) {- return BigInt(Math.round(cents)) * creditMicrosPerCent;- }- return zeroCreditMicros;+export async function planPriceId(plan: PaidPlan): Promise<string | null> {+ return (await readPlanPrices())[plan];+}++// The credits a plan's billing period starts with, as ledger micros.+export function planAllowanceMicros(plan: PaidPlan): bigint {+ return creditStringToMicros(String(PLAN_TERMS[plan].monthlyCredits / creditsPerDollar));}-export async function getActiveProSubscription(userId: string) {+// The account's running subscription, whichever plan it is on; null for a+// free account.+export async function getActiveSubscription(userId: string) {const subscription = await prisma.proSubscription.findUnique({where: { userId },});@@ -80,22 +80,22 @@ export async function getActiveProSubscription(userId: string) {return subscription;}-// The subscription's Pro line item, if any. Matches across ALL items (not just-// the first), so a multi-item subscription is still recognized as Pro and its-// price/period are read from the right item rather than items.data[0].-function proItem(+// The subscription's plan line item and the plan its price sells, or null+// for a subscription to no plan. Matches across ALL items (not just the+// first), so a multi-item subscription is still recognized and its period is+// read from the right item.+export function subscriptionPlan(subscription: Stripe.Subscription,-): Stripe.SubscriptionItem | undefined {- const id = proPriceId();- return id- ? subscription.items.data.find((item) => item.price?.id === id)- : undefined;-}--// True when the subscription includes the Pro price. Used to route shared-// subscription webhook events to the right product sync.-export function subscriptionIsPro(subscription: Stripe.Subscription): boolean {- return proItem(subscription) !== undefined;+ prices: PlanPrices,+): { plan: PaidPlan; item: Stripe.SubscriptionItem } | null {+ for (const plan of PAID_PLANS) {+ const id = prices[plan];+ const item = id ? subscription.items.data.find((i) => i.price?.id === id) : undefined;+ if (item) {+ return { plan, item };+ }+ }+ return null;}// Source of truth for a Pro subscription's lifecycle. Maps the Stripe object@@ -105,6 +105,7 @@ export function subscriptionIsPro(subscription: Stripe.Subscription): boolean {// and the create/update/invoice events for one period grant the allowance once.export async function syncProSubscription(subscription: Stripe.Subscription,+ { plan, item }: { plan: PaidPlan; item: Stripe.SubscriptionItem },): Promise<void> {const userId = await resolveSubscriptionUserId(subscription);const customerId = stripeId(subscription.customer);@@ -116,19 +117,17 @@ export async function syncProSubscription(return;}- const item = proItem(subscription) ?? subscription.items.data[0];- const price = item?.price;- const periodStart = unixToDate(item?.current_period_start ?? null);- const periodEnd = unixToDate(item?.current_period_end ?? null);+ const periodStart = unixToDate(item.current_period_start);+ const periodEnd = unixToDate(item.current_period_end);const cancelAt = subscriptionCancelAt(subscription);const endedAt = unixToDate(subscription.ended_at);const allowanceMicros = periodStart? promotedAllowanceMicros(- allowanceMicrosFromPrice(price),+ planAllowanceMicros(plan),await getGlobalSetting("proAllowancePromotion"),periodStart,)- : allowanceMicrosFromPrice(price);+ : planAllowanceMicros(plan);await prisma.proSubscription.upsert({create: {@@ -138,7 +137,7 @@ export async function syncProSubscription(currentPeriodStart: periodStart,endedAt,monthlyAllowanceMicros: allowanceMicros,- planKey: proPlanKey,+ planKey: plan,status: subscription.status,stripeCustomerId: customerId,stripeSubscriptionId: subscription.id,@@ -151,6 +150,7 @@ export async function syncProSubscription(currentPeriodStart: periodStart,endedAt,monthlyAllowanceMicros: allowanceMicros,+ planKey: plan,status: subscription.status,stripeCustomerId: customerId,stripeSubscriptionId: subscription.id,@@ -176,13 +176,13 @@ export async function syncProSubscription() {await grantCredits({amountMicros: allowanceMicros,- description: "Donkey Pro monthly allowance",+ description: `Donkey ${PLAN_TERMS[plan].name} monthly allowance`,expiresAt: periodEnd,- metadata: { plan: proPlanKey },+ metadata: { plan },periodEnd,periodStart,source: "pro_subscription",- sourceId: `pro:${subscription.id}:${item?.current_period_start ?? 0}`,+ sourceId: `pro:${subscription.id}:${item.current_period_start}`,userId,});}diff --git a/site/src/lib/billing/project-limit-server.ts b/site/src/lib/billing/project-limit-server.tsindex ca4780bd..c6701fd9 100644--- a/site/src/lib/billing/project-limit-server.ts+++ b/site/src/lib/billing/project-limit-server.ts@@ -1,18 +1,20 @@import { starterProjectId } from "@/cut/lib/starter";-import { getActiveProSubscription } from "@/lib/billing/pro-subscription";+import { PLAN_TERMS, isPaidPlan } from "@/lib/billing/plans";+import { getActiveSubscription } from "@/lib/billing/pro-subscription";import { contextForUser, getSetting } from "@/lib/config/effective";import { prisma } from "@/lib/prisma";import { projectLimitFull } from "./project-limit";-/** Whether a free account's cloud projects fill its limit. The cloud is all a+/** Whether an account held to the free project limit has filled it. The cloud is all a* server can count; the page's gate counts every shelf. */export async function cloudProjectsFull(userId: string): Promise<boolean> {const { projects: limit } = await getSetting("freeProjectLimit", await contextForUser(userId, null));if (limit === null) {return false;}- if (await getActiveProSubscription(userId)) {+ const subscription = await getActiveSubscription(userId);+ if (subscription && isPaidPlan(subscription.planKey) && PLAN_TERMS[subscription.planKey].unlimitedProjects) {return false;}diff --git a/site/src/lib/config/audienceFacts.ts b/site/src/lib/config/audienceFacts.tsindex d37b9a16..b6b1b42f 100644--- a/site/src/lib/config/audienceFacts.ts+++ b/site/src/lib/config/audienceFacts.ts@@ -36,7 +36,7 @@ export async function collectFactsFor(const [pro, paid, sessions, storage, credits] = await Promise.all([wantsPro? prisma.proSubscription.findMany({- select: { userId: true },+ select: { planKey: true, userId: true },where: { status: { in: [...ACTIVE_PRO_STATUSES] }, userId: { in: ids } },}): [],@@ -63,6 +63,8 @@ export async function collectFactsFor(}): [],]);+ // Any running plan counts as subscribed; the plan itself sizes the quota.+ const planBy = new Map(pro.map((row) => [row.userId, row.planKey]));for (const row of pro) facts.get(row.userId)!.pro = true;for (const row of paid) facts.get(row.userId)!.paid = true;for (const row of sessions) facts.get(row.userId)!.lastActiveAt = row._max.updatedAt;@@ -71,7 +73,7 @@ export async function collectFactsFor(const bytesBy = new Map(usage.map((row) => [row.userId, Number(row.bytes)]));for (const tier of tiers) {const fact = facts.get(tier.id)!;- const quota = cutLimitsForTier({ superUser: tier.superUser, pro: fact.pro }).storageBytes;+ const quota = cutLimitsForTier({ superUser: tier.superUser, plan: planBy.get(tier.id) ?? null }).storageBytes;fact.storageUsedPercent = quota === null ? null : clampPercent((100 * (bytesBy.get(tier.id) ?? 0)) / quota);}}diff --git a/site/src/lib/config/registry.ts b/site/src/lib/config/registry.tsindex b28a9902..b390c232 100644--- a/site/src/lib/config/registry.ts+++ b/site/src/lib/config/registry.ts@@ -196,7 +196,7 @@ export const SETTINGS = defineSettings({percentOff: z.number().int().min(0).max(90),// Billing months the discount covers.months: z.number().int().min(1).max(12),- // Hours after signup the offer stays open.+ // Hours the offer stays open after the account first sees it.windowHours: z.number().int().min(1).max(24 * 30),}).strict(),@@ -204,7 +204,7 @@ export const SETTINGS = defineSettings({public: true,title: "Intro offer",description:- "A discount on the first months of Pro for an account that subscribes within this many hours of signing up and has never held Pro. Checkout applies it on its own.",+ "A discount on the first months of Pro for an account that has never held a plan. It opens the first time the account sees it and closes this many hours later, for good. Checkout applies it on its own.",},freeProjectLimit: {schema: z@@ -219,18 +219,21 @@ export const SETTINGS = defineSettings({description:"How many projects a free account may hold besides its starter project. Creating one more opens the upgrade dialog.",},- outOfCreditsUpsell: {+ planPrices: {schema: z.object({- // "dialog" opens the upgrade dialog when a request runs out of credits.- mode: z.enum(["off", "dialog"]),+ // Each paid plan's recurring monthly Stripe price; null leaves the+ // plan unsold.+ plus: z.string().regex(/^price_/, "price_…").nullable(),+ pro: z.string().regex(/^price_/, "price_…").nullable(),+ max: z.string().regex(/^price_/, "price_…").nullable(),}).strict(),- default: { mode: "off" },- public: true,- title: "Out of credits upsell",+ default: { plus: null, pro: null, max: null },+ public: false,+ title: "Plan prices",description:- "What happens when the server refuses a request for credits. Off leaves the inline notice; dialog also opens the upgrade dialog, which sells Pro to a free account and credits to a Pro one. A Generate button the balance can't cover opens the dialog either way.",+ "The Stripe price each paid plan checks out with. A plan without one can't be bought, and a subscription to a price not listed here is no plan.",},});diff --git a/site/src/lib/credits/subscribe-bonus.ts b/site/src/lib/credits/subscribe-bonus.tsindex c7fdbe9d..45b854d7 100644--- a/site/src/lib/credits/subscribe-bonus.ts+++ b/site/src/lib/credits/subscribe-bonus.ts@@ -1,5 +1,5 @@import type { CreditOffer } from "@/generated/prisma/client";-import { getActiveProSubscription } from "@/lib/billing/pro-subscription";+import { getActiveSubscription } from "@/lib/billing/pro-subscription";import { getSetting, type ConfigContext } from "@/lib/config/effective";import { creditMicrosToString, creditStringToMicros, zeroCreditMicros } from "@/lib/credits/amounts";import { creditOfferOpen } from "@/lib/credits/offers";@@ -101,7 +101,7 @@ export async function readSubscribeBonusOffer(ctx: ConfigContext, now = new Date// most accounts out before the configuration is resolved.const [offers, pro, grant] = await Promise.all([findOffersForSubscribing(ctx.userId),- getActiveProSubscription(ctx.userId),+ getActiveSubscription(ctx.userId),prisma.userCreditGrant.findFirst({where: { userId: ctx.userId, source: SIGNUP_GRANT_SOURCE },select: { id: true, originalAmountMicros: true, remainingAmountMicros: true },diff --git a/site/src/queries/billing.ts b/site/src/queries/billing.tsindex 065ddf98..396f8b6c 100644--- a/site/src/queries/billing.ts+++ b/site/src/queries/billing.ts@@ -2,6 +2,7 @@import { useMutation, useQuery } from "@tanstack/react-query";+import type { PaidPlan } from "@/lib/billing/plans";import { apiFetch } from "@/queries/apiClient";export const proSubscriptionQueryKey = ["billing", "pro"] as const;@@ -9,6 +10,8 @@ export const introOfferQueryKey = ["billing", "intro-offer"] as const;export type ProSubscription = {isActive: boolean;+ // The running plan; null on a free account.+ plan: PaidPlan | null;status: string | null;// End of the current billing period: the allowance resets and the plan// renews here.@@ -40,11 +43,13 @@ export type IntroOffer = {};// The discount an account inside its intro window gets on Pro. Checkout-// applies it on its own; this read is for the surfaces that show it.+// applies it on its own; this read is for the surfaces that show it, and the+// first one starts the window.export function useIntroOffer({ enabled = true }: { enabled?: boolean } = {}) {return useQuery({enabled,- queryFn: async () => (await apiFetch<{ offer: IntroOffer | null }>("/api/billing/intro-offer")).offer,+ queryFn: async () =>+ (await apiFetch<{ offer: IntroOffer | null }>("/api/billing/intro-offer", { method: "POST" })).offer,queryKey: introOfferQueryKey,staleTime: 5 * 60_000,});@@ -52,11 +57,13 @@ export function useIntroOffer({ enabled = true }: { enabled?: boolean } = {}) {// Mutations return the Stripe URL; the caller redirects the browser. We don't// invalidate here because the user leaves the page for Stripe.-// A checkout opened from an offer's claim link passes the offer's token, so-// the credit that lands is the one the dialog described.+// A checkout names its plan (Pro when unnamed). One opened from an offer's+// claim link passes the offer's token, so the credit that lands is the one the+// dialog described. An account already on a plan moves up in place and comes+// back with the settings URL.export function useStartCheckout() {return useMutation({- mutationFn: (input?: { offerToken: string } | void) =>+ mutationFn: (input?: { plan?: PaidPlan; offerToken?: string } | void) =>apiFetch<{ url: string }>("/api/billing/checkout", {method: "POST",...(input ? { body: JSON.stringify(input) } : {}),