Merge branch 'main' into update-main-version

Signed-off-by: Marcel Klehr <[email protected]>

.github/workflows/files-scan-test.yml

@@ -25,7 +25,7 @@ jobs:
       matrix:
         php-versions: ['8.2']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['master']
+        server-versions: ['master', 'stable28']
 
     name: Test files:scan command on ${{ matrix.databases }}-${{ matrix.server-versions }}
 

.github/workflows/full-run-test.yml

@@ -30,7 +30,7 @@ jobs:
       matrix:
         php-versions: ['8.2']
         databases: ['sqlite']
-        server-versions: ['master']
+        server-versions: ['master', 'stable28']
         pure-js-mode: ['false']
         imagenet-enabled: ['true']
         faces-enabled: ['true']

.github/workflows/phpunit-mysql.yml

@@ -40,7 +40,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.0', '8.1', '8.2', '8.3']
-        server-versions: ['master']
+        server-versions: ['master', 'stable28']
 
     services:
       mysql:

.github/workflows/phpunit-pgsql.yml

@@ -41,7 +41,7 @@ jobs:
       fail-fast: false
       matrix:
         php-versions: ['8.2']
-        server-versions: ['master']
+        server-versions: ['master', 'stable28']
 
     services:
       postgres:

.github/workflows/phpunit-sqlite.yml

@@ -42,7 +42,7 @@ jobs:
       fail-fast: false
       matrix:
         php-versions: ['8.2']
-        server-versions: ['master']
+        server-versions: ['master', 'stable28']
 
     steps:
       - name: Set app env

.github/workflows/psalm.yml

@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         php-versions: [ '8.1', '8.2', '8.3' ]
-        server-versions: [ 'dev-master' ]
+        server-versions: [ 'dev-master', 'dev-stable28' ]
       fail-fast: false
 
     name: Nextcloud

l10n/en_GB.js

@@ -101,6 +101,7 @@ OC.L10N.register(
     "To trigger a full classification run, run the following command on the server terminal. (The classification will run in multiple background jobs which can run in parallel.)" : "To trigger a full classification run, run the following command on the server terminal. (The classification will run in multiple background jobs which can run in parallel.)",
     "To run a full classification run on the terminal, run the following. (The classification will run in sequence inside your terminal.)" : "To run a full classification run on the terminal, run the following. (The classification will run in sequence inside your terminal.)",
     "Before running a full initial classification run on the terminal, you should stop all background processing that Recognize scheduled upon installation to avoid interference." : "Before running a full initial classification run on the terminal, you should stop all background processing that Recognize scheduled upon installation to avoid interference.",
+    "To run a face clustering run on for each user in the terminal, run the following. Consider adding the parameter --batch-size <count> for large libraries to avoid PHP memory exhaustion. (The clustering will run in sequence inside your terminal.)" : "To run a face clustering run on for each user in the terminal, run the following. Consider adding the parameter --batch-size <count> for large libraries to avoid PHP memory exhaustion. (The clustering will run in sequence inside your terminal.)",
     "To remove all face clusters but keep the raw detected faces run the following on the terminal:" : "To remove all face clusters but keep the raw detected faces run the following on the terminal:",
     "To remove all detected faces and face clusters run the following on the terminal:" : "To remove all detected faces and face clusters run the following on the terminal:",
     "You can reset the tags of all files that have been previously classified by Recognize with the following command:" : "You can reset the tags of all files that have been previously classified by Recognise with the following command:",

l10n/en_GB.json

@@ -99,6 +99,7 @@
     "To trigger a full classification run, run the following command on the server terminal. (The classification will run in multiple background jobs which can run in parallel.)" : "To trigger a full classification run, run the following command on the server terminal. (The classification will run in multiple background jobs which can run in parallel.)",
     "To run a full classification run on the terminal, run the following. (The classification will run in sequence inside your terminal.)" : "To run a full classification run on the terminal, run the following. (The classification will run in sequence inside your terminal.)",
     "Before running a full initial classification run on the terminal, you should stop all background processing that Recognize scheduled upon installation to avoid interference." : "Before running a full initial classification run on the terminal, you should stop all background processing that Recognize scheduled upon installation to avoid interference.",
+    "To run a face clustering run on for each user in the terminal, run the following. Consider adding the parameter --batch-size <count> for large libraries to avoid PHP memory exhaustion. (The clustering will run in sequence inside your terminal.)" : "To run a face clustering run on for each user in the terminal, run the following. Consider adding the parameter --batch-size <count> for large libraries to avoid PHP memory exhaustion. (The clustering will run in sequence inside your terminal.)",
     "To remove all face clusters but keep the raw detected faces run the following on the terminal:" : "To remove all face clusters but keep the raw detected faces run the following on the terminal:",
     "To remove all detected faces and face clusters run the following on the terminal:" : "To remove all detected faces and face clusters run the following on the terminal:",
     "You can reset the tags of all files that have been previously classified by Recognize with the following command:" : "You can reset the tags of all files that have been previously classified by Recognise with the following command:",