Merge pull request #24951 from nextcloud/version/21/beta5

21 beta5

.drone.yml

@@ -1,27 +1,4 @@
 kind: pipeline
-name: jsunit
-
-steps:
-- name: jsunit
-  image: nextcloudci/jsunit:jsunit-5
-  environment:
-      CODECOV_TOKEN:
-          from_secret: CODECOV_TOKEN
-  commands:
-    - ./autotest-js.sh
-    - curl -o codecov.sh https://codecov.io/bash
-    - bash codecov.sh -C $DRONE_COMMIT
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
 name: checkers
 
 steps:
@@ -30,7 +7,7 @@ steps:
   commands:
     - git submodule update --init
 - name: checkers
-  image: nextcloudci/php7.3:latest
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - ./autotest-checkers.sh
   secrets: [ github_token ]
@@ -247,12 +224,12 @@ steps:
   commands:
     - git submodule update --init
 - name: nodb-php7.3
-  image: nextcloudci/php7.3:latest
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
 - name: nodb-php7.4
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
@@ -284,12 +261,12 @@ steps:
   commands:
     - git submodule update --init
 - name: sqlite-php7.3
-  image: nextcloudci/php7.3:latest
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
 - name: sqlite-php7.4
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
@@ -321,7 +298,7 @@ steps:
   commands:
     - git submodule update --init
 - name: mariadb10.1-php7.3
-  image: nextcloudci/php7.3:latest
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -357,7 +334,7 @@ steps:
   commands:
     - git submodule update --init
 - name: mariadb10.2-php7.3
-  image: nextcloudci/php7.3:latest
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -392,7 +369,7 @@ steps:
   commands:
     - git submodule update --init
 - name: mariadb10.3-php7.3
-  image: nextcloudci/php7.3:latest
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -428,7 +405,7 @@ steps:
   commands:
     - git submodule update --init
 - name: mariadb10.4-php7.4
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
@@ -469,7 +446,7 @@ steps:
   commands:
     - git submodule update --init
 - name: mysql-php7.4
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
@@ -498,108 +475,7 @@ trigger:
 
 ---
 kind: pipeline
-name: mysql5.7-php7.4
-
-steps:
-- name: submodules
-  image: docker:git
-  commands:
-    - git submodule update --init
-- name: mysql-php7.4
-  image: nextcloudci/php7.4:latest
-  commands:
-    - bash tests/drone-run-php-tests.sh || exit 0
-    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
-
-services:
-- name: mysql
-  image: mysql:5.7
-  environment:
-    MYSQL_ROOT_PASSWORD: owncloud
-    MYSQL_USER: oc_autotest
-    MYSQL_PASSWORD: owncloud
-    MYSQL_DATABASE: oc_autotest
-  tmpfs:
-    - /var/lib/mysql
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - push
-
----
-kind: pipeline
-name: mysql5.7-php7.3
-
-steps:
-- name: submodules
-  image: docker:git
-  commands:
-    - git submodule update --init
-- name: mysql-php7.3
-  image: nextcloudci/php7.3:php7.3-4
-  commands:
-    - bash tests/drone-run-php-tests.sh || exit 0
-    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
-
-services:
-- name: mysql
-  image: mysql:5.7
-  environment:
-    MYSQL_ROOT_PASSWORD: owncloud
-    MYSQL_USER: oc_autotest
-    MYSQL_PASSWORD: owncloud
-    MYSQL_DATABASE: oc_autotest
-  tmpfs:
-    - /var/lib/mysql
-
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - push
-
----
-kind: pipeline
-name: mysql5.6-php7.3
-
-steps:
-- name: submodules
-  image: docker:git
-  commands:
-    - git submodule update --init
-- name: mysql5.6-php7.3
-  image: nextcloudci/php7.3:latest
-  commands:
-    - bash tests/drone-run-php-tests.sh || exit 0
-    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
-
-services:
-- name: cache
-  image: redis
-- name: mysql
-  image: mysql:5.6
-  environment:
-    MYSQL_ROOT_PASSWORD: owncloud
-    MYSQL_USER: oc_autotest
-    MYSQL_PASSWORD: owncloud
-    MYSQL_DATABASE: oc_autotest
-  tmpfs:
-    - /var/lib/mysql
-trigger:
-  branch:
-    - master
-    - stable*
-  event:
-    - pull_request
-    - push
-
----
-kind: pipeline
-name: postgres9-php7.3
+name: postgres9.6-php7.3
 
 steps:
 - name: submodules
@@ -607,7 +483,7 @@ steps:
   commands:
     - git submodule update --init
 - name: postgres-php7.3
-  image: nextcloudci/php7.3:php7.3-4
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - sleep 10 # gives the database enough time to initialize
@@ -617,7 +493,7 @@ services:
 - name: cache
   image: redis
 - name: postgres-9
-  image: postgres:9
+  image: postgres:9.6
   environment:
     POSTGRES_USER: oc_autotest
     POSTGRES_DB: oc_autotest_dummy
@@ -643,7 +519,7 @@ steps:
   commands:
     - git submodule update --init
 - name: postgres-php7.3
-  image: nextcloudci/php7.3:latest
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - sleep 10 # gives the database enough time to initialize
@@ -678,7 +554,7 @@ steps:
   commands:
     - git submodule update --init
 - name: postgres-php7.4
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - sleep 10 # gives the database enough time to initialize
@@ -706,6 +582,77 @@ trigger:
 
 ---
 kind: pipeline
+name: postgres12-php7.4
+
+steps:
+- name: submodules
+  image: docker:git
+  commands:
+    - git submodule update --init
+- name: postgres-php7.4
+  image: nextcloudci/php7.4:php7.4-3
+  commands:
+    - bash tests/drone-run-php-tests.sh || exit 0
+    - sleep 10 # gives the database enough time to initialize
+    - POSTGRES=12 NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
+
+services:
+- name: cache
+  image: redis
+- name: postgres-12
+  image: postgres:12
+  environment:
+    POSTGRES_USER: oc_autotest
+    POSTGRES_DB: oc_autotest_dummy
+    POSTGRES_PASSWORD: owncloud
+  tmpfs:
+    - /var/lib/postgresql/data
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
+---
+kind: pipeline
+name: postgres13-php7.4
+
+steps:
+- name: submodules
+  image: docker:git
+  commands:
+    - git submodule update --init
+- name: postgres-php7.4
+  image: nextcloudci/php7.4:php7.4-3
+  commands:
+    - bash tests/drone-run-php-tests.sh || exit 0
+    - sleep 10 # gives the database enough time to initialize
+    - POSTGRES=13 NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
+
+services:
+- name: cache
+  image: redis
+- name: postgres-13
+  image: postgres:13
+  environment:
+    POSTGRES_USER: oc_autotest
+    POSTGRES_DB: oc_autotest_dummy
+    POSTGRES_PASSWORD: owncloud
+  tmpfs:
+    - /var/lib/postgresql/data
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+---
+kind: pipeline
 name: mysqlmb4-php7.4
 #name: mysqlmb4-php8.0
 
@@ -715,7 +662,7 @@ steps:
   commands:
     - git submodule update --init
 - name: mysqlmb4-php7.4
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
@@ -756,7 +703,7 @@ steps:
   commands:
     - git submodule update --init
 - name: mysqlmb4-php7.3
-  image: nextcloudci/php7.3:php7.3-4
+  image: nextcloudci/php7.3:php7.3-5
   commands:
     - bash tests/drone-run-php-tests.sh || exit 0
     - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
@@ -866,7 +813,7 @@ steps:
   image: docker:git
   commands:
     - git submodule update --init
-- name: integration-auth
+- name: integration-avatar
   image: nextcloudci/integration-php7.3:integration-php7.3-2
   commands:
     - bash tests/drone-run-integration-tests.sh || exit 0
@@ -2061,7 +2008,7 @@ steps:
   commands:
     - git submodule update --init
 - name: nodb-codecov
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   environment:
       CODECOV_TOKEN:
           from_secret: CODECOV_TOKEN
@@ -2092,7 +2039,7 @@ steps:
   commands:
     - git submodule update --init
 - name: db-codecov
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   environment:
       CODECOV_TOKEN:
           from_secret: CODECOV_TOKEN
@@ -2123,7 +2070,7 @@ steps:
   commands:
     - git submodule update --init
 - name: object-store
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   environment:
       CODECOV_TOKEN:
           from_secret: CODECOV_TOKEN
@@ -2156,7 +2103,7 @@ steps:
   commands:
     - git submodule update --init
 - name: object-store
-  image: nextcloudci/php7.4:latest
+  image: nextcloudci/php7.4:php7.4-3
   environment:
       CODECOV_TOKEN:
           from_secret: CODECOV_TOKEN
@@ -2290,7 +2237,7 @@ trigger:
 #  commands:
 #    - git submodule update --init
 #- name: memcache-redis-cluster
-#  image: nextcloudci/php7.3:latest
+#  image: nextcloudci/php7.3:php7.3-5
 #  commands:
 #    - phpenmod xdebug
 #    - sleep 20
@@ -2310,4 +2257,3 @@ trigger:
 #  event:
 #    - pull_request
 #    - push
-

.github/workflows/node.yml

@@ -24,6 +24,7 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - name: Install dependencies & build
       run: |
+        make clean
         npm ci
         npm run build --if-present
     - name: Check webpack build changes
@@ -49,6 +50,17 @@ jobs:
     - name: Test
       run: npm run test
 
+  jsunit:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use node ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+          node-version: ${{ matrix.node-version }}
+    - name: Test
+      run: ./autotest-js.sh
+
   handlebars:
     runs-on: ubuntu-latest
     strategy:

.github/workflows/static-code-analysis.yml

@@ -27,3 +27,28 @@ jobs:
             - name: Show potential changes in Psalm baseline
               run: |
                 bash -c "[[ ! \"`git status --porcelain build/psalm-baseline.xml`\" ]] || ( echo 'Uncommited changes in Psalm baseline' && git status && git diff build/psalm-baseline.xml)"
+
+    static-code-analysis-ocp:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+            - name: Checkout submodules
+              shell: bash
+              run: |
+                auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+                git submodule sync --recursive
+                git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+            - name: Set up php7.4
+              uses: shivammathur/setup-php@master
+              with:
+                php-version: 7.4
+                coverage: none
+            - name: Composer install
+              run: composer i
+            - name: Psalm
+              run: composer run psalm -- -c psalm-ocp.xml --monochrome --no-progress --output-format=text --update-baseline || ( git diff -- . ':!lib/composer' && exit 1 )
+            - name: Check diff
+              run: git diff -- . ':!lib/composer'
+            - name: Show potential changes in Psalm baseline
+              run: |
+                bash -c "[[ ! \"`git status --porcelain build/psalm-baseline-ocp.xml`\" ]] || ( echo 'Uncommited changes in Psalm baseline' && git status && git diff build/psalm-baseline.xml)"

.htaccess

@@ -61,16 +61,12 @@
   RewriteCond %{HTTP_USER_AGENT} DavClnt
   RewriteRule ^$ /remote.php/webdav/ [L,R=302]
   RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
-  RewriteRule ^\.well-known/host-meta /public.php?service=host-meta [QSA,L]
-  RewriteRule ^\.well-known/host-meta\.json /public.php?service=host-meta-json [QSA,L]
-  RewriteRule ^\.well-known/webfinger /public.php?service=webfinger [QSA,L]
-  RewriteRule ^\.well-known/nodeinfo /public.php?service=nodeinfo [QSA,L]
   RewriteRule ^\.well-known/carddav /remote.php/dav/ [R=301,L]
   RewriteRule ^\.well-known/caldav /remote.php/dav/ [R=301,L]
   RewriteRule ^remote/(.*) remote.php [QSA,L]
   RewriteRule ^(?:build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
-  RewriteCond %{REQUEST_URI} !^/\.well-known/(acme-challenge|pki-validation)/.*
-  RewriteRule ^(?:\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
+  RewriteRule ^\.well-known/(?!acme-challenge|pki-validation) /index.php [QSA,L]
+  RewriteRule ^(?:\.(?!well-known)|autotest|occ|issue|indie|db_|console).* - [R=404,L]
 </IfModule>
 <IfModule mod_mime.c>
   AddType image/svg+xml svg svgz

.mailmap

@@ -382,6 +382,7 @@ TheSFReader <TheSFReader@gmail.com>
 Thibaut GRIDEL <tgridel@free.fr>
 thomas <thomas@thomas-VirtualBox.(none)>
 Thomas Citharel <nextcloud@tcit.fr> Thomas Citharel <tcit@tcit.fr>
+Thomas Citharel <nextcloud@tcit.fr> Thomas Citharel <github@tcit.fr>
 Thomas Müller <thomas.mueller@tmit.eu> Thomas Mueller <thomas.mueller@tmit.eu>
 Thomas Müller <thomas.mueller@tmit.eu> Thomas Müller <DeepDiver1975@users.noreply.github.com>
 Thomas Olsen <tol@tanghus>

AUTHORS

@@ -210,7 +210,6 @@ Nextcloud is written by:
  - Michael Kuhn <michael@ikkoku.de>
  - Michael Letzgus <www@chronos.michael-letzgus.de>
  - Michael Roitzsch <reactorcontrol@icloud.com>
- - Michael Roth <michael.roth@rz.uni-augsburg.de>
  - Michael Weimann <mail@michael-weimann.eu>
  - Michael Zamot <michael@zamot.io>
  - Michał Węgrzynek <michal.wegrzynek@malloc.com.pl>
@@ -321,7 +320,6 @@ Nextcloud is written by:
  - Tekhnee <info@tekhnee.org>
  - Temtaime <temtaime@gmail.com>
  - Thibaut GRIDEL <tgridel@free.fr>
- - Thomas Citharel <github@tcit.fr>
  - Thomas Citharel <nextcloud@tcit.fr>
  - Thomas Ebert <thomas.ebert@usability.de>
  - Thomas Müller <thomas.mueller@tmit.eu>
@@ -402,6 +400,7 @@ Nextcloud is written by:
  - martin-rueegg <martin.rueegg@metaworx.ch>
  - martin.mattel@diemattels.at <martin.mattel@diemattels.at>
  - martink-p <47943787+martink-p@users.noreply.github.com>
+ - matt <34400929+call-me-matt@users.noreply.github.com>
  - medcloud <42641918+medcloud@users.noreply.github.com>
  - michaelletzgus <michaelletzgus@users.noreply.github.com>
  - michag86 <micha_g@arcor.de>

README.md

@@ -56,8 +56,9 @@ Several apps that are included by default in regular releases such as [First run
 
 Otherwise, git checkouts can be handled the same as release archives, by using the `stable*` branches. Note they should never be used on production systems.
 
+### Working with front-end code 🏗
 
-### Building front-end code 🏗
+#### Building
 
 We are moving more and more towards using Vue.js in the frontend, starting with Settings. For building the code on changes, use these terminal commands in the root folder:
 
@@ -75,6 +76,8 @@ make watch-js
 make build-js-production
 ```
 
+#### Commiting changes
+
 **When making changes, also commit the compiled files!**
 
 We still use Handlebars templates some places in Files and Settings. We will replace these step-by-step with Vue.js, but in the meantime you need to compile them separately.
@@ -102,6 +105,17 @@ MODULE=user_status make build-js-production
 
 Please note that if you used `make build-js` or `make watch-js` before, you'll notice that a lot of files were marked as changed, so might need to clear the workspace first.
 
+### Working with back-end code 🏗
+
+When changing back-end PHP code, in general no additional steps are needed before checking in.
+
+However, if new files were created, you will need to run the following command to update the autoloader files:
+```bash
+build/autoloaderchecker.sh
+```
+
+After that, please also include the autoloader file changes in your commits.
+
 ### Tools we use 🛠
 
 - [👀 BrowserStack](https://browserstack.com) for cross-browser testing

apps/accessibility/l10n/de_DE.js

@@ -11,7 +11,7 @@ OC.L10N.register(
     "Enable dyslexia font" : "Legasthenie-Schriftart aktivieren",
     "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic ist eine freie Schriftart, die entwickelt wurde, um einige der häufigsten Lesefehler, die durch Legasthenie verursacht werden, zu reduzieren.",
     "Accessibility" : "Barrierefreiheit",
-    "Accessibility options for nextcloud" : "Optionen zur Barrierefreiheit in Nextcloud",
+    "Accessibility options for nextcloud" : "Optionen für Barrierefreiheit in Nextcloud",
     "Provides multiple accessibilities options to ease your use of Nextcloud" : "Bietet verschiedene Optionen für Barrierefreiheit, um die Nutzung von Nextcloud zu erleichtern.",
     "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." : "Der universelle Zugang ist für uns sehr wichtig. Wir halten uns an Webstandards und prüfen, ob alles auch ohne Maus und unterstützende Software wie Screenreader nutzbar ist. Wir streben die Einhaltung der {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 auf AA-Niveau an, mit dem kontrastreichen Design sogar auf AAA-Niveau.",
     "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}!" : "Wenn Sie Fehler finden, melden Sie diese bitte im {issuetracker}Problemverfolgungssystem{linkend}. Und wenn Sie mithelfen möchten, treten Sie dem {designteam}Designteam{linkend} bei!",

apps/accessibility/l10n/de_DE.json

@@ -9,7 +9,7 @@
     "Enable dyslexia font" : "Legasthenie-Schriftart aktivieren",
     "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic ist eine freie Schriftart, die entwickelt wurde, um einige der häufigsten Lesefehler, die durch Legasthenie verursacht werden, zu reduzieren.",
     "Accessibility" : "Barrierefreiheit",
-    "Accessibility options for nextcloud" : "Optionen zur Barrierefreiheit in Nextcloud",
+    "Accessibility options for nextcloud" : "Optionen für Barrierefreiheit in Nextcloud",
     "Provides multiple accessibilities options to ease your use of Nextcloud" : "Bietet verschiedene Optionen für Barrierefreiheit, um die Nutzung von Nextcloud zu erleichtern.",
     "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." : "Der universelle Zugang ist für uns sehr wichtig. Wir halten uns an Webstandards und prüfen, ob alles auch ohne Maus und unterstützende Software wie Screenreader nutzbar ist. Wir streben die Einhaltung der {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 auf AA-Niveau an, mit dem kontrastreichen Design sogar auf AAA-Niveau.",
     "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}!" : "Wenn Sie Fehler finden, melden Sie diese bitte im {issuetracker}Problemverfolgungssystem{linkend}. Und wenn Sie mithelfen möchten, treten Sie dem {designteam}Designteam{linkend} bei!",

apps/admin_audit/l10n/ca.js

@@ -1,7 +1,7 @@
 OC.L10N.register(
     "admin_audit",
     {
-    "Auditing / Logging" : "Auditoria/Registre",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Proporciona capacitats de registre per a Nextcloud, com ara registre d’accés a fitxers o d’altres accions sensibles."
+    "Auditing / Logging" : "Auditoria/registre",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Proporciona funcionalitats de registre per al Nextcloud, com ara un registre d'accés a fitxers o altres accions relacionades amb la confidencialitat."
 },
 "nplurals=2; plural=(n != 1);");

apps/admin_audit/l10n/ca.json

@@ -1,5 +1,5 @@
 { "translations": {
-    "Auditing / Logging" : "Auditoria/Registre",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Proporciona capacitats de registre per a Nextcloud, com ara registre d’accés a fitxers o d’altres accions sensibles."
+    "Auditing / Logging" : "Auditoria/registre",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Proporciona funcionalitats de registre per al Nextcloud, com ara un registre d'accés a fitxers o altres accions relacionades amb la confidencialitat."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/admin_audit/l10n/sr.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." : "Даје Некстклауду могућност бележења, попут приступа фајловима или других осетљивих радњи."
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");

apps/admin_audit/l10n/sr.json

@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Праћење / Бележење",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Даје Некстклауду могућност бележења, попут приступа фајловима или других осетљивих радњи."
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}

apps/cloud_federation_api/l10n/nb.js

@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "cloud_federation_api",
+    {
+    "Cloud Federation API" : "Cloud Federation API",
+    "Enable clouds to communicate with each other and exchange data" : "Lar nettskyer kommunisere med hverandre og utveksle data.",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation APIet lar flere instanser av Nextcloud kommunisere med hverandre og utveksle data."
+},
+"nplurals=2; plural=(n != 1);");

apps/cloud_federation_api/l10n/nb.json

@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cloud Federation API" : "Cloud Federation API",
+    "Enable clouds to communicate with each other and exchange data" : "Lar nettskyer kommunisere med hverandre og utveksle data.",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "Cloud Federation APIet lar flere instanser av Nextcloud kommunisere med hverandre og utveksle data."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/comments/js/comments-tab.js

@@ -1,2 +1,2 @@
-!function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="/js/",t(t.s=877)}({877:function(e,n){function r(e,n,t,r,o,i,u){try{var c=e[i](u),a=c.value}catch(e){return void t(e)}c.done?n(a):Promise.resolve(a).then(r,o)}var o=null,i=new OCA.Files.Sidebar.Tab({id:"comments",name:t("comments","Comments"),icon:"icon-comment",mount:function(e,n,t){return(i=regeneratorRuntime.mark((function r(){return regeneratorRuntime.wrap((function(r){for(;;)switch(r.prev=r.next){case 0:return o&&o.$destroy(),o=new OCA.Comments.View("files",{parent:t}),r.next=4,o.update(n.id);case 4:o.$mount(e);case 5:case"end":return r.stop()}}),r)})),function(){var e=this,n=arguments;return new Promise((function(t,o){var u=i.apply(e,n);function c(e){r(u,t,o,c,a,"next",e)}function a(e){r(u,t,o,c,a,"throw",e)}c(void 0)}))})();var i},update:function(e){o.update(e.id)},destroy:function(){o.$destroy(),o=null},scrollBottomReached:function(){o.onScrollBottomReached()}});window.addEventListener("DOMContentLoaded",(function(){OCA.Files&&OCA.Files.Sidebar&&OCA.Files.Sidebar.registerTab(i)}))}});
+!function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="/js/",t(t.s=880)}({880:function(e,n){function r(e,n,t,r,o,i,u){try{var c=e[i](u),a=c.value}catch(e){return void t(e)}c.done?n(a):Promise.resolve(a).then(r,o)}var o=null,i=new OCA.Files.Sidebar.Tab({id:"comments",name:t("comments","Comments"),icon:"icon-comment",mount:function(e,n,t){return(i=regeneratorRuntime.mark((function r(){return regeneratorRuntime.wrap((function(r){for(;;)switch(r.prev=r.next){case 0:return o&&o.$destroy(),o=new OCA.Comments.View("files",{parent:t}),r.next=4,o.update(n.id);case 4:o.$mount(e);case 5:case"end":return r.stop()}}),r)})),function(){var e=this,n=arguments;return new Promise((function(t,o){var u=i.apply(e,n);function c(e){r(u,t,o,c,a,"next",e)}function a(e){r(u,t,o,c,a,"throw",e)}c(void 0)}))})();var i},update:function(e){o.update(e.id)},destroy:function(){o.$destroy(),o=null},scrollBottomReached:function(){o.onScrollBottomReached()}});window.addEventListener("DOMContentLoaded",(function(){OCA.Files&&OCA.Files.Sidebar&&OCA.Files.Sidebar.registerTab(i)}))}});
 //# sourceMappingURL=comments-tab.js.map

apps/comments/l10n/de.js

@@ -11,7 +11,7 @@ OC.L10N.register(
     "{author} commented on {file}" : "{author} hat {file} kommentiert",
     "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"{file}\" von einem bereits gelöschten Benutzer erwähnt",
-    "{user} mentioned you in a comment on “{file}”" : "{user} hat Dich in einem Kommentar zu “{file}” erwähnt ",
+    "{user} mentioned you in a comment on “{file}”" : "{user} hat Dich in einem Kommentar zu “{file}” erwähnt",
     "Files app plugin to add comments to files" : "Ein Plugin für die Dateien-App zum Kommentieren von Dateien",
     "Edit comment" : "Kommentar bearbeiten",
     "Delete comment" : "Kommentar löschen",

apps/comments/l10n/de.json

@@ -9,7 +9,7 @@
     "{author} commented on {file}" : "{author} hat {file} kommentiert",
     "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"{file}\" von einem bereits gelöschten Benutzer erwähnt",
-    "{user} mentioned you in a comment on “{file}”" : "{user} hat Dich in einem Kommentar zu “{file}” erwähnt ",
+    "{user} mentioned you in a comment on “{file}”" : "{user} hat Dich in einem Kommentar zu “{file}” erwähnt",
     "Files app plugin to add comments to files" : "Ein Plugin für die Dateien-App zum Kommentieren von Dateien",
     "Edit comment" : "Kommentar bearbeiten",
     "Delete comment" : "Kommentar löschen",

apps/comments/l10n/zh_TW.js

@@ -15,12 +15,19 @@ OC.L10N.register(
     "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 未讀留言"],
     "_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 …" : "新增留言",
     "Post" : "送出",
     "Cancel" : "取消",

apps/comments/l10n/zh_TW.json

@@ -13,12 +13,19 @@
     "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 未讀留言"],
     "_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 …" : "新增留言",
     "Post" : "送出",
     "Cancel" : "取消",

apps/contactsinteraction/lib/Db/CardSearchDao.php

@@ -82,7 +82,7 @@ class CardSearchDao {
 			->setMaxResults(1);
 		$result = $cardQuery->execute();
 		/** @var string|resource|false $card */
-		$card = $result->fetchColumn(0);
+		$card = $result->fetchOne();
 
 		if ($card === false) {
 			return null;

apps/dashboard/l10n/ar.js

@@ -15,17 +15,17 @@ OC.L10N.register(
     "elevation data from OpenTopoData" : "بيانات التقييم من OpenTopoData",
     "Weather" : "الطقس",
     "Status" : "الحالة",
-    "Good evening, {name}" : "مساء الخير، {name}",
-    "Good evening" : "مساء الخير",
-    "Good afternoon, {name}" : "مساء الخير، {name}",
-    "Good afternoon" : "مساء الخير",
-    "Good morning, {name}" : "صباح الخير ، {name}",
     "Good morning" : "صباح الخير",
-    "Good night, {name}" : "تصبح على خير، {name}",
-    "Good night" : "تصبح على خير",
-    "Pick from files" : "اختر من الملفات",
+    "Good morning, {name}" : "صباح الخير ، {name}",
+    "Good afternoon" : "مساء الخير",
+    "Good afternoon, {name}" : "مساء الخير، {name}",
+    "Good evening" : "مساء الخير",
+    "Good evening, {name}" : "مساء الخير، {name}",
     "Default images" : "الصور الإفتراضية",
     "Plain background" : "خلفية سادة",
-    "Insert from {productName}" : "اضف من {productName}"
+    "Insert from {productName}" : "اضف من {productName}",
+    "Good night, {name}" : "تصبح على خير، {name}",
+    "Good night" : "تصبح على خير",
+    "Pick from files" : "اختر من الملفات"
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");

apps/dashboard/l10n/ar.json

@@ -13,17 +13,17 @@
     "elevation data from OpenTopoData" : "بيانات التقييم من OpenTopoData",
     "Weather" : "الطقس",
     "Status" : "الحالة",
-    "Good evening, {name}" : "مساء الخير، {name}",
-    "Good evening" : "مساء الخير",
-    "Good afternoon, {name}" : "مساء الخير، {name}",
-    "Good afternoon" : "مساء الخير",
-    "Good morning, {name}" : "صباح الخير ، {name}",
     "Good morning" : "صباح الخير",
-    "Good night, {name}" : "تصبح على خير، {name}",
-    "Good night" : "تصبح على خير",
-    "Pick from files" : "اختر من الملفات",
+    "Good morning, {name}" : "صباح الخير ، {name}",
+    "Good afternoon" : "مساء الخير",
+    "Good afternoon, {name}" : "مساء الخير، {name}",
+    "Good evening" : "مساء الخير",
+    "Good evening, {name}" : "مساء الخير، {name}",
     "Default images" : "الصور الإفتراضية",
     "Plain background" : "خلفية سادة",
-    "Insert from {productName}" : "اضف من {productName}"
+    "Insert from {productName}" : "اضف من {productName}",
+    "Good night, {name}" : "تصبح على خير، {name}",
+    "Good night" : "تصبح على خير",
+    "Pick from files" : "اختر من الملفات"
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }

apps/dashboard/l10n/ca.js

@@ -13,17 +13,17 @@ OC.L10N.register(
     "Weather data from Met.no" : "Dades meteorològiques de Met.no",
     "Weather" : "Temps",
     "Status" : "Estat",
-    "Good evening, {name}" : "Bona nit, {name}",
-    "Good evening" : "Bona tarda",
-    "Good afternoon, {name}" : "Bona tarda, {name}",
-    "Good afternoon" : "Salutació",
-    "Good morning, {name}" : "Bon dia, {name}",
     "Good morning" : "Bon dia",
-    "Good night, {name}" : "Bona nit, {name}",
-    "Good night" : "Bona nit",
-    "Pick from files" : "Tria entre fitxers",
+    "Good morning, {name}" : "Bon dia, {name}",
+    "Good afternoon" : "Salutació",
+    "Good afternoon, {name}" : "Bona tarda, {name}",
+    "Good evening" : "Bona tarda",
+    "Good evening, {name}" : "Bona nit, {name}",
     "Default images" : "Imatges predeterminades",
     "Plain background" : "Fons senzill",
-    "Insert from {productName}" : "Insereix des de {productName}"
+    "Insert from {productName}" : "Insereix des de {productName}",
+    "Good night, {name}" : "Bona nit, {name}",
+    "Good night" : "Bona nit",
+    "Pick from files" : "Tria entre fitxers"
 },
 "nplurals=2; plural=(n != 1);");

apps/dashboard/l10n/ca.json

@@ -11,17 +11,17 @@
     "Weather data from Met.no" : "Dades meteorològiques de Met.no",
     "Weather" : "Temps",
     "Status" : "Estat",
-    "Good evening, {name}" : "Bona nit, {name}",
-    "Good evening" : "Bona tarda",
-    "Good afternoon, {name}" : "Bona tarda, {name}",
-    "Good afternoon" : "Salutació",
-    "Good morning, {name}" : "Bon dia, {name}",
     "Good morning" : "Bon dia",
-    "Good night, {name}" : "Bona nit, {name}",
-    "Good night" : "Bona nit",
-    "Pick from files" : "Tria entre fitxers",
+    "Good morning, {name}" : "Bon dia, {name}",
+    "Good afternoon" : "Salutació",
+    "Good afternoon, {name}" : "Bona tarda, {name}",
+    "Good evening" : "Bona tarda",
+    "Good evening, {name}" : "Bona nit, {name}",
     "Default images" : "Imatges predeterminades",
     "Plain background" : "Fons senzill",
-    "Insert from {productName}" : "Insereix des de {productName}"
+    "Insert from {productName}" : "Insereix des de {productName}",
+    "Good night, {name}" : "Bona nit, {name}",
+    "Good night" : "Bona nit",
+    "Pick from files" : "Tria entre fitxers"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/dashboard/l10n/cs.js

@@ -15,17 +15,17 @@ OC.L10N.register(
     "elevation data from OpenTopoData" : "data o nadmořských výškách z OpenTopoData",
     "Weather" : "Počasí",
     "Status" : "Stav",
-    "Good evening, {name}" : "Dobrý večer, {name}",
-    "Good evening" : "Dobrý večer",
-    "Good afternoon, {name}" : "Dobré odpoledne, {name}",
-    "Good afternoon" : "Dobré odpoledne",
-    "Good morning, {name}" : "Dobré ráno, {name}",
     "Good morning" : "Dobré ráno",
-    "Good night, {name}" : "Dobrou noc, {name}",
-    "Good night" : "Dobrou noc",
-    "Pick from files" : "Vybrat ze souborů",
+    "Good morning, {name}" : "Dobré ráno, {name}",
+    "Good afternoon" : "Dobré odpoledne",
+    "Good afternoon, {name}" : "Dobré odpoledne, {name}",
+    "Good evening" : "Dobrý večer",
+    "Good evening, {name}" : "Dobrý večer, {name}",
     "Default images" : "Výchozí obrázky",
     "Plain background" : "Holé pozadí",
-    "Insert from {productName}" : "Vložit z {productName}"
+    "Insert from {productName}" : "Vložit z {productName}",
+    "Good night, {name}" : "Dobrou noc, {name}",
+    "Good night" : "Dobrou noc",
+    "Pick from files" : "Vybrat ze souborů"
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");

apps/dashboard/l10n/cs.json

@@ -13,17 +13,17 @@
     "elevation data from OpenTopoData" : "data o nadmořských výškách z OpenTopoData",
     "Weather" : "Počasí",
     "Status" : "Stav",
-    "Good evening, {name}" : "Dobrý večer, {name}",
-    "Good evening" : "Dobrý večer",
-    "Good afternoon, {name}" : "Dobré odpoledne, {name}",
-    "Good afternoon" : "Dobré odpoledne",
-    "Good morning, {name}" : "Dobré ráno, {name}",
     "Good morning" : "Dobré ráno",
-    "Good night, {name}" : "Dobrou noc, {name}",
-    "Good night" : "Dobrou noc",
-    "Pick from files" : "Vybrat ze souborů",
+    "Good morning, {name}" : "Dobré ráno, {name}",
+    "Good afternoon" : "Dobré odpoledne",
+    "Good afternoon, {name}" : "Dobré odpoledne, {name}",
+    "Good evening" : "Dobrý večer",
+    "Good evening, {name}" : "Dobrý večer, {name}",
     "Default images" : "Výchozí obrázky",
     "Plain background" : "Holé pozadí",
-    "Insert from {productName}" : "Vložit z {productName}"
+    "Insert from {productName}" : "Vložit z {productName}",
+    "Good night, {name}" : "Dobrou noc, {name}",
+    "Good night" : "Dobrou noc",
+    "Pick from files" : "Vybrat ze souborů"
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
 }

apps/dashboard/l10n/de.js

@@ -9,23 +9,26 @@ OC.L10N.register(
     "Get more widgets from the app store" : "Hole Dir weitere Widgets aus dem App Store",
     "Change background image" : "Hintergrundbild ändern",
     "Weather service" : "Wetterdienst",
-    "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "Zu Deinem Datenschutz werden die Wetterdaten von Ihrem Nextcloud-Server für Dich angefordert, so dass der Wetterdienst keine persönlichen Informationen erhält.",
+    "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "Zu Deinem Datenschutz werden die Wetterdaten von Deinen Nextcloud-Server für Dich angefordert, so dass der Wetterdienst keine persönlichen Informationen erhält.",
     "Weather data from Met.no" : "Wetterdaten von Met.no",
     "geocoding with Nominatim" : "Geokodierung mit Nominatim",
     "elevation data from OpenTopoData" : "Höhendaten von OpenTopoData",
     "Weather" : "Wetter",
     "Status" : "Status",
-    "Good evening, {name}" : "Guten Abend {name}",
-    "Good evening" : "Guten Abend",
-    "Good afternoon, {name}" : "Guten Tag {name}",
-    "Good afternoon" : "Guten Tag",
-    "Good morning, {name}" : "Guten Morgen {name}",
     "Good morning" : "Guten Morgen",
-    "Good night, {name}" : "Gute Nacht {name}",
-    "Good night" : "Gute Nacht",
-    "Pick from files" : "Aus Dateien wählen",
+    "Good morning, {name}" : "Guten Morgen {name}",
+    "Good afternoon" : "Guten Tag",
+    "Good afternoon, {name}" : "Guten Tag {name}",
+    "Good evening" : "Guten Abend",
+    "Good evening, {name}" : "Guten Abend {name}",
+    "Hello" : "Hallo",
+    "Hello, {name}" : "Hallo, {name}",
+    "Pick from Files" : "Aus Dateien auswählen",
     "Default images" : "Standardbilder",
     "Plain background" : "Einfacher Hintergrund",
-    "Insert from {productName}" : "Von {productName} einfügen"
+    "Insert from {productName}" : "Von {productName} einfügen",
+    "Good night, {name}" : "Gute Nacht {name}",
+    "Good night" : "Gute Nacht",
+    "Pick from files" : "Aus Dateien wählen"
 },
 "nplurals=2; plural=(n != 1);");

apps/dashboard/l10n/de.json

@@ -7,23 +7,26 @@
     "Get more widgets from the app store" : "Hole Dir weitere Widgets aus dem App Store",
     "Change background image" : "Hintergrundbild ändern",
     "Weather service" : "Wetterdienst",
-    "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "Zu Deinem Datenschutz werden die Wetterdaten von Ihrem Nextcloud-Server für Dich angefordert, so dass der Wetterdienst keine persönlichen Informationen erhält.",
+    "For your privacy, the weather data is requested by your Nextcloud server on your behalf so the weather service receives no personal information." : "Zu Deinem Datenschutz werden die Wetterdaten von Deinen Nextcloud-Server für Dich angefordert, so dass der Wetterdienst keine persönlichen Informationen erhält.",
     "Weather data from Met.no" : "Wetterdaten von Met.no",
     "geocoding with Nominatim" : "Geokodierung mit Nominatim",
     "elevation data from OpenTopoData" : "Höhendaten von OpenTopoData",
     "Weather" : "Wetter",
     "Status" : "Status",
-    "Good evening, {name}" : "Guten Abend {name}",
-    "Good evening" : "Guten Abend",
-    "Good afternoon, {name}" : "Guten Tag {name}",
-    "Good afternoon" : "Guten Tag",
-    "Good morning, {name}" : "Guten Morgen {name}",
     "Good morning" : "Guten Morgen",
-    "Good night, {name}" : "Gute Nacht {name}",
-    "Good night" : "Gute Nacht",
-    "Pick from files" : "Aus Dateien wählen",
+    "Good morning, {name}" : "Guten Morgen {name}",
+    "Good afternoon" : "Guten Tag",
+    "Good afternoon, {name}" : "Guten Tag {name}",
+    "Good evening" : "Guten Abend",
+    "Good evening, {name}" : "Guten Abend {name}",
+    "Hello" : "Hallo",
+    "Hello, {name}" : "Hallo, {name}",
+    "Pick from Files" : "Aus Dateien auswählen",
     "Default images" : "Standardbilder",
     "Plain background" : "Einfacher Hintergrund",
-    "Insert from {productName}" : "Von {productName} einfügen"
+    "Insert from {productName}" : "Von {productName} einfügen",
+    "Good night, {name}" : "Gute Nacht {name}",
+    "Good night" : "Gute Nacht",
+    "Pick from files" : "Aus Dateien wählen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/dashboard/l10n/de_DE.js

@@ -15,17 +15,20 @@ OC.L10N.register(
     "elevation data from OpenTopoData" : "Höhendaten von OpenTopoData",
     "Weather" : "Wetter",
     "Status" : "Status",
-    "Good evening, {name}" : "Guten Abend {name}",
-    "Good evening" : "Guten Abend",
-    "Good afternoon, {name}" : "Guten Tag {name}",
-    "Good afternoon" : "Guten Tag",
-    "Good morning, {name}" : "Guten Morgen {name}",
     "Good morning" : "Guten Morgen",
-    "Good night, {name}" : "Gute Nacht {name}",
-    "Good night" : "Gute Nacht",
-    "Pick from files" : "Aus Dateien wählen",
+    "Good morning, {name}" : "Guten Morgen {name}",
+    "Good afternoon" : "Guten Tag",
+    "Good afternoon, {name}" : "Guten Tag {name}",
+    "Good evening" : "Guten Abend",
+    "Good evening, {name}" : "Guten Abend {name}",
+    "Hello" : "Hallo",
+    "Hello, {name}" : "Hallo, {name}",
+    "Pick from Files" : "Aus Dateien auswählen",
     "Default images" : "Standardbilder",
     "Plain background" : "Einfacher Hintergrund",
-    "Insert from {productName}" : "Von {productName} einfügen"
+    "Insert from {productName}" : "Von {productName} einfügen",
+    "Good night, {name}" : "Gute Nacht {name}",
+    "Good night" : "Gute Nacht",
+    "Pick from files" : "Aus Dateien wählen"
 },
 "nplurals=2; plural=(n != 1);");

apps/dashboard/l10n/de_DE.json

@@ -13,17 +13,20 @@
     "elevation data from OpenTopoData" : "Höhendaten von OpenTopoData",
     "Weather" : "Wetter",
     "Status" : "Status",
-    "Good evening, {name}" : "Guten Abend {name}",
-    "Good evening" : "Guten Abend",
-    "Good afternoon, {name}" : "Guten Tag {name}",
-    "Good afternoon" : "Guten Tag",
-    "Good morning, {name}" : "Guten Morgen {name}",
     "Good morning" : "Guten Morgen",
-    "Good night, {name}" : "Gute Nacht {name}",
-    "Good night" : "Gute Nacht",
-    "Pick from files" : "Aus Dateien wählen",
+    "Good morning, {name}" : "Guten Morgen {name}",
+    "Good afternoon" : "Guten Tag",
+    "Good afternoon, {name}" : "Guten Tag {name}",
+    "Good evening" : "Guten Abend",
+    "Good evening, {name}" : "Guten Abend {name}",
+    "Hello" : "Hallo",
+    "Hello, {name}" : "Hallo, {name}",
+    "Pick from Files" : "Aus Dateien auswählen",
     "Default images" : "Standardbilder",
     "Plain background" : "Einfacher Hintergrund",
-    "Insert from {productName}" : "Von {productName} einfügen"
+    "Insert from {productName}" : "Von {productName} einfügen",
+    "Good night, {name}" : "Gute Nacht {name}",
+    "Good night" : "Gute Nacht",
+    "Pick from files" : "Aus Dateien wählen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/dashboard/l10n/el.js

@@ -15,17 +15,17 @@ OC.L10N.register(
     "elevation data from OpenTopoData" : "δεδομένα elevation από OpenTopoData",
     "Weather" : "Καιρός",
     "Status" : "Κατάσταση",
-    "Good evening, {name}" : "Καλό βράδυ, {name}",
-    "Good evening" : "Καλό βράδυ",
-    "Good afternoon, {name}" : "Καλό απόγευμα, {name}",
-    "Good afternoon" : "Καλό απόγευμα",
-    "Good morning, {name}" : "Καλημέρα, {name}",
     "Good morning" : "Καλημέρα",
-    "Good night, {name}" : "Καληνύχτα, {name}",
-    "Good night" : "Καληνύχτα",
-    "Pick from files" : "Επιλογή από τα αρχεία",
+    "Good morning, {name}" : "Καλημέρα, {name}",
+    "Good afternoon" : "Καλό απόγευμα",
+    "Good afternoon, {name}" : "Καλό απόγευμα, {name}",
+    "Good evening" : "Καλό βράδυ",
+    "Good evening, {name}" : "Καλό βράδυ, {name}",
     "Default images" : "Προεπιλεγμένες εικόνες",
     "Plain background" : "Απλό παρασκήνιο",
-    "Insert from {productName}" : "Εισαγωγή από {productName}"
+    "Insert from {productName}" : "Εισαγωγή από {productName}",
+    "Good night, {name}" : "Καληνύχτα, {name}",
+    "Good night" : "Καληνύχτα",
+    "Pick from files" : "Επιλογή από τα αρχεία"
 },
 "nplurals=2; plural=(n != 1);");

apps/dashboard/l10n/el.json

@@ -13,17 +13,17 @@
     "elevation data from OpenTopoData" : "δεδομένα elevation από OpenTopoData",
     "Weather" : "Καιρός",
     "Status" : "Κατάσταση",
-    "Good evening, {name}" : "Καλό βράδυ, {name}",
-    "Good evening" : "Καλό βράδυ",
-    "Good afternoon, {name}" : "Καλό απόγευμα, {name}",
-    "Good afternoon" : "Καλό απόγευμα",
-    "Good morning, {name}" : "Καλημέρα, {name}",
     "Good morning" : "Καλημέρα",
-    "Good night, {name}" : "Καληνύχτα, {name}",
-    "Good night" : "Καληνύχτα",
-    "Pick from files" : "Επιλογή από τα αρχεία",
+    "Good morning, {name}" : "Καλημέρα, {name}",
+    "Good afternoon" : "Καλό απόγευμα",
+    "Good afternoon, {name}" : "Καλό απόγευμα, {name}",
+    "Good evening" : "Καλό βράδυ",
+    "Good evening, {name}" : "Καλό βράδυ, {name}",
     "Default images" : "Προεπιλεγμένες εικόνες",
     "Plain background" : "Απλό παρασκήνιο",
-    "Insert from {productName}" : "Εισαγωγή από {productName}"
+    "Insert from {productName}" : "Εισαγωγή από {productName}",
+    "Good night, {name}" : "Καληνύχτα, {name}",
+    "Good night" : "Καληνύχτα",
+    "Pick from files" : "Επιλογή από τα αρχεία"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/dashboard/l10n/es.js

@@ -15,17 +15,20 @@ OC.L10N.register(
     "elevation data from OpenTopoData" : "datos de elevación de OpenTopoData",
     "Weather" : "El tiempo",
     "Status" : "Estado",
-    "Good evening, {name}" : "Buenas tardes, {name}",
-    "Good evening" : "Buenas tardes",
-    "Good afternoon, {name}" : "Buenas tardes, {name}",
-    "Good afternoon" : "Buenas tardes",
-    "Good morning, {name}" : "Buenos días, {name}",
     "Good morning" : "Buenos días",
-    "Good night, {name}" : "Buenas noches, {name}",
-    "Good night" : "Buenas noches",
-    "Pick from files" : "Escoger desde los archivos",
+    "Good morning, {name}" : "Buenos días, {name}",
+    "Good afternoon" : "Buenas tardes",
+    "Good afternoon, {name}" : "Buenas tardes, {name}",
+    "Good evening" : "Buenas tardes",
+    "Good evening, {name}" : "Buenas tardes, {name}",
+    "Hello" : "Hola",
+    "Hello, {name}" : "Hola, {name}",
+    "Pick from Files" : "Elegir de Archivos",
     "Default images" : "Imágenes predeterminadas",
     "Plain background" : "Fondo liso",
-    "Insert from {productName}" : "Insertar desde {productName}"
+    "Insert from {productName}" : "Insertar desde {productName}",
+    "Good night, {name}" : "Buenas noches, {name}",
+    "Good night" : "Buenas noches",
+    "Pick from files" : "Escoger desde los archivos"
 },
 "nplurals=2; plural=(n != 1);");

apps/dashboard/l10n/es.json

@@ -13,17 +13,20 @@
     "elevation data from OpenTopoData" : "datos de elevación de OpenTopoData",
     "Weather" : "El tiempo",
     "Status" : "Estado",
-    "Good evening, {name}" : "Buenas tardes, {name}",
-    "Good evening" : "Buenas tardes",
-    "Good afternoon, {name}" : "Buenas tardes, {name}",
-    "Good afternoon" : "Buenas tardes",
-    "Good morning, {name}" : "Buenos días, {name}",
     "Good morning" : "Buenos días",
-    "Good night, {name}" : "Buenas noches, {name}",
-    "Good night" : "Buenas noches",
-    "Pick from files" : "Escoger desde los archivos",
+    "Good morning, {name}" : "Buenos días, {name}",
+    "Good afternoon" : "Buenas tardes",
+    "Good afternoon, {name}" : "Buenas tardes, {name}",
+    "Good evening" : "Buenas tardes",
+    "Good evening, {name}" : "Buenas tardes, {name}",
+    "Hello" : "Hola",
+    "Hello, {name}" : "Hola, {name}",
+    "Pick from Files" : "Elegir de Archivos",
     "Default images" : "Imágenes predeterminadas",
     "Plain background" : "Fondo liso",
-    "Insert from {productName}" : "Insertar desde {productName}"
+    "Insert from {productName}" : "Insertar desde {productName}",
+    "Good night, {name}" : "Buenas noches, {name}",
+    "Good night" : "Buenas noches",
+    "Pick from files" : "Escoger desde los archivos"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/dashboard/l10n/fa.js

@@ -11,16 +11,16 @@ OC.L10N.register(
     "Weather service" : "سامانه هواشناسی",
     "Weather" : "آب و هوا",
     "Status" : "وضعیت",
-    "Good evening, {name}" : "{name} عصرتان بخیر",
-    "Good evening" : "عصر بخیر",
-    "Good afternoon, {name}" : "{name} بعد از ظهرتان بخیر ",
-    "Good afternoon" : "بعد از ظهر بخیر",
-    "Good morning, {name}" : "{name} صبحتان بخیر",
     "Good morning" : "صبح بخیر",
+    "Good morning, {name}" : "{name} صبحتان بخیر",
+    "Good afternoon" : "بعد از ظهر بخیر",
+    "Good afternoon, {name}" : "{name} بعد از ظهرتان بخیر ",
+    "Good evening" : "عصر بخیر",
+    "Good evening, {name}" : "{name} عصرتان بخیر",
+    "Default images" : "تصاویر پیش‌فرض",
+    "Plain background" : "تصویر زمینه ساده",
     "Good night, {name}" : "{name} شبتان بخیر",
     "Good night" : "شب بخیر",
-    "Pick from files" : "از میان پرونده‌ها انتخاب کنم",
-    "Default images" : "تصاویر پیش‌فرض",
-    "Plain background" : "تصویر زمینه ساده"
+    "Pick from files" : "از میان پرونده‌ها انتخاب کنم"
 },
 "nplurals=2; plural=(n > 1);");

apps/dashboard/l10n/fa.json

@@ -9,16 +9,16 @@
     "Weather service" : "سامانه هواشناسی",
     "Weather" : "آب و هوا",
     "Status" : "وضعیت",
-    "Good evening, {name}" : "{name} عصرتان بخیر",
-    "Good evening" : "عصر بخیر",
-    "Good afternoon, {name}" : "{name} بعد از ظهرتان بخیر ",
-    "Good afternoon" : "بعد از ظهر بخیر",
-    "Good morning, {name}" : "{name} صبحتان بخیر",
     "Good morning" : "صبح بخیر",
+    "Good morning, {name}" : "{name} صبحتان بخیر",
+    "Good afternoon" : "بعد از ظهر بخیر",
+    "Good afternoon, {name}" : "{name} بعد از ظهرتان بخیر ",
+    "Good evening" : "عصر بخیر",
+    "Good evening, {name}" : "{name} عصرتان بخیر",
+    "Default images" : "تصاویر پیش‌فرض",
+    "Plain background" : "تصویر زمینه ساده",
     "Good night, {name}" : "{name} شبتان بخیر",
     "Good night" : "شب بخیر",
-    "Pick from files" : "از میان پرونده‌ها انتخاب کنم",
-    "Default images" : "تصاویر پیش‌فرض",
-    "Plain background" : "تصویر زمینه ساده"
+    "Pick from files" : "از میان پرونده‌ها انتخاب کنم"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }

apps/dashboard/l10n/fi.js

@@ -9,15 +9,15 @@ OC.L10N.register(
     "Weather data from Met.no" : "Säätiedot tarjoaa Met.no",
     "Weather" : "Sää",
     "Status" : "Tila",
-    "Good evening, {name}" : "Hyvää iltaa, {name}",
-    "Good evening" : "Hyvää iltaa",
-    "Good afternoon, {name}" : "Hyvää iltapäivää, {name}",
-    "Good afternoon" : "Hyvää iltapäivää",
-    "Good morning, {name}" : "Hyvää huomenta, {name}",
     "Good morning" : "Hyvää huomenta",
+    "Good morning, {name}" : "Hyvää huomenta, {name}",
+    "Good afternoon" : "Hyvää iltapäivää",
+    "Good afternoon, {name}" : "Hyvää iltapäivää, {name}",
+    "Good evening" : "Hyvää iltaa",
+    "Good evening, {name}" : "Hyvää iltaa, {name}",
+    "Default images" : "Oletuskuvat",
     "Good night, {name}" : "Hyvää yötä, {name}",
     "Good night" : "Hyvää yötä",
-    "Pick from files" : "Valitse tiedostoista",
-    "Default images" : "Oletuskuvat"
+    "Pick from files" : "Valitse tiedostoista"
 },
 "nplurals=2; plural=(n != 1);");

apps/dashboard/l10n/fi.json

@@ -7,15 +7,15 @@
     "Weather data from Met.no" : "Säätiedot tarjoaa Met.no",
     "Weather" : "Sää",
     "Status" : "Tila",
-    "Good evening, {name}" : "Hyvää iltaa, {name}",
-    "Good evening" : "Hyvää iltaa",
-    "Good afternoon, {name}" : "Hyvää iltapäivää, {name}",
-    "Good afternoon" : "Hyvää iltapäivää",
-    "Good morning, {name}" : "Hyvää huomenta, {name}",
     "Good morning" : "Hyvää huomenta",
+    "Good morning, {name}" : "Hyvää huomenta, {name}",
+    "Good afternoon" : "Hyvää iltapäivää",
+    "Good afternoon, {name}" : "Hyvää iltapäivää, {name}",
+    "Good evening" : "Hyvää iltaa",
+    "Good evening, {name}" : "Hyvää iltaa, {name}",
+    "Default images" : "Oletuskuvat",
     "Good night, {name}" : "Hyvää yötä, {name}",
     "Good night" : "Hyvää yötä",
-    "Pick from files" : "Valitse tiedostoista",
-    "Default images" : "Oletuskuvat"
+    "Pick from files" : "Valitse tiedostoista"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/dashboard/l10n/fr.js

@@ -13,17 +13,18 @@ OC.L10N.register(
     "Weather data from Met.no" : "Données météo fournies par Met.no",
     "Weather" : "Météo",
     "Status" : "Statut",
-    "Good evening, {name}" : "Bonsoir {name}",
-    "Good evening" : "Bonsoir",
-    "Good afternoon, {name}" : "Bon après-midi, {name}",
-    "Good afternoon" : "Bon après-midi",
-    "Good morning, {name}" : "Bonjour {name}",
     "Good morning" : "Bonjour",
-    "Good night, {name}" : "Bonne nuit {name}",
-    "Good night" : "Bonne nuit",
-    "Pick from files" : "Choisissez parmi les fichiers",
+    "Good morning, {name}" : "Bonjour {name}",
+    "Good afternoon" : "Bon après-midi",
+    "Good afternoon, {name}" : "Bon après-midi, {name}",
+    "Good evening" : "Bonsoir",
+    "Good evening, {name}" : "Bonsoir {name}",
+    "Pick from Files" : "Sélectionnez parmi les fichiers",
     "Default images" : "Images par défaut",
     "Plain background" : "Fond uni",
-    "Insert from {productName}" : "Insérer depuis {productName}"
+    "Insert from {productName}" : "Insérer depuis {productName}",
+    "Good night, {name}" : "Bonne nuit {name}",
+    "Good night" : "Bonne nuit",
+    "Pick from files" : "Choisissez parmi les fichiers"
 },
 "nplurals=2; plural=(n > 1);");

apps/dashboard/l10n/fr.json

@@ -11,17 +11,18 @@
     "Weather data from Met.no" : "Données météo fournies par Met.no",
     "Weather" : "Météo",
     "Status" : "Statut",
-    "Good evening, {name}" : "Bonsoir {name}",
-    "Good evening" : "Bonsoir",
-    "Good afternoon, {name}" : "Bon après-midi, {name}",
-    "Good afternoon" : "Bon après-midi",
-    "Good morning, {name}" : "Bonjour {name}",
     "Good morning" : "Bonjour",
-    "Good night, {name}" : "Bonne nuit {name}",
-    "Good night" : "Bonne nuit",
-    "Pick from files" : "Choisissez parmi les fichiers",
+    "Good morning, {name}" : "Bonjour {name}",
+    "Good afternoon" : "Bon après-midi",
+    "Good afternoon, {name}" : "Bon après-midi, {name}",
+    "Good evening" : "Bonsoir",
+    "Good evening, {name}" : "Bonsoir {name}",
+    "Pick from Files" : "Sélectionnez parmi les fichiers",
     "Default images" : "Images par défaut",
     "Plain background" : "Fond uni",
-    "Insert from {productName}" : "Insérer depuis {productName}"
+    "Insert from {productName}" : "Insérer depuis {productName}",
+    "Good night, {name}" : "Bonne nuit {name}",
+    "Good night" : "Bonne nuit",
+    "Pick from files" : "Choisissez parmi les fichiers"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }

apps/dashboard/l10n/gl.js

@@ -15,17 +15,20 @@ OC.L10N.register(
     "elevation data from OpenTopoData" : "datos de elevación de OpenTopoData",
     "Weather" : "Meteoroloxía",
     "Status" : "Estado",
-    "Good evening, {name}" : "Boas noites, {name}",
-    "Good evening" : "Boas noites",
-    "Good afternoon, {name}" : "Boas tardes, {name}",
-    "Good afternoon" : "Boas tardes",
-    "Good morning, {name}" : "Bos días, {name}",
     "Good morning" : "Bos días",
-    "Good night, {name}" : "Boas noites, {name}",
-    "Good night" : "Boas noites",
-    "Pick from files" : "Escolla entre os ficheiros",
+    "Good morning, {name}" : "Bos días, {name}",
+    "Good afternoon" : "Boas tardes",
+    "Good afternoon, {name}" : "Boas tardes, {name}",
+    "Good evening" : "Boas noites",
+    "Good evening, {name}" : "Boas noites, {name}",
+    "Hello" : "Hello",
+    "Hello, {name}" : "Ola, {name}",
+    "Pick from Files" : "Escolla entre os ficheiros",
     "Default images" : "Imaxes predeterminadas",
     "Plain background" : "Fondo sinxelo",
-    "Insert from {productName}" : "Inserir dende {productName}"
+    "Insert from {productName}" : "Inserir dende {productName}",
+    "Good night, {name}" : "Boas noites, {name}",
+    "Good night" : "Boas noites",
+    "Pick from files" : "Escolla entre os ficheiros"
 },
 "nplurals=2; plural=(n != 1);");

apps/dashboard/l10n/gl.json

@@ -13,17 +13,20 @@
     "elevation data from OpenTopoData" : "datos de elevación de OpenTopoData",
     "Weather" : "Meteoroloxía",
     "Status" : "Estado",
-    "Good evening, {name}" : "Boas noites, {name}",
-    "Good evening" : "Boas noites",
-    "Good afternoon, {name}" : "Boas tardes, {name}",
-    "Good afternoon" : "Boas tardes",
-    "Good morning, {name}" : "Bos días, {name}",
     "Good morning" : "Bos días",
-    "Good night, {name}" : "Boas noites, {name}",
-    "Good night" : "Boas noites",
-    "Pick from files" : "Escolla entre os ficheiros",
+    "Good morning, {name}" : "Bos días, {name}",
+    "Good afternoon" : "Boas tardes",
+    "Good afternoon, {name}" : "Boas tardes, {name}",
+    "Good evening" : "Boas noites",
+    "Good evening, {name}" : "Boas noites, {name}",
+    "Hello" : "Hello",
+    "Hello, {name}" : "Ola, {name}",
+    "Pick from Files" : "Escolla entre os ficheiros",
     "Default images" : "Imaxes predeterminadas",
     "Plain background" : "Fondo sinxelo",
-    "Insert from {productName}" : "Inserir dende {productName}"
+    "Insert from {productName}" : "Inserir dende {productName}",
+    "Good night, {name}" : "Boas noites, {name}",
+    "Good night" : "Boas noites",
+    "Pick from files" : "Escolla entre os ficheiros"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/dashboard/l10n/he.js

@@ -15,17 +15,17 @@ OC.L10N.register(
     "elevation data from OpenTopoData" : "נתוני גובה מ- OpenTopoData",
     "Weather" : "מזג אוויר",
     "Status" : "מצב",
-    "Good evening, {name}" : "ערב טוב, {name}",
-    "Good evening" : "ערב טוב",
-    "Good afternoon, {name}" : "צהריים טובים, {name}",
-    "Good afternoon" : "צהריים טובים",
-    "Good morning, {name}" : "בוקר טוב, {name}",
     "Good morning" : "בוקר טוב",
-    "Good night, {name}" : "לילה טוב, {name}",
-    "Good night" : "לילה טוב",
-    "Pick from files" : "בחר מתוך קבצים",
+    "Good morning, {name}" : "בוקר טוב, {name}",
+    "Good afternoon" : "צהריים טובים",
+    "Good afternoon, {name}" : "צהריים טובים, {name}",
+    "Good evening" : "ערב טוב",
+    "Good evening, {name}" : "ערב טוב, {name}",
     "Default images" : "תמונות ברירת מחדל",
     "Plain background" : "רקע רגיל",
-    "Insert from {productName}" : "הכנס מ-{productName}"
+    "Insert from {productName}" : "הכנס מ-{productName}",
+    "Good night, {name}" : "לילה טוב, {name}",
+    "Good night" : "לילה טוב",
+    "Pick from files" : "בחר מתוך קבצים"
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;");

apps/dashboard/l10n/he.json

@@ -13,17 +13,17 @@
     "elevation data from OpenTopoData" : "נתוני גובה מ- OpenTopoData",
     "Weather" : "מזג אוויר",
     "Status" : "מצב",
-    "Good evening, {name}" : "ערב טוב, {name}",
-    "Good evening" : "ערב טוב",
-    "Good afternoon, {name}" : "צהריים טובים, {name}",
-    "Good afternoon" : "צהריים טובים",
-    "Good morning, {name}" : "בוקר טוב, {name}",
     "Good morning" : "בוקר טוב",
-    "Good night, {name}" : "לילה טוב, {name}",
-    "Good night" : "לילה טוב",
-    "Pick from files" : "בחר מתוך קבצים",
+    "Good morning, {name}" : "בוקר טוב, {name}",
+    "Good afternoon" : "צהריים טובים",
+    "Good afternoon, {name}" : "צהריים טובים, {name}",
+    "Good evening" : "ערב טוב",
+    "Good evening, {name}" : "ערב טוב, {name}",
     "Default images" : "תמונות ברירת מחדל",
     "Plain background" : "רקע רגיל",
-    "Insert from {productName}" : "הכנס מ-{productName}"
+    "Insert from {productName}" : "הכנס מ-{productName}",
+    "Good night, {name}" : "לילה טוב, {name}",
+    "Good night" : "לילה טוב",
+    "Pick from files" : "בחר מתוך קבצים"
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;"
 }

apps/dashboard/l10n/hr.js

@@ -15,17 +15,17 @@ OC.L10N.register(
     "elevation data from OpenTopoData" : "podaci o nadmorskoj visini iz OpenTopoData",
     "Weather" : "Vrijeme",
     "Status" : "Status",
-    "Good evening, {name}" : "Dobar dan, {name}",
-    "Good evening" : "Dobar dan",
-    "Good afternoon, {name}" : "Dobar dan, {name}",
-    "Good afternoon" : "Dobar dan",
-    "Good morning, {name}" : "Dobro jutro, {name}",
     "Good morning" : "Dobro jutro",
-    "Good night, {name}" : "Dobro večer, {name}",
-    "Good night" : "Dobro večer",
-    "Pick from files" : "Odaberi iz datoteka",
+    "Good morning, {name}" : "Dobro jutro, {name}",
+    "Good afternoon" : "Dobar dan",
+    "Good afternoon, {name}" : "Dobar dan, {name}",
+    "Good evening" : "Dobar dan",
+    "Good evening, {name}" : "Dobar dan, {name}",
     "Default images" : "Zadane slike",
     "Plain background" : "Obična pozadina",
-    "Insert from {productName}" : "Umetni iz {productName}"
+    "Insert from {productName}" : "Umetni iz {productName}",
+    "Good night, {name}" : "Dobro večer, {name}",
+    "Good night" : "Dobro večer",
+    "Pick from files" : "Odaberi iz datoteka"
 },
 "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");

apps/dashboard/l10n/hr.json

@@ -13,17 +13,17 @@
     "elevation data from OpenTopoData" : "podaci o nadmorskoj visini iz OpenTopoData",
     "Weather" : "Vrijeme",
     "Status" : "Status",
-    "Good evening, {name}" : "Dobar dan, {name}",
-    "Good evening" : "Dobar dan",
-    "Good afternoon, {name}" : "Dobar dan, {name}",
-    "Good afternoon" : "Dobar dan",
-    "Good morning, {name}" : "Dobro jutro, {name}",
     "Good morning" : "Dobro jutro",
-    "Good night, {name}" : "Dobro večer, {name}",
-    "Good night" : "Dobro večer",
-    "Pick from files" : "Odaberi iz datoteka",
+    "Good morning, {name}" : "Dobro jutro, {name}",
+    "Good afternoon" : "Dobar dan",
+    "Good afternoon, {name}" : "Dobar dan, {name}",
+    "Good evening" : "Dobar dan",
+    "Good evening, {name}" : "Dobar dan, {name}",
     "Default images" : "Zadane slike",
     "Plain background" : "Obična pozadina",
-    "Insert from {productName}" : "Umetni iz {productName}"
+    "Insert from {productName}" : "Umetni iz {productName}",
+    "Good night, {name}" : "Dobro večer, {name}",
+    "Good night" : "Dobro večer",
+    "Pick from files" : "Odaberi iz datoteka"
 },"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
 }

apps/dashboard/l10n/hu.js

@@ -15,17 +15,17 @@ OC.L10N.register(
     "elevation data from OpenTopoData" : "magassági adatok az OpenTopoData-tól",
     "Weather" : "Időjárás",
     "Status" : "Állapot",
-    "Good evening, {name}" : "Jó estét, {name}",
-    "Good evening" : "Jó estét",
-    "Good afternoon, {name}" : "Jó napot, {name}",
-    "Good afternoon" : "Jó napot",
-    "Good morning, {name}" : "Jó reggelt, {name}",
     "Good morning" : "Jó reggelt",
-    "Good night, {name}" : "Jó éjszakát, {name}",
-    "Good night" : "Jó éjszakát",
-    "Pick from files" : "Választás a fájlok közül",
+    "Good morning, {name}" : "Jó reggelt, {name}",
+    "Good afternoon" : "Jó napot",
+    "Good afternoon, {name}" : "Jó napot, {name}",
+    "Good evening" : "Jó estét",
+    "Good evening, {name}" : "Jó estét, {name}",
     "Default images" : "Alapértelmezett képek",
     "Plain background" : "Egyszerű háttér",
-    "Insert from {productName}" : "Beillesztés {productName}-ból"
+    "Insert from {productName}" : "Beillesztés {productName}-ból",
+    "Good night, {name}" : "Jó éjszakát, {name}",
+    "Good night" : "Jó éjszakát",
+    "Pick from files" : "Választás a fájlok közül"
 },
 "nplurals=2; plural=(n != 1);");

apps/dashboard/l10n/hu.json

@@ -13,17 +13,17 @@
     "elevation data from OpenTopoData" : "magassági adatok az OpenTopoData-tól",
     "Weather" : "Időjárás",
     "Status" : "Állapot",
-    "Good evening, {name}" : "Jó estét, {name}",
-    "Good evening" : "Jó estét",
-    "Good afternoon, {name}" : "Jó napot, {name}",
-    "Good afternoon" : "Jó napot",
-    "Good morning, {name}" : "Jó reggelt, {name}",
     "Good morning" : "Jó reggelt",
-    "Good night, {name}" : "Jó éjszakát, {name}",
-    "Good night" : "Jó éjszakát",
-    "Pick from files" : "Választás a fájlok közül",
+    "Good morning, {name}" : "Jó reggelt, {name}",
+    "Good afternoon" : "Jó napot",
+    "Good afternoon, {name}" : "Jó napot, {name}",
+    "Good evening" : "Jó estét",
+    "Good evening, {name}" : "Jó estét, {name}",
     "Default images" : "Alapértelmezett képek",
     "Plain background" : "Egyszerű háttér",
-    "Insert from {productName}" : "Beillesztés {productName}-ból"
+    "Insert from {productName}" : "Beillesztés {productName}-ból",
+    "Good night, {name}" : "Jó éjszakát, {name}",
+    "Good night" : "Jó éjszakát",
+    "Pick from files" : "Választás a fájlok közül"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/dashboard/l10n/it.js

@@ -15,17 +15,20 @@ OC.L10N.register(
     "elevation data from OpenTopoData" : "dati di elevazione da OpenTopoData",
     "Weather" : "Meteo",
     "Status" : "Stato",
-    "Good evening, {name}" : "Buona sera, {name}",
-    "Good evening" : "Buona sera",
-    "Good afternoon, {name}" : "Buon pomeriggio, {name}",
-    "Good afternoon" : "Buon pomeriggio",
-    "Good morning, {name}" : "Buongiorno, {name}",
     "Good morning" : "Buongiorno",
-    "Good night, {name}" : "Buona notte, {name}",
-    "Good night" : "Buona notte",
-    "Pick from files" : "Scegli da file",
+    "Good morning, {name}" : "Buongiorno, {name}",
+    "Good afternoon" : "Buon pomeriggio",
+    "Good afternoon, {name}" : "Buon pomeriggio, {name}",
+    "Good evening" : "Buona sera",
+    "Good evening, {name}" : "Buona sera, {name}",
+    "Hello" : "Ciao",
+    "Hello, {name}" : "Ciao {name}",
+    "Pick from Files" : "Scegli da File",
     "Default images" : "Immagini predefinite",
     "Plain background" : "Sfondo semplice",
-    "Insert from {productName}" : "Inserisci da {productName}"
+    "Insert from {productName}" : "Inserisci da {productName}",
+    "Good night, {name}" : "Buona notte, {name}",
+    "Good night" : "Buona notte",
+    "Pick from files" : "Scegli da file"
 },
 "nplurals=2; plural=(n != 1);");

apps/dashboard/l10n/it.json

@@ -13,17 +13,20 @@
     "elevation data from OpenTopoData" : "dati di elevazione da OpenTopoData",
     "Weather" : "Meteo",
     "Status" : "Stato",
-    "Good evening, {name}" : "Buona sera, {name}",
-    "Good evening" : "Buona sera",
-    "Good afternoon, {name}" : "Buon pomeriggio, {name}",
-    "Good afternoon" : "Buon pomeriggio",
-    "Good morning, {name}" : "Buongiorno, {name}",
     "Good morning" : "Buongiorno",
-    "Good night, {name}" : "Buona notte, {name}",
-    "Good night" : "Buona notte",
-    "Pick from files" : "Scegli da file",
+    "Good morning, {name}" : "Buongiorno, {name}",
+    "Good afternoon" : "Buon pomeriggio",
+    "Good afternoon, {name}" : "Buon pomeriggio, {name}",
+    "Good evening" : "Buona sera",
+    "Good evening, {name}" : "Buona sera, {name}",
+    "Hello" : "Ciao",
+    "Hello, {name}" : "Ciao {name}",
+    "Pick from Files" : "Scegli da File",
     "Default images" : "Immagini predefinite",
     "Plain background" : "Sfondo semplice",
-    "Insert from {productName}" : "Inserisci da {productName}"
+    "Insert from {productName}" : "Inserisci da {productName}",
+    "Good night, {name}" : "Buona notte, {name}",
+    "Good night" : "Buona notte",
+    "Pick from files" : "Scegli da file"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/dashboard/l10n/lt_LT.js

@@ -15,17 +15,20 @@ OC.L10N.register(
     "elevation data from OpenTopoData" : "aukščio duomenys iš OpenTopoData",
     "Weather" : "Orai",
     "Status" : "Būsena",
-    "Good evening, {name}" : "Labas vakaras, {name}",
-    "Good evening" : "Labas vakaras",
-    "Good afternoon, {name}" : "Laba diena, {name}",
-    "Good afternoon" : "Laba diena",
-    "Good morning, {name}" : "Labas rytas, {name}",
     "Good morning" : "Labas rytas",
-    "Good night, {name}" : "Labas vakaras, {name}",
-    "Good night" : "Labas vakaras",
-    "Pick from files" : "Pasirinkti iš failų",
+    "Good morning, {name}" : "Labas rytas, {name}",
+    "Good afternoon" : "Laba diena",
+    "Good afternoon, {name}" : "Laba diena, {name}",
+    "Good evening" : "Labas vakaras",
+    "Good evening, {name}" : "Labas vakaras, {name}",
+    "Hello" : "Sveiki",
+    "Hello, {name}" : "Sveiki, {name},",
+    "Pick from Files" : "Pasirinkti iš Failų",
     "Default images" : "Numatytieji paveikslai",
     "Plain background" : "Vientisas fonas",
-    "Insert from {productName}" : "Įterpti iš {productName}"
+    "Insert from {productName}" : "Įterpti iš {productName}",
+    "Good night, {name}" : "Labas vakaras, {name}",
+    "Good night" : "Labas vakaras",
+    "Pick from files" : "Pasirinkti iš failų"
 },
 "nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);");

apps/dashboard/l10n/lt_LT.json

@@ -13,17 +13,20 @@
     "elevation data from OpenTopoData" : "aukščio duomenys iš OpenTopoData",
     "Weather" : "Orai",
     "Status" : "Būsena",
-    "Good evening, {name}" : "Labas vakaras, {name}",
-    "Good evening" : "Labas vakaras",
-    "Good afternoon, {name}" : "Laba diena, {name}",
-    "Good afternoon" : "Laba diena",
-    "Good morning, {name}" : "Labas rytas, {name}",
     "Good morning" : "Labas rytas",
-    "Good night, {name}" : "Labas vakaras, {name}",
-    "Good night" : "Labas vakaras",
-    "Pick from files" : "Pasirinkti iš failų",
+    "Good morning, {name}" : "Labas rytas, {name}",
+    "Good afternoon" : "Laba diena",
+    "Good afternoon, {name}" : "Laba diena, {name}",
+    "Good evening" : "Labas vakaras",
+    "Good evening, {name}" : "Labas vakaras, {name}",
+    "Hello" : "Sveiki",
+    "Hello, {name}" : "Sveiki, {name},",
+    "Pick from Files" : "Pasirinkti iš Failų",
     "Default images" : "Numatytieji paveikslai",
     "Plain background" : "Vientisas fonas",
-    "Insert from {productName}" : "Įterpti iš {productName}"
+    "Insert from {productName}" : "Įterpti iš {productName}",
+    "Good night, {name}" : "Labas vakaras, {name}",
+    "Good night" : "Labas vakaras",
+    "Pick from files" : "Pasirinkti iš failų"
 },"pluralForm" :"nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);"
 }

apps/dashboard/l10n/mk.js

@@ -15,17 +15,17 @@ OC.L10N.register(
     "elevation data from OpenTopoData" : "Податоци за височина од OpenTopoData",
     "Weather" : "Временска прогноза",
     "Status" : "Статус",
-    "Good evening, {name}" : "Добровечер, {name}",
-    "Good evening" : "Добровечер",
-    "Good afternoon, {name}" : "Добар ден, {name}",
-    "Good afternoon" : "Добар ден",
-    "Good morning, {name}" : "Добро утро, {name}",
     "Good morning" : "Добро утро",
-    "Good night, {name}" : "Добра ноќ, {name}",
-    "Good night" : "Добра ноќ",
-    "Pick from files" : "Избери од датотеките",
+    "Good morning, {name}" : "Добро утро, {name}",
+    "Good afternoon" : "Добар ден",
+    "Good afternoon, {name}" : "Добар ден, {name}",
+    "Good evening" : "Добровечер",
+    "Good evening, {name}" : "Добровечер, {name}",
     "Default images" : "Стандардни слики",
     "Plain background" : "Обична позадина",
-    "Insert from {productName}" : "Вметнни од {productName}"
+    "Insert from {productName}" : "Вметнни од {productName}",
+    "Good night, {name}" : "Добра ноќ, {name}",
+    "Good night" : "Добра ноќ",
+    "Pick from files" : "Избери од датотеките"
 },
 "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");

apps/dashboard/l10n/mk.json

@@ -13,17 +13,17 @@
     "elevation data from OpenTopoData" : "Податоци за височина од OpenTopoData",
     "Weather" : "Временска прогноза",
     "Status" : "Статус",
-    "Good evening, {name}" : "Добровечер, {name}",
-    "Good evening" : "Добровечер",
-    "Good afternoon, {name}" : "Добар ден, {name}",
-    "Good afternoon" : "Добар ден",
-    "Good morning, {name}" : "Добро утро, {name}",
     "Good morning" : "Добро утро",
-    "Good night, {name}" : "Добра ноќ, {name}",
-    "Good night" : "Добра ноќ",
-    "Pick from files" : "Избери од датотеките",
+    "Good morning, {name}" : "Добро утро, {name}",
+    "Good afternoon" : "Добар ден",
+    "Good afternoon, {name}" : "Добар ден, {name}",
+    "Good evening" : "Добровечер",
+    "Good evening, {name}" : "Добровечер, {name}",
     "Default images" : "Стандардни слики",
     "Plain background" : "Обична позадина",
-    "Insert from {productName}" : "Вметнни од {productName}"
+    "Insert from {productName}" : "Вметнни од {productName}",
+    "Good night, {name}" : "Добра ноќ, {name}",
+    "Good night" : "Добра ноќ",
+    "Pick from files" : "Избери од датотеките"
 },"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
 }

apps/dashboard/l10n/nl.js

@@ -15,17 +15,18 @@ OC.L10N.register(
     "elevation data from OpenTopoData" : "hellingsdata via OpenTopoData",
     "Weather" : "Weer",
     "Status" : "Status",
-    "Good evening, {name}" : "Goedenavond, {name}",
-    "Good evening" : "Goedenavond",
-    "Good afternoon, {name}" : "Goedemiddag, {name}",
-    "Good afternoon" : "Goedemiddag",
-    "Good morning, {name}" : "Goedemorgen, {name}",
     "Good morning" : "Goedemorgen",
-    "Good night, {name}" : "Goedenacht, {name}",
-    "Good night" : "Goedenacht",
-    "Pick from files" : "Kies uit bestanden",
+    "Good morning, {name}" : "Goedemorgen, {name}",
+    "Good afternoon" : "Goedemiddag",
+    "Good afternoon, {name}" : "Goedemiddag, {name}",
+    "Good evening" : "Goedenavond",
+    "Good evening, {name}" : "Goedenavond, {name}",
+    "Pick from Files" : "Kies uit Bestanden",
     "Default images" : "Standaardafbeeldingen",
     "Plain background" : "Kale achtergrond",
-    "Insert from {productName}" : "Invoegen vanuit {productName}"
+    "Insert from {productName}" : "Invoegen vanuit {productName}",
+    "Good night, {name}" : "Goedenacht, {name}",
+    "Good night" : "Goedenacht",
+    "Pick from files" : "Kies uit bestanden"
 },
 "nplurals=2; plural=(n != 1);");

apps/dashboard/l10n/nl.json

@@ -13,17 +13,18 @@
     "elevation data from OpenTopoData" : "hellingsdata via OpenTopoData",
     "Weather" : "Weer",
     "Status" : "Status",
-    "Good evening, {name}" : "Goedenavond, {name}",
-    "Good evening" : "Goedenavond",
-    "Good afternoon, {name}" : "Goedemiddag, {name}",
-    "Good afternoon" : "Goedemiddag",
-    "Good morning, {name}" : "Goedemorgen, {name}",
     "Good morning" : "Goedemorgen",
-    "Good night, {name}" : "Goedenacht, {name}",
-    "Good night" : "Goedenacht",
-    "Pick from files" : "Kies uit bestanden",
+    "Good morning, {name}" : "Goedemorgen, {name}",
+    "Good afternoon" : "Goedemiddag",
+    "Good afternoon, {name}" : "Goedemiddag, {name}",
+    "Good evening" : "Goedenavond",
+    "Good evening, {name}" : "Goedenavond, {name}",
+    "Pick from Files" : "Kies uit Bestanden",
     "Default images" : "Standaardafbeeldingen",
     "Plain background" : "Kale achtergrond",
-    "Insert from {productName}" : "Invoegen vanuit {productName}"
+    "Insert from {productName}" : "Invoegen vanuit {productName}",
+    "Good night, {name}" : "Goedenacht, {name}",
+    "Good night" : "Goedenacht",
+    "Pick from files" : "Kies uit bestanden"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/dashboard/l10n/pl.js

@@ -15,17 +15,20 @@ OC.L10N.register(
     "elevation data from OpenTopoData" : "dane wysokościowe z OpenTopoData",
     "Weather" : "Pogoda",
     "Status" : "Status",
-    "Good evening, {name}" : "Dobry wieczór, {name}",
-    "Good evening" : "Dobry wieczór",
-    "Good afternoon, {name}" : "Dzień dobry, {name}",
-    "Good afternoon" : "Dzień dobry",
-    "Good morning, {name}" : "Dzień dobry, {name}",
     "Good morning" : "Dzień dobry",
-    "Good night, {name}" : "Dobranoc, {name}",
-    "Good night" : "Dobranoc",
-    "Pick from files" : "Wybierz z Plików",
+    "Good morning, {name}" : "Dzień dobry, {name}",
+    "Good afternoon" : "Dzień dobry",
+    "Good afternoon, {name}" : "Dzień dobry, {name}",
+    "Good evening" : "Dobry wieczór",
+    "Good evening, {name}" : "Dobry wieczór, {name}",
+    "Hello" : "Witaj",
+    "Hello, {name}" : "Witaj, {name}",
+    "Pick from Files" : "Wybierz z Plików",
     "Default images" : "Obrazy domyślne",
     "Plain background" : "Zwykłe tło",
-    "Insert from {productName}" : "Wstaw z {productName}"
+    "Insert from {productName}" : "Wstaw z {productName}",
+    "Good night, {name}" : "Dobranoc, {name}",
+    "Good night" : "Dobranoc",
+    "Pick from files" : "Wybierz z Plików"
 },
 "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);");

apps/dashboard/l10n/pl.json

@@ -13,17 +13,20 @@
     "elevation data from OpenTopoData" : "dane wysokościowe z OpenTopoData",
     "Weather" : "Pogoda",
     "Status" : "Status",
-    "Good evening, {name}" : "Dobry wieczór, {name}",
-    "Good evening" : "Dobry wieczór",
-    "Good afternoon, {name}" : "Dzień dobry, {name}",
-    "Good afternoon" : "Dzień dobry",
-    "Good morning, {name}" : "Dzień dobry, {name}",
     "Good morning" : "Dzień dobry",
-    "Good night, {name}" : "Dobranoc, {name}",
-    "Good night" : "Dobranoc",
-    "Pick from files" : "Wybierz z Plików",
+    "Good morning, {name}" : "Dzień dobry, {name}",
+    "Good afternoon" : "Dzień dobry",
+    "Good afternoon, {name}" : "Dzień dobry, {name}",
+    "Good evening" : "Dobry wieczór",
+    "Good evening, {name}" : "Dobry wieczór, {name}",
+    "Hello" : "Witaj",
+    "Hello, {name}" : "Witaj, {name}",
+    "Pick from Files" : "Wybierz z Plików",
     "Default images" : "Obrazy domyślne",
     "Plain background" : "Zwykłe tło",
-    "Insert from {productName}" : "Wstaw z {productName}"
+    "Insert from {productName}" : "Wstaw z {productName}",
+    "Good night, {name}" : "Dobranoc, {name}",
+    "Good night" : "Dobranoc",
+    "Pick from files" : "Wybierz z Plików"
 },"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);"
 }

apps/dashboard/l10n/pt_BR.js

@@ -15,17 +15,17 @@ OC.L10N.register(
     "elevation data from OpenTopoData" : "dados topográficos de OpenTopoData",
     "Weather" : "Clima",
     "Status" : "Status",
-    "Good evening, {name}" : "Boa noite, {name}",
-    "Good evening" : "Boa noite",
-    "Good afternoon, {name}" : "Boa tarde, {name}",
-    "Good afternoon" : "Boa tarde",
-    "Good morning, {name}" : "Bom dia, {name}",
     "Good morning" : "Bom dia",
-    "Good night, {name}" : "Boa noite, {name}",
-    "Good night" : "Boa noite",
-    "Pick from files" : "Escolher de Arquivos",
+    "Good morning, {name}" : "Bom dia, {name}",
+    "Good afternoon" : "Boa tarde",
+    "Good afternoon, {name}" : "Boa tarde, {name}",
+    "Good evening" : "Boa noite",
+    "Good evening, {name}" : "Boa noite, {name}",
     "Default images" : "Imagens padrão",
     "Plain background" : "Fundo simples",
-    "Insert from {productName}" : "Inserir de {productName}"
+    "Insert from {productName}" : "Inserir de {productName}",
+    "Good night, {name}" : "Boa noite, {name}",
+    "Good night" : "Boa noite",
+    "Pick from files" : "Escolher de Arquivos"
 },
 "nplurals=2; plural=(n > 1);");

apps/dashboard/l10n/pt_BR.json

@@ -13,17 +13,17 @@
     "elevation data from OpenTopoData" : "dados topográficos de OpenTopoData",
     "Weather" : "Clima",
     "Status" : "Status",
-    "Good evening, {name}" : "Boa noite, {name}",
-    "Good evening" : "Boa noite",
-    "Good afternoon, {name}" : "Boa tarde, {name}",
-    "Good afternoon" : "Boa tarde",
-    "Good morning, {name}" : "Bom dia, {name}",
     "Good morning" : "Bom dia",
-    "Good night, {name}" : "Boa noite, {name}",
-    "Good night" : "Boa noite",
-    "Pick from files" : "Escolher de Arquivos",
+    "Good morning, {name}" : "Bom dia, {name}",
+    "Good afternoon" : "Boa tarde",
+    "Good afternoon, {name}" : "Boa tarde, {name}",
+    "Good evening" : "Boa noite",
+    "Good evening, {name}" : "Boa noite, {name}",
     "Default images" : "Imagens padrão",
     "Plain background" : "Fundo simples",
-    "Insert from {productName}" : "Inserir de {productName}"
+    "Insert from {productName}" : "Inserir de {productName}",
+    "Good night, {name}" : "Boa noite, {name}",
+    "Good night" : "Boa noite",
+    "Pick from files" : "Escolher de Arquivos"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }

apps/dashboard/l10n/ru.js

@@ -15,17 +15,17 @@ OC.L10N.register(
     "elevation data from OpenTopoData" : "данные о высоте из OpenTopoData",
     "Weather" : "Прогноз погоды",
     "Status" : "Состояние",
-    "Good evening, {name}" : "Добрый вечер, {name}",
-    "Good evening" : "Добрый вечер",
-    "Good afternoon, {name}" : "Добрый день, {name}",
-    "Good afternoon" : "Добрый день",
-    "Good morning, {name}" : "Доброе утро, {name}",
     "Good morning" : "Доброе утро",
-    "Good night, {name}" : "Доброй ночи, {name}",
-    "Good night" : "Доброй ночи",
-    "Pick from files" : "Выбрать из файлов",
+    "Good morning, {name}" : "Доброе утро, {name}",
+    "Good afternoon" : "Добрый день",
+    "Good afternoon, {name}" : "Добрый день, {name}",
+    "Good evening" : "Добрый вечер",
+    "Good evening, {name}" : "Добрый вечер, {name}",
     "Default images" : "Изображения по умолчанию",
     "Plain background" : "Обычный фон",
-    "Insert from {productName}" : "Вставить из {productName}"
+    "Insert from {productName}" : "Вставить из {productName}",
+    "Good night, {name}" : "Доброй ночи, {name}",
+    "Good night" : "Доброй ночи",
+    "Pick from files" : "Выбрать из файлов"
 },
 "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);");

apps/dashboard/l10n/ru.json

@@ -13,17 +13,17 @@
     "elevation data from OpenTopoData" : "данные о высоте из OpenTopoData",
     "Weather" : "Прогноз погоды",
     "Status" : "Состояние",
-    "Good evening, {name}" : "Добрый вечер, {name}",
-    "Good evening" : "Добрый вечер",
-    "Good afternoon, {name}" : "Добрый день, {name}",
-    "Good afternoon" : "Добрый день",
-    "Good morning, {name}" : "Доброе утро, {name}",
     "Good morning" : "Доброе утро",
-    "Good night, {name}" : "Доброй ночи, {name}",
-    "Good night" : "Доброй ночи",
-    "Pick from files" : "Выбрать из файлов",
+    "Good morning, {name}" : "Доброе утро, {name}",
+    "Good afternoon" : "Добрый день",
+    "Good afternoon, {name}" : "Добрый день, {name}",
+    "Good evening" : "Добрый вечер",
+    "Good evening, {name}" : "Добрый вечер, {name}",
     "Default images" : "Изображения по умолчанию",
     "Plain background" : "Обычный фон",
-    "Insert from {productName}" : "Вставить из {productName}"
+    "Insert from {productName}" : "Вставить из {productName}",
+    "Good night, {name}" : "Доброй ночи, {name}",
+    "Good night" : "Доброй ночи",
+    "Pick from files" : "Выбрать из файлов"
 },"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);"
 }

apps/dashboard/l10n/sk.js

@@ -12,8 +12,8 @@ OC.L10N.register(
     "Good morning" : "Dobré ráno",
     "Good night, {name}" : "Dobrý večer, {name}",
     "Good night" : "Dobrý večer",
-    "Pick from files" : "Vybrať zo súborov",
     "Default images" : "Predvolené obrázky",
-    "Insert from {productName}" : "Vložiť z {productName}"
+    "Insert from {productName}" : "Vložiť z {productName}",
+    "Pick from files" : "Vybrať zo súborov"
 },
 "nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);");

apps/dashboard/l10n/sk.json

@@ -10,8 +10,8 @@
     "Good morning" : "Dobré ráno",
     "Good night, {name}" : "Dobrý večer, {name}",
     "Good night" : "Dobrý večer",
-    "Pick from files" : "Vybrať zo súborov",
     "Default images" : "Predvolené obrázky",
-    "Insert from {productName}" : "Vložiť z {productName}"
+    "Insert from {productName}" : "Vložiť z {productName}",
+    "Pick from files" : "Vybrať zo súborov"
 },"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);"
 }

apps/dashboard/l10n/sl.js

@@ -15,17 +15,17 @@ OC.L10N.register(
     "elevation data from OpenTopoData" : "podatke nadmorske višine OpenTopoData",
     "Weather" : "Vreme",
     "Status" : "Stanje",
-    "Good evening, {name}" : "Dober večer, {name}",
-    "Good evening" : "Dober večer",
-    "Good afternoon, {name}" : "Dober dan, {name}",
-    "Good afternoon" : "Dober dan",
-    "Good morning, {name}" : "Dobro jutro, {name}",
     "Good morning" : "Dobro jutro",
-    "Good night, {name}" : "Lahko noč, {name}",
-    "Good night" : "Lahko noč",
-    "Pick from files" : "Izbor iz datotek",
+    "Good morning, {name}" : "Dobro jutro, {name}",
+    "Good afternoon" : "Dober dan",
+    "Good afternoon, {name}" : "Dober dan, {name}",
+    "Good evening" : "Dober večer",
+    "Good evening, {name}" : "Dober večer, {name}",
     "Default images" : "Privzete slike",
     "Plain background" : "Enostavno ozadje",
-    "Insert from {productName}" : "Vstavi iz {productName}"
+    "Insert from {productName}" : "Vstavi iz {productName}",
+    "Good night, {name}" : "Lahko noč, {name}",
+    "Good night" : "Lahko noč",
+    "Pick from files" : "Izbor iz datotek"
 },
 "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");

apps/dashboard/l10n/sl.json

@@ -13,17 +13,17 @@
     "elevation data from OpenTopoData" : "podatke nadmorske višine OpenTopoData",
     "Weather" : "Vreme",
     "Status" : "Stanje",
-    "Good evening, {name}" : "Dober večer, {name}",
-    "Good evening" : "Dober večer",
-    "Good afternoon, {name}" : "Dober dan, {name}",
-    "Good afternoon" : "Dober dan",
-    "Good morning, {name}" : "Dobro jutro, {name}",
     "Good morning" : "Dobro jutro",
-    "Good night, {name}" : "Lahko noč, {name}",
-    "Good night" : "Lahko noč",
-    "Pick from files" : "Izbor iz datotek",
+    "Good morning, {name}" : "Dobro jutro, {name}",
+    "Good afternoon" : "Dober dan",
+    "Good afternoon, {name}" : "Dober dan, {name}",
+    "Good evening" : "Dober večer",
+    "Good evening, {name}" : "Dober večer, {name}",
     "Default images" : "Privzete slike",
     "Plain background" : "Enostavno ozadje",
-    "Insert from {productName}" : "Vstavi iz {productName}"
+    "Insert from {productName}" : "Vstavi iz {productName}",
+    "Good night, {name}" : "Lahko noč, {name}",
+    "Good night" : "Lahko noč",
+    "Pick from files" : "Izbor iz datotek"
 },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
 }

apps/dashboard/l10n/sv.js

@@ -15,17 +15,17 @@ OC.L10N.register(
     "elevation data from OpenTopoData" : "höjddata från OpenTopoData",
     "Weather" : "Väder",
     "Status" : "Status",
-    "Good evening, {name}" : "God kväll, {name}",
-    "Good evening" : "God kväll",
-    "Good afternoon, {name}" : "God eftermiddag, {name}",
-    "Good afternoon" : "God eftermiddag",
-    "Good morning, {name}" : "God morgon, {name}",
     "Good morning" : "God morgon",
-    "Good night, {name}" : "Godnatt, {name}",
-    "Good night" : "Godnatt",
-    "Pick from files" : "Välj från filer",
+    "Good morning, {name}" : "God morgon, {name}",
+    "Good afternoon" : "God eftermiddag",
+    "Good afternoon, {name}" : "God eftermiddag, {name}",
+    "Good evening" : "God kväll",
+    "Good evening, {name}" : "God kväll, {name}",
     "Default images" : "Standardbilder",
     "Plain background" : "Enkel bakgrund",
-    "Insert from {productName}" : "Infoga från {productName}"
+    "Insert from {productName}" : "Infoga från {productName}",
+    "Good night, {name}" : "Godnatt, {name}",
+    "Good night" : "Godnatt",
+    "Pick from files" : "Välj från filer"
 },
 "nplurals=2; plural=(n != 1);");

apps/dashboard/l10n/sv.json

@@ -13,17 +13,17 @@
     "elevation data from OpenTopoData" : "höjddata från OpenTopoData",
     "Weather" : "Väder",
     "Status" : "Status",
-    "Good evening, {name}" : "God kväll, {name}",
-    "Good evening" : "God kväll",
-    "Good afternoon, {name}" : "God eftermiddag, {name}",
-    "Good afternoon" : "God eftermiddag",
-    "Good morning, {name}" : "God morgon, {name}",
     "Good morning" : "God morgon",
-    "Good night, {name}" : "Godnatt, {name}",
-    "Good night" : "Godnatt",
-    "Pick from files" : "Välj från filer",
+    "Good morning, {name}" : "God morgon, {name}",
+    "Good afternoon" : "God eftermiddag",
+    "Good afternoon, {name}" : "God eftermiddag, {name}",
+    "Good evening" : "God kväll",
+    "Good evening, {name}" : "God kväll, {name}",
     "Default images" : "Standardbilder",
     "Plain background" : "Enkel bakgrund",
-    "Insert from {productName}" : "Infoga från {productName}"
+    "Insert from {productName}" : "Infoga från {productName}",
+    "Good night, {name}" : "Godnatt, {name}",
+    "Good night" : "Godnatt",
+    "Pick from files" : "Välj från filer"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/dashboard/l10n/th.js

@@ -0,0 +1,31 @@
+OC.L10N.register(
+    "dashboard",
+    {
+    "Dashboard" : "แดชบอร์ด",
+    "Dashboard app" : "แอปแดชบอร์ด",
+    "Show something" : "แสดงบางอย่าง",
+    "Customize" : "ปรับแต่ง",
+    "Edit widgets" : "แก้ไข วิดเจ็ต",
+    "Get more widgets from the 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}",
+    "Default images" : "รูปภาพเริ่มต้น",
+    "Plain background" : "พื้นหลังธรรมดา",
+    "Insert from {productName}" : "แทรกจาก {productName}",
+    "Good night, {name}" : "ราตรีสวัสดิ์ {name}",
+    "Good night" : "ราตรีสวัสดิ์",
+    "Pick from files" : "เลือกจากไฟล์"
+},
+"nplurals=1; plural=0;");

apps/dashboard/l10n/th.json

@@ -0,0 +1,29 @@
+{ "translations": {
+    "Dashboard" : "แดชบอร์ด",
+    "Dashboard app" : "แอปแดชบอร์ด",
+    "Show something" : "แสดงบางอย่าง",
+    "Customize" : "ปรับแต่ง",
+    "Edit widgets" : "แก้ไข วิดเจ็ต",
+    "Get more widgets from the 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}",
+    "Default images" : "รูปภาพเริ่มต้น",
+    "Plain background" : "พื้นหลังธรรมดา",
+    "Insert from {productName}" : "แทรกจาก {productName}",
+    "Good night, {name}" : "ราตรีสวัสดิ์ {name}",
+    "Good night" : "ราตรีสวัสดิ์",
+    "Pick from files" : "เลือกจากไฟล์"
+},"pluralForm" :"nplurals=1; plural=0;"
+}

apps/dashboard/l10n/tr.js

@@ -15,17 +15,18 @@ OC.L10N.register(
     "elevation data from OpenTopoData" : "yükseklik verileri OpenTopoData tarafından sağlanıyor",
     "Weather" : "Hava Durumu",
     "Status" : "Durum",
-    "Good evening, {name}" : "İyi geceler, {name}",
-    "Good evening" : "İyi geceler",
-    "Good afternoon, {name}" : "Tünaydın, {name}",
-    "Good afternoon" : "Tünaydın",
-    "Good morning, {name}" : "Günaydın, {name}",
     "Good morning" : "Günaydın",
-    "Good night, {name}" : "İyi geceler, {name}",
-    "Good night" : "İyi geceler",
-    "Pick from files" : "Dosyalardan seçin",
+    "Good morning, {name}" : "Günaydın, {name}",
+    "Good afternoon" : "Tünaydın",
+    "Good afternoon, {name}" : "Tünaydın, {name}",
+    "Good evening" : "İyi geceler",
+    "Good evening, {name}" : "İyi geceler, {name}",
+    "Pick from Files" : "Dosyalardan Seçin",
     "Default images" : "Varsayılan görseller",
     "Plain background" : "Düz arka plan",
-    "Insert from {productName}" : "{productName} üzerinden ekle"
+    "Insert from {productName}" : "{productName} üzerinden ekle",
+    "Good night, {name}" : "İyi geceler, {name}",
+    "Good night" : "İyi geceler",
+    "Pick from files" : "Dosyalardan seçin"
 },
 "nplurals=2; plural=(n > 1);");

apps/dashboard/l10n/tr.json

@@ -13,17 +13,18 @@
     "elevation data from OpenTopoData" : "yükseklik verileri OpenTopoData tarafından sağlanıyor",
     "Weather" : "Hava Durumu",
     "Status" : "Durum",
-    "Good evening, {name}" : "İyi geceler, {name}",
-    "Good evening" : "İyi geceler",
-    "Good afternoon, {name}" : "Tünaydın, {name}",
-    "Good afternoon" : "Tünaydın",
-    "Good morning, {name}" : "Günaydın, {name}",
     "Good morning" : "Günaydın",
-    "Good night, {name}" : "İyi geceler, {name}",
-    "Good night" : "İyi geceler",
-    "Pick from files" : "Dosyalardan seçin",
+    "Good morning, {name}" : "Günaydın, {name}",
+    "Good afternoon" : "Tünaydın",
+    "Good afternoon, {name}" : "Tünaydın, {name}",
+    "Good evening" : "İyi geceler",
+    "Good evening, {name}" : "İyi geceler, {name}",
+    "Pick from Files" : "Dosyalardan Seçin",
     "Default images" : "Varsayılan görseller",
     "Plain background" : "Düz arka plan",
-    "Insert from {productName}" : "{productName} üzerinden ekle"
+    "Insert from {productName}" : "{productName} üzerinden ekle",
+    "Good night, {name}" : "İyi geceler, {name}",
+    "Good night" : "İyi geceler",
+    "Pick from files" : "Dosyalardan seçin"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }

apps/dashboard/l10n/zh_CN.js

@@ -15,17 +15,20 @@ OC.L10N.register(
     "elevation data from OpenTopoData" : "海拔数据获取自 OpenTopoData",
     "Weather" : "天气",
     "Status" : "状态",
-    "Good evening, {name}" : "晚上好，{name}",
-    "Good evening" : "晚上好",
-    "Good afternoon, {name}" : "下午好，{name}",
-    "Good afternoon" : "下午好",
-    "Good morning, {name}" : "早上好，{name}",
     "Good morning" : "早上好",
-    "Good night, {name}" : "晚安，{name}",
-    "Good night" : "晚安",
-    "Pick from files" : "从文件选取",
+    "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} 插入"
+    "Insert from {productName}" : "从 {productName} 插入",
+    "Good night, {name}" : "晚安，{name}",
+    "Good night" : "晚安",
+    "Pick from files" : "从文件选取"
 },
 "nplurals=1; plural=0;");

apps/dashboard/l10n/zh_CN.json

@@ -13,17 +13,20 @@
     "elevation data from OpenTopoData" : "海拔数据获取自 OpenTopoData",
     "Weather" : "天气",
     "Status" : "状态",
-    "Good evening, {name}" : "晚上好，{name}",
-    "Good evening" : "晚上好",
-    "Good afternoon, {name}" : "下午好，{name}",
-    "Good afternoon" : "下午好",
-    "Good morning, {name}" : "早上好，{name}",
     "Good morning" : "早上好",
-    "Good night, {name}" : "晚安，{name}",
-    "Good night" : "晚安",
-    "Pick from files" : "从文件选取",
+    "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} 插入"
+    "Insert from {productName}" : "从 {productName} 插入",
+    "Good night, {name}" : "晚安，{name}",
+    "Good night" : "晚安",
+    "Pick from files" : "从文件选取"
 },"pluralForm" :"nplurals=1; plural=0;"
 }

apps/dashboard/l10n/zh_TW.js

@@ -8,19 +8,21 @@ OC.L10N.register(
     "Get more widgets from the app store" : "從應用商店取得更多小工具",
     "Change background image" : "變更背景圖片",
     "Weather service" : "天氣服務",
+    "Weather data from Met.no" : "氣象資訊來自 Met.no",
     "Weather" : "天氣",
     "Status" : "狀態",
-    "Good evening, {name}" : "早安，{name}",
-    "Good evening" : "下午好",
-    "Good afternoon, {name}" : "午安，{name}",
-    "Good afternoon" : "午安",
-    "Good morning, {name}" : "早安，{name}",
     "Good morning" : "早安",
-    "Good night, {name}" : "晚安，{name}",
-    "Good night" : "晚安",
-    "Pick from files" : "從檔案選取",
+    "Good morning, {name}" : "早安，{name}",
+    "Good afternoon" : "午安",
+    "Good afternoon, {name}" : "午安，{name}",
+    "Good evening" : "下午好",
+    "Good evening, {name}" : "早安，{name}",
+    "Pick from Files" : "從檔案選取",
     "Default images" : "預設圖片",
     "Plain background" : "簡單背景",
-    "Insert from {productName}" : "插入自 {productName}"
+    "Insert from {productName}" : "插入自 {productName}",
+    "Good night, {name}" : "晚安，{name}",
+    "Good night" : "晚安",
+    "Pick from files" : "從檔案選取"
 },
 "nplurals=1; plural=0;");

apps/dashboard/l10n/zh_TW.json

@@ -6,19 +6,21 @@
     "Get more widgets from the app store" : "從應用商店取得更多小工具",
     "Change background image" : "變更背景圖片",
     "Weather service" : "天氣服務",
+    "Weather data from Met.no" : "氣象資訊來自 Met.no",
     "Weather" : "天氣",
     "Status" : "狀態",
-    "Good evening, {name}" : "早安，{name}",
-    "Good evening" : "下午好",
-    "Good afternoon, {name}" : "午安，{name}",
-    "Good afternoon" : "午安",
-    "Good morning, {name}" : "早安，{name}",
     "Good morning" : "早安",
-    "Good night, {name}" : "晚安，{name}",
-    "Good night" : "晚安",
-    "Pick from files" : "從檔案選取",
+    "Good morning, {name}" : "早安，{name}",
+    "Good afternoon" : "午安",
+    "Good afternoon, {name}" : "午安，{name}",
+    "Good evening" : "下午好",
+    "Good evening, {name}" : "早安，{name}",
+    "Pick from Files" : "從檔案選取",
     "Default images" : "預設圖片",
     "Plain background" : "簡單背景",
-    "Insert from {productName}" : "插入自 {productName}"
+    "Insert from {productName}" : "插入自 {productName}",
+    "Good night, {name}" : "晚安，{name}",
+    "Good night" : "晚安",
+    "Pick from files" : "從檔案選取"
 },"pluralForm" :"nplurals=1; plural=0;"
 }

apps/dashboard/src/App.vue

@@ -163,18 +163,43 @@ export default {
 		},
 		greeting() {
 			const time = this.timer.getHours()
-			const shouldShowName = this.displayName && this.uid !== this.displayName
 
-			if (time > 18) {
-				return { text: shouldShowName ? t('dashboard', 'Good evening, {name}', { name: this.displayName }) : t('dashboard', 'Good evening') }
+			// Determine part of the day
+			let partOfDay
+			if (time >= 22 && time < 5) {
+				partOfDay = 'night'
+			} else if (time >= 18) {
+				partOfDay = 'evening'
+			} else if (time >= 12) {
+				partOfDay = 'afternoon'
+			} else {
+				partOfDay = 'morning'
 			}
-			if (time > 12) {
-				return { text: shouldShowName ? t('dashboard', 'Good afternoon, {name}', { name: this.displayName }) : t('dashboard', 'Good afternoon') }
+
+			// Define the greetings
+			const good = {
+				morning: {
+					generic: t('dashboard', 'Good morning'),
+					withName: t('dashboard', 'Good morning, {name}', { name: this.displayName }),
+				},
+				afternoon: {
+					generic: t('dashboard', 'Good afternoon'),
+					withName: t('dashboard', 'Good afternoon, {name}', { name: this.displayName }),
+				},
+				evening: {
+					generic: t('dashboard', 'Good evening'),
+					withName: t('dashboard', 'Good evening, {name}', { name: this.displayName }),
+				},
+				night: {
+					// Don't use "Good night" as it's not a greeting
+					generic: t('dashboard', 'Hello'),
+					withName: t('dashboard', 'Hello, {name}', { name: this.displayName }),
+				},
 			}
-			if (time > 5) {
-				return { text: shouldShowName ? t('dashboard', 'Good morning, {name}', { name: this.displayName }) : t('dashboard', 'Good morning') }
-			}
-			return { text: shouldShowName ? t('dashboard', 'Good night, {name}', { name: this.displayName }) : t('dashboard', 'Good night') }
+
+			// Figure out which greeting to show
+			const shouldShowName = this.displayName && this.uid !== this.displayName
+			return { text: shouldShowName ? good[partOfDay].withName : good[partOfDay].generic }
 		},
 		isActive() {
 			return (panel) => this.layout.indexOf(panel.id) > -1

apps/dashboard/src/components/BackgroundSettings.vue

@@ -26,7 +26,7 @@
 			:class="{ active: background === 'custom' }"
 			tabindex="0"
 			@click="pickFile">
-			{{ t('dashboard', 'Pick from files') }}
+			{{ t('dashboard', 'Pick from Files') }}
 		</button>
 		<button class="background default"
 			tabindex="0"

apps/dav/appinfo/info.xml

@@ -32,6 +32,7 @@
 			<step>OCA\DAV\Migration\RegenerateBirthdayCalendars</step>
 			<step>OCA\DAV\Migration\CalDAVRemoveEmptyValue</step>
 			<step>OCA\DAV\Migration\BuildCalendarSearchIndex</step>
+			<step>OCA\DAV\Migration\BuildSocialSearchIndex</step>
 			<step>OCA\DAV\Migration\RefreshWebcalJobRegistrar</step>
 			<step>OCA\DAV\Migration\RegisterBuildReminderIndexBackgroundJob</step>
 			<step>OCA\DAV\Migration\RemoveOrphanEventsAndContacts</step>

apps/dav/composer/composer/autoload_classmap.php

@@ -206,6 +206,8 @@ return array(
     'OCA\\DAV\\HookManager' => $baseDir . '/../lib/HookManager.php',
     'OCA\\DAV\\Migration\\BuildCalendarSearchIndex' => $baseDir . '/../lib/Migration/BuildCalendarSearchIndex.php',
     'OCA\\DAV\\Migration\\BuildCalendarSearchIndexBackgroundJob' => $baseDir . '/../lib/Migration/BuildCalendarSearchIndexBackgroundJob.php',
+    'OCA\\DAV\\Migration\\BuildSocialSearchIndex' => $baseDir . '/../lib/Migration/BuildSocialSearchIndex.php',
+    'OCA\\DAV\\Migration\\BuildSocialSearchIndexBackgroundJob' => $baseDir . '/../lib/Migration/BuildSocialSearchIndexBackgroundJob.php',
     'OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue' => $baseDir . '/../lib/Migration/CalDAVRemoveEmptyValue.php',
     'OCA\\DAV\\Migration\\ChunkCleanup' => $baseDir . '/../lib/Migration/ChunkCleanup.php',
     'OCA\\DAV\\Migration\\FixBirthdayCalendarComponent' => $baseDir . '/../lib/Migration/FixBirthdayCalendarComponent.php',

apps/dav/composer/composer/autoload_static.php

@@ -221,6 +221,8 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\HookManager' => __DIR__ . '/..' . '/../lib/HookManager.php',
         'OCA\\DAV\\Migration\\BuildCalendarSearchIndex' => __DIR__ . '/..' . '/../lib/Migration/BuildCalendarSearchIndex.php',
         'OCA\\DAV\\Migration\\BuildCalendarSearchIndexBackgroundJob' => __DIR__ . '/..' . '/../lib/Migration/BuildCalendarSearchIndexBackgroundJob.php',
+        'OCA\\DAV\\Migration\\BuildSocialSearchIndex' => __DIR__ . '/..' . '/../lib/Migration/BuildSocialSearchIndex.php',
+        'OCA\\DAV\\Migration\\BuildSocialSearchIndexBackgroundJob' => __DIR__ . '/..' . '/../lib/Migration/BuildSocialSearchIndexBackgroundJob.php',
         'OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue' => __DIR__ . '/..' . '/../lib/Migration/CalDAVRemoveEmptyValue.php',
         'OCA\\DAV\\Migration\\ChunkCleanup' => __DIR__ . '/..' . '/../lib/Migration/ChunkCleanup.php',
         'OCA\\DAV\\Migration\\FixBirthdayCalendarComponent' => __DIR__ . '/..' . '/../lib/Migration/FixBirthdayCalendarComponent.php',

apps/dav/l10n/nl.js

@@ -1,7 +1,7 @@
 OC.L10N.register(
     "dav",
     {
-    "Calendar" : "Kalender",
+    "Calendar" : "Agenda",
     "Todos" : "Te doen",
     "Personal" : "Persoonlijk",
     "{actor} created calendar {calendar}" : "{actor} creëerde agenda {calendar}",
@@ -107,9 +107,9 @@ OC.L10N.register(
     "Notifications are sent via background jobs, so these must occur often enough." : "Meldingen worden via achtergrondtaken verstuurd, dus die moeten vaak genoeg plaatsvinden.",
     "Enable notifications for events via push" : "Inschakelen push-melding voor afspraken",
     "Hello %s," : "Hallo %s,",
-    "The meeting »%1$s« with %2$s was canceled." : "De vergadering »%1$s« met %2$s is geannuleerd.",
-    "The meeting »%1$s« with %2$s was updated." : "De vergadering »%1$s« met %2$s is bijgewerkt.",
-    "%1$s invited you to »%2$s«" : "%1$s heeft je uitgenodigd voor »%2$s«",
+    "The meeting »%1$s« with %2$s was canceled." : "De vergadering \"%1$s\" met %2$s is geannuleerd.",
+    "The meeting »%1$s« with %2$s was updated." : "De vergadering \"%1$s\" met %2$s is bijgewerkt.",
+    "%1$s invited you to »%2$s«" : "%1$s heeft je uitgenodigd voor \"%2$s\"",
     "When:" : "Wanneer:"
 },
 "nplurals=2; plural=(n != 1);");

apps/dav/l10n/nl.json

@@ -1,5 +1,5 @@
 { "translations": {
-    "Calendar" : "Kalender",
+    "Calendar" : "Agenda",
     "Todos" : "Te doen",
     "Personal" : "Persoonlijk",
     "{actor} created calendar {calendar}" : "{actor} creëerde agenda {calendar}",
@@ -105,9 +105,9 @@
     "Notifications are sent via background jobs, so these must occur often enough." : "Meldingen worden via achtergrondtaken verstuurd, dus die moeten vaak genoeg plaatsvinden.",
     "Enable notifications for events via push" : "Inschakelen push-melding voor afspraken",
     "Hello %s," : "Hallo %s,",
-    "The meeting »%1$s« with %2$s was canceled." : "De vergadering »%1$s« met %2$s is geannuleerd.",
-    "The meeting »%1$s« with %2$s was updated." : "De vergadering »%1$s« met %2$s is bijgewerkt.",
-    "%1$s invited you to »%2$s«" : "%1$s heeft je uitgenodigd voor »%2$s«",
+    "The meeting »%1$s« with %2$s was canceled." : "De vergadering \"%1$s\" met %2$s is geannuleerd.",
+    "The meeting »%1$s« with %2$s was updated." : "De vergadering \"%1$s\" met %2$s is bijgewerkt.",
+    "%1$s invited you to »%2$s«" : "%1$s heeft je uitgenodigd voor \"%2$s\"",
     "When:" : "Wanneer:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/dav/l10n/pl.js

@@ -12,17 +12,17 @@ OC.L10N.register(
     "You updated calendar {calendar}" : "Zaktualizowałeś kalendarz {calendar}",
     "You shared calendar {calendar} as public link" : "Udostępniłeś kalendarz {calendar} przez link publiczny",
     "You removed public link for calendar {calendar}" : "Usunąłeś link publiczny do kalendarza {calendar}",
-    "{actor} shared calendar {calendar} with you" : "{actor} współdzieli kalendarz {calendar} z Tobą",
-    "You shared calendar {calendar} with {user}" : "Współdzielisz kalendarz {calendar} z {user}",
-    "{actor} shared calendar {calendar} with {user}" : "{actor} współdzieli kalendarz {calendar} z {user}",
-    "{actor} unshared calendar {calendar} from you" : "{actor} zakończył współdzielenie kalendarza {calendar} z Tobą",
-    "You unshared calendar {calendar} from {user}" : "Zakończyłeś współdzielenie kalendarza {calendar} z {user}",
-    "{actor} unshared calendar {calendar} from {user}" : "{actor} zakończył współdzielenie kalendarza {calendar} z {user}",
-    "{actor} unshared calendar {calendar} from themselves" : "{actor} zakończył współdzielenie kalendarza {calendar} od siebie",
-    "You shared calendar {calendar} with group {group}" : "Współdzielisz kalendarz {calendar} z grupą {group}",
-    "{actor} shared calendar {calendar} with group {group}" : "{actor} współdzieli kalendarz {calendar} z grupą {group}",
-    "You unshared calendar {calendar} from group {group}" : "Zakończyłeś współdzielenie kalendarza {calendar} z grupą {group}",
-    "{actor} unshared calendar {calendar} from group {group}" : "{actor}  nie współdzieli kalendarza {calendar} z grupą {group} .",
+    "{actor} shared calendar {calendar} with you" : "{actor} udostępnił kalendarz {calendar} dla Ciebie",
+    "You shared calendar {calendar} with {user}" : "Udostępniłeś kalendarz {calendar} dla {user}",
+    "{actor} shared calendar {calendar} with {user}" : "{actor} udostępnił kalendarz {calendar} dla {user}",
+    "{actor} unshared calendar {calendar} from you" : "{actor} zakończył udostępnianie kalendarza {calendar} dla Ciebie",
+    "You unshared calendar {calendar} from {user}" : "Zakończyłeś udostępnianie kalendarza {calendar} dla {user}",
+    "{actor} unshared calendar {calendar} from {user}" : "{actor} zakończył udostępnianie kalendarza {calendar} dla {user}",
+    "{actor} unshared calendar {calendar} from themselves" : "{actor} zakończył udostępnianie kalendarza {calendar} od siebie",
+    "You shared calendar {calendar} with group {group}" : "Udostępniłeś kalendarz {calendar} dla grupy {group}",
+    "{actor} shared calendar {calendar} with group {group}" : "{actor} udostępnił kalendarz {calendar} dla grupy {group}",
+    "You unshared calendar {calendar} from group {group}" : "Zakończyłeś udostępnianie kalendarza {calendar} dla grupy {group}",
+    "{actor} unshared calendar {calendar} from group {group}" : "{actor} zakończył udostępnianie kalendarza {calendar} dla grupy {group} .",
     "{actor} created event {event} in calendar {calendar}" : "{actor} utworzył wydarzenie {event} w kalendarzu {calendar}",
     "You created event {event} in calendar {calendar}" : "Utworzyłeś wydarzenie {event} w kalendarzu {calendar}",
     "{actor} deleted event {event} from calendar {calendar}" : "{actor} usunął wydarzenie {event} z kalendarza {calendar}",

apps/dav/l10n/pl.json

@@ -10,17 +10,17 @@
     "You updated calendar {calendar}" : "Zaktualizowałeś kalendarz {calendar}",
     "You shared calendar {calendar} as public link" : "Udostępniłeś kalendarz {calendar} przez link publiczny",
     "You removed public link for calendar {calendar}" : "Usunąłeś link publiczny do kalendarza {calendar}",
-    "{actor} shared calendar {calendar} with you" : "{actor} współdzieli kalendarz {calendar} z Tobą",
-    "You shared calendar {calendar} with {user}" : "Współdzielisz kalendarz {calendar} z {user}",
-    "{actor} shared calendar {calendar} with {user}" : "{actor} współdzieli kalendarz {calendar} z {user}",
-    "{actor} unshared calendar {calendar} from you" : "{actor} zakończył współdzielenie kalendarza {calendar} z Tobą",
-    "You unshared calendar {calendar} from {user}" : "Zakończyłeś współdzielenie kalendarza {calendar} z {user}",
-    "{actor} unshared calendar {calendar} from {user}" : "{actor} zakończył współdzielenie kalendarza {calendar} z {user}",
-    "{actor} unshared calendar {calendar} from themselves" : "{actor} zakończył współdzielenie kalendarza {calendar} od siebie",
-    "You shared calendar {calendar} with group {group}" : "Współdzielisz kalendarz {calendar} z grupą {group}",
-    "{actor} shared calendar {calendar} with group {group}" : "{actor} współdzieli kalendarz {calendar} z grupą {group}",
-    "You unshared calendar {calendar} from group {group}" : "Zakończyłeś współdzielenie kalendarza {calendar} z grupą {group}",
-    "{actor} unshared calendar {calendar} from group {group}" : "{actor}  nie współdzieli kalendarza {calendar} z grupą {group} .",
+    "{actor} shared calendar {calendar} with you" : "{actor} udostępnił kalendarz {calendar} dla Ciebie",
+    "You shared calendar {calendar} with {user}" : "Udostępniłeś kalendarz {calendar} dla {user}",
+    "{actor} shared calendar {calendar} with {user}" : "{actor} udostępnił kalendarz {calendar} dla {user}",
+    "{actor} unshared calendar {calendar} from you" : "{actor} zakończył udostępnianie kalendarza {calendar} dla Ciebie",
+    "You unshared calendar {calendar} from {user}" : "Zakończyłeś udostępnianie kalendarza {calendar} dla {user}",
+    "{actor} unshared calendar {calendar} from {user}" : "{actor} zakończył udostępnianie kalendarza {calendar} dla {user}",
+    "{actor} unshared calendar {calendar} from themselves" : "{actor} zakończył udostępnianie kalendarza {calendar} od siebie",
+    "You shared calendar {calendar} with group {group}" : "Udostępniłeś kalendarz {calendar} dla grupy {group}",
+    "{actor} shared calendar {calendar} with group {group}" : "{actor} udostępnił kalendarz {calendar} dla grupy {group}",
+    "You unshared calendar {calendar} from group {group}" : "Zakończyłeś udostępnianie kalendarza {calendar} dla grupy {group}",
+    "{actor} unshared calendar {calendar} from group {group}" : "{actor} zakończył udostępnianie kalendarza {calendar} dla grupy {group} .",
     "{actor} created event {event} in calendar {calendar}" : "{actor} utworzył wydarzenie {event} w kalendarzu {calendar}",
     "You created event {event} in calendar {calendar}" : "Utworzyłeś wydarzenie {event} w kalendarzu {calendar}",
     "{actor} deleted event {event} from calendar {calendar}" : "{actor} usunął wydarzenie {event} z kalendarza {calendar}",

apps/dav/l10n/sl.js

@@ -106,6 +106,7 @@ OC.L10N.register(
     "Hello %s," : "Pozdravljeni, %s,",
     "The meeting »%1$s« with %2$s was canceled." : "Sestanek »%1$s« z uporabnikom %2$s je preklican.",
     "The meeting »%1$s« with %2$s was updated." : "Sestanek »%1$s« z uporabnikom %2$s je spremenjen.",
+    "%1$s invited you to »%2$s«" : "%1$s vas vabi na »%2$s«",
     "When:" : "Kdaj:"
 },
 "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");

apps/dav/l10n/sl.json

@@ -104,6 +104,7 @@
     "Hello %s," : "Pozdravljeni, %s,",
     "The meeting »%1$s« with %2$s was canceled." : "Sestanek »%1$s« z uporabnikom %2$s je preklican.",
     "The meeting »%1$s« with %2$s was updated." : "Sestanek »%1$s« z uporabnikom %2$s je spremenjen.",
+    "%1$s invited you to »%2$s«" : "%1$s vas vabi na »%2$s«",
     "When:" : "Kdaj:"
 },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
 }

apps/dav/lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php

@@ -401,7 +401,7 @@ class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob {
 
 		return array_map(function ($row) {
 			return $row['resource_id'];
-		}, $stmt->fetchAll(\PDO::FETCH_NAMED));
+		}, $stmt->fetchAll());
 	}
 
 	/**
@@ -435,6 +435,6 @@ class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob {
 			->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
 		$stmt = $query->execute();
 
-		return $stmt->fetch(\PDO::FETCH_NAMED)['id'];
+		return $stmt->fetch()['id'];
 	}
 }

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -8,6 +8,7 @@
  * @author dartcafe <github@dartcafe.de>
  * @author Georg Ehrke <oc.list@georgehrke.com>
  * @author Joas Schilling <coding@schilljs.com>
+ * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
  * @author leith abdulla <online-nextcloud@eleith.com>
  * @author Lukas Reschke <lukas@statuscode.ch>
  * @author Morris Jobke <hey@morrisjobke.de>
@@ -255,7 +256,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 		}
 
 		$result = $query->execute();
-		$column = (int)$result->fetchColumn();
+		$column = (int)$result->fetchOne();
 		$result->closeCursor();
 		return $column;
 	}
@@ -345,9 +346,6 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 		$principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
 		$principals = array_merge($principals, $this->principalBackend->getCircleMembership($principalUriOriginal));
 
-		$principals = array_map(function ($principal) {
-			return urldecode($principal);
-		}, $principals);
 		$principals[] = $principalUri;
 
 		$fields = array_values($this->propertyMap);
@@ -1116,7 +1114,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 			->andWhere($q->expr()->eq('calendartype', $q->createNamedParameter($calendarType)));
 
 		$result = $q->execute();
-		$count = (int) $result->fetchColumn();
+		$count = (int) $result->fetchOne();
 		$result->closeCursor();
 
 		if ($count !== 0) {
@@ -1778,7 +1776,8 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 			$calendarAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendartype', $calendarObjectIdQuery->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)));
 
 			// If it's shared, limit search to public events
-			if ($calendar['principaluri'] !== $calendar['{http://owncloud.org/ns}owner-principal']) {
+			if (isset($calendar['{http://owncloud.org/ns}owner-principal'])
+				&& $calendar['principaluri'] !== $calendar['{http://owncloud.org/ns}owner-principal']) {
 				$calendarAnd->add($calendarObjectIdQuery->expr()->eq('co.classification', $calendarObjectIdQuery->createNamedParameter(self::CLASSIFICATION_PUBLIC)));
 			}
 
@@ -1790,7 +1789,8 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 			$subscriptionAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendartype', $calendarObjectIdQuery->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)));
 
 			// If it's shared, limit search to public events
-			if ($subscription['principaluri'] !== $subscription['{http://owncloud.org/ns}owner-principal']) {
+			if (isset($subscription['{http://owncloud.org/ns}owner-principal'])
+				&& $subscription['principaluri'] !== $subscription['{http://owncloud.org/ns}owner-principal']) {
 				$subscriptionAnd->add($calendarObjectIdQuery->expr()->eq('co.classification', $calendarObjectIdQuery->createNamedParameter(self::CLASSIFICATION_PUBLIC)));
 			}
 
@@ -1963,7 +1963,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 		// Current synctoken
 		$stmt = $this->db->prepare('SELECT `synctoken` FROM `*PREFIX*calendars` WHERE `id` = ?');
 		$stmt->execute([ $calendarId ]);
-		$currentToken = $stmt->fetchColumn(0);
+		$currentToken = $stmt->fetchOne();
 
 		if (is_null($currentToken)) {
 			return null;
@@ -2373,7 +2373,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 			->from($table)
 			->where($query->expr()->eq('id', $query->createNamedParameter($calendarId)));
 		$result = $query->execute();
-		$syncToken = (int)$result->fetchColumn();
+		$syncToken = (int)$result->fetchOne();
 		$result->closeCursor();
 
 		$query = $this->db->getQueryBuilder();
@@ -2744,11 +2744,13 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 	 * @param string $uriName
 	 * @param string $uriOrigin
 	 * @param string $uriDestination
+	 * @param string $newUriName (optional) the new uriName
 	 */
-	public function moveCalendar($uriName, $uriOrigin, $uriDestination) {
+	public function moveCalendar($uriName, $uriOrigin, $uriDestination, $newUriName = null) {
 		$query = $this->db->getQueryBuilder();
 		$query->update('calendars')
 			->set('principaluri', $query->createNamedParameter($uriDestination))
+			->set('uri', $query->createNamedParameter($newUriName ?: $uriName))
 			->where($query->expr()->eq('principaluri', $query->createNamedParameter($uriOrigin)))
 			->andWhere($query->expr()->eq('uri', $query->createNamedParameter($uriName)))
 			->execute();