Merge branch 'master' into feature/37677/exclude-some-groups-from-sha…

…ring-with-users

.drone.yml

@@ -1728,4 +1728,4 @@ trigger:
     - push
 ---
 kind: signature
-hmac: 6814dc276b076a391796f3639b27499592e974db8e5e7a4043a120ce215b78cd
+hmac: 641c0bf70ed3d9561f41687c19dd5223da37143cbd6c2ad829836da41b57d4c5

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -101,10 +101,10 @@ body:
         Select PHP engine version serving Nextcloud Server.
         _Describe in the "Additional info" section if you chose "Other"._
       options:
-        - "PHP 7.4"
         - "PHP 8.0"
         - "PHP 8.1"
         - "PHP 8.2"
+        - "PHP 8.3"
         - "Other"
   - type: dropdown
     id: webserver

.gitignore

@@ -162,6 +162,7 @@ tests/acceptance/vendor/
 
 composer.phar
 /lib/composer/bin
+/lib/composer/bamarni
 /vendor-bin/**/vendor
 
 ./.htaccess

apps/admin_audit/l10n/is.js

@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Eftirlit / Atvikaskráning",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Býður upp á atvikaskráningu fyrir Nextcloud, eins og að skrá aðgang að skrám og fleiri viðkvæmar aðgerðir."
+},
+"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");

apps/admin_audit/l10n/is.json

@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Eftirlit / Atvikaskráning",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Býður upp á atvikaskráningu fyrir Nextcloud, eins og að skrá aðgang að skrám og fleiri viðkvæmar aðgerðir."
+},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
+}

apps/comments/l10n/de.js

@@ -16,9 +16,12 @@ OC.L10N.register(
     "Delete comment" : "Kommentar löschen",
     "Cancel edit" : "Bearbeiten abbrechen",
     "Post comment" : "Kommentar veröffentlichen",
+    "@ for mentions, : for emoji, / for smart picker" : "@ für Erwähnungen, : für Emoji, / für Smart Picker",
+    "Could not reload comments" : "Kommentare konnten nicht erneut geladen werden",
     "No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginne die Diskussion!",
     "No more messages" : "Keine weiteren Nachrichten",
     "Retry" : "Wiederholen",
+    "Failed to mark comments as read" : "Kommentare konnten nicht als gelesen markiert werden",
     "Unable to load the comments list" : "Kommentarliste konnte nicht geladen werden",
     "_1 new comment_::_{unread} new comments_" : ["1 neuer Kommentar","[unread] neue Kommentare"],
     "Comment" : "Kommentar",

apps/comments/l10n/de.json

@@ -14,9 +14,12 @@
     "Delete comment" : "Kommentar löschen",
     "Cancel edit" : "Bearbeiten abbrechen",
     "Post comment" : "Kommentar veröffentlichen",
+    "@ for mentions, : for emoji, / for smart picker" : "@ für Erwähnungen, : für Emoji, / für Smart Picker",
+    "Could not reload comments" : "Kommentare konnten nicht erneut geladen werden",
     "No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginne die Diskussion!",
     "No more messages" : "Keine weiteren Nachrichten",
     "Retry" : "Wiederholen",
+    "Failed to mark comments as read" : "Kommentare konnten nicht als gelesen markiert werden",
     "Unable to load the comments list" : "Kommentarliste konnte nicht geladen werden",
     "_1 new comment_::_{unread} new comments_" : ["1 neuer Kommentar","[unread] neue Kommentare"],
     "Comment" : "Kommentar",

apps/comments/l10n/eu.js

@@ -16,6 +16,8 @@ OC.L10N.register(
     "Delete comment" : "Ezabatu iruzkina",
     "Cancel edit" : "Utzi editatzeari",
     "Post comment" : "Argitaratu iruzkina",
+    "@ for mentions, : for emoji, / for smart picker" : "@ aipamenetarako, : emojientzako, / hautatzaile adimentsurako",
+    "Could not reload comments" : "Ezin izan dira iruzkinak freskatu",
     "No comments yet, start the conversation!" : "Oraindik ez dago iruzkinik, izan zaitez lehena zerbait esanez!",
     "No more messages" : "Ez da mezu gehiagorik",
     "Retry" : "Saiatu berriro",

apps/comments/l10n/eu.json

@@ -14,6 +14,8 @@
     "Delete comment" : "Ezabatu iruzkina",
     "Cancel edit" : "Utzi editatzeari",
     "Post comment" : "Argitaratu iruzkina",
+    "@ for mentions, : for emoji, / for smart picker" : "@ aipamenetarako, : emojientzako, / hautatzaile adimentsurako",
+    "Could not reload comments" : "Ezin izan dira iruzkinak freskatu",
     "No comments yet, start the conversation!" : "Oraindik ez dago iruzkinik, izan zaitez lehena zerbait esanez!",
     "No more messages" : "Ez da mezu gehiagorik",
     "Retry" : "Saiatu berriro",

apps/comments/l10n/is.js

@@ -9,14 +9,19 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s setti inn athugasemd um %2$s",
     "{author} commented on {file}" : "{author} setti inn athugasemd við {file}",
     "<strong>Comments</strong> for files" : "<strong>Athugasemdir</strong> við skrár",
+    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "Minnst var á þig í \"{file}\", í athugasemd frá notanda sem síðan þá hefur verið eytt",
+    "{user} mentioned you in a comment on \"{file}\"" : "{user} minntist á þig í athugasemd við \"{file}\"",
     "Files app plugin to add comments to files" : "Viðbót við skráaforrit til að bæta athugasemdum við skrár",
     "Edit comment" : "Breyta athugasemd",
     "Delete comment" : "Eyða athugasemd",
     "Cancel edit" : "Hætta við breytingar",
     "Post comment" : "Senda inn athugasemd",
+    "@ for mentions, : for emoji, / for smart picker" : "@ til að minnast á, : fyrir tjáningartákn, / fyrir snjallveljara",
+    "Could not reload comments" : "Gat ekki endurlesið athugasemdir",
     "No comments yet, start the conversation!" : "Engar athugasemdir ennþá, byrjaðu umræðuna!",
     "No more messages" : "Engin fleiri skilaboð",
     "Retry" : "Reyna aftur",
+    "Failed to mark comments as read" : "Tókst ekki að merkja athugasemdir sem lesnar",
     "Unable to load the comments list" : "Gat ekki hlaðið inn lista yfir athugasemdir",
     "_1 new comment_::_{unread} new comments_" : ["1 ný athugasemd","{unread} nýjar athugasemdir"],
     "Comment" : "Athugasemd",

apps/comments/l10n/is.json

@@ -7,14 +7,19 @@
     "%1$s commented on %2$s" : "%1$s setti inn athugasemd um %2$s",
     "{author} commented on {file}" : "{author} setti inn athugasemd við {file}",
     "<strong>Comments</strong> for files" : "<strong>Athugasemdir</strong> við skrár",
+    "You were mentioned on \"{file}\", in a comment by a user that has since been deleted" : "Minnst var á þig í \"{file}\", í athugasemd frá notanda sem síðan þá hefur verið eytt",
+    "{user} mentioned you in a comment on \"{file}\"" : "{user} minntist á þig í athugasemd við \"{file}\"",
     "Files app plugin to add comments to files" : "Viðbót við skráaforrit til að bæta athugasemdum við skrár",
     "Edit comment" : "Breyta athugasemd",
     "Delete comment" : "Eyða athugasemd",
     "Cancel edit" : "Hætta við breytingar",
     "Post comment" : "Senda inn athugasemd",
+    "@ for mentions, : for emoji, / for smart picker" : "@ til að minnast á, : fyrir tjáningartákn, / fyrir snjallveljara",
+    "Could not reload comments" : "Gat ekki endurlesið athugasemdir",
     "No comments yet, start the conversation!" : "Engar athugasemdir ennþá, byrjaðu umræðuna!",
     "No more messages" : "Engin fleiri skilaboð",
     "Retry" : "Reyna aftur",
+    "Failed to mark comments as read" : "Tókst ekki að merkja athugasemdir sem lesnar",
     "Unable to load the comments list" : "Gat ekki hlaðið inn lista yfir athugasemdir",
     "_1 new comment_::_{unread} new comments_" : ["1 ný athugasemd","{unread} nýjar athugasemdir"],
     "Comment" : "Athugasemd",

apps/comments/l10n/it.js

@@ -16,6 +16,8 @@ OC.L10N.register(
     "Delete comment" : "Elimina commento",
     "Cancel edit" : "Annulla modifica",
     "Post comment" : "Pubblica commento",
+    "@ for mentions, : for emoji, / for smart picker" : "@ per menzioni, : per emoji, / per selettore intelligente",
+    "Could not reload comments" : "Impossibile ricaricare i commenti",
     "No comments yet, start the conversation!" : "Ancora nessun commento, inizia la conversazione!",
     "No more messages" : "Non ci sono altri messaggi",
     "Retry" : "Riprova",

apps/comments/l10n/it.json

@@ -14,6 +14,8 @@
     "Delete comment" : "Elimina commento",
     "Cancel edit" : "Annulla modifica",
     "Post comment" : "Pubblica commento",
+    "@ for mentions, : for emoji, / for smart picker" : "@ per menzioni, : per emoji, / per selettore intelligente",
+    "Could not reload comments" : "Impossibile ricaricare i commenti",
     "No comments yet, start the conversation!" : "Ancora nessun commento, inizia la conversazione!",
     "No more messages" : "Non ci sono altri messaggi",
     "Retry" : "Riprova",

apps/comments/l10n/ja.js

@@ -16,6 +16,8 @@ OC.L10N.register(
     "Delete comment" : "コメントを削除",
     "Cancel edit" : "編集をキャンセル",
     "Post comment" : "コメントを投稿",
+    "@ for mentions, : for emoji, / for smart picker" : "メンションには@、絵文字には:、スマートピッカーには/",
+    "Could not reload comments" : "コメントをリロードできませんでした",
     "No comments yet, start the conversation!" : "まだコメントはありません、会話を開始してください！",
     "No more messages" : "これ以上のメッセージはありません",
     "Retry" : "再試行",

apps/comments/l10n/ja.json

@@ -14,6 +14,8 @@
     "Delete comment" : "コメントを削除",
     "Cancel edit" : "編集をキャンセル",
     "Post comment" : "コメントを投稿",
+    "@ for mentions, : for emoji, / for smart picker" : "メンションには@、絵文字には:、スマートピッカーには/",
+    "Could not reload comments" : "コメントをリロードできませんでした",
     "No comments yet, start the conversation!" : "まだコメントはありません、会話を開始してください！",
     "No more messages" : "これ以上のメッセージはありません",
     "Retry" : "再試行",

apps/comments/l10n/pl.js

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Delete comment" : "Usuń komentarz",
     "Cancel edit" : "Anuluj edycję",
     "Post comment" : "Wyślij komentarz",
+    "@ for mentions, : for emoji, / for smart picker" : "@ dla wzmianek, : dla emoji, / dla inteligentnego wybierania",
     "Could not reload comments" : "Nie można ponownie załadować komentarzy",
     "No comments yet, start the conversation!" : "Brak komentarzy, rozpocznij rozmowę!",
     "No more messages" : "Nie ma więcej wiadomości",

apps/comments/l10n/pl.json

@@ -14,6 +14,7 @@
     "Delete comment" : "Usuń komentarz",
     "Cancel edit" : "Anuluj edycję",
     "Post comment" : "Wyślij komentarz",
+    "@ for mentions, : for emoji, / for smart picker" : "@ dla wzmianek, : dla emoji, / dla inteligentnego wybierania",
     "Could not reload comments" : "Nie można ponownie załadować komentarzy",
     "No comments yet, start the conversation!" : "Brak komentarzy, rozpocznij rozmowę!",
     "No more messages" : "Nie ma więcej wiadomości",

apps/comments/l10n/ro.js

@@ -16,9 +16,12 @@ OC.L10N.register(
     "Delete comment" : "Șterge comentariul",
     "Cancel edit" : "Anulați editarea",
     "Post comment" : "Postează comentariu",
+    "@ for mentions, : for emoji, / for smart picker" : "@ pentru mențiuni, : pentru emoji, / pentru smart picker",
+    "Could not reload comments" : "Nu se pot reîncărca comentariile",
     "No comments yet, start the conversation!" : "Nici un comentariu încă, începe conversația!",
     "No more messages" : "Nu mai sunt mesaje",
     "Retry" : "Reîncearcă",
+    "Failed to mark comments as read" : "Eroare la marcarea comentariilor ca citite",
     "Unable to load the comments list" : "Lista de comentarii nu poate fi încărcată",
     "_1 new comment_::_{unread} new comments_" : ["1 nou comentariu","{unread} noi comentarii","{unread} comentarii noi"],
     "Comment" : "Comentariu",

apps/comments/l10n/ro.json

@@ -14,9 +14,12 @@
     "Delete comment" : "Șterge comentariul",
     "Cancel edit" : "Anulați editarea",
     "Post comment" : "Postează comentariu",
+    "@ for mentions, : for emoji, / for smart picker" : "@ pentru mențiuni, : pentru emoji, / pentru smart picker",
+    "Could not reload comments" : "Nu se pot reîncărca comentariile",
     "No comments yet, start the conversation!" : "Nici un comentariu încă, începe conversația!",
     "No more messages" : "Nu mai sunt mesaje",
     "Retry" : "Reîncearcă",
+    "Failed to mark comments as read" : "Eroare la marcarea comentariilor ca citite",
     "Unable to load the comments list" : "Lista de comentarii nu poate fi încărcată",
     "_1 new comment_::_{unread} new comments_" : ["1 nou comentariu","{unread} noi comentarii","{unread} comentarii noi"],
     "Comment" : "Comentariu",

apps/comments/l10n/ru.js

@@ -16,6 +16,8 @@ OC.L10N.register(
     "Delete comment" : "Удалить комментарий",
     "Cancel edit" : "Отменить правку",
     "Post comment" : "Опубликовать комментарий",
+    "@ for mentions, : for emoji, / for smart picker" : "@ для упоминаний, : для эмодзи, / для интеллектуального выбора",
+    "Could not reload comments" : "Не удалось перезагрузить комментарии",
     "No comments yet, start the conversation!" : "Комментарии отсутствуют, начните обсуждение!",
     "No more messages" : "Сообщений нет",
     "Retry" : "Повторить",

apps/comments/l10n/ru.json

@@ -14,6 +14,8 @@
     "Delete comment" : "Удалить комментарий",
     "Cancel edit" : "Отменить правку",
     "Post comment" : "Опубликовать комментарий",
+    "@ for mentions, : for emoji, / for smart picker" : "@ для упоминаний, : для эмодзи, / для интеллектуального выбора",
+    "Could not reload comments" : "Не удалось перезагрузить комментарии",
     "No comments yet, start the conversation!" : "Комментарии отсутствуют, начните обсуждение!",
     "No more messages" : "Сообщений нет",
     "Retry" : "Повторить",

apps/comments/l10n/sl.js

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Delete comment" : "Izbriši opombo",
     "Cancel edit" : "Prekliči urejanje",
     "Post comment" : "Objavi opombo",
+    "@ for mentions, : for emoji, / for smart picker" : "@ za omenjanje, za izrazne ikone, / za pametni izbirnik",
     "Could not reload comments" : "Opomb ni mogoče posodobiti",
     "No comments yet, start the conversation!" : "Ni še odzivov, bodite prvi!",
     "No more messages" : "Ni drugih sporočil",

apps/comments/l10n/sl.json

@@ -14,6 +14,7 @@
     "Delete comment" : "Izbriši opombo",
     "Cancel edit" : "Prekliči urejanje",
     "Post comment" : "Objavi opombo",
+    "@ for mentions, : for emoji, / for smart picker" : "@ za omenjanje, za izrazne ikone, / za pametni izbirnik",
     "Could not reload comments" : "Opomb ni mogoče posodobiti",
     "No comments yet, start the conversation!" : "Ni še odzivov, bodite prvi!",
     "No more messages" : "Ni drugih sporočil",

apps/comments/l10n/sv.js

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Delete comment" : "Ta bort kommentar",
     "Cancel edit" : "Avbryt redigering",
     "Post comment" : "Publicera kommentar",
+    "@ for mentions, : for emoji, / for smart picker" : "@ för omnämnanden, : för emoji, / för smart picker",
     "Could not reload comments" : "Kunde inte ladda om kommentarer",
     "No comments yet, start the conversation!" : "Inga kommentarer ännu.",
     "No more messages" : "Inga fler meddelanden",

apps/comments/l10n/sv.json

@@ -14,6 +14,7 @@
     "Delete comment" : "Ta bort kommentar",
     "Cancel edit" : "Avbryt redigering",
     "Post comment" : "Publicera kommentar",
+    "@ for mentions, : for emoji, / for smart picker" : "@ för omnämnanden, : för emoji, / för smart picker",
     "Could not reload comments" : "Kunde inte ladda om kommentarer",
     "No comments yet, start the conversation!" : "Inga kommentarer ännu.",
     "No more messages" : "Inga fler meddelanden",

apps/comments/l10n/zh_CN.js

@@ -16,6 +16,7 @@ OC.L10N.register(
     "Delete comment" : "删除评论",
     "Cancel edit" : "取消编辑",
     "Post comment" : "发表评论",
+    "@ for mentions, : for emoji, / for smart picker" : "使用“@”提及，“:”输入表情符号，“/”唤起智能选择",
     "Could not reload comments" : "无法重载评论",
     "No comments yet, start the conversation!" : "还没有评论，开始对话吧！",
     "No more messages" : "没有更多消息",

apps/comments/l10n/zh_CN.json

@@ -14,6 +14,7 @@
     "Delete comment" : "删除评论",
     "Cancel edit" : "取消编辑",
     "Post comment" : "发表评论",
+    "@ for mentions, : for emoji, / for smart picker" : "使用“@”提及，“:”输入表情符号，“/”唤起智能选择",
     "Could not reload comments" : "无法重载评论",
     "No comments yet, start the conversation!" : "还没有评论，开始对话吧！",
     "No more messages" : "没有更多消息",

apps/comments/l10n/zh_HK.js

@@ -16,6 +16,8 @@ OC.L10N.register(
     "Delete comment" : "刪除留言",
     "Cancel edit" : "取消編輯",
     "Post comment" : "張貼留言",
+    "@ for mentions, : for emoji, / for smart picker" : "“@” 表示提及，“:” 表示表情符號，“/” 表示智慧型選擇器",
+    "Could not reload comments" : "無法重新加載評論",
     "No comments yet, start the conversation!" : "尚無留言，開始討論吧！",
     "No more messages" : "沒有更多訊息",
     "Retry" : "重試",

apps/comments/l10n/zh_HK.json

@@ -14,6 +14,8 @@
     "Delete comment" : "刪除留言",
     "Cancel edit" : "取消編輯",
     "Post comment" : "張貼留言",
+    "@ for mentions, : for emoji, / for smart picker" : "“@” 表示提及，“:” 表示表情符號，“/” 表示智慧型選擇器",
+    "Could not reload comments" : "無法重新加載評論",
     "No comments yet, start the conversation!" : "尚無留言，開始討論吧！",
     "No more messages" : "沒有更多訊息",
     "Retry" : "重試",

apps/comments/lib/Listener/LoadAdditionalScripts.php

@@ -39,9 +39,7 @@ public function handle(Event $event): void {
 			return;
 		}
 
-		// TODO: make sure to only include the sidebar script when
-		// we properly split it between files list and sidebar
-		Util::addScript(Application::APP_ID, 'comments');
+		// Adding init script for file list inline actions
 		Util::addInitScript(Application::APP_ID, 'init');
 	}
 }

apps/comments/lib/Listener/LoadSidebarScripts.php

@@ -51,10 +51,7 @@ public function handle(Event $event): void {
 		$this->commentsManager->load();
 
 		$this->initialState->provideInitialState('activityEnabled', $this->appManager->isEnabledForUser('activity'));
-
-		// TODO: make sure to only include the sidebar script when
-		// we properly split it between files list and sidebar
-		Util::addScript(Application::APP_ID, 'comments');
+		// Add comments sidebar tab script
 		Util::addScript(Application::APP_ID, 'comments-tab', 'files');
 	}
 }