Merge branch 'master' into fix/files-breakpoint-improvements

Signed-off-by: John Molakvoæ <[email protected]>

Author: skjnldsv

REUSE.toml

@@ -202,7 +202,7 @@ SPDX-FileCopyrightText = "2016 ownCloud, Inc., 2016-2024 Nextcloud GmbH and Next
 SPDX-License-Identifier = "AGPL-3.0-only"
 
 [[annotations]]
-path = ["tests/data/testapp.0.8.tar.gz", "tests/data/testapp.tar.gz", "tests/data/testapp1.tar.gz", "apps/theming/tests/data/favicon-original.ico", "apps/theming/tests/data/touch-comments.png", "apps/theming/tests/data/touch-core-red.png", "apps/theming/tests/data/touch-original-png.png", "apps/theming/tests/data/touch-original.png", "apps/theming/tests/data/touch-testing-red.png", "core/img/filetypes/package-x-generic.svg"]
+path = ["tests/data/testapp.0.8.tar.gz", "tests/data/testapp.tar.gz", "tests/data/testapp1.tar.gz", "core/img/filetypes/package-x-generic.svg"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2016 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
@@ -232,7 +232,7 @@ SPDX-FileCopyrightText = "2021 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
 
 [[annotations]]
-path = ["apps/theming/img/dark-highcontrast.jpg", "apps/theming/img/dark.jpg", "apps/theming/img/default-source.svg", "apps/theming/img/default.jpg", "apps/theming/img/light-highcontrast.jpg", "apps/theming/img/light.jpg", "apps/theming/img/opendyslexic.jpg", "build/stubs/ftp.php", "tests/data/integritycheck/mimetypeListModified/coresignature.json", "apps/settings/tests/UserMigration/assets/account-complex-config.json", "apps/settings/tests/UserMigration/assets/account-complex.json", "apps/settings/tests/UserMigration/assets/account-config.json", "apps/settings/tests/UserMigration/assets/account.json"]
+path = ["build/stubs/ftp.php", "tests/data/integritycheck/mimetypeListModified/coresignature.json", "apps/settings/tests/UserMigration/assets/account-complex-config.json", "apps/settings/tests/UserMigration/assets/account-complex.json", "apps/settings/tests/UserMigration/assets/account-config.json", "apps/settings/tests/UserMigration/assets/account.json"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2022 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
@@ -387,126 +387,6 @@ precedence = "aggregate"
 SPDX-FileCopyrightText = "2019 Tom Gainor <https://unsplash.com/@its_tgain> <https://unsplash.com/photos/mountain-cliff-under-starry-night-KidY3t8O4PE>"
 SPDX-License-Identifier = "LicenseRef-Unsplash"
 
-[[annotations]]
-path = ["apps/theming/img/background/jenna-kim-the-globe.webp", "apps/theming/img/background/jenna-kim-the-globe-dark.webp", "apps/theming/img/background/preview/jenna-kim-the-globe.jpg"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2024 Nextcloud GmbH"
-SPDX-License-Identifier = "CC-BY-SA-4.0"
-
-[[annotations]]
-path = ["apps/theming/img/background/anatoly-mikhaltsov-butterfly-wing-scale.jpg", "apps/theming/img/background/preview/anatoly-mikhaltsov-butterfly-wing-scale.jpg"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2015 Anatoly Mikhaltsov <https://commons.wikimedia.org/wiki/File:%D0%A7%D0%B5%D1%88%D1%83%D0%B9%D0%BA%D0%B8_%D0%BA%D1%80%D1%8B%D0%BB%D0%B0_%D0%B1%D0%B0%D0%B1%D0%BE%D1%87%D0%BA%D0%B8.jpg>"
-SPDX-License-Identifier = "CC-BY-SA-4.0"
-
-[[annotations]]
-path = ["apps/theming/img/background/bernard-spragg-new-zealand-fern.jpg", "apps/theming/img/background/preview/bernard-spragg-new-zealand-fern.jpg"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2013 Bernard Spragg <https://commons.wikimedia.org/wiki/File:NZ_Fern.(Blechnum_chambersii)_(11263534936).jpg>"
-SPDX-License-Identifier = "CC0-1.0"
-
-[[annotations]]
-path = ["apps/theming/img/background/bernie-cetonia-aurata-take-off-composition.jpg", "apps/theming/img/background/preview/bernie-cetonia-aurata-take-off-composition.jpg"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "Bernie Kohl <https://commons.wikimedia.org/wiki/File:Cetonia_aurata_take_off_composition_05172009.jpg>"
-SPDX-License-Identifier = "CC0-1.0"
-
-[[annotations]]
-path = ["apps/theming/img/background/dejan-krsmanovic-ribbed-red-metal.jpg", "apps/theming/img/background/preview/dejan-krsmanovic-ribbed-red-metal.jpg"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2018 Dejan Krsmanovic <https://www.flickr.com/photos/dejankrsmanovic/42971456774/>"
-SPDX-License-Identifier = "CC-BY-2.0"
-
-[[annotations]]
-path = ["apps/theming/img/background/eduardo-neves-pedra-azul.jpg", "apps/theming/img/background/preview/eduardo-neves-pedra-azul.jpg"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2017 Eduardo Menezes dos Santos Neves <https://commons.wikimedia.org/wiki/File:Pedra_Azul_Milky_Way.jpg>"
-SPDX-License-Identifier = "CC-BY-SA-4.0"
-
-[[annotations]]
-path = ["apps/theming/img/background/european-space-agency-barents-bloom.jpg", "apps/theming/img/background/preview/european-space-agency-barents-bloom.jpg"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2016 Contains modified Copernicus Sentinel data (2016), processed by ESA <https://www.esa.int/ESA_Multimedia/Images/2016/08/Barents_bloom>"
-SPDX-License-Identifier = "CC-BY-SA-3.0-IGO"
-
-[[annotations]]
-path = ["apps/theming/img/background/hannah-maclean-soft-floral.jpg", "apps/theming/img/background/preview/hannah-maclean-soft-floral.jpg"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "Hannah MacLean <https://stocksnap.io/photo/soft-floral-XOYWCCW5PA>"
-SPDX-License-Identifier = "CC0-1.0"
-
-[[annotations]]
-path = ["apps/theming/img/background/hannes-fritz-flippity-floppity.jpg", "apps/theming/img/background/preview/hannes-fritz-flippity-floppity.jpg"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2015 Hannes Fritz <http://hannes.photos/flippity-floppity>"
-SPDX-License-Identifier = "CC-BY-SA-4.0"
-
-[[annotations]]
-path = ["apps/theming/img/background/hannes-fritz-roulette.jpg", "apps/theming/img/background/preview/hannes-fritz-roulette.jpg"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2015 Hannes Fritz <http://hannes.photos/roulette>"
-SPDX-License-Identifier = "CC-BY-SA-4.0"
-
-[[annotations]]
-path = ["apps/theming/img/background/hannes-fritz-sea-spray.jpg", "apps/theming/img/background/preview/hannes-fritz-sea-spray.jpg"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2015 Hannes Fritz <http://hannes.photos/sea-spray>"
-SPDX-License-Identifier = "CC-BY-SA-4.0"
-
-[[annotations]]
-path = ["apps/theming/img/background/kamil-porembinski-clouds.jpg", "apps/theming/img/background/preview/kamil-porembinski-clouds.jpg"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2013 Kamil Porembiński <https://www.flickr.com/photos/paszczak000>"
-SPDX-License-Identifier = "CC-BY-SA-2.0"
-
-[[annotations]]
-path = ["apps/theming/img/background/lali-masriera-yellow-bricks.jpg", "apps/theming/img/background/preview/lali-masriera-yellow-bricks.jpg"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2009 Lali Masriera <https://www.flickr.com/photos/visualpanic/3982464447>"
-SPDX-License-Identifier = "CC-BY-2.0"
-
-[[annotations]]
-path = ["apps/theming/img/background/nasa-waxing-crescent-moon.jpg", "apps/theming/img/background/preview/nasa-waxing-crescent-moon.jpg"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2020 Nasa <https://www.nasa.gov/image-article/waxing-crescent-moon-2/>"
-SPDX-License-Identifier = "LicenseRef-Nasa"
-
-[[annotations]]
-path = ["apps/theming/img/background/rawpixel-pink-tapioca-bubbles.jpg", "apps/theming/img/background/preview/rawpixel-pink-tapioca-bubbles.jpg"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2018 Rawpixel Ltd <https://www.flickr.com/photos/byrawpixel/27665140298/in/photostream/>"
-SPDX-License-Identifier = "CC-BY-2.0"
-
-[[annotations]]
-path = ["apps/theming/img/background/stefanus-martanto-setyo-husodo-underwater-ocean.jpg", "apps/theming/img/background/preview/stefanus-martanto-setyo-husodo-underwater-ocean.jpg"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "Stefanus Martanto Setyo Husodo <https://stocksnap.io/photo/underwater-ocean-TJA9LBH4WS>"
-SPDX-License-Identifier = "CC0-1.0"
-
-[[annotations]]
-path = ["apps/theming/img/background/ted-moravec-morning-fog.jpg", "apps/theming/img/background/preview/ted-moravec-morning-fog.jpg"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2022 Ted Moravec <https://flickr.com/photos/tmoravec/52392410261>"
-SPDX-License-Identifier = "CC0-1.0"
-
-[[annotations]]
-path = ["apps/theming/img/background/tommy-chau-already.jpg", "apps/theming/img/background/preview/tommy-chau-already.jpg"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2015 tommy@chau <https://www.flickr.com/photos/90975693@N05/16910999368>"
-SPDX-License-Identifier = "CC-BY-2.0"
-
-[[annotations]]
-path = ["apps/theming/img/background/tommy-chau-lion-rock-hill.jpg", "apps/theming/img/background/preview/tommy-chau-lion-rock-hill.jpg"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2015 tommy@chau <https://www.flickr.com/photos/90975693@N05/17136440246>"
-SPDX-License-Identifier = "CC-BY-2.0"
-
-[[annotations]]
-path = ["apps/theming/img/background/zoltan-voros-rhythm-and-blues.jpg", "apps/theming/img/background/preview/zoltan-voros-rhythm-and-blues.jpg"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2021 Zoltán Vörös <https://flickr.com/photos/v923z/51634409289/>"
-SPDX-License-Identifier = "CC-BY-2.0"
-
 [[annotations]]
 path = "apps/settings/tests/UserMigration/assets/account-complex.jpg"
 precedence = "aggregate"
@@ -519,12 +399,6 @@ precedence = "aggregate"
 SPDX-FileCopyrightText = "2019 Fabian Wiktor <https://www.pexels.com/photo/green-and-brown-island-on-blue-sea-under-blue-sky-4011450/>"
 SPDX-License-Identifier = "CC0-1.0"
 
-[[annotations]]
-path = ["apps/theming/fonts/OpenDyslexic-Bold.otf", "apps/theming/fonts/OpenDyslexic-Regular.otf"]
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2012-2019 Abbie Gonzalez <https://abbiecod.es|[email protected]>, with Reserved Font Name OpenDyslexic."
-SPDX-License-Identifier = "OFL-1.1-RFN"
-
 [[annotations]]
 path = ["openapi.json", ".envrc", "flake.nix", "flake.lock"]
 precedence = "aggregate"

apps/files/l10n/be.js

@@ -111,6 +111,7 @@ OC.L10N.register(
     "Personal files" : "Асабістыя файлы",
     "Appearance" : "Знешні выгляд",
     "Show file extensions" : "Паказваць пашырэнні файлаў",
+    "Additional settings" : "Дадатковыя налады",
     "WebDAV" : "WebDAV",
     "WebDAV URL" : "URL-адрас WebDAV",
     "Copy" : "Капіяваць",

apps/files/l10n/be.json

@@ -109,6 +109,7 @@
     "Personal files" : "Асабістыя файлы",
     "Appearance" : "Знешні выгляд",
     "Show file extensions" : "Паказваць пашырэнні файлаў",
+    "Additional settings" : "Дадатковыя налады",
     "WebDAV" : "WebDAV",
     "WebDAV URL" : "URL-адрас WebDAV",
     "Copy" : "Капіяваць",