@eifi1/ui-kit 0.40.1 → 0.42.0

package/src/components/tabs.tsx

@@ -77,34 +77,6 @@ export interface TabsProps<T extends string>
   active: T;
   onChange: (id: T) => void;
   className?: string;
-  /** Let the strip WRAP onto as many rows as it needs below `md`, instead of
-   *  scrolling sideways — for a strip carrying more tabs than fit on a phone row.
-   *  Keksdose live #262: ten reports on a 406px screen showed about three, and the
-   *  round-2 answer (a <select> below `md`) cost a tap to open and a tap to choose.
-   *  *"I would rather keep the tabs but have multirow tabs depending on the screen
-   *  size, I will not loose the function to see all reports at once and navigate by
-   *  single click rather by double click."*
-   *
-   *  The active MARKER has to change with the layout, which is why this cannot be
-   *  done from a call site with a `className`: the default marker is a `border-b-2`
-   *  underline riding the container's own bottom rule, and a tab sitting in a row
-   *  that does not touch that rule cannot wear it — every row but the last would
-   *  show a stray line floating mid-strip, and `-mb-px` would pull each chip a
-   *  pixel into the row beneath it. A wrapped strip marks the active tab with a
-   *  filled brand chip instead, which is also the only thing findable at a glance
-   *  among ten same-weight labels on three rows.
-   *
-   *  From `md` up NOTHING changes: same single-line underline strip, same paddings,
-   *  same colours as every other strip in the app.
-   *
-   *  Opt-in on purpose. The three-tab strips (invoices, statements, bank imports)
-   *  already fit a phone row, and turning those into chips would be an unrequested
-   *  redesign of three other pages.
-   *
-   *  @deprecated 0.40 — use the scrolling strip with `overflowCue`; removed in 0.41. No
-   *  consumer is left (keksdose went back to one scrolling row, live #410); the caret
-   *  says a phone's row goes on. */
-  wrap?: boolean;
   /**
    * The caret beside a SCROLLING strip below `md` (0.40, kk run 79 gap 1): a › while
    * tabs lie past the strip's end — a tap scrolls it on by three quarters of its width —
@@ -117,7 +89,7 @@ export interface TabsProps<T extends string>
    * turns round rather than two that come and go, so the strip's width never changes
    * under the thumb. Out of the tab order — the keyboard walks the strip with the arrow
    * keys, which bring the focused tab into view. From `md` up nothing changes. Ignored on
-   * a `wrap` strip and a vertical one (a side nav is a column, not a row). Names:
+   * a vertical strip (a side nav is a column, not a row). Names:
    * `tabs.more` / `tabs.backToFirst`.
    */
   overflowCue?: boolean;
@@ -203,8 +175,8 @@ export interface TabsProps<T extends string>
    * `onRemove`, `onAdd` — means exactly what it means on the horizontal strip; the
    * badge moves to the row's end.
    *
-   * **On a phone (`usePhoneLayout()`) it becomes the horizontal strip**, `wrap` and
-   * all, rather than staying a column. A side nav only works beside its content; on
+   * **On a phone (`usePhoneLayout()`) it becomes the horizontal strip**, rather than
+   * staying a column. A side nav only works beside its content; on
    * a phone it has to go ABOVE it, and eight full-width rows there push the panel
    * the user picked below the fold on every visit — the two keksdose pages both
    * collapsed theirs into a scrolling row by hand for exactly that reason. The
@@ -220,14 +192,6 @@ export interface TabsProps<T extends string>
   ref?: Ref<HTMLDivElement>;
 }
 
-// The two shapes are written out as whole strings rather than as one base plus a
-// pile of `md:` overrides. The unwrapped pair is character-for-character what the
-// three strips that do not opt in get, so those cannot drift; the wrapped pair is
-// authored from scratch, so no unprefixed utility has to be beaten by its own `md:`
-// twin through tailwind-merge. The only ordering this relies on is Tailwind's own:
-// unprefixed utilities are emitted first, then `md:` — so from 768px up the wrapped
-// strip resolves to exactly the paint of the default one. Both themes come free now
-// that the colours are tokens: there is no `md:dark:` tier left to keep in step.
 const TABLIST_CLASSES =
   "flex gap-1 overflow-x-auto overflow-y-hidden border-b border-subtle";
 // The side nav. A column of full-width rows with the open one FILLED rather than
@@ -242,9 +206,6 @@ const TAB_VERTICAL_ACTIVE_CLASSES = "bg-active text-primary";
 const TAB_VERTICAL_INACTIVE_CLASSES =
   "text-muted hover:bg-hover hover:text-primary";
 
-const TABLIST_WRAP_CLASSES =
-  "flex flex-wrap gap-1.5 md:flex-nowrap md:gap-1 md:overflow-x-auto md:overflow-y-hidden md:border-b md:border-subtle";
-
 // `max-w-full`: no tab outgrows its strip. A sheet's `detail` line ("Spurstangenkraft
 // links · … · 31 Punkte") made one tab 448px wide in a 390px strip, and a tab wider
 // than the strip cannot be scrolled into view — its end was simply off screen
@@ -256,31 +217,13 @@ const TAB_ACTIVE_CLASSES = "border-[var(--text-primary)] text-primary";
 const TAB_INACTIVE_CLASSES =
   "border-transparent text-muted hover:text-secondary hover:border-strong";
 
-// Below `md`, a chip: `py-2` on `text-xs` is exactly 32px tall, and ten German
-// report labels then land in three rows on a 406px screen (four at `text-sm`). The
-// active fill is the app's own selected pair, `--brand` / `--brand-contrast`: the
-// palette store writes both halves of it together for every preset and both themes,
-// so the contrast holds everywhere (5.1:1 at its worst preset) without a hard-coded
-// colour. Inactive chips take the raised card surface with full-strength body text —
-// all ten have to stay readable; it is the FILL, not the text weight, that says
-// which one is open.
-const TAB_WRAP_CLASSES =
-  FOCUS_RING_WIDTH +
-  " max-w-full whitespace-nowrap rounded-md px-2.5 py-2 text-xs font-medium transition-colors focus:outline-none focus-visible:ring-strong md:rounded-none md:border-b-2 md:-mb-px md:bg-transparent md:px-3 md:py-2 md:text-sm";
-const TAB_WRAP_ACTIVE_CLASSES =
-  "bg-brand text-brand-contrast md:border-[var(--text-primary)] md:text-primary";
-const TAB_WRAP_INACTIVE_CLASSES =
-  "bg-surface text-primary md:border-transparent md:text-muted md:hover:border-strong md:hover:text-secondary";
-
 // The add/remove chrome. The × reserves its gutter on every removable tab (see
-// `onRemove`); `md:pe-8` is spelled out because the wrapped chip's `md:px-3` would
-// otherwise hand the gutter back from 768px up.
-const TAB_REMOVABLE_CLASSES = "pe-8 md:pe-8";
+// `onRemove`).
+const TAB_REMOVABLE_CLASSES = "pe-8";
 const TAB_EMPTY_CLASSES = "-mx-1.5 rounded border border-dashed border-strong px-1.5";
 const TAB_ADD_CLASSES =
   FOCUS_RING_WIDTH +
   " inline-flex items-center gap-1 whitespace-nowrap rounded-md px-3 py-2 text-sm font-medium text-muted transition-colors hover:text-primary focus:outline-none focus-visible:ring-strong disabled:cursor-not-allowed disabled:opacity-50 [&_svg]:size-4";
-const TAB_ADD_WRAP_CLASSES = "px-2.5 text-xs md:px-3 md:text-sm";
 // `relative`: the phone's visually hidden label needs a positioned ancestor (see the
 // sr-only rule in CONTRIBUTING); `max-md:px-2` squares the lone "+".
 const TAB_ADD_PHONE_CLASSES = "relative max-md:px-2";
@@ -290,7 +233,6 @@ export function Tabs<T extends string>({
   active,
   onChange,
   className,
-  wrap = false,
   overflowCue = false,
   panelId,
   onRemove,
@@ -312,7 +254,7 @@ export function Tabs<T extends string>({
   const setStrip = useMemo(() => mergeRefs(stripRef, ref), [ref]);
   const fade = useStripFade(stripRef);
   // See `overflowCue`. `start` alone means the strip is scrolled to its end.
-  const cue = overflowCue && !wrap && !vertical && fade.overflow !== undefined;
+  const cue = overflowCue && !vertical && fade.overflow !== undefined;
   const cueAtEnd = fade.overflow === "start";
   const onCue = () => {
     const strip = stripRef.current;
@@ -394,9 +336,7 @@ export function Tabs<T extends string>({
     strip.querySelectorAll<HTMLElement>('[role="tab"]')[index]?.focus();
   }, [tabs, active]);
 
-  // Arrow keys walk the strip in DOM order (ARIA tabs pattern), which is what keeps
-  // a WRAPPED strip navigable: the rows flow in DOM order too, so Right off the end
-  // of row one lands on the first chip of row two rather than nowhere. Home/End jump
+  // Arrow keys walk the strip in DOM order (ARIA tabs pattern). Home/End jump
   // to the ends. Focus only — activation stays on click/Enter/Space, because a tab
   // here can be a real route and moving focus must not navigate.
   //
@@ -465,8 +405,8 @@ export function Tabs<T extends string>({
       // With an add button the strip gains an outer box, and `className` goes there
       // — it is the box a caller's margin or width is meant for.
       className={cn(
-        vertical ? TABLIST_VERTICAL_CLASSES : wrap ? TABLIST_WRAP_CLASSES : TABLIST_CLASSES,
-        onAdd ? "min-w-0" : overflowCue && !wrap && !vertical ? "min-w-0 flex-1" : className,
+        vertical ? TABLIST_VERTICAL_CLASSES : TABLIST_CLASSES,
+        onAdd ? "min-w-0" : overflowCue && !vertical ? "min-w-0 flex-1" : className,
       )}
     >
       {tabs.map((tab) => {
@@ -502,14 +442,8 @@ export function Tabs<T extends string>({
                 removable && "pe-8",
               )
             : cn(
-                wrap ? TAB_WRAP_CLASSES : TAB_CLASSES,
-                wrap
-                  ? isActive
-                    ? TAB_WRAP_ACTIVE_CLASSES
-                    : TAB_WRAP_INACTIVE_CLASSES
-                  : isActive
-                    ? TAB_ACTIVE_CLASSES
-                    : TAB_INACTIVE_CLASSES,
+                TAB_CLASSES,
+                isActive ? TAB_ACTIVE_CLASSES : TAB_INACTIVE_CLASSES,
                 removable && TAB_REMOVABLE_CLASSES,
               ),
         };
@@ -537,16 +471,7 @@ export function Tabs<T extends string>({
                 {/* A separator for the NAME only — whitespace between flex items is
                     not drawn, and without it the two lines ran together into one
                     word for a screen reader ("80 km/hloop 2"). */}{" "}
-                <span
-                  className={cn(
-                    "max-w-full truncate-until-large text-caption font-normal leading-tight text-muted",
-                    // On a wrapped strip's filled chip (below `md`) the muted grey
-                    // was dark text on the brand fill — "loop 2" all but vanished
-                    // under the one label that most needed reading. It takes the
-                    // chip's own ink instead, as the label and the × already do.
-                    wrap && isActive && !vertical && "text-brand-contrast md:text-muted",
-                  )}
-                >
+                <span className="max-w-full truncate-until-large text-caption font-normal leading-tight text-muted">
                   {tab.detail}
                 </span>
               </span>
@@ -620,12 +545,7 @@ export function Tabs<T extends string>({
                 type="button"
                 disabled={busy}
                 onClick={() => requestRemove(tab.id)}
-                className={cn(
-                  "absolute inset-y-0 end-1 my-auto",
-                  // On a wrapped strip's filled chip the quiet grey would vanish into
-                  // the brand fill below `md`.
-                  wrap && "text-brand-contrast md:text-placeholder",
-                )}
+                className="absolute inset-y-0 end-1 my-auto"
               >
                 <X />
               </IconButton>
@@ -654,7 +574,7 @@ export function Tabs<T extends string>({
         {text.remove(nameOf(activeTab))}
       </button>
     ) : null;
-  if (!onAdd && overflowCue && !wrap && !vertical) {
+  if (!onAdd && overflowCue && !vertical) {
     // The caret needs a row to sit in beside the strip, and `className` goes there — it
     // is the box a caller's margin or width is meant for, as with an add button. The box
     // is there whether or not the strip overflows right now, so a resize never moves
@@ -692,37 +612,26 @@ export function Tabs<T extends string>({
     );
   }
   return (
-    <div
-      className={cn(
-        wrap ? "flex flex-wrap items-end gap-1.5 md:flex-nowrap md:gap-0" : "flex items-end",
-        className,
-      )}
-    >
+    <div className={cn("flex items-end", className)}>
       {tablist}
       {removeButton}
       {cueButton}
       {/* Outside the tablist: an action, not a tab — and a tablist may own only
           tabs. The rule under the strip carries on beneath it. */}
       <div
-        className={cn(
-          "flex flex-1 items-center",
-          wrap
-            ? "md:self-stretch md:border-b md:border-subtle"
-            : "self-stretch border-b border-subtle",
-        )}
+        className="flex flex-1 items-center self-stretch border-b border-subtle"
       >
         <button
           type="button"
           onClick={onAdd}
           disabled={busy}
-          className={cn(TAB_ADD_CLASSES, wrap ? TAB_ADD_WRAP_CLASSES : TAB_ADD_PHONE_CLASSES)}
+          className={cn(TAB_ADD_CLASSES, TAB_ADD_PHONE_CLASSES)}
         >
           <Plus aria-hidden />
           {/* Below md a scrolling strip keeps the room for tabs: the label is visually
               hidden and the "+" carries it as its name. Beside "+ Add loop" a 390px strip
-              showed the open tab and a sliver of the next (showcase audit). A wrapping
-              strip has its own row there, so it keeps the label. */}
-          <span className={wrap ? undefined : "max-md:sr-only"}>{addLabel ?? text.add}</span>
+              showed the open tab and a sliver of the next (showcase audit). */}
+          <span className="max-md:sr-only">{addLabel ?? text.add}</span>
         </button>
       </div>
     </div>

package/src/components/translation-review-parts.tsx

@@ -170,8 +170,8 @@ export interface TranslationLocaleTabsProps {
 
 /**
  * One tab per locale with its approved/total, one scrolling row on a phone with the
- * strip's caret saying it goes on (`overflowCue`; `wrap` is deprecated in 0.40). Nothing for a single
- * locale: a strip with one tab is a heading that looks clickable.
+ * strip's caret saying it goes on (`overflowCue`). Nothing for a single locale:
+ * a strip with one tab is a heading that looks clickable.
  */
 export function TranslationLocaleTabs({ locales, active, onChange, className, labels: labelsProp }: TranslationLocaleTabsProps) {
   const labels = useKitLabels("translationReview", DEFAULT_TRANSLATION_REVIEW_LABELS, labelsProp);

package/src/feedback/feedback-menu-labels.ts

@@ -7,8 +7,6 @@ import type { FeedbackMenuLabels } from "./feedback-menu";
 export const DEFAULT_FEEDBACK_MENU_LABELS: FeedbackMenuLabels = {
   trigger: "Send feedback",
   myFeedback: "My feedback",
-  viewFeedback: "View feedback",
-  allFeedback: "All feedback",
   discussion: "Feedback discussion",
   inbox: "Feedback inbox",
 };

package/src/feedback/feedback-menu.tsx

@@ -28,12 +28,6 @@ export interface FeedbackMenuLabels {
   /** 0.40: the admin's link to the triage list, {@link FeedbackMenuProps.inboxHref}
    *  ("View feedback" before). de-CH "Feedback-Eingang". */
   inbox: string;
-  /** @deprecated 0.40 — use {@link inbox}; removed in 0.41. Unused: the inbox row reads
-   *  `inbox` (feedback §10.6). */
-  viewFeedback?: string;
-  /** @deprecated 0.40 — use {@link discussion}; removed in 0.41. Unused: the public row
-   *  reads `discussion` (feedback §10.6). */
-  allFeedback?: string;
 }
 
 // Defined in ./feedback-menu-labels, which holds no component code (0.34, KS U8).

package/src/i18n/defaults.ts

@@ -98,6 +98,8 @@ import { DEFAULT_DEVICE_RESET_LABELS } from "../settings/device-reset-setting-la
 import { DEFAULT_ROW_ACTIONS_LABELS } from "../components/row-actions-labels";
 import { DEFAULT_APP_SHELL_MORE_LABELS } from "../shell/app-shell-labels";
 import { DEFAULT_ACCOUNT_STATE_LABELS } from "../components/account-chips-labels";
+import { DEFAULT_ADMIN_AREA_LABELS } from "../admin/admin-area-labels";
+import { DEFAULT_TOP_BAR_PARTS_LABELS } from "../shell/top-bar-parts-labels";
 import { DEFAULT_SHARE_CARD_LABELS } from "../components/share-card-labels";
 import { DEFAULT_REAUTH_DIALOG_LABELS } from "../components/reauth-dialog-labels";
 import { DEFAULT_SERVER_WAKE_LABELS } from "../components/server-wake-labels";
@@ -256,4 +258,6 @@ export const DEFAULT_UI_KIT_LABELS: UiKitLabels = {
   signChip: DEFAULT_SIGN_CHIP_LABELS,
   columnMapper: DEFAULT_COLUMN_MAPPER_LABELS,
   notifications: DEFAULT_NOTIFICATIONS_LABELS,
+  adminArea: DEFAULT_ADMIN_AREA_LABELS,
+  topBarParts: DEFAULT_TOP_BAR_PARTS_LABELS,
 };

package/src/i18n/german.ts

@@ -121,8 +121,6 @@ export function germanLabels(numberLocale: string): UiKitLabels {
     feedbackMenu: {
       trigger: "Feedback senden",
       myFeedback: "Mein Feedback",
-      viewFeedback: "Feedback ansehen",
-      allFeedback: "Alle Rückmeldungen",
       discussion: "Feedback-Diskussion",
       inbox: "Feedback-Eingang",
     },
@@ -1731,6 +1729,12 @@ export function germanLabels(numberLocale: string): UiKitLabels {
         "Ihre Zahlung wird verarbeitet. Ihr Tarif beginnt, sobald sie bestätigt ist; diese Seite aktualisiert sich von selbst.",
       choosePlan: "Tarif wählen",
       updatePayment: "Zahlungsmethode aktualisieren",
+      // 0.42 (§16.7 A): for an admin who isn't the buyer. "Das Admin-Konto", which gives the
+      // reader no gender.
+      paymentFailedAskBuyer: (buyer) =>
+        buyer
+          ? `Die Zahlung ist fehlgeschlagen. ${buyer} kann die Zahlungsmethode aktualisieren.`
+          : "Die Zahlung ist fehlgeschlagen. Die Zahlungsmethode kann über das Admin-Konto aktualisiert werden, mit dem das Abonnement abgeschlossen wurde.",
       checkAgain: "Erneut prüfen",
       lockReason: "Ihr Tarif ist abgelaufen. Wählen Sie einen Tarif, um wieder Änderungen vorzunehmen.",
       // As `characterCount.limitReached` ("Zeichenlimit erreicht").
@@ -1765,6 +1769,20 @@ export function germanLabels(numberLocale: string): UiKitLabels {
       switchCredited: "Gutschrift auf die nächsten Belastungen",
       switchNextCharge: (date) => `Nächste Belastung am ${date}`,
       switchConfirm: "Tarif ändern",
+      // 0.42 (§16): the portal for the buyer only, the in-app cancel, the grant warning.
+      buyerHolds: (buyer) =>
+        buyer
+          ? `Zahlungsmethode und Rechnungen liegen bei ${buyer}: Das Abonnement wurde über dieses Konto abgeschlossen.`
+          : "Zahlungsmethode und Rechnungen liegen beim Admin-Konto, mit dem das Abonnement abgeschlossen wurde.",
+      cancelConfirmTitle: "Abonnement kündigen",
+      cancelConfirmBody: (date) => `Ihr Abonnement endet am ${date}. Bis dahin funktioniert alles wie bisher.`,
+      // §312k BGB: the confirmation button says exactly this.
+      cancelConfirmAction: "Jetzt kündigen",
+      keepSubscription: "Abonnement behalten",
+      grantWarningTitle: "Ihr kostenloser Zugang läuft weiter",
+      grantWarningBody:
+        "Ihr kostenloser Zugang hat kein Enddatum. Solange er läuft, ändert ein Kauf Ihren Tarif nicht: Sie würden für einen Tarif bezahlen, der nicht gilt.",
+      grantWarningAction: "Trotzdem kaufen",
       waitingChanges: (count) =>
         count === 1
           ? `${n(count)} Änderung wartet auf einen Tarif`
@@ -1841,5 +1859,77 @@ export function germanLabels(numberLocale: string): UiKitLabels {
       more: "Mehr",
       moreTitle: "Weitere Seiten",
     },
+    // 0.42.0 — docs/admin-harmonization.md §3.1: the admin area's shared words. "Verwaltung"
+    // as settings §5 names the page; "mit Administratorrechten" rather than "für
+    // Administratoren", which would give the reader a gender (as `transferOwnership`).
+    adminArea: {
+      title: "Verwaltung",
+      waiting: (count) => `${n(count)} offen`,
+      forbiddenTitle: "Nur mit Administratorrechten",
+      forbiddenBody: (appName) => `Hier wird ${appName} verwaltet. Ihr Konto kann diese Seite nicht öffnen.`,
+      forbiddenHome: "Zur Startseite",
+      forbiddenReviewer: "Übersetzungen prüfen",
+      sections: {
+        overview: { title: "Übersicht", help: "Was gerade wartet, auf einen Blick." },
+        users: { title: "Benutzer", help: "Wer ein Konto hat und was jede Person darf." },
+        invitations: { title: "Einladungen", help: "Die Links, mit denen neue Personen dazukommen." },
+        billing: { title: "Abrechnung", help: "Tarif, Zahlung und Rechnungen." },
+        activity: { title: "Aktivität", help: "Was in der Verwaltung getan wurde, das Neueste zuerst." },
+      },
+      tiles: {
+        feedbackWaiting: "Zu sichten",
+        deletionRequests: "Löschanfragen",
+        invitationsPending: "Offene Einladungen",
+        users: "Benutzer",
+        usersNew: (count) => `${n(count)} neu in 7 Tagen`,
+      },
+      tools: "Werkzeuge",
+    },
+    // 0.42.0 — docs/top-bar-harmonization.md §3.1: the top bar's shared parts. keksdose's
+    // reviewed sync words where they are not about its budgets; "Tarif" as `billing`.
+    topBarParts: {
+      tours: {
+        menu: "Geführte Touren",
+        newDot: "Neue Touren",
+        thisPage: "Auf dieser Seite",
+        newTours: "Neue Touren",
+        allTours: "Alle Touren…",
+        badgeNew: "Neu",
+        completed: "Abgeschlossen",
+      },
+      sync: {
+        blocked: (count) =>
+          count === 1
+            ? `${n(count)} Änderung kann von diesem Gerät nicht gesendet werden`
+            : `${n(count)} Änderungen können von diesem Gerät nicht gesendet werden`,
+        offline: "Offline – Änderungen werden auf diesem Gerät gespeichert und bei erneuter Verbindung synchronisiert",
+        refused: "Der Server hat den letzten Abgleich abgelehnt",
+        syncing: "Wird synchronisiert…",
+        pending: (count) =>
+          count === 1
+            ? `${n(count)} Änderung wartet auf Synchronisierung`
+            : `${n(count)} Änderungen warten auf Synchronisierung`,
+        syncedAt: (time) => `Synchronisiert um ${time}`,
+        idle: "Aktuell",
+        syncHint: "Tippen, um jetzt zu synchronisieren",
+        offlineHint: "offline gibt es nichts zu synchronisieren",
+        withHint: (state, hint) => `${state} – ${hint}`,
+        scoped: (scope, state) => `${scope}: ${state}`,
+        offlineShort: "Offline",
+        syncingShort: "Sync läuft…",
+        waitingShort: (count) => `${n(count)} ausstehend`,
+        refusedShort: "Nicht synchronisiert",
+        offlineUnsaved: "Offline – Änderungen können erst nach erneuter Verbindung gespeichert werden",
+        saving: "Wird gespeichert…",
+      },
+      dev: {
+        roleHeading: "Dev · Rolle",
+        switchPlan: "Tarif wechseln",
+        plan: (value) => `Tarif: ${value}`,
+        planHeading: "Dev · Tarif",
+        backTo: (role) => `Zurück zu ${role}`,
+        billingOff: "Die Abrechnung ist lokal aus: Tarife ändern nichts",
+      },
+    },
   };
 }

package/src/i18n/kit-labels.tsx

@@ -118,6 +118,8 @@ import type { PhoneInputLabels } from "../components/phone-input";
 import type { SignChipLabels } from "../components/sign-chip";
 import type { ColumnMapperLabels } from "../components/column-mapper";
 import type { NotificationsLabels } from "../notifications/notifications-labels";
+import type { AdminAreaLabels } from "../admin/admin-area-labels";
+import type { TopBarPartsLabels } from "../shell/top-bar-parts-labels";
 
 /**
  * EVERY string the kit renders, as one typed tree — and an optional provider that
@@ -475,6 +477,13 @@ export interface UiKitLabels {
    *  device's push, the device list, and the unsubscribe page
    *  (docs/notifications-harmonization.md §4.2). */
   notifications: NotificationsLabels;
+  /** 0.42.0: the admin area's shared words — the account menu's "Administration" row, the
+   *  403 page, the shared sections, the overview's tiles and the Tools list
+   *  (docs/admin-harmonization.md §3.1). */
+  adminArea: AdminAreaLabels;
+  /** 0.42.0: the top bar's shared parts — `TourMenu`, `SyncStatusIndicator`, `DevSwitchers`
+   *  (docs/top-bar-harmonization.md §3.1). */
+  topBarParts: TopBarPartsLabels;
 }
 
 /**

package/src/i18n/locales/en.ts

@@ -216,6 +216,25 @@ export function uiKitLabelsEn(numberLocale = "en-US"): UiKitLabels {
       ...d.settings,
       matchCount: (count) => (count === 1 ? "1 match" : `${n(count)} matches`),
     },
+    // 0.42.0: the admin area's two counts (docs/admin-harmonization.md §3.1).
+    adminArea: {
+      ...d.adminArea,
+      waiting: (count) => `${n(count)} waiting`,
+      tiles: { ...d.adminArea.tiles, usersNew: (count) => `${n(count)} new in 7 days` },
+    },
+    // 0.42.0: the top bar's three counts (docs/top-bar-harmonization.md §3.1).
+    topBarParts: {
+      ...d.topBarParts,
+      sync: {
+        ...d.topBarParts.sync,
+        blocked: (count) =>
+          count === 1
+            ? "1 change cannot be sent from this device"
+            : `${n(count)} changes cannot be sent from this device`,
+        pending: (count) => (count === 1 ? "1 change waiting to sync" : `${n(count)} changes waiting to sync`),
+        waitingShort: (count) => `${n(count)} waiting`,
+      },
+    },
     demo: {
       ...d.demo,
       rateLimited: (minutes) =>

package/src/i18n/locales/es.ts

@@ -112,8 +112,6 @@ export function uiKitLabelsEs(numberLocale = "es-ES"): UiKitLabels {
     feedbackMenu: {
       trigger: "Enviar comentarios",
       myFeedback: "Mis comentarios",
-      viewFeedback: "Ver comentarios",
-      allFeedback: "Todos los comentarios",
       discussion: "Debate de comentarios",
       inbox: "Comentarios recibidos",
     },
@@ -1685,6 +1683,11 @@ export function uiKitLabelsEs(numberLocale = "es-ES"): UiKitLabels {
         "Su pago se está procesando. Su plan empieza en cuanto se confirme; esta página se actualiza sola.",
       choosePlan: "Elegir un plan",
       updatePayment: "Actualizar el método de pago",
+      // 0.42 (§16.7 A): for an admin who isn't the buyer.
+      paymentFailedAskBuyer: (buyer) =>
+        buyer
+          ? `El pago no se ha completado. ${buyer} puede actualizar el método de pago.`
+          : "El pago no se ha completado. El administrador que contrató la suscripción puede actualizar el método de pago.",
       checkAgain: "Volver a comprobar",
       lockReason: "Su plan ha terminado. Elija un plan para volver a hacer cambios.",
       // As `characterCount.limitReached` ("Límite de caracteres alcanzado").
@@ -1715,6 +1718,19 @@ export function uiKitLabelsEs(numberLocale = "es-ES"): UiKitLabels {
       switchCredited: "Abonado a sus próximos cargos",
       switchNextCharge: (date) => `Próximo cargo el ${date}`,
       switchConfirm: "Cambiar de plan",
+      // 0.42 (§16): the portal for the buyer only, the in-app cancel, the grant warning.
+      buyerHolds: (buyer) =>
+        buyer
+          ? `El método de pago y las facturas los gestiona ${buyer}, que contrató la suscripción.`
+          : "El método de pago y las facturas los gestiona el administrador que contrató la suscripción.",
+      cancelConfirmTitle: "Cancelar la suscripción",
+      cancelConfirmBody: (date) => `Su suscripción termina el ${date}. Hasta entonces, todo funciona como antes.`,
+      cancelConfirmAction: "Cancelar ahora la suscripción",
+      keepSubscription: "Mantener la suscripción",
+      grantWarningTitle: "Su acceso gratuito continúa",
+      grantWarningBody:
+        "Su acceso gratuito no tiene fecha de fin. Mientras dure, una compra no cambia su plan: pagaría por un plan que no se aplica.",
+      grantWarningAction: "Comprar de todos modos",
       waitingChanges: (count) => `${n(count)} ${plural(count, "cambio", "cambios")} a la espera de un plan`,
       // "Descartar", as `wizard.cancelConfirmLabel`.
       discardWaiting: "Descartar los cambios en espera",
@@ -1783,6 +1799,74 @@ export function uiKitLabelsEs(numberLocale = "es-ES"): UiKitLabels {
       more: "Más",
       moreTitle: "Más páginas",
     },
+    // 0.42.0 — docs/admin-harmonization.md §3.1: the admin area's shared words. "Usted",
+    // as the rest of the catalogue.
+    adminArea: {
+      title: "Administración",
+      waiting: (count) => `${n(count)} ${plural(count, "pendiente", "pendientes")}`,
+      forbiddenTitle: "Solo para administradores",
+      forbiddenBody: (appName) =>
+        `Aquí es donde los administradores gestionan ${appName}. Su cuenta no puede abrir esta página.`,
+      forbiddenHome: "Ir a la página de inicio",
+      forbiddenReviewer: "Revisar traducciones",
+      sections: {
+        overview: { title: "Resumen", help: "Lo que está pendiente, de un vistazo." },
+        users: { title: "Usuarios", help: "Quién tiene una cuenta y qué puede hacer cada uno." },
+        invitations: { title: "Invitaciones", help: "Los enlaces con los que entra una persona nueva." },
+        billing: { title: "Facturación", help: "El plan, el pago y las facturas." },
+        activity: { title: "Actividad", help: "Lo que hicieron los administradores, lo más reciente primero." },
+      },
+      tiles: {
+        feedbackWaiting: "Por clasificar",
+        deletionRequests: "Solicitudes de eliminación",
+        invitationsPending: "Invitaciones pendientes",
+        users: "Usuarios",
+        usersNew: (count) => `${n(count)} ${plural(count, "nuevo", "nuevos")} en 7 días`,
+      },
+      tools: "Herramientas",
+    },
+    // 0.42.0 — docs/top-bar-harmonization.md §3.1: the top bar's shared parts; "plan" as
+    // `billing`, "usted" as the rest of the catalogue.
+    topBarParts: {
+      tours: {
+        menu: "Visitas guiadas",
+        newDot: "Visitas nuevas",
+        thisPage: "En esta página",
+        newTours: "Visitas nuevas",
+        allTours: "Todas las visitas…",
+        badgeNew: "Nuevo",
+        completed: "Completada",
+      },
+      sync: {
+        blocked: (count) =>
+          `${n(count)} ${plural(count, "cambio no se puede enviar", "cambios no se pueden enviar")} desde este dispositivo`,
+        offline: "Sin conexión: los cambios se guardan en este dispositivo y se sincronizarán al volver a conectarse",
+        refused: "El servidor rechazó la última sincronización",
+        syncing: "Sincronizando…",
+        pending: (count) =>
+          `${n(count)} ${plural(count, "cambio", "cambios")} a la espera de sincronizarse`,
+        syncedAt: (time) => `Sincronizado a las ${time}`,
+        idle: "Al día",
+        syncHint: "Toque para sincronizar ahora",
+        offlineHint: "no hay nada que sincronizar sin conexión",
+        withHint: (state, hint) => `${state} — ${hint}`,
+        scoped: (scope, state) => `${scope}: ${state}`,
+        offlineShort: "Sin conexión",
+        syncingShort: "Sincronizando…",
+        waitingShort: (count) => `${n(count)} en espera`,
+        refusedShort: "Sin sincronizar",
+        offlineUnsaved: "Sin conexión: los cambios no se pueden guardar hasta que vuelva a conectarse",
+        saving: "Guardando…",
+      },
+      dev: {
+        roleHeading: "Dev · rol",
+        switchPlan: "Cambiar de plan",
+        plan: (value) => `Plan: ${value}`,
+        planHeading: "Dev · plan",
+        backTo: (role) => `Volver a ${role}`,
+        billingOff: "La facturación está desactivada en local: los planes no cambian nada",
+      },
+    },
   };
 }