diff --git a/Makefile b/Makefile
index 416300f..b17a0ae 100644
--- a/Makefile
+++ b/Makefile
@@ -210,7 +210,7 @@ black:
 	-black server/ python/
 
 
-TARGETS = csslint jslint phplint mo po pot
+TARGETS = csslint jslint phplint mo po pot poedit
 
 define TARGETS_TEMPLATE
 
diff --git a/docs/cap-gettext-extractor.mjs b/docs/cap-gettext-extractor.mjs
new file mode 100644
index 0000000..cc1a53e
--- /dev/null
+++ b/docs/cap-gettext-extractor.mjs
@@ -0,0 +1,184 @@
+import { GettextExtractor, JsExtractors, HtmlExtractors } from 'gettext-extractor';
+import sfc from '@vue/compiler-sfc';
+import { glob } from 'glob';
+import { readFileSync } from 'node:fs';
+import { ArgumentParser } from 'argparse';
+import sourceMap from 'source-map';
+import _ from 'lodash-es';
+
+const sourceMaps = {};
+
+const JSExtractor = new GettextExtractor();
+const VueExtractor = new GettextExtractor();
+
+/**
+ * Extractor for JS files and <script> sections of Vue files.
+ */
+const jsParser = JSExtractor.createJsParser([
+    JsExtractors.callExpression(['wp.i18n.__', '[this].$t', 'vm.$t'], {
+        arguments: {
+            text: 0,
+        }
+    }),
+    JsExtractors.callExpression(['wp.i18n._x', '[this].$x', 'vm.$x'], {
+        arguments: {
+            text: 0,
+            context: 1,
+        }
+    }),
+    JsExtractors.callExpression(['wp.i18n._n', '[this].$n', 'vm.$n'], {
+        arguments: {
+            text: 0,
+            textPlural: 1,
+            context: 3
+        }
+    })
+]);
+
+/**
+ * Extractor for a compiled Vue template.
+ */
+const vueParser = VueExtractor.createJsParser([
+    JsExtractors.callExpression(['_ctx.$t'], {
+        arguments: {
+            text: 0,
+            context: 1
+        }
+    }),
+    JsExtractors.callExpression(['_ctx.$n'], {
+        arguments: {
+            text: 0,
+            textPlural: 1,
+            context: 2
+        }
+    })
+]);
+
+/**
+ * Extractor for a HTML Vue template.
+ */
+const htmlParser = JSExtractor.createHtmlParser([
+    HtmlExtractors.elementContent('*[v-translate]', {})
+]);
+
+
+function jsParseString (code, file, line) {
+    jsParser.parseString (
+        code,
+        file,
+        { lineNumberStart: line }
+    )
+}
+
+async function main (args) {
+
+    for (const glb of args.inputs) {
+        const filenames = glob.sync (glb).sort ();
+
+        for (const filename of filenames) {
+            if (args.verbose)
+                console.log(`Scanning: ${filename}`);
+
+            const file = readFileSync (filename, { 'encoding' : 'utf-8' });
+
+            if (filename.endsWith ('.vue')) {
+                const { descriptor } = sfc.parse (file, { filename });
+
+                if (descriptor.template && descriptor.template.content) {
+                    const template = descriptor.template;
+                    // if (filename.endsWith ('selector.vue')) {
+                    //     console.dir(template, { depth: 4 });
+                    //     exit ();
+                    // }
+
+                    // parse the template in HTML
+                    htmlParser.parseString (
+                        template.loc.source,
+                        filename,
+                        {
+                            lineNumberStart: template.loc.start.line,
+                            trimWhiteSpace: true,
+                        }
+                    );
+
+                    // compile the template into JS
+                    const compiled = sfc.compileTemplate ({
+                        source: template.loc.source,
+                        filename,
+                        id: filename,
+                        inMap: template.map,
+                    });
+
+                    // if (filename.endsWith ('selector.vue')) {
+                    //     console.log(compiled.code);
+                    //     exit();
+                    // }
+
+                    vueParser.parseString (
+                        compiled.code,
+                        filename,
+                        // FIXME: it should be made possible to pass a sourceMap into this
+                        { lineNumberStart: 1 }
+                    )
+
+                    // build a map that actually works because
+                    // SourceMapConsumer.originalPositionFor(generatedPosition) surely
+                    // does not!
+                    new sourceMap.SourceMapConsumer(compiled.map).eachMapping((m) => {
+                        sourceMaps[`${m.source}:${m.generatedLine}`] = `${m.source}:${m.originalLine}`;
+                        // console.log(`${m.source}:${m.generatedLine} => ${m.source}:${m.originalLine}`);
+                    }, this, sourceMap.SourceMapConsumer.ORIGINAL_ORDER);
+                }
+
+                if (descriptor.script && descriptor.script.content) {
+                    // the <script> section of a Vue file
+                    const script = descriptor.script;
+                    jsParseString (
+                        script.loc.source,
+                        filename,
+                        script.loc.start.line,
+                    );
+                }
+            } else {
+                // a plain old JS file
+                jsParseString (
+                    file,
+                    filename,
+                    0,
+                );
+            }
+        }
+    }
+
+    for (const vueMsg of VueExtractor.getMessages()) {
+        const msg = _.pick (vueMsg, ['text', 'references', 'comments']);
+        if (vueMsg.textPlural)
+            msg.textPlural = vueMsg.textPlural;
+        if (vueMsg.context)
+            msg.context = vueMsg.context;
+        msg.references = vueMsg.references.map ((ref) => {
+            const sref = sourceMaps[ref];
+            console.log (ref, sref, msg.text);
+            return sref || ref;
+        });
+        JSExtractor.addMessage (msg);
+    }
+
+    if (args.output == '-')
+        process.stdout.write (JSExtractor.getPotString ());
+    else
+        JSExtractor.savePotFile (args.output);
+
+    if (args.verbose)
+        JSExtractor.printStats ();
+}
+
+const parser = new ArgumentParser ({
+    description: 'Extract translatable strings from js and vue files.'
+});
+
+parser.add_argument('-v', '--verbose', { action: 'store_true', help: 'Be verbose' });
+parser.add_argument('-o', '--output', { default: '-', help: 'Output to file (default stdout).' });
+parser.add_argument('inputs', { nargs: '+', help: 'Input files' });
+
+main (parser.parse_args());
diff --git a/docs/conf.py b/docs/conf.py
index 4572628..16cb6bb 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -40,7 +40,7 @@ def extension(path):
 
 extension("sphinxcontrib-autojsdoc")
 extension("sphinxcontrib-autophpdoc")
-extension("sphinxcontrib-pic")
+extension("sphinxcontrib-minilang")
 
 # -- General configuration ------------------------------------------------
 
@@ -60,7 +60,7 @@ def extension(path):
     "sphinxcontrib.phpdomain",
     "autophpdoc",
     "autojsdoc",
-    "pic",
+    "minilang",
 ]
 
 autojsdoc_structure_json = "build/jsdoc/structure.json"
@@ -71,7 +71,7 @@ def extension(path):
 autophpdoc_members = True
 autophpdoc_title = True
 
-pic_options = {
+minilang_options = {
     "pic": {
         "program": ["dpic", "-v"],
         "align": "center",
diff --git a/docs/gh-pages/artifact.tar.gz b/docs/gh-pages/artifact.tar.gz
index b2efe94..db3d64b 100644
Binary files a/docs/gh-pages/artifact.tar.gz and b/docs/gh-pages/artifact.tar.gz differ
diff --git a/docs/sphinxcontrib-minilang b/docs/sphinxcontrib-minilang
new file mode 120000
index 0000000..0c8e350
--- /dev/null
+++ b/docs/sphinxcontrib-minilang
@@ -0,0 +1 @@
+/home/highlander/uni/prj/sphinxcontrib/sphinxcontrib-minilang/sphinxcontrib/
\ No newline at end of file
diff --git a/docs/sphinxcontrib-pic b/docs/sphinxcontrib-pic
deleted file mode 120000
index f67c412..0000000
--- a/docs/sphinxcontrib-pic
+++ /dev/null
@@ -1 +0,0 @@
-/home/highlander/uni/prj/sphinxcontrib/sphinxcontrib-pic/sphinxcontrib/
\ No newline at end of file
diff --git a/docs/src/_static/my_theme.css b/docs/src/_static/my_theme.css
index 55a9b36..cb3cb72 100644
--- a/docs/src/_static/my_theme.css
+++ b/docs/src/_static/my_theme.css
@@ -10,22 +10,22 @@
     font-style: italic;
 }
 
-.rst-content .pic {
+.rst-content .minilang {
     margin-bottom: 1em;
 }
 
-.rst-content .pic table {
+.rst-content .minilang table {
     min-width: 100%;
 }
 
-.rst-content .pic table th,
-.rst-content .pic table td {
+.rst-content .minilang table th,
+.rst-content .minilang table td {
     border: 1px solid black;
     padding: 0.2em;
     text-align: left;
 }
 
-.rst-content .pic-w100 {
+.rst-content .minilang-w100 {
     width: 100%;
 }
 
diff --git a/docs/src/maintenance/index.rst b/docs/src/maintenance/index.rst
index d27a096..65439bb 100644
--- a/docs/src/maintenance/index.rst
+++ b/docs/src/maintenance/index.rst
@@ -7,6 +7,7 @@ Maintenance
 .. toctree::
    :maxdepth: 2
 
+   scripts
    logfiles
 
 
diff --git a/docs/src/maintenance/scripts.rst b/docs/src/maintenance/scripts.rst
new file mode 100644
index 0000000..3c9ab90
--- /dev/null
+++ b/docs/src/maintenance/scripts.rst
@@ -0,0 +1,16 @@
+.. _maintenance-scripts:
+
+
+Scripts
+=======
+
+Documentation of the Python scripts.
+
+.. contents::
+   :local:
+
+.. autoprogram:: scripts.import_data:build_parser()
+    :prog: import_data.py
+
+.. autoprogram:: scripts.import_solr:build_parser()
+    :prog: import_solr.py
diff --git a/docs/src/overviews/collation_tool.rst b/docs/src/overviews/collation_tool.rst
index 9de6cf3..ee2bb08 100644
--- a/docs/src/overviews/collation_tool.rst
+++ b/docs/src/overviews/collation_tool.rst
@@ -21,7 +21,7 @@ version are extracted.
 
 The online collation tool knows about all versions and offers them to the user.
 
-.. pic:: uml
+.. minilang:: uml
    :caption: Data flow during pre-processing
 
    database  "Manuscript files\n(XML+TEI)"       as tei
@@ -66,7 +66,7 @@ The application server retrieves the chapters from the database and collates the
 results of the collation are sent in json to the frontend that does the formatting for
 display.
 
-.. pic:: uml
+.. minilang:: uml
    :caption: Data flow during collation
 
    cloud "Backend" {
@@ -214,7 +214,7 @@ This is sometimes called the
 
 An example calculation follows:
 
-.. pic:: trigram hlodouuico ludouico
+.. minilang:: trigram hlodouuico ludouico
    :caption: Calculating similarity using trigrams
 
 The similarity based on trigrams was chosen because its calculation can be done in
diff --git a/docs/src/overviews/fulltext_search.rst b/docs/src/overviews/fulltext_search.rst
index 01a505f..ed777ba 100644
--- a/docs/src/overviews/fulltext_search.rst
+++ b/docs/src/overviews/fulltext_search.rst
@@ -32,7 +32,7 @@ The command for updating the Solr database is: :command:`make solr-import`.
 
 That same command is run nightly by cron.
 
-.. pic:: uml
+.. minilang:: uml
    :caption: Data flow during text extraction
 
    database  "Manuscript files\n(TEI)"   as tei
@@ -56,7 +56,7 @@ We extract the metadata from the manuscript files and store them in the Postgres
 database on the Capitularia VM.  The process is similar to the pre-processing
 done for the Collation Tool.
 
-.. pic:: uml
+.. minilang:: uml
    :caption: Data flow during metadata extraction
 
    database  "Manuscript files\n(TEI)" as tei
@@ -116,7 +116,7 @@ Lucene <https://github.com/cceh/capitularia-lucene-tools>`_.
 Searches in Mordek and Wordpress posts use more traditional search methods like
 stemming.
 
-.. pic:: uml
+.. minilang:: uml
     :caption: Components used in searching
 
     component "Frontend\n(Javascript)" as client
@@ -135,7 +135,7 @@ stemming.
     api    --> solr
 
 
-.. pic:: uml
+.. minilang:: uml
     :caption: Data flow while searching
 
     participant "Frontend"         as client
diff --git a/docs/src/overviews/html_generation.rst b/docs/src/overviews/html_generation.rst
index 039a6bd..e13d573 100644
--- a/docs/src/overviews/html_generation.rst
+++ b/docs/src/overviews/html_generation.rst
@@ -10,7 +10,7 @@ plugin<file-includer>`.
 XSLT Transformations
 --------------------
 
-.. pic:: uml
+.. minilang:: uml
    :caption: Data flow during HTML generation
 
    database  "Manuscript files\n(XML+TEI)" as tei
@@ -45,7 +45,7 @@ The HTML files are stored in the cache directory.
 User Delivery
 -------------
 
-.. pic:: uml
+.. minilang:: uml
    :align: center
    :caption: Data flow during user access
 
diff --git a/docs/src/overviews/makefile.rst b/docs/src/overviews/makefile.rst
index 3288a86..761b20e 100644
--- a/docs/src/overviews/makefile.rst
+++ b/docs/src/overviews/makefile.rst
@@ -16,7 +16,7 @@ cron runs as the :ref:`user capitularia <user>`.
     - :ref:`fulltext-search-overview`
 
 
-.. pic:: uml
+.. minilang:: uml
    :caption: Makefile Overview
    :svg-width: 100%
 
diff --git a/docs/src/vm/database.rst b/docs/src/vm/database.rst
index e81052c..1cdda2f 100644
--- a/docs/src/vm/database.rst
+++ b/docs/src/vm/database.rst
@@ -29,7 +29,7 @@ indicate the same concept.
 
 .. Palette https://github.com/d3/d3-scale-chromatic/blob/master/src/categorical/Paired.js
 
-.. pic:: sauml -i manuscripts -i msparts -i capitularies -i chapters -i mss_capitularies
+.. minilang:: sauml -i manuscripts -i msparts -i capitularies -i chapters -i mss_capitularies
                -i mss_chapters -i mss_chapters_text
    :caption: Schema *capitularia*
    :align: center
@@ -49,7 +49,7 @@ place names, which is the one displayed in the manuscript search box.  This hier
 extracted from the file :file:`mss/lists/capitularia_geo.xml`.  Unfortunately it is
 linked to manuscripts and not to manuscript parts.
 
-.. pic:: sauml -s gis
+.. minilang:: sauml -s gis
    :caption: Schema *gis*
    :align: center
    :svg-width: 100%
diff --git a/docs/src/vm/intro.rst b/docs/src/vm/intro.rst
index d2155cd..15199b0 100644
--- a/docs/src/vm/intro.rst
+++ b/docs/src/vm/intro.rst
@@ -20,7 +20,7 @@ We wrote a :ref:`Wordpress theme <wordpress-theme>` and many :ref:`Wordpress plu
 application server (and its API at https://api.capitularia.uni-koeln.de) for all
 functionality that is too inconvenient to implement in Wordpress plugins.
 
-.. pic:: pic
+.. minilang:: pic
    :caption: Main Components of the Capitularia VM
 
    down
diff --git a/docs/src/vm/transformations.rst b/docs/src/vm/transformations.rst
index 713f4f3..6b61393 100644
--- a/docs/src/vm/transformations.rst
+++ b/docs/src/vm/transformations.rst
@@ -28,7 +28,7 @@ These graphs were generated by the tool :program:`python/xslt_dep.py`.
 Graph of All Transformations
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. pic:: xslt_dep_dot
+.. minilang:: xslt_dep_dot
 
    update INSERT DATA { <http://capitularia.uni-koeln.de/$(CACHE_DIR)/lists/corpus.xml> cap:constraint "false" }
    update INSERT DATA { <http://capitularia.uni-koeln.de/$(CACHE_DIR)/extracted/%.xml> cap:constraint "false" }
@@ -39,7 +39,7 @@ Graph of All Transformations
 Graph of Stylesheet Dependencies
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. pic:: xslt_dep_dot
+.. minilang:: xslt_dep_dot
 
    dep
    dot
diff --git a/docs/src/vm/wordpress/development.rst b/docs/src/vm/wordpress/development.rst
index 1afe5dc..5e5290c 100644
--- a/docs/src/vm/wordpress/development.rst
+++ b/docs/src/vm/wordpress/development.rst
@@ -73,10 +73,9 @@ Internationalization consists of these steps:
 Extract
 -------
 
-There are 3 kinds of source files: PHP files, JS files and Vue single component
-files.  PHP files can be extracted using the GNU xgettext utility.  JS and Vue
-files can be extracted using the `easygettext
-<https://github.com/Polyconseil/easygettext>`_ utility.
+There are 3 kinds of source files: PHP files, JS files and Vue single component files.
+PHP files can be extracted using the GNU xgettext utility.  JS and Vue files are
+extracted using the :program:`docs/cap-gettext-extractor.mjs` node utility.
 
 
 PHP Files
@@ -88,35 +87,19 @@ In PHP files use the __ (), _x (), and _n () functions.
 JS Files
 ++++++++
 
-In JS files, add this boilerplate to the file:
+In JS files, do this:
 
 .. code-block:: js
 
    /** The Wordpress Text Domain of the plugin. */
-   const LANG = 'cap-dynamic-menu';
+   const DOMAIN = 'cap-dynamic-menu';
 
-   function $gettext (msg) {
-       return wp.i18n.__ (msg, LANG);
-   }
-   function $pgettext (context, msg) {
-       return wp.i18n._x (msg, context, LANG);
-   }
-   function $ngettext (singular, plural, number) {
-       return wp.i18n._n (singular, plural, number, LANG);
-   }
+   const message  = wp.i18n.__ ('Message to translate', DOMAIN);
+   const xmessage = wp.i18n._x ('Message to translate', 'Hint to translators', DOMAIN);
+   const nmessage = wp.i18n._n ('Singular', 'Plural', number, DOMAIN);
 
-Then use like this:
-
-.. code-block:: js
-
-   const message  = $gettext  ('Message to translate');
-   const pmessage = $pgettext ('Hint to translators', 'Message to translate');
-   const nmessage = $ngettext ('Singular', 'Plural', number);
-
-We must use the :func:`$gettext` names for our functions, or the stupid
-easygettext tool will not recognize the function.  The functions used like this
-tag the message for the string extractor and also translate the string at
-runtime.
+These functions translate the message at runtime and also tag the message for the
+string extractor at compile time.
 
 
 Vue Files
@@ -129,7 +112,7 @@ In the JS section of Vue files, use the :func:`$t ()` function:
 
 .. code-block:: js
 
-   const message = $t ('Message to translate');
+   const message = this.$t ('Message to translate');
 
 This function tags the message for the string extractor and also translates
 the string at runtime.
@@ -145,24 +128,23 @@ tag translatable strings:
 This is the Vue 3 boilerplate that enables translations in Vue files: Put this
 in main.js before initializing your Vue app.
 
-
 .. code-block:: js
    :caption: Vue.js 3 boilerplate
 
    const DOMAIN = 'my-text-domain';
    const app    = createApp (App);
 
-   // wrapper to call the Wordpress translate function
+   // wrapper that calls the Wordpress translate function
    function $t (text) {
        return wp.i18n.__ (text, DOMAIN);
    }
 
-   // the vm.$t function
+   // make it available as this.$t on all instances
    app.config.globalProperties.$t = $t;
 
    // the v-translate directive
    app.directive ('translate', (el) => {
-       el.innerText = $t (el.innerText.trim ());
+       el.innerText = wp.i18n.__ (el.innerText.trim (), DOMAIN);
    });
 
    app.mount ('...');
@@ -210,5 +192,6 @@ Wordpress boilerplate to make translations available in PHP and JS files:
        lib\wp_set_script_translations ("$key.js", DOMAIN);
    }
 
-See also:
-https://make.wordpress.org/core/2018/11/09/new-javascript-i18n-support-in-wordpress/
+.. seealso::
+
+    https://make.wordpress.org/core/2018/11/09/new-javascript-i18n-support-in-wordpress/
diff --git a/include.mak b/include.mak
index 28201cb..d0734cd 100644
--- a/include.mak
+++ b/include.mak
@@ -85,11 +85,11 @@ $(LANG_SRC)/php.pot: $(PHP_FILES)
 
 $(LANG_SRC)/js.pot: $(wildcard $(JS_SRC)/*.js)
 	touch $@
-	-$(EASYGETTEXT) --output $@ $^
+	-$(JSGETTEXT) --output $@ $^
 
 $(LANG_SRC)/vue.pot: $(wildcard $(JS_SRC)/*.vue)
 	touch $@
-	-$(EASYGETTEXT) --output $@ $^
+	-$(VUEGETTEXT) --output $@ $^
 
 poedit: po
 	poedit $(LANG_SRC)/de_DE.po
diff --git a/package.json b/package.json
index 1b923e1..b1e115a 100644
--- a/package.json
+++ b/package.json
@@ -26,15 +26,16 @@
         "d3": "^7.9.0",
         "jquery": "^3.7.1",
         "jquery-ui": "^1.14.0",
-        "jstree": "^3.3.16",
+        "jstree": "^3.3.17",
         "leaflet": "^1.9.4",
         "lodash-es": "^4.17.21",
         "panzoom": "^9.4.3",
         "papaparse": "^5.4.1",
+        "sprintf-js": "*",
         "url": "^0.11.4",
-        "vue": "^3.5.3",
+        "vue": "^3.5.4",
         "vue-cookies": "^1.8.4",
-        "vue-router": "^4.4.3",
+        "vue-router": "^4.4.4",
         "vuex": "^4.1.0"
     },
     "devDependencies": {
@@ -47,7 +48,9 @@
         "@fortawesome/fontawesome-free": "^6.6.0",
         "@types/bootstrap": "^5.2.10",
         "@types/lodash-es": "^4.17.12",
-        "@vue/compiler-sfc": "^3.5.3",
+        "@types/jquery": "*",
+        "@vue/compiler-sfc": "^3.5.4",
+        "argparse": "*",
         "autoprefixer": "^10.4.20",
         "babel-loader": "^9.1.3",
         "cheerio": "1.0.0-rc.12",
@@ -60,6 +63,7 @@
         "eslint-plugin-vue": "^9.28.0",
         "eslint-webpack-plugin": "^4.2.0",
         "file-loader": "^6.2.0",
+        "gettext-extractor": "*",
         "glob": "^11.0.0",
         "globals": "^15.9.0",
         "html-loader": "^5.1.0",
@@ -72,11 +76,12 @@
         "postcss": "^8.4.45",
         "postcss-loader": "^8.1.1",
         "postcss-nested": "^6.2.0",
-        "postcss-preset-env": "^10.0.2",
+        "postcss-preset-env": "^10.0.3",
         "prettier": "^3.3.3",
         "puppeteer-core": "^23.3.0",
         "sass": "^1.78.0",
         "sass-loader": "^16.0.1",
+        "source-map": "*",
         "stream-browserify": "^3.0.0",
         "style-loader": "^4.0.0",
         "stylelint": "^16.9.0",
@@ -105,5 +110,5 @@
         "eslint-plugin-standard": "*",
         "eslint-plugin-vue": "*"
     },
-    "packageManager": "pnpm@9.9.0+sha512.60c18acd138bff695d339be6ad13f7e936eea6745660d4cc4a776d5247c540d0edee1a563695c183a66eb917ef88f2b4feb1fc25f32a7adcadc7aaf3438e99c1"
+    "packageManager": "pnpm@9.10.0+sha512.73a29afa36a0d092ece5271de5177ecbf8318d454ecd701343131b8ebc0c1a91c487da46ab77c8e596d6acf1461e3594ced4becedf8921b074fbd8653ed7051c"
 }
diff --git a/plugins/cap-collation/src/js/front.js b/plugins/cap-collation/src/js/front.js
index f59de67..9c73b17 100644
--- a/plugins/cap-collation/src/js/front.js
+++ b/plugins/cap-collation/src/js/front.js
@@ -10,10 +10,12 @@ import 'jquery-ui/ui/widgets/sortable';
 
 import App from './main.vue';
 
+const DOMAIN = 'cap-collation';
+
 // wrapper to call the Wordpress translate function
 // See: https://make.wordpress.org/core/2018/11/09/new-javascript-i18n-support-in-wordpress/
 function $t (text) {
-    return wp.i18n.__ (text, 'cap-collation');
+    return wp.i18n.__ (text, DOMAIN);
 }
 
 const app = createApp (App);
@@ -23,7 +25,7 @@ app.config.globalProperties.$t = $t;
 
 // the v-translate directive
 app.directive ('translate', (el) => {
-    el.innerText = $t (el.innerText.trim ());
+    el.innerText = wp.i18n.__ (el.innerText.trim (), DOMAIN);
 });
 
 app.mount ('#cap-collation-app');
diff --git a/plugins/cap-collation/src/js/selector.vue b/plugins/cap-collation/src/js/selector.vue
index 42dff1c..2215b15 100644
--- a/plugins/cap-collation/src/js/selector.vue
+++ b/plugins/cap-collation/src/js/selector.vue
@@ -56,8 +56,8 @@
           <div class="form-check">
             <input :id="id + '-lh'" v-model="later_hands" class="form-check-input" type="checkbox"
                    value="" @change="on_later_hands">
-            <label class="form-check-label" :for="id + '-lh'">
-              {{ $t ('Include corrections by different hands') }}
+            <label v-translate class="form-check-label" :for="id + '-lh'">
+                Include corrections by different hands
             </label>
           </div>
         </form>
diff --git a/plugins/cap-collation/src/js/tools.js b/plugins/cap-collation/src/js/tools.js
index 2a11640..32efb4a 100644
--- a/plugins/cap-collation/src/js/tools.js
+++ b/plugins/cap-collation/src/js/tools.js
@@ -9,12 +9,9 @@ import jQuery from 'jquery';
 import { Tooltip } from 'bootstrap';
 
 /** The Wordpress Text Domain of the plugin. */
-const LANG = 'cap-collation';
+const DOMAIN = 'cap-collation';
 
 // See: https://make.wordpress.org/core/2018/11/09/new-javascript-i18n-support-in-wordpress/
-function $pgettext (context, msg) {
-    return wp.i18n._x (msg, context, LANG);
-}
 
 /**
  * The id of the "Obertext".
@@ -134,8 +131,8 @@ export function fix_witness (w) {
 
     const corresp = w.corresp ? `${w.corresp} : ` : '';
     const siglum = w.siglum ? ` [${w.siglum}]` : '';
-    const corrected = w.type === 'later_hands' ? $pgettext ('corrected version of capitularies', ' (corrected)') : '';
-    const n = w.n > '1' ? $pgettext ('2., 3., etc. copy of capitularies', ' ($1. copy)').replace (/\$1/, w.n) : '';
+    const corrected = w.type === 'later_hands' ? wp.i18n._x (' (corrected)', 'corrected version of capitularies', DOMAIN) : '';
+    const n = w.n > '1' ? wp.i18n._x (' ($1. copy)', '2., 3., etc. copy of capitularies', DOMAIN).replace (/\$1/, w.n) : '';
 
     w.title = `${corresp}${w.ms_id}${siglum}${corrected}${n}`;
     w.short_title = `${w.ms_id}${siglum}${corrected}${n}`;
@@ -143,11 +140,11 @@ export function fix_witness (w) {
     w.sort_key    = w.title;
     w.title       = w.title.replace (
         /bk-textzeuge/,
-        $pgettext ('title of the edition', 'Edition by Boretius/Krause')
+        wp.i18n._x ('Edition by Boretius/Krause', 'title of the edition', DOMAIN)
     );
     w.short_title = w.short_title.replace (
         /bk-textzeuge/,
-        $pgettext ('title of the edition', 'Edition by Boretius/Krause')
+        wp.i18n._x ('Edition by Boretius/Krause', 'title of the edition', DOMAIN)
     );
     w.sort_key    = w.sort_key.replace (/bk-textzeuge/, '_bk-textzeuge'); // always sort this first
     w.sort_key    = sort_key (w.sort_key);
diff --git a/plugins/cap-collation/src/languages/capitularia.pot b/plugins/cap-collation/src/languages/capitularia.pot
index 489b84e..4593f1a 100644
--- a/plugins/cap-collation/src/languages/capitularia.pot
+++ b/plugins/cap-collation/src/languages/capitularia.pot
@@ -52,16 +52,12 @@ msgctxt "title of the edition"
 msgid "Edition by Boretius/Krause"
 msgstr ""
 
-#: src/js/front.js:26
-msgid "el"
-msgstr ""
-
 #: src/js/tools.js:15
 msgctxt "context"
 msgid "msg"
 msgstr ""
 
-#: src/js/front.js:15
+#: src/js/front.js:17
 msgid "text"
 msgstr ""
 
diff --git a/plugins/cap-collation/src/languages/de_DE.po b/plugins/cap-collation/src/languages/de_DE.po
index aff1f1a..0007871 100644
--- a/plugins/cap-collation/src/languages/de_DE.po
+++ b/plugins/cap-collation/src/languages/de_DE.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: @cceh/capitularia 0.1.0\n"
 "Report-Msgid-Bugs-To: marcello@perathoner.de\n"
 "POT-Creation-Date: 2024-09-08 15:12+0200\n"
-"PO-Revision-Date: 2020-11-05 18:41+0100\n"
+"PO-Revision-Date: 2024-09-12 23:00+0200\n"
 "Last-Translator: Marcello Perathoner <marcello@perathoner.de>\n"
 "Language-Team: German <>\n"
 "Language: de_DE\n"
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
+"X-Generator: Poedit 3.5\n"
 
 #: cap-collation.php:53
 msgid "Capitularia Collation Tool"
@@ -36,16 +36,12 @@ msgctxt "title of the edition"
 msgid "Edition by Boretius/Krause"
 msgstr "Boretius/Krause Edition"
 
-#: src/js/front.js:26
-msgid "el"
-msgstr ""
-
 #: src/js/tools.js:15
 msgctxt "context"
 msgid "msg"
 msgstr ""
 
-#: src/js/front.js:15
+#: src/js/front.js:17
 msgid "text"
 msgstr ""
 
diff --git a/plugins/cap-collation/src/languages/js.pot b/plugins/cap-collation/src/languages/js.pot
index 9b4b1dd..d4fc709 100644
--- a/plugins/cap-collation/src/languages/js.pot
+++ b/plugins/cap-collation/src/languages/js.pot
@@ -21,15 +21,11 @@ msgctxt "title of the edition"
 msgid "Edition by Boretius/Krause"
 msgstr ""
 
-#: src/js/front.js:26
-msgid "el"
-msgstr ""
-
 #: src/js/tools.js:15
 msgctxt "context"
 msgid "msg"
 msgstr ""
 
-#: src/js/front.js:15
+#: src/js/front.js:17
 msgid "text"
 msgstr ""
diff --git a/plugins/cap-dynamic-menu/src/js/front.js b/plugins/cap-dynamic-menu/src/js/front.js
index 4888f6c..85e7856 100644
--- a/plugins/cap-dynamic-menu/src/js/front.js
+++ b/plugins/cap-dynamic-menu/src/js/front.js
@@ -47,11 +47,7 @@ import jQuery from 'jquery';
 import { escape } from 'lodash';
 
 /** The Wordpress Text Domain of the plugin. */
-const LANG = 'cap-dynamic-menu';
-
-function $pgettext (context, msg) {
-    return wp.i18n._x (msg, context, LANG);
-}
+const DOMAIN = 'cap-dynamic-menu';
 
 /**
  * Initialize all dynamic menus on the page.
@@ -152,7 +148,7 @@ function init_dynamic_menues () {
 
                 // horrible hack for linebreak checkbox, close your eyes
                 if (href === '#editorial-preface') {
-                    const message = escape ($pgettext ('Checkbox label', 'Show line breaks'));
+                    const message = escape (wp.i18n._x ('Show line breaks', 'Checkbox label', DOMAIN));
 
                     a.push (`<a class="ssdone">
 <div class="form-check">
diff --git a/plugins/cap-file-includer/src/languages/de_DE.po b/plugins/cap-file-includer/src/languages/de_DE.po
index 4fc8bee..c93e8fd 100644
--- a/plugins/cap-file-includer/src/languages/de_DE.po
+++ b/plugins/cap-file-includer/src/languages/de_DE.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: @cceh/capitularia 0.1.0\n"
 "Report-Msgid-Bugs-To: marcello@perathoner.de\n"
 "POT-Creation-Date: 2022-06-22 13:17+0200\n"
-"PO-Revision-Date: 2019-11-26 14:38+0100\n"
+"PO-Revision-Date: 2024-09-12 23:01+0200\n"
 "Last-Translator: Marcello Perathoner <marcello@perathoner.de>\n"
 "Language-Team: German <>\n"
 "Language: de_DE\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 3.5\n"
 
 #: cap-file-includer.php:53
 msgid "Capitularia File Includer"
@@ -51,14 +51,13 @@ msgid "Shortcode"
 msgstr "Shortcode"
 
 #: class-settings-page.php:110
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Root directory of the files you want to include, relative to the FS root.  "
 "The FS root is currently configured as<br>%s"
 msgstr ""
-"Wurzelverzeichnis der einzufügenden Dateien, relativ zum AFS-"
-"Wurzelverzeichnis. Das AFS-Wurzelverzeichnis ist derzeit konfiguriert "
-"als<br>%s"
+"Wurzelverzeichnis der einzufügenden Dateien, relativ zum Wurzelverzeichnis. "
+"Das Wurzelverzeichnis ist derzeit konfiguriert als<br>%s"
 
 #: class-settings-page.php:128
 msgid "The shortcode to use, eg.: cap_include"
diff --git a/plugins/cap-lib/src/languages/de_DE.po b/plugins/cap-lib/src/languages/de_DE.po
index 1d6705a..3638790 100644
--- a/plugins/cap-lib/src/languages/de_DE.po
+++ b/plugins/cap-lib/src/languages/de_DE.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Capitularia 2.0\n"
 "Report-Msgid-Bugs-To: marcello@perathoner.de\n"
 "POT-Creation-Date: 2024-09-08 15:12+0200\n"
-"PO-Revision-Date: 2019-11-17 12:09+0100\n"
+"PO-Revision-Date: 2024-09-12 23:02+0200\n"
 "Last-Translator: Marcello Perathoner <marcello@perathoner.de>\n"
 "Language-Team: German\n"
 "Language: de\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 3.5\n"
 
 #: cap-lib.php:61
 msgid "Capitularia Library"
@@ -31,18 +31,16 @@ msgid "General Settings"
 msgstr "Allgemeine Einstellungen"
 
 #: class-settings-page.php:48
-#, fuzzy
 msgid "FS Root"
-msgstr "AFS Root"
+msgstr "Wurzelverzeichnis"
 
 #: class-settings-page.php:56
 msgid "API Entrypoint"
 msgstr "API Entrypoint"
 
 #: class-settings-page.php:101
-#, fuzzy
 msgid "Root directory of Capitularia in the FS"
-msgstr "AFS-Wurzelverzeichnis von Capitularia"
+msgstr "Wurzelverzeichnis von Capitularia"
 
 #: class-settings-page.php:114
 msgid "Capitularia API Server entrypoint"
diff --git a/plugins/cap-meta-search/class-meta-search-widget.php b/plugins/cap-meta-search/class-meta-search-widget.php
index 437b330..b8c2b22 100644
--- a/plugins/cap-meta-search/class-meta-search-widget.php
+++ b/plugins/cap-meta-search/class-meta-search-widget.php
@@ -202,15 +202,8 @@ public function widget ($args, $instance)
         $label       = __ ('Free Text In Transcription', DOMAIN);
         $tooltip     = __ ('Free text search in transcription', DOMAIN);
         $placeholder = __ ('Free Text', DOMAIN);
-        // Use 'fulltext' as query parameter instead of 's' to switch to our own
-        // search implementation.  Because our manuscript pages contain only a
-        // shortcode Wordpress search could not find anything.
-        $this->echo_input  ($label, 'fulltext', $placeholder, $tooltip);
-
-        // ... but without an 's' parameter Wordpress will not process the query
-        // in any sensible manner.  Add a dummy 's' parameter to fix the
-        // brain-dead Wordpress query parser.
-        echo "<input type='hidden' name='s'>";
+
+        $this->echo_input  ($label, 's', $placeholder, $tooltip);
 
         echo "<div class='cap-meta-search-buttons clearfix'>\n";
 
diff --git a/plugins/cap-meta-search/class-meta-search.php b/plugins/cap-meta-search/class-meta-search.php
index 51a3255..7d0112b 100644
--- a/plugins/cap-meta-search/class-meta-search.php
+++ b/plugins/cap-meta-search/class-meta-search.php
@@ -143,15 +143,13 @@ public function on_get_search_query ($dummy_message) // phpcs:ignore
             if ($key == 'notafter') {
                 $your_search[] = sprintf (__ ('before %d', DOMAIN), absint ($val));
             }
-            if ($key == 'placenames') {
-                if (is_array ($val)) {
-                    $your_search[] = sprintf (
-                        __ ('origin in %s', DOMAIN),
-                        implode (', ', $val)
-                    );
-                }
+            if ($key == 'placenames' && is_array ($val)) {
+                $your_search[] = sprintf (
+                    __ ('origin in %s', DOMAIN),
+                    implode (', ', $val)
+                );
             }
-            if ($key == 'fulltext') {
+            if ($key == 's') {
                 $your_search[] = stripslashes ($val);
             }
         }
diff --git a/plugins/cap-meta-search/functions.php b/plugins/cap-meta-search/functions.php
index 91f80a9..edc0df7 100644
--- a/plugins/cap-meta-search/functions.php
+++ b/plugins/cap-meta-search/functions.php
@@ -17,7 +17,7 @@
 
 function is_meta_search ()
 {
-    return !is_admin () && array_key_exists ('fulltext', $_GET);
+    return !is_admin () && array_key_exists ('s', $_GET);
 }
 
 /**
@@ -109,7 +109,6 @@ function on_widgets_init ()
 
 function on_query_vars ($vars)
 {
-    $vars[] = 'fulltext';
     $vars[] = 'capit';
     $vars[] = 'place';
     $vars[] = 'notbefore';
@@ -133,7 +132,7 @@ function on_query_vars ($vars)
 
 function on_cap_meta_search_the_permalink ($permalink)
 {
-    $highlight = $_GET['fulltext'] ?? $_GET['s'] ?? '';
+    $highlight = $_GET['s'] ?? '';
     if (!empty ($highlight)) {
         return esc_attr (add_query_arg (HIGHLIGHT, $highlight, $permalink));
     }
diff --git a/plugins/cap-meta-search/search.php b/plugins/cap-meta-search/search.php
index 714f37e..8c4a52f 100644
--- a/plugins/cap-meta-search/search.php
+++ b/plugins/cap-meta-search/search.php
@@ -29,7 +29,7 @@
 theme\get_content_start ();
 
 echo "<header class='search-header cap-page-header'>\n  <h2>" .
-    __ ('Search Results', 'capitularia') . "</h2>\n";
+    __ ('Search Results', DOMAIN) . "</h2>\n";
 
 echo '<div id="cap-meta-search-app"></div>';
 
diff --git a/plugins/cap-meta-search/src/js/cap-tab.vue b/plugins/cap-meta-search/src/js/cap-tab.vue
index a40b527..156570f 100644
--- a/plugins/cap-meta-search/src/js/cap-tab.vue
+++ b/plugins/cap-meta-search/src/js/cap-tab.vue
@@ -50,11 +50,9 @@ export default {
          */
         solr (start) {
             const vm = this;
-            const queryParams = new URLSearchParams (window.location.search);
             const params = new URLSearchParams (vm.solrParams.toString ());
-            params.set ('q', queryParams.get ('fulltext'));
             params.set ('start', start);
-            console.log (`solr_query: ${params.toString ()}`);
+            console.log (`solr_query: ${decodeURIComponent(params.toString ())}`);
             tools.api ('/solr/select.json', params).then ((response) => {
                 vm.response = response.data.response || {};
                 vm.highlighting = response.data.highlighting || {};
diff --git a/plugins/cap-meta-search/src/js/front.js b/plugins/cap-meta-search/src/js/front.js
index eaf3252..6f28bdc 100644
--- a/plugins/cap-meta-search/src/js/front.js
+++ b/plugins/cap-meta-search/src/js/front.js
@@ -15,6 +15,8 @@ import CapTab from './cap-tab.vue';
 import CapPager from './cap-pager.vue';
 import * as tools from './tools.js';
 
+const DOMAIN = 'cap-meta-search';
+
 /**
  * A wrapper to call the Wordpress translate function
  * See: https://make.wordpress.org/core/2018/11/09/new-javascript-i18n-support-in-wordpress/
@@ -23,7 +25,7 @@ import * as tools from './tools.js';
  * @returns {string}      The translated string.
  */
 function $t (text) {
-    return wp.i18n.__ (text, 'cap-meta-search');
+    return wp.i18n.__ (text, DOMAIN);
 }
 
 /**
@@ -35,7 +37,7 @@ function $t (text) {
  * @returns {string}          The translated string, singular or plural.
  */
 function $n (singular, plural, number) {
-    return wp.i18n._n (singular, plural, number, 'cap-meta-search');
+    return wp.i18n._n (singular, plural, number, DOMAIN);
 }
 
 const app = createApp (App);
@@ -46,7 +48,7 @@ app.config.globalProperties.$n = $n;
 
 // the v-translate directive
 app.directive ('translate', (el) => {
-    el.innerText = $t (el.innerText.trim ());
+    el.innerText = wp.i18n.__ (el.innerText.trim (), DOMAIN);
 });
 
 app.component ('cap-tab', CapTab);
@@ -72,16 +74,21 @@ const collator = new Intl.Collator ('de');
  * Initialize the tree view of places in the widget.
  */
 function places_tree_init () {
+    const places = new URLSearchParams (window.location.search).getAll ('places[]');
+    console.log(places);
+
     jQuery ('#places').jstree ({
-        'plugins'  : ['checkbox', 'sort', 'state', 'wholerow'],
+        'plugins'  : ['checkbox', 'sort', 'wholerow'],
         'checkbox' : {
-            // 'three_state' : false,
-            'cascade' : 'down',
+            'three_state' : false,
+            // 'cascade' : 'up',
+            // 'cascade' : 'down',
         },
         'sort' : function (a, b) {
             return collator.compare (this.get_text (a), this.get_text (b));
         },
         'core' : {
+            'worker' : false,
             'themes' : {
                 'icons' : false,
                 'dots'  : false,
@@ -91,8 +98,15 @@ function places_tree_init () {
                 const params = new URLSearchParams ({ 'lang' : document.documentElement.lang.substring (0, 2) });
                 tools.api ('/data/places.json/', params)
                     .then ((response) => callback (response.data.map (
-                        (r) => ({ 'id' : r.geo_id, 'parent' : r.parent_id || '#', 'text' : r.geo_name })
-                    )));
+                        (r) => ({
+                            'id'     : r.geo_id,
+                            'parent' : r.parent_id || '#',
+                            'text'   : r.geo_name,
+                            'state'  : {
+                                'selected' : places.includes (r.geo_id),
+                            }
+                        })
+                    )))
             },
         },
     });
@@ -100,13 +114,13 @@ function places_tree_init () {
     jQuery ('div.cap-meta-search-box form').submit ((event) => {
         const data = jQuery (event.target).serializeArray ();
         const jst = jQuery ('#places').jstree (true);
-        $.each (jst.get_selected (true), (i, node) => {
+        jQuery.each (jst.get_selected (true), (i, node) => {
             data.push ({ 'name' : 'places[]', 'value' : node.id });
             // used by "You searched for: X"
             data.push ({ 'name' : 'placenames[]', 'value' : node.text });
         });
         // submit to the wordpress search page
-        window.location.href = `/?${$.param (data)}`;
+        window.location.href = `/?${jQuery.param (data)}`;
         event.preventDefault ();
     });
 }
diff --git a/plugins/cap-meta-search/src/js/main.vue b/plugins/cap-meta-search/src/js/main.vue
index fcf197c..e41a935 100644
--- a/plugins/cap-meta-search/src/js/main.vue
+++ b/plugins/cap-meta-search/src/js/main.vue
@@ -1,11 +1,16 @@
 <template>
-<div class="search-your-search">{{ your_search }}</div>
+<div class="search-your-search">{{ your_search () }}</div>
 <div class="search-results cap-meta-search-results">
     <div id="tabheader" class="nav nav-tabs">
         <div class="nav-item">
             <a class="nav-link" data-bs-toggle="tab" data-bs-target="#chapter-tab-pane"
                 :class="getTabHeaderClass ('chapter')"
-                aria-current="page">{{ $t ('Capitularies') }} ({{ getNumFound ('chapter') }})</a>
+                aria-current="page">{{ $t ('Chapters') }} ({{ getNumFound ('chapter') }})</a>
+        </div>
+        <div class="nav-item">
+            <a class="nav-link" data-bs-toggle="tab"
+                :class="getTabHeaderClass ('ms')"
+                data-bs-target="#ms-tab-pane">{{ $t ('Manuscripts') }} ({{ getNumFound ('ms') }})</a>
         </div>
         <div class="nav-item">
             <a class="nav-link" data-bs-toggle="tab"
@@ -15,7 +20,7 @@
         <div class="nav-item">
             <a class="nav-link" data-bs-toggle="tab"
                 :class="getTabHeaderClass ('post')"
-                data-bs-target="#post-tab-pane">{{ $t ('Website') }} ({{ getNumFound ('post') }})</a>
+                data-bs-target="#post-tab-pane">{{ $t ('Posts') }} ({{ getNumFound ('post') }})</a>
         </div>
     </div>
     <div class="tab-content">
@@ -34,6 +39,12 @@
             </div>
         </cap-tab>
 
+        <cap-tab :solr-params="solr_params('ms')" id="ms-tab-pane" :class="getTabClass ('ms')"
+                v-slot="{ doc, snippets, expanded }" @numFound="(n) => setNumFound ('ms', n)">
+            <a class="excerpt-corresp" :href="mss_url + doc.ms_id + '#' + frag(doc)">{{ doc.title_de }}:</a>&nbsp;
+            <span class="snippet" v-html="join_snippets(snippets)" />
+        </cap-tab>
+
         <cap-tab :solr-params="solr_params('front')" id="front-tab-pane" :class="getTabClass ('front')"
                 v-slot="{ doc, snippets }" @numFound="(n) => setNumFound('front', n)">
             <header class="article-header excerpt-header search-excerpt-header">
@@ -66,6 +77,7 @@
 /** @module plugins/cap-meta-search/main */
 
 import _ from 'lodash';
+import { sprintf } from 'sprintf-js';
 
 import * as tools from './tools.js';
 
@@ -80,6 +92,7 @@ export default {
             'q'    : null,
             'tabs' : {
                 'chapter' : { 'numFound' : 0 },
+                'ms'      : { 'numFound' : 0 },
                 'front'   : { 'numFound' : 0 },
                 'post'    : { 'numFound' : 0 },
             },
@@ -113,18 +126,27 @@ export default {
     /** @lends Main */
     'methods' : {
         solr_params (category) {
+            const queryParams = new URLSearchParams (window.location.search);
             const params = new URLSearchParams ();
+            const q = queryParams.get ('s');
             // Note the 'fq' form is a hack to get multiple params with the same name
             // past the brain-damaged PHP
-            params.set ('fq', `category:${category}`);
-            if (category === 'chapter') {
+            if (['chapter', 'ms'].includes(category)) {
+                if (category === 'chapter') {
+                    params.append ('fq', '{!collapse field=cap_id_chapter}');
+                    if (!q) {
+                        params.set ('sort', 'strnumsort(cap_id_chapter) asc');
+                    }
+                } else {
+                    params.append ('fq', '{!collapse field=ms_id}');
+                    if (!q) {
+                        params.set ('sort', 'strnumsort(ms_id) asc');
+                    }
+                    category = 'chapter';
+                }
                 params.set ('qf', 'text_la^2 text_de text_en text_la_ngrams');
-                params.append ('fq', '{!collapse field=cap_id_chapter}');
-                // NOSONAR
-                // p.set ('sort', 'strnumsort(cap_id_chapter) asc');
                 params.set ('expand', 'true');
 
-                const queryParams = new URLSearchParams (window.location.search);
                 const capit = queryParams.get ('capit');
                 if (capit && capit !== '') {
                     params.append ('fq', `cap_id:${capit}`);
@@ -142,8 +164,28 @@ export default {
                     params.append ('fq', `places:(${places.join (' OR ')})`);
                 }
             }
+            params.append ('fq', `category:${category}`);
+            params.set ('q', q || '*:*');
             return params;
         },
+        your_search() {
+            const queryParams = new URLSearchParams (window.location.search);
+            const templates = {
+                's'            : '%s',
+                'capit'        : this.$t ('in %s'),
+                'notbefore'    : this.$t ('after %s'),
+                'notafter'     : this.$t ('before %s'),
+                'placenames[]' : this.$t ('origin in %s'),
+            }
+            const your_search = [];
+
+            for (const [key, template] of Object.entries(templates)) {
+                const value = (queryParams.getAll (key) || []).join (', ');
+                if (value)
+                    your_search.push (sprintf (template, _.escape (value)));
+            }
+            return sprintf (this.$t ('Your search for "%s" gave following results: '), your_search.join (' · '));
+        },
         setNumFound (name, n) {
             this.tabs[name].numFound = n;
         },
@@ -152,7 +194,7 @@ export default {
         },
         getTabHeaderClass (name) {
             const c = [];
-            for (const n of ['chapter', 'front', 'post']) {
+            for (const n of ['chapter', 'ms', 'front', 'post']) {
                 if (this.getNumFound (n) > 0) {
                     if (n === name) {
                         c.push ('active');
@@ -166,7 +208,7 @@ export default {
             return c.join (' ');
         },
         getTabClass (name) {
-            for (const n of ['chapter', 'front', 'post']) {
+            for (const n of ['chapter', 'ms', 'front', 'post']) {
                 if (this.getNumFound (n) > 0) {
                     if (n === name) {
                         return 'active show';
diff --git a/plugins/cap-meta-search/src/languages/capitularia.pot b/plugins/cap-meta-search/src/languages/capitularia.pot
index cddc8c5..4f27d66 100644
--- a/plugins/cap-meta-search/src/languages/capitularia.pot
+++ b/plugins/cap-meta-search/src/languages/capitularia.pot
@@ -10,7 +10,7 @@ msgstr ""
 "#-#-#-#-#  php.pot (Capitularia 2.0)  #-#-#-#-#\n"
 "Project-Id-Version: Capitularia 2.0\n"
 "Report-Msgid-Bugs-To: marcello@perathoner.de\n"
-"POT-Creation-Date: 2024-09-08 15:31+0200\n"
+"POT-Creation-Date: 2024-09-12 09:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -52,7 +52,7 @@ msgstr ""
 msgid "before %d"
 msgstr ""
 
-#: class-meta-search.php:149
+#: class-meta-search.php:148 src/js/main.vue:102
 #, php-format
 msgid "origin in %s"
 msgstr ""
@@ -114,27 +114,27 @@ msgstr ""
 msgid "Free Text"
 msgstr ""
 
-#: class-meta-search-widget.php:217
+#: class-meta-search-widget.php:210
 msgid "Search"
 msgstr ""
 
-#: class-meta-search-widget.php:218
+#: class-meta-search-widget.php:211
 msgid "Start the search"
 msgstr ""
 
-#: class-meta-search-widget.php:221
+#: class-meta-search-widget.php:214
 msgid "Help"
 msgstr ""
 
-#: class-meta-search-widget.php:222
+#: class-meta-search-widget.php:215
 msgid "Show some help"
 msgstr ""
 
-#: class-meta-search-widget.php:268
+#: class-meta-search-widget.php:261
 msgid "Title"
 msgstr ""
 
-#: class-meta-search-widget.php:268
+#: class-meta-search-widget.php:261
 msgid "New title"
 msgstr ""
 
@@ -146,11 +146,7 @@ msgstr ""
 msgid "docs"
 msgstr ""
 
-#: src/js/front.js:49
-msgid "el"
-msgstr ""
-
-#: src/js/front.js:25
+#: src/js/front.js:27
 msgid "text"
 msgstr ""
 
@@ -158,11 +154,27 @@ msgstr ""
 msgid "« Previous page"
 msgstr ""
 
-#: src/js/main.vue:38
-msgid "Capitularies"
+#: src/js/main.vue:100
+msgid "after %s"
+msgstr ""
+
+#: src/js/main.vue:101
+msgid "before %s"
+msgstr ""
+
+#: src/js/main.vue:41
+msgid "Chapters"
 msgstr ""
 
-#: src/js/main.vue:45
+#: src/js/main.vue:99
+msgid "in %s"
+msgstr ""
+
+#: src/js/main.vue:48
+msgid "Manuskripte"
+msgstr ""
+
+#: src/js/main.vue:55
 msgid "Mordek"
 msgstr ""
 
@@ -170,6 +182,10 @@ msgstr ""
 msgid "Next page »"
 msgstr ""
 
-#: src/js/main.vue:52
+#: src/js/main.vue:62
 msgid "Website"
 msgstr ""
+
+#: src/js/main.vue:111
+msgid "Your search for \"%s\" gave following results: "
+msgstr ""
diff --git a/plugins/cap-meta-search/src/languages/de_DE.po b/plugins/cap-meta-search/src/languages/de_DE.po
index 901fb92..03d1de2 100644
--- a/plugins/cap-meta-search/src/languages/de_DE.po
+++ b/plugins/cap-meta-search/src/languages/de_DE.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: @cceh/capitularia 0.1.0\n"
 "Report-Msgid-Bugs-To: marcello@perathoner.de\n"
-"POT-Creation-Date: 2024-09-08 15:12+0200\n"
-"PO-Revision-Date: 2024-08-30 12:05+0200\n"
+"POT-Creation-Date: 2024-09-12 09:08+0200\n"
+"PO-Revision-Date: 2024-09-12 09:21+0200\n"
 "Last-Translator: Marcello Perathoner <marcello@perathoner.de>\n"
 "Language-Team: German\n"
 "Language: de\n"
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.4.4\n"
+"X-Generator: Poedit 3.5\n"
 
 #: cap-meta-search.php:75
 msgid "Capitularia Meta Search"
@@ -36,7 +36,7 @@ msgstr "nach %d"
 msgid "before %d"
 msgstr "vor %d"
 
-#: class-meta-search.php:149
+#: class-meta-search.php:148 src/js/main.vue:102
 #, php-format
 msgid "origin in %s"
 msgstr "entstanden in %s"
@@ -100,27 +100,27 @@ msgstr "Freie Textsuche in der Transkription"
 msgid "Free Text"
 msgstr "Freitext"
 
-#: class-meta-search-widget.php:217
+#: class-meta-search-widget.php:210
 msgid "Search"
 msgstr "Suchen"
 
-#: class-meta-search-widget.php:218
+#: class-meta-search-widget.php:211
 msgid "Start the search"
 msgstr "Suche starten"
 
-#: class-meta-search-widget.php:221
+#: class-meta-search-widget.php:214
 msgid "Help"
 msgstr "Hilfe"
 
-#: class-meta-search-widget.php:222
+#: class-meta-search-widget.php:215
 msgid "Show some help"
 msgstr "Hilfe anzeigen"
 
-#: class-meta-search-widget.php:268
+#: class-meta-search-widget.php:261
 msgid "Title"
 msgstr "Titel"
 
-#: class-meta-search-widget.php:268
+#: class-meta-search-widget.php:261
 msgid "New title"
 msgstr "Neuer Titel"
 
@@ -132,12 +132,7 @@ msgstr "Suchergebnisse"
 msgid "docs"
 msgstr ""
 
-#: src/js/front.js:49
-#, fuzzy
-msgid "el"
-msgstr "Hilfe"
-
-#: src/js/front.js:25
+#: src/js/front.js:27
 msgid "text"
 msgstr ""
 
@@ -145,23 +140,49 @@ msgstr ""
 msgid "« Previous page"
 msgstr "« Vorherige Seite"
 
-#: src/js/main.vue:38
-msgid "Capitularies"
-msgstr "Kapitularien"
+#: src/js/main.vue:100
+msgid "after %s"
+msgstr "nach %s"
+
+#: src/js/main.vue:101
+msgid "before %s"
+msgstr "vor %s"
+
+#: src/js/main.vue:41
+msgid "Chapters"
+msgstr "Kapitel"
+
+#: src/js/main.vue:99
+msgid "in %s"
+msgstr "in %s"
+
+#: src/js/main.vue:48
+msgid "Manuskripte"
+msgstr "Handschriften"
 
-#: src/js/main.vue:45
+#: src/js/main.vue:55
 msgid "Mordek"
 msgstr "Mordek"
 
 #: src/js/cap-pager.vue:37
-#, fuzzy
 msgid "Next page »"
 msgstr "Nächste Seite »"
 
-#: src/js/main.vue:52
+#: src/js/main.vue:62
 msgid "Website"
 msgstr "Webseite"
 
+#: src/js/main.vue:111
+msgid "Your search for \"%s\" gave following results: "
+msgstr "Ihre Suche nach: \"%s\" ergab folgende Treffer: "
+
+#, fuzzy
+#~ msgid "el"
+#~ msgstr "Hilfe"
+
+#~ msgid "Capitularies"
+#~ msgstr "Kapitularien"
+
 #~ msgid "Capitularies contained"
 #~ msgstr "Enthaltene Kapitularien"
 
@@ -322,9 +343,6 @@ msgstr "Webseite"
 #~ msgid "Needleman-Wunsch-Gotoh"
 #~ msgstr "Needleman-Wunsch-Gotoh"
 
-#~ msgid "Manuscript"
-#~ msgstr "Handschrift"
-
 #~ msgid "Manuscripts"
 #~ msgstr "Handschriften"
 
@@ -633,9 +651,6 @@ msgstr "Webseite"
 #~ msgstr[0] "Ihre Suche nach: %1$s ergab einen Treffer."
 #~ msgstr[1] "Ihre Suche nach: %1$s ergab %2$d Treffer."
 
-#~ msgid "Your search for %1$s gave no results."
-#~ msgstr "Ihre Suche nach: %1$s ergab keine Treffer."
-
 #~ msgid "Page:"
 #~ msgstr "Seite:"
 
diff --git a/plugins/cap-meta-search/src/languages/js.pot b/plugins/cap-meta-search/src/languages/js.pot
index f76a50a..bc09888 100644
--- a/plugins/cap-meta-search/src/languages/js.pot
+++ b/plugins/cap-meta-search/src/languages/js.pot
@@ -9,10 +9,6 @@ msgstr ""
 msgid "docs"
 msgstr ""
 
-#: src/js/front.js:49
-msgid "el"
-msgstr ""
-
-#: src/js/front.js:25
+#: src/js/front.js:27
 msgid "text"
 msgstr ""
diff --git a/plugins/cap-meta-search/src/languages/php.pot b/plugins/cap-meta-search/src/languages/php.pot
index c826900..7377c05 100644
--- a/plugins/cap-meta-search/src/languages/php.pot
+++ b/plugins/cap-meta-search/src/languages/php.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Capitularia 2.0\n"
 "Report-Msgid-Bugs-To: marcello@perathoner.de\n"
-"POT-Creation-Date: 2024-09-08 15:31+0200\n"
+"POT-Creation-Date: 2024-09-12 09:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgstr ""
 msgid "before %d"
 msgstr ""
 
-#: class-meta-search.php:149
+#: class-meta-search.php:148
 #, php-format
 msgid "origin in %s"
 msgstr ""
@@ -102,27 +102,27 @@ msgstr ""
 msgid "Free Text"
 msgstr ""
 
-#: class-meta-search-widget.php:217
+#: class-meta-search-widget.php:210
 msgid "Search"
 msgstr ""
 
-#: class-meta-search-widget.php:218
+#: class-meta-search-widget.php:211
 msgid "Start the search"
 msgstr ""
 
-#: class-meta-search-widget.php:221
+#: class-meta-search-widget.php:214
 msgid "Help"
 msgstr ""
 
-#: class-meta-search-widget.php:222
+#: class-meta-search-widget.php:215
 msgid "Show some help"
 msgstr ""
 
-#: class-meta-search-widget.php:268
+#: class-meta-search-widget.php:261
 msgid "Title"
 msgstr ""
 
-#: class-meta-search-widget.php:268
+#: class-meta-search-widget.php:261
 msgid "New title"
 msgstr ""
 
diff --git a/plugins/cap-meta-search/src/languages/vue.pot b/plugins/cap-meta-search/src/languages/vue.pot
index 9036c71..c6da505 100644
--- a/plugins/cap-meta-search/src/languages/vue.pot
+++ b/plugins/cap-meta-search/src/languages/vue.pot
@@ -9,11 +9,27 @@ msgstr ""
 msgid "« Previous page"
 msgstr ""
 
-#: src/js/main.vue:38
-msgid "Capitularies"
+#: src/js/main.vue:100
+msgid "after %s"
 msgstr ""
 
-#: src/js/main.vue:45
+#: src/js/main.vue:101
+msgid "before %s"
+msgstr ""
+
+#: src/js/main.vue:41
+msgid "Chapters"
+msgstr ""
+
+#: src/js/main.vue:99
+msgid "in %s"
+msgstr ""
+
+#: src/js/main.vue:48
+msgid "Manuskripte"
+msgstr ""
+
+#: src/js/main.vue:55
 msgid "Mordek"
 msgstr ""
 
@@ -21,6 +37,14 @@ msgstr ""
 msgid "Next page »"
 msgstr ""
 
-#: src/js/main.vue:52
+#: src/js/main.vue:102
+msgid "origin in %s"
+msgstr ""
+
+#: src/js/main.vue:62
 msgid "Website"
 msgstr ""
+
+#: src/js/main.vue:111
+msgid "Your search for \"%s\" gave following results: "
+msgstr ""
diff --git a/plugins/cap-page-generator/src/languages/de_DE.po b/plugins/cap-page-generator/src/languages/de_DE.po
index 1f2a0a1..838d567 100644
--- a/plugins/cap-page-generator/src/languages/de_DE.po
+++ b/plugins/cap-page-generator/src/languages/de_DE.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: @cceh/capitularia 0.1.0\n"
 "Report-Msgid-Bugs-To: marcello@perathoner.de\n"
 "POT-Creation-Date: 2024-09-08 15:12+0200\n"
-"PO-Revision-Date: 2019-11-26 14:42+0100\n"
+"PO-Revision-Date: 2024-09-12 23:03+0200\n"
 "Last-Translator: Marcello Perathoner <marcello@perathoner.de>\n"
 "Language-Team: German <>\n"
 "Language: de_DE\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 3.5\n"
 
 #: cap-page-generator.php:90
 msgid "Capitularia Page Generator"
@@ -69,13 +69,13 @@ msgid "XML files directory"
 msgstr "Verzeichnis der XML-Dateien"
 
 #: class-config.php:103
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "The path to the XML files, relative to the FS Root. eg.: %s. The FS root is "
 "currently configured as<br>%s"
 msgstr ""
-"Der Pfad zur den XML-Dateien, relativ zum AFS-Wurzelverzeichnis, z.B. %s. "
-"Das AFS-Wurzelverzeichnis ist derzeit konfiguriert als<br>%s"
+"Der Pfad zur den XML-Dateien, relativ zum Wurzelverzeichnis, z.B. %s. Das "
+"Wurzelverzeichnis ist derzeit konfiguriert als<br>%s"
 
 #: class-config.php:114
 msgid "Slug path"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9d78068..8aa30a6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -33,8 +33,8 @@ importers:
         specifier: ^1.14.0
         version: 1.14.0
       jstree:
-        specifier: ^3.3.16
-        version: 3.3.16
+        specifier: ^3.3.17
+        version: 3.3.17
       leaflet:
         specifier: ^1.9.4
         version: 1.9.4
@@ -47,21 +47,24 @@ importers:
       papaparse:
         specifier: ^5.4.1
         version: 5.4.1
+      sprintf-js:
+        specifier: '*'
+        version: 1.1.3
       url:
         specifier: ^0.11.4
         version: 0.11.4
       vue:
-        specifier: ^3.5.3
-        version: 3.5.3(typescript@5.5.4)
+        specifier: ^3.5.4
+        version: 3.5.4(typescript@5.5.4)
       vue-cookies:
         specifier: ^1.8.4
         version: 1.8.4
       vue-router:
-        specifier: ^4.4.3
-        version: 4.4.3(vue@3.5.3(typescript@5.5.4))
+        specifier: ^4.4.4
+        version: 4.4.4(vue@3.5.4(typescript@5.5.4))
       vuex:
         specifier: ^4.1.0
-        version: 4.1.0(vue@3.5.3(typescript@5.5.4))
+        version: 4.1.0(vue@3.5.4(typescript@5.5.4))
     optionalDependencies:
       sass-embedded:
         specifier: ^1.78.0
@@ -91,12 +94,18 @@ importers:
       '@types/bootstrap':
         specifier: ^5.2.10
         version: 5.2.10
+      '@types/jquery':
+        specifier: '*'
+        version: 3.5.30
       '@types/lodash-es':
         specifier: ^4.17.12
         version: 4.17.12
       '@vue/compiler-sfc':
-        specifier: ^3.5.3
-        version: 3.5.3
+        specifier: ^3.5.4
+        version: 3.5.4
+      argparse:
+        specifier: '*'
+        version: 2.0.1
       autoprefixer:
         specifier: ^10.4.20
         version: 10.4.20(postcss@8.4.45)
@@ -133,6 +142,9 @@ importers:
       file-loader:
         specifier: ^6.2.0
         version: 6.2.0(webpack@5.94.0(webpack-cli@5.1.4))
+      gettext-extractor:
+        specifier: '*'
+        version: 3.8.0
       glob:
         specifier: ^11.0.0
         version: 11.0.0
@@ -153,7 +165,7 @@ importers:
         version: 4.0.3
       jsdoc-vuejs:
         specifier: ^4.0.0
-        version: 4.0.0(@vue/compiler-sfc@3.5.3)(jsdoc@4.0.3)
+        version: 4.0.0(@vue/compiler-sfc@3.5.4)(jsdoc@4.0.3)
       jshint:
         specifier: ^2.13.6
         version: 2.13.6
@@ -170,8 +182,8 @@ importers:
         specifier: ^6.2.0
         version: 6.2.0(postcss@8.4.45)
       postcss-preset-env:
-        specifier: ^10.0.2
-        version: 10.0.2(postcss@8.4.45)
+        specifier: ^10.0.3
+        version: 10.0.3(postcss@8.4.45)
       prettier:
         specifier: ^3.3.3
         version: 3.3.3
@@ -184,6 +196,9 @@ importers:
       sass-loader:
         specifier: ^16.0.1
         version: 16.0.1(sass-embedded@1.78.0)(sass@1.78.0)(webpack@5.94.0(webpack-cli@5.1.4))
+      source-map:
+        specifier: '*'
+        version: 0.6.1
       stream-browserify:
         specifier: ^3.0.0
         version: 3.0.0
@@ -204,7 +219,7 @@ importers:
         version: 5.1.4
       vue-loader:
         specifier: ^17.4.2
-        version: 17.4.2(@vue/compiler-sfc@3.5.3)(vue@3.5.3(typescript@5.5.4))(webpack@5.94.0(webpack-cli@5.1.4))
+        version: 17.4.2(@vue/compiler-sfc@3.5.4)(vue@3.5.4(typescript@5.5.4))(webpack@5.94.0(webpack-cli@5.1.4))
       webpack:
         specifier: ^5.94.0
         version: 5.94.0(webpack-cli@5.1.4)
@@ -1250,6 +1265,9 @@ packages:
   '@types/express@4.17.21':
     resolution: {integrity: sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==}
 
+  '@types/glob@7.2.0':
+    resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==}
+
   '@types/html-minifier-terser@6.1.0':
     resolution: {integrity: sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==}
 
@@ -1268,6 +1286,9 @@ packages:
   '@types/istanbul-reports@3.0.4':
     resolution: {integrity: sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==}
 
+  '@types/jquery@3.5.30':
+    resolution: {integrity: sha512-nbWKkkyb919DOUxjmRVk8vwtDb0/k8FKncmUKFi+NY+QXqWltooxTrswvz4LspQwxvLdvzBN1TImr6cw3aQx2A==}
+
   '@types/json-schema@7.0.15':
     resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
 
@@ -1292,12 +1313,18 @@ packages:
   '@types/mime@1.3.5':
     resolution: {integrity: sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==}
 
+  '@types/minimatch@5.1.2':
+    resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==}
+
   '@types/node-forge@1.3.11':
     resolution: {integrity: sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==}
 
   '@types/node@22.5.4':
     resolution: {integrity: sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==}
 
+  '@types/parse5@5.0.3':
+    resolution: {integrity: sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==}
+
   '@types/qs@6.9.15':
     resolution: {integrity: sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==}
 
@@ -1316,6 +1343,9 @@ packages:
   '@types/serve-static@1.15.7':
     resolution: {integrity: sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==}
 
+  '@types/sizzle@2.3.8':
+    resolution: {integrity: sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==}
+
   '@types/sockjs@0.3.36':
     resolution: {integrity: sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==}
 
@@ -1331,37 +1361,37 @@ packages:
   '@types/yauzl@2.10.3':
     resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
 
-  '@vue/compiler-core@3.5.3':
-    resolution: {integrity: sha512-adAfy9boPkP233NTyvLbGEqVuIfK/R0ZsBsIOW4BZNfb4BRpRW41Do1u+ozJpsb+mdoy80O20IzAsHaihRb5qA==}
+  '@vue/compiler-core@3.5.4':
+    resolution: {integrity: sha512-oNwn+BAt3n9dK9uAYvI+XGlutwuTq/wfj4xCBaZCqwwVIGtD7D6ViihEbyYZrDHIHTDE3Q6oL3/hqmAyFEy9DQ==}
 
-  '@vue/compiler-dom@3.5.3':
-    resolution: {integrity: sha512-wnzFArg9zpvk/811CDOZOadJRugf1Bgl/TQ3RfV4nKfSPok4hi0w10ziYUQR6LnnBAUlEXYLUfZ71Oj9ds/+QA==}
+  '@vue/compiler-dom@3.5.4':
+    resolution: {integrity: sha512-yP9RRs4BDLOLfldn6ah+AGCNovGjMbL9uHvhDHf5wan4dAHLnFGOkqtfE7PPe4HTXIqE7l/NILdYw53bo1C8jw==}
 
-  '@vue/compiler-sfc@3.5.3':
-    resolution: {integrity: sha512-P3uATLny2tfyvMB04OQFe7Sczteno7SLFxwrOA/dw01pBWQHB5HL15a8PosoNX2aG/EAMGqnXTu+1LnmzFhpTQ==}
+  '@vue/compiler-sfc@3.5.4':
+    resolution: {integrity: sha512-P+yiPhL+NYH7m0ZgCq7AQR2q7OIE+mpAEgtkqEeH9oHSdIRvUO+4X6MPvblJIWcoe4YC5a2Gdf/RsoyP8FFiPQ==}
 
-  '@vue/compiler-ssr@3.5.3':
-    resolution: {integrity: sha512-F/5f+r2WzL/2YAPl7UlKcJWHrvoZN8XwEBLnT7S4BXwncH25iDOabhO2M2DWioyTguJAGavDOawejkFXj8EM1w==}
+  '@vue/compiler-ssr@3.5.4':
+    resolution: {integrity: sha512-acESdTXsxPnYr2C4Blv0ggx5zIFMgOzZmYU2UgvIff9POdRGbRNBHRyzHAnizcItvpgerSKQbllUc9USp3V7eg==}
 
-  '@vue/devtools-api@6.6.3':
-    resolution: {integrity: sha512-0MiMsFma/HqA6g3KLKn+AGpL1kgKhFWszC9U29NfpWK5LE7bjeXxySWJrOJ77hBz+TBrBQ7o4QJqbPbqbs8rJw==}
+  '@vue/devtools-api@6.6.4':
+    resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==}
 
-  '@vue/reactivity@3.5.3':
-    resolution: {integrity: sha512-2w61UnRWTP7+rj1H/j6FH706gRBHdFVpIqEkSDAyIpafBXYH8xt4gttstbbCWdU3OlcSWO8/3mbKl/93/HSMpw==}
+  '@vue/reactivity@3.5.4':
+    resolution: {integrity: sha512-HKKbEuP7tYSGCq4e4nK6ZW6l5hyG66OUetefBp4budUyjvAYsnQDf+bgFzg2RAgnH0CInyqXwD9y47jwJEHrQw==}
 
-  '@vue/runtime-core@3.5.3':
-    resolution: {integrity: sha512-5b2AQw5OZlmCzSsSBWYoZOsy75N4UdMWenTfDdI5bAzXnuVR7iR8Q4AOzQm2OGoA41xjk53VQKrqQhOz2ktWaw==}
+  '@vue/runtime-core@3.5.4':
+    resolution: {integrity: sha512-f3ek2sTA0AFu0n+w+kCtz567Euqqa3eHewvo4klwS7mWfSj/A+UmYTwsnUFo35KeyAFY60JgrCGvEBsu1n/3LA==}
 
-  '@vue/runtime-dom@3.5.3':
-    resolution: {integrity: sha512-wPR1DEGc3XnQ7yHbmkTt3GoY0cEnVGQnARRdAkDzZ8MbUKEs26gogCQo6AOvvgahfjIcnvWJzkZArQ1fmWjcSg==}
+  '@vue/runtime-dom@3.5.4':
+    resolution: {integrity: sha512-ofyc0w6rbD5KtjhP1i9hGOKdxGpvmuB1jprP7Djlj0X7R5J/oLwuNuE98GJ8WW31Hu2VxQHtk/LYTAlW8xrJdw==}
 
-  '@vue/server-renderer@3.5.3':
-    resolution: {integrity: sha512-28volmaZVG2PGO3V3+gBPKoSHvLlE8FGfG/GKXKkjjfxLuj/50B/0OQGakM/g6ehQeqCrZYM4eHC4Ks48eig1Q==}
+  '@vue/server-renderer@3.5.4':
+    resolution: {integrity: sha512-FbjV6DJLgKRetMYFBA1UXCroCiED/Ckr53/ba9wivyd7D/Xw9fpo0T6zXzCnxQwyvkyrL7y6plgYhWhNjGxY5g==}
     peerDependencies:
-      vue: 3.5.3
+      vue: 3.5.4
 
-  '@vue/shared@3.5.3':
-    resolution: {integrity: sha512-Jp2v8nylKBT+PlOUjun2Wp/f++TfJVFjshLzNtJDdmFJabJa7noGMncqXRM1vXGX+Yo2V7WykQFNxusSim8SCA==}
+  '@vue/shared@3.5.4':
+    resolution: {integrity: sha512-L2MCDD8l7yC62Te5UUyPVpmexhL9ipVnYRw9CsWfm/BGRL5FwDX4a25bcJ/OJSD3+Hx+k/a8LDKcG2AFdJV3BA==}
 
   '@webassemblyjs/ast@1.12.1':
     resolution: {integrity: sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==}
@@ -1492,8 +1522,8 @@ packages:
     peerDependencies:
       acorn: ^6.1.0 || ^7 || ^8
 
-  acorn-walk@8.3.3:
-    resolution: {integrity: sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==}
+  acorn-walk@8.3.4:
+    resolution: {integrity: sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==}
     engines: {node: '>=0.4.0'}
 
   acorn@7.4.1:
@@ -1546,8 +1576,8 @@ packages:
     resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
     engines: {node: '>=8'}
 
-  ansi-regex@6.0.1:
-    resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
+  ansi-regex@6.1.0:
+    resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==}
     engines: {node: '>=12'}
 
   ansi-styles@3.2.1:
@@ -1672,17 +1702,17 @@ packages:
   bare-events@2.4.2:
     resolution: {integrity: sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==}
 
-  bare-fs@2.3.3:
-    resolution: {integrity: sha512-7RYKL+vZVCyAsMLi5SPu7QGauGGT8avnP/HO571ndEuV4MYdGXvLhtW67FuLPeEI8EiIY7zbbRR9x7x7HU0kgw==}
+  bare-fs@2.3.4:
+    resolution: {integrity: sha512-7YyxitZEq0ey5loOF5gdo1fZQFF7290GziT+VbAJ+JbYTJYaPZwuEz2r/Nq23sm4fjyTgUf2uJI2gkT3xAuSYA==}
 
-  bare-os@2.4.2:
-    resolution: {integrity: sha512-HZoJwzC+rZ9lqEemTMiO0luOePoGYNBgsLLgegKR/cljiJvcDNhDZQkzC+NC5Oh0aHbdBNSOHpghwMuB5tqhjg==}
+  bare-os@2.4.3:
+    resolution: {integrity: sha512-FjkNiU3AwTQNQkcxFOmDcCfoN1LjjtU+ofGJh5DymZZLTqdw2i/CzV7G0h3snvh6G8jrWtdmNSgZPH4L2VOAsQ==}
 
   bare-path@2.1.3:
     resolution: {integrity: sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==}
 
-  bare-stream@2.2.1:
-    resolution: {integrity: sha512-YTB47kHwBW9zSG8LD77MIBAAQXjU2WjAkMHeeb7hUplVs6+IoM5I7uEVQNPMB7lj9r8I76UMdoMkGnCodHOLqg==}
+  bare-stream@2.3.0:
+    resolution: {integrity: sha512-pVRWciewGUeCyKEuRxwv06M079r+fRjAQjBEK2P6OYGrO43O+Z0LrPZZEjlc4mB6C2RpZ9AxJ1s7NLEtOHO6eA==}
 
   base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
@@ -1707,8 +1737,8 @@ packages:
   bluebird@3.7.2:
     resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==}
 
-  body-parser@1.20.2:
-    resolution: {integrity: sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==}
+  body-parser@1.20.3:
+    resolution: {integrity: sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==}
     engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
 
   bonjour-service@1.2.1:
@@ -1775,8 +1805,8 @@ packages:
   camel-case@4.1.2:
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
 
-  caniuse-lite@1.0.30001658:
-    resolution: {integrity: sha512-N2YVqWbJELVdrnsW5p+apoQyYt51aBMSsBZki1XZEfeBCexcM/sf4xiAHcXQBkuOwJBXtWF7aW1sYX6tKebPHw==}
+  caniuse-lite@1.0.30001660:
+    resolution: {integrity: sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==}
 
   catharsis@0.9.0:
     resolution: {integrity: sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==}
@@ -1975,6 +2005,9 @@ packages:
   css-select@5.1.0:
     resolution: {integrity: sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==}
 
+  css-selector-parser@1.4.1:
+    resolution: {integrity: sha512-HYPSb7y/Z7BNDCOrakL4raGO2zltZkbeXyAd6Tg9obzix6QhzxCotdBl6VT0Dv4vZfJGVz3WL/xaEI9Ly3ul0g==}
+
   css-tree@2.3.1:
     resolution: {integrity: sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==}
     engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
@@ -1983,8 +2016,8 @@ packages:
     resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==}
     engines: {node: '>= 6'}
 
-  cssdb@8.1.0:
-    resolution: {integrity: sha512-BQN57lfS4dYt2iL0LgyrlDbefZKEtUyrO8rbzrbGrqBk6OoyNTQLF+porY9DrpDBjLo4NEvj2IJttC7vf3x+Ew==}
+  cssdb@8.1.1:
+    resolution: {integrity: sha512-kRbSRgZoxtZNl5snb3nOzBkFOt5AwnephcUTIEFc2DebKG9PN50/cHarlwOooTxYQ/gxsnKs3BxykhNLmfvyLg==}
 
   cssesc@3.0.0:
     resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
@@ -2289,8 +2322,8 @@ packages:
     engines: {node: '>=0.10.0'}
     hasBin: true
 
-  electron-to-chromium@1.5.18:
-    resolution: {integrity: sha512-1OfuVACu+zKlmjsNdcJuVQuVE61sZOLbNM4JAQ1Rvh6EOj0/EUKhMJjRH73InPlXSh8HIJk1cVZ8pyOV/FMdUQ==}
+  electron-to-chromium@1.5.20:
+    resolution: {integrity: sha512-74mdl6Fs1HHzK9SUX4CKFxAtAe3nUns48y79TskHNAG6fGOlLfyKA4j855x+0b5u8rWJIrlaG9tcTPstMlwjIw==}
 
   emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
@@ -2306,6 +2339,10 @@ packages:
     resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==}
     engines: {node: '>= 0.8'}
 
+  encodeurl@2.0.0:
+    resolution: {integrity: sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==}
+    engines: {node: '>= 0.8'}
+
   encoding@0.1.13:
     resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==}
 
@@ -2531,8 +2568,8 @@ packages:
     resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}
     engines: {node: '>= 0.8.0'}
 
-  express@4.19.2:
-    resolution: {integrity: sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==}
+  express@4.21.0:
+    resolution: {integrity: sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==}
     engines: {node: '>= 0.10.0'}
 
   extract-zip@2.0.1:
@@ -2594,8 +2631,8 @@ packages:
     resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
     engines: {node: '>=8'}
 
-  finalhandler@1.2.0:
-    resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==}
+  finalhandler@1.3.1:
+    resolution: {integrity: sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==}
     engines: {node: '>= 0.8'}
 
   find-cache-dir@4.0.0:
@@ -2711,6 +2748,10 @@ packages:
     resolution: {integrity: sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==}
     engines: {node: '>= 14'}
 
+  gettext-extractor@3.8.0:
+    resolution: {integrity: sha512-i/3mDQufQoJd2/EKm/B+VlaYrt3yGjVfLZu8DQpESKH29klNiW6z2S89FVCIEB85bDNgtGCeM/3A/yR1njr/Lw==}
+    engines: {node: '>=6'}
+
   gettext-parser@1.4.0:
     resolution: {integrity: sha512-sedZYLHlHeBop/gZ1jdg59hlUEcpcZJofLq2JFwJT1zTqAU3l2wFv6IsuwFHGqbiT9DWzMUW4/em2+hspnmMMA==}
 
@@ -3226,8 +3267,8 @@ packages:
   jstransformer@1.0.0:
     resolution: {integrity: sha512-C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A==}
 
-  jstree@3.3.16:
-    resolution: {integrity: sha512-yeeIJffi2WAqyMeHufXj/Ozy7GqgKdDkxfN8L8lwbG0h1cw/TgDafWmyhroH4AKgDSk9yW1W6jiJZu4zXAqzXw==}
+  jstree@3.3.17:
+    resolution: {integrity: sha512-V0Pl1B6BIaxHUQMiWkol37QlhlBKoZA9RUeUmm95+UnV2QeZsj2QP1sOQl/m2EIOyZXOOxOHvR0SYZLSDC7EFw==}
 
   keyv@4.5.4:
     resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
@@ -3349,8 +3390,8 @@ packages:
     resolution: {integrity: sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==}
     engines: {node: '>=18'}
 
-  merge-descriptors@1.0.1:
-    resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==}
+  merge-descriptors@1.0.3:
+    resolution: {integrity: sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==}
 
   merge-stream@2.0.0:
     resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
@@ -3596,6 +3637,9 @@ packages:
   parse5-htmlparser2-tree-adapter@7.0.0:
     resolution: {integrity: sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==}
 
+  parse5@6.0.1:
+    resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==}
+
   parse5@7.1.2:
     resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==}
 
@@ -3629,8 +3673,8 @@ packages:
     resolution: {integrity: sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==}
     engines: {node: 20 || >=22}
 
-  path-to-regexp@0.1.7:
-    resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==}
+  path-to-regexp@0.1.10:
+    resolution: {integrity: sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==}
 
   path-type@4.0.0:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
@@ -3658,6 +3702,9 @@ packages:
     resolution: {integrity: sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==}
     engines: {node: '>=14.16'}
 
+  pofile@1.0.11:
+    resolution: {integrity: sha512-Vy9eH1dRD9wHjYt/QqXcTz+RnX/zg53xK+KljFSX30PvdDMb2z+c6uDUeblUGqqJgz3QFsdlA0IJvHziPmWtQg==}
+
   pofile@1.1.4:
     resolution: {integrity: sha512-r6Q21sKsY1AjTVVjOuU02VYKVNQGJNQHjTIvs4dEbeuuYfxgYk/DGD2mqqq4RDaVkwdSq0VEtmQUOPe/wH8X3g==}
 
@@ -3818,11 +3865,11 @@ packages:
     peerDependencies:
       postcss: ^8.4
 
-  postcss-opacity-percentage@2.0.0:
-    resolution: {integrity: sha512-lyDrCOtntq5Y1JZpBFzIWm2wG9kbEdujpNt4NLannF+J9c8CgFIzPa80YQfdza+Y+yFfzbYj/rfoOsYsooUWTQ==}
-    engines: {node: ^14 || ^16 || >=18}
+  postcss-opacity-percentage@3.0.0:
+    resolution: {integrity: sha512-K6HGVzyxUxd/VgZdX04DCtdwWJ4NGLG212US4/LA1TLAbHgmAsTWVR86o+gGIbFtnTkfOpb9sCRBx8K7HO66qQ==}
+    engines: {node: '>=18'}
     peerDependencies:
-      postcss: ^8.2
+      postcss: ^8.4
 
   postcss-overflow-shorthand@6.0.0:
     resolution: {integrity: sha512-BdDl/AbVkDjoTofzDQnwDdm/Ym6oS9KgmO7Gr+LHYjNWJ6ExORe4+3pcLQsLA9gIROMkiGVjjwZNoL/mpXHd5Q==}
@@ -3841,8 +3888,8 @@ packages:
     peerDependencies:
       postcss: ^8.4
 
-  postcss-preset-env@10.0.2:
-    resolution: {integrity: sha512-PMxqnz0RQYMUmUi6p4P7BhC9EVGyEUCIdwn4vJ7Fy1jvc2QP4mMH75BSBB1mBFqjl3x4xYwyCNMhGZ8y0+/qOA==}
+  postcss-preset-env@10.0.3:
+    resolution: {integrity: sha512-1nrZ4IeBXEEj53IMoRKE+k/Ub6nQb3gFjaxTeyUNG5zv3JQclFDY5GKKhAi3nsa1lnPMWgzQX+/1y6wUt2+I7Q==}
     engines: {node: '>=18'}
     peerDependencies:
       postcss: ^8.4
@@ -3959,8 +4006,8 @@ packages:
   pug@3.0.3:
     resolution: {integrity: sha512-uBi6kmc9f3SZ3PXxqcHiUZLmIXgfgWooKWXcwSGwQd2Zi5Rb0bT14+8CJjJgI8AB+nndLaNgHGrcc6bPIB665g==}
 
-  pump@3.0.0:
-    resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==}
+  pump@3.0.2:
+    resolution: {integrity: sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==}
 
   punycode.js@2.3.1:
     resolution: {integrity: sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==}
@@ -3977,10 +4024,6 @@ packages:
     resolution: {integrity: sha512-sB2SsVMFs4gKad5OCdv6w5vocvtEUrRl0zQqSyRPbo/cj1Ktbarmhxy02Zyb9R9HrssBcJDZbkrvBnbaesPyYg==}
     engines: {node: '>=18'}
 
-  qs@6.11.0:
-    resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==}
-    engines: {node: '>=0.6'}
-
   qs@6.13.0:
     resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==}
     engines: {node: '>=0.6'}
@@ -4298,8 +4341,8 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  send@0.18.0:
-    resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
+  send@0.19.0:
+    resolution: {integrity: sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==}
     engines: {node: '>= 0.8.0'}
 
   serialize-javascript@6.0.2:
@@ -4309,8 +4352,8 @@ packages:
     resolution: {integrity: sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==}
     engines: {node: '>= 0.8.0'}
 
-  serve-static@1.15.0:
-    resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==}
+  serve-static@1.16.2:
+    resolution: {integrity: sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==}
     engines: {node: '>= 0.8.0'}
 
   set-function-length@1.2.2:
@@ -4376,8 +4419,8 @@ packages:
   source-list-map@2.0.1:
     resolution: {integrity: sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==}
 
-  source-map-js@1.2.0:
-    resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
+  source-map-js@1.2.1:
+    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
     engines: {node: '>=0.10.0'}
 
   source-map-support@0.5.21:
@@ -4547,8 +4590,8 @@ packages:
       uglify-js:
         optional: true
 
-  terser@5.31.6:
-    resolution: {integrity: sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==}
+  terser@5.32.0:
+    resolution: {integrity: sha512-v3Gtw3IzpBJ0ugkxEX8U0W6+TnPKRRCWGh1jC/iM/e3Ki5+qvO1L1EAZ56bZasc64aXHwRHNIQEzm6//i5cemQ==}
     engines: {node: '>=10'}
     hasBin: true
 
@@ -4741,13 +4784,13 @@ packages:
       vue:
         optional: true
 
-  vue-router@4.4.3:
-    resolution: {integrity: sha512-sv6wmNKx2j3aqJQDMxLFzs/u/mjA9Z5LCgy6BE0f7yFWMjrPLnS/sPNn8ARY/FXw6byV18EFutn5lTO6+UsV5A==}
+  vue-router@4.4.4:
+    resolution: {integrity: sha512-3MlnDqwRwZwCQVbtVfpsU+nrNymNjnXSsQtXName5925NVC1+326VVfYH9vSrA0N13teGEo8z5x7gbRnGjCDiQ==}
     peerDependencies:
       vue: ^3.2.0
 
-  vue@3.5.3:
-    resolution: {integrity: sha512-xvRbd0HpuLovYbOHXRHlSBsSvmUJbo0pzbkKTApWnQGf3/cu5Z39mQeA5cZdLRVIoNf3zI6MSoOgHUT5i2jO+Q==}
+  vue@3.5.4:
+    resolution: {integrity: sha512-3yAj2gkmiY+i7+22A1PWM+kjOVXjU74UPINcTiN7grIVPyFFI0lpGwHlV/4xydDmobaBn7/xmi+YG8HeSlCTcg==}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
@@ -6186,6 +6229,11 @@ snapshots:
       '@types/qs': 6.9.15
       '@types/serve-static': 1.15.7
 
+  '@types/glob@7.2.0':
+    dependencies:
+      '@types/minimatch': 5.1.2
+      '@types/node': 22.5.4
+
   '@types/html-minifier-terser@6.1.0': {}
 
   '@types/http-errors@2.0.4': {}
@@ -6204,6 +6252,10 @@ snapshots:
     dependencies:
       '@types/istanbul-lib-report': 3.0.3
 
+  '@types/jquery@3.5.30':
+    dependencies:
+      '@types/sizzle': 2.3.8
+
   '@types/json-schema@7.0.15': {}
 
   '@types/json5@0.0.29': {}
@@ -6225,6 +6277,8 @@ snapshots:
 
   '@types/mime@1.3.5': {}
 
+  '@types/minimatch@5.1.2': {}
+
   '@types/node-forge@1.3.11':
     dependencies:
       '@types/node': 22.5.4
@@ -6233,6 +6287,8 @@ snapshots:
     dependencies:
       undici-types: 6.19.8
 
+  '@types/parse5@5.0.3': {}
+
   '@types/qs@6.9.15': {}
 
   '@types/range-parser@1.2.7': {}
@@ -6254,6 +6310,8 @@ snapshots:
       '@types/node': 22.5.4
       '@types/send': 0.17.4
 
+  '@types/sizzle@2.3.8': {}
+
   '@types/sockjs@0.3.36':
     dependencies:
       '@types/node': 22.5.4
@@ -6273,61 +6331,61 @@ snapshots:
       '@types/node': 22.5.4
     optional: true
 
-  '@vue/compiler-core@3.5.3':
+  '@vue/compiler-core@3.5.4':
     dependencies:
       '@babel/parser': 7.25.6
-      '@vue/shared': 3.5.3
+      '@vue/shared': 3.5.4
       entities: 4.5.0
       estree-walker: 2.0.2
-      source-map-js: 1.2.0
+      source-map-js: 1.2.1
 
-  '@vue/compiler-dom@3.5.3':
+  '@vue/compiler-dom@3.5.4':
     dependencies:
-      '@vue/compiler-core': 3.5.3
-      '@vue/shared': 3.5.3
+      '@vue/compiler-core': 3.5.4
+      '@vue/shared': 3.5.4
 
-  '@vue/compiler-sfc@3.5.3':
+  '@vue/compiler-sfc@3.5.4':
     dependencies:
       '@babel/parser': 7.25.6
-      '@vue/compiler-core': 3.5.3
-      '@vue/compiler-dom': 3.5.3
-      '@vue/compiler-ssr': 3.5.3
-      '@vue/shared': 3.5.3
+      '@vue/compiler-core': 3.5.4
+      '@vue/compiler-dom': 3.5.4
+      '@vue/compiler-ssr': 3.5.4
+      '@vue/shared': 3.5.4
       estree-walker: 2.0.2
       magic-string: 0.30.11
       postcss: 8.4.45
-      source-map-js: 1.2.0
+      source-map-js: 1.2.1
 
-  '@vue/compiler-ssr@3.5.3':
+  '@vue/compiler-ssr@3.5.4':
     dependencies:
-      '@vue/compiler-dom': 3.5.3
-      '@vue/shared': 3.5.3
+      '@vue/compiler-dom': 3.5.4
+      '@vue/shared': 3.5.4
 
-  '@vue/devtools-api@6.6.3': {}
+  '@vue/devtools-api@6.6.4': {}
 
-  '@vue/reactivity@3.5.3':
+  '@vue/reactivity@3.5.4':
     dependencies:
-      '@vue/shared': 3.5.3
+      '@vue/shared': 3.5.4
 
-  '@vue/runtime-core@3.5.3':
+  '@vue/runtime-core@3.5.4':
     dependencies:
-      '@vue/reactivity': 3.5.3
-      '@vue/shared': 3.5.3
+      '@vue/reactivity': 3.5.4
+      '@vue/shared': 3.5.4
 
-  '@vue/runtime-dom@3.5.3':
+  '@vue/runtime-dom@3.5.4':
     dependencies:
-      '@vue/reactivity': 3.5.3
-      '@vue/runtime-core': 3.5.3
-      '@vue/shared': 3.5.3
+      '@vue/reactivity': 3.5.4
+      '@vue/runtime-core': 3.5.4
+      '@vue/shared': 3.5.4
       csstype: 3.1.3
 
-  '@vue/server-renderer@3.5.3(vue@3.5.3(typescript@5.5.4))':
+  '@vue/server-renderer@3.5.4(vue@3.5.4(typescript@5.5.4))':
     dependencies:
-      '@vue/compiler-ssr': 3.5.3
-      '@vue/shared': 3.5.3
-      vue: 3.5.3(typescript@5.5.4)
+      '@vue/compiler-ssr': 3.5.4
+      '@vue/shared': 3.5.4
+      vue: 3.5.4(typescript@5.5.4)
 
-  '@vue/shared@3.5.3': {}
+  '@vue/shared@3.5.4': {}
 
   '@webassemblyjs/ast@1.12.1':
     dependencies:
@@ -6478,7 +6536,7 @@ snapshots:
       acorn: 7.4.1
       acorn-private-class-elements: 0.2.7(acorn@7.4.1)
 
-  acorn-walk@8.3.3:
+  acorn-walk@8.3.4:
     dependencies:
       acorn: 8.12.1
 
@@ -6527,7 +6585,7 @@ snapshots:
 
   ansi-regex@5.0.1: {}
 
-  ansi-regex@6.0.1: {}
+  ansi-regex@6.1.0: {}
 
   ansi-styles@3.2.1:
     dependencies:
@@ -6617,7 +6675,7 @@ snapshots:
   autoprefixer@10.4.20(postcss@8.4.45):
     dependencies:
       browserslist: 4.23.3
-      caniuse-lite: 1.0.30001658
+      caniuse-lite: 1.0.30001660
       fraction.js: 4.3.7
       normalize-range: 0.1.2
       picocolors: 1.1.0
@@ -6681,22 +6739,22 @@ snapshots:
   bare-events@2.4.2:
     optional: true
 
-  bare-fs@2.3.3:
+  bare-fs@2.3.4:
     dependencies:
       bare-events: 2.4.2
       bare-path: 2.1.3
-      bare-stream: 2.2.1
+      bare-stream: 2.3.0
     optional: true
 
-  bare-os@2.4.2:
+  bare-os@2.4.3:
     optional: true
 
   bare-path@2.1.3:
     dependencies:
-      bare-os: 2.4.2
+      bare-os: 2.4.3
     optional: true
 
-  bare-stream@2.2.1:
+  bare-stream@2.3.0:
     dependencies:
       b4a: 1.6.6
       streamx: 2.20.0
@@ -6716,7 +6774,7 @@ snapshots:
 
   bluebird@3.7.2: {}
 
-  body-parser@1.20.2:
+  body-parser@1.20.3:
     dependencies:
       bytes: 3.1.2
       content-type: 1.0.5
@@ -6726,7 +6784,7 @@ snapshots:
       http-errors: 2.0.0
       iconv-lite: 0.4.24
       on-finished: 2.4.1
-      qs: 6.11.0
+      qs: 6.13.0
       raw-body: 2.5.2
       type-is: 1.6.18
       unpipe: 1.0.0
@@ -6759,8 +6817,8 @@ snapshots:
 
   browserslist@4.23.3:
     dependencies:
-      caniuse-lite: 1.0.30001658
-      electron-to-chromium: 1.5.18
+      caniuse-lite: 1.0.30001660
+      electron-to-chromium: 1.5.20
       node-releases: 2.0.18
       update-browserslist-db: 1.1.0(browserslist@4.23.3)
 
@@ -6801,7 +6859,7 @@ snapshots:
       pascal-case: 3.1.2
       tslib: 2.7.0
 
-  caniuse-lite@1.0.30001658: {}
+  caniuse-lite@1.0.30001660: {}
 
   catharsis@0.9.0:
     dependencies:
@@ -7028,14 +7086,16 @@ snapshots:
       domutils: 3.1.0
       nth-check: 2.1.1
 
+  css-selector-parser@1.4.1: {}
+
   css-tree@2.3.1:
     dependencies:
       mdn-data: 2.0.30
-      source-map-js: 1.2.0
+      source-map-js: 1.2.1
 
   css-what@6.1.0: {}
 
-  cssdb@8.1.0: {}
+  cssdb@8.1.1: {}
 
   cssesc@3.0.0: {}
 
@@ -7353,7 +7413,7 @@ snapshots:
       '@babel/core': 7.25.2
       acorn: 7.4.1
       acorn-stage3: 4.0.0(acorn@7.4.1)
-      acorn-walk: 8.3.3
+      acorn-walk: 8.3.4
       buntis: 0.2.1
       cheerio: 1.0.0-rc.12
       estree-walker: 2.0.2
@@ -7361,7 +7421,7 @@ snapshots:
       minimist: 1.2.8
       pofile: 1.1.4
     optionalDependencies:
-      '@vue/compiler-sfc': 3.5.3
+      '@vue/compiler-sfc': 3.5.4
       pug: 3.0.3
     transitivePeerDependencies:
       - supports-color
@@ -7372,7 +7432,7 @@ snapshots:
     dependencies:
       jake: 10.9.2
 
-  electron-to-chromium@1.5.18: {}
+  electron-to-chromium@1.5.20: {}
 
   emoji-regex@8.0.0: {}
 
@@ -7382,6 +7442,8 @@ snapshots:
 
   encodeurl@1.0.2: {}
 
+  encodeurl@2.0.0: {}
+
   encoding@0.1.13:
     dependencies:
       iconv-lite: 0.6.3
@@ -7679,34 +7741,34 @@ snapshots:
 
   exit@0.1.2: {}
 
-  express@4.19.2:
+  express@4.21.0:
     dependencies:
       accepts: 1.3.8
       array-flatten: 1.1.1
-      body-parser: 1.20.2
+      body-parser: 1.20.3
       content-disposition: 0.5.4
       content-type: 1.0.5
       cookie: 0.6.0
       cookie-signature: 1.0.6
       debug: 2.6.9
       depd: 2.0.0
-      encodeurl: 1.0.2
+      encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
-      finalhandler: 1.2.0
+      finalhandler: 1.3.1
       fresh: 0.5.2
       http-errors: 2.0.0
-      merge-descriptors: 1.0.1
+      merge-descriptors: 1.0.3
       methods: 1.1.2
       on-finished: 2.4.1
       parseurl: 1.3.3
-      path-to-regexp: 0.1.7
+      path-to-regexp: 0.1.10
       proxy-addr: 2.0.7
-      qs: 6.11.0
+      qs: 6.13.0
       range-parser: 1.2.1
       safe-buffer: 5.2.1
-      send: 0.18.0
-      serve-static: 1.15.0
+      send: 0.19.0
+      serve-static: 1.16.2
       setprototypeof: 1.2.0
       statuses: 2.0.1
       type-is: 1.6.18
@@ -7779,10 +7841,10 @@ snapshots:
     dependencies:
       to-regex-range: 5.0.1
 
-  finalhandler@1.2.0:
+  finalhandler@1.3.1:
     dependencies:
       debug: 2.6.9
-      encodeurl: 1.0.2
+      encodeurl: 2.0.0
       escape-html: 1.0.3
       on-finished: 2.4.1
       parseurl: 1.3.3
@@ -7890,7 +7952,7 @@ snapshots:
 
   get-stream@5.2.0:
     dependencies:
-      pump: 3.0.0
+      pump: 3.0.2
 
   get-symbol-description@1.0.2:
     dependencies:
@@ -7907,6 +7969,16 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  gettext-extractor@3.8.0:
+    dependencies:
+      '@types/glob': 7.2.0
+      '@types/parse5': 5.0.3
+      css-selector-parser: 1.4.1
+      glob: 7.2.3
+      parse5: 6.0.1
+      pofile: 1.0.11
+      typescript: 5.5.4
+
   gettext-parser@1.4.0:
     dependencies:
       encoding: 0.1.13
@@ -8039,7 +8111,7 @@ snapshots:
       he: 1.2.0
       param-case: 3.0.4
       relateurl: 0.2.7
-      terser: 5.31.6
+      terser: 5.32.0
 
   html-minifier-terser@7.2.0:
     dependencies:
@@ -8049,7 +8121,7 @@ snapshots:
       entities: 4.5.0
       param-case: 3.0.4
       relateurl: 0.2.7
-      terser: 5.31.6
+      terser: 5.32.0
 
   html-tags@3.3.1: {}
 
@@ -8170,7 +8242,7 @@ snapshots:
 
   imports-loader@5.0.0(webpack@5.94.0(webpack-cli@5.1.4)):
     dependencies:
-      source-map-js: 1.2.0
+      source-map-js: 1.2.1
       strip-comments: 2.0.1
       webpack: 5.94.0(webpack-cli@5.1.4)
 
@@ -8380,9 +8452,9 @@ snapshots:
 
   jsbn@1.1.0: {}
 
-  jsdoc-vuejs@4.0.0(@vue/compiler-sfc@3.5.3)(jsdoc@4.0.3):
+  jsdoc-vuejs@4.0.0(@vue/compiler-sfc@3.5.4)(jsdoc@4.0.3):
     dependencies:
-      '@vue/compiler-sfc': 3.5.3
+      '@vue/compiler-sfc': 3.5.4
       ejs: 3.1.10
       jsdoc: 4.0.3
 
@@ -8446,7 +8518,7 @@ snapshots:
       promise: 7.3.1
     optional: true
 
-  jstree@3.3.16:
+  jstree@3.3.17:
     dependencies:
       jquery: 3.7.1
 
@@ -8561,7 +8633,7 @@ snapshots:
 
   meow@13.2.0: {}
 
-  merge-descriptors@1.0.1: {}
+  merge-descriptors@1.0.3: {}
 
   merge-stream@2.0.0: {}
 
@@ -8804,6 +8876,8 @@ snapshots:
       domhandler: 5.0.3
       parse5: 7.1.2
 
+  parse5@6.0.1: {}
+
   parse5@7.1.2:
     dependencies:
       entities: 4.5.0
@@ -8830,7 +8904,7 @@ snapshots:
       lru-cache: 11.0.1
       minipass: 7.1.2
 
-  path-to-regexp@0.1.7: {}
+  path-to-regexp@0.1.10: {}
 
   path-type@4.0.0: {}
 
@@ -8852,6 +8926,8 @@ snapshots:
     dependencies:
       find-up: 6.3.0
 
+  pofile@1.0.11: {}
+
   pofile@1.1.4: {}
 
   possible-typed-array-names@1.0.0: {}
@@ -9008,7 +9084,7 @@ snapshots:
       postcss: 8.4.45
       postcss-selector-parser: 6.1.2
 
-  postcss-opacity-percentage@2.0.0(postcss@8.4.45):
+  postcss-opacity-percentage@3.0.0(postcss@8.4.45):
     dependencies:
       postcss: 8.4.45
 
@@ -9026,7 +9102,7 @@ snapshots:
       postcss: 8.4.45
       postcss-value-parser: 4.2.0
 
-  postcss-preset-env@10.0.2(postcss@8.4.45):
+  postcss-preset-env@10.0.3(postcss@8.4.45):
     dependencies:
       '@csstools/postcss-cascade-layers': 5.0.0(postcss@8.4.45)
       '@csstools/postcss-color-function': 4.0.2(postcss@8.4.45)
@@ -9063,7 +9139,7 @@ snapshots:
       css-blank-pseudo: 7.0.0(postcss@8.4.45)
       css-has-pseudo: 7.0.0(postcss@8.4.45)
       css-prefers-color-scheme: 10.0.0(postcss@8.4.45)
-      cssdb: 8.1.0
+      cssdb: 8.1.1
       postcss: 8.4.45
       postcss-attribute-case-insensitive: 7.0.0(postcss@8.4.45)
       postcss-clamp: 4.1.0(postcss@8.4.45)
@@ -9083,7 +9159,7 @@ snapshots:
       postcss-lab-function: 7.0.2(postcss@8.4.45)
       postcss-logical: 8.0.0(postcss@8.4.45)
       postcss-nesting: 13.0.0(postcss@8.4.45)
-      postcss-opacity-percentage: 2.0.0(postcss@8.4.45)
+      postcss-opacity-percentage: 3.0.0(postcss@8.4.45)
       postcss-overflow-shorthand: 6.0.0(postcss@8.4.45)
       postcss-page-break: 3.0.4(postcss@8.4.45)
       postcss-place: 10.0.0(postcss@8.4.45)
@@ -9126,7 +9202,7 @@ snapshots:
     dependencies:
       nanoid: 3.3.7
       picocolors: 1.1.0
-      source-map-js: 1.2.0
+      source-map-js: 1.2.1
 
   prelude-ls@1.2.1: {}
 
@@ -9245,7 +9321,7 @@ snapshots:
       pug-strip-comments: 2.0.0
     optional: true
 
-  pump@3.0.0:
+  pump@3.0.2:
     dependencies:
       end-of-stream: 1.4.4
       once: 1.4.0
@@ -9269,10 +9345,6 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  qs@6.11.0:
-    dependencies:
-      side-channel: 1.0.6
-
   qs@6.13.0:
     dependencies:
       side-channel: 1.0.6
@@ -9532,7 +9604,7 @@ snapshots:
     dependencies:
       chokidar: 3.6.0
       immutable: 4.3.7
-      source-map-js: 1.2.0
+      source-map-js: 1.2.1
 
   schema-utils@3.3.0:
     dependencies:
@@ -9558,7 +9630,7 @@ snapshots:
 
   semver@7.6.3: {}
 
-  send@0.18.0:
+  send@0.19.0:
     dependencies:
       debug: 2.6.9
       depd: 2.0.0
@@ -9592,12 +9664,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  serve-static@1.15.0:
+  serve-static@1.16.2:
     dependencies:
-      encodeurl: 1.0.2
+      encodeurl: 2.0.0
       escape-html: 1.0.3
       parseurl: 1.3.3
-      send: 0.18.0
+      send: 0.19.0
     transitivePeerDependencies:
       - supports-color
 
@@ -9673,7 +9745,7 @@ snapshots:
 
   source-list-map@2.0.1: {}
 
-  source-map-js@1.2.0: {}
+  source-map-js@1.2.1: {}
 
   source-map-support@0.5.21:
     dependencies:
@@ -9769,7 +9841,7 @@ snapshots:
 
   strip-ansi@7.1.0:
     dependencies:
-      ansi-regex: 6.0.1
+      ansi-regex: 6.1.0
 
   strip-bom@3.0.0: {}
 
@@ -9886,10 +9958,10 @@ snapshots:
 
   tar-fs@3.0.6:
     dependencies:
-      pump: 3.0.0
+      pump: 3.0.2
       tar-stream: 3.1.7
     optionalDependencies:
-      bare-fs: 2.3.3
+      bare-fs: 2.3.4
       bare-path: 2.1.3
 
   tar-stream@3.1.7:
@@ -9904,10 +9976,10 @@ snapshots:
       jest-worker: 27.5.1
       schema-utils: 3.3.0
       serialize-javascript: 6.0.2
-      terser: 5.31.6
+      terser: 5.32.0
       webpack: 5.94.0(webpack-cli@5.1.4)
 
-  terser@5.31.6:
+  terser@5.32.0:
     dependencies:
       '@jridgewell/source-map': 0.3.6
       acorn: 8.12.1
@@ -9997,8 +10069,7 @@ snapshots:
 
   typed-query-selector@2.12.0: {}
 
-  typescript@5.5.4:
-    optional: true
+  typescript@5.5.4: {}
 
   uc.micro@2.1.0: {}
 
@@ -10085,35 +10156,35 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  vue-loader@17.4.2(@vue/compiler-sfc@3.5.3)(vue@3.5.3(typescript@5.5.4))(webpack@5.94.0(webpack-cli@5.1.4)):
+  vue-loader@17.4.2(@vue/compiler-sfc@3.5.4)(vue@3.5.4(typescript@5.5.4))(webpack@5.94.0(webpack-cli@5.1.4)):
     dependencies:
       chalk: 4.1.2
       hash-sum: 2.0.0
       watchpack: 2.4.2
       webpack: 5.94.0(webpack-cli@5.1.4)
     optionalDependencies:
-      '@vue/compiler-sfc': 3.5.3
-      vue: 3.5.3(typescript@5.5.4)
+      '@vue/compiler-sfc': 3.5.4
+      vue: 3.5.4(typescript@5.5.4)
 
-  vue-router@4.4.3(vue@3.5.3(typescript@5.5.4)):
+  vue-router@4.4.4(vue@3.5.4(typescript@5.5.4)):
     dependencies:
-      '@vue/devtools-api': 6.6.3
-      vue: 3.5.3(typescript@5.5.4)
+      '@vue/devtools-api': 6.6.4
+      vue: 3.5.4(typescript@5.5.4)
 
-  vue@3.5.3(typescript@5.5.4):
+  vue@3.5.4(typescript@5.5.4):
     dependencies:
-      '@vue/compiler-dom': 3.5.3
-      '@vue/compiler-sfc': 3.5.3
-      '@vue/runtime-dom': 3.5.3
-      '@vue/server-renderer': 3.5.3(vue@3.5.3(typescript@5.5.4))
-      '@vue/shared': 3.5.3
+      '@vue/compiler-dom': 3.5.4
+      '@vue/compiler-sfc': 3.5.4
+      '@vue/runtime-dom': 3.5.4
+      '@vue/server-renderer': 3.5.4(vue@3.5.4(typescript@5.5.4))
+      '@vue/shared': 3.5.4
     optionalDependencies:
       typescript: 5.5.4
 
-  vuex@4.1.0(vue@3.5.3(typescript@5.5.4)):
+  vuex@4.1.0(vue@3.5.4(typescript@5.5.4)):
     dependencies:
-      '@vue/devtools-api': 6.6.3
-      vue: 3.5.3(typescript@5.5.4)
+      '@vue/devtools-api': 6.6.4
+      vue: 3.5.4(typescript@5.5.4)
 
   watchpack@2.4.2:
     dependencies:
@@ -10169,7 +10240,7 @@ snapshots:
       colorette: 2.0.20
       compression: 1.7.4
       connect-history-api-fallback: 2.0.0
-      express: 4.19.2
+      express: 4.21.0
       graceful-fs: 4.2.11
       html-entities: 2.5.2
       http-proxy-middleware: 2.0.6(@types/express@4.17.21)
diff --git a/server/data_server.py b/server/data_server.py
index 54b7f63..0298b4c 100644
--- a/server/data_server.py
+++ b/server/data_server.py
@@ -568,7 +568,7 @@ def query_manuscripts():
     """Return manuscripts according to query."""
 
     status = request.args.get("status")
-    fulltext = request.args.get("fulltext")
+    fulltext = request.args.get("s")
     capit = request.args.get("capit")
     notbefore = request.args.get("notbefore")
     notafter = request.args.get("notafter")
diff --git a/server/db.py b/server/db.py
index 3563a07..c6e3364 100644
--- a/server/db.py
+++ b/server/db.py
@@ -128,7 +128,7 @@ def process(value):
 class Manuscripts(Base):
     r"""Manuscripts
 
-    .. pic:: sauml -i manuscripts
+    .. minilang:: sauml -i manuscripts
 
     """
 
@@ -153,7 +153,7 @@ class Manuscripts(Base):
 class MsParts(Base):
     r"""The parts of a manuscript
 
-    .. pic:: sauml -i msparts
+    .. minilang:: sauml -i msparts
 
     """
 
@@ -187,7 +187,7 @@ class Capitularies(Base):
 
     All capitularies catalogued according to BK or Mordek.
 
-    .. pic:: sauml -i capitularies
+    .. minilang:: sauml -i capitularies
 
     """
 
@@ -209,7 +209,7 @@ class Chapters(Base):
 
     All chapters catalogued according to BK or Mordek.
 
-    .. pic:: sauml -i chapters
+    .. minilang:: sauml -i chapters
 
     """
 
@@ -234,7 +234,7 @@ class MssCapitularies(Base):
     A finer granularity (chapters instead of capitularies) can be found in the
     :class:`MssChapters` table, albeit only already transcribed ones.
 
-    .. pic:: sauml -i mss_capitularies
+    .. minilang:: sauml -i mss_capitularies
 
     """
 
@@ -281,7 +281,7 @@ class MssChapters(Base):
     Note: The table :class:`MssCapitularies` relates manuscripts to
     capitularies yet untranscribed.
 
-    .. pic:: sauml -i mss_chapters
+    .. minilang:: sauml -i mss_chapters
 
     """
 
@@ -345,7 +345,7 @@ class MssChaptersText(Base):
     There may be more than one text extracted from the same chapter: the original
     hand and later corrector hands.
 
-    .. pic:: sauml -i mss_chapters_text
+    .. minilang:: sauml -i mss_chapters_text
 
     """
 
@@ -457,7 +457,7 @@ class GeoPlaces(Base):
 
     Data extracted from capitularia_geo.xml
 
-    .. pic:: sauml -s gis -i gis.geoplaces
+    .. minilang:: sauml -s gis -i gis.geoplaces
 
     """
 
@@ -478,7 +478,7 @@ class GeoPlacesNames(Base):
 
     Data extracted from capitularia_geo.xml
 
-    .. pic:: sauml -s gis -i gis.geoplaces_names
+    .. minilang:: sauml -s gis -i gis.geoplaces_names
 
     """
 
@@ -498,7 +498,7 @@ class GeoPlacesNames(Base):
 class MnManuscriptsGeoPlaces(Base):
     r"""The M:N relationship between manuscripts and geoplaces
 
-    .. pic:: sauml -s gis -i gis.mn_mss_geoplaces
+    .. minilang:: sauml -s gis -i gis.mn_mss_geoplaces
 
     """
 
@@ -521,7 +521,7 @@ class Geonames(Base):
 
     Data scraped from geonames.org et al. and cached here.
 
-    .. pic:: sauml -s gis -i gis.geonames
+    .. minilang:: sauml -s gis -i gis.geonames
 
     """
 
@@ -547,7 +547,7 @@ class Geonames(Base):
 class MnMsPartsGeonames(Base):
     r"""The M:N relationship between msparts and geonames
 
-    .. pic:: sauml -s gis -i gis.mn_msparts_geonames
+    .. minilang:: sauml -s gis -i gis.mn_msparts_geonames
 
     """
 
@@ -578,7 +578,7 @@ class GeoAreas(Base):
 
     Custom defined geographic areas
 
-    .. pic:: sauml -s gis -i gis.geoareas
+    .. minilang:: sauml -s gis -i gis.geoareas
 
     """
 
diff --git a/server/scripts/import_data.py b/server/scripts/import_data.py
index 26e1ec4..a023823 100755
--- a/server/scripts/import_data.py
+++ b/server/scripts/import_data.py
@@ -1,11 +1,12 @@
 #!/usr/bin/python3
 
-"""Insert and update data from TEI files into Postgres.
+"""Inserts and updates data from TEI files into Postgres.
 
-Call this tool from cron to keep the postgres database in sync with the data in
-the TEI file collection.
+- Inserts the contents of each single capitulary chapter into the Postgres database.
+- Inserts the geographic information into Postgres.
 
-Includes the geographic information tables.
+This tool is run at regular intervals by :program:`cron` to keep the postgres database
+in sync with the data in the TEI file collection.
 
 """
 
@@ -874,10 +875,7 @@ def import_fulltext(conn, filenames, mode):
                 # set bk-textzeuge's id
                 if fn.endswith("bk-textzeuge.xml"):
                     ms_id = common.BK_ZEUGE
-                title = tei.xpath(
-                    "normalize-space(tei:teiHeader/tei:fileDesc/tei:titleStmt/tei:title[@type='main'])",
-                    namespaces=NS,
-                )
+
                 solr = []
 
                 for item in tei.xpath(
@@ -976,6 +974,17 @@ def import_fulltext(conn, filenames, mode):
                                 )
 
                         if mode == "solr" and params["ms_id"] != common.BK_ZEUGE:
+                            res = execute(
+                                conn,
+                                """
+                            SELECT title
+                            FROM manuscripts
+                            WHERE ms_id = :ms_id
+                            """,
+                                params,
+                            )
+                            title = res.scalar() or ""
+
                             res = execute(
                                 conn,
                                 """
@@ -1002,7 +1011,7 @@ def import_fulltext(conn, filenames, mode):
                             params["notafter"] = row[2]
                             params["places"] = get_parent_places(conn, row[3])
 
-                            params["title_de"] = title
+                            params["title_de"] = common.normalize_space(title.strip())
                             params["text_la"] = item.text
                             params["cap_id_chapter"] = fix_id(f"{cap_id}-{chapter}")
                             params["id"] = fix_id(
@@ -1039,7 +1048,7 @@ def import_fulltext(conn, filenames, mode):
             log(logging.ERROR, "Parsing %s ...\n%s" % (fn, str(e)))
 
 
-def build_parser(default_config_file):
+def build_parser(default_config_file="server.conf"):
     """Build the commandline parser."""
 
     parser = common.build_parser(default_config_file, __doc__)
@@ -1051,25 +1060,40 @@ def build_parser(default_config_file):
         default=False,
     )
     parser.add_argument(
-        "--mss", nargs="+", help="the manuscript files (or the corpus file) to import"
+        "--mss",
+        nargs="+",
+        metavar="FILES",
+        help="the manuscript files (or the corpus file) to import",
     )
     parser.add_argument(
-        "--cap-list", nargs="+", help="the capitularies lists to import"
+        "--cap-list",
+        nargs="+",
+        metavar="FILES",
+        help="the capitularies lists to import",
     )
     parser.add_argument(
-        "--extracted", nargs="*", help="import per-chapter extracted XML from files"
+        "--extracted",
+        nargs="+",
+        metavar="FILES",
+        help="import per-chapter extracted XML from files",
     )
     parser.add_argument(
-        "--fulltext", nargs="*", help="import per-chapter extracted fulltext from files"
+        "--fulltext",
+        nargs="+",
+        metavar="FILES",
+        help="import per-chapter extracted fulltext from files",
     )
     parser.add_argument(
         "--solr",
-        nargs="*",
-        metavar="FULLTEXT",
+        nargs="+",
+        metavar="FILES",
         help="index per-chapter extracted fulltext from files with Solr",
     )
     parser.add_argument(
-        "--geoareas", nargs="+", help="import geoareas from geojson file"
+        "--geoareas",
+        nargs="+",
+        metavar="FILES",
+        help="import geoareas from geojson file",
     )
     parser.add_argument(
         "--publish",
@@ -1098,7 +1122,7 @@ def build_parser(default_config_file):
 
 
 if __name__ == "__main__":
-    build_parser("server.conf").parse_args(namespace=args)
+    build_parser().parse_args(namespace=args)
     args.config = config_from_pyfile(args.config_file)
 
     handlers = [
diff --git a/server/scripts/import_solr.py b/server/scripts/import_solr.py
index 411ca74..d5f3eee 100644
--- a/server/scripts/import_solr.py
+++ b/server/scripts/import_solr.py
@@ -1,12 +1,11 @@
 #!/usr/bin/python3
 
-"""Indexes TEI files and Wordpress pages into Solr
+"""Indexes TEI files and Wordpress pages into Solr.
 
-This tool can:
+- Connects to the Wordpress mysql database and indexes all pages and posts to Solr.
+- Indexes the header (Mordek) sections of TEI files to Solr.
 
-  - Connect directly to the Wordpress mysql database and index all pages and posts to
-    Solr.
-  - Index the header sections of TEI files to Solr.
+This program is run nightly by :program:`cron`.
 
 """
 
@@ -264,7 +263,7 @@ def tei2solr():
                 log(logging.ERROR, f"Error: {fn} {str(e)}")
 
 
-def build_parser(default_config_file):
+def build_parser(default_config_file="server.conf"):
     """Build the commandline parser."""
 
     parser = common.build_parser(default_config_file, __doc__)
@@ -286,7 +285,7 @@ def build_parser(default_config_file):
 
 
 if __name__ == "__main__":
-    build_parser("server.conf").parse_args(namespace=args)
+    build_parser().parse_args(namespace=args)
     args.config = config_from_pyfile(args.config_file)
 
     handlers = [
diff --git a/server/solr_server.py b/server/solr_server.py
index 18d9ffb..3f43f5b 100644
--- a/server/solr_server.py
+++ b/server/solr_server.py
@@ -73,6 +73,7 @@
 
 """
 
+import logging
 from urllib.parse import urljoin
 
 import requests
@@ -136,6 +137,7 @@ def select():
         "q.op": "AND",
         "qf": "text_la text_de text_en",
         "defType": "edismax",
+        # "fl": "ms_id cap_id mscap_n chapter type ms_id_part notbefore notafter places cap_id_chapter id category post_status title_de score",
         "fl": "* score",
         "hl": "true",
         "hl.tag.pre": "<mark>",
@@ -155,4 +157,5 @@ def select():
     url = urljoin(current_app.config["SOLR_URL"], "select")
 
     r = requests.get(url, params=params)
+    # logging.info(r.content)
     return r.content
diff --git a/themes/Capitularia/header.php b/themes/Capitularia/header.php
index b3bcccb..136cb66 100644
--- a/themes/Capitularia/header.php
+++ b/themes/Capitularia/header.php
@@ -82,7 +82,10 @@
                 <tr>
                   <td>
                     <input id="searchinput" class="sword" type="text" name="s"
-                        <?php echo_attribute ('placeholder', __ ('Search', 'capitularia')); ?> />
+                        <?php
+                            echo_attribute ('value', $_GET['s']);
+                            echo_attribute ('placeholder', __ ('Search', 'capitularia')); ?>
+                        />
                   </td>
                   <td class="submit-cell">
                     <button id="searchsubmit" class="submit" type="submit" name="submit"></button>
diff --git a/themes/Capitularia/src/languages/capitularia.pot b/themes/Capitularia/src/languages/capitularia.pot
index 7c8184f..6c4b1c8 100644
--- a/themes/Capitularia/src/languages/capitularia.pot
+++ b/themes/Capitularia/src/languages/capitularia.pot
@@ -10,7 +10,7 @@ msgstr ""
 "#-#-#-#-#  php.pot (Capitularia 2.0)  #-#-#-#-#\n"
 "Project-Id-Version: Capitularia 2.0\n"
 "Report-Msgid-Bugs-To: marcello@perathoner.de\n"
-"POT-Creation-Date: 2024-09-08 15:12+0200\n"
+"POT-Creation-Date: 2024-09-12 09:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -99,7 +99,7 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: header.php:85
+#: header.php:87
 msgid "Search"
 msgstr ""
 
diff --git a/themes/Capitularia/src/languages/de_DE.po b/themes/Capitularia/src/languages/de_DE.po
index 0e4c505..ce0228a 100644
--- a/themes/Capitularia/src/languages/de_DE.po
+++ b/themes/Capitularia/src/languages/de_DE.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: @cceh/capitularia 0.1.0\n"
 "Report-Msgid-Bugs-To: marcello@perathoner.de\n"
-"POT-Creation-Date: 2024-09-08 15:12+0200\n"
-"PO-Revision-Date: 2024-04-25 17:41+0200\n"
+"POT-Creation-Date: 2024-09-12 09:08+0200\n"
+"PO-Revision-Date: 2024-09-12 22:59+0200\n"
 "Last-Translator: Marcello Perathoner <marcello@perathoner.de>\n"
 "Language-Team: German <>\n"
 "Language: de_DE\n"
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.4.2\n"
+"X-Generator: Poedit 3.5\n"
 
 #: functions-include.php:97
 #, php-format
@@ -87,7 +87,7 @@ msgstr "November"
 msgid "December"
 msgstr "Dezember"
 
-#: header.php:85
+#: header.php:87
 msgid "Search"
 msgstr "Suchen"
 
diff --git a/themes/Capitularia/src/languages/php.pot b/themes/Capitularia/src/languages/php.pot
index 9e8bddb..fd51cf4 100644
--- a/themes/Capitularia/src/languages/php.pot
+++ b/themes/Capitularia/src/languages/php.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Capitularia 2.0\n"
 "Report-Msgid-Bugs-To: marcello@perathoner.de\n"
-"POT-Creation-Date: 2024-09-08 15:12+0200\n"
+"POT-Creation-Date: 2024-09-12 09:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -92,7 +92,7 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: header.php:85
+#: header.php:87
 msgid "Search"
 msgstr ""
 
diff --git a/variables.mak b/variables.mak
index b5a070a..fdd6755 100644
--- a/variables.mak
+++ b/variables.mak
@@ -22,8 +22,9 @@ HOST_PRJ_DIR := $(HOST_ROOT):~/prj/capitularia/capitularia
 HOST_SERVER  := $(HOST_PRJ_DIR)/server
 HOST_XSLT    := $(HOST_PRJ_DIR)/xslt
 
+NODEJS       := node
 NODE_MODULES := $(ROOT)/node_modules
-NODE         := $(NODE_MODULES)/.bin
+NODE_BIN_DIR := $(NODE_MODULES)/.bin
 PYTHON       := $(ROOT)/.venv/bin/python3
 
 SOLR_INST    := $(HOME)/solr/solr
@@ -31,35 +32,37 @@ SOLR         := $(SOLR_INST)/bin/solr
 
 NAT_EARTH    := https://naciscdn.org/naturalearth
 
-WEBPACK             = $(NODE)/webpack --no-color
-WEBPACK_DEV_SERVER  = $(NODE)/webpack serve --no-color
+WEBPACK             = $(NODE_BIN_DIR)/webpack --no-color
+WEBPACK_DEV_SERVER  = $(NODE_BIN_DIR)/webpack serve --no-color
 WEBPACK_DEV_CONFIG  = webpack.dev.js
 WEBPACK_PROD_CONFIG = webpack.prod.js
 
-BABEL           = $(NODE)/babel
+BABEL           = $(NODE_BIN_DIR)/babel
 BABELFLAGS      = --source-maps true
-SASS            = $(NODE)/sass
+SASS            = $(NODE_BIN_DIR)/sass
 SASSFLAGS       = -I $(CSS_SRC)
-POSTCSS         = $(NODE)/postcss
+POSTCSS         = $(NODE_BIN_DIR)/postcss
 POSTCSSFLAGS    =
-ESLINT         := $(NODE)/eslint
+ESLINT         := $(NODE_BIN_DIR)/eslint
 ESLINTFLAGS     = -f unix
-JSHINT         := $(NODE)/jshint
+JSHINT         := $(NODE_BIN_DIR)/jshint
 JSHINTFLAGS     = --reporter=unix
-STYLELINT       = $(NODE)/stylelint $(STYLELINTFLAGS)
+STYLELINT       = $(NODE_BIN_DIR)/stylelint $(STYLELINTFLAGS)
 STYLELINTFLAGS  = -f unix
 RSYNC          := rsync -v -crlptz --exclude='*~' --exclude='.*'
 RSYNCPY        := $(RSYNC) --exclude "**/__pycache__"  --exclude "*.pyc" --exclude "*.log"
 WP_CLI         := $(LOCALFS)/wp
 PO2JSON        := $(ROOT)/python/po2json.py
-EASYGETTEXT    := $(NODE)/gettext-extract --attribute v-translate
+EASYGETTEXT    := $(NODE_BIN_DIR)/gettext-extract --attribute v-translate
+JSGETTEXT      := $(NODEJS) docs/cap-gettext-extractor.mjs
+VUEGETTEXT     := $(JSGETTEXT)
 XGETTEXT       := xgettext --default-domain=capitularia --from-code=utf-8 \
 	--copyright-holder="CCeH Cologne" --package-name=Capitularia --package-version=2.0 \
 	--msgid-bugs-address=marcello@perathoner.de \
 	-k'__' -k'_e' -k'_n:1,2' -k'_x:1,2c' -k'_ex:1,2c'
 
 PHPDOC         := vendor/phpdoc
-JSDOC          := $(NODE)/jsdoc
+JSDOC          := $(NODE_BIN_DIR)/jsdoc
 
 MYSQL_REMOTE     := mysql --defaults-file=~/.my.cnf.capitularia
 MYSQL_LOCAL      := mysql --defaults-file=~/.my.cnf.capitularia-local