fix: Merge branch 'man' into HolgerHees-nextcloud-patch-1

Signed-off-by: Enjeck <32180937+enjeck@users.noreply.github.com>

Author: enjeck

.github/workflows/npm-audit-fix.yml

@@ -70,7 +70,7 @@ jobs:
 
       - name: Create Pull Request
         if: steps.checkout.outcome == 'success'
-        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
+        uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
           commit-message: 'fix(deps): Fix npm audit'

.github/workflows/playwright.yml

@@ -59,7 +59,7 @@ jobs:
         run: npx playwright test
 
       - name: Upload results
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         if: always()
         with:
           name: playwright-report

.github/workflows/update-nextcloud-ocp-matrix.yml

@@ -90,7 +90,7 @@ jobs:
         continue-on-error: true
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
+        uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
           commit-message: 'chore(dev-deps): Bump nextcloud/ocp package'

appinfo/info.xml

@@ -25,8 +25,8 @@ The Notes app is a distraction free notes taking app for [Nextcloud](https://www
 	<repository type="git">https://github.com/nextcloud/notes.git</repository>
 	<screenshot small-thumbnail="https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Notes/notes-thumbnail.jpg">https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Notes/notes.png</screenshot>
 	<dependencies>
-		<php min-version="8.0" max-version="8.5"/>
-		<nextcloud min-version="28" max-version="34"/>
+		<php min-version="8.1" max-version="8.5"/>
+		<nextcloud min-version="30" max-version="34"/>
 	</dependencies>
 	<repair-steps>
 		<post-migration>

appinfo/routes.php

@@ -92,6 +92,16 @@
 		'verb' => 'DELETE',
 		'requirements' => ['id' => '\d+'],
 	],
+	[
+		'name' => 'notes#renameCategory',
+		'url' => '/notes/category',
+		'verb' => 'PATCH',
+	],
+	[
+		'name' => 'notes#deleteCategory',
+		'url' => '/notes/category',
+		'verb' => 'DELETE',
+	],
 
 	//////////  A T T A C H M E N T S  //////////
 

l10n/af.js

@@ -9,6 +9,7 @@ OC.L10N.register(
     "Insert image" : "Voer beeld in",
     "General" : "Algemeen",
     "Files" : " Lêers",
+    "Cancel" : "Kanselleer",
     "All notes" : "Alle notas",
     "Categories" : "Kategorieë",
     "Remove from favorites" : "Verwyder uit gunstelinge",

l10n/af.json

@@ -7,6 +7,7 @@
     "Insert image" : "Voer beeld in",
     "General" : "Algemeen",
     "Files" : " Lêers",
+    "Cancel" : "Kanselleer",
     "All notes" : "Alle notas",
     "Categories" : "Kategorieë",
     "Remove from favorites" : "Verwyder uit gunstelinge",

l10n/ar.js

@@ -39,6 +39,8 @@ OC.L10N.register(
     "Notes folder" : "مجلد الملاحظات",
     "Mobile apps" : "التطبيقات المحمولة",
     "Shortcuts" : "اختصارات ",
+    "Delete" : "حذف",
+    "Cancel" : "إلغاء",
     "All notes" : "جميع الملاحظات",
     "Categories" : "التصنيفات",
     "Create a sample note with Markdown" : "إنشاء ملاحظة تجريبية بتسنيق  Markdown",
@@ -87,7 +89,6 @@ OC.L10N.register(
     "Write down your thoughts without any distractions." : "دون أفكارك بكل يسر وسلاسة.",
     "Use Markdown markups to style your text." : "إستعمل علامات ماركداون لتنسيق نَصِّك.",
     "Organize your notes in categories." : "تنظيم ملاحظاتك في فئات.",
-    "Start writing a note by clicking on “{newnote}” in the app navigation." : "إبدأ كتابة الملاحظة بالنقر على “{newnote}” في واجهة التطبيق.",
     "Note not found." : "الملاحظة غير موجودة",
     "Note is locked." : "الملاحظة مقفلة",
     "Insufficient storage." : "مساحة التخزين لا تكفي",

l10n/ar.json

@@ -37,6 +37,8 @@
     "Notes folder" : "مجلد الملاحظات",
     "Mobile apps" : "التطبيقات المحمولة",
     "Shortcuts" : "اختصارات ",
+    "Delete" : "حذف",
+    "Cancel" : "إلغاء",
     "All notes" : "جميع الملاحظات",
     "Categories" : "التصنيفات",
     "Create a sample note with Markdown" : "إنشاء ملاحظة تجريبية بتسنيق  Markdown",
@@ -85,7 +87,6 @@
     "Write down your thoughts without any distractions." : "دون أفكارك بكل يسر وسلاسة.",
     "Use Markdown markups to style your text." : "إستعمل علامات ماركداون لتنسيق نَصِّك.",
     "Organize your notes in categories." : "تنظيم ملاحظاتك في فئات.",
-    "Start writing a note by clicking on “{newnote}” in the app navigation." : "إبدأ كتابة الملاحظة بالنقر على “{newnote}” في واجهة التطبيق.",
     "Note not found." : "الملاحظة غير موجودة",
     "Note is locked." : "الملاحظة مقفلة",
     "Insufficient storage." : "مساحة التخزين لا تكفي",

l10n/ast.js

@@ -11,6 +11,8 @@ OC.L10N.register(
     "Files" : "Ficheros",
     "Mobile apps" : "Aplicaciones pa móviles",
     "Shortcuts" : "Atayos",
+    "Delete" : "Desaniciar",
+    "Cancel" : "Encaboxar",
     "All notes" : "Toles notes",
     "Categories" : "Categories",
     "No notes yet" : "Nun hai nenguna nota",
@@ -30,7 +32,6 @@ OC.L10N.register(
     "Loading …" : "Cargando…",
     "Write down your thoughts without any distractions." : "Escribi cualesquier pensamientu ensin nenguna distraición.",
     "Organize your notes in categories." : "Organiza les notes per categoríes.",
-    "Start writing a note by clicking on “{newnote}” in the app navigation." : "Comienza a escribir notes al calcar en «{newnote}» na navegación de l'aplicación.",
     "Note not found." : "Nun s'atopó la nota",
     "Note is locked." : "La nota ta bloquiada",
     "Uncategorized" : "Ensin categoría",