Merge pull request #26893 from nextcloud/version/21.0.2

21.0.2
2021-05-06 13:46:30 +02:00 · 2021-05-06 12:53:00 +02:00 · 2021-05-06 02:25:46 +00:00 · 2021-05-05 13:43:35 +02:00 · 2021-05-05 11:02:10 +00:00 · 2021-05-05 11:02:09 +00:00
2039 changed files with 31240 additions and 12387 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -754,6 +754,31 @@ trigger:
    - pull_request
    - push

+---
+kind: pipeline
+name: integration-collaboration_features
+
+steps:
+- name: submodules
+  image: docker:git
+  commands:
+    - git submodule update --init
+- name: integration-collaboration_features
+  image: nextcloudci/integration-php7.3:integration-php7.3-2
+  commands:
+    - bash tests/drone-run-integration-tests.sh || exit 0
+    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
+    - cd build/integration
+    - ./run.sh collaboration_features/
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
 ---
 kind: pipeline
 name: integration-federation_features
@@ -769,7 +794,7 @@ steps:
    - bash tests/drone-run-integration-tests.sh || exit 0
    - ./occ maintenance:install --admin-pass=admin
    - cd build/integration
-    - ./run.sh federation_features/federated.feature
+    - ./run.sh federation_features/

 trigger:
  branch:
@@ -1353,7 +1378,7 @@ steps:
  commands:
    # JavaScript files are not used in integration tests so it is not needed to
    # build them.
-    - git clone --depth 1 https://github.com/nextcloud/spreed apps/spreed
+    - git clone --depth 1 --branch stable21 https://github.com/nextcloud/spreed apps/spreed
 - name: integration-sharing-v1-video-verification
  image: nextcloudci/integration-php7.3:integration-php7.3-2
  commands:
--- a/.github/workflows/oci.yml
+++ b/.github/workflows/oci.yml
@@ -9,7 +9,7 @@ on:

 jobs:
  phpunit-oci8:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04

    strategy:
      # do not stop on another job's failure
--- a/2
+++ b/2
--- a/apps/accessibility/composer/composer/ClassLoader.php
+++ b/apps/accessibility/composer/composer/ClassLoader.php
@@ -311,8 +311,10 @@ class ClassLoader
        spl_autoload_register(array($this, 'loadClass'), true, $prepend);

        if (null === $this->vendorDir) {
-            //no-op
-        } elseif ($prepend) {
+            return;
+        }
+
+        if ($prepend) {
            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
        } else {
            unset(self::$registeredLoaders[$this->vendorDir]);
--- a/apps/accessibility/css/dark.scss
+++ b/apps/accessibility/css/dark.scss
@@ -32,8 +32,8 @@ $color-border-dark: lighten($color-main-background, 14%);
 }

 #navigation #apps li a,
-#body-settings #content.app-settings .app-image-icon,
-#body-settings #content.app-settings #app-sidebar #app-details-view h2 {
+#body-settings #content-vue.app-settings .app-image-icon,
+#body-settings #content-vue.app-settings #app-sidebar #app-details-view h2 {
 	svg {
 		filter: invert(100%);
 	}
--- a/apps/accessibility/l10n/bg.js
+++ b/apps/accessibility/l10n/bg.js
@@ -1,7 +1,7 @@
 OC.L10N.register(
    "accessibility",
    {
-    "Dark theme" : "Тъмна тема",
+    "Dark theme" : "Tъмна Tема",
    "Enable dark theme" : "Активиране на тъмна тема",
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Тъмна тема, която облекчава очите ви, като намалява яркостта. Все още е в процес на разработка, затова, моля, докладвайте за всички проблеми, които откриете.",
    "High contrast mode" : "Висок контраст",
--- a/apps/accessibility/l10n/bg.json
+++ b/apps/accessibility/l10n/bg.json
@@ -1,5 +1,5 @@
 { "translations": {
-    "Dark theme" : "Тъмна тема",
+    "Dark theme" : "Tъмна Tема",
    "Enable dark theme" : "Активиране на тъмна тема",
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Тъмна тема, която облекчава очите ви, като намалява яркостта. Все още е в процес на разработка, затова, моля, докладвайте за всички проблеми, които откриете.",
    "High contrast mode" : "Висок контраст",
--- a/apps/accessibility/l10n/bn_BD.js
+++ b/apps/accessibility/l10n/bn_BD.js
@@ -0,0 +1,19 @@
+OC.L10N.register(
+    "accessibility",
+    {
+    "Dark theme" : "অন্ধকার থিম",
+    "Enable dark theme" : "অন্ধকার থিম সক্ষম করুন",
+    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "সামগ্রিক আলোকসজ্জা এবং উজ্জ্বলতা হ্রাস করে আপনার চোখকে সহজ করার জন্য একটি অন্ধকার থিম। এটা এখনও উন্নয়ন অধীনে, তাই কোনো সমস্যা আপনি খুঁজে পেতে পারেন রিপোর্ট করুন। ",
+    "High contrast mode" : "উচ্চ বিপরীতে মোড ",
+    "Enable high contrast mode" : "উচ্চতর বিপরীতে মোড সক্ষম করুন",
+    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "আপনার নেভিগেশন সহজ করতে একটি উচ্চ বিপরীতে মোড। ভিজ্যুয়াল মান হ্রাস পাবে তবে স্বচ্ছতা বাড়ানো হবে। ",
+    "Dyslexia font" : "ডিসলেক্সিয়া হরফ",
+    "Enable dyslexia font" : "ডিসলেক্সিয়া হরফ সক্ষম করুন",
+    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "ওপেনডাইলেক্সিক হ'ল ফ্রি টাইপফেস / হরফ ডিজাইলেসিয়া দ্বারা সৃষ্ট কিছু সাধারণ পাঠ্য ত্রুটি প্রশমিত করার জন্য ডিজাইন করা। ",
+    "Accessibility" : "অ্যাক্সেসযোগ্যতা",
+    "Accessibility options for nextcloud" : "নেক্সটক্লাউডের জন্য অ্যাক্সেসযোগ্যতার বিকল্পগুলি",
+    "Provides multiple accessibilities options to ease your use of Nextcloud" : "নেক্সটক্লাউডের আপনার ব্যবহার সহজ করার জন্য একাধিক অ্যাক্সেসিবিলিটি বিকল্প সরবরাহ করে",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "সর্বজনীন অ্যাক্সেস আমাদের জন্য খুব গুরুত্বপূর্ণ। আমরা ওয়েব স্ট্যান্ডার্ডগুলি অনুসরণ করি এবং মাউস ছাড়াই এবং স্ক্রিনড্রেডারের মতো সহায়ক সফ্টওয়্যার ছাড়াও সবকিছুকে ব্যবহারযোগ্য করে তুলতে পরীক্ষা করে দেখি। আমরা এএএ স্তরে এমনকি উচ্চতর বিপরীতে থিম সহ, এএ স্তরের {নির্দেশিকা} ওয়েব সামগ্রী অ্যাক্সেসিবিলিটি নির্দেশিকা {লিনএন্ড} 2.1 এর সাথে অনুগত হতে লক্ষ্য করি।",
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "আপনি যদি কোনও সমস্যা খুঁজে পান তবে তাদেরকে আমাদের ইস্যু ট্র্যাকার {লিনএন্ড} এ প্রতিবেদন করতে দ্বিধা করবেন না} এবং আপনি যদি এতে জড়িত থাকতে চান তবে আসুন {ডিজাইনটিয়াম} আমাদের ডিজাইন দল {লিনএন্ড} এ যোগদান করুন"
+},
+"nplurals=2; plural=(n != 1);");
--- a/apps/accessibility/l10n/bn_BD.json
+++ b/apps/accessibility/l10n/bn_BD.json
@@ -0,0 +1,17 @@
+{ "translations": {
+    "Dark theme" : "অন্ধকার থিম",
+    "Enable dark theme" : "অন্ধকার থিম সক্ষম করুন",
+    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "সামগ্রিক আলোকসজ্জা এবং উজ্জ্বলতা হ্রাস করে আপনার চোখকে সহজ করার জন্য একটি অন্ধকার থিম। এটা এখনও উন্নয়ন অধীনে, তাই কোনো সমস্যা আপনি খুঁজে পেতে পারেন রিপোর্ট করুন। ",
+    "High contrast mode" : "উচ্চ বিপরীতে মোড ",
+    "Enable high contrast mode" : "উচ্চতর বিপরীতে মোড সক্ষম করুন",
+    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "আপনার নেভিগেশন সহজ করতে একটি উচ্চ বিপরীতে মোড। ভিজ্যুয়াল মান হ্রাস পাবে তবে স্বচ্ছতা বাড়ানো হবে। ",
+    "Dyslexia font" : "ডিসলেক্সিয়া হরফ",
+    "Enable dyslexia font" : "ডিসলেক্সিয়া হরফ সক্ষম করুন",
+    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "ওপেনডাইলেক্সিক হ'ল ফ্রি টাইপফেস / হরফ ডিজাইলেসিয়া দ্বারা সৃষ্ট কিছু সাধারণ পাঠ্য ত্রুটি প্রশমিত করার জন্য ডিজাইন করা। ",
+    "Accessibility" : "অ্যাক্সেসযোগ্যতা",
+    "Accessibility options for nextcloud" : "নেক্সটক্লাউডের জন্য অ্যাক্সেসযোগ্যতার বিকল্পগুলি",
+    "Provides multiple accessibilities options to ease your use of Nextcloud" : "নেক্সটক্লাউডের আপনার ব্যবহার সহজ করার জন্য একাধিক অ্যাক্সেসিবিলিটি বিকল্প সরবরাহ করে",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "সর্বজনীন অ্যাক্সেস আমাদের জন্য খুব গুরুত্বপূর্ণ। আমরা ওয়েব স্ট্যান্ডার্ডগুলি অনুসরণ করি এবং মাউস ছাড়াই এবং স্ক্রিনড্রেডারের মতো সহায়ক সফ্টওয়্যার ছাড়াও সবকিছুকে ব্যবহারযোগ্য করে তুলতে পরীক্ষা করে দেখি। আমরা এএএ স্তরে এমনকি উচ্চতর বিপরীতে থিম সহ, এএ স্তরের {নির্দেশিকা} ওয়েব সামগ্রী অ্যাক্সেসিবিলিটি নির্দেশিকা {লিনএন্ড} 2.1 এর সাথে অনুগত হতে লক্ষ্য করি।",
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "আপনি যদি কোনও সমস্যা খুঁজে পান তবে তাদেরকে আমাদের ইস্যু ট্র্যাকার {লিনএন্ড} এ প্রতিবেদন করতে দ্বিধা করবেন না} এবং আপনি যদি এতে জড়িত থাকতে চান তবে আসুন {ডিজাইনটিয়াম} আমাদের ডিজাইন দল {লিনএন্ড} এ যোগদান করুন"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
--- a/apps/accessibility/l10n/br.js
+++ b/apps/accessibility/l10n/br.js
@@ -2,18 +2,18 @@ OC.L10N.register(
    "accessibility",
    {
    "Dark theme" : "Tem teñval",
-    "Enable dark theme" : "Enaouiñ an tem teñval",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Un tem teñval evit distanañ ho taoulagad en ur vihanaat ar sklaerijenn. War ziorren emañ c'hoazh, setu ma c'hallit kas deomp hoc'h evezhiadennoù.",
+    "Enable dark theme" : "Aotren an tem teñval",
+    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Un tem teñval evit distanañ ho taoulagad en ur vihanaat ar sklêrijenn. War ziorren emañ c'hoazh, setu ma c'hallit kas deomp hoc'h evezhiadennoù.",
    "High contrast mode" : "Mod dargemm uhel",
-    "Enable high contrast mode" : "Enaouiñ an dargemm uhel",
+    "Enable high contrast mode" : "Aotren mod an dargemm uhel",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Ur mod dargemm uhel evit aesaat ho merdeiñ. Bihanaet e vo ar c'halite met brasaet e vo ar spisder eta.",
-    "Dyslexia font" : "Skritur evit an dislegiezh",
-    "Enable dyslexia font" : "Enaouiñ ar skritur evit an dislegiezh",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic a zo ur skritur stummet evit skañvaat ar fazioù lenn-pennañ graet abalamour d'an dislegiezh.",
+    "Dyslexia font" : "Font a-enep an dislegiezh",
+    "Enable dyslexia font" : "Aotren ar font a-enep an dislegiezh",
+    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic a zo ur font digoust soñjet evit disteraat ar fazioù lenn pennañ deuet diwar dislegiezh.",
    "Accessibility" : "Monedusted",
-    "Accessibility options for nextcloud" : "Arventennoù monedusted Nexcloud",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Roet e vez meur a arventenn vonedusted evit simplaat implij Nexcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Ar vonedusted evit an holl a zo pouezus-ruz eo evidomp. Heuliet e vez ganeomp ar standardoù web ha gwiriet a vez hag-eñ e c'hall an holl dud implijout, hag ar re hep logodenn zoken, ha gant meziantoù sikour evel \"screenreaders\". Klasket e vez ober hervez ar {guidelines}Reolennoù monedusted endalc'hadoù ar Web{linkend} 2.1 gant ul live AA, gant an tem gant un dargemm bras eus al live AAA zoken.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Ma vez kavet ur gudenn ganeoc'h, arabat deoc'h kaout aon da reiñ da c'houzout ez eus anezho d'{issuetracker}hon heulier kudennoù{linkend}. Ha m'ho peus c'hoant sikour, deuit en {designteam}hor skipailh design{linkend}!"
+    "Accessibility options for nextcloud" : "Arventennoù monedusted Nextcloud",
+    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Pourveziñ a ra meur a arventenn vonedusted evit simplaat implij Nexcloud",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Hollbouezus eo deomp ar vonedusted hollvedel. Heuliañ a reomp ar standardoù web ha gwiriañ a reomp hag-eñ e c'hall mat pep tra bezañ implijet hep logodenn zoken, ha gant meziantoù skoazellañ evel \"lennerioù skramm\". Klask a reomp doujañ da {guidelines}Reolennoù monedusted endalc'hadoù ar Web{linkend} 2.1 gant ul live AA, gant an tem gantañ un dargemm bras, d'al live AAA zoken.",
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Mar kavit un draen bennak, na dermit ket da reiñ deomp da c'houzout war {issuetracker}hor benveg dizreinañ{linkend}. Ha mar fell deoc'h kemer perzh e viot degemeret mat en {designteam}hor skipailh dezagn{linkend}!"
 },
 "nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);");
--- a/apps/accessibility/l10n/br.json
+++ b/apps/accessibility/l10n/br.json
@@ -1,17 +1,17 @@
 { "translations": {
    "Dark theme" : "Tem teñval",
-    "Enable dark theme" : "Enaouiñ an tem teñval",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Un tem teñval evit distanañ ho taoulagad en ur vihanaat ar sklaerijenn. War ziorren emañ c'hoazh, setu ma c'hallit kas deomp hoc'h evezhiadennoù.",
+    "Enable dark theme" : "Aotren an tem teñval",
+    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Un tem teñval evit distanañ ho taoulagad en ur vihanaat ar sklêrijenn. War ziorren emañ c'hoazh, setu ma c'hallit kas deomp hoc'h evezhiadennoù.",
    "High contrast mode" : "Mod dargemm uhel",
-    "Enable high contrast mode" : "Enaouiñ an dargemm uhel",
+    "Enable high contrast mode" : "Aotren mod an dargemm uhel",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Ur mod dargemm uhel evit aesaat ho merdeiñ. Bihanaet e vo ar c'halite met brasaet e vo ar spisder eta.",
-    "Dyslexia font" : "Skritur evit an dislegiezh",
-    "Enable dyslexia font" : "Enaouiñ ar skritur evit an dislegiezh",
-    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic a zo ur skritur stummet evit skañvaat ar fazioù lenn-pennañ graet abalamour d'an dislegiezh.",
+    "Dyslexia font" : "Font a-enep an dislegiezh",
+    "Enable dyslexia font" : "Aotren ar font a-enep an dislegiezh",
+    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic a zo ur font digoust soñjet evit disteraat ar fazioù lenn pennañ deuet diwar dislegiezh.",
    "Accessibility" : "Monedusted",
-    "Accessibility options for nextcloud" : "Arventennoù monedusted Nexcloud",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Roet e vez meur a arventenn vonedusted evit simplaat implij Nexcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Ar vonedusted evit an holl a zo pouezus-ruz eo evidomp. Heuliet e vez ganeomp ar standardoù web ha gwiriet a vez hag-eñ e c'hall an holl dud implijout, hag ar re hep logodenn zoken, ha gant meziantoù sikour evel \"screenreaders\". Klasket e vez ober hervez ar {guidelines}Reolennoù monedusted endalc'hadoù ar Web{linkend} 2.1 gant ul live AA, gant an tem gant un dargemm bras eus al live AAA zoken.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Ma vez kavet ur gudenn ganeoc'h, arabat deoc'h kaout aon da reiñ da c'houzout ez eus anezho d'{issuetracker}hon heulier kudennoù{linkend}. Ha m'ho peus c'hoant sikour, deuit en {designteam}hor skipailh design{linkend}!"
+    "Accessibility options for nextcloud" : "Arventennoù monedusted Nextcloud",
+    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Pourveziñ a ra meur a arventenn vonedusted evit simplaat implij Nexcloud",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Hollbouezus eo deomp ar vonedusted hollvedel. Heuliañ a reomp ar standardoù web ha gwiriañ a reomp hag-eñ e c'hall mat pep tra bezañ implijet hep logodenn zoken, ha gant meziantoù skoazellañ evel \"lennerioù skramm\". Klask a reomp doujañ da {guidelines}Reolennoù monedusted endalc'hadoù ar Web{linkend} 2.1 gant ul live AA, gant an tem gantañ un dargemm bras, d'al live AAA zoken.",
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Mar kavit un draen bennak, na dermit ket da reiñ deomp da c'houzout war {issuetracker}hor benveg dizreinañ{linkend}. Ha mar fell deoc'h kemer perzh e viot degemeret mat en {designteam}hor skipailh dezagn{linkend}!"
 },"pluralForm" :"nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);"
 }
--- a/apps/accessibility/l10n/cs.js
+++ b/apps/accessibility/l10n/cs.js
@@ -2,18 +2,18 @@ OC.L10N.register(
    "accessibility",
    {
    "Dark theme" : "Tmavý motiv vzhledu",
-    "Enable dark theme" : "Zapnout tmavý motiv vzhledu",
+    "Enable dark theme" : "Používat tmavý motiv vzhledu",
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Tmavý motiv vzhledu pro ulevení vašim očím snížením celkové svítivosti a jasu. Jeho vývoj zatím ještě není zcela dokončen, proto prosíme hlaste jakékoli problémy, se kterými se setkáte.",
    "High contrast mode" : "Režim s vysokým kontrastem",
    "Enable high contrast mode" : "Zapnout režim s vysokým kontrastem",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Režim s vysokým kontrastem pro usnadnění orientace při pohybu po aplikaci. Vizuální kvalita bude snížena, zato zřetelnost se zlepší.",
    "Dyslexia font" : "Písmo pro dyslektiky",
-    "Enable dyslexia font" : "Použít písmo pro dyslektiky",
+    "Enable dyslexia font" : "Používat písmo pro dyslektiky",
    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic je bezplatné písmo (font) navržené tak, aby odpomáhalo od některých běžných chybování při čtení, způsobených dyslexií.",
    "Accessibility" : "Zpřístupnění",
    "Accessibility options for nextcloud" : "Předvolby v Nexcloud pro zpřístupnění",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Poskytuje vícero možností zpřístupnění pro usnadnění používání Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Přístupnost pro všechny je pro nás velmi důležitá. Splňujeme webové standardy a zajišťujeme, aby všechno bylo použitelné i bez myši a s asistenčním software, jako například čtečkami obrazovky. Máme za cíl být v souladu s {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 na úrovni AA, při použití motivu vzhledu s vysokým kontrastem dokonce na úrovni AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Pokud naleznete jakékoli problémy, neváhejte s jejich nahlášením do {issuetracker}našeho systému pro správu hlášení {linkend}. A pokud se chcete zapojit, přidejte se k {designteam}týmu našich designérů{linkend}!"
+    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Poskytuje vícero možností pro zpřístupnění a tím usnadnění používání Nextcloud",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Přístupnost pro všechny je pro nás velmi důležitá. Splňujeme webové standardy a zajišťujeme, aby všechno bylo použitelné i bez myši a s asistenčním software, jako například čtečkami obrazovky. Máme za cíl být v souladu s doporučeními {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 na úrovni AA, při použití motivu vzhledu s vysokým kontrastem dokonce na úrovni AAA.",
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Pokud naleznete jakékoli problémy, neváhejte s jejich nahlášením do {issuetracker}našeho systému pro správu hlášení{linkend}. A pokud se chcete zapojit, přidejte se k {designteam}týmu našich designérů{linkend}!"
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");
--- a/apps/accessibility/l10n/cs.json
+++ b/apps/accessibility/l10n/cs.json
@@ -1,17 +1,17 @@
 { "translations": {
    "Dark theme" : "Tmavý motiv vzhledu",
-    "Enable dark theme" : "Zapnout tmavý motiv vzhledu",
+    "Enable dark theme" : "Používat tmavý motiv vzhledu",
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Tmavý motiv vzhledu pro ulevení vašim očím snížením celkové svítivosti a jasu. Jeho vývoj zatím ještě není zcela dokončen, proto prosíme hlaste jakékoli problémy, se kterými se setkáte.",
    "High contrast mode" : "Režim s vysokým kontrastem",
    "Enable high contrast mode" : "Zapnout režim s vysokým kontrastem",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Režim s vysokým kontrastem pro usnadnění orientace při pohybu po aplikaci. Vizuální kvalita bude snížena, zato zřetelnost se zlepší.",
    "Dyslexia font" : "Písmo pro dyslektiky",
-    "Enable dyslexia font" : "Použít písmo pro dyslektiky",
+    "Enable dyslexia font" : "Používat písmo pro dyslektiky",
    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic je bezplatné písmo (font) navržené tak, aby odpomáhalo od některých běžných chybování při čtení, způsobených dyslexií.",
    "Accessibility" : "Zpřístupnění",
    "Accessibility options for nextcloud" : "Předvolby v Nexcloud pro zpřístupnění",
-    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Poskytuje vícero možností zpřístupnění pro usnadnění používání Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Přístupnost pro všechny je pro nás velmi důležitá. Splňujeme webové standardy a zajišťujeme, aby všechno bylo použitelné i bez myši a s asistenčním software, jako například čtečkami obrazovky. Máme za cíl být v souladu s {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 na úrovni AA, při použití motivu vzhledu s vysokým kontrastem dokonce na úrovni AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Pokud naleznete jakékoli problémy, neváhejte s jejich nahlášením do {issuetracker}našeho systému pro správu hlášení {linkend}. A pokud se chcete zapojit, přidejte se k {designteam}týmu našich designérů{linkend}!"
+    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Poskytuje vícero možností pro zpřístupnění a tím usnadnění používání Nextcloud",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Přístupnost pro všechny je pro nás velmi důležitá. Splňujeme webové standardy a zajišťujeme, aby všechno bylo použitelné i bez myši a s asistenčním software, jako například čtečkami obrazovky. Máme za cíl být v souladu s doporučeními {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 na úrovni AA, při použití motivu vzhledu s vysokým kontrastem dokonce na úrovni AAA.",
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Pokud naleznete jakékoli problémy, neváhejte s jejich nahlášením do {issuetracker}našeho systému pro správu hlášení{linkend}. A pokud se chcete zapojit, přidejte se k {designteam}týmu našich designérů{linkend}!"
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
 }
--- a/apps/accessibility/l10n/es_AR.js
+++ b/apps/accessibility/l10n/es_AR.js
@@ -13,6 +13,7 @@ OC.L10N.register(
    "Accessibility" : "Accesibilidad",
    "Accessibility options for nextcloud" : "Opciones de accesibilidad para nextcloud",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Proporciona múltiples opciones de accesibilidad para facilitar el uso de Nextcloud",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "El acceso universal es muy importante para nosotros. Seguimos los estándares web y verificamos que todo se pueda usar también sin mouse y software de asistencia, como lectores de pantalla. Nuestro objetivo es cumplir con las {pautas} Accesibilidad al contenido web {linkend} 2.1 en el nivel AA, con el tema de alto contraste incluso en el nivel AAA.",
    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Si encuentra algún problema, no dude en informarlo en {issuetracker}nuestro rastreador de problemas {linkend}. Y si desea participar, ¡únase a {designteam}a nuestro equipo de diseño {linkend}!"
 },
 "nplurals=2; plural=(n != 1);");
--- a/apps/accessibility/l10n/es_AR.json
+++ b/apps/accessibility/l10n/es_AR.json
@@ -11,6 +11,7 @@
    "Accessibility" : "Accesibilidad",
    "Accessibility options for nextcloud" : "Opciones de accesibilidad para nextcloud",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Proporciona múltiples opciones de accesibilidad para facilitar el uso de Nextcloud",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "El acceso universal es muy importante para nosotros. Seguimos los estándares web y verificamos que todo se pueda usar también sin mouse y software de asistencia, como lectores de pantalla. Nuestro objetivo es cumplir con las {pautas} Accesibilidad al contenido web {linkend} 2.1 en el nivel AA, con el tema de alto contraste incluso en el nivel AAA.",
    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Si encuentra algún problema, no dude en informarlo en {issuetracker}nuestro rastreador de problemas {linkend}. Y si desea participar, ¡únase a {designteam}a nuestro equipo de diseño {linkend}!"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
--- a/apps/accessibility/l10n/es_MX.js
+++ b/apps/accessibility/l10n/es_MX.js
@@ -6,6 +6,7 @@ OC.L10N.register(
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Un tema oscuro para ayudar a tus ojos al reducir el brillo y luminosidad en general. Todavía está bajo desarrollo, así que por favor reporta cualquier problema que pudieras encontrar.",
    "High contrast mode" : "Modo de alto contraste",
    "Enable high contrast mode" : "Habilitar modo de alto contraste",
+    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Modo de alto contraste para facilitar tu navegación. La calidad visual puede ser menor pero incrementa la claridad.",
    "Dyslexia font" : "Fuente para dislexia",
    "Enable dyslexia font" : "Habilitar fuente para dislexia",
    "Accessibility" : "Accesibilidad",
--- a/apps/accessibility/l10n/es_MX.json
+++ b/apps/accessibility/l10n/es_MX.json
@@ -4,6 +4,7 @@
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Un tema oscuro para ayudar a tus ojos al reducir el brillo y luminosidad en general. Todavía está bajo desarrollo, así que por favor reporta cualquier problema que pudieras encontrar.",
    "High contrast mode" : "Modo de alto contraste",
    "Enable high contrast mode" : "Habilitar modo de alto contraste",
+    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Modo de alto contraste para facilitar tu navegación. La calidad visual puede ser menor pero incrementa la claridad.",
    "Dyslexia font" : "Fuente para dislexia",
    "Enable dyslexia font" : "Habilitar fuente para dislexia",
    "Accessibility" : "Accesibilidad",
--- a/apps/accessibility/l10n/fi.js
+++ b/apps/accessibility/l10n/fi.js
@@ -1,8 +1,8 @@
 OC.L10N.register(
    "accessibility",
    {
-    "Dark theme" : "Tummateema",
-    "Enable dark theme" : "Käytä tummaateemaa",
+    "Dark theme" : "Tumma teema",
+    "Enable dark theme" : "Käytä tummaa teemaa",
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Tumma teema helpottaa silmien rasitusta vähentämällä kokonaiskirkkautta. Teemaa kehitetään edelleen, joten ilmoitathan mahdollisesti kohtaamasi ongelmat.",
    "High contrast mode" : "Suuren kontrastin tila",
    "Enable high contrast mode" : "Käytä suuren kontrastin tilaa",
--- a/apps/accessibility/l10n/fi.json
+++ b/apps/accessibility/l10n/fi.json
@@ -1,6 +1,6 @@
 { "translations": {
-    "Dark theme" : "Tummateema",
-    "Enable dark theme" : "Käytä tummaateemaa",
+    "Dark theme" : "Tumma teema",
+    "Enable dark theme" : "Käytä tummaa teemaa",
    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Tumma teema helpottaa silmien rasitusta vähentämällä kokonaiskirkkautta. Teemaa kehitetään edelleen, joten ilmoitathan mahdollisesti kohtaamasi ongelmat.",
    "High contrast mode" : "Suuren kontrastin tila",
    "Enable high contrast mode" : "Käytä suuren kontrastin tilaa",
--- a/apps/accessibility/l10n/ja.js
+++ b/apps/accessibility/l10n/ja.js
@@ -3,7 +3,7 @@ OC.L10N.register(
    {
    "Dark theme" : "ダークテーマ",
    "Enable dark theme" : "ダークテーマを有効にする",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "ダークテーマは目の負担になりにくいです。このテーマは開発中のためバグを見つけたら報告してください。",
+    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "ダークテーマは画面全体のの明るさを減らすため、目の負担を和らげることができます。このテーマは開発中のためバグを見つけたら報告してください。",
    "High contrast mode" : "ハイ・コントラストモード",
    "Enable high contrast mode" : "ハイ・コントラストモードを有効にする。",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "操作をわかりやすくするためのハイ・コントラストモード。\n見た目の美しさは低下しますが、明確さが向上します。",
--- a/apps/accessibility/l10n/ja.json
+++ b/apps/accessibility/l10n/ja.json
@@ -1,7 +1,7 @@
 { "translations": {
    "Dark theme" : "ダークテーマ",
    "Enable dark theme" : "ダークテーマを有効にする",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "ダークテーマは目の負担になりにくいです。このテーマは開発中のためバグを見つけたら報告してください。",
+    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "ダークテーマは画面全体のの明るさを減らすため、目の負担を和らげることができます。このテーマは開発中のためバグを見つけたら報告してください。",
    "High contrast mode" : "ハイ・コントラストモード",
    "Enable high contrast mode" : "ハイ・コントラストモードを有効にする。",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "操作をわかりやすくするためのハイ・コントラストモード。\n見た目の美しさは低下しますが、明確さが向上します。",
--- a/apps/accessibility/l10n/oc.js
+++ b/apps/accessibility/l10n/oc.js
@@ -6,6 +6,8 @@ OC.L10N.register(
    "High contrast mode" : "Mòde fòrt contraste",
    "Enable high contrast mode" : "Activar lo mòde fòrt contraste",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un mòde fòrt contraste per facilitar la navegacion. La qualitat visuala baissarà mas la claror serà aumentada.",
+    "Dyslexia font" : "Poliça dyslexia",
+    "Enable dyslexia font" : "Activar la poliça dyslexia",
    "Accessibility" : "Accessibilitat",
    "Accessibility options for nextcloud" : "Opcions d’accessibilitat per nextcloud"
 },
--- a/apps/accessibility/l10n/oc.json
+++ b/apps/accessibility/l10n/oc.json
@@ -4,6 +4,8 @@
    "High contrast mode" : "Mòde fòrt contraste",
    "Enable high contrast mode" : "Activar lo mòde fòrt contraste",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un mòde fòrt contraste per facilitar la navegacion. La qualitat visuala baissarà mas la claror serà aumentada.",
+    "Dyslexia font" : "Poliça dyslexia",
+    "Enable dyslexia font" : "Activar la poliça dyslexia",
    "Accessibility" : "Accessibilitat",
    "Accessibility options for nextcloud" : "Opcions d’accessibilitat per nextcloud"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
--- a/apps/accessibility/l10n/pl.js
+++ b/apps/accessibility/l10n/pl.js
@@ -3,7 +3,7 @@ OC.L10N.register(
    {
    "Dark theme" : "Ciemny motyw",
    "Enable dark theme" : "Włącz ciemny motyw",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Ciemny motyw, który łagodzi zmęczenie oczu, zmniejszając ogólną jasność. Nadal jest w fazie rozwoju, więc proszę zgłaszać wszelkie zauważone błędy.",
+    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Ciemny motyw, który łagodzi zmęczenie oczu, zmniejszając ogólną jasność. Nadal jest w fazie rozwoju, więc zgłaszaj wszelkie zauważone błędy.",
    "High contrast mode" : "Tryb wysokiego kontrastu",
    "Enable high contrast mode" : "Włącz tryb wysokiego kontrastu",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Tryb wysokiego kontrastu ułatwiający nawigację. Jakość obrazu zostanie zmniejszona, celem poprawy przejrzystości.",
--- a/apps/accessibility/l10n/pl.json
+++ b/apps/accessibility/l10n/pl.json
@@ -1,7 +1,7 @@
 { "translations": {
    "Dark theme" : "Ciemny motyw",
    "Enable dark theme" : "Włącz ciemny motyw",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Ciemny motyw, który łagodzi zmęczenie oczu, zmniejszając ogólną jasność. Nadal jest w fazie rozwoju, więc proszę zgłaszać wszelkie zauważone błędy.",
+    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Ciemny motyw, który łagodzi zmęczenie oczu, zmniejszając ogólną jasność. Nadal jest w fazie rozwoju, więc zgłaszaj wszelkie zauważone błędy.",
    "High contrast mode" : "Tryb wysokiego kontrastu",
    "Enable high contrast mode" : "Włącz tryb wysokiego kontrastu",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Tryb wysokiego kontrastu ułatwiający nawigację. Jakość obrazu zostanie zmniejszona, celem poprawy przejrzystości.",
--- a/apps/accessibility/l10n/pt_PT.js
+++ b/apps/accessibility/l10n/pt_PT.js
@@ -3,7 +3,7 @@ OC.L10N.register(
    {
    "Dark theme" : "Tema escuro",
    "Enable dark theme" : "Ativar tema escuro",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Um tema escuro para descansar os olhos reduzindo a luminosidade e o brilho. Ainda está em desenvolvimento, pelo que tenha a gentileza de reportar quaisquer erros que encontre.",
+    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Um tema escuro para descansar os olhos reduzindo a luminosidade e o brilho. Ainda está em desenvolvimento, pelo que por favor reporte quaisquer erros que encontre.",
    "High contrast mode" : "Modo de alto contraste",
    "Enable high contrast mode" : "Ativar modo de alto contraste",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Um modo de alto contraste para facilitar sua navegação. A qualidade visual será reduzida, mas a clareza será aumentada.",
@@ -13,7 +13,7 @@ OC.L10N.register(
    "Accessibility" : "Acessibilidade",
    "Accessibility options for nextcloud" : "Opções de acessibilidade para nextcloud",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Fornece várias opções de acessibilidade para facilitar a sua utilização do Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "O acesso universal é muito importante para nós. Seguimos os padrões da web e verificamos para tornar tudo utilizável também sem mouse e software auxiliar, como leitores de tela. O nosso objetivo é estar em conformidade com as {guidelines} Diretrizes de acessibilidade para o conteúdo da Web {linkend} 2.1 no nível AA, com o tema de alto contraste, mesmo no nível AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Se você encontrar algum problema, não hesite em denunciá-lo no {issuetracker} o nosso rastreador de problemas {linkend}. E se quiser participar, venha juntar-se à {designteam} a nossa equipa de design {linkend}!"
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "O acesso universal é muito importante para nós. Seguimos os padrões da web e verificamos para tornar tudo utilizável também sem rato e software auxiliar, como leitores de ecrã. O nosso objetivo é estar em conformidade com as {guidelines} Diretrizes de acessibilidade para o conteúdo da Web {linkend} 2.1 no nível AA, com o tema de alto contraste, mesmo no nível AAA.",
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Se você encontrar algum problema, não hesite em o reportar no {issuetracker} nosso issue tracker {linkend}. E se quiser participar, venha juntar-se à {designteam} a nossa equipa de design {linkend}!"
 },
 "nplurals=2; plural=(n != 1);");
--- a/apps/accessibility/l10n/pt_PT.json
+++ b/apps/accessibility/l10n/pt_PT.json
@@ -1,7 +1,7 @@
 { "translations": {
    "Dark theme" : "Tema escuro",
    "Enable dark theme" : "Ativar tema escuro",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Um tema escuro para descansar os olhos reduzindo a luminosidade e o brilho. Ainda está em desenvolvimento, pelo que tenha a gentileza de reportar quaisquer erros que encontre.",
+    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Um tema escuro para descansar os olhos reduzindo a luminosidade e o brilho. Ainda está em desenvolvimento, pelo que por favor reporte quaisquer erros que encontre.",
    "High contrast mode" : "Modo de alto contraste",
    "Enable high contrast mode" : "Ativar modo de alto contraste",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Um modo de alto contraste para facilitar sua navegação. A qualidade visual será reduzida, mas a clareza será aumentada.",
@@ -11,7 +11,7 @@
    "Accessibility" : "Acessibilidade",
    "Accessibility options for nextcloud" : "Opções de acessibilidade para nextcloud",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Fornece várias opções de acessibilidade para facilitar a sua utilização do Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "O acesso universal é muito importante para nós. Seguimos os padrões da web e verificamos para tornar tudo utilizável também sem mouse e software auxiliar, como leitores de tela. O nosso objetivo é estar em conformidade com as {guidelines} Diretrizes de acessibilidade para o conteúdo da Web {linkend} 2.1 no nível AA, com o tema de alto contraste, mesmo no nível AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Se você encontrar algum problema, não hesite em denunciá-lo no {issuetracker} o nosso rastreador de problemas {linkend}. E se quiser participar, venha juntar-se à {designteam} a nossa equipa de design {linkend}!"
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "O acesso universal é muito importante para nós. Seguimos os padrões da web e verificamos para tornar tudo utilizável também sem rato e software auxiliar, como leitores de ecrã. O nosso objetivo é estar em conformidade com as {guidelines} Diretrizes de acessibilidade para o conteúdo da Web {linkend} 2.1 no nível AA, com o tema de alto contraste, mesmo no nível AAA.",
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Se você encontrar algum problema, não hesite em o reportar no {issuetracker} nosso issue tracker {linkend}. E se quiser participar, venha juntar-se à {designteam} a nossa equipa de design {linkend}!"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
--- a/apps/accessibility/l10n/ro.js
+++ b/apps/accessibility/l10n/ro.js
@@ -3,7 +3,7 @@ OC.L10N.register(
    {
    "Dark theme" : "Temă întunecată",
    "Enable dark theme" : "Activați tema întunecată",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Temă întunecată pentru ușurarea ochilor prin reducerea generală a luminozității. Temă în curs de dezvoltare deci vă rugăm să raportați orice problemă găsită.",
+    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "O temă întunecată pentru ușurarea ochilor prin reducerea generală a luminozității. Temă în curs de dezvoltare deci vă rugăm să raportați orice problemă găsită.",
    "High contrast mode" : "Modul contrast puternic.",
    "Enable high contrast mode" : "Activați tema cu contrast înalt",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un contrast puternic poate ușura utilizarea. Calitatea vizuală va fi redusă, dar claritatea va fi ridicată.",
@@ -14,6 +14,6 @@ OC.L10N.register(
    "Accessibility options for nextcloud" : "Opțiuni de accesibilitate pentru nextcloud",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Vă oferă opțiuni multiple de accesibilitate pentru a simplifica utilizarea Nextcloud",
    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Accesul universal este foarte important pentru noi. Urmărim standardele web și verificăm să facem ca toate funcțiile să poată fii utilizate și fără mouse și software de asistență, cum ar fi sofware de citit ecranul. Ne propunem să fim conformi cu {guidelines} Accesibilitatea conținutului web {linkend} 2.1 la nivel AA, cu tema de contrast ridicat chiar și la nivel AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Dacă găsiți probleme, nu ezitați să le raportați la {issuetracker} următorul nostru de probleme {linkend}. Și dacă doriți să vă implicați, participați la {designteam} echipa noastră de design {linkend}!"
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Dacă găsiți probleme, nu ezitați să le raportați la {issuetracker} tracker-ul nostru de probleme {linkend}. Și dacă doriți să vă implicați, participați în {designteam} echipa noastră de design {linkend}!"
 },
 "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
--- a/apps/accessibility/l10n/ro.json
+++ b/apps/accessibility/l10n/ro.json
@@ -1,7 +1,7 @@
 { "translations": {
    "Dark theme" : "Temă întunecată",
    "Enable dark theme" : "Activați tema întunecată",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Temă întunecată pentru ușurarea ochilor prin reducerea generală a luminozității. Temă în curs de dezvoltare deci vă rugăm să raportați orice problemă găsită.",
+    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "O temă întunecată pentru ușurarea ochilor prin reducerea generală a luminozității. Temă în curs de dezvoltare deci vă rugăm să raportați orice problemă găsită.",
    "High contrast mode" : "Modul contrast puternic.",
    "Enable high contrast mode" : "Activați tema cu contrast înalt",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "Un contrast puternic poate ușura utilizarea. Calitatea vizuală va fi redusă, dar claritatea va fi ridicată.",
@@ -12,6 +12,6 @@
    "Accessibility options for nextcloud" : "Opțiuni de accesibilitate pentru nextcloud",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Vă oferă opțiuni multiple de accesibilitate pentru a simplifica utilizarea Nextcloud",
    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Accesul universal este foarte important pentru noi. Urmărim standardele web și verificăm să facem ca toate funcțiile să poată fii utilizate și fără mouse și software de asistență, cum ar fi sofware de citit ecranul. Ne propunem să fim conformi cu {guidelines} Accesibilitatea conținutului web {linkend} 2.1 la nivel AA, cu tema de contrast ridicat chiar și la nivel AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Dacă găsiți probleme, nu ezitați să le raportați la {issuetracker} următorul nostru de probleme {linkend}. Și dacă doriți să vă implicați, participați la {designteam} echipa noastră de design {linkend}!"
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Dacă găsiți probleme, nu ezitați să le raportați la {issuetracker} tracker-ul nostru de probleme {linkend}. Și dacă doriți să vă implicați, participați în {designteam} echipa noastră de design {linkend}!"
 },"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
 }
--- a/apps/accessibility/l10n/sc.js
+++ b/apps/accessibility/l10n/sc.js
@@ -13,7 +13,7 @@ OC.L10N.register(
    "Accessibility" : "Atzessibilidade",
    "Accessibility options for nextcloud" : "Sèberos de atzessibilidade pro nextcloud",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Frunit sèberos de atzessibilidade pro agiudare s'impreu tuo de Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "S'atzessu universale est de importu mannu pro nois. Sighimus is istandard de sa rete e chircamus de fàghere chi totu si potzat impreare chene cursore puru, e cun programmas de assistèntzia comente leghidores de ischermu. S'intentu nostru est de acumprire is inditos de is {lìniasghia}Lìinas ghia cuntenutos de rete{linkend} 2.1 a su livellu AA, cun su tema de cuntrastu artu a su livellu AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Si agatas problemas, no istentes a ddu sinnalare a {rastradoredeproblemas}su rastradore nostru{linkend}. E si nos cheres agiudare, intra in {grupudedisegnu}su grupu de disegnu nostru{linkend}!"
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "S'atzessu universale est de importu mannu pro nois. Sighimus is istandard de sa rete e chircamus de fàghere chi totu si potzat impreare chene cursore puru, e cun programmas de assistèntzia comente leghidores de ischermu. S'intentu nostru est de acumprire is inditos de is {guidelines}Lìinas ghia cuntenutos de rete{linkend} 2.1 a su livellu AA, cun su tema de cuntrastu artu a su livellu AAA.",
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Si agatas problemas, no istentes a ddu sinnalare a {issuetracker}su rastradore nostru{linkend}. E si nos cheres agiudare, intra in {designteam}su grupu de disegnu nostru{linkend}!"
 },
 "nplurals=2; plural=(n != 1);");
--- a/apps/accessibility/l10n/sc.json
+++ b/apps/accessibility/l10n/sc.json
@@ -11,7 +11,7 @@
    "Accessibility" : "Atzessibilidade",
    "Accessibility options for nextcloud" : "Sèberos de atzessibilidade pro nextcloud",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Frunit sèberos de atzessibilidade pro agiudare s'impreu tuo de Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "S'atzessu universale est de importu mannu pro nois. Sighimus is istandard de sa rete e chircamus de fàghere chi totu si potzat impreare chene cursore puru, e cun programmas de assistèntzia comente leghidores de ischermu. S'intentu nostru est de acumprire is inditos de is {lìniasghia}Lìinas ghia cuntenutos de rete{linkend} 2.1 a su livellu AA, cun su tema de cuntrastu artu a su livellu AAA.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Si agatas problemas, no istentes a ddu sinnalare a {rastradoredeproblemas}su rastradore nostru{linkend}. E si nos cheres agiudare, intra in {grupudedisegnu}su grupu de disegnu nostru{linkend}!"
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "S'atzessu universale est de importu mannu pro nois. Sighimus is istandard de sa rete e chircamus de fàghere chi totu si potzat impreare chene cursore puru, e cun programmas de assistèntzia comente leghidores de ischermu. S'intentu nostru est de acumprire is inditos de is {guidelines}Lìinas ghia cuntenutos de rete{linkend} 2.1 a su livellu AA, cun su tema de cuntrastu artu a su livellu AAA.",
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Si agatas problemas, no istentes a ddu sinnalare a {issuetracker}su rastradore nostru{linkend}. E si nos cheres agiudare, intra in {designteam}su grupu de disegnu nostru{linkend}!"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
--- a/apps/accessibility/l10n/sv.js
+++ b/apps/accessibility/l10n/sv.js
@@ -14,6 +14,6 @@ OC.L10N.register(
    "Accessibility options for nextcloud" : "Tillgänglighetsalternativ för Nextcloud",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Ger flera tillgänglighetsalternativ för att underlätta din användning av Nextcloud",
    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Allmän åtkomst är mycket viktig för oss. Vi följer webbstandarder och kontrollerar att allt är användbart även utan mus och hjälpmedel som skärmläsare. Vi strävar efter att följa {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 på AA-nivå, med temat hög kontrast även på AAA-nivå.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Om du hittar några problem, tveka inte att rapportera dem på {issuetracker}vår issue tracker{linkend}. Och om du vill engagera dig, gå med i {designteam}vårt design team{linkend}!"
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Om du hittar några problem, tveka inte att rapportera dem på {issuetracker}vår problemhanterare{linkend}. Och om du vill engagera dig, gå med i {designteam}vårt designteam{linkend}!"
 },
 "nplurals=2; plural=(n != 1);");
--- a/apps/accessibility/l10n/sv.json
+++ b/apps/accessibility/l10n/sv.json
@@ -12,6 +12,6 @@
    "Accessibility options for nextcloud" : "Tillgänglighetsalternativ för Nextcloud",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Ger flera tillgänglighetsalternativ för att underlätta din användning av Nextcloud",
    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Allmän åtkomst är mycket viktig för oss. Vi följer webbstandarder och kontrollerar att allt är användbart även utan mus och hjälpmedel som skärmläsare. Vi strävar efter att följa {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 på AA-nivå, med temat hög kontrast även på AAA-nivå.",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Om du hittar några problem, tveka inte att rapportera dem på {issuetracker}vår issue tracker{linkend}. Och om du vill engagera dig, gå med i {designteam}vårt design team{linkend}!"
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Om du hittar några problem, tveka inte att rapportera dem på {issuetracker}vår problemhanterare{linkend}. Och om du vill engagera dig, gå med i {designteam}vårt designteam{linkend}!"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
--- a/apps/accessibility/l10n/vi.js
+++ b/apps/accessibility/l10n/vi.js
@@ -13,7 +13,7 @@ OC.L10N.register(
    "Accessibility" : "Khả năng tiếp cận",
    "Accessibility options for nextcloud" : "Tùy chọn truy cập cho nextcloud",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Cung cấp nhiều tùy chọn truy cập để dễ dàng sử dụng Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Truy cập đa dạng là rất quan trọng với chúng tôi. Chúng tôi tuân theo các tiêu chuẩn mạng và kiểm tra để khiến mọi thứ đều có thể sử dụng được ngay cả khi không có chuột, và hỗ trợ những phần mềm hỗ trợ như đọc màn hình. Chúng tôi hướng đến sự tương thích với {guidelines}Nguyên Tắc Truy Cập Cho Nội Dung Mạng{linkend} 2.1  ở cấp độ AA, với chế độ tương phản cao là AAA",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Nếu bạn tìm được bất cứ vấn đề gì, đừng ngần ngại để báo cáo chúng trên {issuetracker} hệ thống theo dõi vấn đề của chúng tôi{linkend}. Và nếu bạn muốn can thiệp, hãy gia nhập {designteam}đội ngũ thiết kế{linkend}!"
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Truy cập đa dạng là rất quan trọng với chúng tôi. Chúng tôi tuân theo các tiêu chuẩn mạng và kiểm tra để khiến mọi thứ đều có thể sử dụng được ngay cả khi không có chuột, và hỗ trợ những phần mềm hỗ trợ như đọc màn hình. Chúng tôi hướng đến sự tương thích với Nguyên Tắc Truy Cập Cho Nội Dung Mạng 2.1  ở cấp độ AA, với chế độ tương phản cao là AAA",
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Nếu bạn tìm được bất cứ vấn đề gì, đừng ngần ngại để báo cáo chúng trên hệ thống theo dõi vấn đề của chúng tôi."
 },
 "nplurals=1; plural=0;");
--- a/apps/accessibility/l10n/vi.json
+++ b/apps/accessibility/l10n/vi.json
@@ -11,7 +11,7 @@
    "Accessibility" : "Khả năng tiếp cận",
    "Accessibility options for nextcloud" : "Tùy chọn truy cập cho nextcloud",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "Cung cấp nhiều tùy chọn truy cập để dễ dàng sử dụng Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Truy cập đa dạng là rất quan trọng với chúng tôi. Chúng tôi tuân theo các tiêu chuẩn mạng và kiểm tra để khiến mọi thứ đều có thể sử dụng được ngay cả khi không có chuột, và hỗ trợ những phần mềm hỗ trợ như đọc màn hình. Chúng tôi hướng đến sự tương thích với {guidelines}Nguyên Tắc Truy Cập Cho Nội Dung Mạng{linkend} 2.1  ở cấp độ AA, với chế độ tương phản cao là AAA",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Nếu bạn tìm được bất cứ vấn đề gì, đừng ngần ngại để báo cáo chúng trên {issuetracker} hệ thống theo dõi vấn đề của chúng tôi{linkend}. Và nếu bạn muốn can thiệp, hãy gia nhập {designteam}đội ngũ thiết kế{linkend}!"
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "Truy cập đa dạng là rất quan trọng với chúng tôi. Chúng tôi tuân theo các tiêu chuẩn mạng và kiểm tra để khiến mọi thứ đều có thể sử dụng được ngay cả khi không có chuột, và hỗ trợ những phần mềm hỗ trợ như đọc màn hình. Chúng tôi hướng đến sự tương thích với Nguyên Tắc Truy Cập Cho Nội Dung Mạng 2.1  ở cấp độ AA, với chế độ tương phản cao là AAA",
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "Nếu bạn tìm được bất cứ vấn đề gì, đừng ngần ngại để báo cáo chúng trên hệ thống theo dõi vấn đề của chúng tôi."
 },"pluralForm" :"nplurals=1; plural=0;"
 }
--- a/apps/accessibility/l10n/zh_HK.js
+++ b/apps/accessibility/l10n/zh_HK.js
@@ -11,9 +11,9 @@ OC.L10N.register(
    "Enable dyslexia font" : "啟用閱讀困難症字型",
    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic 是一種免費的字型，目的在降低因拼音文字閱讀困難引起的一些常見閱讀錯誤。",
    "Accessibility" : "輔助工具",
-    "Accessibility options for nextcloud" : " Nextcloud 輔助工具設定",
+    "Accessibility options for nextcloud" : "Nextcloud 輔助工具設定",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "提供多種 輔助工具使您更易於操作 Nextcloud",
    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "我們非常重視無障礙存取。我們遵循網路標準，並透過檢查來確保所有內容皆可在沒有滑鼠或輔助軟體（例如螢幕閱讀器）的情況下使用。我們目標是能達到 {guidelines}網頁內容可及性指引{linkend} 2.1 版的 AA 等級，加上高對比度主題甚至還能到 AAA 等級。",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : " \n如果您發現任何一個問題，請不要猶豫並請在 {issuetracker}我們的問題追蹤系統{linkend} 回報。而如果您想參與，歡迎加入 {designteam}我們的設計團隊{linked}！"
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : " \n如果您發現任何一個問題，請不要猶豫並請在 {issuetracker}我們的問題追蹤系統{linkend} 舉報。而如果您想參與，歡迎加入 {designteam}我們的設計團隊{linked}！"
 },
 "nplurals=1; plural=0;");
--- a/apps/accessibility/l10n/zh_HK.json
+++ b/apps/accessibility/l10n/zh_HK.json
@@ -9,9 +9,9 @@
    "Enable dyslexia font" : "啟用閱讀困難症字型",
    "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic 是一種免費的字型，目的在降低因拼音文字閱讀困難引起的一些常見閱讀錯誤。",
    "Accessibility" : "輔助工具",
-    "Accessibility options for nextcloud" : " Nextcloud 輔助工具設定",
+    "Accessibility options for nextcloud" : "Nextcloud 輔助工具設定",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "提供多種 輔助工具使您更易於操作 Nextcloud",
    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "我們非常重視無障礙存取。我們遵循網路標準，並透過檢查來確保所有內容皆可在沒有滑鼠或輔助軟體（例如螢幕閱讀器）的情況下使用。我們目標是能達到 {guidelines}網頁內容可及性指引{linkend} 2.1 版的 AA 等級，加上高對比度主題甚至還能到 AAA 等級。",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : " \n如果您發現任何一個問題，請不要猶豫並請在 {issuetracker}我們的問題追蹤系統{linkend} 回報。而如果您想參與，歡迎加入 {designteam}我們的設計團隊{linked}！"
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : " \n如果您發現任何一個問題，請不要猶豫並請在 {issuetracker}我們的問題追蹤系統{linkend} 舉報。而如果您想參與，歡迎加入 {designteam}我們的設計團隊{linked}！"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
--- a/apps/accessibility/l10n/zh_TW.js
+++ b/apps/accessibility/l10n/zh_TW.js
@@ -1,9 +1,9 @@
 OC.L10N.register(
    "accessibility",
    {
-    "Dark theme" : "黑暗主題",
-    "Enable dark theme" : "啟用黑暗主題",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "黑暗風格的主題，通過降低整體亮度來舒緩對您眼睛的刺激。黑暗主題仍在開發中，如發現任何問題，煩請報告。",
+    "Dark theme" : "深色主題",
+    "Enable dark theme" : "啟用深色主題",
+    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "黑暗風格的主題，通過降低整體亮度來舒緩對您眼睛的刺激。深色主題仍在開發中，如發現任何問題，煩請報告。",
    "High contrast mode" : "高對比度模式",
    "Enable high contrast mode" : "開啟高對比度模式",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "高對比度模式會降低介面品質，但會提高清晰度，有助您瀏覽。",
@@ -13,7 +13,7 @@ OC.L10N.register(
    "Accessibility" : "協助工具",
    "Accessibility options for nextcloud" : "Nextcloud 協助工具設定",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "提供多種協助工具使您更易於操作 Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "我們非常重視無障礙存取。我們遵循網路標準，並透過檢查來確保所有內容皆可在沒有滑鼠或輔助軟體（例如螢幕閱讀器）的情況下使用。我們目標是能達到 {guidelines}網頁內容可及性指引{linkend} 2.1 版的 AA 等級，加上高對比度主題甚至還能到 AAA 等級。",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "如果您發現任何一個問題，請不要猶豫並請在 {issuetracker}我們的問題追蹤系統{linkend} 回報。而如果您想參與，歡迎加入 {designteam}我們的設計團隊{linked}！"
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "我們非常重視無障礙存取。我們遵循網路標準，並透過檢查來確保所有內容皆可在沒有滑鼠或輔助軟體（例如螢幕閱讀器）的情況下使用。我們目標是能達到{guidelines}網頁內容可及性指引{linkend} 2.1 版的 AA 等級，加上高對比度主題甚至還能到 AAA 等級。",
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "如果您發現任何一個問題，請不要猶豫並請在{issuetracker}我們的問題追蹤系統{linkend}回報。而如果您想參與，歡迎加入{designteam}我們的設計團隊{linked}！"
 },
 "nplurals=1; plural=0;");
--- a/apps/accessibility/l10n/zh_TW.json
+++ b/apps/accessibility/l10n/zh_TW.json
@@ -1,7 +1,7 @@
 { "translations": {
-    "Dark theme" : "黑暗主題",
-    "Enable dark theme" : "啟用黑暗主題",
-    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "黑暗風格的主題，通過降低整體亮度來舒緩對您眼睛的刺激。黑暗主題仍在開發中，如發現任何問題，煩請報告。",
+    "Dark theme" : "深色主題",
+    "Enable dark theme" : "啟用深色主題",
+    "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "黑暗風格的主題，通過降低整體亮度來舒緩對您眼睛的刺激。深色主題仍在開發中，如發現任何問題，煩請報告。",
    "High contrast mode" : "高對比度模式",
    "Enable high contrast mode" : "開啟高對比度模式",
    "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "高對比度模式會降低介面品質，但會提高清晰度，有助您瀏覽。",
@@ -11,7 +11,7 @@
    "Accessibility" : "協助工具",
    "Accessibility options for nextcloud" : "Nextcloud 協助工具設定",
    "Provides multiple accessibilities options to ease your use of Nextcloud" : "提供多種協助工具使您更易於操作 Nextcloud",
-    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "我們非常重視無障礙存取。我們遵循網路標準，並透過檢查來確保所有內容皆可在沒有滑鼠或輔助軟體（例如螢幕閱讀器）的情況下使用。我們目標是能達到 {guidelines}網頁內容可及性指引{linkend} 2.1 版的 AA 等級，加上高對比度主題甚至還能到 AAA 等級。",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "如果您發現任何一個問題，請不要猶豫並請在 {issuetracker}我們的問題追蹤系統{linkend} 回報。而如果您想參與，歡迎加入 {designteam}我們的設計團隊{linked}！"
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "我們非常重視無障礙存取。我們遵循網路標準，並透過檢查來確保所有內容皆可在沒有滑鼠或輔助軟體（例如螢幕閱讀器）的情況下使用。我們目標是能達到{guidelines}網頁內容可及性指引{linkend} 2.1 版的 AA 等級，加上高對比度主題甚至還能到 AAA 等級。",
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "如果您發現任何一個問題，請不要猶豫並請在{issuetracker}我們的問題追蹤系統{linkend}回報。而如果您想參與，歡迎加入{designteam}我們的設計團隊{linked}！"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
--- a/apps/accessibility/lib/Controller/AccessibilityController.php
+++ b/apps/accessibility/lib/Controller/AccessibilityController.php
@@ -45,7 +45,7 @@ use OCP\IRequest;
 use OCP\IUserSession;
 use ScssPhp\ScssPhp\Compiler;
 use ScssPhp\ScssPhp\Exception\ParserException;
-use ScssPhp\ScssPhp\Formatter\Crunched;
+use ScssPhp\ScssPhp\OutputStyle;

 class AccessibilityController extends Controller {

@@ -134,8 +134,7 @@ class AccessibilityController extends Controller {
 			]);

 			// Continue after throw
-			$scss->setIgnoreErrors(true);
-			$scss->setFormatter(Crunched::class);
+			$scss->setOutputStyle(OutputStyle::COMPRESSED);

 			// Import theme, variables and compile css4 variables
 			try {
--- a/apps/admin_audit/composer/composer/ClassLoader.php
+++ b/apps/admin_audit/composer/composer/ClassLoader.php
@@ -311,8 +311,10 @@ class ClassLoader
        spl_autoload_register(array($this, 'loadClass'), true, $prepend);

        if (null === $this->vendorDir) {
-            //no-op
-        } elseif ($prepend) {
+            return;
+        }
+
+        if ($prepend) {
            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
        } else {
            unset(self::$registeredLoaders[$this->vendorDir]);
--- a/apps/admin_audit/l10n/bg.js
+++ b/apps/admin_audit/l10n/bg.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Одитиране/създаване на регистри",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Предоставя възможности за регистриране в Nextcloud, като например достъп до файлове за регистриране или други чувствителни действия."
+},
+"nplurals=2; plural=(n != 1);");
--- a/apps/admin_audit/l10n/bg.json
+++ b/apps/admin_audit/l10n/bg.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Одитиране/създаване на регистри",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Предоставя възможности за регистриране в Nextcloud, като например достъп до файлове за регистриране или други чувствителни действия."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
--- a/apps/admin_audit/l10n/es_AR.js
+++ b/apps/admin_audit/l10n/es_AR.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Auditando / Logueando",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Proporciona capacidades de registro para Nextcloud, como el acceso a archivos de registro o acciones sensibles."
+},
+"nplurals=2; plural=(n != 1);");
--- a/apps/admin_audit/l10n/es_AR.json
+++ b/apps/admin_audit/l10n/es_AR.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Auditando / Logueando",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Proporciona capacidades de registro para Nextcloud, como el acceso a archivos de registro o acciones sensibles."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
--- a/apps/admin_audit/l10n/pl.js
+++ b/apps/admin_audit/l10n/pl.js
@@ -1,7 +1,7 @@
 OC.L10N.register(
    "admin_audit",
    {
-    "Auditing / Logging" : "Audyt/logowanie",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Zapewnia możliwość rejestrowania dla Nextcloud, takie jak rejestrowanie dostępu do plików lub inne wrażliwe akcje."
+    "Auditing / Logging" : "Audyt/Logowanie",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Zapewnia możliwość rejestrowania dla Nextcloud, takie jak rejestrowanie dostępu do plików lub innych wrażliwych akcji."
 },
 "nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);");
--- a/apps/admin_audit/l10n/pl.json
+++ b/apps/admin_audit/l10n/pl.json
@@ -1,5 +1,5 @@
 { "translations": {
-    "Auditing / Logging" : "Audyt/logowanie",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Zapewnia możliwość rejestrowania dla Nextcloud, takie jak rejestrowanie dostępu do plików lub inne wrażliwe akcje."
+    "Auditing / Logging" : "Audyt/Logowanie",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Zapewnia możliwość rejestrowania dla Nextcloud, takie jak rejestrowanie dostępu do plików lub innych wrażliwych akcji."
 },"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"
 }
--- a/apps/admin_audit/l10n/pt_BR.js
+++ b/apps/admin_audit/l10n/pt_BR.js
@@ -1,7 +1,7 @@
 OC.L10N.register(
    "admin_audit",
    {
-    "Auditing / Logging" : "Auditoria/Registro",
+    "Auditing / Logging" : "Auditoria / Registro",
    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece recursos de registro para Nextcloud, como registros de acesso a arquivos ou outras ações confidenciais."
 },
 "nplurals=2; plural=(n > 1);");
--- a/apps/admin_audit/l10n/pt_BR.json
+++ b/apps/admin_audit/l10n/pt_BR.json
@@ -1,5 +1,5 @@
 { "translations": {
-    "Auditing / Logging" : "Auditoria/Registro",
+    "Auditing / Logging" : "Auditoria / Registro",
    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece recursos de registro para Nextcloud, como registros de acesso a arquivos ou outras ações confidenciais."
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
--- a/apps/admin_audit/l10n/ro.js
+++ b/apps/admin_audit/l10n/ro.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Auditare / Logare",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Oferă abilități de înregistrare pentru Nextcloud, cum ar fi înregistrarea accesării fișierelor sau alte acțiuni sensibile."
+},
+"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
--- a/apps/admin_audit/l10n/ro.json
+++ b/apps/admin_audit/l10n/ro.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Auditare / Logare",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Oferă abilități de înregistrare pentru Nextcloud, cum ar fi înregistrarea accesării fișierelor sau alte acțiuni sensibile."
+},"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
+}
--- a/apps/admin_audit/l10n/vi.js
+++ b/apps/admin_audit/l10n/vi.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "‎Kiểm tra / Nhật ký‎",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "‎Cung cấp khả năng ghi nhật ký cho Nextcloud, chẳng hạn như ghi nhật ký quyền truy cập tệp hoặc các hành động nhạy cảm khác.‎"
+},
+"nplurals=1; plural=0;");
--- a/apps/admin_audit/l10n/vi.json
+++ b/apps/admin_audit/l10n/vi.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "‎Kiểm tra / Nhật ký‎",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "‎Cung cấp khả năng ghi nhật ký cho Nextcloud, chẳng hạn như ghi nhật ký quyền truy cập tệp hoặc các hành động nhạy cảm khác.‎"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
--- a/apps/admin_audit/l10n/zh_HK.js
+++ b/apps/admin_audit/l10n/zh_HK.js
@@ -2,6 +2,6 @@ OC.L10N.register(
    "admin_audit",
    {
    "Auditing / Logging" : "稽核 / 記錄",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "提供 Nextcloud 的記錄功能，例如記錄檔存取或其他敏感操作。"
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "提供 Nextcloud 的記錄功能，例如記錄檔案存取或其他敏感操作。"
 },
 "nplurals=1; plural=0;");
--- a/apps/admin_audit/l10n/zh_HK.json
+++ b/apps/admin_audit/l10n/zh_HK.json
@@ -1,5 +1,5 @@
 { "translations": {
    "Auditing / Logging" : "稽核 / 記錄",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "提供 Nextcloud 的記錄功能，例如記錄檔存取或其他敏感操作。"
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "提供 Nextcloud 的記錄功能，例如記錄檔案存取或其他敏感操作。"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
--- a/apps/admin_audit/l10n/zh_TW.js
+++ b/apps/admin_audit/l10n/zh_TW.js
@@ -1,7 +1,7 @@
 OC.L10N.register(
    "admin_audit",
    {
-    "Auditing / Logging" : "稽核 / 記錄",
+    "Auditing / Logging" : "稽核／記錄",
    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "提供 Nextcloud 的記錄功能，例如記錄檔存取或其他敏感操作。"
 },
 "nplurals=1; plural=0;");
--- a/apps/admin_audit/l10n/zh_TW.json
+++ b/apps/admin_audit/l10n/zh_TW.json
@@ -1,5 +1,5 @@
 { "translations": {
-    "Auditing / Logging" : "稽核 / 記錄",
+    "Auditing / Logging" : "稽核／記錄",
    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "提供 Nextcloud 的記錄功能，例如記錄檔存取或其他敏感操作。"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
--- a/apps/cloud_federation_api/composer/composer/ClassLoader.php
+++ b/apps/cloud_federation_api/composer/composer/ClassLoader.php
@@ -311,8 +311,10 @@ class ClassLoader
        spl_autoload_register(array($this, 'loadClass'), true, $prepend);

        if (null === $this->vendorDir) {
-            //no-op
-        } elseif ($prepend) {
+            return;
+        }
+
+        if ($prepend) {
            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
        } else {
            unset(self::$registeredLoaders[$this->vendorDir]);
--- a/apps/cloud_federation_api/l10n/hu.js
+++ b/apps/cloud_federation_api/l10n/hu.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "cloud_federation_api",
+    {
+    "Cloud Federation API" : "Felhő együttműködési alkalmazás fejlesztői felület",
+    "Enable clouds to communicate with each other and exchange data" : "Kommunikáció és adatcsere engedélyezése a felhőszolgáltatások között",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "A felhő együttműködési alkalmazás fejlesztői felület segítségével a különféle Nextcloud példányok képesek egymás között kommunikálni és adatokat cserélni."
+},
+"nplurals=2; plural=(n != 1);");
--- a/apps/cloud_federation_api/l10n/hu.json
+++ b/apps/cloud_federation_api/l10n/hu.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cloud Federation API" : "Felhő együttműködési alkalmazás fejlesztői felület",
+    "Enable clouds to communicate with each other and exchange data" : "Kommunikáció és adatcsere engedélyezése a felhőszolgáltatások között",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "A felhő együttműködési alkalmazás fejlesztői felület segítségével a különféle Nextcloud példányok képesek egymás között kommunikálni és adatokat cserélni."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
--- a/apps/cloud_federation_api/l10n/ro.js
+++ b/apps/cloud_federation_api/l10n/ro.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "cloud_federation_api",
+    {
+    "Cloud Federation API" : "API-ul Cloud Federation",
+    "Enable clouds to communicate with each other and exchange data" : "Permiteți serviciilor de cloud să comunice între ele și să facă schimb de date",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "API-ul Cloud Federation permite diferitelor instanțe Nextcloud să comunice între ele și să facă schimb de date."
+},
+"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
--- a/apps/cloud_federation_api/l10n/ro.json
+++ b/apps/cloud_federation_api/l10n/ro.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cloud Federation API" : "API-ul Cloud Federation",
+    "Enable clouds to communicate with each other and exchange data" : "Permiteți serviciilor de cloud să comunice între ele și să facă schimb de date",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "API-ul Cloud Federation permite diferitelor instanțe Nextcloud să comunice între ele și să facă schimb de date."
+},"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
+}
--- a/apps/comments/composer/composer/ClassLoader.php
+++ b/apps/comments/composer/composer/ClassLoader.php
@@ -311,8 +311,10 @@ class ClassLoader
        spl_autoload_register(array($this, 'loadClass'), true, $prepend);

        if (null === $this->vendorDir) {
-            //no-op
-        } elseif ($prepend) {
+            return;
+        }
+
+        if ($prepend) {
            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
        } else {
            unset(self::$registeredLoaders[$this->vendorDir]);
--- a/apps/comments/js/comments-app.js
+++ b/apps/comments/js/comments-app.js
--- a/apps/comments/js/comments-app.js.map
+++ b/apps/comments/js/comments-app.js.map
--- a/apps/comments/l10n/ar.js
+++ b/apps/comments/l10n/ar.js
@@ -4,17 +4,30 @@ OC.L10N.register(
    "Comments" : "تعليقات",
    "You commented" : "قمت بكتابة تعليق",
    "%1$s commented" : "%1$s كتب تعليق",
+    "{author} commented" : "{author} علّق",
    "You commented on %1$s" : "لقد علقت على %1$s",
    "You commented on {file}" : "علقت على {file}",
    "%1$s commented on %2$s" : "%1$s كتب تعليق على %2$s",
    "{author} commented on {file}" : "{author} علّق على {file}",
    "<strong>Comments</strong> for files" : "<strong>تعليقات</strong> على الملفات",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "تمت الإشارة إليك على “{file}”, في تعليق بواسطة مستخدم تم حذفه منذ ذلك الحين",
+    "{user} mentioned you in a comment on “{file}”" : "{user} أشار إليك في تعليق على “{file}”",
+    "Files app plugin to add comments to files" : "المكوِّن الإضافي لتطبيق الملفات لإضافة تعليقات إلى الملفات",
    "Edit comment" : "تعديل التعليق",
    "Delete comment" : "حذف التعليق",
+    "Cancel edit" : "إلغاء التعديل",
+    "Post comment" : "أضف تعليق",
    "No comments yet, start the conversation!" : "لا يوجد تعليقات, ابدأ النقاش الآن!",
+    "No more messages" : "لامزيد من الرسائل",
    "Retry" : "أعد المحاولة",
+    "Unable to load the comments list" : "تعذر تحميل قائمة التعليقات",
    "_%n unread comment_::_%n unread comments_" : ["%n تعليق غير مقروء","%n تعليق غير مقروء","تعليقان غير مقروءة","%n تعليقات غير مقروء","%n تعليق غير مقروء","%n تعليق غير مقروء"],
+    "_1 new comment_::_{unread} new comments_" : ["1 تعليق جديد","1 تعليق جديد","{unread} تعليقات جديدة","{unread} تعليقات جديدة","{unread} تعليقات جديدة","{unread} تعليقات جديدة"],
    "Comment" : "تعليق",
+    "An error occurred while trying to edit the comment" : "حدث خطأ أثناء محاولة تعديل التعليق",
+    "Comment deleted" : "التعليق حُذف",
+    "An error occurred while trying to delete the comment" : "حدث خطأ أثناء محاولة حذف التعليق",
+    "An error occurred while trying to create the comment" : "حدث خطأ أثناء محاولة إنشاء التعليق",
    "New comment …" : "تعليق جديد",
    "Post" : "ارسال",
    "Cancel" : "إلغاء",
--- a/apps/comments/l10n/ar.json
+++ b/apps/comments/l10n/ar.json
@@ -2,17 +2,30 @@
    "Comments" : "تعليقات",
    "You commented" : "قمت بكتابة تعليق",
    "%1$s commented" : "%1$s كتب تعليق",
+    "{author} commented" : "{author} علّق",
    "You commented on %1$s" : "لقد علقت على %1$s",
    "You commented on {file}" : "علقت على {file}",
    "%1$s commented on %2$s" : "%1$s كتب تعليق على %2$s",
    "{author} commented on {file}" : "{author} علّق على {file}",
    "<strong>Comments</strong> for files" : "<strong>تعليقات</strong> على الملفات",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "تمت الإشارة إليك على “{file}”, في تعليق بواسطة مستخدم تم حذفه منذ ذلك الحين",
+    "{user} mentioned you in a comment on “{file}”" : "{user} أشار إليك في تعليق على “{file}”",
+    "Files app plugin to add comments to files" : "المكوِّن الإضافي لتطبيق الملفات لإضافة تعليقات إلى الملفات",
    "Edit comment" : "تعديل التعليق",
    "Delete comment" : "حذف التعليق",
+    "Cancel edit" : "إلغاء التعديل",
+    "Post comment" : "أضف تعليق",
    "No comments yet, start the conversation!" : "لا يوجد تعليقات, ابدأ النقاش الآن!",
+    "No more messages" : "لامزيد من الرسائل",
    "Retry" : "أعد المحاولة",
+    "Unable to load the comments list" : "تعذر تحميل قائمة التعليقات",
    "_%n unread comment_::_%n unread comments_" : ["%n تعليق غير مقروء","%n تعليق غير مقروء","تعليقان غير مقروءة","%n تعليقات غير مقروء","%n تعليق غير مقروء","%n تعليق غير مقروء"],
+    "_1 new comment_::_{unread} new comments_" : ["1 تعليق جديد","1 تعليق جديد","{unread} تعليقات جديدة","{unread} تعليقات جديدة","{unread} تعليقات جديدة","{unread} تعليقات جديدة"],
    "Comment" : "تعليق",
+    "An error occurred while trying to edit the comment" : "حدث خطأ أثناء محاولة تعديل التعليق",
+    "Comment deleted" : "التعليق حُذف",
+    "An error occurred while trying to delete the comment" : "حدث خطأ أثناء محاولة حذف التعليق",
+    "An error occurred while trying to create the comment" : "حدث خطأ أثناء محاولة إنشاء التعليق",
    "New comment …" : "تعليق جديد",
    "Post" : "ارسال",
    "Cancel" : "إلغاء",
--- a/apps/comments/l10n/bg.js
+++ b/apps/comments/l10n/bg.js
@@ -12,12 +12,22 @@ OC.L10N.register(
    "<strong>Comments</strong> for files" : "<strong>Коментари</strong> за файлове",
    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Бяхте споменат/а към “{file}”, в коментар от потребител, който вече е изтрит",
    "{user} mentioned you in a comment on “{file}”" : "{user} те спомена в коментар за “{file}”",
+    "Files app plugin to add comments to files" : "Добавка на приложението Файлове за добавяне на коментари към файловете",
    "Edit comment" : "Редактирай коментра",
    "Delete comment" : "Изтрий коментар",
+    "Cancel edit" : "Отказ на редактиране",
+    "Post comment" : "Публикуване на коментар",
    "No comments yet, start the conversation!" : "Все още няма коментари, започнете разговор!",
+    "No more messages" : " Няма повече съобщения",
    "Retry" : "Опитай отново",
+    "Unable to load the comments list" : "Списъкът с коментари не може да се зареди",
    "_%n unread comment_::_%n unread comments_" : ["%n непрочетен коментар","%n непрочетени коментари"],
+    "_1 new comment_::_{unread} new comments_" : ["{unread} нови коментари","{unread} нови коментари"],
    "Comment" : "Коментар",
+    "An error occurred while trying to edit the comment" : "Възникна грешка при опит за редактиране на коментара",
+    "Comment deleted" : " Изтрит е коментар",
+    "An error occurred while trying to delete the comment" : "Възникна грешка при опит за изтриване на коментара",
+    "An error occurred while trying to create the comment" : "Възникна грешка при опит за създаване на коментар",
    "New comment …" : "Нов коментар...",
    "Post" : "Публикация",
    "Cancel" : "Отказ",
@@ -25,6 +35,7 @@ OC.L10N.register(
    "More comments …" : "Още коментари...",
    "Save" : "Запазване",
    "Allowed characters {count} of {max}" : "Позволени символи {count} от {max}",
+    "Error occurred while retrieving comment with ID {id}" : "Възникна грешка по време на извличане на коментар с ID {id}",
    "Error occurred while updating comment with id {id}" : "Възникна грешка по време на обновяване на коментар с код {id}",
    "Error occurred while posting comment" : "Възникна грешка по време на изпращане на коментар"
 },
--- a/apps/comments/l10n/bg.json
+++ b/apps/comments/l10n/bg.json
@@ -10,12 +10,22 @@
    "<strong>Comments</strong> for files" : "<strong>Коментари</strong> за файлове",
    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Бяхте споменат/а към “{file}”, в коментар от потребител, който вече е изтрит",
    "{user} mentioned you in a comment on “{file}”" : "{user} те спомена в коментар за “{file}”",
+    "Files app plugin to add comments to files" : "Добавка на приложението Файлове за добавяне на коментари към файловете",
    "Edit comment" : "Редактирай коментра",
    "Delete comment" : "Изтрий коментар",
+    "Cancel edit" : "Отказ на редактиране",
+    "Post comment" : "Публикуване на коментар",
    "No comments yet, start the conversation!" : "Все още няма коментари, започнете разговор!",
+    "No more messages" : " Няма повече съобщения",
    "Retry" : "Опитай отново",
+    "Unable to load the comments list" : "Списъкът с коментари не може да се зареди",
    "_%n unread comment_::_%n unread comments_" : ["%n непрочетен коментар","%n непрочетени коментари"],
+    "_1 new comment_::_{unread} new comments_" : ["{unread} нови коментари","{unread} нови коментари"],
    "Comment" : "Коментар",
+    "An error occurred while trying to edit the comment" : "Възникна грешка при опит за редактиране на коментара",
+    "Comment deleted" : " Изтрит е коментар",
+    "An error occurred while trying to delete the comment" : "Възникна грешка при опит за изтриване на коментара",
+    "An error occurred while trying to create the comment" : "Възникна грешка при опит за създаване на коментар",
    "New comment …" : "Нов коментар...",
    "Post" : "Публикация",
    "Cancel" : "Отказ",
@@ -23,6 +33,7 @@
    "More comments …" : "Още коментари...",
    "Save" : "Запазване",
    "Allowed characters {count} of {max}" : "Позволени символи {count} от {max}",
+    "Error occurred while retrieving comment with ID {id}" : "Възникна грешка по време на извличане на коментар с ID {id}",
    "Error occurred while updating comment with id {id}" : "Възникна грешка по време на обновяване на коментар с код {id}",
    "Error occurred while posting comment" : "Възникна грешка по време на изпращане на коментар"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
--- a/apps/comments/l10n/cs.js
+++ b/apps/comments/l10n/cs.js
@@ -9,7 +9,7 @@ OC.L10N.register(
    "You commented on {file}" : "Okomentovali jste {file}",
    "%1$s commented on %2$s" : "%1$s okomentoval(a) %2$s",
    "{author} commented on {file}" : "{author} okomentoval(a) {file}",
-    "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
+    "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> k souborům",
    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v souboru „{file}“, v komentáři od uživatele, který byl později smazán",
    "{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil(a) v komentáři u „{file}“",
    "Files app plugin to add comments to files" : "Zásuvný modul do aplikace Soubory pro přidávání komentářů k souborům",
--- a/apps/comments/l10n/cs.json
+++ b/apps/comments/l10n/cs.json
@@ -7,7 +7,7 @@
    "You commented on {file}" : "Okomentovali jste {file}",
    "%1$s commented on %2$s" : "%1$s okomentoval(a) %2$s",
    "{author} commented on {file}" : "{author} okomentoval(a) {file}",
-    "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
+    "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> k souborům",
    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v souboru „{file}“, v komentáři od uživatele, který byl později smazán",
    "{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil(a) v komentáři u „{file}“",
    "Files app plugin to add comments to files" : "Zásuvný modul do aplikace Soubory pro přidávání komentářů k souborům",
--- a/apps/comments/l10n/hu.js
+++ b/apps/comments/l10n/hu.js
@@ -15,12 +15,19 @@ OC.L10N.register(
    "Files app plugin to add comments to files" : "A Fájlok alkalmazás bővítménye, amellyel megjegyzések adhatóak a fájlokhoz",
    "Edit comment" : "Hozzászólás szerkesztése",
    "Delete comment" : "Hozzászólás törlése",
+    "Cancel edit" : "Változások elvetése",
+    "Post comment" : "Hozzászólás közzététele",
    "No comments yet, start the conversation!" : "Még nincsenek hozzászólások, kezdje el a beszélgetést!",
+    "No more messages" : "Nincs több üzenet",
    "Retry" : "Újra",
+    "Unable to load the comments list" : "A megjegyzések listájának betöltése sikertelen",
    "_%n unread comment_::_%n unread comments_" : ["%n olvasatlan hozzászólás","%n olvasatlan hozzászólás"],
    "_1 new comment_::_{unread} new comments_" : ["1 új hozzászólás","{unread} új hozzászólás"],
    "Comment" : "Hozzászólás",
+    "An error occurred while trying to edit the comment" : "Hiba történt a megjegyzés szerkesztése közben",
    "Comment deleted" : "Hozzászólás törölve",
+    "An error occurred while trying to delete the comment" : "Hiba történt a megjegyzés törlése közben",
+    "An error occurred while trying to create the comment" : "Hiba történt a megjegyzés létrehozása közben",
    "New comment …" : "Új hozzászólás…",
    "Post" : "Küldés",
    "Cancel" : "Mégse",
--- a/apps/comments/l10n/hu.json
+++ b/apps/comments/l10n/hu.json
@@ -13,12 +13,19 @@
    "Files app plugin to add comments to files" : "A Fájlok alkalmazás bővítménye, amellyel megjegyzések adhatóak a fájlokhoz",
    "Edit comment" : "Hozzászólás szerkesztése",
    "Delete comment" : "Hozzászólás törlése",
+    "Cancel edit" : "Változások elvetése",
+    "Post comment" : "Hozzászólás közzététele",
    "No comments yet, start the conversation!" : "Még nincsenek hozzászólások, kezdje el a beszélgetést!",
+    "No more messages" : "Nincs több üzenet",
    "Retry" : "Újra",
+    "Unable to load the comments list" : "A megjegyzések listájának betöltése sikertelen",
    "_%n unread comment_::_%n unread comments_" : ["%n olvasatlan hozzászólás","%n olvasatlan hozzászólás"],
    "_1 new comment_::_{unread} new comments_" : ["1 új hozzászólás","{unread} új hozzászólás"],
    "Comment" : "Hozzászólás",
+    "An error occurred while trying to edit the comment" : "Hiba történt a megjegyzés szerkesztése közben",
    "Comment deleted" : "Hozzászólás törölve",
+    "An error occurred while trying to delete the comment" : "Hiba történt a megjegyzés törlése közben",
+    "An error occurred while trying to create the comment" : "Hiba történt a megjegyzés létrehozása közben",
    "New comment …" : "Új hozzászólás…",
    "Post" : "Küldés",
    "Cancel" : "Mégse",
--- a/apps/comments/l10n/ro.js
+++ b/apps/comments/l10n/ro.js
@@ -15,11 +15,19 @@ OC.L10N.register(
    "Files app plugin to add comments to files" : "Plugin pentru aplicația de fișiere pentru adăugarea de comentarii",
    "Edit comment" : "Editează comentariul",
    "Delete comment" : "Șterge comentariul",
+    "Cancel edit" : "Anulați editarea",
+    "Post comment" : "Postează comentariu",
    "No comments yet, start the conversation!" : "Nici un comentariu încă, începe conversația!",
+    "No more messages" : "Nu mai sunt mesaje",
    "Retry" : "Reîncearcă",
+    "Unable to load the comments list" : "Lista de comentarii nu poate fi încărcată",
    "_%n unread comment_::_%n unread comments_" : ["%n comentariu necitit","%n comentarii necitite","%n comentarii necitite"],
    "_1 new comment_::_{unread} new comments_" : ["1 nou comentariu","{unread} noi comentarii","{unread} comentarii noi"],
    "Comment" : "Comentariu",
+    "An error occurred while trying to edit the comment" : "A apărut o eroare la încercarea de a edita comentariul",
+    "Comment deleted" : "Comentariul a fost șters",
+    "An error occurred while trying to delete the comment" : "A apărut o eroare la încercarea de a șterge comentariul",
+    "An error occurred while trying to create the comment" : "A apărut o eroare la încercarea de a crea comentariul",
    "New comment …" : "Comentariu nou...",
    "Post" : "Postează",
    "Cancel" : "Anulează",
--- a/apps/comments/l10n/ro.json
+++ b/apps/comments/l10n/ro.json
@@ -13,11 +13,19 @@
    "Files app plugin to add comments to files" : "Plugin pentru aplicația de fișiere pentru adăugarea de comentarii",
    "Edit comment" : "Editează comentariul",
    "Delete comment" : "Șterge comentariul",
+    "Cancel edit" : "Anulați editarea",
+    "Post comment" : "Postează comentariu",
    "No comments yet, start the conversation!" : "Nici un comentariu încă, începe conversația!",
+    "No more messages" : "Nu mai sunt mesaje",
    "Retry" : "Reîncearcă",
+    "Unable to load the comments list" : "Lista de comentarii nu poate fi încărcată",
    "_%n unread comment_::_%n unread comments_" : ["%n comentariu necitit","%n comentarii necitite","%n comentarii necitite"],
    "_1 new comment_::_{unread} new comments_" : ["1 nou comentariu","{unread} noi comentarii","{unread} comentarii noi"],
    "Comment" : "Comentariu",
+    "An error occurred while trying to edit the comment" : "A apărut o eroare la încercarea de a edita comentariul",
+    "Comment deleted" : "Comentariul a fost șters",
+    "An error occurred while trying to delete the comment" : "A apărut o eroare la încercarea de a șterge comentariul",
+    "An error occurred while trying to create the comment" : "A apărut o eroare la încercarea de a crea comentariul",
    "New comment …" : "Comentariu nou...",
    "Post" : "Postează",
    "Cancel" : "Anulează",
--- a/apps/comments/l10n/ru.js
+++ b/apps/comments/l10n/ru.js
@@ -16,6 +16,7 @@ OC.L10N.register(
    "Edit comment" : "Редактировать комментарий",
    "Delete comment" : "Удалить комментарий",
    "Cancel edit" : "Отменить правку",
+    "Post comment" : "Опубликовать комментарий",
    "No comments yet, start the conversation!" : "Комментарии отсутствуют, начните обсуждение!",
    "No more messages" : "Сообщений нет",
    "Retry" : "Повторить",
--- a/apps/comments/l10n/ru.json
+++ b/apps/comments/l10n/ru.json
@@ -14,6 +14,7 @@
    "Edit comment" : "Редактировать комментарий",
    "Delete comment" : "Удалить комментарий",
    "Cancel edit" : "Отменить правку",
+    "Post comment" : "Опубликовать комментарий",
    "No comments yet, start the conversation!" : "Комментарии отсутствуют, начните обсуждение!",
    "No more messages" : "Сообщений нет",
    "Retry" : "Повторить",
--- a/apps/comments/l10n/sc.js
+++ b/apps/comments/l10n/sc.js
@@ -0,0 +1,42 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Comments" : "Cummentos",
+    "You commented" : "As cummentadu",
+    "%1$s commented" : "%1$s at cummentadu",
+    "{author} commented" : "{author} at cummentadu",
+    "You commented on %1$s" : "As cummentadu in %1$s",
+    "You commented on {file}" : "As cummentadu {file}",
+    "%1$s commented on %2$s" : "%1$s at cummentadu %2$s",
+    "{author} commented on {file}" : "{author} at cummentadu {file}",
+    "<strong>Comments</strong> for files" : "<strong>Cummentos</strong> pro archìvios",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "T'ant mentovadu in “{file}”, in unu cummentu de un'utente chi ant cantzelladu",
+    "{user} mentioned you in a comment on “{file}”" : "{user} t'at mentovadu in unu cummentu in “{file}”",
+    "Files app plugin to add comments to files" : "Estensione de s'aplicatzione archìvios pro agiùnghere cummentos a archìvios",
+    "Edit comment" : "Modìfica cummentu",
+    "Delete comment" : "Cantzella cummentu",
+    "Cancel edit" : "Annulla modìfica",
+    "Post comment" : "Pùblica cummentu",
+    "No comments yet, start the conversation!" : "Ancora perunu cummentu, cumintza sa cunversatzione!",
+    "No more messages" : "Perunu àteru messàgiu",
+    "Retry" : "Torra a proare",
+    "Unable to load the comments list" : "Non faghet a carrigare sa lista de cummentos",
+    "_%n unread comment_::_%n unread comments_" : ["%n cummentu non lèghidu","%n cummentos non lèghidos"],
+    "_1 new comment_::_{unread} new comments_" : ["1 cummentu nou","{unread} cummentos noos"],
+    "Comment" : "Cummenta",
+    "An error occurred while trying to edit the comment" : "Ddoe at àpidu un'errore proende a modificare su cummentu",
+    "Comment deleted" : "Cummentu cantzelladu",
+    "An error occurred while trying to delete the comment" : "Ddoe at àpidu un'errore proende a cantzellare su cummentu",
+    "An error occurred while trying to create the comment" : "Ddoe at àpidu un'errore proende a creare su cummentu",
+    "New comment …" : "Cummentu nou …",
+    "Post" : "Pùblica",
+    "Cancel" : "Annulla",
+    "[Deleted user]" : "[Utèntzia cantzellada]",
+    "More comments …" : "Àtero cummentos ...",
+    "Save" : "Sarva",
+    "Allowed characters {count} of {max}" : "Caràteres permìtidos {count} de {max}",
+    "Error occurred while retrieving comment with ID {id}" : "Ddoe at àpidu un'errore in su recùperu de su cummentu cun ID {id}",
+    "Error occurred while updating comment with id {id}" : "Ddoe at àpidu un'errore in s'agiornamentu de su cummentu cun id {id}",
+    "Error occurred while posting comment" : "Ddoe at àpidu un'errore in sa publicatzione de su cummentu"
+},
+"nplurals=2; plural=(n != 1);");
--- a/apps/comments/l10n/sc.json
+++ b/apps/comments/l10n/sc.json
@@ -0,0 +1,40 @@
+{ "translations": {
+    "Comments" : "Cummentos",
+    "You commented" : "As cummentadu",
+    "%1$s commented" : "%1$s at cummentadu",
+    "{author} commented" : "{author} at cummentadu",
+    "You commented on %1$s" : "As cummentadu in %1$s",
+    "You commented on {file}" : "As cummentadu {file}",
+    "%1$s commented on %2$s" : "%1$s at cummentadu %2$s",
+    "{author} commented on {file}" : "{author} at cummentadu {file}",
+    "<strong>Comments</strong> for files" : "<strong>Cummentos</strong> pro archìvios",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "T'ant mentovadu in “{file}”, in unu cummentu de un'utente chi ant cantzelladu",
+    "{user} mentioned you in a comment on “{file}”" : "{user} t'at mentovadu in unu cummentu in “{file}”",
+    "Files app plugin to add comments to files" : "Estensione de s'aplicatzione archìvios pro agiùnghere cummentos a archìvios",
+    "Edit comment" : "Modìfica cummentu",
+    "Delete comment" : "Cantzella cummentu",
+    "Cancel edit" : "Annulla modìfica",
+    "Post comment" : "Pùblica cummentu",
+    "No comments yet, start the conversation!" : "Ancora perunu cummentu, cumintza sa cunversatzione!",
+    "No more messages" : "Perunu àteru messàgiu",
+    "Retry" : "Torra a proare",
+    "Unable to load the comments list" : "Non faghet a carrigare sa lista de cummentos",
+    "_%n unread comment_::_%n unread comments_" : ["%n cummentu non lèghidu","%n cummentos non lèghidos"],
+    "_1 new comment_::_{unread} new comments_" : ["1 cummentu nou","{unread} cummentos noos"],
+    "Comment" : "Cummenta",
+    "An error occurred while trying to edit the comment" : "Ddoe at àpidu un'errore proende a modificare su cummentu",
+    "Comment deleted" : "Cummentu cantzelladu",
+    "An error occurred while trying to delete the comment" : "Ddoe at àpidu un'errore proende a cantzellare su cummentu",
+    "An error occurred while trying to create the comment" : "Ddoe at àpidu un'errore proende a creare su cummentu",
+    "New comment …" : "Cummentu nou …",
+    "Post" : "Pùblica",
+    "Cancel" : "Annulla",
+    "[Deleted user]" : "[Utèntzia cantzellada]",
+    "More comments …" : "Àtero cummentos ...",
+    "Save" : "Sarva",
+    "Allowed characters {count} of {max}" : "Caràteres permìtidos {count} de {max}",
+    "Error occurred while retrieving comment with ID {id}" : "Ddoe at àpidu un'errore in su recùperu de su cummentu cun ID {id}",
+    "Error occurred while updating comment with id {id}" : "Ddoe at àpidu un'errore in s'agiornamentu de su cummentu cun id {id}",
+    "Error occurred while posting comment" : "Ddoe at àpidu un'errore in sa publicatzione de su cummentu"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
--- a/apps/comments/l10n/si.js
+++ b/apps/comments/l10n/si.js
@@ -0,0 +1,29 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Comments" : "අදහස්",
+    "You commented" : "ඔබ අදහස් දැක්වා ඇත ",
+    "%1$s commented" : "%1$s අදහස් දැක්වා ඇත",
+    "{author} commented" : "{author} අදහස් දැක්වා ඇත",
+    "You commented on {file}" : "ඔබ {file} හි අදහස් දැක්වා ඇත",
+    "<strong>Comments</strong> for files" : "ගොනු සඳහා <strong>අදහස්</strong>",
+    "Edit comment" : "අදහස සංස්කරණය",
+    "Post comment" : "අදහසක් පළ කරන්න",
+    "No comments yet, start the conversation!" : "තවම අදහස් නැත, සංවාදය ආරම්භ කරන්න!",
+    "No more messages" : "තවත් පණිවිඩ නැත",
+    "Retry" : "නැවත උත්සාහ කරන්න",
+    "Unable to load the comments list" : "අදහස් ලැයිස්තුව පූරණය කළ නොහැකිය",
+    "Comment" : "අදහස",
+    "An error occurred while trying to edit the comment" : "අදහස සංස්කරණය කිරීමට උත්සාහ කිරීමේදී දෝෂයක් ඇතිවිය",
+    "An error occurred while trying to create the comment" : "අදහස සෑදීමට උත්සාහ කිරීමේදී දෝෂයක් ඇතිවිය",
+    "New comment …" : "නව අදහසක්…",
+    "Post" : "පළ කරන්න",
+    "Cancel" : "අවලංගු කරන්න",
+    "More comments …" : "තවත් අදහස්…",
+    "Save" : "සුරකින්න",
+    "Allowed characters {count} of {max}" : "අවසර ලත් අක්ෂර {max} න් {count}",
+    "Error occurred while retrieving comment with ID {id}" : "{id} සමඟ අදහස් ලබා ගැනීමේදී දෝෂයක් ඇතිවිය",
+    "Error occurred while updating comment with id {id}" : "{id} සමඟ අදහස් යාවත්කාලීන කිරීමේදී දෝෂයක් ඇතිවිය",
+    "Error occurred while posting comment" : "අදහස් පළ කිරීමේදී දෝෂයක් ඇතිවිය"
+},
+"nplurals=2; plural=(n != 1);");
--- a/apps/comments/l10n/si.json
+++ b/apps/comments/l10n/si.json
@@ -0,0 +1,27 @@
+{ "translations": {
+    "Comments" : "අදහස්",
+    "You commented" : "ඔබ අදහස් දැක්වා ඇත ",
+    "%1$s commented" : "%1$s අදහස් දැක්වා ඇත",
+    "{author} commented" : "{author} අදහස් දැක්වා ඇත",
+    "You commented on {file}" : "ඔබ {file} හි අදහස් දැක්වා ඇත",
+    "<strong>Comments</strong> for files" : "ගොනු සඳහා <strong>අදහස්</strong>",
+    "Edit comment" : "අදහස සංස්කරණය",
+    "Post comment" : "අදහසක් පළ කරන්න",
+    "No comments yet, start the conversation!" : "තවම අදහස් නැත, සංවාදය ආරම්භ කරන්න!",
+    "No more messages" : "තවත් පණිවිඩ නැත",
+    "Retry" : "නැවත උත්සාහ කරන්න",
+    "Unable to load the comments list" : "අදහස් ලැයිස්තුව පූරණය කළ නොහැකිය",
+    "Comment" : "අදහස",
+    "An error occurred while trying to edit the comment" : "අදහස සංස්කරණය කිරීමට උත්සාහ කිරීමේදී දෝෂයක් ඇතිවිය",
+    "An error occurred while trying to create the comment" : "අදහස සෑදීමට උත්සාහ කිරීමේදී දෝෂයක් ඇතිවිය",
+    "New comment …" : "නව අදහසක්…",
+    "Post" : "පළ කරන්න",
+    "Cancel" : "අවලංගු කරන්න",
+    "More comments …" : "තවත් අදහස්…",
+    "Save" : "සුරකින්න",
+    "Allowed characters {count} of {max}" : "අවසර ලත් අක්ෂර {max} න් {count}",
+    "Error occurred while retrieving comment with ID {id}" : "{id} සමඟ අදහස් ලබා ගැනීමේදී දෝෂයක් ඇතිවිය",
+    "Error occurred while updating comment with id {id}" : "{id} සමඟ අදහස් යාවත්කාලීන කිරීමේදී දෝෂයක් ඇතිවිය",
+    "Error occurred while posting comment" : "අදහස් පළ කිරීමේදී දෝෂයක් ඇතිවිය"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
--- a/apps/comments/l10n/zh_HK.js
+++ b/apps/comments/l10n/zh_HK.js
@@ -5,10 +5,10 @@ OC.L10N.register(
    "You commented" : "您已留言",
    "%1$s commented" : "%1$s 個留言",
    "{author} commented" : "{author} 已留言",
-    "You commented on %1$s" : "你對 %1$s 留言",
-    "You commented on {file}" : "你對 {file} 留言",
-    "%1$s commented on %2$s" : "%1$s 在 %2$s 留言",
-    "{author} commented on {file}" : "{author} 對 {file} 留言",
+    "You commented on %1$s" : "你對 %1$s 留了言",
+    "You commented on {file}" : "你對 {file} 留了言",
+    "%1$s commented on %2$s" : "%1$s 對 %2$s 留了言",
+    "{author} commented on {file}" : "{author} 對 {file} 留了言",
    "<strong>Comments</strong> for files" : "檔案的<strong>留言</strong>",
    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "一個已被刪除的用戶在 “{file}” 的留言中提到你",
    "{user} mentioned you in a comment on “{file}”" : "{user} 在 “{file}” 的留言中提到你",
@@ -16,27 +16,27 @@ OC.L10N.register(
    "Edit comment" : "編輯留言",
    "Delete comment" : "刪除留言",
    "Cancel edit" : "取消編輯",
-    "Post comment" : "張貼評論",
-    "No comments yet, start the conversation!" : "尚無留言，開始討論 !",
+    "Post comment" : "張貼留言",
+    "No comments yet, start the conversation!" : "尚無留言，開始討論吧！",
    "No more messages" : "沒有更多訊息",
    "Retry" : "重試",
-    "Unable to load the comments list" : "無法載入評論清單",
-    "_%n unread comment_::_%n unread comments_" : ["%n 未讀留言"],
+    "Unable to load the comments list" : "無法載入留言清單",
+    "_%n unread comment_::_%n unread comments_" : ["%n 個未讀留言"],
    "_1 new comment_::_{unread} new comments_" : ["{unread} 個新留言"],
    "Comment" : "留言",
-    "An error occurred while trying to edit the comment" : "嘗試編輯此評論時錯誤",
+    "An error occurred while trying to edit the comment" : "嘗試編輯此留言時錯誤",
    "Comment deleted" : "意見刪除",
-    "An error occurred while trying to delete the comment" : "嘗試刪除此評論時錯誤",
-    "An error occurred while trying to create the comment" : "嘗試建立此評論時錯誤",
+    "An error occurred while trying to delete the comment" : "嘗試刪除此留言時錯誤",
+    "An error occurred while trying to create the comment" : "嘗試建立此留言時錯誤",
    "New comment …" : "新增留言",
    "Post" : "送出",
    "Cancel" : "取消",
-    "[Deleted user]" : "[已刪除的使用者]",
-    "More comments …" : "其他留言…",
+    "[Deleted user]" : "[已刪除的用戶]",
+    "More comments …" : "更多留言…",
    "Save" : "儲存",
-    "Allowed characters {count} of {max}" : "已輸入 {count} / 長度限制 {max}",
-    "Error occurred while retrieving comment with ID {id}" : "在擷取 ID {id} 的註解時發生錯誤",
-    "Error occurred while updating comment with id {id}" : "編輯留言 {id} 發生錯誤",
-    "Error occurred while posting comment" : "張貼留言出錯"
+    "Allowed characters {count} of {max}" : "已輸入 {count} / {max}",
+    "Error occurred while retrieving comment with ID {id}" : "在擷取留言（ID {id}）時發生錯誤",
+    "Error occurred while updating comment with id {id}" : "編輯留言（ID {id}）時發生錯誤",
+    "Error occurred while posting comment" : "張貼留言時發生錯誤"
 },
 "nplurals=1; plural=0;");
--- a/apps/comments/l10n/zh_HK.json
+++ b/apps/comments/l10n/zh_HK.json
@@ -3,10 +3,10 @@
    "You commented" : "您已留言",
    "%1$s commented" : "%1$s 個留言",
    "{author} commented" : "{author} 已留言",
-    "You commented on %1$s" : "你對 %1$s 留言",
-    "You commented on {file}" : "你對 {file} 留言",
-    "%1$s commented on %2$s" : "%1$s 在 %2$s 留言",
-    "{author} commented on {file}" : "{author} 對 {file} 留言",
+    "You commented on %1$s" : "你對 %1$s 留了言",
+    "You commented on {file}" : "你對 {file} 留了言",
+    "%1$s commented on %2$s" : "%1$s 對 %2$s 留了言",
+    "{author} commented on {file}" : "{author} 對 {file} 留了言",
    "<strong>Comments</strong> for files" : "檔案的<strong>留言</strong>",
    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "一個已被刪除的用戶在 “{file}” 的留言中提到你",
    "{user} mentioned you in a comment on “{file}”" : "{user} 在 “{file}” 的留言中提到你",
@@ -14,27 +14,27 @@
    "Edit comment" : "編輯留言",
    "Delete comment" : "刪除留言",
    "Cancel edit" : "取消編輯",
-    "Post comment" : "張貼評論",
-    "No comments yet, start the conversation!" : "尚無留言，開始討論 !",
+    "Post comment" : "張貼留言",
+    "No comments yet, start the conversation!" : "尚無留言，開始討論吧！",
    "No more messages" : "沒有更多訊息",
    "Retry" : "重試",
-    "Unable to load the comments list" : "無法載入評論清單",
-    "_%n unread comment_::_%n unread comments_" : ["%n 未讀留言"],
+    "Unable to load the comments list" : "無法載入留言清單",
+    "_%n unread comment_::_%n unread comments_" : ["%n 個未讀留言"],
    "_1 new comment_::_{unread} new comments_" : ["{unread} 個新留言"],
    "Comment" : "留言",
-    "An error occurred while trying to edit the comment" : "嘗試編輯此評論時錯誤",
+    "An error occurred while trying to edit the comment" : "嘗試編輯此留言時錯誤",
    "Comment deleted" : "意見刪除",
-    "An error occurred while trying to delete the comment" : "嘗試刪除此評論時錯誤",
-    "An error occurred while trying to create the comment" : "嘗試建立此評論時錯誤",
+    "An error occurred while trying to delete the comment" : "嘗試刪除此留言時錯誤",
+    "An error occurred while trying to create the comment" : "嘗試建立此留言時錯誤",
    "New comment …" : "新增留言",
    "Post" : "送出",
    "Cancel" : "取消",
-    "[Deleted user]" : "[已刪除的使用者]",
-    "More comments …" : "其他留言…",
+    "[Deleted user]" : "[已刪除的用戶]",
+    "More comments …" : "更多留言…",
    "Save" : "儲存",
-    "Allowed characters {count} of {max}" : "已輸入 {count} / 長度限制 {max}",
-    "Error occurred while retrieving comment with ID {id}" : "在擷取 ID {id} 的註解時發生錯誤",
-    "Error occurred while updating comment with id {id}" : "編輯留言 {id} 發生錯誤",
-    "Error occurred while posting comment" : "張貼留言出錯"
+    "Allowed characters {count} of {max}" : "已輸入 {count} / {max}",
+    "Error occurred while retrieving comment with ID {id}" : "在擷取留言（ID {id}）時發生錯誤",
+    "Error occurred while updating comment with id {id}" : "編輯留言（ID {id}）時發生錯誤",
+    "Error occurred while posting comment" : "張貼留言時發生錯誤"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
--- a/apps/comments/l10n/zh_TW.js
+++ b/apps/comments/l10n/zh_TW.js
@@ -3,40 +3,40 @@ OC.L10N.register(
    {
    "Comments" : "留言",
    "You commented" : "您已留言",
-    "%1$s commented" : "%1$s 個留言",
+    "%1$s commented" : "%1$s 已留言",
    "{author} commented" : "{author} 已留言",
-    "You commented on %1$s" : "你對 %1$s 留言",
-    "You commented on {file}" : "你對 {file} 留言",
-    "%1$s commented on %2$s" : "%1$s 在 %2$s 留言",
-    "{author} commented on {file}" : "{author} 對 {file} 留言",
+    "You commented on %1$s" : "您已對 %1$s 留言",
+    "You commented on {file}" : "您已對 {file} 留言",
+    "%1$s commented on %2$s" : "%1$s 已對 %2$s 留言",
+    "{author} commented on {file}" : "{author} 已對 {file} 留言",
    "<strong>Comments</strong> for files" : "檔案的<strong>留言</strong>",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "一個已被刪除的用戶在 “{file}” 的留言中提到你",
-    "{user} mentioned you in a comment on “{file}”" : "{user} 在 “{file}” 的留言中提到你",
-    "Files app plugin to add comments to files" : "檔案插件程式插件，用於為檔案增加註釋",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "一個已被刪除的使用者在「{file}」的留言中提到您",
+    "{user} mentioned you in a comment on “{file}”" : "{user} 在「{file}」的留言中提到您",
+    "Files app plugin to add comments to files" : "用於對檔案加入留言的檔案應用程式擴充元件",
    "Edit comment" : "編輯留言",
    "Delete comment" : "刪除留言",
    "Cancel edit" : "取消編輯",
-    "Post comment" : "張貼評論",
-    "No comments yet, start the conversation!" : "尚無留言，開始討論 !",
+    "Post comment" : "張貼留言",
+    "No comments yet, start the conversation!" : "尚無留言，開始討論！",
    "No more messages" : "沒有更多訊息",
    "Retry" : "重試",
-    "Unable to load the comments list" : "無法載入評論清單",
-    "_%n unread comment_::_%n unread comments_" : ["%n 未讀留言"],
-    "_1 new comment_::_{unread} new comments_" : ["{unread} 個新留言"],
+    "Unable to load the comments list" : "無法載入留言列表",
+    "_%n unread comment_::_%n unread comments_" : ["%n 則未讀留言"],
+    "_1 new comment_::_{unread} new comments_" : ["{unread} 則新留言"],
    "Comment" : "留言",
-    "An error occurred while trying to edit the comment" : "嘗試編輯此評論時錯誤",
-    "Comment deleted" : "意見刪除",
-    "An error occurred while trying to delete the comment" : "嘗試刪除此評論時錯誤",
-    "An error occurred while trying to create the comment" : "嘗試建立此評論時錯誤",
-    "New comment …" : "新增留言",
+    "An error occurred while trying to edit the comment" : "嘗試編輯此留言時錯誤",
+    "Comment deleted" : "留言已刪除",
+    "An error occurred while trying to delete the comment" : "嘗試刪除留言時發生錯誤",
+    "An error occurred while trying to create the comment" : "嘗試建立留言時發生錯誤",
+    "New comment …" : "新增留言……",
    "Post" : "送出",
    "Cancel" : "取消",
    "[Deleted user]" : "[已刪除的使用者]",
-    "More comments …" : "其他留言…",
+    "More comments …" : "其他留言……",
    "Save" : "儲存",
    "Allowed characters {count} of {max}" : "已輸入 {count} / 長度限制 {max}",
-    "Error occurred while retrieving comment with ID {id}" : "在擷取 ID {id} 的註解時發生錯誤",
-    "Error occurred while updating comment with id {id}" : "編輯留言 {id} 發生錯誤",
-    "Error occurred while posting comment" : "張貼留言出錯"
+    "Error occurred while retrieving comment with ID {id}" : "在擷取 ID {id} 的留言時發生錯誤",
+    "Error occurred while updating comment with id {id}" : "編輯留言 ID {id} 時發生錯誤",
+    "Error occurred while posting comment" : "張貼留言時發生錯誤"
 },
 "nplurals=1; plural=0;");
--- a/apps/comments/l10n/zh_TW.json
+++ b/apps/comments/l10n/zh_TW.json
@@ -1,40 +1,40 @@
 { "translations": {
    "Comments" : "留言",
    "You commented" : "您已留言",
-    "%1$s commented" : "%1$s 個留言",
+    "%1$s commented" : "%1$s 已留言",
    "{author} commented" : "{author} 已留言",
-    "You commented on %1$s" : "你對 %1$s 留言",
-    "You commented on {file}" : "你對 {file} 留言",
-    "%1$s commented on %2$s" : "%1$s 在 %2$s 留言",
-    "{author} commented on {file}" : "{author} 對 {file} 留言",
+    "You commented on %1$s" : "您已對 %1$s 留言",
+    "You commented on {file}" : "您已對 {file} 留言",
+    "%1$s commented on %2$s" : "%1$s 已對 %2$s 留言",
+    "{author} commented on {file}" : "{author} 已對 {file} 留言",
    "<strong>Comments</strong> for files" : "檔案的<strong>留言</strong>",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "一個已被刪除的用戶在 “{file}” 的留言中提到你",
-    "{user} mentioned you in a comment on “{file}”" : "{user} 在 “{file}” 的留言中提到你",
-    "Files app plugin to add comments to files" : "檔案插件程式插件，用於為檔案增加註釋",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "一個已被刪除的使用者在「{file}」的留言中提到您",
+    "{user} mentioned you in a comment on “{file}”" : "{user} 在「{file}」的留言中提到您",
+    "Files app plugin to add comments to files" : "用於對檔案加入留言的檔案應用程式擴充元件",
    "Edit comment" : "編輯留言",
    "Delete comment" : "刪除留言",
    "Cancel edit" : "取消編輯",
-    "Post comment" : "張貼評論",
-    "No comments yet, start the conversation!" : "尚無留言，開始討論 !",
+    "Post comment" : "張貼留言",
+    "No comments yet, start the conversation!" : "尚無留言，開始討論！",
    "No more messages" : "沒有更多訊息",
    "Retry" : "重試",
-    "Unable to load the comments list" : "無法載入評論清單",
-    "_%n unread comment_::_%n unread comments_" : ["%n 未讀留言"],
-    "_1 new comment_::_{unread} new comments_" : ["{unread} 個新留言"],
+    "Unable to load the comments list" : "無法載入留言列表",
+    "_%n unread comment_::_%n unread comments_" : ["%n 則未讀留言"],
+    "_1 new comment_::_{unread} new comments_" : ["{unread} 則新留言"],
    "Comment" : "留言",
-    "An error occurred while trying to edit the comment" : "嘗試編輯此評論時錯誤",
-    "Comment deleted" : "意見刪除",
-    "An error occurred while trying to delete the comment" : "嘗試刪除此評論時錯誤",
-    "An error occurred while trying to create the comment" : "嘗試建立此評論時錯誤",
-    "New comment …" : "新增留言",
+    "An error occurred while trying to edit the comment" : "嘗試編輯此留言時錯誤",
+    "Comment deleted" : "留言已刪除",
+    "An error occurred while trying to delete the comment" : "嘗試刪除留言時發生錯誤",
+    "An error occurred while trying to create the comment" : "嘗試建立留言時發生錯誤",
+    "New comment …" : "新增留言……",
    "Post" : "送出",
    "Cancel" : "取消",
    "[Deleted user]" : "[已刪除的使用者]",
-    "More comments …" : "其他留言…",
+    "More comments …" : "其他留言……",
    "Save" : "儲存",
    "Allowed characters {count} of {max}" : "已輸入 {count} / 長度限制 {max}",
-    "Error occurred while retrieving comment with ID {id}" : "在擷取 ID {id} 的註解時發生錯誤",
-    "Error occurred while updating comment with id {id}" : "編輯留言 {id} 發生錯誤",
-    "Error occurred while posting comment" : "張貼留言出錯"
+    "Error occurred while retrieving comment with ID {id}" : "在擷取 ID {id} 的留言時發生錯誤",
+    "Error occurred while updating comment with id {id}" : "編輯留言 ID {id} 時發生錯誤",
+    "Error occurred while posting comment" : "張貼留言時發生錯誤"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
--- a/apps/comments/lib/Activity/Provider.php
+++ b/apps/comments/lib/Activity/Provider.php
@@ -213,17 +213,11 @@ class Provider implements IProvider {
 					continue;
 				}

-				$pattern = '/(^|\s)(' . '@' . $mention['id'] . ')(\b)/';
-				if (strpos($mention['id'], ' ') !== false) {
-					$pattern = '/(^|\s)(' . '@"' . $mention['id'] . '"' . ')(\b)?/';
+				$message = str_replace('@"' . $mention['id'] . '"', '{mention' . $mentionCount . '}', $message);
+				if (strpos($mention['id'], ' ') === false && strpos($mention['id'], 'guest/') !== 0) {
+					$message = str_replace('@' . $mention['id'], '{mention' . $mentionCount . '}', $message);
 				}

-				$message = preg_replace(
-					$pattern,
-					//'${1}' . $this->regexSafeUser($mention['id'], $displayName) . '${3}',
-					'${1}' . '{mention' . $mentionCount . '}' . '${3}',
-					$message
-				);
 				$mentions['mention' . $mentionCount] = $this->generateUserParameter($mention['id']);
 				$mentionCount++;
 			}
--- a/apps/comments/lib/Notification/Notifier.php
+++ b/apps/comments/lib/Notification/Notifier.php
@@ -195,7 +195,11 @@ class Notifier implements INotifier {
 			// could contain characters like '@' for user IDs) but a one-based
 			// index of the mentions of that type.
 			$mentionParameterId = 'mention-' . $mention['type'] . $mentionTypeCount[$mention['type']];
-			$message = str_replace('@' . $mention['id'], '{' . $mentionParameterId . '}', $message);
+			$message = str_replace('@"' . $mention['id'] . '"', '{' . $mentionParameterId . '}', $message);
+			if (strpos($mention['id'], ' ') === false && strpos($mention['id'], 'guest/') !== 0) {
+				$message = str_replace('@' . $mention['id'], '{' . $mentionParameterId . '}', $message);
+			}
+
 			try {
 				$displayName = $this->commentsManager->resolveDisplayName($mention['type'], $mention['id']);
 			} catch (\OutOfBoundsException $e) {
--- a/apps/contactsinteraction/composer/composer/ClassLoader.php
+++ b/apps/contactsinteraction/composer/composer/ClassLoader.php
@@ -311,8 +311,10 @@ class ClassLoader
        spl_autoload_register(array($this, 'loadClass'), true, $prepend);

        if (null === $this->vendorDir) {
-            //no-op
-        } elseif ($prepend) {
+            return;
+        }
+
+        if ($prepend) {
            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
        } else {
            unset(self::$registeredLoaders[$this->vendorDir]);
--- a/apps/contactsinteraction/l10n/hu.js
+++ b/apps/contactsinteraction/l10n/hu.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "contactsinteraction",
+    {
+    "Recently contacted" : "Legutóbbi kapcsolatfelvételek",
+    "Contacts Interaction" : "Kapcsolatfelvételek",
+    "Manages interaction between users and contacts" : "A felhasználók és a kapcsolataik közötti interakciót kezeli",
+    "Collect data about user and contacts interactions and provide an address book for the data" : "Adatokat gyűjt a felhasználók és kapcsolataik között interakciókról, és címjegyzéket biztosít az adatokhoz"
+},
+"nplurals=2; plural=(n != 1);");
--- a/apps/contactsinteraction/l10n/hu.json
+++ b/apps/contactsinteraction/l10n/hu.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Recently contacted" : "Legutóbbi kapcsolatfelvételek",
+    "Contacts Interaction" : "Kapcsolatfelvételek",
+    "Manages interaction between users and contacts" : "A felhasználók és a kapcsolataik közötti interakciót kezeli",
+    "Collect data about user and contacts interactions and provide an address book for the data" : "Adatokat gyűjt a felhasználók és kapcsolataik között interakciókról, és címjegyzéket biztosít az adatokhoz"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
--- a/apps/contactsinteraction/l10n/ro.js
+++ b/apps/contactsinteraction/l10n/ro.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "contactsinteraction",
+    {
+    "Recently contacted" : "Contactat recent",
+    "Contacts Interaction" : "Interacțiunea contactelor",
+    "Manages interaction between users and contacts" : "Gestionează interacțiunea dintre utilizatori și contacte",
+    "Collect data about user and contacts interactions and provide an address book for the data" : "Colectați date despre interacțiunile dintre utilizatori și contacte și furnizați o agendă pentru date"
+},
+"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
--- a/apps/contactsinteraction/l10n/ro.json
+++ b/apps/contactsinteraction/l10n/ro.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Recently contacted" : "Contactat recent",
+    "Contacts Interaction" : "Interacțiunea contactelor",
+    "Manages interaction between users and contacts" : "Gestionează interacțiunea dintre utilizatori și contacte",
+    "Collect data about user and contacts interactions and provide an address book for the data" : "Colectați date despre interacțiunile dintre utilizatori și contacte și furnizați o agendă pentru date"
+},"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
+}
--- a/apps/contactsinteraction/l10n/ru.js
+++ b/apps/contactsinteraction/l10n/ru.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "contactsinteraction",
+    {
+    "Recently contacted" : "Недавние контакты",
+    "Contacts Interaction" : "Взаимодействие с контактами",
+    "Manages interaction between users and contacts" : "Отслеживание взаимодейтсвей пользователей и контактов",
+    "Collect data about user and contacts interactions and provide an address book for the data" : "Сбор данных о взаимодействиях пользователей и контактов и создание адресных книг на основе этих данных"
+},
+"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
--- a/apps/contactsinteraction/l10n/ru.json
+++ b/apps/contactsinteraction/l10n/ru.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Recently contacted" : "Недавние контакты",
+    "Contacts Interaction" : "Взаимодействие с контактами",
+    "Manages interaction between users and contacts" : "Отслеживание взаимодейтсвей пользователей и контактов",
+    "Collect data about user and contacts interactions and provide an address book for the data" : "Сбор данных о взаимодействиях пользователей и контактов и создание адресных книг на основе этих данных"
+},"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
+}
--- a/apps/contactsinteraction/l10n/zh_HK.js
+++ b/apps/contactsinteraction/l10n/zh_HK.js
@@ -3,7 +3,7 @@ OC.L10N.register(
    {
    "Recently contacted" : "最近聯絡",
    "Contacts Interaction" : "聯絡人互動",
-    "Manages interaction between users and contacts" : "管理使用者與聯絡人間的互動",
-    "Collect data about user and contacts interactions and provide an address book for the data" : "蒐集關於使用者與聯絡人互動的資料，並提供資料的通訊錄"
+    "Manages interaction between users and contacts" : "管理用戶與聯絡人間的互動",
+    "Collect data about user and contacts interactions and provide an address book for the data" : "蒐集關於用戶與聯絡人互動的資料，並提供資料的通訊錄"
 },
 "nplurals=1; plural=0;");
--- a/apps/contactsinteraction/l10n/zh_HK.json
+++ b/apps/contactsinteraction/l10n/zh_HK.json
@@ -1,7 +1,7 @@
 { "translations": {
    "Recently contacted" : "最近聯絡",
    "Contacts Interaction" : "聯絡人互動",
-    "Manages interaction between users and contacts" : "管理使用者與聯絡人間的互動",
-    "Collect data about user and contacts interactions and provide an address book for the data" : "蒐集關於使用者與聯絡人互動的資料，並提供資料的通訊錄"
+    "Manages interaction between users and contacts" : "管理用戶與聯絡人間的互動",
+    "Collect data about user and contacts interactions and provide an address book for the data" : "蒐集關於用戶與聯絡人互動的資料，並提供資料的通訊錄"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
--- a/apps/contactsinteraction/lib/Card.php
+++ b/apps/contactsinteraction/lib/Card.php
@@ -53,7 +53,7 @@ class Card implements ICard, IACL {
 	 * @inheritDoc
 	 */
 	public function getOwner(): ?string {
-		$this->principal;
+		return $this->principal;
 	}

 	/**
--- a/apps/dashboard/l10n/ar.js
+++ b/apps/dashboard/l10n/ar.js
@@ -21,6 +21,9 @@ OC.L10N.register(
    "Good afternoon, {name}" : "مساء الخير، {name}",
    "Good evening" : "مساء الخير",
    "Good evening, {name}" : "مساء الخير، {name}",
+    "Hello" : "مرحبا",
+    "Hello, {name}" : "مرحبا، {name} ",
+    "Pick from Files" : "اختر من الملفات",
    "Default images" : "الصور الإفتراضية",
    "Plain background" : "خلفية سادة",
    "Insert from {productName}" : "اضف من {productName}",
--- a/apps/dashboard/l10n/ar.json
+++ b/apps/dashboard/l10n/ar.json
@@ -19,6 +19,9 @@
    "Good afternoon, {name}" : "مساء الخير، {name}",
    "Good evening" : "مساء الخير",
    "Good evening, {name}" : "مساء الخير، {name}",
+    "Hello" : "مرحبا",
+    "Hello, {name}" : "مرحبا، {name} ",
+    "Pick from Files" : "اختر من الملفات",
    "Default images" : "الصور الإفتراضية",
    "Plain background" : "خلفية سادة",
    "Insert from {productName}" : "اضف من {productName}",
--- a/apps/dashboard/l10n/bg.js
+++ b/apps/dashboard/l10n/bg.js
@@ -0,0 +1,34 @@
+OC.L10N.register(
+    "dashboard",
+    {
+    "Dashboard" : "Табло",
+    "Dashboard app" : "Приложение за Табло",
+    "Show something" : "Покажи нещо",
+    "Customize" : "Персонизиране",
+    "Edit widgets" : "Редактиране на изпълнимите модули",
+    "Get more widgets from the app store" : "Вземете повече приспособления от  app store",
+    "Change background image" : "Промяна на фоновото изображение",
+    "Weather service" : "Метеорологична услуга",
+    "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "За вашата поверителност данните за времето се изискват от Nextcloud  сървъра ви от ваше име, така че метеорологичната служба не получава лична информация.",
+    "Weather data from Met.no" : "Данни за времето от Met.no",
+    "geocoding with Nominatim" : "геокодиране с Nominatim",
+    "elevation data from OpenTopoData" : " кота данни от OpenTopoData",
+    "Weather" : "Време",
+    "Status" : "Състояние",
+    "Good morning" : "Добро утро",
+    "Good morning, {name}" : "Добро утро, {name}",
+    "Good afternoon" : "Добър ден",
+    "Good afternoon, {name}" : "Добър ден, {name}",
+    "Good evening" : "Добър вечер",
+    "Good evening, {name}" : "Добър вечер, {name}",
+    "Hello" : "Здравейте",
+    "Hello, {name}" : "Здравейте, {name}",
+    "Pick from Files" : "Избери от Файловете",
+    "Default images" : "Изображения по подразбиране",
+    "Plain background" : "Обикновен фон",
+    "Insert from {productName}" : "Вмъкване от {productName}",
+    "Good night, {name}" : "Лека нощ, {name}",
+    "Good night" : "Лека нощ",
+    "Pick from files" : "Избери от Файловете"
+},
+"nplurals=2; plural=(n != 1);");
--- a/Show More
+++ b/Show More