Merge branch 'master' into stable

Author: marcelklehr

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [16.2.3] - 2026-07-12
+
+### Fixed
+- fix(BookmarkMapper): Do not count trashed bookmarks as duplicated
+- perf(BookmarkMapper): Improve countDuplicated performance
+- fix(l10n): Update translations from Transifex
+
 ## [16.2.2] - 2026-06-20
 
 ### Fixed
@@ -12,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * fix(BookmarkMapper): Fix countDuplicated to use the recursive CTE
 * fix(Import): Handle transactions correctly
 * fix(Trashbin): Improve folder undelete UX
-* tests: Do not return folders twice in trashbin endpoint Marcel Klehr Yesterday 11:09 AM
+* tests: Do not return folders twice in trashbin endpoint
 * fix(TreeMapper#getSoftDeletedRootItems): Do not return folders twice
 * fix(Trashbin): Only populate the parent folders of bookmark entries that are actually soft deleted when showing trashbin items
 * fix(MOVE_BOOKMARK): Hard delete moved items from the origin of the move

Makefile

@@ -7,7 +7,7 @@ source_dir=$(build_dir)/source
 sign_dir=$(build_dir)/sign
 package_name=$(app_name)
 cert_dir=$(HOME)/.nextcloud/certificates
-version+=16.2.2
+version+=16.2.3
 
 all: dev-setup build-js-production composer-no-dev
 

appinfo/info.xml

@@ -23,7 +23,7 @@ Requirements:
    - mbstring: *
  - when using MySQL, use at least v8.0
 ]]></description>
-	<version>16.2.2</version>
+	<version>16.2.3</version>
 	<licence>agpl</licence>
 	<author mail="mklehr@gmx.net" homepage="https://marcelklehr.de">Marcel Klehr</author>
 	<author mail="blizzz@arthur-schiwon.de" homepage="https://www.arthur-schiwon.de">Arthur Schiwon</author>

l10n/de.js

@@ -128,6 +128,7 @@ OC.L10N.register(
     "Adding selection to folders" : "Auswahl zu Ordnern hinzufügen",
     "Emptying trashbin" : "Papierkorb wird geleert.",
     "Loading trashbin" : "Papierkorb wird geladen",
+    "Restoring folder" : "Ordner wird wiederhergestellt",
     "_Moving %n folder and some bookmarks_::_Moving %n folders and some bookmarks_" : ["Verschiebe %n Ordner und einige Lesezeichen","Verschiebe %n Ordner und einige Lesezeichen"],
     "_Moving %n folder_::_Moving %n folders_" : ["Verschiebe %n Ordner","Verschiebe %n Ordner"],
     "_Moving %n bookmark_::_Moving %n bookmarks_" : ["Verschiebe %n Lesezeichen","Verschiebe %n Lesezeichen"],
@@ -230,9 +231,9 @@ OC.L10N.register(
     "Screeenly" : "Screeenly",
     "You can either sign up for free at screeenly.com or setup your own server." : "Du kannst dich entweder kostenlos bei screeenly.com anmelden oder deinen eigenen Server einrichten.",
     "Screeenly API URL" : "Screeenly-API-URL",
-    "Screeenly API key" : "Screeenly-API-Key",
+    "Screeenly API key" : "Screeenly-API-Schlüssel",
     "ScreenshotMachine" : "ScreenshotMachine",
-    "ScreenshotMachine API key" : "ScreenshotMachine-API-Key",
+    "ScreenshotMachine API key" : "ScreenshotMachine-API-Schlüssel",
     "Webshot" : "Webshot",
     "Webshot API URL" : "Webshot-API-URL",
     "Generic screenshot API" : "Generische Screenshot-API",

l10n/de.json

@@ -126,6 +126,7 @@
     "Adding selection to folders" : "Auswahl zu Ordnern hinzufügen",
     "Emptying trashbin" : "Papierkorb wird geleert.",
     "Loading trashbin" : "Papierkorb wird geladen",
+    "Restoring folder" : "Ordner wird wiederhergestellt",
     "_Moving %n folder and some bookmarks_::_Moving %n folders and some bookmarks_" : ["Verschiebe %n Ordner und einige Lesezeichen","Verschiebe %n Ordner und einige Lesezeichen"],
     "_Moving %n folder_::_Moving %n folders_" : ["Verschiebe %n Ordner","Verschiebe %n Ordner"],
     "_Moving %n bookmark_::_Moving %n bookmarks_" : ["Verschiebe %n Lesezeichen","Verschiebe %n Lesezeichen"],
@@ -228,9 +229,9 @@
     "Screeenly" : "Screeenly",
     "You can either sign up for free at screeenly.com or setup your own server." : "Du kannst dich entweder kostenlos bei screeenly.com anmelden oder deinen eigenen Server einrichten.",
     "Screeenly API URL" : "Screeenly-API-URL",
-    "Screeenly API key" : "Screeenly-API-Key",
+    "Screeenly API key" : "Screeenly-API-Schlüssel",
     "ScreenshotMachine" : "ScreenshotMachine",
-    "ScreenshotMachine API key" : "ScreenshotMachine-API-Key",
+    "ScreenshotMachine API key" : "ScreenshotMachine-API-Schlüssel",
     "Webshot" : "Webshot",
     "Webshot API URL" : "Webshot-API-URL",
     "Generic screenshot API" : "Generische Screenshot-API",

l10n/de_DE.js

@@ -128,6 +128,7 @@ OC.L10N.register(
     "Adding selection to folders" : "Auswahl zu Ordnern hinzufügen",
     "Emptying trashbin" : "Papierkorb wird geleert",
     "Loading trashbin" : "Papierkorb wird geladen",
+    "Restoring folder" : "Ordner wird wiederhergestellt",
     "_Moving %n folder and some bookmarks_::_Moving %n folders and some bookmarks_" : ["Verschiebe %n Ordner und einige Lesezeichen","Verschiebe %n Ordner und einige Lesezeichen"],
     "_Moving %n folder_::_Moving %n folders_" : ["Verschiebe %n Ordner","Verschiebe %n Ordner"],
     "_Moving %n bookmark_::_Moving %n bookmarks_" : ["%n Lesezeichen verschieben","Verschiebe %n Lesezeichen"],
@@ -230,9 +231,9 @@ OC.L10N.register(
     "Screeenly" : "Screeenly",
     "You can either sign up for free at screeenly.com or setup your own server." : "Sie können sich entweder kostenlos bei screeenly.com anmelden oder Ihren eigenen Server einrichten.",
     "Screeenly API URL" : "Screeenly-API-URL",
-    "Screeenly API key" : "Screeenly-API-Key",
+    "Screeenly API key" : "Screeenly-API-Schlüssel",
     "ScreenshotMachine" : "ScreenshotMachine",
-    "ScreenshotMachine API key" : "ScreenshotMachine-API-Key",
+    "ScreenshotMachine API key" : "ScreenshotMachine-API-Schlüssel",
     "Webshot" : "Webshot",
     "Webshot API URL" : "Webshot-API-URL",
     "Generic screenshot API" : "Generische Screenshot-API",

l10n/de_DE.json

@@ -126,6 +126,7 @@
     "Adding selection to folders" : "Auswahl zu Ordnern hinzufügen",
     "Emptying trashbin" : "Papierkorb wird geleert",
     "Loading trashbin" : "Papierkorb wird geladen",
+    "Restoring folder" : "Ordner wird wiederhergestellt",
     "_Moving %n folder and some bookmarks_::_Moving %n folders and some bookmarks_" : ["Verschiebe %n Ordner und einige Lesezeichen","Verschiebe %n Ordner und einige Lesezeichen"],
     "_Moving %n folder_::_Moving %n folders_" : ["Verschiebe %n Ordner","Verschiebe %n Ordner"],
     "_Moving %n bookmark_::_Moving %n bookmarks_" : ["%n Lesezeichen verschieben","Verschiebe %n Lesezeichen"],
@@ -228,9 +229,9 @@
     "Screeenly" : "Screeenly",
     "You can either sign up for free at screeenly.com or setup your own server." : "Sie können sich entweder kostenlos bei screeenly.com anmelden oder Ihren eigenen Server einrichten.",
     "Screeenly API URL" : "Screeenly-API-URL",
-    "Screeenly API key" : "Screeenly-API-Key",
+    "Screeenly API key" : "Screeenly-API-Schlüssel",
     "ScreenshotMachine" : "ScreenshotMachine",
-    "ScreenshotMachine API key" : "ScreenshotMachine-API-Key",
+    "ScreenshotMachine API key" : "ScreenshotMachine-API-Schlüssel",
     "Webshot" : "Webshot",
     "Webshot API URL" : "Webshot-API-URL",
     "Generic screenshot API" : "Generische Screenshot-API",

l10n/en_GB.js

@@ -127,6 +127,7 @@ OC.L10N.register(
     "Moving selection" : "Moving selection",
     "Adding selection to folders" : "Adding selection to folders",
     "Emptying trashbin" : "Emptying trashbin",
+    "Restoring folder" : "Restoring folder",
     "_Moving %n folder and some bookmarks_::_Moving %n folders and some bookmarks_" : ["Moving %n folder and some bookmarks","Moving %n folders and some bookmarks"],
     "_Moving %n folder_::_Moving %n folders_" : ["Moving %n folder","Moving %n folders"],
     "_Moving %n bookmark_::_Moving %n bookmarks_" : ["Moving %n bookmark","Moving %n bookmarks"],

l10n/en_GB.json

@@ -125,6 +125,7 @@
     "Moving selection" : "Moving selection",
     "Adding selection to folders" : "Adding selection to folders",
     "Emptying trashbin" : "Emptying trashbin",
+    "Restoring folder" : "Restoring folder",
     "_Moving %n folder and some bookmarks_::_Moving %n folders and some bookmarks_" : ["Moving %n folder and some bookmarks","Moving %n folders and some bookmarks"],
     "_Moving %n folder_::_Moving %n folders_" : ["Moving %n folder","Moving %n folders"],
     "_Moving %n bookmark_::_Moving %n bookmarks_" : ["Moving %n bookmark","Moving %n bookmarks"],

l10n/et_EE.js

@@ -128,6 +128,7 @@ OC.L10N.register(
     "Adding selection to folders" : "Lisan valikut kaustadesse",
     "Emptying trashbin" : "Tühjendan prügikasti",
     "Loading trashbin" : "Laadin prügikasti",
+    "Restoring folder" : "Taastan kausta",
     "_Moving %n folder and some bookmarks_::_Moving %n folders and some bookmarks_" : ["Teisaldan %n kausta ja mõned järjehoidjad","Teisaldan %n kausta ja mõned järjehoidjad"],
     "_Moving %n folder_::_Moving %n folders_" : ["Teisaldan %n kausta","Teisaldan %n kausta"],
     "_Moving %n bookmark_::_Moving %n bookmarks_" : ["Teisaldan %n järjehoidja","Teisaldan %n järjehoidjat"],
@@ -150,7 +151,7 @@ OC.L10N.register(
     "Your search yielded no results in the current folder." : "Otsingul praeguses kaustas polnud tulemusi.",
     "No broken links" : "Katkisi linke pole",
     "No shared folders" : "Jagatud kaustu pole",
-    "No duplicated bookmarks" : "Topeltjärjehoidjaid  pole",
+    "No duplicated bookmarks" : "Topeltjärjehoidjaid pole",
     "No deleted bookmarks" : "Kustutatud järjehoidjaid pole",
     "You haven't deleted anything yet." : "Sa pole veel mitte midagi kustutanud.",
     "No bookmarks here" : "Siin ei leidu järjehoidjaid",
@@ -165,9 +166,9 @@ OC.L10N.register(
     "The bookmarks app can automatically archive the web content of links you have bookmarked" : "Järjehoidjate rakendus võib järjehoidjatena salvestatud linkide veebisisu automaatselt arhiveerida",
     "Enable archiving" : "Lülita arhiveerimine sisse",
     "Enter the path of a folder in your Files where bookmarked files should be stored." : "Sisesta järjehoidjate salvestamiseks kaust failirakendusest",
-    "Currently your administrator has disabled network access for this app, however, which is why Auto-archiving is disabled at the moment." : "Automaatne arhiveerimine hetkel ei toimi, sest peakasutaja on  keelanud ligipääsu võrgule.",
+    "Currently your administrator has disabled network access for this app, however, which is why Auto-archiving is disabled at the moment." : "Automaatne arhiveerimine hetkel ei toimi, sest peakasutaja on keelanud ligipääsu võrgule.",
     "Auto-Backup" : "Automaatne varundus",
-    "The bookmarks app can automatically backup your bookmarks on a daily basis to prevent data loss when syncing bookmarks across devices." : "Järjehoidjate rakendus võib sinu järjehoidjad iga päev automaatselt varundada ja tagada andmete säilimise, kui erinevate nutiseadmete vahel sünkroniseerides tekib vigu.",
+    "The bookmarks app can automatically backup your bookmarks on a daily basis to prevent data loss when syncing bookmarks across devices." : "Järjehoidjate rakendus võib sinu järjehoidjad iga päev automaatselt varundada ja tagada andmete säilimise, kui erinevate nutiseadmete vahel sünkroonides tekib vigu.",
     "Enable backups" : "Lülita varundamine sisse",
     "Enter the path of a folder in your Files where backups will be stored." : "Sisesta varukoopia salvestamiseks kaust failirakendusest",
     "Context Chat integration" : "Kontekstuaalse vestluse lõiming",
@@ -188,7 +189,7 @@ OC.L10N.register(
     "My work on this Bookmarks app is fuelled by a voluntary subscription model. If you think what I do is worthwhile, I would be happy if you could support my work. Also, please consider giving the app a review on the Nextcloud app store. Thank you 💙 " : "Minu töö selle Järjehoidjate rakendusega põhineb vabatahtlikel tellimustel. Kui sulle meeldib, mida ma olem teinud, siis ma oleksin rõõmus, kui sa minu tööd oleksid nõus toetama. Lisaks palun koosta ka arvustus Nextcloudi rakendustepoes. Suur tänu 💙",
     "Created {time} ago" : "Loodud {time} tagasi",
     "Created on {date}" : "Loodud {date}",
-    "(Empty title)" : "(Tühipealkiri)",
+    "(Empty title)" : "(Tühi pealkiri)",
     "Title" : "Pealkiri",
     "Link" : "Link",
     "Untitled folder" : "Nimetu kaust",