diff --git a/app/(control)/admin/layout.tsx b/app/(control)/admin/layout.tsx
index f0741a7..16242e3 100644
--- a/app/(control)/admin/layout.tsx
+++ b/app/(control)/admin/layout.tsx
@@ -8,22 +8,42 @@ export default async function AdminLayout({ children }: { children: React.ReactN
   const locale = await controlLocale();
   const t = await getTranslations({ locale, namespace: "control.shell" });
 
+  // Grouped by the question each section answers — who wants to buy, who is
+  // running, what is being charged, what happened — not by the order the pages
+  // were built. Ten equal-weight links in a header row was a list to scan
+  // rather than a structure to navigate.
   return (
     <ControlShell
       title={t("admin")}
       userLabel={user.name}
       signOutLabel={t("signOut")}
-      nav={[
-        { href: "/admin", label: t("nav.applications") },
-        { href: "/admin/signups", label: t("nav.signups") },
-        { href: "/admin/partners", label: t("nav.partners") },
-        { href: "/admin/clients", label: t("nav.clients") },
-        { href: "/admin/tenants", label: t("nav.tenants") },
-        { href: "/admin/fleet", label: t("nav.fleet") },
-        { href: "/admin/provision", label: t("nav.provision") },
-        { href: "/admin/onboard", label: t("nav.onboard") },
-        { href: "/admin/billing", label: t("nav.billing") },
-        { href: "/admin/audit", label: t("nav.audit") },
+      groups={[
+        {
+          label: t("groups.pipeline"),
+          items: [
+            { href: "/admin", label: t("nav.applications") },
+            { href: "/admin/signups", label: t("nav.signups") },
+            { href: "/admin/partners", label: t("nav.partners") },
+            { href: "/admin/clients", label: t("nav.clients") },
+          ],
+        },
+        {
+          label: t("groups.tenants"),
+          items: [
+            { href: "/admin/tenants", label: t("nav.tenants") },
+            { href: "/admin/provision", label: t("nav.provision") },
+            { href: "/admin/onboard", label: t("nav.onboard") },
+            { href: "/admin/fleet", label: t("nav.fleet") },
+          ],
+        },
+        {
+          label: t("groups.money"),
+          items: [{ href: "/admin/billing", label: t("nav.billing") }],
+        },
+        {
+          label: t("groups.system"),
+          items: [{ href: "/admin/audit", label: t("nav.audit") }],
+        },
       ]}
     >
       {children}
diff --git a/components/control/ControlShell.tsx b/components/control/ControlShell.tsx
index 2759cb7..9152da2 100644
--- a/components/control/ControlShell.tsx
+++ b/components/control/ControlShell.tsx
@@ -1,44 +1,58 @@
 import Link from "next/link";
 import BrandMark from "@/components/BrandMark";
 import { logoutAction } from "@/lib/actions/auth-actions";
+import SidebarNav, { type NavGroup, type NavItem } from "./SidebarNav";
 
 /** Shared chrome for the partner dashboard and founder admin. Labels arrive
- *  translated from the server layouts (control-plane i18n, sofra #9). */
+ *  translated from the server layouts (control-plane i18n, sofra #9).
+ *
+ *  Two nav shapes, because the two surfaces are different sizes: the partner
+ *  dashboard has one to three destinations and keeps them inline in the header
+ *  (`nav`), while admin has ten and gets a grouped sidebar (`groups`) — ten
+ *  equal-weight links in a row is a list to scan, not a structure to navigate.
+ *  The sidebar collapses to a scrollable strip under the header on small
+ *  screens rather than hiding behind a toggle: no JS, nothing to discover. */
 export default function ControlShell({
   title,
   nav,
+  groups,
   userLabel,
   signOutLabel,
   children,
 }: {
   title: string;
-  nav: { href: string; label: string }[];
+  nav?: NavItem[];
+  groups?: NavGroup[];
   userLabel: string;
   signOutLabel: string;
   children: React.ReactNode;
 }) {
+  const inlineNav = nav ?? [];
   return (
     <>
       <header className="sticky top-0 z-40 bg-background/90 backdrop-blur-xs border-b-2 border-border">
-        <div className="mx-auto max-w-6xl px-6 h-16 flex items-center justify-between gap-4">
+        <div className="mx-auto max-w-7xl px-6 h-16 flex items-center justify-between gap-4">
           <div className="flex items-center gap-6 min-w-0">
-            <Link
-              href="/"
-              className="flex items-center gap-2 text-primary shrink-0"
-            >
+            <Link href="/" className="flex items-center gap-2 text-primary shrink-0">
               <BrandMark className="h-9 w-auto" />
               <span className="font-hand text-3xl font-bold">SofraPiwas</span>
             </Link>
             <span className="masking-tape font-label text-sm px-3 py-0.5 text-muted-foreground shrink-0">
               {title}
             </span>
-            <nav className="hidden md:flex items-center gap-5 font-label text-lg">
-              {nav.map((item) => (
-                <a key={item.href} href={item.href} className="hover:text-primary transition-colors">
-                  {item.label}
-                </a>
-              ))}
-            </nav>
+            {inlineNav.length > 0 && (
+              <nav className="hidden md:flex items-center gap-5 font-label text-lg">
+                {inlineNav.map((item) => (
+                  <a
+                    key={item.href}
+                    href={item.href}
+                    className="hover:text-primary transition-colors"
+                  >
+                    {item.label}
+                  </a>
+                ))}
+              </nav>
+            )}
           </div>
           <div className="flex items-center gap-4 shrink-0">
             <span className="hidden sm:block font-label text-sm text-muted-foreground truncate max-w-40">
@@ -54,16 +68,28 @@ export default function ControlShell({
             </form>
           </div>
         </div>
-        {/* Mobile nav row */}
-        <nav className="md:hidden mx-auto max-w-6xl px-6 pb-3 flex flex-wrap gap-4 font-label">
-          {nav.map((item) => (
-            <a key={item.href} href={item.href} className="hover:text-primary transition-colors">
-              {item.label}
-            </a>
-          ))}
-        </nav>
+        {inlineNav.length > 0 && (
+          /* Mobile nav row (inline shape only — the sidebar has its own) */
+          <nav className="md:hidden mx-auto max-w-7xl px-6 pb-3 flex flex-wrap gap-4 font-label">
+            {inlineNav.map((item) => (
+              <a key={item.href} href={item.href} className="hover:text-primary transition-colors">
+                {item.label}
+              </a>
+            ))}
+          </nav>
+        )}
       </header>
-      <main className="mx-auto max-w-6xl px-6 py-10">{children}</main>
+
+      {groups ? (
+        <div className="mx-auto max-w-7xl px-6 lg:flex lg:gap-8">
+          <aside className="lg:w-52 lg:shrink-0 lg:sticky lg:top-16 lg:self-start lg:max-h-[calc(100vh-4rem)] lg:overflow-y-auto py-3 lg:py-8 border-b-2 lg:border-b-0 lg:border-r-2 border-border lg:pr-4">
+            <SidebarNav groups={groups} />
+          </aside>
+          <main className="min-w-0 flex-1 py-8">{children}</main>
+        </div>
+      ) : (
+        <main className="mx-auto max-w-6xl px-6 py-10">{children}</main>
+      )}
     </>
   );
 }
diff --git a/components/control/ProvisionForm.tsx b/components/control/ProvisionForm.tsx
index b8b63a9..d6eec73 100644
--- a/components/control/ProvisionForm.tsx
+++ b/components/control/ProvisionForm.tsx
@@ -7,6 +7,7 @@ import {
   type ProvisionActionState,
 } from "@/lib/actions/provisioning-actions";
 import ActionError from "./ActionError";
+import ProvisionPicker from "./ProvisionPicker";
 
 /**
  * Admin form that proposes a new tenant (ADR-012): submits to the server action
@@ -75,21 +76,16 @@ export default function ProvisionForm({ disabled }: Readonly<{ disabled?: boolea
         aria-label={t("provision.currency")}
         className="input-primary"
       />
-      <input
-        name="languages"
-        required
-        defaultValue="en, nl"
-        placeholder={t("provision.languages")}
-        aria-label={t("provision.languages")}
-        className="input-primary"
-      />
-      <input
-        name="modules"
-        required
-        defaultValue="core"
-        placeholder={t("provision.modules")}
-        aria-label={t("provision.modules")}
-        className="input-primary"
+      <ProvisionPicker
+        labels={{
+          modules: t("provision.modules"),
+          modulesCore: t("provision.modulesCore"),
+          languages: t("provision.languages"),
+          languagesHint: t("provision.languagesHint"),
+          price: t("provision.price"),
+          priceBundle: t("provision.priceBundle"),
+          priceALaCarte: t("provision.priceALaCarte"),
+        }}
       />
       <div className="sm:col-span-2 flex flex-wrap items-center gap-4">
         <button type="submit" disabled={pending || disabled} className="btn-primary disabled:opacity-60">
diff --git a/components/control/ProvisionPicker.tsx b/components/control/ProvisionPicker.tsx
new file mode 100644
index 0000000..df19dbc
--- /dev/null
+++ b/components/control/ProvisionPicker.tsx
@@ -0,0 +1,130 @@
+"use client";
+
+import { useState } from "react";
+import {
+  BUNDLES,
+  MODULES,
+  TENANT_LANGUAGES,
+  extraLanguageCount,
+  quoteModules,
+  type ModuleId,
+} from "@/lib/module-catalog";
+import { eur } from "@/lib/format";
+
+/**
+ * Module + language pickers for the provisioning form (ADR-010 catalog).
+ *
+ * These were free-text comma lists, which asked the founder to remember eight
+ * exact ids and ten locale codes and rejected them after the fact. Checkboxes
+ * carry the same values — the server action reads `getAll` and joins, so the
+ * registry entry and the validation are unchanged.
+ *
+ * The running price is the reason this is a client component: the selection
+ * feeds `/admin/onboard`'s amount field, and computing it here means the two
+ * numbers come from one source instead of a mental sum.
+ */
+export default function ProvisionPicker({
+  labels,
+}: Readonly<{
+  labels: {
+    modules: string;
+    modulesCore: string;
+    languages: string;
+    languagesHint: string;
+    price: string;
+    priceBundle: string;
+    priceALaCarte: string;
+  };
+}>) {
+  const [modules, setModules] = useState<ModuleId[]>([]);
+  const [languages, setLanguages] = useState<string[]>(["en", "nl"]);
+
+  const toggle = <T extends string>(list: T[], value: T, on: boolean): T[] =>
+    on ? [...list, value] : list.filter((v) => v !== value);
+
+  const extras = extraLanguageCount(languages);
+  // The add-on is per-tenant, not per-language: selecting it once covers them
+  // all, so the quote takes the flag from the language count.
+  const selection: ModuleId[] = extras > 0 ? [...modules, "extra-languages"] : modules;
+  const quote = quoteModules(selection);
+  const bundle = BUNDLES.find((b) => b.id === quote.bundle);
+
+  return (
+    <>
+      <fieldset className="sm:col-span-2 border-2 border-border rounded-craft p-3">
+        <legend className="font-label px-1 text-sm text-muted-foreground">{labels.modules}</legend>
+        {/* Core is mandatory — every instance runs it — so it is stated, not offered,
+            and carried by a hidden input because a disabled checkbox submits nothing. */}
+        <input type="hidden" name="modules" value="core" />
+        <p className="font-label text-sm mb-2">
+          {labels.modulesCore} · {eur(MODULES.find((m) => m.id === "core")!.priceCents)}
+        </p>
+        <div className="grid gap-1 sm:grid-cols-2">
+          {MODULES.filter((m) => m.id !== "core" && m.id !== "extra-languages").map((m) => (
+            <label key={m.id} className="flex items-start gap-2 font-label text-sm">
+              <input
+                type="checkbox"
+                name="modules"
+                value={m.id}
+                checked={modules.includes(m.id)}
+                onChange={(e) => setModules((prev) => toggle(prev, m.id, e.target.checked))}
+                className="mt-1 accent-primary"
+              />
+              <span>
+                <span className="font-bold">{m.id}</span> · {eur(m.priceCents)}
+                <br />
+                <span className="text-muted-foreground">{m.surface}</span>
+              </span>
+            </label>
+          ))}
+        </div>
+      </fieldset>
+
+      <fieldset className="sm:col-span-2 border-2 border-border rounded-craft p-3">
+        <legend className="font-label px-1 text-sm text-muted-foreground">{labels.languages}</legend>
+        {/* English is the tenant app's fallback locale, so it ships regardless —
+            disabled inputs don't submit, hence the hidden one. First in source
+            order so the registry list reads en, …. */}
+        <input type="hidden" name="languages" value="en" />
+        <div className="flex flex-wrap gap-x-4 gap-y-1">
+          {TENANT_LANGUAGES.map((l) => (
+            <label key={l.code} className="flex items-center gap-2 font-label text-sm">
+              <input
+                type="checkbox"
+                name="languages"
+                value={l.code}
+                checked={languages.includes(l.code)}
+                disabled={l.code === "en"}
+                onChange={(e) => setLanguages((prev) => toggle(prev, l.code, e.target.checked))}
+                className="accent-primary"
+              />
+              <span>
+                {l.label} <span className="text-muted-foreground">({l.code})</span>
+              </span>
+            </label>
+          ))}
+        </div>
+        {/* Priced AND recorded: the quote adds extra-languages past English + one,
+            so the registry entry has to carry it too or the tenant is billed for a
+            module their instance was never marked as having. */}
+        {extras > 0 && <input type="hidden" name="modules" value="extra-languages" />}
+        <p className="font-label text-xs text-muted-foreground mt-2">{labels.languagesHint}</p>
+      </fieldset>
+
+      <output className="sm:col-span-2 font-label text-sm">
+        <span className="font-bold text-lg text-primary">
+          {labels.price}: {eur(quote.monthlyCents)}
+        </span>
+        {bundle && (
+          <span className="text-muted-foreground">
+            {" "}
+            — {labels.priceBundle} «{bundle.id}»
+            {quote.aLaCarteCents > quote.monthlyCents && (
+              <> ({labels.priceALaCarte} {eur(quote.aLaCarteCents)})</>
+            )}
+          </span>
+        )}
+      </output>
+    </>
+  );
+}
diff --git a/components/control/SidebarNav.tsx b/components/control/SidebarNav.tsx
new file mode 100644
index 0000000..769d095
--- /dev/null
+++ b/components/control/SidebarNav.tsx
@@ -0,0 +1,79 @@
+"use client";
+
+import Link from "next/link";
+import { usePathname } from "next/navigation";
+
+export interface NavItem {
+  href: string;
+  label: string;
+}
+
+export interface NavGroup {
+  label: string;
+  items: NavItem[];
+}
+
+/**
+ * Admin navigation. Client-side only to mark the current page — the links are
+ * plain <Link>s, so navigation works untouched without JS.
+ *
+ * Two renderings of the same items, because a vertical sidebar on a phone means
+ * scrolling past ten links to reach the page: below `lg` it is a compact
+ * wrapped row (group labels dropped — the grouping is a desktop scanning aid,
+ * not information), and from `lg` it is the grouped column.
+ *
+ * "Current" is longest-prefix, not equality, so /admin/clients/<id> still lights
+ * up Clients. /admin is the exception — every admin path starts with it, so it
+ * only matches exactly.
+ */
+export default function SidebarNav({ groups }: Readonly<{ groups: NavGroup[] }>) {
+  const pathname = usePathname();
+  const active = groups
+    .flatMap((g) => g.items.map((i) => i.href))
+    .filter((h) => (h === "/admin" ? pathname === h : pathname === h || pathname.startsWith(`${h}/`)))
+    .sort((a, b) => b.length - a.length)[0];
+
+  const link = (item: NavItem, block: boolean) => {
+    const isActive = item.href === active;
+    return (
+      <Link
+        href={item.href}
+        aria-current={isActive ? "page" : undefined}
+        className={`${block ? "block" : "inline-block"} rounded-craft px-3 py-1.5 transition-colors ${
+          isActive ? "bg-primary/10 text-primary font-bold" : "hover:bg-foreground/5 hover:text-primary"
+        }`}
+      >
+        {item.label}
+      </Link>
+    );
+  };
+
+  return (
+    <nav aria-label="Admin sections" className="font-label">
+      {/* Phone / tablet: one compact wrapped row. */}
+      <ul className="lg:hidden flex flex-wrap gap-x-1 gap-y-0.5 -mx-3">
+        {groups.flatMap((g) => g.items).map((item) => (
+          <li key={item.href}>{link(item, false)}</li>
+        ))}
+      </ul>
+
+      {/* Desktop: grouped column. */}
+      <div className="hidden lg:block">
+        {groups.map((group) => (
+          <div key={group.label} className="mb-5 last:mb-0">
+            <h2 className="px-3 mb-1 text-xs uppercase tracking-wider text-muted-foreground/80">
+              {group.label}
+            </h2>
+            <ul className="flex flex-col gap-0.5">
+              {group.items.map((item) => (
+                <li key={item.href} className="text-lg">
+                  {link(item, true)}
+                </li>
+              ))}
+            </ul>
+          </div>
+        ))}
+      </div>
+    </nav>
+  );
+}
diff --git a/lib/actions/provisioning-actions.ts b/lib/actions/provisioning-actions.ts
index 5c917cf..cd5c0de 100644
--- a/lib/actions/provisioning-actions.ts
+++ b/lib/actions/provisioning-actions.ts
@@ -18,6 +18,14 @@ import {
  *  GitHub API errors pass through raw. `prUrl` on success. */
 export type ProvisionActionState = { error?: string; ok?: boolean; prUrl?: string };
 
+/** Collapse a repeated (checkbox-group) form field into the comma list the
+ *  schema validates, dropping any non-string entry. */
+const csvField = (formData: FormData, name: string): string =>
+  formData
+    .getAll(name)
+    .filter((v): v is string => typeof v === "string")
+    .join(",");
+
 export async function openProvisioningPrAction(
   _prev: ProvisionActionState,
   formData: FormData,
@@ -31,8 +39,13 @@ export async function openProvisioningPrAction(
     adminEmail: formData.get("adminEmail"),
     template: formData.get("template"),
     currency: formData.get("currency"),
-    languages: formData.get("languages"),
-    modules: formData.get("modules"),
+    // Checkbox groups: several values under one name, so getAll + join — a
+    // plain get() would silently take the FIRST box and provision a tenant
+    // missing everything else that was ticked. getAll can also yield File
+    // entries on a crafted multipart POST, which would stringify to
+    // "[object Object]" and sail into the registry; keep strings only.
+    languages: csvField(formData, "languages"),
+    modules: csvField(formData, "modules"),
     city: formData.get("city"),
   });
   if (!parsed.success) return { error: parsed.error.issues[0]?.message ?? "invalidInput" };
diff --git a/lib/module-catalog.ts b/lib/module-catalog.ts
index 03e8f5a..aca018d 100644
--- a/lib/module-catalog.ts
+++ b/lib/module-catalog.ts
@@ -139,3 +139,42 @@ export function quoteModules(selection: readonly string[]): Quote {
   }
   return best;
 }
+
+/**
+ * Locales the TENANT app ships (frontend `src/i18n.ts` — 10 since the Dutch
+ * addition, frontend #126). Not the same set as this control plane's six site
+ * locales: a tenant can serve languages sofrapiwas.com does not.
+ *
+ * Core includes English plus one; anything beyond that is the `extra-languages`
+ * add-on. `en` is not optional — it is the fallback the tenant app falls back to.
+ */
+export const TENANT_LANGUAGES = [
+  { code: "en", label: "English" },
+  { code: "nl", label: "Nederlands" },
+  { code: "fr", label: "Français" },
+  { code: "de", label: "Deutsch" },
+  { code: "it", label: "Italiano" },
+  { code: "es", label: "Español" },
+  { code: "tr", label: "Türkçe" },
+  { code: "ar", label: "العربية" },
+  { code: "ru", label: "Русский" },
+  { code: "zh", label: "中文" },
+] as const;
+
+export type TenantLanguage = (typeof TENANT_LANGUAGES)[number]["code"];
+
+const LANGUAGE_CODES = new Set<string>(TENANT_LANGUAGES.map((l) => l.code));
+
+export function isTenantLanguage(value: string): value is TenantLanguage {
+  return LANGUAGE_CODES.has(value);
+}
+
+/** The ids in `values` that the tenant app cannot serve — empty means all valid. */
+export function unknownLanguages(values: readonly string[]): string[] {
+  return values.filter((v) => !isTenantLanguage(v));
+}
+
+/** Languages billable as `extra-languages`: everything past English + one. */
+export function extraLanguageCount(codes: readonly string[]): number {
+  return Math.max(0, new Set(codes.filter(isTenantLanguage)).size - 2);
+}
diff --git a/lib/provisioning.ts b/lib/provisioning.ts
index 4dd5de7..a8dd53e 100644
--- a/lib/provisioning.ts
+++ b/lib/provisioning.ts
@@ -77,8 +77,10 @@ export async function openProvisioningPr(input: TenantProvisionInput): Promise<{
 
   const entry = buildTenantRegistryEntry(input);
   // trimEnd() (no regex) drops any trailing whitespace/newlines, then we re-add
-  // exactly one before the appended entry — avoids the ReDoS-prone `\n*$`.
-  const updated = `${current.trimEnd()}\n${entry}\n`;
+  // exactly two — avoids the ReDoS-prone `\n*$`, and the blank line keeps the
+  // new tenant from butting against the previous one's trailing comment, which
+  // reads as if it belongs to the new entry.
+  const updated = `${current.trimEnd()}\n\n${entry}\n`;
 
   // Branch off BASE's tip.
   const baseRef = await gh<{ object: { sha: string } }>(
diff --git a/messages/ar.json b/messages/ar.json
index ba62ea9..c890826 100644
--- a/messages/ar.json
+++ b/messages/ar.json
@@ -470,6 +470,12 @@
         "overview": "نظرة عامة",
         "signups": "التسجيلات",
         "fleet": "الأسطول"
+      },
+      "groups": {
+        "pipeline": "المسار",
+        "tenants": "المستأجرون",
+        "money": "المالية",
+        "system": "النظام"
       }
     },
     "status": {
@@ -721,12 +727,17 @@
         "city": "المدينة (اختياري)",
         "template": "القالب",
         "currency": "العملة (مثل EUR)",
-        "languages": "اللغات (مفصولة بفواصل، مثل en, nl)",
-        "modules": "الوحدات (مفصولة بفواصل، مثل core)",
+        "languages": "اللغات",
+        "modules": "الوحدات",
         "create": "فتح طلب سحب للسجل",
         "creating": "جارٍ الفتح…",
         "created": "تم فتح طلب سحب للسجل — راجعه وادمجه، ثم زوّد:",
-        "nextSteps": "بعد الدمج: تتزامن التغييرات مع الخادم في المزامنة التالية للنشر، ثم شغّل إجراء provision-tenant بهذا المعرّف."
+        "nextSteps": "بعد الدمج: تتزامن التغييرات مع الخادم في المزامنة التالية للنشر، ثم شغّل إجراء provision-tenant بهذا المعرّف.",
+        "modulesCore": "Core (مضمَّن دائمًا)",
+        "languagesHint": "الإنجليزية تُشحن دائمًا (اللغة الاحتياطية لتطبيق المستأجر). لما يزيد عن الإنجليزية + لغة واحدة تُطبَّق إضافة extra-languages.",
+        "price": "سعر القائمة الشهري",
+        "priceBundle": "كحزمة",
+        "priceALaCarte": "منفصلًا"
       },
       "fleet": {
         "title": "أسطول الطابعات",
diff --git a/messages/de.json b/messages/de.json
index fbb2e54..142d809 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -470,6 +470,12 @@
         "overview": "Übersicht",
         "signups": "Anmeldungen",
         "fleet": "Flotte"
+      },
+      "groups": {
+        "pipeline": "Pipeline",
+        "tenants": "Mandanten",
+        "money": "Finanzen",
+        "system": "System"
       }
     },
     "status": {
@@ -721,12 +727,17 @@
         "city": "Stadt (optional)",
         "template": "Vorlage",
         "currency": "Währung (z. B. EUR)",
-        "languages": "Sprachen (kommagetrennt, z. B. en, nl)",
-        "modules": "Module (kommagetrennt, z. B. core)",
+        "languages": "Sprachen",
+        "modules": "Module",
         "create": "Registry-PR öffnen",
         "creating": "Wird geöffnet…",
         "created": "Registry-PR geöffnet — prüfen + zusammenführen, dann bereitstellen:",
-        "nextSteps": "Nach dem Zusammenführen: Die Änderung wird beim nächsten Deploy-Sync auf den Server übertragen, dann die provision-tenant-Action mit diesem Slug starten."
+        "nextSteps": "Nach dem Zusammenführen: Die Änderung wird beim nächsten Deploy-Sync auf den Server übertragen, dann die provision-tenant-Action mit diesem Slug starten.",
+        "modulesCore": "Core (immer enthalten)",
+        "languagesHint": "Englisch ist immer dabei (Fallback der Tenant-App). Über Englisch + eine Sprache hinaus greift das Add-on extra-languages.",
+        "price": "Monatlicher Listenpreis",
+        "priceBundle": "als Paket",
+        "priceALaCarte": "einzeln"
       },
       "fleet": {
         "title": "Drucker-Flotte",
diff --git a/messages/en.json b/messages/en.json
index 05b7b54..22fe521 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -470,6 +470,12 @@
         "overview": "Overview",
         "signups": "Signups",
         "fleet": "Fleet"
+      },
+      "groups": {
+        "pipeline": "Pipeline",
+        "tenants": "Tenants",
+        "money": "Money",
+        "system": "System"
       }
     },
     "status": {
@@ -721,12 +727,17 @@
         "city": "City (optional)",
         "template": "Template",
         "currency": "Currency (e.g. EUR)",
-        "languages": "Languages (comma-separated, e.g. en, nl)",
-        "modules": "Modules (comma-separated, e.g. core)",
+        "languages": "Languages",
+        "modules": "Modules",
         "create": "Open registry PR",
         "creating": "Opening…",
         "created": "Registry PR opened — review + merge it, then provision:",
-        "nextSteps": "After merge: the change syncs to the box on the next deploy sync, then run the provision-tenant Action with this slug."
+        "nextSteps": "After merge: the change syncs to the box on the next deploy sync, then run the provision-tenant Action with this slug.",
+        "modulesCore": "Core (always included)",
+        "languagesHint": "English always ships (the tenant app's fallback). Beyond English + one, the extra-languages add-on applies.",
+        "price": "Monthly list price",
+        "priceBundle": "as bundle",
+        "priceALaCarte": "à la carte"
       },
       "fleet": {
         "title": "Printer fleet",
diff --git a/messages/fr.json b/messages/fr.json
index 10c4b78..5126058 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -470,6 +470,12 @@
         "overview": "Aperçu",
         "signups": "Inscriptions",
         "fleet": "Parc"
+      },
+      "groups": {
+        "pipeline": "Pipeline",
+        "tenants": "Locataires",
+        "money": "Finances",
+        "system": "Système"
       }
     },
     "status": {
@@ -721,12 +727,17 @@
         "city": "Ville (facultatif)",
         "template": "Modèle",
         "currency": "Devise (ex. EUR)",
-        "languages": "Langues (séparées par des virgules, ex. en, nl)",
-        "modules": "Modules (séparés par des virgules, ex. core)",
+        "languages": "Langues",
+        "modules": "Modules",
         "create": "Ouvrir la PR de registre",
         "creating": "Ouverture…",
         "created": "PR de registre ouverte — révisez + fusionnez, puis provisionnez :",
-        "nextSteps": "Après la fusion : la modification se synchronise avec le serveur lors de la prochaine synchro de déploiement, puis lancez l’action provision-tenant avec cet identifiant."
+        "nextSteps": "Après la fusion : la modification se synchronise avec le serveur lors de la prochaine synchro de déploiement, puis lancez l’action provision-tenant avec cet identifiant.",
+        "modulesCore": "Core (toujours inclus)",
+        "languagesHint": "L'anglais est toujours livré (langue de repli de l'app tenant). Au-delà de l'anglais + une langue, l'option extra-languages s'applique.",
+        "price": "Prix catalogue mensuel",
+        "priceBundle": "en formule",
+        "priceALaCarte": "à la carte"
       },
       "fleet": {
         "title": "Parc d'imprimantes",
diff --git a/messages/nl.json b/messages/nl.json
index 2a0a6a2..ae62497 100644
--- a/messages/nl.json
+++ b/messages/nl.json
@@ -470,6 +470,12 @@
         "overview": "Overzicht",
         "signups": "Aanmeldingen",
         "fleet": "Vloot"
+      },
+      "groups": {
+        "pipeline": "Pijplijn",
+        "tenants": "Tenants",
+        "money": "Financieel",
+        "system": "Systeem"
       }
     },
     "status": {
@@ -721,12 +727,17 @@
         "city": "Stad (optioneel)",
         "template": "Sjabloon",
         "currency": "Valuta (bijv. EUR)",
-        "languages": "Talen (komma-gescheiden, bijv. en, nl)",
-        "modules": "Modules (komma-gescheiden, bijv. core)",
+        "languages": "Talen",
+        "modules": "Modules",
         "create": "Registry-PR openen",
         "creating": "Bezig met openen…",
         "created": "Registry-PR geopend — beoordeel + voeg samen, richt dan in:",
-        "nextSteps": "Na samenvoegen: de wijziging synchroniseert naar de server bij de volgende deploy-sync, start dan de provision-tenant Action met deze slug."
+        "nextSteps": "Na samenvoegen: de wijziging synchroniseert naar de server bij de volgende deploy-sync, start dan de provision-tenant Action met deze slug.",
+        "modulesCore": "Core (altijd inbegrepen)",
+        "languagesHint": "Engels gaat altijd mee (de fallback van de tenant-app). Boven Engels + één taal geldt de add-on extra-languages.",
+        "price": "Maandelijkse adviesprijs",
+        "priceBundle": "als bundel",
+        "priceALaCarte": "los"
       },
       "fleet": {
         "title": "Printervloot",
diff --git a/messages/tr.json b/messages/tr.json
index 391d2d4..cfaf86d 100644
--- a/messages/tr.json
+++ b/messages/tr.json
@@ -470,6 +470,12 @@
         "overview": "Genel bakış",
         "signups": "Kayıtlar",
         "fleet": "Filo"
+      },
+      "groups": {
+        "pipeline": "Süreç",
+        "tenants": "Kiracılar",
+        "money": "Finans",
+        "system": "Sistem"
       }
     },
     "status": {
@@ -721,12 +727,17 @@
         "city": "Şehir (isteğe bağlı)",
         "template": "Şablon",
         "currency": "Para birimi (ör. EUR)",
-        "languages": "Diller (virgülle ayrılmış, ör. en, nl)",
-        "modules": "Modüller (virgülle ayrılmış, ör. core)",
+        "languages": "Diller",
+        "modules": "Modüller",
         "create": "Kayıt PR’si aç",
         "creating": "Açılıyor…",
         "created": "Kayıt PR’si açıldı — inceleyip birleştirin, sonra sağlayın:",
-        "nextSteps": "Birleştirmeden sonra: değişiklik bir sonraki dağıtım eşitlemesinde sunucuya eşitlenir, ardından bu kısa adla provision-tenant Action’ını çalıştırın."
+        "nextSteps": "Birleştirmeden sonra: değişiklik bir sonraki dağıtım eşitlemesinde sunucuya eşitlenir, ardından bu kısa adla provision-tenant Action’ını çalıştırın.",
+        "modulesCore": "Core (her zaman dahil)",
+        "languagesHint": "İngilizce her zaman gelir (tenant uygulamasının yedek dili). İngilizce + bir dilden fazlası için extra-languages eklentisi geçerlidir.",
+        "price": "Aylık liste fiyatı",
+        "priceBundle": "paket olarak",
+        "priceALaCarte": "tek tek"
       },
       "fleet": {
         "title": "Yazıcı filosu",
diff --git a/tests/unit/module-catalog.test.ts b/tests/unit/module-catalog.test.ts
index 4a57c38..f1a9ea6 100644
--- a/tests/unit/module-catalog.test.ts
+++ b/tests/unit/module-catalog.test.ts
@@ -3,8 +3,11 @@ import {
   BUNDLES,
   MODULES,
   MODULE_IDS,
+  TENANT_LANGUAGES,
+  extraLanguageCount,
   isModuleId,
   quoteModules,
+  unknownLanguages,
   unknownModuleIds,
 } from "@/lib/module-catalog";
 
@@ -109,3 +112,35 @@ describe("quoteModules", () => {
     expect(q.monthlyCents).toBe(1900 + 900);
   });
 });
+
+describe("tenant languages", () => {
+  it("covers exactly the 10 locales the tenant app ships", () => {
+    expect(TENANT_LANGUAGES.map((l) => l.code)).toEqual([
+      "en",
+      "nl",
+      "fr",
+      "de",
+      "it",
+      "es",
+      "tr",
+      "ar",
+      "ru",
+      "zh",
+    ]);
+    expect(unknownLanguages(["en", "zh"])).toEqual([]);
+    expect(unknownLanguages(["en", "kl", "xx"])).toEqual(["kl", "xx"]);
+  });
+
+  it("bills extra-languages only past English + one", () => {
+    expect(extraLanguageCount(["en"])).toBe(0);
+    expect(extraLanguageCount(["en", "nl"])).toBe(0);
+    expect(extraLanguageCount(["en", "nl", "fr"])).toBe(1);
+    expect(extraLanguageCount(["en", "nl", "fr", "de"])).toBe(2);
+  });
+
+  it("ignores duplicates and unknown codes when counting", () => {
+    // The picker can only emit valid codes, but the registry is hand-editable.
+    expect(extraLanguageCount(["en", "en", "nl"])).toBe(0);
+    expect(extraLanguageCount(["en", "nl", "klingon"])).toBe(0);
+  });
+});