diff -pruN 5.94.0-1/autotests/folding/highlight.php.fold 5.96.0-1/autotests/folding/highlight.php.fold
--- 5.94.0-1/autotests/folding/highlight.php.fold	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/folding/highlight.php.fold	2022-07-02 16:03:19.000000000 +0000
@@ -107,10 +107,13 @@ echo <beginfold id='18'><<<'HTML'</begin
 <endfold id='18'>HTML</endfold id='18'>;
 echo <beginfold id='16'><<<DOC</beginfold id='16'>
 <p>bla $var \$var bla\'</p>
- DOC
- DOC;
-DOC;blah
 <endfold id='16'>DOC</endfold id='16'>;
+echo <beginfold id='16'><<<DOC</beginfold id='16'>
+		<p>bla $var \$var bla\'</p>
+<endfold id='16'>	DOC</endfold id='16'>;
+echo <beginfold id='16'><<<DOC</beginfold id='16'>
+    <p>bla $var \$var bla\'</p>
+<endfold id='16'>  DOC</endfold id='16'>;
 
 echo 123456 1_2_34_5 1__2 1_;
 echo 0x12345af 0x1_2_3_45_a_f 0x1__2 0x_1 0x1_ 0x1g 0xg;
diff -pruN 5.94.0-1/autotests/folding/highlight.sh.fold 5.96.0-1/autotests/folding/highlight.sh.fold
--- 5.94.0-1/autotests/folding/highlight.sh.fold	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/folding/highlight.sh.fold	2022-07-02 16:03:19.000000000 +0000
@@ -248,6 +248,12 @@ pacman -syu --needed intel-ucode grub
 # Braces (bug ##387915)
 <beginfold id='1'>[[</beginfold id='1'> $line_name =~ \{([0-9]{1,})\}\{([0-9]{1,})\}(.*) <endfold id='1'>]]</endfold id='1'>
 <beginfold id='1'>[[</beginfold id='1'> $name =~ (.*)_(S[0-9]{2})(E[0-9]{2,3}[a-z]{0,1})_(.*) <endfold id='1'>]]</endfold id='1'>
+# Comments in Braces (bug 450878)
+<beginfold id='1'>[[</beginfold id='1'> # comment 1
+   1 == 1 # comment 2
+   # comment 3
+<endfold id='1'>]]</endfold id='1'>
+
 rm /data/{hello1,hello2}/input/{bye1,$bye2}/si{a,${b},c{k,p{e,a}}}/*.non
 rm /data/{aa,{e,i}t{b,c} # Not closed
 rm /data/{aa,{e,i}t{b,c}}
diff -pruN 5.94.0-1/autotests/folding/systemd-unit.service.fold 5.96.0-1/autotests/folding/systemd-unit.service.fold
--- 5.94.0-1/autotests/folding/systemd-unit.service.fold	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/folding/systemd-unit.service.fold	2022-07-02 16:03:19.000000000 +0000
@@ -92,6 +92,7 @@ OOMPolicy = stop
 ## from systemd.exec
 ExecPaths = some/path some/other/path
 ExtensionImages = /source/path
+ExtensionDirectories = /source/path
 IPCNamespacePath = /some/absolute/path
 NoExecPaths = some/path some/other/path
 PrivateIPC = false
@@ -1432,6 +1433,7 @@ ExecStart = @!!+/some/cmd arg
 SuccessExitStatus = 75
 SuccessExitStatus = ADDRESS_FAMILIES
 SuccessExitStatus = APPARMOR
+SuccessExitStatus = BPF
 SuccessExitStatus = CACHE_DIRECTORY
 SuccessExitStatus = CANTCREAT
 SuccessExitStatus = CAPABILITIES
diff -pruN 5.94.0-1/autotests/foldingtest.cpp 5.96.0-1/autotests/foldingtest.cpp
--- 5.94.0-1/autotests/foldingtest.cpp	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/foldingtest.cpp	2022-07-02 16:03:19.000000000 +0000
@@ -6,11 +6,11 @@
 
 #include "test-config.h"
 
-#include <abstracthighlighter.h>
-#include <definition.h>
-#include <foldingregion.h>
-#include <repository.h>
-#include <state.h>
+#include <KSyntaxHighlighting/AbstractHighlighter>
+#include <KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/FoldingRegion>
+#include <KSyntaxHighlighting/Repository>
+#include <KSyntaxHighlighting/State>
 
 #include <QDir>
 #include <QFile>
diff -pruN 5.94.0-1/autotests/highlighter_benchmark.cpp 5.96.0-1/autotests/highlighter_benchmark.cpp
--- 5.94.0-1/autotests/highlighter_benchmark.cpp	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/highlighter_benchmark.cpp	2022-07-02 16:03:19.000000000 +0000
@@ -6,11 +6,11 @@
 
 #include "test-config.h"
 
-#include <abstracthighlighter.h>
-#include <definition.h>
-#include <format.h>
-#include <repository.h>
-#include <state.h>
+#include <KSyntaxHighlighting/AbstractHighlighter>
+#include <KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/Format>
+#include <KSyntaxHighlighting/Repository>
+#include <KSyntaxHighlighting/State>
 
 #include <QDir>
 #include <QObject>
diff -pruN 5.94.0-1/autotests/html/highlight.php.dark.html 5.96.0-1/autotests/html/highlight.php.dark.html
--- 5.94.0-1/autotests/html/highlight.php.dark.html	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/html/highlight.php.dark.html	2022-07-02 16:03:19.000000000 +0000
@@ -113,10 +113,13 @@
 <span style="color:#da4453;">HTML</span>;
 <span style="font-weight:bold;">echo</span> <span style="color:#da4453;">&lt;&lt;&lt;DOC</span>
 <span style="color:#f44f4f;">&lt;p&gt;bla </span><span style="color:#27aeae;">$var</span><span style="color:#f44f4f;"> \</span><span style="color:#27aeae;">$var</span><span style="color:#f44f4f;"> bla\'&lt;/p&gt;</span>
-<span style="color:#f44f4f;"> DOC</span>
-<span style="color:#f44f4f;"> DOC;</span>
-<span style="color:#f44f4f;">DOC;blah</span>
 <span style="color:#da4453;">DOC</span>;
+<span style="font-weight:bold;">echo</span> <span style="color:#da4453;">&lt;&lt;&lt;DOC</span>
+<span style="color:#f44f4f;">		&lt;p&gt;bla </span><span style="color:#27aeae;">$var</span><span style="color:#f44f4f;"> \</span><span style="color:#27aeae;">$var</span><span style="color:#f44f4f;"> bla\'&lt;/p&gt;</span>
+<span style="color:#da4453;">	DOC</span>;
+<span style="font-weight:bold;">echo</span> <span style="color:#da4453;">&lt;&lt;&lt;DOC</span>
+<span style="color:#f44f4f;">    &lt;p&gt;bla </span><span style="color:#27aeae;">$var</span><span style="color:#f44f4f;"> \</span><span style="color:#27aeae;">$var</span><span style="color:#f44f4f;"> bla\'&lt;/p&gt;</span>
+<span style="color:#da4453;">  DOC</span>;
 
 <span style="font-weight:bold;">echo</span> <span style="color:#f67400;">123456</span> <span style="color:#f67400;">1_2_34_5</span> <span style="color:#da4453;text-decoration:underline;">1</span>__2 <span style="color:#da4453;text-decoration:underline;">1</span>_<span style="color:#27ae60;">;</span>
 <span style="font-weight:bold;">echo</span> <span style="color:#f67400;">0x12345af</span> <span style="color:#f67400;">0x1_2_3_45_a_f</span> <span style="color:#da4453;text-decoration:underline;">0</span>x1__2 <span style="color:#da4453;text-decoration:underline;">0</span>x_1 <span style="color:#da4453;text-decoration:underline;">0</span>x1_ <span style="color:#da4453;text-decoration:underline;">0</span>x1g <span style="color:#da4453;text-decoration:underline;">0</span>xg<span style="color:#27ae60;">;</span>
diff -pruN 5.94.0-1/autotests/html/highlight.php.html 5.96.0-1/autotests/html/highlight.php.html
--- 5.94.0-1/autotests/html/highlight.php.html	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/html/highlight.php.html	2022-07-02 16:03:19.000000000 +0000
@@ -113,10 +113,13 @@
 <span style="color:#e31616;">HTML</span>;
 <span style="font-weight:bold;">echo</span> <span style="color:#ff5500;">&lt;&lt;&lt;DOC</span>
 <span style="color:#bf0303;">&lt;p&gt;bla </span><span style="color:#0057ae;">$var</span><span style="color:#bf0303;"> \</span><span style="color:#0057ae;">$var</span><span style="color:#bf0303;"> bla\'&lt;/p&gt;</span>
-<span style="color:#bf0303;"> DOC</span>
-<span style="color:#bf0303;"> DOC;</span>
-<span style="color:#bf0303;">DOC;blah</span>
 <span style="color:#ff5500;">DOC</span>;
+<span style="font-weight:bold;">echo</span> <span style="color:#ff5500;">&lt;&lt;&lt;DOC</span>
+<span style="color:#bf0303;">		&lt;p&gt;bla </span><span style="color:#0057ae;">$var</span><span style="color:#bf0303;"> \</span><span style="color:#0057ae;">$var</span><span style="color:#bf0303;"> bla\'&lt;/p&gt;</span>
+<span style="color:#ff5500;">	DOC</span>;
+<span style="font-weight:bold;">echo</span> <span style="color:#ff5500;">&lt;&lt;&lt;DOC</span>
+<span style="color:#bf0303;">    &lt;p&gt;bla </span><span style="color:#0057ae;">$var</span><span style="color:#bf0303;"> \</span><span style="color:#0057ae;">$var</span><span style="color:#bf0303;"> bla\'&lt;/p&gt;</span>
+<span style="color:#ff5500;">  DOC</span>;
 
 <span style="font-weight:bold;">echo</span> <span style="color:#b08000;">123456</span> <span style="color:#b08000;">1_2_34_5</span> <span style="color:#bf0303;text-decoration:underline;">1</span>__2 <span style="color:#bf0303;text-decoration:underline;">1</span>_<span style="color:#006e28;">;</span>
 <span style="font-weight:bold;">echo</span> <span style="color:#b08000;">0x12345af</span> <span style="color:#b08000;">0x1_2_3_45_a_f</span> <span style="color:#bf0303;text-decoration:underline;">0</span>x1__2 <span style="color:#bf0303;text-decoration:underline;">0</span>x_1 <span style="color:#bf0303;text-decoration:underline;">0</span>x1_ <span style="color:#bf0303;text-decoration:underline;">0</span>x1g <span style="color:#bf0303;text-decoration:underline;">0</span>xg<span style="color:#006e28;">;</span>
diff -pruN 5.94.0-1/autotests/html/highlight.sh.dark.html 5.96.0-1/autotests/html/highlight.sh.dark.html
--- 5.94.0-1/autotests/html/highlight.sh.dark.html	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/html/highlight.sh.dark.html	2022-07-02 16:03:19.000000000 +0000
@@ -254,6 +254,12 @@
 <span style="color:#7a7c7d;"># Braces (bug ##387915)</span>
 <span style="font-weight:bold;">[[</span> <span style="color:#27aeae;">$line_name</span> <span style="color:#27ae60;">=~</span> <span style="color:#2980b9;">\{</span><span style="color:#3f8058;">([</span><span style="color:#da4453;">0</span><span style="color:#3f8058;">-</span><span style="color:#da4453;">9</span><span style="color:#3f8058;">]</span><span style="color:#27aeae;">{</span><span style="color:#f67400;">1</span><span style="color:#3f8058;">,</span><span style="color:#27aeae;">}</span><span style="color:#3f8058;">)</span><span style="color:#2980b9;">\}\{</span><span style="color:#3f8058;">([</span><span style="color:#da4453;">0</span><span style="color:#3f8058;">-</span><span style="color:#da4453;">9</span><span style="color:#3f8058;">]</span><span style="color:#27aeae;">{</span><span style="color:#f67400;">1</span><span style="color:#3f8058;">,</span><span style="color:#27aeae;">}</span><span style="color:#3f8058;">)</span><span style="color:#2980b9;">\}</span><span style="color:#3f8058;">(</span><span style="color:#27ae60;">.*</span><span style="color:#3f8058;">)</span> <span style="font-weight:bold;">]]</span>
 <span style="font-weight:bold;">[[</span> <span style="color:#27aeae;">$name</span> <span style="color:#27ae60;">=~</span> <span style="color:#3f8058;">(</span><span style="color:#27ae60;">.*</span><span style="color:#3f8058;">)</span><span style="color:#da4453;">_</span><span style="color:#3f8058;">(</span><span style="color:#da4453;">S</span><span style="color:#3f8058;">[</span><span style="color:#da4453;">0</span><span style="color:#3f8058;">-</span><span style="color:#da4453;">9</span><span style="color:#3f8058;">]</span><span style="color:#27aeae;">{</span><span style="color:#f67400;">2</span><span style="color:#27aeae;">}</span><span style="color:#3f8058;">)(</span><span style="color:#da4453;">E</span><span style="color:#3f8058;">[</span><span style="color:#da4453;">0</span><span style="color:#3f8058;">-</span><span style="color:#da4453;">9</span><span style="color:#3f8058;">]</span><span style="color:#27aeae;">{</span><span style="color:#f67400;">2</span><span style="color:#3f8058;">,</span><span style="color:#f67400;">3</span><span style="color:#27aeae;">}</span><span style="color:#3f8058;">[</span><span style="color:#da4453;">a</span><span style="color:#3f8058;">-</span><span style="color:#da4453;">z</span><span style="color:#3f8058;">]</span><span style="color:#27aeae;">{</span><span style="color:#f67400;">0</span><span style="color:#3f8058;">,</span><span style="color:#f67400;">1</span><span style="color:#27aeae;">}</span><span style="color:#3f8058;">)</span><span style="color:#da4453;">_</span><span style="color:#3f8058;">(</span><span style="color:#27ae60;">.*</span><span style="color:#3f8058;">)</span> <span style="font-weight:bold;">]]</span>
+<span style="color:#7a7c7d;"># Comments in Braces (bug 450878)</span>
+<span style="font-weight:bold;">[[</span> <span style="color:#7a7c7d;"># comment 1</span>
+   1 <span style="color:#27ae60;">==</span> 1 <span style="color:#7a7c7d;"># comment 2</span>
+   <span style="color:#7a7c7d;"># comment 3</span>
+<span style="font-weight:bold;">]]</span>
+
 <span style="color:#8e44ad;">rm</span> /data/<span style="color:#2980b9;">{hello1</span><span style="color:#3f8058;">,</span><span style="color:#2980b9;">hello2}</span>/input/<span style="color:#2980b9;">{bye1</span><span style="color:#3f8058;">,</span><span style="color:#27aeae;">$bye2</span><span style="color:#2980b9;">}</span>/si<span style="color:#2980b9;">{a</span><span style="color:#3f8058;">,</span><span style="color:#27aeae;">${</span><span style="color:#27aeae;">b</span><span style="color:#27aeae;">}</span><span style="color:#3f8058;">,</span><span style="color:#2980b9;">c{k</span><span style="color:#3f8058;">,</span><span style="color:#2980b9;">p{e</span><span style="color:#3f8058;">,</span><span style="color:#2980b9;">a}}}</span>/<span style="color:#27ae60;">*</span>.non
 <span style="color:#8e44ad;">rm</span> /data/{aa,<span style="color:#2980b9;">{e</span><span style="color:#3f8058;">,</span><span style="color:#2980b9;">i}</span>t<span style="color:#2980b9;">{b</span><span style="color:#3f8058;">,</span><span style="color:#2980b9;">c}</span> <span style="color:#7a7c7d;"># Not closed</span>
 <span style="color:#8e44ad;">rm</span> /data/<span style="color:#2980b9;">{aa</span><span style="color:#3f8058;">,</span><span style="color:#2980b9;">{e</span><span style="color:#3f8058;">,</span><span style="color:#2980b9;">i}t{b</span><span style="color:#3f8058;">,</span><span style="color:#2980b9;">c}}</span>
diff -pruN 5.94.0-1/autotests/html/highlight.sh.html 5.96.0-1/autotests/html/highlight.sh.html
--- 5.94.0-1/autotests/html/highlight.sh.html	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/html/highlight.sh.html	2022-07-02 16:03:19.000000000 +0000
@@ -254,6 +254,12 @@
 <span style="color:#898887;"># Braces (bug ##387915)</span>
 <span style="font-weight:bold;">[[</span> <span style="color:#0057ae;">$line_name</span> <span style="color:#006e28;">=~</span> <span style="color:#0057ae;">\{</span><span style="color:#ca60ca;">([</span><span style="color:#ff5500;">0</span><span style="color:#ca60ca;">-</span><span style="color:#ff5500;">9</span><span style="color:#ca60ca;">]</span><span style="color:#0057ae;">{</span><span style="color:#b08000;">1</span><span style="color:#ca60ca;">,</span><span style="color:#0057ae;">}</span><span style="color:#ca60ca;">)</span><span style="color:#0057ae;">\}\{</span><span style="color:#ca60ca;">([</span><span style="color:#ff5500;">0</span><span style="color:#ca60ca;">-</span><span style="color:#ff5500;">9</span><span style="color:#ca60ca;">]</span><span style="color:#0057ae;">{</span><span style="color:#b08000;">1</span><span style="color:#ca60ca;">,</span><span style="color:#0057ae;">}</span><span style="color:#ca60ca;">)</span><span style="color:#0057ae;">\}</span><span style="color:#ca60ca;">(</span><span style="color:#006e28;">.*</span><span style="color:#ca60ca;">)</span> <span style="font-weight:bold;">]]</span>
 <span style="font-weight:bold;">[[</span> <span style="color:#0057ae;">$name</span> <span style="color:#006e28;">=~</span> <span style="color:#ca60ca;">(</span><span style="color:#006e28;">.*</span><span style="color:#ca60ca;">)</span><span style="color:#ff5500;">_</span><span style="color:#ca60ca;">(</span><span style="color:#ff5500;">S</span><span style="color:#ca60ca;">[</span><span style="color:#ff5500;">0</span><span style="color:#ca60ca;">-</span><span style="color:#ff5500;">9</span><span style="color:#ca60ca;">]</span><span style="color:#0057ae;">{</span><span style="color:#b08000;">2</span><span style="color:#0057ae;">}</span><span style="color:#ca60ca;">)(</span><span style="color:#ff5500;">E</span><span style="color:#ca60ca;">[</span><span style="color:#ff5500;">0</span><span style="color:#ca60ca;">-</span><span style="color:#ff5500;">9</span><span style="color:#ca60ca;">]</span><span style="color:#0057ae;">{</span><span style="color:#b08000;">2</span><span style="color:#ca60ca;">,</span><span style="color:#b08000;">3</span><span style="color:#0057ae;">}</span><span style="color:#ca60ca;">[</span><span style="color:#ff5500;">a</span><span style="color:#ca60ca;">-</span><span style="color:#ff5500;">z</span><span style="color:#ca60ca;">]</span><span style="color:#0057ae;">{</span><span style="color:#b08000;">0</span><span style="color:#ca60ca;">,</span><span style="color:#b08000;">1</span><span style="color:#0057ae;">}</span><span style="color:#ca60ca;">)</span><span style="color:#ff5500;">_</span><span style="color:#ca60ca;">(</span><span style="color:#006e28;">.*</span><span style="color:#ca60ca;">)</span> <span style="font-weight:bold;">]]</span>
+<span style="color:#898887;"># Comments in Braces (bug 450878)</span>
+<span style="font-weight:bold;">[[</span> <span style="color:#898887;"># comment 1</span>
+   1 <span style="color:#006e28;">==</span> 1 <span style="color:#898887;"># comment 2</span>
+   <span style="color:#898887;"># comment 3</span>
+<span style="font-weight:bold;">]]</span>
+
 <span style="color:#644a9b;">rm</span> /data/<span style="color:#0057ae;">{hello1</span><span style="color:#ca60ca;">,</span><span style="color:#0057ae;">hello2}</span>/input/<span style="color:#0057ae;">{bye1</span><span style="color:#ca60ca;">,</span><span style="color:#0057ae;">$bye2</span><span style="color:#0057ae;">}</span>/si<span style="color:#0057ae;">{a</span><span style="color:#ca60ca;">,</span><span style="color:#0057ae;">${</span><span style="color:#0057ae;">b</span><span style="color:#0057ae;">}</span><span style="color:#ca60ca;">,</span><span style="color:#0057ae;">c{k</span><span style="color:#ca60ca;">,</span><span style="color:#0057ae;">p{e</span><span style="color:#ca60ca;">,</span><span style="color:#0057ae;">a}}}</span>/<span style="color:#006e28;">*</span>.non
 <span style="color:#644a9b;">rm</span> /data/{aa,<span style="color:#0057ae;">{e</span><span style="color:#ca60ca;">,</span><span style="color:#0057ae;">i}</span>t<span style="color:#0057ae;">{b</span><span style="color:#ca60ca;">,</span><span style="color:#0057ae;">c}</span> <span style="color:#898887;"># Not closed</span>
 <span style="color:#644a9b;">rm</span> /data/<span style="color:#0057ae;">{aa</span><span style="color:#ca60ca;">,</span><span style="color:#0057ae;">{e</span><span style="color:#ca60ca;">,</span><span style="color:#0057ae;">i}t{b</span><span style="color:#ca60ca;">,</span><span style="color:#0057ae;">c}}</span>
diff -pruN 5.94.0-1/autotests/html/systemd-unit.service.dark.html 5.96.0-1/autotests/html/systemd-unit.service.dark.html
--- 5.94.0-1/autotests/html/systemd-unit.service.dark.html	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/html/systemd-unit.service.dark.html	2022-07-02 16:03:19.000000000 +0000
@@ -98,6 +98,7 @@
 <span style="color:#7a7c7d;">## from systemd.exec</span>
 <span style="color:#2980b9;">ExecPaths</span> = some/path some/other/path
 <span style="color:#2980b9;">ExtensionImages</span> = /source/path
+<span style="color:#2980b9;">ExtensionDirectories</span> = /source/path
 <span style="color:#2980b9;">IPCNamespacePath</span> = /some/absolute/path
 <span style="color:#2980b9;">NoExecPaths</span> = some/path some/other/path
 <span style="color:#2980b9;">PrivateIPC</span> = <span style="color:#27aeae;font-weight:bold;">false</span>
@@ -1438,6 +1439,7 @@ WantedBy = some.service some.socket
 <span style="color:#2980b9;">SuccessExitStatus</span> = <span style="color:#f67400;">75</span>
 <span style="color:#2980b9;">SuccessExitStatus</span> = <span style="color:#27aeae;font-weight:bold;">ADDRESS_FAMILIES</span>
 <span style="color:#2980b9;">SuccessExitStatus</span> = <span style="color:#27aeae;font-weight:bold;">APPARMOR</span>
+<span style="color:#2980b9;">SuccessExitStatus</span> = <span style="color:#27aeae;font-weight:bold;">BPF</span>
 <span style="color:#2980b9;">SuccessExitStatus</span> = <span style="color:#27aeae;font-weight:bold;">CACHE_DIRECTORY</span>
 <span style="color:#2980b9;">SuccessExitStatus</span> = <span style="color:#27aeae;font-weight:bold;">CANTCREAT</span>
 <span style="color:#2980b9;">SuccessExitStatus</span> = <span style="color:#27aeae;font-weight:bold;">CAPABILITIES</span>
diff -pruN 5.94.0-1/autotests/html/systemd-unit.service.html 5.96.0-1/autotests/html/systemd-unit.service.html
--- 5.94.0-1/autotests/html/systemd-unit.service.html	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/html/systemd-unit.service.html	2022-07-02 16:03:19.000000000 +0000
@@ -98,6 +98,7 @@
 <span style="color:#898887;">## from systemd.exec</span>
 <span style="color:#0057ae;">ExecPaths</span> = some/path some/other/path
 <span style="color:#0057ae;">ExtensionImages</span> = /source/path
+<span style="color:#0057ae;">ExtensionDirectories</span> = /source/path
 <span style="color:#0057ae;">IPCNamespacePath</span> = /some/absolute/path
 <span style="color:#0057ae;">NoExecPaths</span> = some/path some/other/path
 <span style="color:#0057ae;">PrivateIPC</span> = <span style="color:#aa5500;">false</span>
@@ -1438,6 +1439,7 @@ WantedBy = some.service some.socket
 <span style="color:#0057ae;">SuccessExitStatus</span> = <span style="color:#b08000;">75</span>
 <span style="color:#0057ae;">SuccessExitStatus</span> = <span style="color:#aa5500;">ADDRESS_FAMILIES</span>
 <span style="color:#0057ae;">SuccessExitStatus</span> = <span style="color:#aa5500;">APPARMOR</span>
+<span style="color:#0057ae;">SuccessExitStatus</span> = <span style="color:#aa5500;">BPF</span>
 <span style="color:#0057ae;">SuccessExitStatus</span> = <span style="color:#aa5500;">CACHE_DIRECTORY</span>
 <span style="color:#0057ae;">SuccessExitStatus</span> = <span style="color:#aa5500;">CANTCREAT</span>
 <span style="color:#0057ae;">SuccessExitStatus</span> = <span style="color:#aa5500;">CAPABILITIES</span>
diff -pruN 5.94.0-1/autotests/htmlhighlighter_test.cpp 5.96.0-1/autotests/htmlhighlighter_test.cpp
--- 5.94.0-1/autotests/htmlhighlighter_test.cpp	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/htmlhighlighter_test.cpp	2022-07-02 16:03:19.000000000 +0000
@@ -6,10 +6,10 @@
 
 #include "test-config.h"
 
-#include <definition.h>
+#include <KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/Repository>
+#include <KSyntaxHighlighting/Theme>
 #include <htmlhighlighter.h>
-#include <repository.h>
-#include <theme.h>
 
 #include <QDir>
 #include <QObject>
diff -pruN 5.94.0-1/autotests/input/highlight.php 5.96.0-1/autotests/input/highlight.php
--- 5.94.0-1/autotests/input/highlight.php	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/input/highlight.php	2022-07-02 16:03:19.000000000 +0000
@@ -107,10 +107,13 @@ echo <<<'HTML'
 HTML;
 echo <<<DOC
 <p>bla $var \$var bla\'</p>
- DOC
- DOC;
-DOC;blah
 DOC;
+echo <<<DOC
+		<p>bla $var \$var bla\'</p>
+	DOC;
+echo <<<DOC
+    <p>bla $var \$var bla\'</p>
+  DOC;
 
 echo 123456 1_2_34_5 1__2 1_;
 echo 0x12345af 0x1_2_3_45_a_f 0x1__2 0x_1 0x1_ 0x1g 0xg;
diff -pruN 5.94.0-1/autotests/input/highlight.sh 5.96.0-1/autotests/input/highlight.sh
--- 5.94.0-1/autotests/input/highlight.sh	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/input/highlight.sh	2022-07-02 16:03:19.000000000 +0000
@@ -248,6 +248,12 @@ pacman -syu --needed intel-ucode grub
 # Braces (bug ##387915)
 [[ $line_name =~ \{([0-9]{1,})\}\{([0-9]{1,})\}(.*) ]]
 [[ $name =~ (.*)_(S[0-9]{2})(E[0-9]{2,3}[a-z]{0,1})_(.*) ]]
+# Comments in Braces (bug 450878)
+[[ # comment 1
+   1 == 1 # comment 2
+   # comment 3
+]]
+
 rm /data/{hello1,hello2}/input/{bye1,$bye2}/si{a,${b},c{k,p{e,a}}}/*.non
 rm /data/{aa,{e,i}t{b,c} # Not closed
 rm /data/{aa,{e,i}t{b,c}}
diff -pruN 5.94.0-1/autotests/input/systemd-unit.service 5.96.0-1/autotests/input/systemd-unit.service
--- 5.94.0-1/autotests/input/systemd-unit.service	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/input/systemd-unit.service	2022-07-02 16:03:19.000000000 +0000
@@ -92,6 +92,7 @@ OOMPolicy = stop
 ## from systemd.exec
 ExecPaths = some/path some/other/path
 ExtensionImages = /source/path
+ExtensionDirectories = /source/path
 IPCNamespacePath = /some/absolute/path
 NoExecPaths = some/path some/other/path
 PrivateIPC = false
@@ -1432,6 +1433,7 @@ ExecStart = @!!+/some/cmd arg
 SuccessExitStatus = 75
 SuccessExitStatus = ADDRESS_FAMILIES
 SuccessExitStatus = APPARMOR
+SuccessExitStatus = BPF
 SuccessExitStatus = CACHE_DIRECTORY
 SuccessExitStatus = CANTCREAT
 SuccessExitStatus = CAPABILITIES
diff -pruN 5.94.0-1/autotests/reference/highlight.php.ref 5.96.0-1/autotests/reference/highlight.php.ref
--- 5.94.0-1/autotests/reference/highlight.php.ref	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/reference/highlight.php.ref	2022-07-02 16:03:19.000000000 +0000
@@ -107,10 +107,13 @@
 <Nowdoc>HTML</Nowdoc><Normal Text>;</Normal Text><br/>
 <Keyword>echo</Keyword><PHP Text> </PHP Text><Heredoc><<<DOC</Heredoc><br/>
 <String><p>bla </String><Variable>$var</Variable><String> \</String><Variable>$var</Variable><String> bla\'</p></String><br/>
-<String> DOC</String><br/>
-<String> DOC;</String><br/>
-<String>DOC;blah</String><br/>
 <Heredoc>DOC</Heredoc><Normal Text>;</Normal Text><br/>
+<Keyword>echo</Keyword><PHP Text> </PHP Text><Heredoc><<<DOC</Heredoc><br/>
+<String>		<p>bla </String><Variable>$var</Variable><String> \</String><Variable>$var</Variable><String> bla\'</p></String><br/>
+<Heredoc>	DOC</Heredoc><Normal Text>;</Normal Text><br/>
+<Keyword>echo</Keyword><PHP Text> </PHP Text><Heredoc><<<DOC</Heredoc><br/>
+<String>    <p>bla </String><Variable>$var</Variable><String> \</String><Variable>$var</Variable><String> bla\'</p></String><br/>
+<Heredoc>  DOC</Heredoc><Normal Text>;</Normal Text><br/>
 <PHP Text></PHP Text><br/>
 <Keyword>echo</Keyword><PHP Text> </PHP Text><Decimal>123456</Decimal><PHP Text> </PHP Text><Decimal>1_2_34_5</Decimal><PHP Text> </PHP Text><Error>1</Error><PHP Text>__2 </PHP Text><Error>1</Error><PHP Text>_</PHP Text><Other>;</Other><br/>
 <Keyword>echo</Keyword><PHP Text> </PHP Text><Hex>0x12345af</Hex><PHP Text> </PHP Text><Hex>0x1_2_3_45_a_f</Hex><PHP Text> </PHP Text><Error>0</Error><PHP Text>x1__2 </PHP Text><Error>0</Error><PHP Text>x_1 </PHP Text><Error>0</Error><PHP Text>x1_ </PHP Text><Error>0</Error><PHP Text>x1g </PHP Text><Error>0</Error><PHP Text>xg</PHP Text><Other>;</Other><br/>
diff -pruN 5.94.0-1/autotests/reference/highlight.sh.ref 5.96.0-1/autotests/reference/highlight.sh.ref
--- 5.94.0-1/autotests/reference/highlight.sh.ref	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/reference/highlight.sh.ref	2022-07-02 16:03:19.000000000 +0000
@@ -248,6 +248,12 @@
 <Comment># Braces (bug ##387915)</Comment><br/>
 <Keyword>[[</Keyword><Normal Text> </Normal Text><Variable>$line_name</Variable><Normal Text> </Normal Text><Expression>=~</Expression><Normal Text> </Normal Text><Escape>\{</Escape><Operator>([</Operator><Pattern>0</Pattern><Operator>-</Operator><Pattern>9</Pattern><Operator>]</Operator><Parameter Expansion>{</Parameter Expansion><Decimal>1</Decimal><Parameter Expansion Operator>,</Parameter Expansion Operator><Parameter Expansion>}</Parameter Expansion><Operator>)</Operator><Escape>\}\{</Escape><Operator>([</Operator><Pattern>0</Pattern><Operator>-</Operator><Pattern>9</Pattern><Operator>]</Operator><Parameter Expansion>{</Parameter Expansion><Decimal>1</Decimal><Parameter Expansion Operator>,</Parameter Expansion Operator><Parameter Expansion>}</Parameter Expansion><Operator>)</Operator><Escape>\}</Escape><Operator>(</Operator><Glob>.*</Glob><Operator>)</Operator><Normal Text> </Normal Text><Keyword>]]</Keyword><br/>
 <Keyword>[[</Keyword><Normal Text> </Normal Text><Variable>$name</Variable><Normal Text> </Normal Text><Expression>=~</Expression><Normal Text> </Normal Text><Operator>(</Operator><Glob>.*</Glob><Operator>)</Operator><Pattern>_</Pattern><Operator>(</Operator><Pattern>S</Pattern><Operator>[</Operator><Pattern>0</Pattern><Operator>-</Operator><Pattern>9</Pattern><Operator>]</Operator><Parameter Expansion>{</Parameter Expansion><Decimal>2</Decimal><Parameter Expansion>}</Parameter Expansion><Operator>)(</Operator><Pattern>E</Pattern><Operator>[</Operator><Pattern>0</Pattern><Operator>-</Operator><Pattern>9</Pattern><Operator>]</Operator><Parameter Expansion>{</Parameter Expansion><Decimal>2</Decimal><Parameter Expansion Operator>,</Parameter Expansion Operator><Decimal>3</Decimal><Parameter Expansion>}</Parameter Expansion><Operator>[</Operator><Pattern>a</Pattern><Operator>-</Operator><Pattern>z</Pattern><Operator>]</Operator><Parameter Expansion>{</Parameter Expansion><Decimal>0</Decimal><Parameter Expansion Operator>,</Parameter Expansion Operator><Decimal>1</Decimal><Parameter Expansion>}</Parameter Expansion><Operator>)</Operator><Pattern>_</Pattern><Operator>(</Operator><Glob>.*</Glob><Operator>)</Operator><Normal Text> </Normal Text><Keyword>]]</Keyword><br/>
+<Comment># Comments in Braces (bug 450878)</Comment><br/>
+<Keyword>[[</Keyword><Normal Text> </Normal Text><Comment># comment 1</Comment><br/>
+<Normal Text>   1 </Normal Text><Expression>==</Expression><Normal Text> 1 </Normal Text><Comment># comment 2</Comment><br/>
+<Normal Text>   </Normal Text><Comment># comment 3</Comment><br/>
+<Keyword>]]</Keyword><br/>
+<Normal Text></Normal Text><br/>
 <Command>rm</Command><Normal Text> </Normal Text><Path>/data/</Path><Escape>{hello1</Escape><Operator>,</Operator><Escape>hello2}</Escape><Path>/input/</Path><Escape>{bye1</Escape><Operator>,</Operator><Variable>$bye2</Variable><Escape>}</Escape><Path>/si</Path><Escape>{a</Escape><Operator>,</Operator><Parameter Expansion>${</Parameter Expansion><Variable>b</Variable><Parameter Expansion>}</Parameter Expansion><Operator>,</Operator><Escape>c{k</Escape><Operator>,</Operator><Escape>p{e</Escape><Operator>,</Operator><Escape>a}}}</Escape><Path>/</Path><Glob>*</Glob><Path>.non</Path><br/>
 <Command>rm</Command><Normal Text> </Normal Text><Path>/data/{aa,</Path><Escape>{e</Escape><Operator>,</Operator><Escape>i}</Escape><Path>t</Path><Escape>{b</Escape><Operator>,</Operator><Escape>c}</Escape><Normal Text> </Normal Text><Comment># Not closed</Comment><br/>
 <Command>rm</Command><Normal Text> </Normal Text><Path>/data/</Path><Escape>{aa</Escape><Operator>,</Operator><Escape>{e</Escape><Operator>,</Operator><Escape>i}t{b</Escape><Operator>,</Operator><Escape>c}}</Escape><br/>
diff -pruN 5.94.0-1/autotests/reference/systemd-unit.service.ref 5.96.0-1/autotests/reference/systemd-unit.service.ref
--- 5.94.0-1/autotests/reference/systemd-unit.service.ref	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/reference/systemd-unit.service.ref	2022-07-02 16:03:19.000000000 +0000
@@ -92,6 +92,7 @@
 <Comment>## from systemd.exec</Comment><br/>
 <Option Name>ExecPaths</Option Name><Normal> = some/path some/other/path</Normal><br/>
 <Option Name>ExtensionImages</Option Name><Normal> = /source/path</Normal><br/>
+<Option Name>ExtensionDirectories</Option Name><Normal> = /source/path</Normal><br/>
 <Option Name>IPCNamespacePath</Option Name><Normal> = /some/absolute/path</Normal><br/>
 <Option Name>NoExecPaths</Option Name><Normal> = some/path some/other/path</Normal><br/>
 <Option Name>PrivateIPC</Option Name><Normal> = </Normal><Constant>false</Constant><br/>
@@ -1432,6 +1433,7 @@
 <Option Name>SuccessExitStatus</Option Name><Normal> = </Normal><Number>75</Number><br/>
 <Option Name>SuccessExitStatus</Option Name><Normal> = </Normal><Constant>ADDRESS_FAMILIES</Constant><br/>
 <Option Name>SuccessExitStatus</Option Name><Normal> = </Normal><Constant>APPARMOR</Constant><br/>
+<Option Name>SuccessExitStatus</Option Name><Normal> = </Normal><Constant>BPF</Constant><br/>
 <Option Name>SuccessExitStatus</Option Name><Normal> = </Normal><Constant>CACHE_DIRECTORY</Constant><br/>
 <Option Name>SuccessExitStatus</Option Name><Normal> = </Normal><Constant>CANTCREAT</Constant><br/>
 <Option Name>SuccessExitStatus</Option Name><Normal> = </Normal><Constant>CAPABILITIES</Constant><br/>
diff -pruN 5.94.0-1/autotests/repository_benchmark.cpp 5.96.0-1/autotests/repository_benchmark.cpp
--- 5.94.0-1/autotests/repository_benchmark.cpp	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/repository_benchmark.cpp	2022-07-02 16:03:19.000000000 +0000
@@ -8,8 +8,8 @@
 #include "repository_test_base.h"
 #include "test-config.h"
 
-#include <definition.h>
-#include <repository.h>
+#include <KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/Repository>
 
 #include <QTest>
 
diff -pruN 5.94.0-1/autotests/repository_test_base.cpp 5.96.0-1/autotests/repository_test_base.cpp
--- 5.94.0-1/autotests/repository_test_base.cpp	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/repository_test_base.cpp	2022-07-02 16:03:19.000000000 +0000
@@ -9,7 +9,7 @@
 
 #include "test-config.h"
 
-#include <definition.h>
+#include <KSyntaxHighlighting/Definition>
 
 #include <QStandardPaths>
 #include <QTest>
diff -pruN 5.94.0-1/autotests/repository_test_base.h 5.96.0-1/autotests/repository_test_base.h
--- 5.94.0-1/autotests/repository_test_base.h	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/repository_test_base.h	2022-07-02 16:03:19.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef REPOSITORY_TEST_BASE_H
 #define REPOSITORY_TEST_BASE_H
 
-#include <repository.h>
+#include <KSyntaxHighlighting/Repository>
 
 #include <QObject>
 #include <QString>
diff -pruN 5.94.0-1/autotests/repository_test.cpp 5.96.0-1/autotests/repository_test.cpp
--- 5.94.0-1/autotests/repository_test.cpp	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/repository_test.cpp	2022-07-02 16:03:19.000000000 +0000
@@ -7,12 +7,12 @@
 #include "repository_test_base.h"
 #include "test-config.h"
 
-#include <abstracthighlighter.h>
-#include <definition.h>
-#include <format.h>
-#include <repository.h>
-#include <state.h>
-#include <theme.h>
+#include <KSyntaxHighlighting/AbstractHighlighter>
+#include <KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/Format>
+#include <KSyntaxHighlighting/Repository>
+#include <KSyntaxHighlighting/State>
+#include <KSyntaxHighlighting/Theme>
 
 #include <QFileInfo>
 #include <QPalette>
diff -pruN 5.94.0-1/autotests/test-config.h.in 5.96.0-1/autotests/test-config.h.in
--- 5.94.0-1/autotests/test-config.h.in	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/test-config.h.in	2022-07-02 16:03:19.000000000 +0000
@@ -14,7 +14,7 @@
 #include <QTextStream>
 #include <QTest>
 
-#include <repository.h>
+#include <KSyntaxHighlighting/Repository>
 
 #define TESTSRCDIR "@CMAKE_CURRENT_SOURCE_DIR@"
 #define TESTBUILDDIR "@CMAKE_CURRENT_BINARY_DIR@"
diff -pruN 5.94.0-1/autotests/testhighlighter.cpp 5.96.0-1/autotests/testhighlighter.cpp
--- 5.94.0-1/autotests/testhighlighter.cpp	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/testhighlighter.cpp	2022-07-02 16:03:19.000000000 +0000
@@ -6,12 +6,12 @@
 
 #include "test-config.h"
 
-#include <abstracthighlighter.h>
-#include <definition.h>
-#include <format.h>
-#include <repository.h>
-#include <state.h>
-#include <theme.h>
+#include <KSyntaxHighlighting/AbstractHighlighter>
+#include <KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/Format>
+#include <KSyntaxHighlighting/Repository>
+#include <KSyntaxHighlighting/State>
+#include <KSyntaxHighlighting/Theme>
 
 #include <QDir>
 #include <QFile>
diff -pruN 5.94.0-1/autotests/theme_test.cpp 5.96.0-1/autotests/theme_test.cpp
--- 5.94.0-1/autotests/theme_test.cpp	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/theme_test.cpp	2022-07-02 16:03:19.000000000 +0000
@@ -6,13 +6,13 @@
 
 #include "test-config.h"
 
-#include <abstracthighlighter.h>
-#include <definition.h>
-#include <format.h>
+#include <KSyntaxHighlighting/AbstractHighlighter>
+#include <KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/Format>
+#include <KSyntaxHighlighting/Repository>
+#include <KSyntaxHighlighting/State>
+#include <KSyntaxHighlighting/Theme>
 #include <htmlhighlighter.h>
-#include <repository.h>
-#include <state.h>
-#include <theme.h>
 
 #include <QDebug>
 #include <QDirIterator>
diff -pruN 5.94.0-1/autotests/wildcardmatcher_test.cpp 5.96.0-1/autotests/wildcardmatcher_test.cpp
--- 5.94.0-1/autotests/wildcardmatcher_test.cpp	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/autotests/wildcardmatcher_test.cpp	2022-07-02 16:03:19.000000000 +0000
@@ -4,7 +4,7 @@
     SPDX-License-Identifier: MIT
 */
 
-#include <wildcardmatcher.h>
+#include <KSyntaxHighlighting/WildcardMatcher>
 
 #include <QObject>
 #include <QTest>
diff -pruN 5.94.0-1/CMakeLists.txt 5.96.0-1/CMakeLists.txt
--- 5.94.0-1/CMakeLists.txt	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/CMakeLists.txt	2022-07-02 16:03:19.000000000 +0000
@@ -1,9 +1,9 @@
 cmake_minimum_required(VERSION 3.16)
 
-set(KF_VERSION "5.94.0")
+set(KF_VERSION "5.96.0")
 project(KSyntaxHighlighting VERSION ${KF_VERSION})
 
-find_package(ECM 5.93.0 REQUIRED NO_MODULE)
+find_package(ECM 5.96.0 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 if(POLICY CMP0063)
     cmake_policy(SET CMP0063 NEW)
@@ -26,7 +26,7 @@ include(ECMMarkNonGuiExecutable)
 include(ECMAddQch)
 include(ECMOptionalAddSubdirectory)
 include(ECMGenerateExportHeader)
-
+include(ECMDeprecationSettings)
 
 ecm_setup_version(PROJECT
     VARIABLE_PREFIX SyntaxHighlighting
@@ -92,7 +92,10 @@ endif()
 if (NO_STANDARD_PATHS)
     add_definitions(-DNO_STANDARD_PATHS)
 endif()
-add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)
+
+ecm_set_disabled_deprecation_versions(
+    QT 5.15.2
+)
 
 #
 # Actually build the stuff
diff -pruN 5.94.0-1/data/generators/cmake.yaml 5.96.0-1/data/generators/cmake.yaml
--- 5.94.0-1/data/generators/cmake.yaml	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/data/generators/cmake.yaml	2022-07-02 16:03:19.000000000 +0000
@@ -1,4 +1,4 @@
-version: 38
+version: 39
 
 global-properties:
     - ALLOW_DUPLICATE_CUSTOM_TARGETS
@@ -135,7 +135,7 @@ target-properties:
     - C_EXTENSIONS
     - C_STANDARD
     - C_STANDARD_REQUIRED
-    - COMMON_LANGUAGE_RUNTIME                               # Sine 3.12
+    - COMMON_LANGUAGE_RUNTIME                               # Since 3.12
     - COMPATIBLE_INTERFACE_BOOL
     - COMPATIBLE_INTERFACE_NUMBER_MAX
     - COMPATIBLE_INTERFACE_NUMBER_MIN
@@ -148,6 +148,7 @@ target-properties:
     - COMPILE_PDB_NAME_<CONFIG>
     - COMPILE_PDB_OUTPUT_DIRECTORY
     - COMPILE_PDB_OUTPUT_DIRECTORY_<CONFIG>
+    - COMPILE_WARNING_AS_ERROR                              # Since 3.24
     - <CONFIG>_OUTPUT_NAME
     - <CONFIG>_POSTFIX
     - CROSSCOMPILING_EMULATOR
@@ -236,10 +237,13 @@ target-properties:
     - INTERFACE_COMPILE_FEATURES
     - INTERFACE_COMPILE_OPTIONS
     - INTERFACE_HEADER_SETS                                 # Since 3.23
+    - INTERFACE_HEADER_SETS_TO_VERIFY                       # Since 3.24
     - INTERFACE_INCLUDE_DIRECTORIES
     - INTERFACE_LINK_DEPENDS                                # Since 3.13
     - INTERFACE_LINK_DIRECTORIES                            # Since 3.13
     - INTERFACE_LINK_LIBRARIES
+    - INTERFACE_LINK_LIBRARIES_DIRECT                       # Since 3.24
+    - INTERFACE_LINK_LIBRARIES_DIRECT_EXCLUDE               # Since 3.24
     - INTERFACE_LINK_OPTIONS                                # Since 3.13
     - INTERFACE_PRECOMPILE_HEADERS                          # Since 3.16
     - INTERFACE_POSITION_INDEPENDENT_CODE
@@ -259,7 +263,7 @@ target-properties:
     - <LANG>_CPPCHECK                                       # Since 3.10
     - <LANG>_CPPLINT
     - <LANG>_INCLUDE_WHAT_YOU_USE
-    - <LANG>_LINKER_LAUNCHER                                # Sine 3.21
+    - <LANG>_LINKER_LAUNCHER                                # Since 3.21
     - <LANG>_VISIBILITY_PRESET
     - LIBRARY_OUTPUT_DIRECTORY_<CONFIG>
     - LIBRARY_OUTPUT_DIRECTORY
@@ -347,6 +351,7 @@ target-properties:
     - UNITY_BUILD_CODE_BEFORE_INCLUDE                       # Since 3.16
     - UNITY_BUILD_MODE                                      # Since 3.18
     - UNITY_BUILD_UNIQUE_ID                                 # Since 3.20
+    - VERIFY_INTERFACE_HEADER_SETS                          # Since 3.24
     - VERSION
     - VISIBILITY_INLINES_HIDDEN
     - VS_CONFIGURATION_TYPE
@@ -359,6 +364,7 @@ target-properties:
     - VS_DOTNET_REFERENCEPROP_<refname>_TAG_<tagname>       # Since 3.10
     - VS_DOTNET_REFERENCES
     - VS_DOTNET_REFERENCES_COPY_LOCAL
+    - VS_DOTNET_STARTUP_OBJECT                              # Since 3.24
     - VS_DOTNET_TARGET_FRAMEWORK_VERSION
     - VS_DOTNET_DOCUMENTATION_FILE                          # Since 3.17
     - VS_DPI_AWARE                                          # Since 3.16
@@ -371,6 +377,7 @@ target-properties:
     - VS_JUST_MY_CODE_DEBUGGING                             # Since 3.15
     - VS_KEYWORD
     - VS_MOBILE_EXTENSIONS_VERSION
+    - VS_NO_COMPILE_BATCHING
     - VS_NO_SOLUTION_DEPLOY                                 # Since 3.15
     - VS_PACKAGE_REFERENCES                                 # Since 3.15
     - VS_PLATFORM_TOOLSET                                   # Since 3.18
@@ -387,6 +394,7 @@ target-properties:
     - VS_WINRT_COMPONENT
     - VS_WINRT_EXTENSIONS
     - VS_WINRT_REFERENCES
+    - WATCOM_RUNTIME_LIBRARY                                # Since 3.24
     - WIN32_EXECUTABLE
     - WINDOWS_EXPORT_ALL_SYMBOLS
     - XCODE_ATTRIBUTE_<an-attribute>
@@ -420,6 +428,7 @@ target-properties:
     - XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP       # Since 3.13
     - XCODE_SCHEME_WORKING_DIRECTORY                        # Since 3.1?
     - XCODE_SCHEME_ZOMBIE_OBJECTS                           # Since 3.13
+    - XCODE_XCCONFIG                                        # Since 3.24
     - XCTEST
 
 test-properties:
@@ -535,6 +544,13 @@ generator-expressions:
     - VERSION_EQUAL
     - VERSION_LESS_EQUAL
     - VERSION_GREATER_EQUAL
+    #   * Path Comparisons
+    - PATH_EQUAL                                            # Since 3.24
+    #   * Path Queries
+    #   * Path Decomposition
+    #   * Path Transformations
+    # TODO Need a bit deeper genex parsing to get sub-commands of `PATH`
+    - PATH                                                  # Since 3.24
     #   * Variable Queries
     - TARGET_EXISTS                                         # Since 3.12
     - CONFIG
@@ -555,6 +571,8 @@ generator-expressions:
     - LINK_LANGUAGE                                         # Since 3.18
     - DEVICE_LINK                                           # Since 3.18
     - HOST_LINK                                             # Since 3.18
+    - LINK_LIBRARY                                          # Since 3.24
+    - LINK_GROUP                                            # Since 3.24
     # String-Valued Generator Expressions
     #   * Escaped Characters
     - ANGLE-R
@@ -593,6 +611,7 @@ generator-expressions:
     - TARGET_PDB_FILE_BASE_NAME                             # Since 3.15
     - TARGET_PDB_FILE_NAME
     - TARGET_PDB_FILE_DIR
+    - TARGET_BUNDLE_DIR_NAME                                # Since 3.24
     - TARGET_BUNDLE_DIR
     - TARGET_BUNDLE_CONTENT_DIR
     - TARGET_PROPERTY
@@ -645,6 +664,7 @@ variables:
     - CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES
     - CMAKE_FIND_DEBUG_MODE                                 # Since 3.17
     - CMAKE_FIND_PACKAGE_NAME
+    - CMAKE_FIND_PACKAGE_REDIRECTS_DIR                      # Since 3.24
     - CMAKE_FIND_PACKAGE_SORT_DIRECTION
     - CMAKE_FIND_PACKAGE_SORT_ORDER
     - CMAKE_GENERATOR
@@ -746,6 +766,7 @@ variables:
     - CMAKE_CODEBLOCKS_COMPILER_ID                          # Since 3.11
     - CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES               # Since 3.10
     - CMAKE_CODELITE_USE_TARGETS
+    - CMAKE_COLOR_DIAGNOSTICS                               # Since 3.24
     - CMAKE_COLOR_MAKEFILE
     - CMAKE_CONFIGURATION_TYPES
     - CMAKE_DEBUG_TARGET_PROPERTIES
@@ -772,6 +793,7 @@ variables:
     - CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY
     - CMAKE_FIND_PACKAGE_PREFER_CONFIG                      # Since 3.15
     - CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKS                   # Since 3.14
+    - CMAKE_FIND_PACKAGE_TARGETS_GLOBAL                     # Since 3.24
     - CMAKE_FIND_PACKAGE_WARN_NO_MODULE
     - CMAKE_FIND_ROOT_PATH
     - CMAKE_FIND_ROOT_PATH_MODE_INCLUDE
@@ -781,6 +803,7 @@ variables:
     - CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH                 # Since 3.16
     - CMAKE_FIND_USE_CMAKE_PATH                             # Since 3.16
     - CMAKE_FIND_USE_CMAKE_SYSTEM_PATH                      # Since 3.16
+    - CMAKE_FIND_USE_INSTALL_PREFIX                         # Since 3.24
     - CMAKE_FIND_USE_PACKAGE_ROOT_PATH                      # Since 3.16
     - CMAKE_FIND_USE_PACKAGE_REGISTRY                       # Since 3.16
     - CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH                # Since 3.16
@@ -809,6 +832,8 @@ variables:
     - CMAKE_PROJECT_INCLUDE                                 # Since 3.15
     - CMAKE_PROJECT_INCLUDE_BEFORE                          # Since 3.15
     - CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE
+    - CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE_BEFORE           # Since 3.17
+    - CMAKE_PROJECT_TOP_LEVEL_INCLUDES                      # Since 3.24
     - CMAKE_REQUIRE_FIND_PACKAGE_<PackageName>              # Since 3.22
     - CMAKE_SKIP_INSTALL_ALL_DEPENDENCY
     - CMAKE_STAGING_PREFIX
@@ -851,6 +876,7 @@ variables:
     - CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER      # Since 3.13
     - CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP # Since 3.13
     - CMAKE_XCODE_SCHEME_ZOMBIE_OBJECTS                     # Since 3.13
+    - CMAKE_XCODE_XCCONFIG                                  # Since 3.24
     # Variables that Describe the System
     - ANDROID
     - APPLE
@@ -946,6 +972,7 @@ variables:
     - CMAKE_BUILD_WITH_INSTALL_RPATH
     - CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY
     - CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_<CONFIG>
+    - CMAKE_COMPILE_WARNING_AS_ERROR                        # Since 3.24
     - CMAKE_<CONFIG>_POSTFIX
     - CMAKE_CROSS_CONFIGS                                   # Since 3.17
     - CMAKE_CTEST_ARGUMENTS                                 # Since 3.17
@@ -986,9 +1013,13 @@ variables:
     - CMAKE_<LANG>_CPPCHECK                                 # Since 3.10
     - CMAKE_<LANG>_CPPLINT
     - CMAKE_<LANG>_INCLUDE_WHAT_YOU_USE
-    - CMAKE_<LANG>_LINKER_LAUNCHER                          # Sine 3.21
-    - CMAKE_<LANG>_LINK_LIBRARY_FILE_FLAG                   # Sine 3.16
-    - CMAKE_<LANG>_LINK_LIBRARY_FLAG                        # Sine 3.16
+    - CMAKE_<LANG>_LINK_LIBRARY_USING_<FEATURE>             # Since 3.24
+    - CMAKE_<LANG>_LINK_LIBRARY_USING_<FEATURE>_SUPPORTED   # Since 3.24
+    - CMAKE_<LANG>_LINKER_LAUNCHER                          # Since 3.21
+    - CMAKE_<LANG>_LINK_GROUP_USING_<FEATURE>               # Since 3.24
+    - CMAKE_<LANG>_LINK_GROUP_USING_<FEATURE>_SUPPORTED     # Since 3.24
+    - CMAKE_<LANG>_LINK_LIBRARY_FILE_FLAG                   # Since 3.16
+    - CMAKE_<LANG>_LINK_LIBRARY_FLAG                        # Since 3.16
     - CMAKE_<LANG>_LINK_WHAT_YOU_USE_FLAG                   # Since 3.22
     - CMAKE_<LANG>_VISIBILITY_PRESET
     - CMAKE_LIBRARY_OUTPUT_DIRECTORY
@@ -999,6 +1030,8 @@ variables:
     - CMAKE_LINK_INTERFACE_LIBRARIES
     - CMAKE_LINK_LIBRARY_FILE_FLAG
     - CMAKE_LINK_LIBRARY_FLAG
+    - CMAKE_LINK_LIBRARY_USING_<FEATURE>                    # Since 3.24
+    - CMAKE_LINK_LIBRARY_USING_<FEATURE>_SUPPORTED          # Since 3.24
     - CMAKE_LINK_WHAT_YOU_USE
     - CMAKE_LINK_WHAT_YOU_USE_CHECK                         # Since 3.22
     - CMAKE_MACOSX_BUNDLE
@@ -1035,11 +1068,13 @@ variables:
     - CMAKE_STATIC_LINKER_FLAGS_<CONFIG>_INIT
     - CMAKE_STATIC_LINKER_FLAGS_INIT
     - CMAKE_TRY_COMPILE_CONFIGURATION
+    - CMAKE_TRY_COMPILE_NO_PLATFORM_VARIABLES               # Since 3.24
     - CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
     - CMAKE_TRY_COMPILE_TARGET_TYPE
     - CMAKE_UNITY_BUILD                                     # Since 3.16
     - CMAKE_UNITY_BUILD_BATCH_SIZE                          # Since 3.16
     - CMAKE_USE_RELATIVE_PATHS
+    - CMAKE_VERIFY_INTERFACE_HEADER_SETS                    # Since 3.24
     - CMAKE_VISIBILITY_INLINES_HIDDEN
     - CMAKE_VS_GLOBALS                                      # Since 3.13
     - CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD
@@ -1052,6 +1087,8 @@ variables:
     - CMAKE_VS_SDK_LIBRARY_WINRT_DIRECTORIES                # Since 3.12
     - CMAKE_VS_SDK_REFERENCE_DIRECTORIES                    # Since 3.12
     - CMAKE_VS_SDK_SOURCE_DIRECTORIES                       # Since 3.12
+    - CMAKE_VS_WINRT_BY_DEFAULT                             # Since 3.13
+    - CMAKE_WATCOM_RUNTIME_LIBRARY                          # Since 3.24
     - CMAKE_WIN32_EXECUTABLE
     - CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS
     - CMAKE_XCODE_ATTRIBUTE_<an-attribute>
@@ -1106,6 +1143,8 @@ variables:
     - CMAKE_<LANG>_EXTENSIONS
     - CMAKE_<LANG>_EXTENSIONS_DEFAULT                       # Since 3.22
     - CMAKE_<LANG>_FLAGS
+    - CMAKE_<LANG>_FLAGS_<CONFIG>
+    - CMAKE_<LANG>_FLAGS_<CONFIG>_INIT
     - CMAKE_<LANG>_FLAGS_DEBUG
     - CMAKE_<LANG>_FLAGS_DEBUG_INIT
     - CMAKE_<LANG>_FLAGS_INIT
@@ -1173,6 +1212,7 @@ variables:
     - CTEST_CUSTOM_PRE_MEMCHECK
     - CTEST_CUSTOM_PRE_TEST
     - CTEST_CUSTOM_TEST_IGNORE
+    - CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION                   # Since 3.24
     - CTEST_CUSTOM_WARNING_EXCEPTION
     - CTEST_CUSTOM_WARNING_MATCH
     - CTEST_CVS_CHECKOUT
@@ -1465,6 +1505,7 @@ variables:
     - CPACK_DMG_DS_STORE_SETUP_SCRIPT
     - CPACK_DMG_BACKGROUND_IMAGE
     - CPACK_DMG_DISABLE_APPLICATIONS_SYMLINK
+    - CPACK_DMG_SLA_USE_RESOURCE_FILE_LICENSE               # Since 3.23
     - CPACK_DMG_SLA_DIR
     - CPACK_DMG_SLA_LANGUAGES
     - CPACK_DMG_<component>_FILE_NAME                       # Since 3.17
@@ -1603,6 +1644,7 @@ variables:
     - CPACK_NUGET_<compName>_PACKAGE_DEPENDENCIES_<dependency>_VERSION
     - CPACK_NUGET_PACKAGE_DEBUG
     # - CPackPackageMaker is deprecated and gonna be removed in next versions of CPack
+    #   NOTE CPackPackageMaker has been removed in 3.24
     # - CPackProductBuild
     - CPACK_COMMAND_PRODUCTBUILD
     - CPACK_PRODUCTBUILD_IDENTIFIER                         # Since 3.23
@@ -1794,6 +1836,7 @@ variables:
     - CPACK_WIX_ROOT
     - CPACK_WIX_CUSTOM_XMLNS                                # Since 3.19
     - CPACK_WIX_SKIP_WIX_UI_EXTENSION                       # Since 3.23
+    - CPACK_WIX_ARCHITECTURE                                # Since 3.24
     # - CTest
     # - Dart
     - BUILD_TESTING
@@ -1820,6 +1863,7 @@ variables:
     - FETCHCONTENT_QUIET
     - FETCHCONTENT_FULLY_DISCONNECTED
     - FETCHCONTENT_UPDATES_DISCONNECTED
+    - FETCHCONTENT_TRY_FIND_PACKAGE_MODE                    # Since 3.24
     - FETCHCONTENT_SOURCE_DIR_<ucName>
     - FETCHCONTENT_UPDATES_DISCONNECTED_<ucName>
     # - FindXXX module "standard" variables
@@ -2233,6 +2277,12 @@ variables:
     - PKG_CONFIG_VERSION_STRING
     - PKG_CONFIG_USE_CMAKE_PREFIX_PATH
     - <prefix>_MODULE_NAME                                  # Since 3.16
+    - <XXX>_LINK_LIBRARIES
+    - <XXX>_STATIC_LINK_LIBRARIES                           # Since 3.24
+    - <XXX>_LDFLAGS
+    - <XXX>_LDFLAGS_OTHER
+    - <XXX>_CFLAGS
+    - <XXX>_CFLAGS_OTHER
     # - FindPNG
     - PNG_DEFINITIONS
     - PNG_LIBRARY
@@ -2404,6 +2454,7 @@ variables:
     - XercesC_LIBRARY
     # - FindXMLRPC
     # - FindZLIB
+    - ZLIB_USE_STATIC_LIBS                                  # Since 3.24
     # - FortranCInterface
     # The following vars gonna match by regex
     # - FortranCInterface_GLOBAL_FOUND
@@ -2529,6 +2580,7 @@ environment-variables:
     - CMAKE_APPLE_SILICON_PROCESSOR                         # Since 3.19.2
     - CMAKE_BUILD_PARALLEL_LEVEL
     - CMAKE_BUILD_TYPE                                      # Since 3.22
+    - CMAKE_COLOR_DIAGNOSTICS                               # Since 3.24
     - CMAKE_CONFIGURATION_TYPES                             # Since 3.22
     - CMAKE_CONFIG_TYPE
     - CMAKE_EXPORT_COMPILE_COMMANDS                         # Since 3.17
@@ -2588,7 +2640,18 @@ scripting-commands:
         nulary?: true
     -
         name: cmake_host_system_information
-        named-args: [RESULT, QUERY]
+        named-args: [
+            RESULT
+          , QUERY
+            # Since 3.24
+          , WINDOWS_REGISTRY
+          , VALUE_NAMES
+          , SUBKEYS
+          , VALUE
+          , VIEW
+          , SEPARATOR
+          , ERROR_VARIABLE
+          ]
         special-args: [
             NUMBER_OF_LOGICAL_CORES
           , NUMBER_OF_PHYSICAL_CORES
@@ -2618,9 +2681,17 @@ scripting-commands:
           , OS_RELEASE
           , OS_VERSION
           , OS_PLATFORM
-          # Since 3.22
+            # Since 3.22
           , DISTRIB_INFO
           , DISTRIB_<name>
+            # Since 3.24
+          , '64'
+          , '32'
+          , '64_32'
+          , '32_64'
+          , HOST
+          , TARGET
+          , BOTH
           ]
     -
         name: cmake_language
@@ -2636,7 +2707,12 @@ scripting-commands:
           , GET_CALL_IDS
           , GET_CALL
           , CANCEL_CALL
+            # Since 3.24
+          , SET_DEPENDENCY_PROVIDER
+          , SUPPORTED_METHODS
           ]
+        # Since 3.24
+        special-args: [FIND_PACKAGE, FETCHCONTENT_MAKEAVAILABLE_SERIAL]
     -
         name: cmake_minimum_required
         named-args: [VERSION, FATAL_ERROR]
@@ -2670,6 +2746,9 @@ scripting-commands:
           , IS_RELATIVE
           , IS_PREFIX
           , NORMALIZE
+          , COMPARE                                         # Since 3.??
+          , EQUAL                                           # Since 3.??
+          , NOT_EQUAL                                       # Since 3.??
             # Modification
           , SET
           , APPEND
@@ -2744,6 +2823,7 @@ scripting-commands:
           , VERSION_GREATER_EQUAL
           , IN_LIST
           , DEFINED
+          , PATH_EQUAL                                      # Since 3.24
           ]
         has-target-name-after-kw: TARGET
         nested-parentheses?: true
@@ -2860,6 +2940,8 @@ scripting-commands:
           , HTTPHEADER
           , EXPECTED_HASH
           , EXPECTED_MD5
+          , RANGE_START                                     # Since 3.24
+          , RANGE_END                                       # Since 3.24
           , TLS_VERIFY
           , TLS_CAINFO
           , TIMESTAMP
@@ -2999,7 +3081,11 @@ scripting-commands:
           , CMAKE_FIND_ROOT_PATH_BOTH
           , ONLY_CMAKE_FIND_ROOT_PATH
           , NO_CMAKE_FIND_ROOT_PATH
+          , NO_CMAKE_INSTALL_PREFIX                         # Since 3.24
+          , REGISTRY_VIEW                                   # Since 3.24
           ]
+        # Since 3.24
+        special-args: &reg_view_special ['64', '32', '64_32', '32_64', HOST, TARGET, BOTH]
     -
         name: find_library
         named-args: &find_library [
@@ -3020,7 +3106,10 @@ scripting-commands:
           , CMAKE_FIND_ROOT_PATH_BOTH
           , ONLY_CMAKE_FIND_ROOT_PATH
           , NO_CMAKE_FIND_ROOT_PATH
+          , NO_CMAKE_INSTALL_PREFIX                         # Since 3.24
+          , REGISTRY_VIEW                                   # Since 3.24
           ]
+        special-args: *reg_view_special                     # Since 3.24
     -
         name: find_package
         named-args: [
@@ -3049,13 +3138,20 @@ scripting-commands:
           , CMAKE_FIND_ROOT_PATH_BOTH
           , ONLY_CMAKE_FIND_ROOT_PATH
           , NO_CMAKE_FIND_ROOT_PATH
+          , NO_CMAKE_INSTALL_PREFIX                         # Since 3.24
+          , BYPASS_PROVIDER                                 # Since 3.24
+          , REGISTRY_VIEW                                   # Since 3.24
+          , GLOBAL                                          # Since 3.24
           ]
+        special-args: *reg_view_special                     # Since 3.24
     -
         name: find_path
         named-args: *find_file
+        special-args: *reg_view_special                     # Since 3.24
     -
         name: find_program
         named-args: *find_library
+        special-args: *reg_view_special                     # Since 3.24
     -
         name: foreach
         named-args: [
@@ -3781,8 +3877,7 @@ project-commands:
     -
         name: try_compile
         named-args: [
-            RESULT_VAR
-          , CMAKE_FLAGS
+            CMAKE_FLAGS
           , OUTPUT_VARIABLE
           , SOURCES
           , COMPILE_DEFINITIONS
@@ -4545,6 +4640,7 @@ standard-module-commands:
             - URL_HASH
             - URL_MD5
             - DOWNLOAD_NAME
+            - DOWNLOAD_EXTRACT_TIMESTAMP                    # Since 3.24
             - DOWNLOAD_NO_EXTRACT
             - DOWNLOAD_NO_PROGRESS
             - TIMEOUT
@@ -5047,8 +5143,10 @@ standard-module-commands:
             - OUTPUT_NAME
             - DOCUMENTATION
             - LINK_TO
+            - R2017b
+            - R2018a
             - EXCLUDE_FROM_ALL
-        special-args: [R2017b, R2018a]
+            - NO_IMPLICIT_LINK_TO_MATLAB_LIBRARIES          # Since 3.24
     # FindPkgConfig
     -
         name: pkg_check_modules
@@ -5059,6 +5157,7 @@ standard-module-commands:
             - NO_CMAKE_ENVIRONMENT_PATH
             - IMPORTED_TARGET
             - GLOBAL
+            - STATIC_TARGET                                 # Since 3.24
     -
         name: pkg_search_module
         named-args: *pkgcm
diff -pruN 5.94.0-1/data/syntax/bash.xml 5.96.0-1/data/syntax/bash.xml
--- 5.94.0-1/data/syntax/bash.xml	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/data/syntax/bash.xml	2022-07-02 16:03:19.000000000 +0000
@@ -39,7 +39,7 @@
         <!ENTITY arithmetic_as_subshell "\(((?:[^`'&quot;()$]++|\$\{[^`'&quot;(){}$]+\}|\$(?=[^{`'&quot;()])|`[^`]*+`|\((?1)(?:[)]|(?=['&quot;])))++)(?:[)](?=$|[^)])|[&quot;'])">
 ]>
 
-<language name="Bash" version="38" kateversion="5.79" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.exlib;*.exheres-0;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="Bash" version="39" kateversion="5.79" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.exlib;*.exheres-0;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
 <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
     Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
@@ -1405,6 +1405,7 @@
       <!-- ExprDblBracket consumes an expression till ]] -->
       <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracket" fallthroughContext="#pop!ExprDblBracketNot">
         <DetectSpaces attribute="Normal Text" context="#stay"/>
+        <DetectChar attribute="Comment" context="Comment" char="#"/>
         <IncludeRules context="FindExprDblBracketEnd"/>
       </context>
 
@@ -1480,6 +1481,7 @@
       <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketFinal" fallthroughContext="ExprDblBracketValue">
         <DetectSpaces attribute="Normal Text" context="#stay"/>
         <IncludeRules context="FindExprDblBracketEnd"/>
+        <DetectChar attribute="Comment" context="Comment" char="#"/>
         <RegExpr attribute="Error" context="#pop" String="(?:[^] &tab;]++|\](?:[^]]|\][^ &tab;]))++" endRegion="expression"/>
       </context>
 
diff -pruN 5.94.0-1/data/syntax/cmake.xml 5.96.0-1/data/syntax/cmake.xml
--- 5.94.0-1/data/syntax/cmake.xml	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/data/syntax/cmake.xml	2022-07-02 16:03:19.000000000 +0000
@@ -25,7 +25,7 @@
 
 <language
     name="CMake"
-    version="38"
+    version="39"
     kateversion="5.0"
     section="Other"
     extensions="CMakeLists.txt;*.cmake;*.cmake.in"
@@ -148,12 +148,24 @@
         <item>ctest_upload</item>
     </list>
     <list name="cmake_host_system_information_nargs">
+      <item>ERROR_VARIABLE</item>
       <item>QUERY</item>
       <item>RESULT</item>
+      <item>SEPARATOR</item>
+      <item>SUBKEYS</item>
+      <item>VALUE</item>
+      <item>VALUE_NAMES</item>
+      <item>VIEW</item>
+      <item>WINDOWS_REGISTRY</item>
     </list>
     <list name="cmake_host_system_information_sargs">
+      <item>32</item>
+      <item>32_64</item>
+      <item>64</item>
+      <item>64_32</item>
       <item>AVAILABLE_PHYSICAL_MEMORY</item>
       <item>AVAILABLE_VIRTUAL_MEMORY</item>
+      <item>BOTH</item>
       <item>DISTRIB_INFO</item>
       <item>FQDN</item>
       <item>HAS_AMD_3DNOW</item>
@@ -167,6 +179,7 @@
       <item>HAS_SSE2</item>
       <item>HAS_SSE_FP</item>
       <item>HAS_SSE_MMX</item>
+      <item>HOST</item>
       <item>HOSTNAME</item>
       <item>IS_64BIT</item>
       <item>NUMBER_OF_LOGICAL_CORES</item>
@@ -178,6 +191,7 @@
       <item>PROCESSOR_DESCRIPTION</item>
       <item>PROCESSOR_NAME</item>
       <item>PROCESSOR_SERIAL_NUMBER</item>
+      <item>TARGET</item>
       <item>TOTAL_PHYSICAL_MEMORY</item>
       <item>TOTAL_VIRTUAL_MEMORY</item>
     </list>
@@ -192,6 +206,12 @@
       <item>GET_CALL_IDS</item>
       <item>ID</item>
       <item>ID_VAR</item>
+      <item>SET_DEPENDENCY_PROVIDER</item>
+      <item>SUPPORTED_METHODS</item>
+    </list>
+    <list name="cmake_language_sargs">
+      <item>FETCHCONTENT_MAKEAVAILABLE_SERIAL</item>
+      <item>FIND_PACKAGE</item>
     </list>
     <list name="cmake_minimum_required_nargs">
       <item>FATAL_ERROR</item>
@@ -205,7 +225,9 @@
       <item>APPEND</item>
       <item>APPEND_STRING</item>
       <item>BASE_DIRECTORY</item>
+      <item>COMPARE</item>
       <item>CONVERT</item>
+      <item>EQUAL</item>
       <item>EXTENSION</item>
       <item>FILENAME</item>
       <item>GET</item>
@@ -225,6 +247,7 @@
       <item>NATIVE_PATH</item>
       <item>NORMALIZE</item>
       <item>NORMAL_PATH</item>
+      <item>NOT_EQUAL</item>
       <item>OUTPUT_VARIABLE</item>
       <item>PARENT_PATH</item>
       <item>RELATIVE_PART</item>
@@ -286,6 +309,7 @@
       <item>MATCHES</item>
       <item>NOT</item>
       <item>OR</item>
+      <item>PATH_EQUAL</item>
       <item>POLICY</item>
       <item>STREQUAL</item>
       <item>STRGREATER</item>
@@ -410,6 +434,8 @@
       <item>POST_INCLUDE_REGEXES</item>
       <item>PRE_EXCLUDE_REGEXES</item>
       <item>PRE_INCLUDE_REGEXES</item>
+      <item>RANGE_END</item>
+      <item>RANGE_START</item>
       <item>READ</item>
       <item>READ_SYMLINK</item>
       <item>REAL_PATH</item>
@@ -501,6 +527,7 @@
       <item>NO_CACHE</item>
       <item>NO_CMAKE_ENVIRONMENT_PATH</item>
       <item>NO_CMAKE_FIND_ROOT_PATH</item>
+      <item>NO_CMAKE_INSTALL_PREFIX</item>
       <item>NO_CMAKE_PATH</item>
       <item>NO_CMAKE_SYSTEM_PATH</item>
       <item>NO_DEFAULT_PATH</item>
@@ -509,8 +536,18 @@
       <item>ONLY_CMAKE_FIND_ROOT_PATH</item>
       <item>PATHS</item>
       <item>PATH_SUFFIXES</item>
+      <item>REGISTRY_VIEW</item>
       <item>REQUIRED</item>
     </list>
+    <list name="find_file_sargs">
+      <item>32</item>
+      <item>32_64</item>
+      <item>64</item>
+      <item>64_32</item>
+      <item>BOTH</item>
+      <item>HOST</item>
+      <item>TARGET</item>
+    </list>
     <list name="find_library_nargs">
       <item>CMAKE_FIND_ROOT_PATH_BOTH</item>
       <item>DOC</item>
@@ -520,6 +557,7 @@
       <item>NO_CACHE</item>
       <item>NO_CMAKE_ENVIRONMENT_PATH</item>
       <item>NO_CMAKE_FIND_ROOT_PATH</item>
+      <item>NO_CMAKE_INSTALL_PREFIX</item>
       <item>NO_CMAKE_PATH</item>
       <item>NO_CMAKE_SYSTEM_PATH</item>
       <item>NO_DEFAULT_PATH</item>
@@ -528,19 +566,32 @@
       <item>ONLY_CMAKE_FIND_ROOT_PATH</item>
       <item>PATHS</item>
       <item>PATH_SUFFIXES</item>
+      <item>REGISTRY_VIEW</item>
       <item>REQUIRED</item>
     </list>
+    <list name="find_library_sargs">
+      <item>32</item>
+      <item>32_64</item>
+      <item>64</item>
+      <item>64_32</item>
+      <item>BOTH</item>
+      <item>HOST</item>
+      <item>TARGET</item>
+    </list>
     <list name="find_package_nargs">
+      <item>BYPASS_PROVIDER</item>
       <item>CMAKE_FIND_ROOT_PATH_BOTH</item>
       <item>COMPONENTS</item>
       <item>CONFIG</item>
       <item>CONFIGS</item>
       <item>EXACT</item>
+      <item>GLOBAL</item>
       <item>HINTS</item>
       <item>MODULE</item>
       <item>NAMES</item>
       <item>NO_CMAKE_ENVIRONMENT_PATH</item>
       <item>NO_CMAKE_FIND_ROOT_PATH</item>
+      <item>NO_CMAKE_INSTALL_PREFIX</item>
       <item>NO_CMAKE_PACKAGE_REGISTRY</item>
       <item>NO_CMAKE_PATH</item>
       <item>NO_CMAKE_SYSTEM_PACKAGE_REGISTRY</item>
@@ -555,8 +606,18 @@
       <item>PATHS</item>
       <item>PATH_SUFFIXES</item>
       <item>QUIET</item>
+      <item>REGISTRY_VIEW</item>
       <item>REQUIRED</item>
     </list>
+    <list name="find_package_sargs">
+      <item>32</item>
+      <item>32_64</item>
+      <item>64</item>
+      <item>64_32</item>
+      <item>BOTH</item>
+      <item>HOST</item>
+      <item>TARGET</item>
+    </list>
     <list name="find_path_nargs">
       <item>CMAKE_FIND_ROOT_PATH_BOTH</item>
       <item>DOC</item>
@@ -565,6 +626,7 @@
       <item>NO_CACHE</item>
       <item>NO_CMAKE_ENVIRONMENT_PATH</item>
       <item>NO_CMAKE_FIND_ROOT_PATH</item>
+      <item>NO_CMAKE_INSTALL_PREFIX</item>
       <item>NO_CMAKE_PATH</item>
       <item>NO_CMAKE_SYSTEM_PATH</item>
       <item>NO_DEFAULT_PATH</item>
@@ -573,8 +635,18 @@
       <item>ONLY_CMAKE_FIND_ROOT_PATH</item>
       <item>PATHS</item>
       <item>PATH_SUFFIXES</item>
+      <item>REGISTRY_VIEW</item>
       <item>REQUIRED</item>
     </list>
+    <list name="find_path_sargs">
+      <item>32</item>
+      <item>32_64</item>
+      <item>64</item>
+      <item>64_32</item>
+      <item>BOTH</item>
+      <item>HOST</item>
+      <item>TARGET</item>
+    </list>
     <list name="find_program_nargs">
       <item>CMAKE_FIND_ROOT_PATH_BOTH</item>
       <item>DOC</item>
@@ -584,6 +656,7 @@
       <item>NO_CACHE</item>
       <item>NO_CMAKE_ENVIRONMENT_PATH</item>
       <item>NO_CMAKE_FIND_ROOT_PATH</item>
+      <item>NO_CMAKE_INSTALL_PREFIX</item>
       <item>NO_CMAKE_PATH</item>
       <item>NO_CMAKE_SYSTEM_PATH</item>
       <item>NO_DEFAULT_PATH</item>
@@ -592,8 +665,18 @@
       <item>ONLY_CMAKE_FIND_ROOT_PATH</item>
       <item>PATHS</item>
       <item>PATH_SUFFIXES</item>
+      <item>REGISTRY_VIEW</item>
       <item>REQUIRED</item>
     </list>
+    <list name="find_program_sargs">
+      <item>32</item>
+      <item>32_64</item>
+      <item>64</item>
+      <item>64_32</item>
+      <item>BOTH</item>
+      <item>HOST</item>
+      <item>TARGET</item>
+    </list>
     <list name="foreach_nargs">
       <item>IN</item>
       <item>ITEMS</item>
@@ -661,6 +744,7 @@
       <item>MATCHES</item>
       <item>NOT</item>
       <item>OR</item>
+      <item>PATH_EQUAL</item>
       <item>POLICY</item>
       <item>STREQUAL</item>
       <item>STRGREATER</item>
@@ -869,6 +953,7 @@
       <item>MATCHES</item>
       <item>NOT</item>
       <item>OR</item>
+      <item>PATH_EQUAL</item>
       <item>POLICY</item>
       <item>STREQUAL</item>
       <item>STRGREATER</item>
@@ -1281,7 +1366,6 @@
       <item>LINK_LIBRARIES</item>
       <item>LINK_OPTIONS</item>
       <item>OUTPUT_VARIABLE</item>
-      <item>RESULT_VAR</item>
       <item>SOURCES</item>
     </list>
     <list name="try_run_nargs">
@@ -1676,6 +1760,7 @@
       <item>DEPENDS</item>
       <item>DOWNLOAD_COMMAND</item>
       <item>DOWNLOAD_DIR</item>
+      <item>DOWNLOAD_EXTRACT_TIMESTAMP</item>
       <item>DOWNLOAD_NAME</item>
       <item>DOWNLOAD_NO_EXTRACT</item>
       <item>DOWNLOAD_NO_PROGRESS</item>
@@ -2091,13 +2176,12 @@
       <item>LINK_TO</item>
       <item>MODULE</item>
       <item>NAME</item>
+      <item>NO_IMPLICIT_LINK_TO_MATLAB_LIBRARIES</item>
       <item>OUTPUT_NAME</item>
-      <item>SHARED</item>
-      <item>SRC</item>
-    </list>
-    <list name="matlab_add_mex_sargs">
       <item>R2017b</item>
       <item>R2018a</item>
+      <item>SHARED</item>
+      <item>SRC</item>
     </list>
     <list name="pkg_check_modules_nargs">
       <item>GLOBAL</item>
@@ -2106,6 +2190,7 @@
       <item>NO_CMAKE_PATH</item>
       <item>QUIET</item>
       <item>REQUIRED</item>
+      <item>STATIC_TARGET</item>
     </list>
     <list name="pkg_search_module_nargs">
       <item>GLOBAL</item>
@@ -2114,6 +2199,7 @@
       <item>NO_CMAKE_PATH</item>
       <item>QUIET</item>
       <item>REQUIRED</item>
+      <item>STATIC_TARGET</item>
     </list>
     <list name="protobuf_generate_cpp_nargs">
       <item>DESCRIPTORS</item>
@@ -2250,6 +2336,7 @@
       <item>CMAKE_CODEBLOCKS_COMPILER_ID</item>
       <item>CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES</item>
       <item>CMAKE_CODELITE_USE_TARGETS</item>
+      <item>CMAKE_COLOR_DIAGNOSTICS</item>
       <item>CMAKE_COLOR_MAKEFILE</item>
       <item>CMAKE_COMMAND</item>
       <item>CMAKE_COMPILER_2005</item>
@@ -2257,6 +2344,7 @@
       <item>CMAKE_COMPILER_IS_GNUCXX</item>
       <item>CMAKE_COMPILER_IS_GNUG77</item>
       <item>CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY</item>
+      <item>CMAKE_COMPILE_WARNING_AS_ERROR</item>
       <item>CMAKE_CONFIGURATION_TYPES</item>
       <item>CMAKE_CROSSCOMPILING</item>
       <item>CMAKE_CROSSCOMPILING_EMULATOR</item>
@@ -2338,9 +2426,11 @@
       <item>CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY</item>
       <item>CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY</item>
       <item>CMAKE_FIND_PACKAGE_PREFER_CONFIG</item>
+      <item>CMAKE_FIND_PACKAGE_REDIRECTS_DIR</item>
       <item>CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKS</item>
       <item>CMAKE_FIND_PACKAGE_SORT_DIRECTION</item>
       <item>CMAKE_FIND_PACKAGE_SORT_ORDER</item>
+      <item>CMAKE_FIND_PACKAGE_TARGETS_GLOBAL</item>
       <item>CMAKE_FIND_PACKAGE_WARN_NO_MODULE</item>
       <item>CMAKE_FIND_ROOT_PATH</item>
       <item>CMAKE_FIND_ROOT_PATH_MODE_INCLUDE</item>
@@ -2350,6 +2440,7 @@
       <item>CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH</item>
       <item>CMAKE_FIND_USE_CMAKE_PATH</item>
       <item>CMAKE_FIND_USE_CMAKE_SYSTEM_PATH</item>
+      <item>CMAKE_FIND_USE_INSTALL_PREFIX</item>
       <item>CMAKE_FIND_USE_PACKAGE_REGISTRY</item>
       <item>CMAKE_FIND_USE_PACKAGE_ROOT_PATH</item>
       <item>CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH</item>
@@ -2541,6 +2632,7 @@
       <item>CMAKE_PROJECT_INCLUDE</item>
       <item>CMAKE_PROJECT_INCLUDE_BEFORE</item>
       <item>CMAKE_PROJECT_NAME</item>
+      <item>CMAKE_PROJECT_TOP_LEVEL_INCLUDES</item>
       <item>CMAKE_PROJECT_VERSION</item>
       <item>CMAKE_PROJECT_VERSION_MAJOR</item>
       <item>CMAKE_PROJECT_VERSION_MINOR</item>
@@ -2600,6 +2692,7 @@
       <item>CMAKE_THREAD_PREFER_PTHREAD</item>
       <item>CMAKE_TOOLCHAIN_FILE</item>
       <item>CMAKE_TRY_COMPILE_CONFIGURATION</item>
+      <item>CMAKE_TRY_COMPILE_NO_PLATFORM_VARIABLES</item>
       <item>CMAKE_TRY_COMPILE_PLATFORM_VARIABLES</item>
       <item>CMAKE_TRY_COMPILE_TARGET_TYPE</item>
       <item>CMAKE_TWEAK_VERSION</item>
@@ -2611,6 +2704,7 @@
       <item>CMAKE_USE_SPROC_INIT</item>
       <item>CMAKE_USE_WIN32_THREADS_INIT</item>
       <item>CMAKE_VERBOSE_MAKEFILE</item>
+      <item>CMAKE_VERIFY_INTERFACE_HEADER_SETS</item>
       <item>CMAKE_VERSION</item>
       <item>CMAKE_VISIBILITY_INLINES_HIDDEN</item>
       <item>CMAKE_VS_DEVENV_COMMAND</item>
@@ -2634,8 +2728,10 @@
       <item>CMAKE_VS_SDK_SOURCE_DIRECTORIES</item>
       <item>CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION</item>
       <item>CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM</item>
+      <item>CMAKE_VS_WINRT_BY_DEFAULT</item>
       <item>CMAKE_WARN_DEPRECATED</item>
       <item>CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION</item>
+      <item>CMAKE_WATCOM_RUNTIME_LIBRARY</item>
       <item>CMAKE_WIN32_EXECUTABLE</item>
       <item>CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS</item>
       <item>CMAKE_XCODE_BUILD_SYSTEM</item>
@@ -2662,6 +2758,7 @@
       <item>CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP</item>
       <item>CMAKE_XCODE_SCHEME_WORKING_DIRECTORY</item>
       <item>CMAKE_XCODE_SCHEME_ZOMBIE_OBJECTS</item>
+      <item>CMAKE_XCODE_XCCONFIG</item>
       <item>CPACK_ABSOLUTE_DESTINATION_FILES</item>
       <item>CPACK_ARCHIVE_COMPONENT_INSTALL</item>
       <item>CPACK_ARCHIVE_FILE_NAME</item>
@@ -2731,6 +2828,7 @@
       <item>CPACK_DMG_FORMAT</item>
       <item>CPACK_DMG_SLA_DIR</item>
       <item>CPACK_DMG_SLA_LANGUAGES</item>
+      <item>CPACK_DMG_SLA_USE_RESOURCE_FILE_LICENSE</item>
       <item>CPACK_DMG_VOLUME_NAME</item>
       <item>CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION</item>
       <item>CPACK_EXTERNAL_BUILT_PACKAGES</item>
@@ -2966,6 +3064,7 @@
       <item>CPACK_TOPLEVEL_TAG</item>
       <item>CPACK_VERBATIM_VARIABLES</item>
       <item>CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION</item>
+      <item>CPACK_WIX_ARCHITECTURE</item>
       <item>CPACK_WIX_CMAKE_PACKAGE_REGISTRY</item>
       <item>CPACK_WIX_CULTURES</item>
       <item>CPACK_WIX_CUSTOM_XMLNS</item>
@@ -3015,6 +3114,7 @@
       <item>CTEST_CUSTOM_PRE_MEMCHECK</item>
       <item>CTEST_CUSTOM_PRE_TEST</item>
       <item>CTEST_CUSTOM_TEST_IGNORE</item>
+      <item>CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION</item>
       <item>CTEST_CUSTOM_WARNING_EXCEPTION</item>
       <item>CTEST_CUSTOM_WARNING_MATCH</item>
       <item>CTEST_CVS_CHECKOUT</item>
@@ -3102,6 +3202,7 @@
       <item>ExternalData_URL_TEMPLATES</item>
       <item>FETCHCONTENT_FULLY_DISCONNECTED</item>
       <item>FETCHCONTENT_QUIET</item>
+      <item>FETCHCONTENT_TRY_FIND_PACKAGE_MODE</item>
       <item>FETCHCONTENT_UPDATES_DISCONNECTED</item>
       <item>FLEX_EXECUTABLE</item>
       <item>FLTK2_BASE_LIBRARY</item>
@@ -3494,6 +3595,7 @@
       <item>XINDY_COMPILER</item>
       <item>XalanC_LIBRARY</item>
       <item>XercesC_LIBRARY</item>
+      <item>ZLIB_USE_STATIC_LIBS</item>
       <item>wxWidgets_CONFIGURATION</item>
       <item>wxWidgets_CXX_FLAGS</item>
       <item>wxWidgets_DEFINITIONS</item>
@@ -3530,6 +3632,7 @@
       <item>CMAKE_APPLE_SILICON_PROCESSOR</item>
       <item>CMAKE_BUILD_PARALLEL_LEVEL</item>
       <item>CMAKE_BUILD_TYPE</item>
+      <item>CMAKE_COLOR_DIAGNOSTICS</item>
       <item>CMAKE_CONFIGURATION_TYPES</item>
       <item>CMAKE_CONFIG_TYPE</item>
       <item>CMAKE_EXPORT_COMPILE_COMMANDS</item>
@@ -3703,6 +3806,7 @@
       <item>COMPILE_OPTIONS</item>
       <item>COMPILE_PDB_NAME</item>
       <item>COMPILE_PDB_OUTPUT_DIRECTORY</item>
+      <item>COMPILE_WARNING_AS_ERROR</item>
       <item>CROSSCOMPILING_EMULATOR</item>
       <item>CUDA_ARCHITECTURES</item>
       <item>CUDA_EXTENSIONS</item>
@@ -3777,10 +3881,13 @@
       <item>INTERFACE_COMPILE_FEATURES</item>
       <item>INTERFACE_COMPILE_OPTIONS</item>
       <item>INTERFACE_HEADER_SETS</item>
+      <item>INTERFACE_HEADER_SETS_TO_VERIFY</item>
       <item>INTERFACE_INCLUDE_DIRECTORIES</item>
       <item>INTERFACE_LINK_DEPENDS</item>
       <item>INTERFACE_LINK_DIRECTORIES</item>
       <item>INTERFACE_LINK_LIBRARIES</item>
+      <item>INTERFACE_LINK_LIBRARIES_DIRECT</item>
+      <item>INTERFACE_LINK_LIBRARIES_DIRECT_EXCLUDE</item>
       <item>INTERFACE_LINK_OPTIONS</item>
       <item>INTERFACE_POSITION_INDEPENDENT_CODE</item>
       <item>INTERFACE_PRECOMPILE_HEADERS</item>
@@ -3866,6 +3973,7 @@
       <item>UNITY_BUILD_CODE_BEFORE_INCLUDE</item>
       <item>UNITY_BUILD_MODE</item>
       <item>UNITY_BUILD_UNIQUE_ID</item>
+      <item>VERIFY_INTERFACE_HEADER_SETS</item>
       <item>VERSION</item>
       <item>VISIBILITY_INLINES_HIDDEN</item>
       <item>VS_CONFIGURATION_TYPE</item>
@@ -3877,6 +3985,7 @@
       <item>VS_DOTNET_DOCUMENTATION_FILE</item>
       <item>VS_DOTNET_REFERENCES</item>
       <item>VS_DOTNET_REFERENCES_COPY_LOCAL</item>
+      <item>VS_DOTNET_STARTUP_OBJECT</item>
       <item>VS_DOTNET_TARGET_FRAMEWORK_VERSION</item>
       <item>VS_DPI_AWARE</item>
       <item>VS_GLOBAL_KEYWORD</item>
@@ -3887,6 +3996,7 @@
       <item>VS_JUST_MY_CODE_DEBUGGING</item>
       <item>VS_KEYWORD</item>
       <item>VS_MOBILE_EXTENSIONS_VERSION</item>
+      <item>VS_NO_COMPILE_BATCHING</item>
       <item>VS_NO_SOLUTION_DEPLOY</item>
       <item>VS_PACKAGE_REFERENCES</item>
       <item>VS_PLATFORM_TOOLSET</item>
@@ -3902,6 +4012,7 @@
       <item>VS_WINRT_COMPONENT</item>
       <item>VS_WINRT_EXTENSIONS</item>
       <item>VS_WINRT_REFERENCES</item>
+      <item>WATCOM_RUNTIME_LIBRARY</item>
       <item>WIN32_EXECUTABLE</item>
       <item>WINDOWS_EXPORT_ALL_SYMBOLS</item>
       <item>XCODE_EXPLICIT_FILE_TYPE</item>
@@ -3930,6 +4041,7 @@
       <item>XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP</item>
       <item>XCODE_SCHEME_WORKING_DIRECTORY</item>
       <item>XCODE_SCHEME_ZOMBIE_OBJECTS</item>
+      <item>XCODE_XCCONFIG</item>
       <item>XCTEST</item>
     </list>
     <list name="source-properties">
@@ -4042,6 +4154,8 @@
       <item>VERSION_EQUAL</item>
       <item>VERSION_LESS_EQUAL</item>
       <item>VERSION_GREATER_EQUAL</item>
+      <item>PATH_EQUAL</item>
+      <item>PATH</item>
       <item>TARGET_EXISTS</item>
       <item>CONFIG</item>
       <item>PLATFORM_ID</item>
@@ -4061,6 +4175,8 @@
       <item>LINK_LANGUAGE</item>
       <item>DEVICE_LINK</item>
       <item>HOST_LINK</item>
+      <item>LINK_LIBRARY</item>
+      <item>LINK_GROUP</item>
       <item>ANGLE-R</item>
       <item>COMMA</item>
       <item>SEMICOLON</item>
@@ -4093,6 +4209,7 @@
       <item>TARGET_PDB_FILE_BASE_NAME</item>
       <item>TARGET_PDB_FILE_NAME</item>
       <item>TARGET_PDB_FILE_DIR</item>
+      <item>TARGET_BUNDLE_DIR_NAME</item>
       <item>TARGET_BUNDLE_DIR</item>
       <item>TARGET_BUNDLE_CONTENT_DIR</item>
       <item>TARGET_PROPERTY</item>
@@ -4688,6 +4805,7 @@
       <context attribute="Normal Text" lineEndContext="#stay" name="cmake_language_ctx_op">
         <DetectChar attribute="Normal Text" context="#pop" char=")" lookAhead="true" />
         <keyword attribute="Named Args" context="#stay" String="cmake_language_nargs" />
+        <keyword attribute="Special Args" context="#stay" String="cmake_language_sargs" />
         <IncludeRules context="User Function Args" />
       </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="cmake_minimum_required_ctx">
@@ -4838,6 +4956,7 @@
       <context attribute="Normal Text" lineEndContext="#stay" name="find_file_ctx_op">
         <DetectChar attribute="Normal Text" context="#pop" char=")" lookAhead="true" />
         <keyword attribute="Named Args" context="#stay" String="find_file_nargs" />
+        <keyword attribute="Special Args" context="#stay" String="find_file_sargs" />
         <IncludeRules context="User Function Args" />
       </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="find_library_ctx">
@@ -4847,6 +4966,7 @@
       <context attribute="Normal Text" lineEndContext="#stay" name="find_library_ctx_op">
         <DetectChar attribute="Normal Text" context="#pop" char=")" lookAhead="true" />
         <keyword attribute="Named Args" context="#stay" String="find_library_nargs" />
+        <keyword attribute="Special Args" context="#stay" String="find_library_sargs" />
         <IncludeRules context="User Function Args" />
       </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="find_package_ctx">
@@ -4857,6 +4977,7 @@
         <DetectChar attribute="Normal Text" context="#pop" char=")" lookAhead="true" />
         <keyword attribute="Named Args" context="#stay" String="find_package_nargs" />
         <keyword attribute="Standard Module" context="#stay" String="standard-finder-modules" />
+        <keyword attribute="Special Args" context="#stay" String="find_package_sargs" />
         <IncludeRules context="User Function Args" />
       </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="find_path_ctx">
@@ -4866,6 +4987,7 @@
       <context attribute="Normal Text" lineEndContext="#stay" name="find_path_ctx_op">
         <DetectChar attribute="Normal Text" context="#pop" char=")" lookAhead="true" />
         <keyword attribute="Named Args" context="#stay" String="find_path_nargs" />
+        <keyword attribute="Special Args" context="#stay" String="find_path_sargs" />
         <IncludeRules context="User Function Args" />
       </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="find_program_ctx">
@@ -4875,6 +4997,7 @@
       <context attribute="Normal Text" lineEndContext="#stay" name="find_program_ctx_op">
         <DetectChar attribute="Normal Text" context="#pop" char=")" lookAhead="true" />
         <keyword attribute="Named Args" context="#stay" String="find_program_nargs" />
+        <keyword attribute="Special Args" context="#stay" String="find_program_sargs" />
         <IncludeRules context="User Function Args" />
       </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="foreach_ctx">
@@ -7240,7 +7363,6 @@
       <context attribute="Normal Text" lineEndContext="#stay" name="matlab_add_mex_ctx_op">
         <DetectChar attribute="Normal Text" context="#pop" char=")" lookAhead="true" />
         <keyword attribute="Named Args" context="#stay" String="matlab_add_mex_nargs" />
-        <keyword attribute="Special Args" context="#stay" String="matlab_add_mex_sargs" />
         <IncludeRules context="User Function Args" />
       </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="pkg_check_modules_ctx">
@@ -7363,7 +7485,7 @@
 
       <context attribute="Normal Text" lineEndContext="#stay" name="Detect More Builtin Variables">
         <RegExpr attribute="CMake Internal Variable" context="#stay" String="\b(?:CMAKE_&var_ref_re;_PLATFORM_ID|CMAKE_&var_ref_re;_COMPILER_VERSION_INTERNAL|CMAKE_&var_ref_re;_COMPILER_ARCHITECTURE_ID|CMAKE_&var_ref_re;_COMPILER_ABI)\b" />
-        <RegExpr attribute="Builtin Variable" context="#stay" String="\b(?:SWIG_MODULE_&var_ref_re;_EXTRA_DEPS|OpenMP_&var_ref_re;_SPEC_DATE|OpenMP_&var_ref_re;_LIB_NAMES|OpenMP_&var_ref_re;_LIBRARY|OpenMP_&var_ref_re;_FLAGS|OpenACC_&var_ref_re;_SPEC_DATE|OpenACC_&var_ref_re;_OPTIONS|OpenACC_&var_ref_re;_FLAGS|MPI_&var_ref_re;_LIB_NAMES|MPI_&var_ref_re;_LIBRARY|MPI_&var_ref_re;_COMPILE_OPTIONS|MPI_&var_ref_re;_COMPILE_DEFINITIONS|MPI_&var_ref_re;_COMPILER|MPI_&var_ref_re;_ADDITIONAL_INCLUDE_VARS|ICU_&var_ref_re;_LIBRARY|ICU_&var_ref_re;_EXECUTABLE|FETCHCONTENT_UPDATES_DISCONNECTED_&var_ref_re;|FETCHCONTENT_SOURCE_DIR_&var_ref_re;|ExternalData_URL_ALGO_&var_ref_re;_&var_ref_re;|ExternalData_CUSTOM_SCRIPT_&var_ref_re;|DOXYGEN_&var_ref_re;|CPACK_WIX_PROPERTY_&var_ref_re;|CPACK_WIX_&var_ref_re;_EXTRA_FLAGS|CPACK_WIX_&var_ref_re;_EXTENSIONS|CPACK_RPM_NO_&var_ref_re;_INSTALL_PREFIX_RELOCATION|CPACK_RPM_&var_ref_re;_USER_FILELIST|CPACK_RPM_&var_ref_re;_USER_BINARY_SPECFILE|CPACK_RPM_&var_ref_re;_PACKAGE_URL|CPACK_RPM_&var_ref_re;_PACKAGE_SUMMARY|CPACK_RPM_&var_ref_re;_PACKAGE_SUGGESTS|CPACK_RPM_&var_ref_re;_PACKAGE_REQUIRES_PREUN|CPACK_RPM_&var_ref_re;_PACKAGE_REQUIRES_PRE|CPACK_RPM_&var_ref_re;_PACKAGE_REQUIRES_POSTUN|CPACK_RPM_&var_ref_re;_PACKAGE_REQUIRES_POST|CPACK_RPM_&var_ref_re;_PACKAGE_REQUIRES|CPACK_RPM_&var_ref_re;_PACKAGE_PROVIDES|CPACK_RPM_&var_ref_re;_PACKAGE_PREFIX|CPACK_RPM_&var_ref_re;_PACKAGE_OBSOLETES|CPACK_RPM_&var_ref_re;_PACKAGE_NAME|CPACK_RPM_&var_ref_re;_PACKAGE_GROUP|CPACK_RPM_&var_ref_re;_PACKAGE_DESCRIPTION|CPACK_RPM_&var_ref_re;_PACKAGE_CONFLICTS|CPACK_RPM_&var_ref_re;_PACKAGE_AUTOREQPROV|CPACK_RPM_&var_ref_re;_PACKAGE_AUTOREQ|CPACK_RPM_&var_ref_re;_PACKAGE_AUTOPROV|CPACK_RPM_&var_ref_re;_PACKAGE_ARCHITECTURE|CPACK_RPM_&var_ref_re;_FILE_NAME|CPACK_RPM_&var_ref_re;_DEFAULT_USER|CPACK_RPM_&var_ref_re;_DEFAULT_GROUP|CPACK_RPM_&var_ref_re;_DEFAULT_FILE_PERMISSIONS|CPACK_RPM_&var_ref_re;_DEFAULT_DIR_PERMISSIONS|CPACK_RPM_&var_ref_re;_DEBUGINFO_PACKAGE|CPACK_RPM_&var_ref_re;_DEBUGINFO_FILE_NAME|CPACK_RPM_&var_ref_re;_BUILD_SOURCE_DIRS_PREFIX|CPACK_PREFLIGHT_&var_ref_re;_SCRIPT|CPACK_POSTFLIGHT_&var_ref_re;_SCRIPT|CPACK_NUGET_PACKAGE_DEPENDENCIES_&var_ref_re;_VERSION|CPACK_NUGET_&var_ref_re;_PACKAGE_VERSION|CPACK_NUGET_&var_ref_re;_PACKAGE_TITLE|CPACK_NUGET_&var_ref_re;_PACKAGE_TAGS|CPACK_NUGET_&var_ref_re;_PACKAGE_RELEASE_NOTES|CPACK_NUGET_&var_ref_re;_PACKAGE_OWNERS|CPACK_NUGET_&var_ref_re;_PACKAGE_NAME|CPACK_NUGET_&var_ref_re;_PACKAGE_LICENSE_FILE_NAME|CPACK_NUGET_&var_ref_re;_PACKAGE_LICENSE_EXPRESSION|CPACK_NUGET_&var_ref_re;_PACKAGE_LICENSEURL|CPACK_NUGET_&var_ref_re;_PACKAGE_LANGUAGE|CPACK_NUGET_&var_ref_re;_PACKAGE_ICONURL|CPACK_NUGET_&var_ref_re;_PACKAGE_ICON|CPACK_NUGET_&var_ref_re;_PACKAGE_HOMEPAGE_URL|CPACK_NUGET_&var_ref_re;_PACKAGE_DESCRIPTION_SUMMARY|CPACK_NUGET_&var_ref_re;_PACKAGE_DESCRIPTION|CPACK_NUGET_&var_ref_re;_PACKAGE_DEPENDENCIES_&var_ref_re;_VERSION|CPACK_NUGET_&var_ref_re;_PACKAGE_DEPENDENCIES|CPACK_NUGET_&var_ref_re;_PACKAGE_COPYRIGHT|CPACK_NUGET_&var_ref_re;_PACKAGE_AUTHORS|CPACK_NSIS_&var_ref_re;_INSTALL_DIRECTORY|CPACK_DMG_&var_ref_re;_FILE_NAME|CPACK_DEBIAN_&var_ref_re;_PACKAGE_SUGGESTS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_SOURCE|CPACK_DEBIAN_&var_ref_re;_PACKAGE_SHLIBDEPS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_SECTION|CPACK_DEBIAN_&var_ref_re;_PACKAGE_REPLACES|CPACK_DEBIAN_&var_ref_re;_PACKAGE_RECOMMENDS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_PROVIDES|CPACK_DEBIAN_&var_ref_re;_PACKAGE_PRIORITY|CPACK_DEBIAN_&var_ref_re;_PACKAGE_PREDEPENDS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_NAME|CPACK_DEBIAN_&var_ref_re;_PACKAGE_ENHANCES|CPACK_DEBIAN_&var_ref_re;_PACKAGE_DEPENDS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_CONTROL_STRICT_PERMISSION|CPACK_DEBIAN_&var_ref_re;_PACKAGE_CONTROL_EXTRA|CPACK_DEBIAN_&var_ref_re;_PACKAGE_CONFLICTS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_BREAKS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_ARCHITECTURE|CPACK_DEBIAN_&var_ref_re;_FILE_NAME|CPACK_DEBIAN_&var_ref_re;_DESCRIPTION|CPACK_DEBIAN_&var_ref_re;_DEBUGINFO_PACKAGE|CPACK_COMPONENT_&var_ref_re;_REQUIRED|CPACK_COMPONENT_&var_ref_re;_HIDDEN|CPACK_COMPONENT_&var_ref_re;_GROUP|CPACK_COMPONENT_&var_ref_re;_DISPLAY_NAME|CPACK_COMPONENT_&var_ref_re;_DISABLED|CPACK_COMPONENT_&var_ref_re;_DESCRIPTION|CPACK_COMPONENT_&var_ref_re;_DEPENDS|CPACK_BINARY_&var_ref_re;|CPACK_ARCHIVE_&var_ref_re;_FILE_NAME|CPACK_&var_ref_re;_COMPONENT_INSTALL|CMAKE_XCODE_ATTRIBUTE_&var_ref_re;|CMAKE_USER_MAKE_RULES_OVERRIDE_&var_ref_re;|CMAKE_STATIC_LINKER_FLAGS_&var_ref_re;_INIT|CMAKE_STATIC_LINKER_FLAGS_&var_ref_re;|CMAKE_SHARED_LINKER_FLAGS_&var_ref_re;_INIT|CMAKE_SHARED_LINKER_FLAGS_&var_ref_re;|CMAKE_RUNTIME_OUTPUT_DIRECTORY_&var_ref_re;|CMAKE_REQUIRE_FIND_PACKAGE_&var_ref_re;|CMAKE_PROJECT_&var_ref_re;_INCLUDE|CMAKE_POLICY_WARNING_CMP[0-9]{4}|CMAKE_POLICY_DEFAULT_CMP[0-9]{4}|CMAKE_PDB_OUTPUT_DIRECTORY_&var_ref_re;|CMAKE_MODULE_LINKER_FLAGS_&var_ref_re;_INIT|CMAKE_MODULE_LINKER_FLAGS_&var_ref_re;|CMAKE_MATCH_[0-9]+|CMAKE_MAP_IMPORTED_CONFIG_&var_ref_re;|CMAKE_LIBRARY_OUTPUT_DIRECTORY_&var_ref_re;|CMAKE_INTERPROCEDURAL_OPTIMIZATION_&var_ref_re;|CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_&var_ref_re;|CMAKE_FRAMEWORK_MULTI_CONFIG_POSTFIX_&var_ref_re;|CMAKE_EXE_LINKER_FLAGS_&var_ref_re;_INIT|CMAKE_EXE_LINKER_FLAGS_&var_ref_re;|CMAKE_DISABLE_FIND_PACKAGE_&var_ref_re;|CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_&var_ref_re;|CMAKE_ARGV[0-9]+|CMAKE_ARCHIVE_OUTPUT_DIRECTORY_&var_ref_re;|CMAKE_&var_ref_re;_VISIBILITY_PRESET|CMAKE_&var_ref_re;_STANDARD_LIBRARIES|CMAKE_&var_ref_re;_STANDARD_INCLUDE_DIRECTORIES|CMAKE_&var_ref_re;_SOURCE_FILE_EXTENSIONS|CMAKE_&var_ref_re;_SIZEOF_DATA_PTR|CMAKE_&var_ref_re;_SIMULATE_VERSION|CMAKE_&var_ref_re;_SIMULATE_ID|CMAKE_&var_ref_re;_POSTFIX|CMAKE_&var_ref_re;_OUTPUT_EXTENSION|CMAKE_&var_ref_re;_LINK_WHAT_YOU_USE_FLAG|CMAKE_&var_ref_re;_LINK_LIBRARY_FLAG|CMAKE_&var_ref_re;_LINK_LIBRARY_FILE_FLAG|CMAKE_&var_ref_re;_LINK_EXECUTABLE|CMAKE_&var_ref_re;_LINKER_WRAPPER_FLAG_SEP|CMAKE_&var_ref_re;_LINKER_WRAPPER_FLAG|CMAKE_&var_ref_re;_LINKER_PREFERENCE_PROPAGATES|CMAKE_&var_ref_re;_LINKER_PREFERENCE|CMAKE_&var_ref_re;_LINKER_LAUNCHER|CMAKE_&var_ref_re;_LIBRARY_ARCHITECTURE|CMAKE_&var_ref_re;_INCLUDE_WHAT_YOU_USE|CMAKE_&var_ref_re;_IMPLICIT_LINK_LIBRARIES|CMAKE_&var_ref_re;_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES|CMAKE_&var_ref_re;_IMPLICIT_LINK_DIRECTORIES|CMAKE_&var_ref_re;_IMPLICIT_INCLUDE_DIRECTORIES|CMAKE_&var_ref_re;_IGNORE_EXTENSIONS|CMAKE_&var_ref_re;_GHS_KERNEL_FLAGS_RELWITHDEBINFO|CMAKE_&var_ref_re;_GHS_KERNEL_FLAGS_RELEASE|CMAKE_&var_ref_re;_GHS_KERNEL_FLAGS_MINSIZEREL|CMAKE_&var_ref_re;_GHS_KERNEL_FLAGS_DEBUG|CMAKE_&var_ref_re;_FLAGS_RELWITHDEBINFO_INIT|CMAKE_&var_ref_re;_FLAGS_RELWITHDEBINFO|CMAKE_&var_ref_re;_FLAGS_RELEASE_INIT|CMAKE_&var_ref_re;_FLAGS_RELEASE|CMAKE_&var_ref_re;_FLAGS_MINSIZEREL_INIT|CMAKE_&var_ref_re;_FLAGS_MINSIZEREL|CMAKE_&var_ref_re;_FLAGS_INIT|CMAKE_&var_ref_re;_FLAGS_DEBUG_INIT|CMAKE_&var_ref_re;_FLAGS_DEBUG|CMAKE_&var_ref_re;_FLAGS|CMAKE_&var_ref_re;_EXTENSIONS_DEFAULT|CMAKE_&var_ref_re;_EXTENSIONS|CMAKE_&var_ref_re;_CREATE_STATIC_LIBRARY|CMAKE_&var_ref_re;_CREATE_SHARED_MODULE|CMAKE_&var_ref_re;_CREATE_SHARED_LIBRARY|CMAKE_&var_ref_re;_CPPLINT|CMAKE_&var_ref_re;_CPPCHECK|CMAKE_&var_ref_re;_COMPILE_OBJECT|CMAKE_&var_ref_re;_COMPILER_VERSION|CMAKE_&var_ref_re;_COMPILER_TARGET|CMAKE_&var_ref_re;_COMPILER_RANLIB|CMAKE_&var_ref_re;_COMPILER_LOADED|CMAKE_&var_ref_re;_COMPILER_LAUNCHER|CMAKE_&var_ref_re;_COMPILER_ID|CMAKE_&var_ref_re;_COMPILER_EXTERNAL_TOOLCHAIN|CMAKE_&var_ref_re;_COMPILER_AR|CMAKE_&var_ref_re;_COMPILER|CMAKE_&var_ref_re;_CLANG_TIDY|CMAKE_&var_ref_re;_BYTE_ORDER|CMAKE_&var_ref_re;_ARCHIVE_FINISH|CMAKE_&var_ref_re;_ARCHIVE_CREATE|CMAKE_&var_ref_re;_ARCHIVE_APPEND|CMAKE_&var_ref_re;_ANDROID_TOOLCHAIN_SUFFIX|CMAKE_&var_ref_re;_ANDROID_TOOLCHAIN_PREFIX|CMAKE_&var_ref_re;_ANDROID_TOOLCHAIN_MACHINE|Boost_&var_ref_re;_LIBRARY_RELEASE|Boost_&var_ref_re;_LIBRARY_DEBUG|Boost_&var_ref_re;_LIBRARY|BISON_&var_ref_re;_OUTPUT_SOURCE|BISON_&var_ref_re;_OUTPUT_HEADER|BISON_&var_ref_re;_OUTPUTS|BISON_&var_ref_re;_INPUT|BISON_&var_ref_re;_DEFINED|BISON_&var_ref_re;_COMPILE_FLAGS|ARGV[0-9]+|&var_ref_re;__TRYRUN_OUTPUT|&var_ref_re;_VERSION_TWEAK|&var_ref_re;_VERSION_STRING|&var_ref_re;_VERSION_PATCH|&var_ref_re;_VERSION_MINOR|&var_ref_re;_VERSION_MAJOR|&var_ref_re;_VERSION_COUNT|&var_ref_re;_VERSION|&var_ref_re;_UNPARSED_ARGUMENTS|&var_ref_re;_SOURCE_DIR|&var_ref_re;_ROOT|&var_ref_re;_MODULE_NAME|&var_ref_re;_LIBRARY_DIRS|&var_ref_re;_LIBRARIES|&var_ref_re;_KEYWORDS_MISSING_VALUES|&var_ref_re;_IS_TOP_LEVEL|&var_ref_re;_INCLUDE_DIRS|&var_ref_re;_HOMEPAGE_URL|&var_ref_re;_FOUND|&var_ref_re;_FIND_VERSION_RANGE_MIN|&var_ref_re;_FIND_VERSION_RANGE_MAX|&var_ref_re;_FIND_VERSION_RANGE|&var_ref_re;_FIND_VERSION_MIN_TWEAK|&var_ref_re;_FIND_VERSION_MIN_PATCH|&var_ref_re;_FIND_VERSION_MIN_MINOR|&var_ref_re;_FIND_VERSION_MIN_MAJOR|&var_ref_re;_FIND_VERSION_MIN_COUNT|&var_ref_re;_FIND_VERSION_MIN|&var_ref_re;_FIND_VERSION_MAX_TWEAK|&var_ref_re;_FIND_VERSION_MAX_PATCH|&var_ref_re;_FIND_VERSION_MAX_MINOR|&var_ref_re;_FIND_VERSION_MAX_MAJOR|&var_ref_re;_FIND_VERSION_MAX_COUNT|&var_ref_re;_FIND_VERSION_MAX|&var_ref_re;_FIND_VERSION_EXACT|&var_ref_re;_FIND_VERSION_COUNT|&var_ref_re;_FIND_VERSION_COMPLETE|&var_ref_re;_FIND_REQUIRED_&var_ref_re;|&var_ref_re;_FIND_REQUIRED|&var_ref_re;_FIND_QUIETLY|&var_ref_re;_FIND_COMPONENTS|&var_ref_re;_DESCRIPTION|&var_ref_re;_CONSIDERED_VERSIONS|&var_ref_re;_CONSIDERED_CONFIGS|&var_ref_re;_CONFIG|&var_ref_re;_BINARY_DIR)\b" />
+        <RegExpr attribute="Builtin Variable" context="#stay" String="\b(?:SWIG_MODULE_&var_ref_re;_EXTRA_DEPS|OpenMP_&var_ref_re;_SPEC_DATE|OpenMP_&var_ref_re;_LIB_NAMES|OpenMP_&var_ref_re;_LIBRARY|OpenMP_&var_ref_re;_FLAGS|OpenACC_&var_ref_re;_SPEC_DATE|OpenACC_&var_ref_re;_OPTIONS|OpenACC_&var_ref_re;_FLAGS|MPI_&var_ref_re;_LIB_NAMES|MPI_&var_ref_re;_LIBRARY|MPI_&var_ref_re;_COMPILE_OPTIONS|MPI_&var_ref_re;_COMPILE_DEFINITIONS|MPI_&var_ref_re;_COMPILER|MPI_&var_ref_re;_ADDITIONAL_INCLUDE_VARS|ICU_&var_ref_re;_LIBRARY|ICU_&var_ref_re;_EXECUTABLE|FETCHCONTENT_UPDATES_DISCONNECTED_&var_ref_re;|FETCHCONTENT_SOURCE_DIR_&var_ref_re;|ExternalData_URL_ALGO_&var_ref_re;_&var_ref_re;|ExternalData_CUSTOM_SCRIPT_&var_ref_re;|DOXYGEN_&var_ref_re;|CPACK_WIX_PROPERTY_&var_ref_re;|CPACK_WIX_&var_ref_re;_EXTRA_FLAGS|CPACK_WIX_&var_ref_re;_EXTENSIONS|CPACK_RPM_NO_&var_ref_re;_INSTALL_PREFIX_RELOCATION|CPACK_RPM_&var_ref_re;_USER_FILELIST|CPACK_RPM_&var_ref_re;_USER_BINARY_SPECFILE|CPACK_RPM_&var_ref_re;_PACKAGE_URL|CPACK_RPM_&var_ref_re;_PACKAGE_SUMMARY|CPACK_RPM_&var_ref_re;_PACKAGE_SUGGESTS|CPACK_RPM_&var_ref_re;_PACKAGE_REQUIRES_PREUN|CPACK_RPM_&var_ref_re;_PACKAGE_REQUIRES_PRE|CPACK_RPM_&var_ref_re;_PACKAGE_REQUIRES_POSTUN|CPACK_RPM_&var_ref_re;_PACKAGE_REQUIRES_POST|CPACK_RPM_&var_ref_re;_PACKAGE_REQUIRES|CPACK_RPM_&var_ref_re;_PACKAGE_PROVIDES|CPACK_RPM_&var_ref_re;_PACKAGE_PREFIX|CPACK_RPM_&var_ref_re;_PACKAGE_OBSOLETES|CPACK_RPM_&var_ref_re;_PACKAGE_NAME|CPACK_RPM_&var_ref_re;_PACKAGE_GROUP|CPACK_RPM_&var_ref_re;_PACKAGE_DESCRIPTION|CPACK_RPM_&var_ref_re;_PACKAGE_CONFLICTS|CPACK_RPM_&var_ref_re;_PACKAGE_AUTOREQPROV|CPACK_RPM_&var_ref_re;_PACKAGE_AUTOREQ|CPACK_RPM_&var_ref_re;_PACKAGE_AUTOPROV|CPACK_RPM_&var_ref_re;_PACKAGE_ARCHITECTURE|CPACK_RPM_&var_ref_re;_FILE_NAME|CPACK_RPM_&var_ref_re;_DEFAULT_USER|CPACK_RPM_&var_ref_re;_DEFAULT_GROUP|CPACK_RPM_&var_ref_re;_DEFAULT_FILE_PERMISSIONS|CPACK_RPM_&var_ref_re;_DEFAULT_DIR_PERMISSIONS|CPACK_RPM_&var_ref_re;_DEBUGINFO_PACKAGE|CPACK_RPM_&var_ref_re;_DEBUGINFO_FILE_NAME|CPACK_RPM_&var_ref_re;_BUILD_SOURCE_DIRS_PREFIX|CPACK_PREFLIGHT_&var_ref_re;_SCRIPT|CPACK_POSTFLIGHT_&var_ref_re;_SCRIPT|CPACK_NUGET_PACKAGE_DEPENDENCIES_&var_ref_re;_VERSION|CPACK_NUGET_&var_ref_re;_PACKAGE_VERSION|CPACK_NUGET_&var_ref_re;_PACKAGE_TITLE|CPACK_NUGET_&var_ref_re;_PACKAGE_TAGS|CPACK_NUGET_&var_ref_re;_PACKAGE_RELEASE_NOTES|CPACK_NUGET_&var_ref_re;_PACKAGE_OWNERS|CPACK_NUGET_&var_ref_re;_PACKAGE_NAME|CPACK_NUGET_&var_ref_re;_PACKAGE_LICENSE_FILE_NAME|CPACK_NUGET_&var_ref_re;_PACKAGE_LICENSE_EXPRESSION|CPACK_NUGET_&var_ref_re;_PACKAGE_LICENSEURL|CPACK_NUGET_&var_ref_re;_PACKAGE_LANGUAGE|CPACK_NUGET_&var_ref_re;_PACKAGE_ICONURL|CPACK_NUGET_&var_ref_re;_PACKAGE_ICON|CPACK_NUGET_&var_ref_re;_PACKAGE_HOMEPAGE_URL|CPACK_NUGET_&var_ref_re;_PACKAGE_DESCRIPTION_SUMMARY|CPACK_NUGET_&var_ref_re;_PACKAGE_DESCRIPTION|CPACK_NUGET_&var_ref_re;_PACKAGE_DEPENDENCIES_&var_ref_re;_VERSION|CPACK_NUGET_&var_ref_re;_PACKAGE_DEPENDENCIES|CPACK_NUGET_&var_ref_re;_PACKAGE_COPYRIGHT|CPACK_NUGET_&var_ref_re;_PACKAGE_AUTHORS|CPACK_NSIS_&var_ref_re;_INSTALL_DIRECTORY|CPACK_DMG_&var_ref_re;_FILE_NAME|CPACK_DEBIAN_&var_ref_re;_PACKAGE_SUGGESTS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_SOURCE|CPACK_DEBIAN_&var_ref_re;_PACKAGE_SHLIBDEPS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_SECTION|CPACK_DEBIAN_&var_ref_re;_PACKAGE_REPLACES|CPACK_DEBIAN_&var_ref_re;_PACKAGE_RECOMMENDS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_PROVIDES|CPACK_DEBIAN_&var_ref_re;_PACKAGE_PRIORITY|CPACK_DEBIAN_&var_ref_re;_PACKAGE_PREDEPENDS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_NAME|CPACK_DEBIAN_&var_ref_re;_PACKAGE_ENHANCES|CPACK_DEBIAN_&var_ref_re;_PACKAGE_DEPENDS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_CONTROL_STRICT_PERMISSION|CPACK_DEBIAN_&var_ref_re;_PACKAGE_CONTROL_EXTRA|CPACK_DEBIAN_&var_ref_re;_PACKAGE_CONFLICTS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_BREAKS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_ARCHITECTURE|CPACK_DEBIAN_&var_ref_re;_FILE_NAME|CPACK_DEBIAN_&var_ref_re;_DESCRIPTION|CPACK_DEBIAN_&var_ref_re;_DEBUGINFO_PACKAGE|CPACK_COMPONENT_&var_ref_re;_REQUIRED|CPACK_COMPONENT_&var_ref_re;_HIDDEN|CPACK_COMPONENT_&var_ref_re;_GROUP|CPACK_COMPONENT_&var_ref_re;_DISPLAY_NAME|CPACK_COMPONENT_&var_ref_re;_DISABLED|CPACK_COMPONENT_&var_ref_re;_DESCRIPTION|CPACK_COMPONENT_&var_ref_re;_DEPENDS|CPACK_BINARY_&var_ref_re;|CPACK_ARCHIVE_&var_ref_re;_FILE_NAME|CPACK_&var_ref_re;_COMPONENT_INSTALL|CMAKE_XCODE_ATTRIBUTE_&var_ref_re;|CMAKE_USER_MAKE_RULES_OVERRIDE_&var_ref_re;|CMAKE_STATIC_LINKER_FLAGS_&var_ref_re;_INIT|CMAKE_STATIC_LINKER_FLAGS_&var_ref_re;|CMAKE_SHARED_LINKER_FLAGS_&var_ref_re;_INIT|CMAKE_SHARED_LINKER_FLAGS_&var_ref_re;|CMAKE_RUNTIME_OUTPUT_DIRECTORY_&var_ref_re;|CMAKE_REQUIRE_FIND_PACKAGE_&var_ref_re;|CMAKE_PROJECT_&var_ref_re;_INCLUDE_BEFORE|CMAKE_PROJECT_&var_ref_re;_INCLUDE|CMAKE_POLICY_WARNING_CMP[0-9]{4}|CMAKE_POLICY_DEFAULT_CMP[0-9]{4}|CMAKE_PDB_OUTPUT_DIRECTORY_&var_ref_re;|CMAKE_MODULE_LINKER_FLAGS_&var_ref_re;_INIT|CMAKE_MODULE_LINKER_FLAGS_&var_ref_re;|CMAKE_MATCH_[0-9]+|CMAKE_MAP_IMPORTED_CONFIG_&var_ref_re;|CMAKE_LINK_LIBRARY_USING_&var_ref_re;_SUPPORTED|CMAKE_LINK_LIBRARY_USING_&var_ref_re;|CMAKE_LIBRARY_OUTPUT_DIRECTORY_&var_ref_re;|CMAKE_INTERPROCEDURAL_OPTIMIZATION_&var_ref_re;|CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_&var_ref_re;|CMAKE_FRAMEWORK_MULTI_CONFIG_POSTFIX_&var_ref_re;|CMAKE_EXE_LINKER_FLAGS_&var_ref_re;_INIT|CMAKE_EXE_LINKER_FLAGS_&var_ref_re;|CMAKE_DISABLE_FIND_PACKAGE_&var_ref_re;|CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_&var_ref_re;|CMAKE_ARGV[0-9]+|CMAKE_ARCHIVE_OUTPUT_DIRECTORY_&var_ref_re;|CMAKE_&var_ref_re;_VISIBILITY_PRESET|CMAKE_&var_ref_re;_STANDARD_LIBRARIES|CMAKE_&var_ref_re;_STANDARD_INCLUDE_DIRECTORIES|CMAKE_&var_ref_re;_SOURCE_FILE_EXTENSIONS|CMAKE_&var_ref_re;_SIZEOF_DATA_PTR|CMAKE_&var_ref_re;_SIMULATE_VERSION|CMAKE_&var_ref_re;_SIMULATE_ID|CMAKE_&var_ref_re;_POSTFIX|CMAKE_&var_ref_re;_OUTPUT_EXTENSION|CMAKE_&var_ref_re;_LINK_WHAT_YOU_USE_FLAG|CMAKE_&var_ref_re;_LINK_LIBRARY_USING_&var_ref_re;_SUPPORTED|CMAKE_&var_ref_re;_LINK_LIBRARY_USING_&var_ref_re;|CMAKE_&var_ref_re;_LINK_LIBRARY_FLAG|CMAKE_&var_ref_re;_LINK_LIBRARY_FILE_FLAG|CMAKE_&var_ref_re;_LINK_GROUP_USING_&var_ref_re;_SUPPORTED|CMAKE_&var_ref_re;_LINK_GROUP_USING_&var_ref_re;|CMAKE_&var_ref_re;_LINK_EXECUTABLE|CMAKE_&var_ref_re;_LINKER_WRAPPER_FLAG_SEP|CMAKE_&var_ref_re;_LINKER_WRAPPER_FLAG|CMAKE_&var_ref_re;_LINKER_PREFERENCE_PROPAGATES|CMAKE_&var_ref_re;_LINKER_PREFERENCE|CMAKE_&var_ref_re;_LINKER_LAUNCHER|CMAKE_&var_ref_re;_LIBRARY_ARCHITECTURE|CMAKE_&var_ref_re;_INCLUDE_WHAT_YOU_USE|CMAKE_&var_ref_re;_IMPLICIT_LINK_LIBRARIES|CMAKE_&var_ref_re;_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES|CMAKE_&var_ref_re;_IMPLICIT_LINK_DIRECTORIES|CMAKE_&var_ref_re;_IMPLICIT_INCLUDE_DIRECTORIES|CMAKE_&var_ref_re;_IGNORE_EXTENSIONS|CMAKE_&var_ref_re;_GHS_KERNEL_FLAGS_RELWITHDEBINFO|CMAKE_&var_ref_re;_GHS_KERNEL_FLAGS_RELEASE|CMAKE_&var_ref_re;_GHS_KERNEL_FLAGS_MINSIZEREL|CMAKE_&var_ref_re;_GHS_KERNEL_FLAGS_DEBUG|CMAKE_&var_ref_re;_FLAGS_RELWITHDEBINFO_INIT|CMAKE_&var_ref_re;_FLAGS_RELWITHDEBINFO|CMAKE_&var_ref_re;_FLAGS_RELEASE_INIT|CMAKE_&var_ref_re;_FLAGS_RELEASE|CMAKE_&var_ref_re;_FLAGS_MINSIZEREL_INIT|CMAKE_&var_ref_re;_FLAGS_MINSIZEREL|CMAKE_&var_ref_re;_FLAGS_INIT|CMAKE_&var_ref_re;_FLAGS_DEBUG_INIT|CMAKE_&var_ref_re;_FLAGS_DEBUG|CMAKE_&var_ref_re;_FLAGS_&var_ref_re;_INIT|CMAKE_&var_ref_re;_FLAGS_&var_ref_re;|CMAKE_&var_ref_re;_FLAGS|CMAKE_&var_ref_re;_EXTENSIONS_DEFAULT|CMAKE_&var_ref_re;_EXTENSIONS|CMAKE_&var_ref_re;_CREATE_STATIC_LIBRARY|CMAKE_&var_ref_re;_CREATE_SHARED_MODULE|CMAKE_&var_ref_re;_CREATE_SHARED_LIBRARY|CMAKE_&var_ref_re;_CPPLINT|CMAKE_&var_ref_re;_CPPCHECK|CMAKE_&var_ref_re;_COMPILE_OBJECT|CMAKE_&var_ref_re;_COMPILER_VERSION|CMAKE_&var_ref_re;_COMPILER_TARGET|CMAKE_&var_ref_re;_COMPILER_RANLIB|CMAKE_&var_ref_re;_COMPILER_LOADED|CMAKE_&var_ref_re;_COMPILER_LAUNCHER|CMAKE_&var_ref_re;_COMPILER_ID|CMAKE_&var_ref_re;_COMPILER_EXTERNAL_TOOLCHAIN|CMAKE_&var_ref_re;_COMPILER_AR|CMAKE_&var_ref_re;_COMPILER|CMAKE_&var_ref_re;_CLANG_TIDY|CMAKE_&var_ref_re;_BYTE_ORDER|CMAKE_&var_ref_re;_ARCHIVE_FINISH|CMAKE_&var_ref_re;_ARCHIVE_CREATE|CMAKE_&var_ref_re;_ARCHIVE_APPEND|CMAKE_&var_ref_re;_ANDROID_TOOLCHAIN_SUFFIX|CMAKE_&var_ref_re;_ANDROID_TOOLCHAIN_PREFIX|CMAKE_&var_ref_re;_ANDROID_TOOLCHAIN_MACHINE|Boost_&var_ref_re;_LIBRARY_RELEASE|Boost_&var_ref_re;_LIBRARY_DEBUG|Boost_&var_ref_re;_LIBRARY|BISON_&var_ref_re;_OUTPUT_SOURCE|BISON_&var_ref_re;_OUTPUT_HEADER|BISON_&var_ref_re;_OUTPUTS|BISON_&var_ref_re;_INPUT|BISON_&var_ref_re;_DEFINED|BISON_&var_ref_re;_COMPILE_FLAGS|ARGV[0-9]+|&var_ref_re;__TRYRUN_OUTPUT|&var_ref_re;_VERSION_TWEAK|&var_ref_re;_VERSION_STRING|&var_ref_re;_VERSION_PATCH|&var_ref_re;_VERSION_MINOR|&var_ref_re;_VERSION_MAJOR|&var_ref_re;_VERSION_COUNT|&var_ref_re;_VERSION|&var_ref_re;_UNPARSED_ARGUMENTS|&var_ref_re;_STATIC_LINK_LIBRARIES|&var_ref_re;_SOURCE_DIR|&var_ref_re;_ROOT|&var_ref_re;_MODULE_NAME|&var_ref_re;_LINK_LIBRARIES|&var_ref_re;_LIBRARY_DIRS|&var_ref_re;_LIBRARIES|&var_ref_re;_LDFLAGS_OTHER|&var_ref_re;_LDFLAGS|&var_ref_re;_KEYWORDS_MISSING_VALUES|&var_ref_re;_IS_TOP_LEVEL|&var_ref_re;_INCLUDE_DIRS|&var_ref_re;_HOMEPAGE_URL|&var_ref_re;_FOUND|&var_ref_re;_FIND_VERSION_RANGE_MIN|&var_ref_re;_FIND_VERSION_RANGE_MAX|&var_ref_re;_FIND_VERSION_RANGE|&var_ref_re;_FIND_VERSION_MIN_TWEAK|&var_ref_re;_FIND_VERSION_MIN_PATCH|&var_ref_re;_FIND_VERSION_MIN_MINOR|&var_ref_re;_FIND_VERSION_MIN_MAJOR|&var_ref_re;_FIND_VERSION_MIN_COUNT|&var_ref_re;_FIND_VERSION_MIN|&var_ref_re;_FIND_VERSION_MAX_TWEAK|&var_ref_re;_FIND_VERSION_MAX_PATCH|&var_ref_re;_FIND_VERSION_MAX_MINOR|&var_ref_re;_FIND_VERSION_MAX_MAJOR|&var_ref_re;_FIND_VERSION_MAX_COUNT|&var_ref_re;_FIND_VERSION_MAX|&var_ref_re;_FIND_VERSION_EXACT|&var_ref_re;_FIND_VERSION_COUNT|&var_ref_re;_FIND_VERSION_COMPLETE|&var_ref_re;_FIND_REQUIRED_&var_ref_re;|&var_ref_re;_FIND_REQUIRED|&var_ref_re;_FIND_QUIETLY|&var_ref_re;_FIND_COMPONENTS|&var_ref_re;_DESCRIPTION|&var_ref_re;_CONSIDERED_VERSIONS|&var_ref_re;_CONSIDERED_CONFIGS|&var_ref_re;_CONFIG|&var_ref_re;_CFLAGS_OTHER|&var_ref_re;_CFLAGS|&var_ref_re;_BINARY_DIR)\b" />
       </context>
 
       <context attribute="Normal Text" lineEndContext="#stay" name="Detect Variable Substitutions">
diff -pruN 5.94.0-1/data/syntax/debianchangelog.xml 5.96.0-1/data/syntax/debianchangelog.xml
--- 5.94.0-1/data/syntax/debianchangelog.xml	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/data/syntax/debianchangelog.xml	2022-07-02 16:03:19.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Debian Changelog" version="17" kateversion="2.4" section="Other" extensions="" mimetype="">
+<language name="Debian Changelog" version="18" kateversion="2.4" section="Other" extensions="" mimetype="">
     <highlighting>
         <list name="keywords">
             <item>urgency</item>
@@ -230,6 +230,11 @@
             <item>jammy-proposed</item>
             <item>jammy-updates</item>
             <item>jammy-backports</item>
+            <item>kinetic</item>
+            <item>kinetic-security</item>
+            <item>kinetic-proposed</item>
+            <item>kinetic-updates</item>
+            <item>kinetic-backports</item>
         </list>
 
         <list name="urgencies">
diff -pruN 5.94.0-1/data/syntax/diff.xml 5.96.0-1/data/syntax/diff.xml
--- 5.94.0-1/data/syntax/diff.xml	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/data/syntax/diff.xml	2022-07-02 16:03:19.000000000 +0000
@@ -12,7 +12,7 @@
     2008-02-13: 1.11 Eduardo Robles Elvira <edulix AT gmail DOT com>
      Fixed folding.
 -->
-<language name="Diff" version="7" kateversion="5.62" section="Other" extensions="*.diff;*patch;*.rej" mimetype="text/x-patch">
+<language name="Diff" version="8" kateversion="5.62" section="Other" extensions="*.diff;*patch;*.rej" mimetype="text/x-patch">
 
   <highlighting>
 
@@ -115,13 +115,13 @@
     </contexts>
 
     <itemDatas>
-      <itemData name="Normal Text" defStyleNum="dsNormal"/>
-      <itemData name="File"  defStyleNum="dsKeyword"/>
-      <itemData name="Header"  defStyleNum="dsDataType"/>
-      <itemData name="Removed line"  defStyleNum="dsString" />
-      <itemData name="Added line"  defStyleNum="dsVariable"/>
-      <itemData name="Changed line (old)"  defStyleNum="dsString"/>
-      <itemData name="Changed line (new)"  defStyleNum="dsVariable"/>
+      <itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false"/>
+      <itemData name="File"  defStyleNum="dsKeyword" spellChecking="false"/>
+      <itemData name="Header"  defStyleNum="dsDataType" spellChecking="false"/>
+      <itemData name="Removed line"  defStyleNum="dsString" spellChecking="false"/>
+      <itemData name="Added line"  defStyleNum="dsVariable" spellChecking="false"/>
+      <itemData name="Changed line (old)"  defStyleNum="dsString" spellChecking="false"/>
+      <itemData name="Changed line (new)"  defStyleNum="dsVariable" spellChecking="false"/>
     </itemDatas>
 
   </highlighting>
diff -pruN 5.94.0-1/data/syntax/php.xml 5.96.0-1/data/syntax/php.xml
--- 5.94.0-1/data/syntax/php.xml	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/data/syntax/php.xml	2022-07-02 16:03:19.000000000 +0000
@@ -77,7 +77,7 @@ Changes:
   <!ENTITY float "\b&LNUM;(\.(&LNUM;)?(&EXPONENT;)?|&EXPONENT;)|\.&LNUM;(&EXPONENT;)?">
 ]>
 
-<language name="PHP/PHP" indenter="cstyle" version="22" kateversion="5.53" section="Scripts" extensions="" priority="5" mimetype="" hidden="true">
+<language name="PHP/PHP" indenter="cstyle" version="23" kateversion="5.53" section="Scripts" extensions="" priority="5" mimetype="" hidden="true">
   <highlighting>
     <!-- https://php.watch/versions -->
     <!-- Based on 8.1 -->
@@ -11160,7 +11160,7 @@ Changes:
       </context>
       <context name="heredoc" attribute="String" lineEndContext="#stay" dynamic="true">
         <IncludeRules context="doublestringvariablecommon" />
-        <RegExpr attribute="Heredoc" context="#pop" String="^%1(?=;?$)" dynamic="true" endRegion="Heredoc" column="0" />
+        <RegExpr attribute="Heredoc" context="#pop" String="^\s*%1(?=;?$)" dynamic="true" endRegion="Heredoc" column="0" />
       </context>
 
       <context name="htmlnowdoc" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
diff -pruN 5.94.0-1/data/syntax/rpmspec.xml 5.96.0-1/data/syntax/rpmspec.xml
--- 5.94.0-1/data/syntax/rpmspec.xml	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/data/syntax/rpmspec.xml	2022-07-02 16:03:19.000000000 +0000
@@ -8,7 +8,7 @@
   <!ENTITY os_conditionals_names "(ifos|ifnos)">
   <!ENTITY lookahead_whitespace_eol "(?=($| |\t))">
 ]>
-<language name="RPM Spec" version="10" kateversion="5.62" section="Other" extensions="*.spec" mimetype="text/x-rpm-spec" license="Public Domain">
+<language name="RPM Spec" version="11" kateversion="5.62" section="Other" extensions="*.spec" mimetype="text/x-rpm-spec" license="Public Domain">
 
 <!-- The entities "arch" and "os" are based on /usr/lib/rpm/rpmrc (in the version coming with openSUSE 11.4). -->
 
@@ -90,7 +90,7 @@
         <RegExpr attribute="Tag" context="tag_line_value" String="^((Icon)[ \t]*:[ \t]*)" column="0" />
         <RegExpr attribute="Tag" context="tag_line_os" String="^((ExclusiveOs|ExcludeOs)[ \t]*:[ \t]*)" column="0" />
         <RegExpr attribute="Tag" context="tag_line_arch" String="^((BuildArch|BuildArchitectures|ExclusiveArch|ExcludeArch)[ \t]*:[ \t]*)" column="0" />
-        <RegExpr attribute="Tag" context="tag_line_package" String="^((Conflicts|Obsoletes|Provides|Requires|Requires\(.*\)|Enhances|Suggests|BuildConflicts|BuildRequires|Recommends|PreReq|BuildPreReq|Supplements)[ \t]*:[ \t]*)" column="0" />
+        <RegExpr attribute="Tag" context="tag_line_package" String="^((Conflicts|Obsoletes|Provides|Requires|Requires\(.*\)|Enhances|Suggests|BuildConflicts|BuildRequires|Recommends|PreReq|BuildPreReq|Supplements|OrderWithRequires|RemovePathPostfixes)[ \t]*:[ \t]*)" column="0" />
         <RegExpr attribute="Tag" context="tag_line_integer" String="^((Epoch|Serial|Nosource|Nopatch)[ \t]*:[ \t]*)" column="0" />
         <RegExpr attribute="Tag" context="tag_line_switch" String="^((AutoReq|AutoProv|AutoReqProv)[ \t]*:[ \t]*)" column="0" />
         <RegExpr attribute="Tag" context="tag_line_string" String="^((Copyright|License|Summary|Summary\(.*\)|Distribution|Vendor|Packager|Group|Source\d*|Patch\d*|BuildRoot|Prefix)[ \t]*:[ \t]*)" column="0" />
diff -pruN 5.94.0-1/data/syntax/systemd-unit.xml 5.96.0-1/data/syntax/systemd-unit.xml
--- 5.94.0-1/data/syntax/systemd-unit.xml	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/data/syntax/systemd-unit.xml	2022-07-02 16:03:19.000000000 +0000
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created for systemd version 250. -->
+<!-- Created for systemd version 251. -->
 <!DOCTYPE language SYSTEM "language.dtd" [
 <!ENTITY alp "A-Za-z">
 <!ENTITY aln "&alp;0-9">
 <!ENTITY end "(?:\s+|$)">
 <!ENTITY escaped "\\x[0-9a-f]{2}">
 <!ENTITY hex "0-9A-Fa-f">
-<!ENTITY specifier "&#x0025;[&#x0025;ABCEGHIJLMNPSTUVWabfghijlmnopstuvw]">
+<!ENTITY specifier "&#x0025;[&#x0025;ABCEGHIJLMNPSTUVWYabdfghijlmnopqstuvwy]">
 <!ENTITY name "(?:[-\w]|&specifier;)+@?(?:[-.@\:\w]|&escaped;|&specifier;)*">
 <!ENTITY extension "automount|device|mount|path|service|slice|socket|swap|target|timer">
 <!ENTITY unit "&name;\.(?:&extension;)&end;">
@@ -22,7 +22,7 @@
 <!ENTITY tsp_unit "&tsp_year;|&tsp_month;|&tsp_week;|&tsp_day;|&tsp_hour;|&tsp_sec;|&tsp_msec;|&tsp_usec;|&tsp_min;">
 <!ENTITY tsp "\d+(?:\.\d+)?\h*(?=(&tsp_unit;)?)">
 ]>
-<language author="Andreas Gratzer" extensions="*.automount;*.device;*.mount;*.path;*.service;*.slice;*.socket;*.swap;*.target;*.timer" kateversion="5.0" license="MIT" mimetype="text/x-systemd-unit" name="systemd unit" section="Configuration" version="8">
+<language author="Andreas Gratzer" extensions="*.automount;*.device;*.mount;*.path;*.service;*.slice;*.socket;*.swap;*.target;*.timer" kateversion="5.0" license="MIT" mimetype="text/x-systemd-unit" name="systemd unit" section="Configuration" version="9">
   <highlighting>
     <list name="boolean">
       <!-- 0, 1, t, f, y, n are also valid, but handled using AnyChar. -->
@@ -488,6 +488,7 @@
       <item>CAPABILITIES</item>
       <item>CANTCREAT</item>
       <item>CACHE_DIRECTORY</item>
+      <item>BPF</item>
       <item>APPARMOR</item>
       <item>ADDRESS_FAMILIES</item>
     </list>
@@ -897,6 +898,7 @@
       <item>CacheDirectory</item>
       <item>ConfigurationDirectory</item>
       <item>ExecSearchPath</item>
+      <item>ExtensionDirectories</item>
       <item>ExtensionImages</item>
       <item>IPCNamespacePath</item>
       <item>InaccessiblePaths</item>
diff -pruN 5.94.0-1/debian/changelog 5.96.0-1/debian/changelog
--- 5.94.0-1/debian/changelog	2022-05-19 21:59:03.000000000 +0000
+++ 5.96.0-1/debian/changelog	2022-07-31 11:33:00.000000000 +0000
@@ -1,3 +1,14 @@
+ksyntax-highlighting (5.96.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.96.0).
+  * Bump Standards-Version to 4.6.1, no change required.
+  * Add lintian override for kate-syntax-highlighter having no manpages.
+  * Add overrides for lintian not liking the look of test data files.
+  * Review copyright information.
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Sun, 31 Jul 2022 13:33:00 +0200
+
 ksyntax-highlighting (5.94.0-1) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
diff -pruN 5.94.0-1/debian/control 5.96.0-1/debian/control
--- 5.94.0-1/debian/control	2022-05-08 22:38:32.000000000 +0000
+++ 5.96.0-1/debian/control	2022-07-31 11:33:00.000000000 +0000
@@ -7,17 +7,17 @@ Uploaders: Aurélien COUDERC <coucouf@de
 Build-Depends: cmake (>= 3.16~),
                debhelper-compat (= 13),
                doxygen,
-               extra-cmake-modules (>= 5.93.0~),
+               extra-cmake-modules (>= 5.96.0~),
                libqt5sql5-sqlite,
                libqt5xmlpatterns5-dev (>= 5.15.2~),
                perl:any,
                pkg-kde-tools (>= 0.15.15ubuntu1~),
                qtbase5-dev (>= 5.15.2~),
-               qtbase5-dev:native,
+               qtbase5-dev:native (>= 5.15.2~),
                qtdeclarative5-dev (>= 5.15.2~),
                qttools5-dev (>= 5.4),
                qttools5-dev:native,
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
 Homepage: https://invent.kde.org/frameworks/syntax-highlighting
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/syntax-highlighting
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/syntax-highlighting.git
diff -pruN 5.94.0-1/debian/copyright 5.96.0-1/debian/copyright
--- 5.94.0-1/debian/copyright	2022-02-02 12:07:06.000000000 +0000
+++ 5.96.0-1/debian/copyright	2022-07-31 11:33:00.000000000 +0000
@@ -4,142 +4,315 @@ Source: https://invent.kde.org/framework
 Upstream-Contact: kde-frameworks-devel@kde.org
 
 Files: *
-Copyright: 2009-2020, Alex Turbov <I.zaufi@gmail.com>
-           2004, Alexander Neundorf <neundorf@kde.org>
-           2017, Alexis Sellier, the Less Core Team, Contributors, The MIT License
+Copyright: 2021, Alberto Salvia Novella <https://es20490446e.wordpress.com>
+           2020, Aleix Pol Gonzalez <aleixpol@kde.org>
+           2020-2021, Alex Turbov <i.zaufi@gmail.com>
+           2020, Alexander Schlarb <alexander@ninetailed.ninja>
+           2018, Andrew Crouthamel <andrew.crouthamel@kdemail.net>
+           2016, Arctic Ice Studio <development@arcticicestudio.com>
+           2014-2020, Christoph Cullmann <cullmann@kde.org>
+           2018, Dan Hedgecock
+           2012-2018, Dominik Haumann <dhaumann@kde.org>
+           2016, Dracula Theme
+           2018, Eike Hein <hein@kde.org>
+           2011, Ethan Schoonover
+           2020, Frederik Banning <laubblaeser@live.com>
+           2019, Friedrich W. H. Kossebau <kossebau@kde.org>
+           2016-2020, GitHub Inc.
+           2021, Igor Kushnir <igorkuo@gmail.com>
+           2016, Ike Ku
+           James Turnbull <james@lovedthanlost.net>
+           2020-2021, Jonathan Poelen <jonathan.poelen@gmail.com>
+           2020, Juraj Oravec <jurajoravec@mailo.com>
+           2021, Marco Rebhan <me@dblsaiko.net>
+           2020, Nibaldo González <nibgonz@gmail.com>
+           2017-2020, Nibaldo González S. <nibgonz@gmail.com>
+           2007, Paolo Borelli <pborelli@gnome.org>, GtkSourceView team
+           2017, Pavel Pertsev <morhetz@gmail.com>
+           2007, Sebastian Pipping <webmaster@hartwork.org>
+           2021, shenlebantongying <shenlebantongying@gmail.com>
+           2016, Sven Greb <development@svengreb.de>
+           2016-2021, Volker Krause <vkrause@kde.org>
+           2020, Waqar Ahmed <waqar.17a@gmail.com>
+           2006, Wimer Hazenberg
+License: MIT
+Comment: Automatically extracted
+
+Files: data/generators/generate-cmake-syntax.py
+       data/generators/get-Qt-macros.sh
+       data/generators/get-Qt-classes.sh
+       data/schema/language.xsd
+       data/syntax/adblock.xml
+       data/syntax/ahk.xml
+       data/syntax/alert.xml
+       data/syntax/ansic89.xml
+       data/syntax/asciidoc.xml
+       data/syntax/brightscript.xml
+       data/syntax/changelog.xml
+       data/syntax/cil.xml
+       data/syntax/clist.xml
+       data/syntax/coffee.xml
+       data/syntax/comments.xml
+       data/syntax/commonlisp.xml
+       data/syntax/component-pascal.xml
+       data/syntax/dart.xml
+       data/syntax/dot.xml
+       data/syntax/doxygen.xml
+       data/syntax/eiffel.xml
+       data/syntax/elm.xml
+       data/syntax/email.xml
+       data/syntax/flatbuffers.xml
+       data/syntax/fluent.xml
+       data/syntax/fortran-free.xml
+       data/syntax/gd-script.xml
+       data/syntax/gdl.xml
+       data/syntax/gherkin.xml
+       data/syntax/gettext.xml
+       data/syntax/grammar.xml
+       data/syntax/graphql.xml
+       data/syntax/haxe.xml
+       data/syntax/innosetup.xml
+       data/syntax/intelhex.xml
+       data/syntax/jam.xml
+       data/syntax/java-properties.xml
+       data/syntax/javascript.xml
+       data/syntax/javascript-react.xml
+       data/syntax/julia.xml
+       data/syntax/ld.xml
+       data/syntax/ldif.xml
+       data/syntax/makefile.xml
+       data/syntax/matlab.xml
+       data/syntax/metamath.xml
+       data/syntax/mib.xml
+       data/syntax/mips.xml
+       data/syntax/modelines.xml
+       data/syntax/modula-2.xml
+       data/syntax/modula-2-iso-only.xml
+       data/syntax/modula-2-pim-only.xml
+       data/syntax/modula-2-r10-only.xml
+       data/syntax/mustache.xml
+       data/syntax/nemerle.xml
+       data/syntax/ninja.xml
+       data/syntax/noweb.xml
+       data/syntax/objectivecpp.xml
+       data/syntax/oors.xml
+       data/syntax/opal.xml
+       data/syntax/orgmode.xml
+       data/syntax/overpassql.xml
+       data/syntax/pascal.xml
+       data/syntax/pike.xml
+       data/syntax/pli.xml
+       data/syntax/pony.xml
+       data/syntax/python.xml
+       data/syntax/qdocconf.xml
+       data/syntax/qmake.xml
+       data/syntax/qml.xml
+       data/syntax/racket.xml
+       data/syntax/raku.xml
+       data/syntax/rdoc.xml
+       data/syntax/renpy.xml
+       data/syntax/retro.xml
+       data/syntax/rsiidl.xml
+       data/syntax/rust.xml
+       data/syntax/sass.xml
+       data/syntax/scheme.xml
+       data/syntax/sieve.xml
+       data/syntax/smali.xml
+       data/syntax/sml.xml
+       data/syntax/snort_suricata.xml
+       data/syntax/solidity.xml
+       data/syntax/spdx-comments.xml
+       data/syntax/stan.xml
+       data/syntax/swift.xml
+       data/syntax/systemd-unit.xml
+       data/syntax/tads3.xml
+       data/syntax/terraform.xml
+       data/syntax/tiger.xml
+       data/syntax/todo.xml
+       data/syntax/typescript.xml
+       data/syntax/typescript-react.xml
+       data/syntax/velocity.xml
+       data/syntax/verilog.xml
+       data/syntax/vhdl.xml
+       data/syntax/wayland-trace.xml
+       data/syntax/yara.xml
+       data/syntax/zsh.xml
+Copyright: Aaron Puchert
+           2011-2013, Alex Turbov
+           2017-2020, Alex Turbov <i.zaufi@gmail.com>
+           Alex Turbov <i.zaufi@gmail.com>
            2002, Anders Lund <anders@alweb.dk>
-           2012, Antoni Boucher <bouanto@hotmail.com>
-           2007, Aziz Köksal <aziz.koeksal@gmail.com>
-           2011, Caspar Hasenclever
-           2005, Chris Martin <linux@chriscodes.com>
-           2014, Christoph Cullmann <cullmann@kde.org>
-           2008, Chusslove Illich <caslav.ilic@gmx.net>
-           2008, Diggory Hardy
-           2004-2005, Dominik Haumann
-           2016, Dominik Haumann <dhaumann@kde.org>
-           2004-2005, Dominik Haumann <dhdev@gmx.de>
-           2016, Fernand Veilleux <fernveilleux@gmail.com>
-           2002-2018, Free Software Foundation
-           2000-2013, Free Software Foundation, Inc
-           2004, Goffart Olivier
-           2004, Irv Mullins
-           2004, Jan Villat <jan.villat@net2000.ch>
-           2007, Jari-Matti Mäkelä <jmjm@iki.fi>
-           2018, Jeffrey Arnold
-           2012, Johannes Schwenk <johannes.schwenk@adition.com>
-           2011, Jonathan Kolberg <bulldog98@kubuntu-de.org>
-           2012, Jose A. Ruiz
-           2008, Joseph Wenninger
+           Anders Lund <anders@alweb.dk>
+           Andreas Cord-Landwehr <cordlandwehr@kde.org>
+           Andreas Gratzer
+           Andreas Hochsteger <e9625392@student.tuwien.ac.at>
+           B. Kowarsch <trijezdci@github>
+           Bonghyun Kim <bonghyun.d.kim@gmail.com>
+           caminoix + Kamil Skalski (Nazgul)
+           Chad Joan
+           Chris Higgs <chiggs.99@gmail.com>
+           Christoph Cullmann <cullmann@absint.com>
+           Christoph Cullmann <cullmann@kde.org>
+           Daniel Levin <dendy.ua@gmail.com>
+           2005, Dominik Haumann <dhdev@gmx.de>
+           Dominik Haumann <dhaumann@kde.org>
+           Fabian Wunsch <fabian@uriah.heep.sax.de>
+           Florent Ouchet <outchy@users.sourceforge.net>
+           Franchin Matteo <fnch@libero.it>
+           Gary Wang
+           Gennady Telegin <gepo@lvk.cs.msu.su>
+           Gernot Gebhard <gebhard@absint.com>
+           Harald Fernengel
+           I. Elland <igor@elland.me>
+           Jaap Keuter <jaap.keuter@xs4all.nl>
+           Jan Michel <jan@mueschelsoft.de>
+           John Christopher <John@animalsinneed.net>
+           Jonathan Poelen <jonathan.poelen@gmail.com>
+           Jonathan Schmidt-Dominé <devel@the-user.org>
            2001, Joseph Wenninger <jowenn@kde.org>
-           2005, KDE Russian translation team
-           2002-2004, KDE Team
-           2007, KDE i18n Project for Vietnamese
-           2016, Kevin Funk <kfunk@kde.org>
-           2010, Matt Williams <matt@milliams.com>
-           2006-2014, Matthew Woehlke <mw_triad@users.sourceforge.net>
-           2001-2002, Meni Livne <livne@kde.org>
-           2014, Michal Humpula <michal.humpula@seznam.cz>
-           2011, Miquel Sabaté <mikisabate@gmail.com>
+           Joseph Wenninger <jowenn@kde.org>
+           Kevin Funk <kevin.funk@kdab.com>
+           Leonardo Finetti, www.finex.org
+           Luigi Calligaris <luigi.calligaris@stfc.ac.uk>
+           Lyle Putnam <lcputnam@gmail.com>
+           Mario Aichinger
+           Markus Fraenz <fraenz@linmpi.mpg.de>
+           Matthias Böhm (MatthiasBoehm87 _at_ gmail.com)
+           Max Shawabkeh <max99x@gmail.com>
+           Michael Bueker
+           Michael Hansen
+           Miklos Marton <martonmiklosqdev@gmail.com>
+           2006, Mildred <silkensedai@online.fr>
+           Milian Wolff <mail@milianw.de>
            2018, Modula-2 Software Foundation
-           2018-2020, Nibaldo González S <nibgonz@gmail.com>
-           2006, Richard Dale <rdale@foton.es>
-           2008, Robin Pedersen <robinpeder@gmail.com>
-           2007-2009, Rosetta Contributors and Canonical Ltd
-           2007, Sebastian Pipping <webmaster@hartwork.org>
-           2004, Sebastian Vuorinen <sebastian.vuorinen@helsinki.fi>
+           2018-2020, Nibaldo González S. <nibgonz@gmail.com>
+           Nibaldo González <nibgonz@gmail.com>
+           Nikolay Kultashev <nkultashev@yandex.ru>
+           Nikos Chantziaras <realnc@gmail.com>
+           Pablo Oliveira
+           Paul Pogonyshev
+           Per Wigren <wigren@home.se>
+           Postula Loïs <lois.postula@live.be>
+           Robert Kaiser <kairo@kairo.at>
+           Rocky Scaletta <rocky@purdue.edu>
+           Ryan Dalzell <ryan@tullyroan.com>
+           Samu Voutilainen <kde.gherkin-syntax@smar.fi>
+           slbtty <shenlebantongying@gmail.com>
+           Scott Collins <scc@scottcollins.net>
+           Sebastian Pipping <webmaster@hartwork.org>
+           Sebastian Vuorinen
            2003, Simon Huerlimann <simon.huerlimann@access.unizh.ch>
-           2004, Simon J Mackenzie <project.katedxml@smackoz.fastmail.fm>
-           2004, Stefan Lang <langstefan@gmx.at>
-           2002-2019, This_file_is_part_of_KDE
-           2012, Torsten Eichstädt
-           2016, Volker Krause <vkrause@kde.org>
+           Sinel
+           Stefan Endrullis <stefan@endrullis.de>
+           Stefan Stoll, Swiss Federal Institute of Technology, Zurich
+           Thuck <denisdoria@gmail.com>
+           Timothy E. Holy, Washington University in St. Louis
+           2015, The Rust Project Developers
+           Unnamed people and Liu Sizhuang <oldherl@gmail.com>
+           Volker Krause <vkrause@kde.org>
+           Waqar Ahmed <waqar.17a@gmail.com>
+           Werner Braun <wb@o3-software.de>
+           Whitehawk Stormchaser <zerokode@gmx.net>
            2008, Wilbert Berendsen <info@wilbertberendsen.nl>
-           2004-2006, Wilbert Berendsen <wilbert@kde.nl>
-           2012, alexander Kabakov. http://kabakov.wordpress.com
+           Yevgen Voronenko <ysv22@drexel.edu>
+License: MIT
+Comment: Manually collected
+
+Files: autotests/folding/highlight.lgt.fold
+       autotests/folding/test.smali.fold
+       autotests/html/highlight.lgt.dark.html
+       autotests/html/highlight.lgt.html
+       autotests/html/test.smali.dark.html
+       autotests/html/test.smali.html
+       autotests/input/highlight.lgt
+       autotests/input/test.smali
+       autotests/reference/highlight.lgt.ref
+       autotests/reference/test.smali.ref
+Copyright: Logtalk copright holder
+           2006, The Android Open Source Project
+License: Apache-2.0
+Comment: Manually collected
+
+Files: data/syntax/llvm.xml
+       data/syntax/logtalk.xml
+Copyright: LLVM Team
+           Paulo Moura <pmoura@logtalk.org>
+License: Apache-2.0
+Comment: Manually collected
+
+Files: data/syntax/ample.xml
+Copyright: Christian Parg (cparg_(at)_gmx_de)
+License: Apache-2.0_OR_LGPL-2.0-or-later
+ This file comes without any warranty and is licensed under Apache
+ License or LGPL V2 or later
+Comment: Manually collected
+
+Files: data/syntax/lpc.xml
+       data/syntax/template-toolkit.xml
+Copyright: Andreas Klauer <Andreas.Klauer@metamorpher.de>
            2007, Красимир Беров <k.berov@gmail.com>
-License: LGPL-2+
+License: Artistic
 
-Files: autotests/foldingtest.cpp
-       autotests/highlighter_benchmark.cpp
-       autotests/htmlhighlighter_test.cpp
-       autotests/repository_benchmark.cpp
-       autotests/syntaxrepository_test.cpp
-       autotests/test-config.h.in
-       autotests/testhighlighter.cpp
-       autotests/theme_test.cpp
-       autotests/wildcardmatcher_test.cpp
-       data/syntax/apparmor.xml
-       data/syntax/jam.xml
-       data/syntax/logcat.xml
-       data/syntax/rust.xml
-       data/syntax/selinux-cil.xml
-       data/syntax/selinux-fc.xml
-       data/syntax/selinux.xml
-       examples/codeeditor/codeeditor.cpp
-       examples/codeeditor/codeeditor.h
-       examples/codeeditor/main.cpp
-       examples/codepdfprinter/codepdfprinter.cpp
-       examples/codepdfprinter/codepdfprinter.h
-       examples/codepdfprinter/main.cpp
-       src/cli/kate-syntax-highlighter.cpp
-       src/indexer/katehighlightingindexer.cpp
-       src/lib/abstracthighlighter.cpp
-       src/lib/abstracthighlighter.h
-       src/lib/abstracthighlighter_p.h
-       src/lib/context.cpp
-       src/lib/context_p.h
-       src/lib/definition.cpp
-       src/lib/definition.h
-       src/lib/definition_p.h
-       src/lib/definitionref_p.h
-       src/lib/foldingregion.h
-       src/lib/format.cpp
-       src/lib/format_p.h
-       src/lib/htmlhighlighter.cpp
-       src/lib/htmlhighlighter.h
-       src/lib/keywordlist.cpp
-       src/lib/keywordlist_p.h
-       src/lib/matchresult_p.h
-       src/lib/repository.h
-       src/lib/rule_p.h
-       src/lib/state.cpp
-       src/lib/state.h
-       src/lib/state_p.h
-       src/lib/syntaxhighlighter.cpp
-       src/lib/syntaxhighlighter.h
-       src/lib/theme.h
-       src/lib/wildcardmatcher.cpp
-       src/lib/xml_p.h
-Copyright: 2014-2018, Christoph Cullmann <cullmann@kde.org>
-           2018, Dominik Haumann <dhaumann@kde.org>
-           2019, Friedrich W. H. Kossebau <kossebau@kde.org>
-           2006, Mildred <silkensedai@online.fr>
-           2017-2019, Nibaldo González S <nibgonz@gmail.com>
-           2007, Sebastian Pipping <webmaster@hartwork.org>
-           2015, The Rust Project Developers
-           2016, Volker Krause <vkrause@kde.org>
-License: Expat
+Files: autotests/folding/devicedetect.vcl.fold
+       autotests/folding/vmod.vcc.fold
+       autotests/input/devicedetect.vcl
+       autotests/input/vmod.vcc
+Copyright: 2010-2017, Varnish Software AS
+           2016-2018, Varnish Cache project
+License: BSD-2-Clause
+Comment: Automatically extracted
+
+Files: src/quick/CMakeLists.txt
+Copyright: 2018, Eike Hein <hein@kde.org>
+           2021, Volker Krause <vkrause@kde.org>
+License: BSD-3-Clause
+Comment: Automatically extracted
+
+Files: data/syntax/ccss.xml
+       data/syntax/m4.xml
+       data/syntax/purescript.xml
+       data/syntax/tcl.xml
+Copyright: 2011, Cybernetica AS ( http://www.cyber.ee/ )
+           Gleb Popov <6yearold@gmail.com>
+           Irsid - Arcelor Innovation R&D
+           Massimiliano Torromeo
+License: BSD-3-Clause
+Comment: Manually collected
+
+Files: docs/qml-api.md
+       src/quick/qmldir
+Copyright: 2018, Eike Hein <hein@kde.org>
+           2020-2021, Volker Krause <vkrause@kde.org>
+License: CC0-1.0
+Comment: Automatically extracted
+
+Files: data/syntax/carto-css.xml
+Copyright: Lukas Sommer
+License: CC0-1.0
+Comment: Manually collected
+
+Files: data/syntax/doxyfile.xml
+Copyright: 2016-2017, Ernst Maurer <ernst.maurer@gmail.com>
+License: Expat-like-Highscore
 
-Files: autotests/folding/highlight.prg.fold
-       autotests/html/highlight.prg.html
-       autotests/input/highlight.prg
-       autotests/reference/highlight.prg.ref
-       data/syntax/abap.xml
+Files: data/syntax/mediawiki.xml
+Copyright: none
+License: GFDL
+Comment: Manually collected
+
+Files: data/syntax/abap.xml
        data/syntax/asn1.xml
        data/syntax/bitbake.xml
        data/syntax/clipper.xml
        data/syntax/context.xml
-       data/syntax/email.xml
        data/syntax/fasm.xml
        data/syntax/fastq.xml
        data/syntax/freebasic.xml
        data/syntax/gap.xml
        data/syntax/gitolite.xml
-       data/syntax/inform.xml
        data/syntax/j.xml
        data/syntax/json.xml
        data/syntax/mandoc.xml
-       data/syntax/markdown.xml
        data/syntax/monobasic.xml
        data/syntax/nagios.xml
        data/syntax/octave.xml
@@ -149,324 +322,726 @@ Files: autotests/folding/highlight.prg.f
        data/syntax/rmarkdown.xml
        data/syntax/roff.xml
        data/syntax/sed.xml
-       data/syntax/wml.xml
        data/syntax/xharbour.xml
-Copyright: 2005, Carl A Joslin <carl.joslin@joslin.dyndns.org>
-           2008, Darrin Yeager. http://www.dyeager.org
+Copyright: Andor Dávid <david-andor@kozpontiagy.hu>
+           Andrey Cherepanov <sibskull@mail.ru>
+           Bart Sas <bart.sas@gmail.com>
+           Chris Neugebauer <chrisjrn@gmail.com>
+           2005, Davide Bettio <davide.bettio@kdemail.net>
            2014, Dirk Sarpe <dsarpe@posteo.de>
+           Gastón Martini
+           Giancarlo Niccolai <giancarlo@niccolai.ws>
+           greg heil <gheil.j@gmail.com>"
+           Igor Zhuravlov <zhuravlov.ip@ya.ru>
+           Ivan Koveshnikov
            2012, Johannes Schwenk <johannes.schwenk@adition.com>
-           2004, Roland Nagy
+           Jose Joao Morais
+           Luis Silvestre and Federico Zenith
+           Marcos Antonio Alvarez Costales <busgosin@hotmail.com>
+           Matthew Woehlke <mw_triad@users.sourceforge.net>
+           2019, Nibaldo González S. <nibgonz@gmail.com>
+           Philipp A
+           Philipp A. <flying-sheep@web.de>
+           Philippe Rigault
+           Rares Stanciulescu <rstanciu@operamail.com>
+           rCX <rCX12@yahoo.com>
+           2005, Ruben Carlo Benante <dr.beco@gmail.com>
+           Sebastian Pipping <sebastian@pipping.org>
 License: GPL
+Comment: Manually collected
 
-Files: autotests/folding/light52_muldiv.vhdl.fold
-       autotests/folding/or1200_du.v.fold
-       autotests/input/light52_muldiv.vhdl
-       autotests/input/or1200_du.v
-       data/syntax/ansforth94.xml
-       data/syntax/maxima.xml
-       data/syntax/yang.xml
-Copyright: 2008, Alexey V. Beshenov <al@beshenov.ru>
-           2000-2010, Authors and OPENCORES.ORG
-           1991-1999, Free Software Foundation, Inc
-           2012, Jose A. Ruiz
-           2011, Mark Corbin <mark@dibsco.co.uk>
-License: LGPL-2.1+
+Files: data/syntax/markdown.xml
+Copyright: 2009, Claes Holmerson. http://github.com/claes/kate-markdown/
+           2008, Darrin Yeager. http://www.dyeager.org/
+License: GPL_OR_BSD_with_parts_under_MIT
+ Dual-Licensed under both GPL and BSD licenses.
+ .
+ changes under MIT license
+Comment: Manually collected
+
+Files: autotests/folding/test.bb.fold
+       autotests/input/test.bb
+Copyright: 2009, Chris Schlaeger <chris@linux.com>
+License: GPL-2.0-only
+Comment: Manually collected
+
+Files: data/syntax/nesc.xml
+       data/syntax/r.xml
+       data/syntax/taskjuggler.xml
+Copyright: 2009, Chris Schlaeger <chris@linux.com>
+           Shakthi Kannan
+           2006, Thomas Friedrichsmeier, Arne Henningsen, and the RKWard Team
+License: GPL-2.0-only
+Comment: Manually collected
 
 Files: data/syntax/asm-avr.xml
-       data/syntax/gnuassembler.xml
        data/syntax/go.xml
        data/syntax/ilerpg.xml
+       data/syntax/inform.xml
        data/syntax/mel.xml
        data/syntax/nasm.xml
        data/syntax/replicode.xml
-Copyright: 2002, John Zaitseff
-           2014, Martin Sandsmark
+       data/syntax/wml.xml
+       data/syntax/gnuassembler.xml
+Copyright: Bogdan Drozdowski <bogdandr@op.pl>
+           Karl Erlandsen <karlerlandsen@yahoo.com>
+           2008-2011, Ignacio Riquelme Morelle <shadowm2006@gmail.com>
+           2002, John Zaitseff <J.Zaitseff@zap.org.au>
+           2010, Jonathan Schmidt-Dominé <devel@the-user.org>
+           2011, Lyle Putnam <lcputnam@gmail.com>
+           2014, Martin Sandsmark <martin.sandsmark@kde.org>
            2010, Miquel Sabaté <mikisabate@gmail.com>
-           2003, Nick Roux
+           2003-2006, Nick Roux <nick@sundown.homeip.net>
+           Nicola Gigante <nicola.gigante@gmail.com>
            2004, Roland Nagy
-License: GPL-2+
-
-Files: autotests/folding/highlight.gdb.fold
-       autotests/html/highlight.gdb.html
-       autotests/input/highlight.gdb
-       autotests/reference/highlight.gdb.ref
-       data/syntax/systemverilog.xml
-       data/syntax/vera.xml
-Copyright: Sean O'Boyle <seanoboyle@intelligentdv.com>
-License: GPL-3+
-
-Files: data/syntax/varnish.xml
-       data/syntax/varnishcc.xml
-       data/syntax/varnishtest.xml
-Copyright: Xavier Guerrin <xavier@tuxfamily.org>
-License: WTFPL
+           2002, Roland Pabel <roland@pabel.name>
+           2021, Waqar Ahmed <waqar.17a@gmail.com>
+           Zachary Palmer <zep01@bahj.com>
+License: GPL-2.0-or-later
+Comment: Manually collected
 
-Files: autotests/folding/test.bb.fold
-       autotests/input/test.bb
-       data/syntax/nesc.xml
-       data/syntax/r.xml
-       data/syntax/taskjuggler.xml
-Copyright: 2009, Chris Schlaeger <chris@linux.com>
-           2006, Thomas Friedrichsmeier, Arne Henningsen, and the RKWard Team
-License: GPL-2
+Files: data/syntax/kconfig.xml
+Copyright: Martin Walch <walch.martin@web.de>
+License: GPL-3.0-only
+Comment: Manually collected
 
-Files: data/syntax/erlang.xml
-       data/syntax/modelica.xml
+Files: data/syntax/systemverilog.xml
+       data/syntax/vera.xml
+Copyright: 2008-2009, Sean O'Boyle <seanoboyle@intelligentdv.com>
+License: GPL-3.0-or-later
+Comment: Manually collected
+
+Files: data/generators/generate-php.pl
+       data/syntax/4dos.xml
+       data/syntax/abc.xml
+       data/syntax/actionscript.xml
+       data/syntax/agda.xml
+       data/syntax/ansys.xml
+       data/syntax/apache.xml
+       data/syntax/asm-dsp56k.xml
+       data/syntax/asm-m68k.xml
+       data/syntax/asp.xml
+       data/syntax/ats.xml
+       data/syntax/awk.xml
+       data/syntax/bash.xml
+       data/syntax/bibtex.xml
+       data/syntax/bmethod.xml
+       data/syntax/boo.xml
+       data/syntax/cg.xml
+       data/syntax/cisco.xml
+       data/syntax/cpp.xml
+       data/syntax/css.xml
+       data/syntax/curry.xml
+       data/syntax/d.xml
+       data/syntax/djangotemplate.xml
+       data/syntax/dosbat.xml
+       data/syntax/dtd.xml
+       data/syntax/erlang.xml
+       data/syntax/fgl-4gl.xml
+       data/syntax/fgl-per.xml
+       data/syntax/fish.xml
+       data/syntax/fsharp.xml
+       data/syntax/gcc.xml
+       data/syntax/gdb.xml
+       data/syntax/gdb-bt.xml
+       data/syntax/gdbinit.xml
+       data/syntax/git-ignore.xml
+       data/syntax/git-rebase.xml
+       data/syntax/glosstex.xml
+       data/syntax/glsl.xml
+       data/syntax/groovy.xml
+       data/syntax/haml.xml
+       data/syntax/hamlet.xml
+       data/syntax/haskell.xml
+       data/syntax/html.xml
+       data/syntax/idris.xml
+       data/syntax/ini.xml
+       data/syntax/isocpp.xml
+       data/syntax/java.xml
+       data/syntax/javadoc.xml
+       data/syntax/jsp.xml
+       data/syntax/latex.xml
+       data/syntax/less.xml
+       data/syntax/lex.xml
+       data/syntax/lilypond.xml
+       data/syntax/literate-curry.xml
+       data/syntax/literate-haskell.xml
+       data/syntax/m3u.xml
+       data/syntax/mako.xml
+       data/syntax/mathematica.xml
+       data/syntax/meson.xml
+       data/syntax/metafont.xml
+       data/syntax/modula-3.xml
+       data/syntax/mup.xml
+       data/syntax/ocaml.xml
+       data/syntax/ocamllex.xml
+       data/syntax/ocamlyacc.xml
+       data/syntax/pango.xml
        data/syntax/perl.xml
+       data/syntax/picsrc.xml
+       data/syntax/povray.xml
        data/syntax/praat.xml
-Copyright: 2001-2004, Anders Lund <anders@alweb.dk>
+       data/syntax/protobuf.xml
+       data/syntax/pug.xml
+       data/syntax/purebasic.xml
+       data/syntax/rapidq.xml
+       data/syntax/relaxng.xml
+       data/syntax/relaxngcompact.xml
+       data/syntax/rib.xml
+       data/syntax/scala.xml
+       data/syntax/scss.xml
+       data/syntax/sisu.xml
+       data/syntax/spice.xml
+       data/syntax/sql.xml
+       data/syntax/sql-mysql.xml
+       data/syntax/sql-oracle.xml
+       data/syntax/sql-postgresql.xml
+       data/syntax/stata.xml
+       data/syntax/tcsh.xml
+       data/syntax/texinfo.xml
+       data/syntax/textile.xml
+       data/syntax/valgrind-suppression.xml
+       data/syntax/xml.xml
+       data/syntax/xorg.xml
+       data/syntax/xslt.xml
+       data/syntax/xul.xml
+       data/syntax/yacc.xml
+Copyright: Aaron Miller <armantic101@gmail.com>
+           Alain GIBAUD <alain.gibaud@univ-valenciennes.fr>
+           2012, Alex Turbov <i.zaufi@gmail.com>
+           Alex Turbov <i.zaufi@gmail.com>
+           2012, Alexander Kabakov <kabakov.as@gmail.com>
+           Alexander Clay <Tuireann@EpicBasic.org>;Sven Langenkamp <ace@kylixforum.de>
+           Alexander Shabalin
+           Alfredo Luiz Foltran Fialho <alfoltran@ig.com.br>
+           2001-2004, Anders Lund <anders@alweb.dk>
+           Anders Lund <anders@alweb.dk>
+           2005, Andrea Primiani <primiani@dag.it>
+           Andrej Falout <andrej@falout.org>
+           Andrey Karepin <egdfree@opensuse.org>
+           Andriy Lesyuk <s-andy@in.if.ua>
+           Antonio Salazar <savedfastcool@gmail.com>
+           Arnd Diestelhorst <adiestelhorst@m-xchg.de>
+           2007, Aziz Köksal <aziz.koeksal@gmail.com>
+           Bas Bossink <bas.bossink@gmail.com>
+           Bastian Holst <bastianholst@gmx.de>
            2007, Bill Ross <bill@emailme.net.au>
+           Björn Peemöller <bjp@informatik.uni-kiel.de>
+           Chris Reeves <chris@ev-soft.net>
+           2004, Christoph Hormann <chris_hormann@gmx.de>
+           Cies Breijs (cies_at_kde_nl)
+           Daniel Franke <franke.daniel@gmail.com>
+           David Williams <david@david-williams.info>
+           Florian Schanda <florian.schanda@schanda.de>
+           Giovanni Bacci <giovanni@castellodilari.it>
+           Glyn Webster <glynwebster@orcon.net.nz> and Vincent Hugot <vincent.hugot@gmail.com>
+           Guo Yunhe <guoyunhebrave@gmail.com>
+           Holger Danielsson <holger.danielsson@versanet.de>
+           Ivo Anjo <knuckles@gmail.com>
+           2005, Iztok Kobal <iztok.kobal@siol.net>
+           Jan Janssen <medhefgo@googlemail.com>
+           Jan Janssen <medhefgo@web.de>
+           2004, Jan Villat <jan.villat@net2000.ch>
+           Jan Villat <jan.villat@net2000.ch>
+           2007, Jari-Matti Mäkelä <jmjm@iki.fi>
+           Jeroen Wijnhout <Jeroen.Wijnhout@kdemail.net>
+           Jonathan Schmidt-Domniné <devel@the-user.org>
            2016, José Joaquín Atria <jjatria@gmail.com>
-License: LGPL-2
-
-Files: autotests/folding/test.smali.fold
-       autotests/html/test.smali.html
-       autotests/input/test.smali
-       autotests/reference/test.smali.ref
-Copyright: 2006, The Android Open Source Project
-           2006, The Android Open Source Project</Comment>
-           2006, The Android Open Source Project</span>
-License: Apache-2
+           Joseph Wenninger <jowenn@kde.org>
+           kate project
+           Kiwamu Okabe <kiwamu@debian.or.jp>
+           Larry Radbill (Larry.Radbill gmail com)
+           Marc Dassonneville
+           Marc Dassonneville <marc.dassonneville@gmail.com>
+           Matthew Marshall <matthew@matthewmarshall.org>
+           2006-2010, Matthew Woehlke <mw_triad@users.sourceforge.net>
+           Matthias C. M. Troffaes
+           Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+           Michel Ludwig <michel.ludwig@kdemail.net>
+           Milian Wolff <mail@milianw.de>
+           Miro Kropacek <miro.kropacek@gmail.com>
+           Nicolas Wu <zenzike@gmail.com>
+           Oliver Richers <o.richers@tu-bs.de>
+           Orgad Shaneh <orgads@gmail.com>
+           2004, Peter Lammich (views@gmx.de)
+           Ralph Amissah <ralph.amissah@gmail.com>
+           Raphaël GRAPINET
+           Rob Martin <rob@gamepimp.com>
+           Shane Wright <me@shanewright.co.uk>
+           2004, Simon J Mackenzie <project.katedxml@smackoz.fastmail.fm>
+           Slawomir Mikula <slawek.mikula@gmail.com>
+           Stefan Huebner <st0ff@npl.de>
+           Stephane Micheloud <stephane.micheloud@epfl.ch>
+           Steven Robson <s.a.robson@sms.ed.ac.uk> and Anders Lund
+           Sven Brauch <svenbrauch@gmail.com>
+           Rintze Zelle
+           Thomas Braun <braun@physik.fu-berlin.de>
+           Thomas Braun <thomas.braun@virtuell-zuhause.de>
+           2007, Thomas Schraitle (tom_schr AT web DOT de)
+           Tiberiu Dragulinescu
+           Yedvilun <yedvilun@gmail.com>
+           Yury Lebedev <yurylebedev@mail.ru>
+           Whitehawk Stormchaser <zerokode@gmx.net>
+           Wilbert Berendsen <wilbert@kde.nl>
+License: LGPL-2.0-only
+Comment: Manually collected
+
+Files: data/syntax/yaml.xml
+Copyright: Dr Orlovsky MA <maxim@orlovsky.info>
+           Nibaldo González S. <nibgonz@gmail.com>
+License: LGPL-2.0-only_with_parts_under_MIT
+ Original work under the LGPL.
+ .
+ Modifications under the MIT license.
+
+Files: data/generators/cmake.xml.tpl
+       data/generators/qmake-gen.py
+       data/syntax/cmake.xml
+Copyright: 2013-2020, Alex Turbov <i.zaufi@gmail.com>
+           2004, Alexander Neundorf <neundorf@kde.org>
+           2005, Dominik Haumann <dhdev@gmx.de>
+           2016, Kevin Funk <kfunk@kde.org>
+           2007-2014, Matthew Woehlke <mw_triad@users.sourceforge.net>
+License: LGPL-2.0-or-later
+Comment: Automatically extracted
+
+Files: data/syntax/clojure.xml
+       data/syntax/euphoria.xml
+       data/syntax/elixir.xml
+       data/syntax/ftl.xml
+       data/syntax/gcode.xml
+       data/syntax/k.xml
+       data/syntax/kotlin.xml
+       data/syntax/mergetagtext.xml
+       data/syntax/modelica.xml
+       data/syntax/nsis.xml
+       data/syntax/ply.xml
+       data/syntax/prolog.xml
+       data/syntax/puppet.xml
+       data/syntax/pure.xml
+       data/syntax/q.xml
+       data/syntax/rhtml.xml
+       data/syntax/stl.xml
+       data/syntax/systemc.xml
+       data/syntax/toml.xml
+       data/syntax/vala.xml
+       data/syntax/vrml.xml
+       data/syntax/wavefront-obj.xml
+       data/syntax/xonotic-console.xml
+Copyright: Albert Graef
+           2012, Antoni Boucher <bouanto@hotmail.com>
+           2016, Boris Egorov <egorov@linux.com>
+           2011, Caspar Hasenclever
+           2005, Chris Martin <linux@chriscodes.com>
+           Christian Parg <cparg@gmx.de>
+           2008, Diggory Hardy <diggory.hardy@gmail.com>
+           2004, Dominik Haumann
+           2016, Fernand Veilleux <fernveilleux@gmail.com>
+           flying-sheep@web.de
+           2008, Federico Zenith, Max Planck Institute for Complex Technical Systems, Magdeburg (Germany)
+           2004, Irv Mullins <irvm@ellijay.com>
+           James Schmitz <james.schmitz@gmail.com>
+           2008, Joseph Wenninger <jowenn@kde.org>
+           Kevin Funk <kfunk@kde.org>
+           Matthias Mailänder <matthias.mailaender@vogella.com>
+           2014, Michal Humpula <michal.humpula@seznam.cz>
+           2011, Miquel Sabaté <mikisabate@gmail.com>
+           Radomir Svancer <svancer@gmail.com>
+           2006, Richard Dale <rdale@foton.es>
+           Robert Kratky <kratky@rob.cz>>
+           2008, Robin Pedersen <robinpeder@gmail.com>
+           2014, Rubén Caro <ruben.caro.estevez@gmail.com>
+           2004, Sebastian Vuorinen (sebastian dot vuorinen at helsinki dot fi)
+           2004, Stefan Lang <langstefan@gmx.at>
+           Sergey Mashkov <sergey.mashkov@jetbrains.com>
+           2012, Torsten Eichstädt <torsten.eichstaedt@web.de>
+           Volker Krause <vkrause@kde.org>
+           2006, Wilbert Berendsen <wilbert@kde.nl>
+License: LGPL-2.0-or-later
+Comment: Manually collected
+
+Files: data/syntax/hunspell-aff.xml
+       data/syntax/hunspell-dat.xml
+       data/syntax/hunspell-dic.xml
+       data/syntax/hunspell-idx.xml
+       data/syntax/rtf.xml
+Copyright: Lukas Sommer
+License: LGPL-2.1-only_OR_LGPL-3.0-only_OR_LicenseRef-KDE-Accepted-LGPL
+Comment: Manually collected
 
 Files: po/ca/*
        po/ca@valencia/*
        po/uk/*
-Copyright: 2016-2020, This_file_is_part_of_KDE
-License: LGPL-2.1+3+KDEeV
+Copyright: 2016-2022, This_file_is_part_of_KDE
+License: LGPL-2.1-only_OR_LGPL-3.0-only_OR_LicenseRef-KDE-Accepted-LGPL
+Comment: Manually collected
 
-Files: data/syntax/kdesrc-buildrc.xml
-       data/syntax/lsl.xml
-Copyright: Michael Pyne <mpyne@kde.org>
-           Rafał Rzepeck
-License: LGPL-3
+Files: autotests/folding/light52_muldiv.vhdl.fold
+       autotests/folding/or1200_du.v.fold
+       autotests/input/light52_muldiv.vhdl
+       autotests/input/or1200_du.v
+Copyright: 2000, Authors and OPENCORES.ORG
+           2012, Jose A. Ruiz
+License: LGPL-2.1-or-later
+Comment: Manually collected
 
-Files: data/syntax/elixir.xml
-Copyright: 2016, Boris Egorov <egorov@linux.com>
-           2014, Rubén Caro <ruben.caro.estevez@gmail.com>
-License: GPL_LGPL-2+
-Comment: The xml attribution and the licensing information in the comments
- don't match, probably a typo in the attribution.
+Files: data/syntax/ansforth94.xml
+       data/syntax/yang.xml
+       data/syntax/maxima.xml
+Copyright: 2008, Alexey V. Beshenov <al@beshenov.ru>
+           2011, Mark Corbin <mark@dibsco.co.uk>
+           Nicolás Alvarez
+License: LGPL-2.1-or-later
+Comment: Manually collected
 
-Files: data/syntax/kconfig.xml
-Copyright: Martin Walch <walch.martin@web.de>
-License: GPL-3
+Files: data/syntax/kdesrc-buildrc.xml
+       data/syntax/lsl.xml
+Copyright: Rafał Rzepeck
+           Michael Pyne <mpyne@kde.org>
+License: LGPL-3.0-only
+Comment: Manually collected
+
+Files: data/syntax/fstab.xml
+       data/syntax/ppd.xml
+       data/syntax/rpmspec.xml
+       data/syntax/vcard.xml
+Copyright: Diego Iastrubni <elcuco@kde.org>
+           Lukas Sommer
+License: Public_Domain
+ These files are waived under the Public Domain.
 
-Files: data/syntax/m4.xml
-Copyright: 2011, Cybernetica AS ( http://www.cyber.ee/ )
-License: BSD-3-clause
+Files: data/syntax/nim.xml
+       data/syntax/varnish.xml
+       data/syntax/varnishcc.xml
+       data/syntax/varnishtest.xml
+Copyright: github.com/juancarlospaco
+           Xavier Guerrin <xavier@tuxfamily.org>
+License: WTFPL
 
-Files: data/syntax/doxyfile.xml
-Copyright: 2016-2017, Ernst Maurer <ernst.maurer@gmail.com>
-License: Expat-like-Highscore
+Files: data/syntax/cubescript.xml
+Copyright: Kevin Meyer
+License: ZLib
 
 Files: debian/*
-Copyright: 2014, Scarlett Clark <scarlett@scarlettgatelyclark.com>
+Copyright: 2022, Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+           2014, Scarlett Clark <scarlett@scarlettgatelyclark.com>
            2016, Maximiliano Curia <maxy@debian.org>
-License: LGPL-2+
+License: LGPL-2.0-or-later
 
-License: Apache-2
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License"); you
+ may not use this file except in compliance with the License. You may
+ obtain a copy of the License at
  .
-      http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
  .
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied. See the License for the specific language governing
+ permissions and limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache License, Version
+ 2.0 can be found in `/usr/share/common-licenses/Apache-2.0’.
+
+License: Artistic
+ On Debian systems, the complete text of the Artistic license can be
+ found in `/usr/share/common-licenses/Artistic’.
+
+License: BSD-2-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
  .
- The complete text of the GNU General Public License can be found in
- `/usr/share/common-licenses/Apache-2.0'.
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
 
-License: BSD-3-clause
+License: BSD-3-Clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
  .
- 1. Redistributions of source code must retain the copyright
+ 1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
-    derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to
- deal in the Software without restriction, including without limitation the
- rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- sell copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- IN THE SOFTWARE.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+ .
+ 3. Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+License: CC0-1.0
+ To the extent possible under law, the author(s) have dedicated all
+ copyright and related and neighboring rights to this software to the
+ public domain worldwide. This software is distributed without any
+ warranty.
+ .
+ You should have received a copy of the CC0 Public Domain Dedication
+ along with this software. If not, see
+ <https://creativecommons.org/publicdomain/zero/1.0/>.
+ .
+ On Debian systems, the complete text of the CC0 Public Domain
+ Dedication can be found in `/usr/share/common-licenses/CC0-1.0’.
 
 License: Expat-like-Highscore
- Permission to use, copy, modify, and distribute this software
- and its documentation for any purpose and without fee is hereby
- granted, provided that the above copyright notice appear in all
- copies and that both that the copyright notice and this
- permission notice and warranty disclaimer appear in supporting
- documentation, and that the name of the author not be used in
- advertising or publicity pertaining to distribution of the
- software without specific, written prior permission.
- .
- The author disclaim all warranties with regard to this
- software, including all implied warranties of merchantability
- and fitness.  In no event shall the author be liable for any
- special, indirect or consequential damages or any damages
- whatsoever resulting from loss of use, data or profits, whether
- in an action of contract, negligence or other tortious action,
- arising out of or in connection with the use or performance of
- this software.
+ Permission to use, copy, modify, and distribute this software and
+ its documentation for any purpose and without fee is hereby granted,
+ provided that the above copyright notice appear in all copies and
+ that both that the copyright notice and this permission notice and
+ warranty disclaimer appear in supporting documentation, and that the
+ name of the author not be used in advertising or publicity
+ pertaining to distribution of the software without specific, written
+ prior permission.
+ .
+ The author disclaim all warranties with regard to this software,
+ including all implied warranties of merchantability and fitness.  In
+ no event shall the author be liable for any special, indirect or
+ consequential damages or any damages whatsoever resulting from loss
+ of use, data or profits, whether in an action of contract,
+ negligence or other tortious action, arising out of or in connection
+ with the use or performance of this software.
+
+License: GFDL
+ On Debian systems, the complete text of the GNU Free Documentation
+ License can be found in `/usr/share/common-licenses/GFDL’.
 
 License: GPL
- The complete text of the GNU General Public License can be found in
- `/usr/share/common-licenses/GPL'.
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in `/usr/share/common-licenses/GPL’.
 
-License: GPL-2
- The complete text of the GNU General Public License version 2 can be found in
- "/usr/share/common-licenses/GPL-2".
+License: GPL-2.0-only
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2.
+ .
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA. Also add information on how to contact you by
+ electronic and paper mail.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in
+ `/usr/share/common-licenses/GPL-2’.
 
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
+License: GPL-2.0-or-later
+ This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.
  .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA. Also add information on how to contact you by
+ electronic and paper mail.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in
+ `/usr/share/common-licenses/GPL-2’.
 
-License: GPL-3
- The complete text of the GNU General Public License version 3 can be found in
- `/usr/share/common-licenses/GPL-3'.
+License: GPL-3.0-only
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GPL License as published by the Free
+ Software Foundation, version 3.
+ .
+ This package is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License version 3 can be found in
+ `/usr/share/common-licenses/GPL-3’.
 
-License: GPL-3+
+License: GPL-3.0-or-later
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, either version 3 of the License, or
  (at your option) any later version.
  .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- The complete text of the GNU General Public License version 3 can be found in
- `/usr/share/common-licenses/GPL-3'.
-
-License: GPL_LGPL-2+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Library General Public License for more details.
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA  02110-1301, USA.
- .
- The complete text of the GNU Library General Public License version 2 can be
- found in `/usr/share/common-licenses/LGPL-2', likewise, the complete text of
- the GNU General Public License can be found in
- `/usr/share/common-licenses/GPL'.
-
-License: LGPL-2
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License version 2 as published by the Free Software Foundation.
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see
+ <http://www.gnu.org/licenses/>.
  .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
+ On Debian systems, the complete text of the GNU General Public
+ License version 3 can be found in
+ `/usr/share/common-licenses/GPL-3’.
+
+License: LGPL-2.0-only
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Library General Public License version
+ 2 as published by the Free Software Foundation.
+ .
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Library General Public License for more details.
  .
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB.  If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301, USA.
  .
  On Debian systems, the complete text of the GNU Library General
- Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
+ Public License version 2 can be found in
+ `/usr/share/common-licenses/LGPL-2’.
 
-License: LGPL-2+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
+License: LGPL-2.0-or-later
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option)  any later version.
  .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Library General Public License for more details.
  .
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB.  If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301, USA.
  .
  On Debian systems, the complete text of the GNU Library General
- Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
+ Public License version 2 can be found in
+ `/usr/share/common-licenses/LGPL-2’.
 
-License: LGPL-2.1+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+License: LGPL-2.1-only_OR_LGPL-3.0-only_OR_LicenseRef-KDE-Accepted-LGPL
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of the
+ License, or (at your option) version 3, or any later version
+ accepted by the membership of KDE e.V. (or its successor approved by
+ the membership of KDE e.V.), which shall act as a proxy defined in
+ Section 6 of version 3 of the license.
  .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
  .
- On Debian systems, the complete text of the GNU Lesser General Public License
- version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
-
-License: LGPL-2.1+3+KDEeV
- This file is distributed under the license LGPL version 2.1 or
- version 3 or later versions approved by the membership of KDE e.V.
- .
- The complete text of the GNU Lesser General Public License version 2.1
- can be found in `/usr/share/common-licenses/LGPL-2.1', likewise,
- the complete text of the GNU Lesser General Public License version 3
- can be found in `/usr/share/common-licenses/LGPL-3'.
-
-License: LGPL-3
- The complete text of the GNU Lesser General Public License version 3 can be
- found in `/usr/share/common-licenses/LGPL-3'.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.  If not, see
+ <https://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License version 2.1 can be found in
+ `/usr/share/common-licenses/LGPL-2.1’, likewise, the complete text
+ of the GNU Lesser General Public License version 3 can be found in
+ `/usr/share/common-licenses/LGPL-3’.
+
+License: LGPL-2.1-or-later
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of the
+ License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301  USA Also add information on how to contact you by
+ electronic and paper mail.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License version 2.1 can be found in
+ `/usr/share/common-licenses/LGPL-2.1’.
+
+License: LGPL-3.0-only
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License version
+ 3 as published by the Free Software Foundation.
+ .
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library.  If not, see
+ <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License version 3 can be found in
+ `/usr/share/common-licenses/LGPL-3’.
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation files
+ (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge,
+ publish, distribute, sublicense, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
 
 License: WTFPL
  Everyone is permitted to copy and distribute verbatim or modified
@@ -477,3 +1052,23 @@ License: WTFPL
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
  .
  0. You just DO WHAT THE FUCK YOU WANT TO.
+
+License: ZLib
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any
+ damages arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any
+ purpose, including commercial applications, and to alter it and
+ redistribute it freely, subject to the following restrictions:
+ .
+     1. The origin of this software must not be misrepresented; you
+     must not claim that you wrote the original software. If you use
+     this software in a product, an acknowledgment in the product
+     documentation would be appreciated but is not required.
+ .
+     2. Altered source versions must be plainly marked as such, and
+     must not be misrepresented as being the original software.
+ .
+     3. This notice may not be removed or altered from any source
+     distribution.
diff -pruN 5.94.0-1/debian/libkf5syntaxhighlighting-tools.lintian-overrides 5.96.0-1/debian/libkf5syntaxhighlighting-tools.lintian-overrides
--- 5.94.0-1/debian/libkf5syntaxhighlighting-tools.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ 5.96.0-1/debian/libkf5syntaxhighlighting-tools.lintian-overrides	2022-07-31 11:33:00.000000000 +0000
@@ -0,0 +1 @@
+libkf5syntaxhighlighting-tools: no-manual-page [usr/bin/kate-syntax-highlighter]
diff -pruN 5.94.0-1/debian/source/lintian-overrides 5.96.0-1/debian/source/lintian-overrides
--- 5.94.0-1/debian/source/lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ 5.96.0-1/debian/source/lintian-overrides	2022-07-31 11:33:00.000000000 +0000
@@ -0,0 +1,2 @@
+# Test files may not look very nice and have long lines but they’re definitely the original sources
+ksyntax-highlighting source: source-is-missing [autotests/html/*]
diff -pruN 5.94.0-1/examples/codeeditor/codeeditor.cpp 5.96.0-1/examples/codeeditor/codeeditor.cpp
--- 5.94.0-1/examples/codeeditor/codeeditor.cpp	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/examples/codeeditor/codeeditor.cpp	2022-07-02 16:03:19.000000000 +0000
@@ -6,10 +6,10 @@
 
 #include "codeeditor.h"
 
-#include <definition.h>
-#include <foldingregion.h>
-#include <syntaxhighlighter.h>
-#include <theme.h>
+#include <KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/FoldingRegion>
+#include <KSyntaxHighlighting/SyntaxHighlighter>
+#include <KSyntaxHighlighting/Theme>
 
 #include <QActionGroup>
 #include <QApplication>
diff -pruN 5.94.0-1/examples/codeeditor/codeeditor.h 5.96.0-1/examples/codeeditor/codeeditor.h
--- 5.94.0-1/examples/codeeditor/codeeditor.h	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/examples/codeeditor/codeeditor.h	2022-07-02 16:03:19.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef CODEEDITOR_H
 #define CODEEDITOR_H
 
-#include <repository.h>
+#include <KSyntaxHighlighting/Repository>
 
 #include <QPlainTextEdit>
 
diff -pruN 5.94.0-1/examples/codepdfprinter/codepdfprinter.cpp 5.96.0-1/examples/codepdfprinter/codepdfprinter.cpp
--- 5.94.0-1/examples/codepdfprinter/codepdfprinter.cpp	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/examples/codepdfprinter/codepdfprinter.cpp	2022-07-02 16:03:19.000000000 +0000
@@ -6,9 +6,9 @@
 
 #include "codepdfprinter.h"
 
-#include <definition.h>
-#include <syntaxhighlighter.h>
-#include <theme.h>
+#include <KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/SyntaxHighlighter>
+#include <KSyntaxHighlighting/Theme>
 
 #include <QDebug>
 #include <QFile>
diff -pruN 5.94.0-1/examples/codepdfprinter/codepdfprinter.h 5.96.0-1/examples/codepdfprinter/codepdfprinter.h
--- 5.94.0-1/examples/codepdfprinter/codepdfprinter.h	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/examples/codepdfprinter/codepdfprinter.h	2022-07-02 16:03:19.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef CODEPDFPRINTER_H
 #define CODEPDFPRINTER_H
 
-#include <repository.h>
+#include <KSyntaxHighlighting/Repository>
 
 #include <QTextDocument>
 
diff -pruN 5.94.0-1/examples/minimal/main.cpp 5.96.0-1/examples/minimal/main.cpp
--- 5.94.0-1/examples/minimal/main.cpp	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/examples/minimal/main.cpp	2022-07-02 16:03:19.000000000 +0000
@@ -9,11 +9,11 @@
 #include <QDebug>
 #include <QPlainTextEdit>
 
-#include <definition.h>
-#include <foldingregion.h>
-#include <repository.h>
-#include <syntaxhighlighter.h>
-#include <theme.h>
+#include <KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/FoldingRegion>
+#include <KSyntaxHighlighting/Repository>
+#include <KSyntaxHighlighting/SyntaxHighlighter>
+#include <KSyntaxHighlighting/Theme>
 
 int main(int argc, char **argv)
 {
diff -pruN 5.94.0-1/po/bg/syntaxhighlighting5_qt.po 5.96.0-1/po/bg/syntaxhighlighting5_qt.po
--- 5.94.0-1/po/bg/syntaxhighlighting5_qt.po	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/po/bg/syntaxhighlighting5_qt.po	2022-07-02 16:03:19.000000000 +0000
@@ -3,2025 +3,1414 @@
 #
 # Zlatko Popov <zlatkopopov@fsa-bg.org>, 2006, 2007, 2009.
 # Yasen Pramatarov <yasen@lindeas.com>, 2010, 2011.
+# Mincho Kondarev <mkondarev@yahoo.de>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: katepart4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2016-09-08 07:30+0000\n"
-"PO-Revision-Date: 2011-07-12 21:14+0300\n"
-"Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
-"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"PO-Revision-Date: 2022-06-28 09:54+0200\n"
+"Last-Translator: Mincho Kondarev <mkondarev@yahoo.de>\n"
+"Language-Team: Bulgarian <kde-i18n-doc@kde.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 22.04.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Qt-Contexts: true\n"
 
 msgctxt "Language|"
 msgid "4DOS BatchToMemory"
-msgstr ""
+msgstr "4DOS BatchToMemory"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "ABAP"
 msgctxt "Language|"
 msgid "ABAP"
 msgstr "ABAP"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "ABC"
 msgctxt "Language|"
 msgid "ABC"
 msgstr "ABC"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "ActionScript 2.0"
 msgctxt "Language|"
 msgid "ActionScript 2.0"
 msgstr "ActionScript 2.0"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Ada"
 msgctxt "Language|"
 msgid "Ada"
 msgstr "Ada"
 
 msgctxt "Language|"
 msgid "Agda"
-msgstr ""
+msgstr "Agda"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "AHDL"
 msgctxt "Language|"
 msgid "AHDL"
 msgstr "AHDL"
 
 msgctxt "Language|"
 msgid "AutoHotKey"
-msgstr ""
+msgstr "AutoHotKey"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Alerts"
 msgctxt "Language|"
 msgid "Alerts"
-msgstr "Предупреждения"
+msgstr "Alerts"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "AMPLE"
 msgctxt "Language|"
 msgid "AMPLE"
 msgstr "AMPLE"
 
 msgctxt "Language|"
 msgid "ANS-Forth94"
-msgstr ""
+msgstr "ANS-Forth94"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "ANSI C89"
 msgctxt "Language|"
 msgid "ANSI C89"
 msgstr "ANSI C89"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Ansys"
 msgctxt "Language|"
 msgid "Ansys"
 msgstr "Ansys"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Apache Configuration"
 msgctxt "Language|"
 msgid "Apache Configuration"
-msgstr "Настройки на Apache"
+msgstr "Конфигурация на Apache"
 
 msgctxt "Language|"
 msgid "AppArmor Security Profile"
-msgstr ""
+msgstr "Профил за защита на AppArmor"
 
 msgctxt "Language|"
 msgid "AsciiDoc"
-msgstr ""
+msgstr "AsciiDoc"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Asm6502"
 msgctxt "Language|"
 msgid "Asm6502"
 msgstr "Asm6502"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "AVR Assembler"
 msgctxt "Language|"
 msgid "AVR Assembler"
 msgstr "AVR Асемблер"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Motorola DSP56k"
 msgctxt "Language|"
 msgid "Motorola DSP56k"
 msgstr "Motorola DSP56k"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Motorola 68k (VASM/Devpac)"
 msgctxt "Language|"
 msgid "Motorola 68k (VASM/Devpac)"
 msgstr "Motorola 68k (VASM/Devpac)"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "ASN.1"
 msgctxt "Language|"
 msgid "ASN.1"
 msgstr "ASN.1"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "ASP"
 msgctxt "Language|"
 msgid "ASP"
 msgstr "ASP"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "ASP"
 msgctxt "Language|"
 msgid "ATS"
-msgstr "ASP"
+msgstr "ATS"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "AWK"
 msgctxt "Language|"
 msgid "AWK"
 msgstr "AWK"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Bash"
 msgctxt "Language|"
 msgid "Bash"
 msgstr "Bash"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "BibTeX"
 msgctxt "Language|"
 msgid "BibTeX"
 msgstr "BibTeX"
 
 msgctxt "Language|"
 msgid "Bitbake"
-msgstr ""
+msgstr "Bitbake"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "B-Method"
 msgctxt "Language|"
 msgid "B-Method"
 msgstr "B-Method"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Boo"
 msgctxt "Language|"
 msgid "Boo"
 msgstr "Boo"
 
 msgctxt "Language|"
 msgid "CleanCSS"
-msgstr ""
+msgstr "CleanCSS"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "CGiS"
 msgctxt "Language|"
 msgid "CGiS"
 msgstr "CGiS"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Cg"
 msgctxt "Language|"
 msgid "Cg"
 msgstr "Cg"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "ChangeLog"
 msgctxt "Language|"
 msgid "ChangeLog"
 msgstr "ChangeLog"
 
 msgctxt "Language|"
 msgid "Common Intermediate Language (CIL)"
-msgstr ""
+msgstr "Common Intermediate Language (CIL)"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Cisco"
 msgctxt "Language|"
 msgid "Cisco"
 msgstr "Cisco"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Clipper"
 msgctxt "Language|"
 msgid "Clipper"
 msgstr "Clipper"
 
 msgctxt "Language|"
 msgid "CLIST"
-msgstr ""
+msgstr "CLIST"
 
 msgctxt "Language|"
 msgid "Clojure"
-msgstr ""
+msgstr "Clojure"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "PostScript"
 msgctxt "Language|"
 msgid "CoffeeScript"
-msgstr "PostScript"
+msgstr "CoffeeScript"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "ColdFusion"
 msgctxt "Language|"
 msgid "ColdFusion"
 msgstr "ColdFusion"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Common Lisp"
 msgctxt "Language|"
 msgid "Common Lisp"
 msgstr "Common Lisp"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Component-Pascal"
 msgctxt "Language|"
 msgid "Component-Pascal"
 msgstr "Component-Pascal"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "CMake"
 msgctxt "Language|"
 msgid "Crack"
-msgstr "CMake"
+msgstr "Crack"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "CSS"
 msgctxt "Language|"
 msgid "CSS"
 msgstr "CSS"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "C#"
 msgctxt "Language|"
 msgid "C#"
 msgstr "C#"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "PostScript"
 msgctxt "Language|"
 msgid "CubeScript"
-msgstr "PostScript"
+msgstr "CubeScript"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "CUE Sheet"
 msgctxt "Language|"
 msgid "CUE Sheet"
 msgstr "CUE Sheet"
 
 msgctxt "Language|"
 msgid "Curry"
-msgstr ""
+msgstr "Curry"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "C"
 msgctxt "Language|"
 msgid "C"
 msgstr "C"
 
 msgctxt "Language|"
 msgid "Dart"
-msgstr ""
+msgstr "Dart"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Debian Changelog"
 msgctxt "Language|"
 msgid "Debian Changelog"
-msgstr "Changelog на Debian"
+msgstr "Debian Changelog"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Debian Control"
 msgctxt "Language|"
 msgid "Debian Control"
 msgstr "Debian Control"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid ".desktop"
 msgctxt "Language|"
 msgid ".desktop"
 msgstr ".desktop"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Diff"
 msgctxt "Language|"
 msgid "Diff"
 msgstr "Diff"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Django HTML Template"
 msgctxt "Language|"
 msgid "Django HTML Template"
-msgstr "Шаблон HTML за Django"
+msgstr "Django HTML Template"
 
 msgctxt "Language|"
 msgid "MS-DOS Batch"
-msgstr ""
+msgstr "MS-DOS Batch"
 
 msgctxt "Language|"
 msgid "dot"
-msgstr ""
+msgstr "dot"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Makefile"
 msgctxt "Language|"
 msgid "Doxyfile"
-msgstr "Makefile"
+msgstr "Doxyfile"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Doxygen"
 msgctxt "Language|"
 msgid "Doxygen"
 msgstr "Doxygen"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "DTD"
 msgctxt "Language|"
 msgid "DTD"
 msgstr "DTD"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "D"
 msgctxt "Language|"
 msgid "D"
 msgstr "D"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Eiffel"
 msgctxt "Language|"
 msgid "Eiffel"
 msgstr "Eiffel"
 
 msgctxt "Language|"
 msgid "Elm"
-msgstr ""
+msgstr "Elm"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Email"
 msgctxt "Language|"
 msgid "Email"
-msgstr "Е-поща"
+msgstr "Email"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Erlang"
 msgctxt "Language|"
 msgid "Erlang"
 msgstr "Erlang"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Euphoria"
 msgctxt "Language|"
 msgid "Euphoria"
 msgstr "Euphoria"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "E Language"
 msgctxt "Language|"
 msgid "E Language"
-msgstr "Език E"
+msgstr "E Language"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Intel x86 (NASM)"
 msgctxt "Language|"
 msgid "Intel x86 (FASM)"
-msgstr "Intel x86 (NASM)"
+msgstr "Intel x86 (FASM)"
 
 msgctxt "Language|"
 msgid "FASTQ"
-msgstr ""
+msgstr "FASTQ"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "ferite"
 msgctxt "Language|"
 msgid "ferite"
 msgstr "ferite"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "4GL"
 msgctxt "Language|"
 msgid "4GL"
 msgstr "4GL"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "4GL-PER"
 msgctxt "Language|"
 msgid "4GL-PER"
 msgstr "4GL-PER"
 
 msgctxt "Language|"
 msgid "Fish"
-msgstr ""
+msgstr "Fish"
 
 msgctxt "Language|"
 msgid "FlatBuffers"
-msgstr ""
+msgstr "FlatBuffers"
 
 msgctxt "Language|"
 msgid "Fluent"
-msgstr ""
+msgstr "Fluent"
 
-#, fuzzy
-#| msgid "File Format"
 msgctxt "Language|"
 msgid "Fortran (Fixed Format)"
-msgstr "Формат на файл"
+msgstr "Fortran (фиксиран формат)"
 
 msgctxt "Language|"
 msgid "Fortran (Free Format)"
-msgstr ""
+msgstr "Fortran (свободен формат)"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "FreeBASIC"
 msgctxt "Language|"
 msgid "FreeBASIC"
 msgstr "FreeBASIC"
 
 msgctxt "Language|"
 msgid "FSharp"
-msgstr ""
+msgstr "FSharp"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "fstab"
 msgctxt "Language|"
 msgid "fstab"
 msgstr "fstab"
 
 msgctxt "Language|"
 msgid "FTL"
-msgstr ""
+msgstr "FTL"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "GAP"
 msgctxt "Language|"
 msgid "GAP"
 msgstr "GAP"
 
 msgctxt "Language|"
 msgid "G-Code"
-msgstr ""
+msgstr "G-Code"
 
-#, fuzzy
-#| msgid "Backspace"
 msgctxt "Language|"
 msgid "GDB Backtrace"
-msgstr "Изтриване на предишния знак"
+msgstr "GDB Backtrace"
 
 msgctxt "Language|"
 msgid "GDB Init"
-msgstr ""
+msgstr "GDB Init"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "GDL"
 msgctxt "Language|"
 msgid "GDB"
-msgstr "GDL"
+msgstr "GDB"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "GDL"
 msgctxt "Language|"
 msgid "GDL"
 msgstr "GDL"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "GNU Gettext"
 msgctxt "Language|"
 msgid "GNU Gettext"
 msgstr "GNU Gettext"
 
 msgctxt "Language|"
 msgid "Cucumber Gherkin feature"
-msgstr ""
+msgstr "Cucumber Gherkin feature"
 
-#, fuzzy
-#| msgid "&Ignore"
 msgctxt "Language|"
 msgid "Git Ignore"
-msgstr "&Пренебрегване"
+msgstr "Git Ignore"
 
 msgctxt "Language|"
 msgid "Gitolite"
-msgstr ""
+msgstr "Gitolite"
 
 msgctxt "Language|"
 msgid "Git Rebase"
-msgstr ""
+msgstr "Git Rebase"
 
 msgctxt "Language|"
 msgid "GlossTex"
-msgstr ""
+msgstr "GlossTex"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "GLSL"
 msgctxt "Language|"
 msgid "GLSL"
 msgstr "GLSL"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "GNU Assembler"
 msgctxt "Language|"
 msgid "GNU Assembler"
-msgstr "GNU Асемблер"
+msgstr "GNU Assembler"
 
 msgctxt "Language|"
 msgid "Gnuplot"
-msgstr ""
+msgstr "Gnuplot"
 
-#, fuzzy
-#| msgid "Go"
 msgctxt "Language|"
 msgid "Go"
-msgstr "Преход"
+msgstr "Go"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "KDev-PG[-Qt] Grammar"
 msgctxt "Language|"
 msgid "KDev-PG[-Qt] Grammar"
-msgstr "Граматика на KDev-PG[-Qt]"
+msgstr "KDev-PG[-Qt] Grammar"
 
 msgctxt "Language|"
 msgid "GraphQL"
-msgstr ""
+msgstr "GraphQL"
 
 msgctxt "Language|"
 msgid "Groovy"
-msgstr ""
+msgstr "Groovy"
 
 msgctxt "Language|"
 msgid "Hamlet"
-msgstr ""
+msgstr "Hamlet"
 
 msgctxt "Language|"
 msgid "Haml"
-msgstr ""
+msgstr "Haml"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Haskell"
 msgctxt "Language|"
 msgid "Haskell"
 msgstr "Haskell"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Haxe"
 msgctxt "Language|"
 msgid "Haxe"
 msgstr "Haxe"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "HTML"
 msgctxt "Language|"
 msgid "HTML"
 msgstr "HTML"
 
 msgctxt "Language|"
 msgid "Hunspell Affix File"
-msgstr ""
+msgstr "Hunspell Affix файл"
 
 msgctxt "Language|"
 msgid "Hunspell Thesaurus File"
-msgstr ""
+msgstr "Hunspell Thesaurus файл"
 
 msgctxt "Language|"
 msgid "Hunspell Dictionary File"
-msgstr ""
+msgstr "Hunspell Dictionary файл"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Quake Script"
 msgctxt "Language|"
 msgid "Quake Script"
-msgstr "Скрипт за Quake"
+msgstr "Quake Script"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "IDL"
 msgctxt "Language|"
 msgid "IDL"
 msgstr "IDL"
 
 msgctxt "Language|"
 msgid "Idris"
-msgstr ""
+msgstr "Idris"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "ILERPG"
 msgctxt "Language|"
 msgid "ILERPG"
 msgstr "ILERPG"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Inform"
 msgctxt "Language|"
 msgid "Inform"
 msgstr "Inform"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "INI Files"
 msgctxt "Language|"
 msgid "INI Files"
-msgstr "Файлове INI"
+msgstr "INI файлове"
 
 msgctxt "Language|"
 msgid "InnoSetup"
-msgstr ""
+msgstr "InnoSetup"
 
 msgctxt "Language|"
 msgid "Intel HEX"
-msgstr ""
+msgstr "Intel HEX"
 
 msgctxt "Language|"
 msgid "Jam"
-msgstr ""
+msgstr "Jam"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Javadoc"
 msgctxt "Language|"
 msgid "Javadoc"
 msgstr "Javadoc"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "JavaScript"
 msgctxt "Language|"
 msgid "JavaScript React (JSX)"
-msgstr "JavaScript"
+msgstr "JavaScript React (JSX)"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "JavaScript"
 msgctxt "Language|"
 msgid "JavaScript"
 msgstr "JavaScript"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Java"
 msgctxt "Language|"
 msgid "Java"
 msgstr "Java"
 
 msgctxt "Language|"
 msgid "JCL"
-msgstr ""
+msgstr "JCL"
 
 msgctxt "Language|"
 msgid "Jira"
-msgstr ""
+msgstr "Jira"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "JSON"
 msgctxt "Language|"
 msgid "JSON"
 msgstr "JSON"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "JSP"
 msgctxt "Language|"
 msgid "JSP"
 msgstr "JSP"
 
 msgctxt "Language|"
 msgid "Julia"
-msgstr ""
+msgstr "Julia"
 
 msgctxt "Language|"
 msgid "J"
-msgstr ""
+msgstr "J"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "KBasic"
 msgctxt "Language|"
 msgid "KBasic"
 msgstr "KBasic"
 
-#, fuzzy
-#| msgid "Configure"
 msgctxt "Language|"
 msgid "Kconfig"
-msgstr "Настройване"
+msgstr "Kconfig"
 
 msgctxt "Language|"
 msgid "Kotlin"
-msgstr ""
+msgstr "Kotlin"
 
 msgctxt "Language|"
 msgid "k"
-msgstr ""
+msgstr "k"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "LaTeX"
 msgctxt "Language|"
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "LDIF"
 msgctxt "Language|"
 msgid "LDIF"
 msgstr "LDIF"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Quake Script"
 msgctxt "Language|"
 msgid "GNU Linker Script"
-msgstr "Скрипт за Quake"
+msgstr "GNU Linker Script"
 
 msgctxt "Language|"
 msgid "LESSCSS"
-msgstr ""
+msgstr "LESSCSS"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Lex/Flex"
 msgctxt "Language|"
 msgid "Lex/Flex"
 msgstr "Lex/Flex"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "LilyPond"
 msgctxt "Language|"
 msgid "LilyPond"
 msgstr "LilyPond"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Literate Haskell"
 msgctxt "Language|"
 msgid "Literate Curry"
-msgstr "Literate Haskell"
+msgstr "Literate Curry"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Literate Haskell"
 msgctxt "Language|"
 msgid "Literate Haskell"
 msgstr "Literate Haskell"
 
 msgctxt "Language|"
 msgid "LLVM"
-msgstr ""
+msgstr "LLVM"
 
 msgctxt "Language|"
 msgid "Logcat"
-msgstr ""
+msgstr "Logcat"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Logtalk"
 msgctxt "Language|"
 msgid "Logtalk"
 msgstr "Logtalk"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "LPC"
 msgctxt "Language|"
 msgid "LPC"
 msgstr "LPC"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "LSL"
 msgctxt "Language|"
 msgid "LSL"
 msgstr "LSL"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Lua"
 msgctxt "Language|"
 msgid "Lua"
 msgstr "Lua"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "M3U"
 msgctxt "Language|"
 msgid "M3U"
 msgstr "M3U"
 
 msgctxt "Language|"
 msgid "GNU M4"
-msgstr ""
+msgstr "GNU M4"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "MAB-DB"
 msgctxt "Language|"
 msgid "MAB-DB"
 msgstr "MAB-DB"
 
 msgctxt "Language|"
 msgid "Magma"
-msgstr ""
+msgstr "Magma"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Makefile"
 msgctxt "Language|"
 msgid "Makefile"
 msgstr "Makefile"
 
 msgctxt "Language|"
 msgid "Mako"
-msgstr ""
+msgstr "Mako"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Troff Mandoc"
 msgctxt "Language|"
 msgid "Troff Mandoc"
 msgstr "Troff Mandoc"
 
 msgctxt "Language|"
 msgid "Markdown"
-msgstr ""
+msgstr "Markdown"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Mason"
 msgctxt "Language|"
 msgid "Mason"
 msgstr "Mason"
 
 msgctxt "Language|"
 msgid "Mathematica"
-msgstr ""
+msgstr "Mathematica"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Matlab"
 msgctxt "Language|"
 msgid "Matlab"
 msgstr "Matlab"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Maxima"
 msgctxt "Language|"
 msgid "Maxima"
 msgstr "Maxima"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "MediaWiki"
 msgctxt "Language|"
 msgid "MediaWiki"
 msgstr "MediaWiki"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "QML"
 msgctxt "Language|"
 msgid "MEL"
-msgstr "QML"
+msgstr "MEL"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "mergetag text"
 msgctxt "Language|"
 msgid "mergetag text"
 msgstr "mergetag text"
 
 msgctxt "Language|"
 msgid "Meson"
-msgstr ""
+msgstr "Meson"
 
 msgctxt "Language|"
 msgid "Metapost/Metafont"
-msgstr ""
+msgstr "Metapost/Metafont"
 
 msgctxt "Language|"
 msgid "Metamath"
-msgstr ""
+msgstr "Metamath"
 
 msgctxt "Language|"
 msgid "MIB"
-msgstr ""
+msgstr "MIB"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "MIPS Assembler"
 msgctxt "Language|"
 msgid "MIPS Assembler"
-msgstr "MIPS Асемблер"
+msgstr "MIPS Assembler"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Modelica"
 msgctxt "Language|"
 msgid "Modelica"
 msgstr "Modelica"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Modelica"
 msgctxt "Language|"
 msgid "Modelines"
-msgstr "Modelica"
+msgstr "Modelines"
 
 msgctxt "Language|"
 msgid "Modula-2 (ISO only)"
-msgstr ""
+msgstr "Modula-2 (само ISO)"
 
 msgctxt "Language|"
 msgid "Modula-2 (PIM only)"
-msgstr ""
+msgstr "Modula-2 (само  PIM)"
 
 msgctxt "Language|"
 msgid "Modula-2 (R10 only)"
-msgstr ""
+msgstr "Modula-2 (само R10)"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Modula-2"
 msgctxt "Language|"
 msgid "Modula-2"
 msgstr "Modula-2"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Modula-2"
 msgctxt "Language|"
 msgid "Modula-3"
-msgstr "Modula-2"
+msgstr "Modula-3"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "MonoBasic"
 msgctxt "Language|"
 msgid "MonoBasic"
 msgstr "MonoBasic"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Music Publisher"
 msgctxt "Language|"
 msgid "Music Publisher"
 msgstr "Music Publisher"
 
 msgctxt "Language|"
 msgid "Mustache/Handlebars (HTML)"
-msgstr ""
+msgstr "Mustache/Handlebars (HTML)"
 
 msgctxt "Language|"
 msgid "Nagios"
-msgstr ""
+msgstr "Nagios"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Intel x86 (NASM)"
 msgctxt "Language|"
 msgid "Intel x86 (NASM)"
 msgstr "Intel x86 (NASM)"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Nemerle"
 msgctxt "Language|"
 msgid "Nemerle"
 msgstr "Nemerle"
 
 msgctxt "Language|"
 msgid "nesC"
-msgstr ""
+msgstr "nesC"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "noweb"
 msgctxt "Language|"
 msgid "noweb"
 msgstr "noweb"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Objective-C++"
 msgctxt "Language|"
 msgid "Objective-C++"
 msgstr "Objective-C++"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Objective-C"
 msgctxt "Language|"
 msgid "Objective-C"
 msgstr "Objective-C"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Objective Caml"
 msgctxt "Language|"
 msgid "Objective Caml Ocamllex"
-msgstr "Objective Caml"
+msgstr "Objective Caml Ocamllex"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Objective Caml"
 msgctxt "Language|"
 msgid "Objective Caml"
 msgstr "Objective Caml"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Objective Caml"
 msgctxt "Language|"
 msgid "Objective Caml Ocamlyacc"
-msgstr "Objective Caml"
+msgstr "Objective Caml Ocamlyacc"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Octave"
 msgctxt "Language|"
 msgid "Octave"
 msgstr "Octave"
 
 msgctxt "Language|"
 msgid "OORS"
-msgstr ""
+msgstr "OORS"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "OPAL"
 msgctxt "Language|"
 msgid "OPAL"
 msgstr "OPAL"
 
 msgctxt "Language|"
 msgid "OpenCL"
-msgstr ""
+msgstr "OpenCL"
 
 msgctxt "Language|"
 msgid "OpenSCAD"
-msgstr ""
+msgstr "OpenSCAD"
 
-#, fuzzy
-#| msgid "Normal Text"
 msgctxt "Language|"
 msgid "Org Mode"
-msgstr "Обикновен текст"
+msgstr "Org Mode"
 
 msgctxt "Language|"
 msgid "Overpass QL"
-msgstr ""
+msgstr "Overpass QL"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Pango"
 msgctxt "Language|"
 msgid "Pango"
 msgstr "Pango"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Pascal"
 msgctxt "Language|"
 msgid "Pascal"
 msgstr "Pascal"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Perl"
 msgctxt "Language|"
 msgid "Perl"
 msgstr "Perl"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "PHP/PHP"
 msgctxt "Language|"
 msgid "PHP/PHP"
 msgstr "PHP/PHP"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "PicAsm"
 msgctxt "Language|"
 msgid "PicAsm"
 msgstr "PicAsm"
 
 msgctxt "Language|"
 msgid "Pig"
-msgstr ""
+msgstr "Pig"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Pike"
 msgctxt "Language|"
 msgid "Pike"
 msgstr "Pike"
 
 msgctxt "Language|"
 msgid "PL/I"
-msgstr ""
+msgstr "PL/I"
 
 msgctxt "Language|"
 msgid "PLY"
-msgstr ""
+msgstr "PLY"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "PostScript"
 msgctxt "Language|"
 msgid "PostScript"
 msgstr "PostScript"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "POV-Ray"
 msgctxt "Language|"
 msgid "POV-Ray"
 msgstr "POV-Ray"
 
 msgctxt "Language|"
 msgid "Praat"
-msgstr ""
+msgstr "Praat"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "progress"
 msgctxt "Language|"
 msgid "progress"
 msgstr "progress"
 
 msgctxt "Language|"
 msgid "Protobuf"
-msgstr ""
+msgstr "Protobuf"
 
-#, fuzzy
-#| msgid "Plugins"
 msgctxt "Language|"
 msgid "Pug"
-msgstr "Приставки"
+msgstr "Pug"
 
 msgctxt "Language|"
 msgid "Puppet"
-msgstr ""
+msgstr "Puppet"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "PureBasic"
 msgctxt "Language|"
 msgid "PureBasic"
 msgstr "PureBasic"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "PostScript"
 msgctxt "Language|"
 msgid "PureScript"
-msgstr "PostScript"
+msgstr "PureScript"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "PureBasic"
 msgctxt "Language|"
 msgid "Pure"
-msgstr "PureBasic"
+msgstr "Pure"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Python"
 msgctxt "Language|"
 msgid "Python"
 msgstr "Python"
 
-#, fuzzy
-#| msgctxt "Language Section"
-#| msgid "Configuration"
 msgctxt "Language|"
 msgid "QDoc Configuration"
-msgstr "Настройки"
+msgstr "QDoc Configuration"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "CMake"
 msgctxt "Language|"
 msgid "QMake"
-msgstr "CMake"
+msgstr "QMake"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "QML"
 msgctxt "Language|"
 msgid "QML"
 msgstr "QML"
 
 msgctxt "Language|"
 msgid "q"
-msgstr ""
+msgstr "q"
 
 msgctxt "Language|"
 msgid "Racket"
-msgstr ""
+msgstr "Racket"
 
 msgctxt "Language|"
 msgid "Raku"
-msgstr ""
+msgstr "Raku"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "RapidQ"
 msgctxt "Language|"
 msgid "RapidQ"
 msgstr "RapidQ"
 
-#, fuzzy
-#| msgid "Show i&ndentation lines"
 msgctxt "Language|"
 msgid "R documentation"
-msgstr "Показване на линия за о&тстъпа"
+msgstr "R documentation"
 
 msgctxt "Language|"
 msgid "RelaxNG-Compact"
-msgstr ""
+msgstr "RelaxNG-Compact"
 
 msgctxt "Language|"
 msgid "RenPy"
-msgstr ""
+msgstr "RenPy"
 
-#, fuzzy
-#| msgid "&Replace"
 msgctxt "Language|"
 msgid "Replicode"
-msgstr "&Замяна"
+msgstr "Replicode"
 
-#, fuzzy
-#| msgid "Selected text:"
 msgctxt "Language|"
 msgid "reStructuredText"
-msgstr "Маркиран текст:"
+msgstr "reStructuredText"
 
 msgctxt "Language|"
 msgid "RETRO"
-msgstr ""
+msgstr "RETRO"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "REXX"
 msgctxt "Language|"
 msgid "REXX"
 msgstr "REXX"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Ruby/Rails/RHTML"
 msgctxt "Language|"
 msgid "Ruby/Rails/RHTML"
 msgstr "Ruby/Rails/RHTML"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "RenderMan RIB"
 msgctxt "Language|"
 msgid "RenderMan RIB"
 msgstr "RenderMan RIB"
 
 msgctxt "Language|"
 msgid "R Markdown"
-msgstr ""
+msgstr "R Markdown"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Roff"
 msgctxt "Language|"
 msgid "Roff"
 msgstr "Roff"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "RPM Spec"
 msgctxt "Language|"
 msgid "RPM Spec"
 msgstr "RPM Spec"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "RSI IDL"
 msgctxt "Language|"
 msgid "RSI IDL"
 msgstr "RSI IDL"
 
-#, fuzzy
-#| msgid "File Format"
 msgctxt "Language|"
 msgid "Rich Text Format"
-msgstr "Формат на файл"
+msgstr "Rich Text Format"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Ruby"
 msgctxt "Language|"
 msgid "Ruby"
 msgstr "Ruby"
 
 msgctxt "Language|"
 msgid "Rust"
-msgstr ""
+msgstr "Rust"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "R Script"
 msgctxt "Language|"
 msgid "R Script"
-msgstr "Скрипт R"
+msgstr "R Script"
 
 msgctxt "Language|"
 msgid "SASS"
-msgstr ""
+msgstr "SASS"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Sather"
 msgctxt "Language|"
 msgid "Sather"
 msgstr "Sather"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Scala"
 msgctxt "Language|"
 msgid "Scala"
 msgstr "Scala"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Scheme"
 msgctxt "Language|"
 msgid "Scheme"
 msgstr "Scheme"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "scilab"
 msgctxt "Language|"
 msgid "scilab"
 msgstr "scilab"
 
 msgctxt "Language|"
 msgid "SCSS"
-msgstr ""
+msgstr "SCSS"
 
 msgctxt "Language|"
 msgid "sed"
-msgstr ""
+msgstr "sed"
 
 msgctxt "Language|"
 msgid "SELinux CIL Policy"
-msgstr ""
+msgstr "SELinux CIL Policy"
 
 msgctxt "Language|"
 msgid "SELinux File Contexts"
-msgstr ""
+msgstr "SELinux File Contexts"
 
 msgctxt "Language|"
 msgid "SELinux Policy"
-msgstr ""
+msgstr "SELinux Policy"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "SGML"
 msgctxt "Language|"
 msgid "SGML"
 msgstr "SGML"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "SiSU"
 msgctxt "Language|"
 msgid "SiSU"
 msgstr "SiSU"
 
 msgctxt "Language|"
 msgid "Smali"
-msgstr ""
+msgstr "Smali"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "SML"
 msgctxt "Language|"
 msgid "SML"
 msgstr "SML"
 
 msgctxt "Language|"
 msgid "Snort/Suricata"
-msgstr ""
+msgstr "Snort/Suricata"
 
 msgctxt "Language|"
 msgid "Solidity"
-msgstr ""
+msgstr "Solidity"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Spice"
 msgctxt "Language|"
 msgid "Spice"
 msgstr "Spice"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "SQL (MySQL)"
 msgctxt "Language|"
 msgid "SQL (MySQL)"
 msgstr "SQL (MySQL)"
 
 msgctxt "Language|"
 msgid "SQL (Oracle)"
-msgstr ""
+msgstr "SQL (Oracle)"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "SQL (PostgreSQL)"
 msgctxt "Language|"
 msgid "SQL (PostgreSQL)"
 msgstr "SQL (PostgreSQL)"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "SQL"
 msgctxt "Language|"
 msgid "SQL"
 msgstr "SQL"
 
 msgctxt "Language|"
 msgid "Stan"
-msgstr ""
+msgstr "Stan"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Stata"
 msgctxt "Language|"
 msgid "Stata"
 msgstr "Stata"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "LSL"
 msgctxt "Language|"
 msgid "STL"
-msgstr "LSL"
+msgstr "STL"
 
 msgctxt "Language|"
 msgid "SubRip Subtitles"
-msgstr ""
+msgstr "SubRip Subtitles"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "SystemC"
 msgctxt "Language|"
 msgid "SystemC"
 msgstr "SystemC"
 
 msgctxt "Language|"
 msgid "systemd unit"
-msgstr ""
+msgstr "systemd unit"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Verilog"
 msgctxt "Language|"
 msgid "SystemVerilog"
-msgstr "Verilog"
+msgstr "SystemVerilog"
 
 msgctxt "Language|"
 msgid "TADS 3"
-msgstr ""
+msgstr "TADS 3"
 
 msgctxt "Language|"
 msgid "TaskJuggler"
-msgstr ""
+msgstr "TaskJuggler"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Tcl/Tk"
 msgctxt "Language|"
 msgid "Tcl/Tk"
 msgstr "Tcl/Tk"
 
 msgctxt "Language|"
 msgid "Tcsh"
-msgstr ""
+msgstr "Tcsh"
 
 msgctxt "Language|"
 msgid "Terraform"
-msgstr ""
+msgstr "Terraform"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Texinfo"
 msgctxt "Language|"
 msgid "Texinfo"
 msgstr "Texinfo"
 
 msgctxt "Language|"
 msgid "Textile"
-msgstr ""
+msgstr "Textile"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "TI Basic"
 msgctxt "Language|"
 msgid "TI Basic"
 msgstr "TI Basic"
 
 msgctxt "Language|"
 msgid "Tiger"
-msgstr ""
+msgstr "Tiger"
 
 msgctxt "Language|"
 msgid "TOML"
-msgstr ""
+msgstr "TOML"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "txt2tags"
 msgctxt "Language|"
 msgid "txt2tags"
 msgstr "txt2tags"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "JavaScript"
 msgctxt "Language|"
 msgid "TypeScript React (TSX)"
-msgstr "JavaScript"
+msgstr "TypeScript React (TSX)"
 
-#, fuzzy
-#| msgctxt "Language Section"
-#| msgid "Scripts"
 msgctxt "Language|"
 msgid "TypeScript"
-msgstr "Скриптове"
+msgstr "TypeScript"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "UnrealScript"
 msgctxt "Language|"
 msgid "UnrealScript"
 msgstr "UnrealScript"
 
 msgctxt "Language|"
 msgid "Vala"
-msgstr ""
+msgstr "Vala"
 
 msgctxt "Language|"
 msgid "Valgrind Suppression"
-msgstr ""
+msgstr "Valgrind Suppression"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Apache Configuration"
 msgctxt "Language|"
 msgid "Varnish module spec file"
-msgstr "Настройки на Apache"
+msgstr "Varnish module spec file"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Apache Configuration"
 msgctxt "Language|"
 msgid "Varnish Test Case language"
-msgstr "Настройки на Apache"
+msgstr "Varnish Test Case language"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Apache Configuration"
 msgctxt "Language|"
 msgid "Varnish Configuration Language"
-msgstr "Настройки на Apache"
+msgstr "Varnish Configuration Language"
 
 msgctxt "Language|"
 msgid "vCard, vCalendar, iCalendar"
-msgstr ""
+msgstr "vCard, vCalendar, iCalendar"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Velocity"
 msgctxt "Language|"
 msgid "Velocity"
 msgstr "Velocity"
 
 msgctxt "Language|"
 msgid "Vera"
-msgstr ""
+msgstr "Vera"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Verilog"
 msgctxt "Language|"
 msgid "Verilog"
 msgstr "Verilog"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "VHDL"
 msgctxt "Language|"
 msgid "VHDL"
 msgstr "VHDL"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "VRML"
 msgctxt "Language|"
 msgid "VRML"
 msgstr "VRML"
 
 msgctxt "Language|"
 msgid "Wavefront OBJ"
-msgstr ""
+msgstr "Wavefront OBJ"
 
 msgctxt "Language|"
 msgid "Wayland Trace"
-msgstr ""
+msgstr "Wayland Trace"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "WINE Config"
 msgctxt "Language|"
 msgid "WINE Config"
-msgstr "Настройки на WINE"
+msgstr "WINE Config"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Wesnoth Markup Language"
 msgctxt "Language|"
 msgid "Wesnoth Markup Language"
-msgstr "Език за маркиране Wesnoth"
+msgstr "Wesnoth Markup Language"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "xHarbour"
 msgctxt "Language|"
 msgid "xHarbour"
 msgstr "xHarbour"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "XML (Debug)"
 msgctxt "Language|"
 msgid "XML (Debug)"
 msgstr "XML (Debug)"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "XML"
 msgctxt "Language|"
 msgid "XML"
 msgstr "XML"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "PostScript"
 msgctxt "Language|"
 msgid "Xonotic Script"
-msgstr "PostScript"
+msgstr "Xonotic Script"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "x.org Configuration"
 msgctxt "Language|"
 msgid "x.org Configuration"
-msgstr "Настройки на x.org"
+msgstr "x.org Configuration"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "xslt"
 msgctxt "Language|"
 msgid "xslt"
 msgstr "xslt"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "XUL"
 msgctxt "Language|"
 msgid "XUL"
 msgstr "XUL"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "yacas"
 msgctxt "Language|"
 msgid "yacas"
 msgstr "yacas"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Yacc/Bison"
 msgctxt "Language|"
 msgid "Yacc/Bison"
 msgstr "Yacc/Bison"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "YAML"
 msgctxt "Language|"
 msgid "YAML"
 msgstr "YAML"
 
 msgctxt "Language|"
 msgid "YANG"
-msgstr ""
+msgstr "YANG"
 
 msgctxt "Language|"
 msgid "YARA"
-msgstr ""
+msgstr "YARA"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Zonnon"
 msgctxt "Language|"
 msgid "Zonnon"
 msgstr "Zonnon"
 
 msgctxt "Language|"
 msgid "Zsh"
-msgstr ""
+msgstr "Zsh"
 
-#, fuzzy
-#| msgctxt "Language Section"
-#| msgid "Scripts"
 msgctxt "Language Section|"
 msgid "Scripts"
-msgstr "Скриптове"
+msgstr "Scripts"
 
-#, fuzzy
-#| msgctxt "Language Section"
-#| msgid "Sources"
 msgctxt "Language Section|"
 msgid "Sources"
-msgstr "Източници"
+msgstr "Sources"
 
-#, fuzzy
-#| msgctxt "Language Section"
-#| msgid "Other"
 msgctxt "Language Section|"
 msgid "Other"
 msgstr "Други"
 
-#, fuzzy
-#| msgctxt "Language Section"
-#| msgid "Hardware"
 msgctxt "Language Section|"
 msgid "Hardware"
 msgstr "Хардуер"
 
-#, fuzzy
-#| msgctxt "Language Section"
-#| msgid "Scientific"
 msgctxt "Language Section|"
 msgid "Scientific"
-msgstr "Наука"
+msgstr "Научни"
 
-#, fuzzy
-#| msgctxt "Language Section"
-#| msgid "Configuration"
 msgctxt "Language Section|"
 msgid "Configuration"
-msgstr "Настройки"
+msgstr "Конфигурация"
 
-#, fuzzy
-#| msgctxt "Language Section"
-#| msgid "Markup"
 msgctxt "Language Section|"
 msgid "Markup"
-msgstr "Маркиращи"
+msgstr "Markup"
 
-#, fuzzy
-#| msgctxt "Language Section"
-#| msgid "Assembler"
 msgctxt "Language Section|"
 msgid "Assembler"
-msgstr "Асемблер"
+msgstr "Assembler"
 
-#, fuzzy
-#| msgctxt "Language Section"
-#| msgid "Database"
 msgctxt "Language Section|"
 msgid "Database"
-msgstr "База от данни"
+msgstr "База данни"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "D"
 msgctxt "Language Section|"
 msgid "3D"
-msgstr "D"
+msgstr "3D"
 
 msgctxt "Theme|"
 msgid "Atom One Dark"
-msgstr ""
+msgstr "Atom One Dark"
 
 msgctxt "Theme|"
 msgid "Atom One Light"
-msgstr ""
+msgstr "Atom One Light"
 
 msgctxt "Theme|"
 msgid "ayu Dark"
-msgstr ""
+msgstr "ayu Dark"
 
 msgctxt "Theme|"
 msgid "ayu Light"
-msgstr ""
+msgstr "ayu Light"
 
 msgctxt "Theme|"
 msgid "ayu Mirage"
-msgstr ""
+msgstr "ayu Mirage"
 
 msgctxt "Theme|"
 msgid "Breeze Dark"
-msgstr ""
+msgstr "Breeze Тъмен"
 
 msgctxt "Theme|"
 msgid "Breeze Light"
-msgstr ""
+msgstr "Breeze Светъл"
 
 msgctxt "Theme|"
 msgid "Dracula"
-msgstr ""
+msgstr "Dracula"
 
 msgctxt "Theme|"
 msgid "Falcon"
-msgstr ""
+msgstr "Falcon"
 
 msgctxt "Theme|"
 msgid "GitHub Dark"
-msgstr ""
+msgstr "GitHub Dark"
 
 msgctxt "Theme|"
 msgid "GitHub Light"
-msgstr ""
+msgstr "GitHub Light"
 
 msgctxt "Theme|"
 msgid "gruvbox Dark"
-msgstr ""
+msgstr "gruvbox Тъмен"
 
 msgctxt "Theme|"
 msgid "Homunculus"
-msgstr ""
+msgstr "Homunculus"
 
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "MonoBasic"
 msgctxt "Theme|"
 msgid "Monokai"
-msgstr "MonoBasic"
+msgstr "Monokai"
 
 msgctxt "Theme|"
 msgid "Nord"
-msgstr ""
+msgstr "Nord"
 
 msgctxt "Theme|"
 msgid "Oblivion"
-msgstr ""
+msgstr "Oblivion"
 
-#, fuzzy
-#| msgid "Sorting"
 msgctxt "Theme|"
 msgid "Printing"
-msgstr "Сортиране"
+msgstr "Printing"
 
 msgctxt "Theme|"
 msgid "Radical"
-msgstr ""
+msgstr "Radical"
 
 msgctxt "Theme|"
 msgid "Solarized Dark"
-msgstr ""
+msgstr "Solarized Dark"
 
 msgctxt "Theme|"
 msgid "Solarized Light"
-msgstr ""
+msgstr "Solarized Light"
 
 msgctxt "Theme|"
 msgid "Vim Dark"
-msgstr ""
+msgstr "Vim Dark"
 
 #: cli/kate-syntax-highlighter.cpp:61
 msgctxt "SyntaxHighlightingCLI|"
 msgid "Command line syntax highlighter using Kate syntax definitions."
-msgstr ""
+msgstr "Синтаксис на командния ред, използващ дефиниции на синтаксис на Kate."
 
 #: cli/kate-syntax-highlighter.cpp:64
-#, fuzzy
-#| msgctxt "Language Section"
-#| msgid "Sources"
 msgctxt "SyntaxHighlightingCLI|"
 msgid "source"
-msgstr "Източници"
+msgstr "източник"
 
 #: cli/kate-syntax-highlighter.cpp:64
 msgctxt "SyntaxHighlightingCLI|"
 msgid "The source file to highlight."
-msgstr ""
+msgstr "Изходен файл за осветяване."
 
 #: cli/kate-syntax-highlighter.cpp:67
 msgctxt "SyntaxHighlightingCLI|"
 msgid "List all available syntax definitions."
-msgstr ""
+msgstr "Списък на всички налични дефиниции на синтаксис."
 
 #: cli/kate-syntax-highlighter.cpp:69
 msgctxt "SyntaxHighlightingCLI|"
 msgid "List all available themes."
-msgstr ""
+msgstr "Списък на всички налични теми."
 
 #: cli/kate-syntax-highlighter.cpp:73
 msgctxt "SyntaxHighlightingCLI|"
 msgid "Download new/updated syntax definitions."
-msgstr ""
+msgstr "Изтегляне на нови/актуализирани дефиниции на синтаксиса."
 
 #: cli/kate-syntax-highlighter.cpp:77
 msgctxt "SyntaxHighlightingCLI|"
 msgid "File to write HTML output to (default: stdout)."
-msgstr ""
+msgstr "Файл за записване на HTML изхода (по подразбиране: stdout)."
 
 #: cli/kate-syntax-highlighter.cpp:78
 msgctxt "SyntaxHighlightingCLI|"
 msgid "output"
-msgstr ""
+msgstr "изход"
 
 #: cli/kate-syntax-highlighter.cpp:82
 msgctxt "SyntaxHighlightingCLI|"
@@ -2029,26 +1418,23 @@ msgid ""
 "Highlight using this syntax definition (default: auto-detect based on input "
 "file)."
 msgstr ""
+"Осветяване с помощта на тази дефиниция на синтаксиса (по подразбиране: "
+"автоматично разпознаване въз основа на входния файл)."
 
 #: cli/kate-syntax-highlighter.cpp:83
 msgctxt "SyntaxHighlightingCLI|"
 msgid "syntax"
-msgstr ""
+msgstr "синтаксис"
 
 #: cli/kate-syntax-highlighter.cpp:87
-#, fuzzy
-#| msgid "Kate Syntax Highlighting Parser"
 msgctxt "SyntaxHighlightingCLI|"
 msgid "Color theme to use for highlighting."
-msgstr "Синтактичен анализатор за открояване на кода"
+msgstr "Цветова тема, която да се използва за осветяване."
 
 #: cli/kate-syntax-highlighter.cpp:88
-#, fuzzy
-#| msgctxt "Language"
-#| msgid "Scheme"
 msgctxt "SyntaxHighlightingCLI|"
 msgid "theme"
-msgstr "Scheme"
+msgstr "тема"
 
 #: cli/kate-syntax-highlighter.cpp:94
 msgctxt "SyntaxHighlightingCLI|"
@@ -2056,13 +1442,13 @@ msgid ""
 "Use the specified format instead of html. Must be html, ansi or "
 "ansi256Colors."
 msgstr ""
+"Използвайте посочения формат вместо html. Трябва да е html, ansi или "
+"ansi256Colors."
 
 #: cli/kate-syntax-highlighter.cpp:95
-#, fuzzy
-#| msgid "&Format:"
 msgctxt "SyntaxHighlightingCLI|"
 msgid "format"
-msgstr "Фо&рмат:"
+msgstr "формат"
 
 #: cli/kate-syntax-highlighter.cpp:100
 msgctxt "SyntaxHighlightingCLI|"
@@ -2070,16 +1456,19 @@ msgid ""
 "Add information to debug a syntax file. Only works with --output-format=ansi "
 "or ansi256Colors. Possible values are format, region, context and stackSize."
 msgstr ""
+"Добавяне на информация за отстраняване на грешки в синтактичен файл. Работи "
+"само с  --output-format = ansi или ansi256Colors. Възможните стойности са "
+"format, region, context and stackSize."
 
 #: cli/kate-syntax-highlighter.cpp:103
 msgctxt "SyntaxHighlightingCLI|"
 msgid "type"
-msgstr ""
+msgstr "тип"
 
 #: cli/kate-syntax-highlighter.cpp:107
 msgctxt "SyntaxHighlightingCLI|"
 msgid "Disable ANSI background for the default color."
-msgstr ""
+msgstr "Деактивирайте ANSI фона за цвета по подразбиране."
 
 #: cli/kate-syntax-highlighter.cpp:112
 msgctxt "SyntaxHighlightingCLI|"
@@ -2087,23 +1476,21 @@ msgid ""
 "Set HTML page's title\n"
 "(default: the filename or \"Kate Syntax Highlighter\" if reading from stdin)."
 msgstr ""
+"Задаване на заглавието на HTML страницата \n"
+"(по подразбиране: името на файла или \\ \"Kate Syntax Highlighter \", ако "
+"четете от stdin)."
 
 #: cli/kate-syntax-highlighter.cpp:113
-#, fuzzy
-#| msgid "Untitled"
 msgctxt "SyntaxHighlightingCLI|"
 msgid "title"
-msgstr "Неозаглавено"
+msgstr "заглавие"
 
 #: cli/kate-syntax-highlighter.cpp:117
 msgctxt "SyntaxHighlightingCLI|"
 msgid "Read file from stdin. The -s option must also be used."
-msgstr ""
+msgstr "Четене на файла от stdin. Трябва да се използва и опцията -s."
 
 #: lib/definition_p.h:98
-#, fuzzy
-#| msgctxt "Syntax highlighting"
-#| msgid "None"
 msgctxt "Language|"
 msgid "None"
 msgstr "Без"
@@ -2111,16 +1498,16 @@ msgstr "Без"
 #: lib/definitiondownloader.cpp:64
 msgctxt "QObject|"
 msgid "All syntax definitions are up-to-date."
-msgstr ""
+msgstr "Всички дефиниции на синтаксиса са актуални."
 
 #: lib/definitiondownloader.cpp:78
 #, qt-format
 msgctxt "QObject|"
 msgid "Downloading new syntax definition for '%1'..."
-msgstr ""
+msgstr "Изтегля се нова дефиниция на синтаксис за \"%1\"..."
 
 #: lib/definitiondownloader.cpp:85
 #, qt-format
 msgctxt "QObject|"
 msgid "Updating syntax definition for '%1' to version %2..."
-msgstr ""
+msgstr "Актуализиране на дефиницията на синтаксис за \"%1\" до версия %2..."
diff -pruN 5.94.0-1/po/ca@valencia/syntaxhighlighting5_qt.po 5.96.0-1/po/ca@valencia/syntaxhighlighting5_qt.po
--- 5.94.0-1/po/ca@valencia/syntaxhighlighting5_qt.po	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/po/ca@valencia/syntaxhighlighting5_qt.po	2022-07-02 16:03:19.000000000 +0000
@@ -1260,7 +1260,7 @@ msgstr "Codis font"
 
 msgctxt "Language Section|"
 msgid "Other"
-msgstr "Atres"
+msgstr "Altres"
 
 msgctxt "Language Section|"
 msgid "Hardware"
@@ -1356,7 +1356,7 @@ msgstr "Oblivion"
 
 msgctxt "Theme|"
 msgid "Printing"
-msgstr "Impressió"
+msgstr "Imprimix"
 
 msgctxt "Theme|"
 msgid "Radical"
@@ -1378,8 +1378,8 @@ msgstr "Vim fosc"
 msgctxt "SyntaxHighlightingCLI|"
 msgid "Command line syntax highlighter using Kate syntax definitions."
 msgstr ""
-"Ressalta la sintaxi de la línia d'ordres usant les definicions de sintaxi de "
-"Kate."
+"Ressalta la sintaxi de la línia d'ordres utilitzant les definicions de "
+"sintaxi de Kate."
 
 #: cli/kate-syntax-highlighter.cpp:64
 msgctxt "SyntaxHighlightingCLI|"
@@ -1422,8 +1422,8 @@ msgid ""
 "Highlight using this syntax definition (default: auto-detect based on input "
 "file)."
 msgstr ""
-"Ressaltat usant la definició de sintaxi (per defecte: detecció automàtica "
-"basada en el fitxer d'entrada)."
+"Ressaltat utilitzant la definició de sintaxi (per defecte: detecció "
+"automàtica basada en el fitxer d'entrada)."
 
 #: cli/kate-syntax-highlighter.cpp:83
 msgctxt "SyntaxHighlightingCLI|"
@@ -1480,7 +1480,7 @@ msgid ""
 "Set HTML page's title\n"
 "(default: the filename or \"Kate Syntax Highlighter\" if reading from stdin)."
 msgstr ""
-"Estableix el títol de la pàgina HTML\n"
+"Establix el títol de la pàgina HTML\n"
 "(per defecte: el nom del fitxer o el «Ressaltat de sintaxi de Kate» si es "
 "llig des de l'estrada estàndard)."
 
diff -pruN 5.94.0-1/po/ia/syntaxhighlighting5_qt.po 5.96.0-1/po/ia/syntaxhighlighting5_qt.po
--- 5.94.0-1/po/ia/syntaxhighlighting5_qt.po	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/po/ia/syntaxhighlighting5_qt.po	2022-07-02 16:03:19.000000000 +0000
@@ -1,13 +1,13 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
 #
-# g.sora <g.sora@tiscali.it>, 2010, 2011, 2012, 2013, 2014, 2016, 2019, 2020, 2021.
+# g.sora <g.sora@tiscali.it>, 2010, 2011, 2012, 2013, 2014, 2016, 2019, 2020, 2021, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2016-09-08 07:30+0000\n"
-"PO-Revision-Date: 2021-12-14 22:28+0100\n"
+"PO-Revision-Date: 2022-05-26 09:29+0200\n"
 "Last-Translator: giovanni <g.sora@tiscali.it>\n"
 "Language-Team: Italian <kde-i18n-doc@kde.org>\n"
 "Language: ia\n"
@@ -15,7 +15,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: Lokalize 21.12.0\n"
+"X-Generator: Lokalize 20.04.2\n"
 "X-Qt-Contexts: true\n"
 
 msgctxt "Language|"
@@ -352,7 +352,7 @@ msgstr "G-Code"
 
 msgctxt "Language|"
 msgid "GDB Backtrace"
-msgstr "Tracia de retro (backtrace) de GDB"
+msgstr "Retraciamento (backtrace) de GDB"
 
 msgctxt "Language|"
 msgid "GDB Init"
diff -pruN 5.94.0-1/po/nn/syntaxhighlighting5_qt.po 5.96.0-1/po/nn/syntaxhighlighting5_qt.po
--- 5.94.0-1/po/nn/syntaxhighlighting5_qt.po	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/po/nn/syntaxhighlighting5_qt.po	2022-07-02 16:03:19.000000000 +0000
@@ -2,7 +2,7 @@
 #
 # Gaute Hvoslef Kvalnes <gaute@verdsveven.com>, 1999, 2000, 2002, 2003, 2004, 2005, 2006.
 # Håvard Korsvoll <korsvoll@skulelinux.no>, 2003, 2005.
-# Karl Ove Hufthammer <karl@huftis.org>, 2004, 2007, 2008, 2009, 2010, 2011, 2015, 2016, 2017, 2018, 2019, 2020, 2021.
+# Karl Ove Hufthammer <karl@huftis.org>, 2004, 2007, 2008, 2009, 2010, 2011, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022.
 # Jørgen Grønlund <jorgenhg@broadpark.no>, 2005.
 # Eirik U. Birkeland <eirbir@gmail.com>, 2008, 2009, 2010.
 msgid ""
@@ -10,14 +10,14 @@ msgstr ""
 "Project-Id-Version: katepart4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2016-09-05 07:08+0000\n"
-"PO-Revision-Date: 2021-03-21 17:53+0100\n"
+"PO-Revision-Date: 2022-06-19 13:41+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <l10n-no@lister.huftis.org>\n"
 "Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 20.12.3\n"
+"X-Generator: Lokalize 22.04.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Environment: kde\n"
 "X-Accelerator-Marker: &\n"
@@ -222,7 +222,7 @@ msgstr "C"
 
 msgctxt "Language|"
 msgid "Dart"
-msgstr ""
+msgstr "Dart"
 
 msgctxt "Language|"
 msgid "Debian Changelog"
@@ -784,9 +784,10 @@ msgctxt "Language|"
 msgid "OpenSCAD"
 msgstr "OpenSCAD"
 
+# https://orgmode.org/
 msgctxt "Language|"
 msgid "Org Mode"
-msgstr ""
+msgstr "Org-modus"
 
 msgctxt "Language|"
 msgid "Overpass QL"
@@ -890,7 +891,7 @@ msgstr "q"
 
 msgctxt "Language|"
 msgid "Racket"
-msgstr ""
+msgstr "Racket"
 
 msgctxt "Language|"
 msgid "Raku"
@@ -922,7 +923,7 @@ msgstr "reStructuredText"
 
 msgctxt "Language|"
 msgid "RETRO"
-msgstr ""
+msgstr "RETRO"
 
 msgctxt "Language|"
 msgid "REXX"
@@ -1098,7 +1099,7 @@ msgstr "Tcsh"
 
 msgctxt "Language|"
 msgid "Terraform"
-msgstr ""
+msgstr "Terraform"
 
 msgctxt "Language|"
 msgid "Texinfo"
@@ -1327,7 +1328,7 @@ msgstr "Dracula"
 
 msgctxt "Theme|"
 msgid "Falcon"
-msgstr ""
+msgstr "Falcon"
 
 msgctxt "Theme|"
 msgid "GitHub Dark"
@@ -1343,7 +1344,7 @@ msgstr "Gruvbox mørk"
 
 msgctxt "Theme|"
 msgid "Homunculus"
-msgstr ""
+msgstr "Homunculus"
 
 msgctxt "Theme|"
 msgid "Monokai"
diff -pruN 5.94.0-1/po/zh_CN/syntaxhighlighting5_qt.po 5.96.0-1/po/zh_CN/syntaxhighlighting5_qt.po
--- 5.94.0-1/po/zh_CN/syntaxhighlighting5_qt.po	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/po/zh_CN/syntaxhighlighting5_qt.po	2022-07-02 16:03:19.000000000 +0000
@@ -15,10 +15,6 @@
 # Feng Chao <chaofeng111@qq.com>, 2020.
 msgid ""
 msgstr ""
-"Project-Id-Version: kdeorg\n"
-"PO-Revision-Date: 2022-04-26 15:20\n"
-"Language-Team: Chinese Simplified\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +26,10 @@ msgstr ""
 "X-Crowdin-File: /kf5-trunk/messages/syntax-highlighting/"
 "syntaxhighlighting5_qt.pot\n"
 "X-Crowdin-File-ID: 5585\n"
+"Project-Id-Version: kdeorg\n"
+"Language-Team: Chinese Simplified\n"
+"Language: zh_CN\n"
+"PO-Revision-Date: 2022-07-02 11:00\n"
 
 msgctxt "Language|"
 msgid "4DOS BatchToMemory"
diff -pruN 5.94.0-1/src/cli/kate-syntax-highlighter.cpp 5.96.0-1/src/cli/kate-syntax-highlighter.cpp
--- 5.94.0-1/src/cli/kate-syntax-highlighter.cpp	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/src/cli/kate-syntax-highlighter.cpp	2022-07-02 16:03:19.000000000 +0000
@@ -6,12 +6,12 @@
 
 #include "ksyntaxhighlighting_version.h"
 
+#include <KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/DefinitionDownloader>
+#include <KSyntaxHighlighting/Repository>
+#include <KSyntaxHighlighting/Theme>
 #include <ansihighlighter.h>
-#include <definition.h>
-#include <definitiondownloader.h>
 #include <htmlhighlighter.h>
-#include <repository.h>
-#include <theme.h>
 
 #include <QCommandLineParser>
 #include <QCoreApplication>
diff -pruN 5.94.0-1/src/lib/ansihighlighter.h 5.96.0-1/src/lib/ansihighlighter.h
--- 5.94.0-1/src/lib/ansihighlighter.h	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/src/lib/ansihighlighter.h	2022-07-02 16:03:19.000000000 +0000
@@ -20,6 +20,7 @@ namespace KSyntaxHighlighting
 {
 class AnsiHighlighterPrivate;
 
+// Exported for a bundled helper program
 class KSYNTAXHIGHLIGHTING_EXPORT AnsiHighlighter final : public AbstractHighlighter
 {
 public:
diff -pruN 5.94.0-1/src/lib/CMakeLists.txt 5.96.0-1/src/lib/CMakeLists.txt
--- 5.94.0-1/src/lib/CMakeLists.txt	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/src/lib/CMakeLists.txt	2022-07-02 16:03:19.000000000 +0000
@@ -47,8 +47,7 @@ set_target_properties(KF5SyntaxHighlight
     SOVERSION ${SyntaxHighlighting_SOVERSION}
     EXPORT_NAME SyntaxHighlighting
 )
-target_include_directories(KF5SyntaxHighlighting INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KSyntaxHighlighting>")
-target_include_directories(KF5SyntaxHighlighting PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_CURRENT_BINARY_DIR};>")
+
 target_link_libraries(KF5SyntaxHighlighting
     PUBLIC
         Qt${QT_MAJOR_VERSION}::Gui
@@ -72,6 +71,12 @@ set(Forwarding_Header_Names
 ecm_generate_headers(CamelCase_HEADERS
     HEADER_NAMES ${Forwarding_Header_Names}
     REQUIRED_HEADERS SyntaxHighlighting_HEADERS
+    OUTPUT_DIR ${CMAKE_BINARY_DIR}/KSyntaxHighlighting/KSyntaxHighlighting
+)
+
+target_include_directories(KF5SyntaxHighlighting
+    INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KSyntaxHighlighting>"
+    PUBLIC "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/KSyntaxHighlighting;>"
 )
 
 install(TARGETS KF5SyntaxHighlighting EXPORT KF5SyntaxHighlightingTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff -pruN 5.94.0-1/src/lib/repository.h 5.96.0-1/src/lib/repository.h
--- 5.94.0-1/src/lib/repository.h	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/src/lib/repository.h	2022-07-02 16:03:19.000000000 +0000
@@ -10,8 +10,9 @@
 #include "ksyntaxhighlighting_export.h"
 
 #include <QVector>
+#include <QtGlobal>
+
 #include <memory>
-#include <qglobal.h>
 
 QT_BEGIN_NAMESPACE
 class QString;
diff -pruN 5.94.0-1/src/quick/kquicksyntaxhighlighter.cpp 5.96.0-1/src/quick/kquicksyntaxhighlighter.cpp
--- 5.94.0-1/src/quick/kquicksyntaxhighlighter.cpp	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/src/quick/kquicksyntaxhighlighter.cpp	2022-07-02 16:03:19.000000000 +0000
@@ -7,8 +7,8 @@
 
 #include "kquicksyntaxhighlighter.h"
 
-#include <repository.h>
-#include <syntaxhighlighter.h>
+#include <KSyntaxHighlighting/Repository>
+#include <KSyntaxHighlighting/SyntaxHighlighter>
 
 #include <QGuiApplication>
 #include <QPalette>
diff -pruN 5.94.0-1/src/quick/kquicksyntaxhighlighter.h 5.96.0-1/src/quick/kquicksyntaxhighlighter.h
--- 5.94.0-1/src/quick/kquicksyntaxhighlighter.h	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/src/quick/kquicksyntaxhighlighter.h	2022-07-02 16:03:19.000000000 +0000
@@ -10,8 +10,8 @@
 
 #include "repositorywrapper.h"
 
-#include <definition.h>
-#include <theme.h>
+#include <KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/Theme>
 
 #include <QObject>
 #include <QVariant>
diff -pruN 5.94.0-1/src/quick/kquicksyntaxhighlightingplugin.cpp 5.96.0-1/src/quick/kquicksyntaxhighlightingplugin.cpp
--- 5.94.0-1/src/quick/kquicksyntaxhighlightingplugin.cpp	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/src/quick/kquicksyntaxhighlightingplugin.cpp	2022-07-02 16:03:19.000000000 +0000
@@ -9,10 +9,9 @@
 #include "kquicksyntaxhighlighter.h"
 #include "repositorywrapper.h"
 
-#include <definition.h>
-#include <repository.h>
-#include <theme.h>
-
+#include <KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/Repository>
+#include <KSyntaxHighlighting/Theme>
 
 #include <memory>
 
diff -pruN 5.94.0-1/src/quick/repositorywrapper.cpp 5.96.0-1/src/quick/repositorywrapper.cpp
--- 5.94.0-1/src/quick/repositorywrapper.cpp	2022-05-07 21:30:22.000000000 +0000
+++ 5.96.0-1/src/quick/repositorywrapper.cpp	2022-07-02 16:03:19.000000000 +0000
@@ -6,9 +6,9 @@
 
 #include "repositorywrapper.h"
 
-#include <definition.h>
-#include <repository.h>
-#include <theme.h>
+#include <KSyntaxHighlighting/Definition>
+#include <KSyntaxHighlighting/Repository>
+#include <KSyntaxHighlighting/Theme>
 
 using namespace KSyntaxHighlighting;
 
