@conduction/nextcloud-vue 2.97.0 → 2.99.0

package/l10n/en.json

@@ -1590,7 +1590,111 @@
     "About {name}": "About {name}",
     "Sent message": "Sent message",
     "Received message": "Received message",
-    "Loading messages…": "Loading messages…"
+    "Loading messages…": "Loading messages…",
+    "Move {item} up": "Move {item} up",
+    "Move {item} down": "Move {item} down",
+    "Remove {item}": "Remove {item}",
+    "Nothing added yet.": "Nothing added yet.",
+    "Ordered list": "Ordered list",
+    "{item} moved to position {position} of {total}": "{item} moved to position {position} of {total}",
+    "{item} removed": "{item} removed",
+    "{item} added": "{item} added",
+    "Organisations": "Organisations",
+    "Provisioning": "Provisioning",
+    "Suspended": "Suspended",
+    "Deprovisioning": "Deprovisioning",
+    "Archived": "Archived",
+    "Retained": "Retained",
+    "A flow runs a series of steps when something happens — an object changes, a schedule fires, or you run it yourself.": "A flow runs a series of steps when something happens — an object changes, a schedule fires, or you run it yourself.",
+    "Schedule": "Schedule",
+    "Enabled, but has no owner — it will not start": "Enabled, but has no owner — it will not start",
+    "Enabled": "Enabled",
+    "{context}, step {step} of {total}": "{context}, step {step} of {total}",
+    "completed": "completed",
+    "Runs": "Runs",
+    "Save the flow first — an unsaved flow has never run.": "Save the flow first — an unsaved flow has never run.",
+    "This flow has never run.": "This flow has never run.",
+    "Create draft version": "Create draft version",
+    "Deprecate": "Deprecate",
+    "Published": "Published",
+    "Arrange steps automatically": "Arrange steps automatically",
+    "Undo the last change": "Undo the last change",
+    "Opening the run": "Opening the run",
+    "Zoom out": "Zoom out",
+    "Reset zoom": "Reset zoom",
+    "Zoom in": "Zoom in",
+    "Show the flow controls": "Show the flow controls",
+    "A field this step asks for is no longer available in the schema.": "A field this step asks for is no longer available in the schema.",
+    "Form out of date": "Form out of date",
+    "The engine does not know this node type, so this step will fail when the flow runs.": "The engine does not know this node type, so this step will fail when the flow runs.",
+    "Unknown step": "Unknown step",
+    "No steps yet": "No steps yet",
+    "Add a step from the sidebar to start building this flow.": "Add a step from the sidebar to start building this flow.",
+    "Flow run": "Flow run",
+    "Flow editor": "Flow editor",
+    "Loading the flow": "Loading the flow",
+    "Reading the run and the graph it used.": "Reading the run and the graph it used.",
+    "Reading the steps of this flow.": "Reading the steps of this flow.",
+    "You are looking at a stored version. Go back to the flow to edit and save it.": "You are looking at a stored version. Go back to the flow to edit and save it.",
+    "A published flow cannot be edited. Create a draft to change it.": "A published flow cannot be edited. Create a draft to change it.",
+    "This line is already drawn this way.": "This line is already drawn this way.",
+    "Edit label": "Edit label",
+    "Paste style": "Paste style",
+    "This flow cannot run yet.": "This flow cannot run yet.",
+    "This flow can run, with warnings.": "This flow can run, with warnings.",
+    "This flow looks runnable.": "This flow looks runnable.",
+    "The last action failed.": "The last action failed.",
+    "This flow has no trigger and no end step, so it cannot start or finish.": "This flow has no trigger and no end step, so it cannot start or finish.",
+    "This flow has no trigger, so nothing will start it.": "This flow has no trigger, so nothing will start it.",
+    "This flow has no end step, so a run can never finish.": "This flow has no end step, so a run can never finish.",
+    "This version is published and cannot be changed. Create a draft to make changes; the published version keeps running until you publish the draft.": "This version is published and cannot be changed. Create a draft to make changes; the published version keeps running until you publish the draft.",
+    "Only a draft version can be published.": "Only a draft version can be published.",
+    "Only a published version can be deprecated.": "Only a published version can be deprecated.",
+    "This flow has no published version, so it cannot run. Publish a version first.": "This flow has no published version, so it cannot run. Publish a version first.",
+    "This version cannot be published while a step has nowhere to send its work.": "This version cannot be published while a step has nowhere to send its work.",
+    "This version cannot be removed while a run is still using it.": "This version cannot be removed while a run is still using it.",
+    "That change was refused by the flow's current state.": "That change was refused by the flow's current state.",
+    "This flow could not be found. It may have been deleted, or you may not have access to it.": "This flow could not be found. It may have been deleted, or you may not have access to it.",
+    "This version is read-only. Create a draft to change its steps; the published version keeps running until you publish the draft.": "This version is read-only. Create a draft to change its steps; the published version keeps running until you publish the draft.",
+    "The list of available steps could not be read, so no steps can be added. This does not mean the instance has none.": "The list of available steps could not be read, so no steps can be added. This does not mean the instance has none.",
+    "This flow has no owner yet, so a trigger will not start it. Saving it makes you its owner.": "This flow has no owner yet, so a trigger will not start it. Saving it makes you its owner.",
+    "This flow has unsaved changes.": "This flow has unsaved changes.",
+    "This is version {version} of the flow, the graph this run used. Go back to the flow to edit it.": "This is version {version} of the flow, the graph this run used. Go back to the flow to edit it.",
+    "This run used version {version} of the flow. You have unsaved changes, so it is replayed over your current graph instead. Save or undo your changes to see the graph it used.": "This run used version {version} of the flow. You have unsaved changes, so it is replayed over your current graph instead. Save or undo your changes to see the graph it used.",
+    "Version {version} of this flow could not be read, so the run is replayed over the current graph. Read the run steps in the sidebar for what actually ran.": "Version {version} of this flow could not be read, so the run is replayed over the current graph. Read the run steps in the sidebar for what actually ran.",
+    "Some steps of this run belong to nodes that are no longer on the canvas, so they were skipped: {nodes}": "Some steps of this run belong to nodes that are no longer on the canvas, so they were skipped: {nodes}",
+    "The form of step \"{step}\" asks for fields the schema no longer offers: {fields}": "The form of step \"{step}\" asks for fields the schema no longer offers: {fields}",
+    "is no longer in the schema": "is no longer in the schema",
+    "is read-only in the schema": "is read-only in the schema",
+    "is hidden in the schema": "is hidden in the schema",
+    "not configured": "not configured",
+    "Objects this run is about": "Objects this run is about",
+    "Changed by this run": "Changed by this run",
+    "at {node}": "at {node}",
+    "The flows could not be loaded. This does not mean there are none.": "The flows could not be loaded. This does not mean there are none.",
+    "No flows yet": "No flows yet",
+    "App": "App",
+    "Set up this app": "Set up this app",
+    "Finish": "Finish",
+    "Setup complete.": "Setup complete.",
+    "Select \"{step}\" first.": "Select \"{step}\" first.",
+    "Please make a selection to continue.": "Please make a selection to continue.",
+    "Please run this step before continuing.": "Please run this step before continuing.",
+    "Stored. Type a new value to replace it.": "Stored. Type a new value to replace it.",
+    "Unsaved changes": "Unsaved changes",
+    "The settings could not be loaded: {reason}": "The settings could not be loaded: {reason}",
+    "{field} is required.": "{field} is required.",
+    "{field} is not in the right form.": "{field} is not in the right form.",
+    "{field} must be a number.": "{field} must be a number.",
+    "{field} must be at least {min}.": "{field} must be at least {min}.",
+    "{field} must be at most {max}.": "{field} must be at most {max}.",
+    "Check the marked fields.": "Check the marked fields.",
+    "The settings could not be saved: {reason}": "The settings could not be saved: {reason}",
+    "This value could not be loaded: {reason}": "This value could not be loaded: {reason}",
+    "{fields}: {reason}": "{fields}: {reason}",
+    "Current {name}": "Current {name}",
+    "Upload {name}": "Upload {name}",
+    "The image could not be uploaded: {reason}": "The image could not be uploaded: {reason}"
   },
   "plurals": {
     "{count} selected": [
@@ -1684,6 +1788,10 @@
     "And %n more type in this group.": [
       "And %n more type in this group.",
       "And %n more types in this group."
+    ],
+    "Showing %n flow": [
+      "Showing %n flow",
+      "Showing %n flows"
     ]
   }
 }

package/l10n/nl.json

@@ -1776,7 +1776,140 @@
     "About {name}": "Over {name}",
     "Sent message": "Verstuurd bericht",
     "Received message": "Ontvangen bericht",
-    "Loading messages…": "Berichten laden…"
+    "Loading messages…": "Berichten laden…",
+    "Move {item} up": "{item} omhoog",
+    "Move {item} down": "{item} omlaag",
+    "Remove {item}": "{item} verwijderen",
+    "Nothing added yet.": "Nog niets toegevoegd.",
+    "Ordered list": "Lijst op volgorde",
+    "{item} moved to position {position} of {total}": "{item} staat nu op plaats {position} van {total}",
+    "{item} removed": "{item} verwijderd",
+    "{item} added": "{item} toegevoegd",
+    "Question {n} of {total}": "Vraag {n} van {total}",
+    "Questions answered": "Beantwoorde vragen",
+    "(required)": "(verplicht)",
+    "Answer this question to go on.": "Beantwoord deze vraag om verder te gaan.",
+    "Finish": "Afronden",
+    "Take or add a photo": "Foto maken of toevoegen",
+    "Another photo": "Nog een foto",
+    "Photo for question {n}": "Foto bij vraag {n}",
+    "This checklist has no questions.": "Deze checklist heeft geen vragen.",
+    "The checklist could not be loaded.": "De checklist kon niet worden geladen.",
+    "The answer could not be saved. Try again.": "Het antwoord kon niet worden opgeslagen. Probeer het opnieuw.",
+    "Checklist finished.": "Checklist afgerond.",
+    "Not applicable": "Niet van toepassing",
+    "Answer with a photo.": "Beantwoord met een foto.",
+    "This answer needs a photo. Add one to go on.": "Bij dit antwoord hoort een foto. Voeg er een toe om verder te gaan.",
+    "Organisations": "Organisaties",
+    "Provisioning": "Wordt ingericht",
+    "Suspended": "Opgeschort",
+    "Deprovisioning": "Wordt opgeheven",
+    "Archived": "Gearchiveerd",
+    "Retained": "Bewaard",
+    "A flow runs a series of steps when something happens — an object changes, a schedule fires, or you run it yourself.": "Een flow voert een reeks stappen uit als er iets gebeurt: een object verandert, een schema gaat af of je start hem zelf.",
+    "Schedule": "Schema",
+    "Enabled, but has no owner — it will not start": "Aan, maar zonder eigenaar: hij start niet",
+    "Enabled": "Aan",
+    "{context}, step {step} of {total}": "{context}, stap {step} van {total}",
+    "completed": "afgerond",
+    "Runs": "Uitvoeringen",
+    "Save the flow first — an unsaved flow has never run.": "Sla de flow eerst op. Een flow die niet is opgeslagen, heeft nooit gedraaid.",
+    "This flow has never run.": "Deze flow heeft nog nooit gedraaid.",
+    "Create draft version": "Conceptversie maken",
+    "Deprecate": "Uitfaseren",
+    "Published": "Gepubliceerd",
+    "Arrange steps automatically": "Stappen automatisch ordenen",
+    "Undo the last change": "Laatste wijziging ongedaan maken",
+    "Opening the run": "De uitvoering openen",
+    "Zoom out": "Uitzoomen",
+    "Reset zoom": "Zoom herstellen",
+    "Zoom in": "Inzoomen",
+    "Show the flow controls": "Toon de knoppen van de flow",
+    "A field this step asks for is no longer available in the schema.": "Een veld dat deze stap vraagt, staat niet meer in het schema.",
+    "Form out of date": "Formulier verouderd",
+    "The engine does not know this node type, so this step will fail when the flow runs.": "De engine kent dit soort stap niet. Deze stap mislukt dus als de flow draait.",
+    "Unknown step": "Onbekende stap",
+    "No steps yet": "Nog geen stappen",
+    "Add a step from the sidebar to start building this flow.": "Voeg een stap toe vanuit de zijbalk om deze flow te bouwen.",
+    "Flow run": "Uitvoering van de flow",
+    "Flow editor": "Flow-editor",
+    "Loading the flow": "De flow laden",
+    "Reading the run and the graph it used.": "De uitvoering en de gebruikte stappen worden gelezen.",
+    "Reading the steps of this flow.": "De stappen van deze flow worden gelezen.",
+    "You are looking at a stored version. Go back to the flow to edit and save it.": "Je bekijkt een opgeslagen versie. Ga terug naar de flow om te wijzigen en op te slaan.",
+    "A published flow cannot be edited. Create a draft to change it.": "Een gepubliceerde flow kun je niet wijzigen. Maak een concept om hem te veranderen.",
+    "This line is already drawn this way.": "Deze lijn is al zo getekend.",
+    "Edit label": "Label bewerken",
+    "Paste style": "Stijl plakken",
+    "This flow cannot run yet.": "Deze flow kan nog niet draaien.",
+    "This flow can run, with warnings.": "Deze flow kan draaien, met waarschuwingen.",
+    "This flow looks runnable.": "Deze flow lijkt klaar om te draaien.",
+    "The last action failed.": "De laatste actie is mislukt.",
+    "This flow has no trigger and no end step, so it cannot start or finish.": "Deze flow heeft geen start en geen eindstap. Hij kan dus niet beginnen of eindigen.",
+    "This flow has no trigger, so nothing will start it.": "Deze flow heeft geen start, dus niets zet hem in gang.",
+    "This flow has no end step, so a run can never finish.": "Deze flow heeft geen eindstap, dus een uitvoering wordt nooit afgerond.",
+    "This version is published and cannot be changed. Create a draft to make changes; the published version keeps running until you publish the draft.": "Deze versie is gepubliceerd en kan niet veranderen. Maak een concept om te wijzigen. De gepubliceerde versie blijft draaien tot je het concept publiceert.",
+    "Only a draft version can be published.": "Alleen een conceptversie kun je publiceren.",
+    "Only a published version can be deprecated.": "Alleen een gepubliceerde versie kun je uitfaseren.",
+    "This flow has no published version, so it cannot run. Publish a version first.": "Deze flow heeft geen gepubliceerde versie en kan dus niet draaien. Publiceer eerst een versie.",
+    "This version cannot be published while a step has nowhere to send its work.": "Je kunt deze versie niet publiceren zolang een stap zijn werk nergens heen kan sturen.",
+    "This version cannot be removed while a run is still using it.": "Je kunt deze versie niet verwijderen zolang een uitvoering hem nog gebruikt.",
+    "That change was refused by the flow's current state.": "De flow staat die wijziging in zijn huidige toestand niet toe.",
+    "This flow could not be found. It may have been deleted, or you may not have access to it.": "Deze flow is niet gevonden. Misschien is hij verwijderd, of heb je er geen toegang toe.",
+    "This version is read-only. Create a draft to change its steps; the published version keeps running until you publish the draft.": "Deze versie is alleen-lezen. Maak een concept om de stappen te wijzigen. De gepubliceerde versie blijft draaien tot je het concept publiceert.",
+    "The list of available steps could not be read, so no steps can be added. This does not mean the instance has none.": "De lijst met beschikbare stappen kon niet worden gelezen, dus je kunt geen stappen toevoegen. Dat betekent niet dat er geen zijn.",
+    "This flow has no owner yet, so a trigger will not start it. Saving it makes you its owner.": "Deze flow heeft nog geen eigenaar, dus een start zet hem niet in gang. Als je hem opslaat, word jij de eigenaar.",
+    "This flow has unsaved changes.": "Deze flow heeft wijzigingen die nog niet zijn opgeslagen.",
+    "This is version {version} of the flow, the graph this run used. Go back to the flow to edit it.": "Dit is versie {version} van de flow, de stappen die deze uitvoering gebruikte. Ga terug naar de flow om hem te wijzigen.",
+    "This run used version {version} of the flow. You have unsaved changes, so it is replayed over your current graph instead. Save or undo your changes to see the graph it used.": "Deze uitvoering gebruikte versie {version} van de flow. Je hebt wijzigingen die nog niet zijn opgeslagen. Daarom wordt hij over je huidige stappen afgespeeld. Sla je wijzigingen op of maak ze ongedaan om de gebruikte stappen te zien.",
+    "Version {version} of this flow could not be read, so the run is replayed over the current graph. Read the run steps in the sidebar for what actually ran.": "Versie {version} van deze flow kon niet worden gelezen. Daarom wordt de uitvoering over de huidige stappen afgespeeld. Wat echt draaide, lees je in de stappen in de zijbalk.",
+    "Some steps of this run belong to nodes that are no longer on the canvas, so they were skipped: {nodes}": "Sommige stappen van deze uitvoering horen bij stappen die niet meer op het canvas staan. Die zijn overgeslagen: {nodes}",
+    "The form of step \"{step}\" asks for fields the schema no longer offers: {fields}": "Het formulier van stap \"{step}\" vraagt velden die niet meer in het schema staan: {fields}",
+    "is no longer in the schema": "staat niet meer in het schema",
+    "is read-only in the schema": "is alleen-lezen in het schema",
+    "is hidden in the schema": "is verborgen in het schema",
+    "not configured": "niet ingesteld",
+    "Objects this run is about": "Objecten waar deze uitvoering over gaat",
+    "Changed by this run": "Gewijzigd door deze uitvoering",
+    "at {node}": "bij {node}",
+    "The flows could not be loaded. This does not mean there are none.": "De flows konden niet worden geladen. Dat betekent niet dat er geen zijn.",
+    "No flows yet": "Nog geen flows",
+    "App": "App",
+    "Set up this app": "Deze app instellen",
+    "Setup complete.": "Instellen is klaar.",
+    "Select \"{step}\" first.": "Kies eerst \"{step}\".",
+    "Please make a selection to continue.": "Maak een keuze om verder te gaan.",
+    "Please run this step before continuing.": "Voer deze stap uit voor je verdergaat.",
+    "Stored. Type a new value to replace it.": "Opgeslagen. Typ een nieuwe waarde om die te vervangen.",
+    "Unsaved changes": "Niet-opgeslagen wijzigingen",
+    "The settings could not be loaded: {reason}": "De instellingen konden niet worden geladen: {reason}",
+    "{field} is required.": "{field} is verplicht.",
+    "{field} is not in the right form.": "{field} heeft niet de juiste vorm.",
+    "{field} must be a number.": "{field} moet een getal zijn.",
+    "{field} must be at least {min}.": "{field} moet minstens {min} zijn.",
+    "{field} must be at most {max}.": "{field} mag hoogstens {max} zijn.",
+    "Check the marked fields.": "Controleer de gemarkeerde velden.",
+    "The settings could not be saved: {reason}": "De instellingen konden niet worden opgeslagen: {reason}",
+    "This value could not be loaded: {reason}": "Deze waarde kon niet worden geladen: {reason}",
+    "{fields}: {reason}": "{fields}: {reason}",
+    "Current {name}": "Huidige {name}",
+    "Upload {name}": "{name} uploaden",
+    "The image could not be uploaded: {reason}": "De afbeelding kon niet worden geüpload: {reason}",
+    "Previous month": "Vorige maand",
+    "Next month": "Volgende maand",
+    "Add day": "Dag toevoegen",
+    "No working calendar found.": "Geen werkkalender gevonden.",
+    "Holidays could not be read. Only the days added by hand are shown.": "De feestdagen konden niet worden gelezen. Alleen de met de hand toegevoegde dagen staan erin.",
+    "The working calendar could not be loaded.": "De werkkalender kon niet worden geladen.",
+    "{date}, closed: {name}": "{date}, gesloten: {name}",
+    "{date}, closed": "{date}, gesloten",
+    "{date}, working day": "{date}, werkdag",
+    "{date}, not a working day": "{date}, geen werkdag",
+    "Day added by hand": "Met de hand toegevoegde dag",
+    "Day added.": "Dag toegevoegd.",
+    "Only an administrator can change the working calendar.": "Alleen een beheerder kan de werkkalender wijzigen.",
+    "The day could not be added. Try again.": "De dag kon niet worden toegevoegd. Probeer het opnieuw.",
+    "Loading …": "Laden …"
   },
   "plurals": {
     "{count} selected": [
@@ -1870,6 +2003,10 @@
     "And %n more type in this group.": [
       "En nog %n soort in deze groep.",
       "En nog %n soorten in deze groep."
+    ],
+    "Showing %n flow": [
+      "%n flow",
+      "%n flows"
     ]
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@conduction/nextcloud-vue",
-  "version": "2.97.0",
+  "version": "2.99.0",
   "description": "Shared Vue component library for Conduction Nextcloud apps — complements @nextcloud/vue with higher-level components, OpenRegister integration, and NL Design System support",
   "homepage": "https://github.com/ConductionNL/nextcloud-vue#readme",
   "bugs": {
@@ -86,7 +86,7 @@
     "jsdoc-baselines:update": "node scripts/check-jsdoc.js --update",
     "lint": "eslint src/ eslint/ testing/ tests/ e2e/",
     "lint-fix": "npm run lint -- --fix",
-    "prepare": "husky || true",
+    "prepare": "husky || true; git config merge.l10n.name 'l10n catalogue key-wise merge' || true; git config merge.l10n.driver 'node scripts/merge-l10n.js %O %A %B %P' || true",
     "prepublishOnly": "npm run build",
     "smoke-baseline:update": "node scripts/update-smoke-baseline.js",
     "styleguide": "cd styleguide && npm run server",

package/scripts/merge-l10n.js

@@ -0,0 +1,196 @@
+#!/usr/bin/env node
+/**
+ * SPDX-License-Identifier: EUPL-1.2
+ * SPDX-FileCopyrightText: 2026 Conduction B.V.
+ *
+ * Git merge driver for the l10n catalogues (`l10n/*.json`).
+ *
+ * Every branch that adds a library string appends to the end of `translations`
+ * (and sometimes `plurals`) in `l10n/en.json` and `l10n/nl.json`, so two
+ * branches always edit the same last lines and git calls it a conflict on
+ * every merge of development. A catalogue is a set of keys, not a sequence of
+ * lines, so this driver merges the three versions key by key: a key one side
+ * added is kept, a key one side removed is dropped, a key only one side
+ * changed takes that side's text, and only a key BOTH sides changed to
+ * different texts is a conflict.
+ *
+ * A conflict is written with `<<<<<<<` / `=======` / `>>>>>>>` markers around
+ * the two one-line entries and exit code 1, so git marks the path unmerged and
+ * the file does not parse until a person picks one. A side that does not
+ * parse is not guessed at: exit 1, our version untouched.
+ *
+ * Order: our keys in our order, then the keys only their side added, in
+ * theirs. Output is `JSON.stringify(doc, null, 2)` plus a newline, which is the
+ * shape every catalogue in this repo already has byte for byte.
+ *
+ * `merge=union` is not used on purpose: it concatenates both hunks, which on
+ * JSON drops a comma or doubles a brace, and a catalogue that does not parse
+ * turns every string back into its English key.
+ *
+ * Registration is local git config (git never runs a command a repository
+ * ships); `npm install` sets it through `prepare`, an existing clone runs:
+ *
+ *   git config merge.l10n.driver 'node scripts/merge-l10n.js %O %A %B %P'
+ *
+ * Without it git falls back to its ordinary merge, as before.
+ *
+ * Usage (what git invokes): node scripts/merge-l10n.js %O %A %B %P
+ */
+
+'use strict'
+
+const fs = require('fs')
+
+const MARKER_INDENT = '    '
+
+/**
+ * Whether two catalogue values are the same (a plural is an array of forms).
+ *
+ * @param {unknown} a One value, undefined for absent.
+ * @param {unknown} b The other.
+ * @return {boolean}
+ */
+function same(a, b) {
+	return a === b || (a !== undefined && b !== undefined && JSON.stringify(a) === JSON.stringify(b))
+}
+
+/**
+ * Three-way merge of one object of keys (a catalogue block).
+ *
+ * @param {object} base The ancestor's block.
+ * @param {object} ours Our block.
+ * @param {object} theirs Their block.
+ * @return {{merged: object, conflicts: Array<{key: string, ours: unknown, theirs: unknown}>}}
+ */
+function mergeBlock(base, ours, theirs) {
+	const merged = {}
+	const conflicts = []
+	const keys = [...Object.keys(ours), ...Object.keys(theirs).filter((key) => !Object.hasOwn(ours, key))]
+	for (const key of keys) {
+		const b = base[key]
+		const o = ours[key]
+		const t = theirs[key]
+		let value
+		if (same(o, t)) {
+			value = o
+		} else if (same(o, b)) {
+			value = t
+		} else if (same(t, b)) {
+			value = o
+		} else {
+			conflicts.push({ key, ours: o, theirs: t })
+			value = o === undefined ? t : o
+		}
+		if (value !== undefined) {
+			merged[key] = value
+		}
+	}
+	return { merged, conflicts }
+}
+
+/**
+ * Whether a value is a plain object (a catalogue block).
+ *
+ * @param {unknown} value The value.
+ * @return {boolean}
+ */
+function isBlock(value) {
+	return value !== null && typeof value === 'object' && !Array.isArray(value)
+}
+
+/**
+ * Merge three catalogue texts.
+ *
+ * @param {string} baseText The ancestor ('' when both sides added the file).
+ * @param {string} oursText Our version.
+ * @param {string} theirsText Their version.
+ * @return {{text: string|null, conflicts: number}} The merged text (null when a side does not parse) and the number of conflicting keys.
+ */
+function mergeCatalogues(baseText, oursText, theirsText) {
+	let base
+	let ours
+	let theirs
+	try {
+		base = baseText.trim() === '' ? {} : JSON.parse(baseText)
+		ours = JSON.parse(oursText)
+		theirs = JSON.parse(theirsText)
+	} catch {
+		return { text: null, conflicts: 0 }
+	}
+	if (!isBlock(base) || !isBlock(ours) || !isBlock(theirs)) {
+		return { text: null, conflicts: 0 }
+	}
+	const doc = {}
+	const conflicts = []
+	const topKeys = [...Object.keys(ours), ...Object.keys(theirs).filter((key) => !Object.hasOwn(ours, key))]
+	for (const key of topKeys) {
+		const [b, o, t] = [base[key], ours[key], theirs[key]]
+		if (isBlock(o) || isBlock(t)) {
+			const result = mergeBlock(isBlock(b) ? b : {}, isBlock(o) ? o : {}, isBlock(t) ? t : {})
+			doc[key] = result.merged
+			result.conflicts.forEach((conflict) => conflicts.push({ block: key, ...conflict }))
+			continue
+		}
+		const result = mergeBlock({ [key]: b }, o === undefined ? {} : { [key]: o }, t === undefined ? {} : { [key]: t })
+		if (Object.hasOwn(result.merged, key)) {
+			doc[key] = result.merged[key]
+		}
+		result.conflicts.forEach((conflict) => conflicts.push({ block: null, ...conflict }))
+	}
+	let text = JSON.stringify(doc, null, 2) + '\n'
+	for (const conflict of conflicts) {
+		text = markConflict(text, conflict)
+	}
+	return { text, conflicts: conflicts.length }
+}
+
+/**
+ * Put conflict markers around one key's entry, both sides on one line each.
+ *
+ * @param {string} text The serialised merge.
+ * @param {{block: string|null, key: string, ours: unknown, theirs: unknown}} conflict The conflict.
+ * @return {string} The text with markers.
+ */
+function markConflict(text, conflict) {
+	const indent = conflict.block ? MARKER_INDENT : '  '
+	const entry = (value) => (value === undefined ? `${indent}(removed)` : `${indent}${JSON.stringify(conflict.key)}: ${JSON.stringify(value)},`)
+	const lines = text.split('\n')
+	const start = lines.findIndex((line) => line.startsWith(`${indent}${JSON.stringify(conflict.key)}: `))
+	if (start < 0) {
+		return text
+	}
+	let end = start
+	if (/[[{]$/.test(lines[start])) {
+		const close = indent + (lines[start].endsWith('[') ? ']' : '}')
+		while (end < lines.length - 1 && !lines[end].startsWith(close)) {
+			end += 1
+		}
+	}
+	const block = ['<<<<<<< ours', entry(conflict.ours), '=======', entry(conflict.theirs), '>>>>>>> theirs']
+	lines.splice(start, end - start + 1, ...block)
+	return lines.join('\n')
+}
+
+module.exports = { mergeCatalogues }
+
+if (require.main === module) {
+	const [basePath, oursPath, theirsPath, label] = process.argv.slice(2)
+	const read = (file) => {
+		try {
+			return fs.readFileSync(file, 'utf8')
+		} catch {
+			return ''
+		}
+	}
+	const { text, conflicts } = mergeCatalogues(read(basePath), read(oursPath), read(theirsPath))
+	if (text === null) {
+		process.stderr.write(`merge-l10n: ${label || oursPath} does not parse on one side; resolve it by hand.\n`)
+		process.exit(1)
+	}
+	fs.writeFileSync(oursPath, text)
+	if (conflicts > 0) {
+		process.stderr.write(`merge-l10n: ${conflicts} key(s) in ${label || oursPath} were translated differently on both sides.\n`)
+		process.exit(1)
+	}
+	process.exit(0)
+}

package/src/components/CnActionsMenu/CnActionsMenu.vue

@@ -30,7 +30,8 @@
 			:data-testid="`${testidBase}-actions`"
 			@update:open="menuOpen = $event">
 			<template #icon>
-				<DotsHorizontal :size="20" />
+				<ChevronDown v-if="trailingChevron" :size="14" />
+				<DotsHorizontal v-else :size="20" />
 			</template>
 			<!-- @slot lead-items Items rendered at the very top of the menu, above Refresh: the tabs a board strip lists here instead of drawing them (CnTabsWidget). The caller owns any separator after them. -->
 			<slot name="lead-items" />
@@ -127,6 +128,7 @@ import { translate as t } from '@nextcloud/l10n'
 import { NcActionButton, NcActionLink, NcActions, NcLoadingIcon } from '@nextcloud/vue'
 import BookOpenVariant from 'vue-material-design-icons/BookOpenVariant.vue'
 import BugOutline from 'vue-material-design-icons/BugOutline.vue'
+import ChevronDown from 'vue-material-design-icons/ChevronDown.vue'
 import DotsHorizontal from 'vue-material-design-icons/DotsHorizontal.vue'
 import LightbulbOutline from 'vue-material-design-icons/LightbulbOutline.vue'
 import Refresh from 'vue-material-design-icons/Refresh.vue'
@@ -248,6 +250,7 @@ export default {
 		NcActionButton,
 		NcActionLink,
 		NcLoadingIcon,
+		ChevronDown,
 		DotsHorizontal,
 		Refresh,
 		LightbulbOutline,
@@ -487,6 +490,16 @@ export default {
 			default: () => t('nextcloud-vue', 'Request a feature'),
 		},
 
+		/**
+		 * Draw a 14px chevron after the label instead of the dots before it:
+		 * the board's "Meer" menu in a detail header (DqZaak). The board look
+		 * puts the icon after the label; the Nextcloud look keeps it first.
+		 */
+		trailingChevron: {
+			type: Boolean,
+			default: false,
+		},
+
 		/** Pre-translated aria-label / tooltip for the overflow trigger. */
 		actionsMenuLabel: {
 			type: String,

package/src/components/CnAppRoot/CnAppRoot.md

@@ -87,6 +87,7 @@ With loading state, custom components, translate, permissions, and custom page t
 | `userSettingsTitle` | String | No | `''` | Title shown at the top of the hosted `NcAppSettingsDialog`. Empty (the default) resolves to "User settings" from the library catalogue ("Persoonlijke instellingen" in Dutch), then the app's `translate`. Override per app to brand the modal (e.g. `'Decidiq preferences'`). |
 | `userSettingsEyebrow` | String | No | `''` | Board look: the line above the user-settings title. Empty uses "Your account" ("Uw account"). Goes through the app's `translate`. |
 | `userSettingsSubtitle` | String | No | `''` | Board look: the sentence under the user-settings title. Empty uses "Only for you. Colleagues keep their own settings." Goes through the app's `translate`. |
+| `userSettingsNextcloudLinks` | Array | No | `[]` | Board look: Nextcloud's own personal settings, listed first in the user-settings navigation as links, `[{ label, section? \| href?, icon? }]`. With any, the app's sections sit under one entry named after the app. |
 | `userSettingsSections` | Array | No | `null` | The user-settings sections to draw, in order: `app` (the app's slot content), `notifications`, `credentials`, `walkthrough`, `integrations`. A key left out is not drawn. `null` keeps the defaults: every section after `#user-settings-sections` content, or only the `#user-settings` content and the integrations section. |
 | `adminSettingsTitle` | String | No | `''` | Title shown at the top of the admin-settings `NcAppSettingsDialog`. Empty (the default) resolves to `translate('Administration')`. Override per app (e.g. `'Pipelinq administration'`). |
 | `requiresApps` | Array | No | `['openregister']` | App ids that MUST be installed for the host app to function. Checked against the OCS capabilities API on mount. When any required app is missing, CnAppRoot renders the empty state from the `or-missing` slot (default: `<NcEmptyContent>`) instead of the renderer. Pass `[]` to opt out (e.g. launchpad, the docs/styleguide app) — useful for any consumer that does not depend on OpenRegister. |

package/src/components/CnAppRoot/CnAppRoot.vue

@@ -1687,6 +1687,20 @@ export default {
 			default: '',
 		},
 
+		/**
+		 * Board look: Nextcloud's own personal settings, listed first in the
+		 * user-settings navigation as links, `[{ label, section? | href?, icon? }]`
+		 * (`section` is a personal settings section id). With any, the app's
+		 * sections sit under one entry named after the app. Labels go through
+		 * the app's `translate`.
+		 *
+		 * @type {Array<object>}
+		 */
+		userSettingsNextcloudLinks: {
+			type: Array,
+			default: () => [],
+		},
+
 		/**
 		 * The sections of the user-settings modal, in the order they are
 		 * drawn. Keys: `app` (the content of the `#user-settings-sections`
@@ -3143,6 +3157,9 @@ export default {
 			if (this.userSettingsSubtitle) {
 				props.subtitle = this.translate(this.userSettingsSubtitle)
 			}
+			if (Array.isArray(this.userSettingsNextcloudLinks) && this.userSettingsNextcloudLinks.length > 0) {
+				props.nextcloudLinks = this.userSettingsNextcloudLinks.map((link) => ({ ...link, label: this.translate(link?.label || '') }))
+			}
 			return props
 		},
 

package/src/components/CnBreadcrumbs/CnBreadcrumbs.vue

@@ -19,6 +19,7 @@
 		v-if="crumbs.length > 0"
 		:aria-label="ariaLabel"
 		:rootIcon="rootText ? '' : undefined"
+		class="cn-breadcrumbs"
 		:class="{ 'cn-breadcrumbs--text-separator': separator !== '' }"
 		:style="separatorStyle"
 		data-testid="cn-breadcrumbs">

package/src/components/CnChartWidget/CnChartWidget.md

@@ -18,7 +18,7 @@ When `CnDashboardPage` resolves a widget definition with `type: "chart"`, it mou
 }
 ```
 
-Supported `props` keys forwarded by the dispatcher: `chartKind` (→ `type`), `series`, `categories`, `labels`, `options`, `colors`, `toolbar`, `legend`, `height`, `width`, `unavailableLabel`, plus the display passthrough `horizontal`, `legendPosition`, `valueAxisBaseline`, `valueFormat`, `colorMap`, `emptyLabel`, `views`, `endpointSource`, `barMax`, `footnote`, `highlight`. The `dataSource` field resolves declaratively: `aggregate: 'count'` / raw `graphql` via GraphQL, `bucket` / `groupBy` / the OBJECT-form `aggregate` (Wave 3: group-by + topN/Other + labelResolve) via OpenRegister's REST aggregation facets, with an optional sibling `drilldown: { route, filterParam }` that navigates on segment/bar click with the raw category key in the query.
+Supported `props` keys forwarded by the dispatcher: `chartKind` (→ `type`), `series`, `categories`, `labels`, `options`, `colors`, `toolbar`, `legend`, `height`, `width`, `unavailableLabel`, plus the display passthrough `horizontal`, `legendPosition`, `valueAxisBaseline`, `valueFormat`, `colorMap`, `emptyLabel`, `views`, `endpointSource`, `barMax`, `footnote`, `highlight`, `cellSource`. The `dataSource` field resolves declaratively: `aggregate: 'count'` / raw `graphql` via GraphQL, `bucket` / `groupBy` / the OBJECT-form `aggregate` (Wave 3: group-by + topN/Other + labelResolve) via OpenRegister's REST aggregation facets, with an optional sibling `drilldown: { route, filterParam }` that navigates on segment/bar click with the raw category key in the query.
 
 Area chart — time series data:
 
@@ -109,6 +109,7 @@ Fallback slot — shown when ApexCharts is not available:
 | `barMax` | Number | `null` | `bar-list`: the value a full track stands for (100 for percentages); null takes the largest value |
 | `footnote` | String | `''` | `bar-list` / `matrix`: a line under the rows, through the host's translate |
 | `highlight` | Object | `null` | `matrix`: the cell to outline, `{ row, column, columnKeys? }`, tokens such as `@object.behaviour` resolved |
+| `cellSource` | Object | `null` | `matrix`: read the cells from records that each hold one cell (`{ register, schema, filter?, rowField, columnField, valueField, … }`), or with `cellsPath` from the cells inside one record, see [Bar list and matrix](#bar-list-and-matrix) |
 | `valueAxisBaseline` | String | `'auto'` | How the value axis picks its baseline, so a small difference cannot read as a dramatic one. `'auto'` anchors magnitude marks (bar/area) at zero and stops line charts zooming past a quarter of the data's magnitude; `'zero'` always anchors at zero; `'fit'` restores plain ApexCharts autoscaling — use it for series that live far from zero (a percentage hovering 95–99), where a zero baseline flattens the signal. Pie-family charts, negative series, empty data and stacked charts (`options.chart.stacked` — where the visible height is the per-category sum, not the largest datapoint) always autoscale; an explicit `options.yaxis.min`/`max` still wins. The ceiling rounds up to a nice number (7 → 8, 62 → 80). |
 | `valueFormat` | String\|Object | `null` | Named value formatter for the value axis + tooltip: `'currency'`, `'currency-compact'`, `'percent'`, or `{ name, currency?, decimals? }` |
 | `colorMap` | Object | `null` | Per-category colour map (`{ categoryLabel: cssColor }`) for pie-family slices and (distributed) bar categories |