Merge pull request #15003 from nextcloud/version/noid/15.0.7

15.0.7

.drone.yml

@@ -38,6 +38,7 @@ steps:
     - ./build/vue-builds.sh ./apps/updatenotification/js/updatenotification.js
     - ./build/vue-builds.sh ./apps/oauth2/js/oauth2.js
     - ./build/vue-builds.sh ./apps/accessibility/js/accessibility.js
+    - ./build/vue-builds.sh ./apps/twofactor_backupcodes/js/settings.js
 
 trigger:
   branch:
@@ -60,7 +61,30 @@ steps:
   image: nextcloudci/php7.0:php7.0-19
   commands:
     - ./autotest-checkers.sh
-  secrets: [ GITHUB_TOKEN ]
+  secrets: [ github_token ]
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
+---
+kind: pipeline
+name: handlebars
+
+steps:
+- name: submodules
+  image: docker:git
+  commands:
+    - git submodule update --init
+- name: handlebars
+  image: node
+  commands:
+    - npm install handlebars -g
+    - ./build/compile-handlebars-templates.sh
 
 trigger:
   branch:
@@ -83,12 +107,22 @@ steps:
   image: nextcloudci/php7.0:php7.0-19
   commands:
     - composer install
-    - ./lib/composer/bin/parallel-lint --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
+    - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
 - name: syntax-php7.1
   image: nextcloudci/php7.1:php7.1-16
   commands:
     - composer install
-    - ./lib/composer/bin/parallel-lint --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
+    - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
+- name: syntax-php7.2
+  image: nextcloudci/php7.2:php7.2-12
+  commands:
+    - composer install
+    - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php --exclude 3rdparty/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php .
+- name: syntax-php7.3
+  image: nextcloudci/php7.3:php7.3-1
+  commands:
+    - composer install
+    - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php --exclude 3rdparty/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php .
 
 trigger:
   branch:
@@ -427,6 +461,28 @@ trigger:
     - pull_request
     - push
 
+---
+kind: pipeline
+name: nodb-php7.3
+
+steps:
+- name: submodules
+  image: docker:git
+  commands:
+    - git submodule update --init
+- name: nodb-php7.3
+  image: nextcloudci/php7.3:php7.3-1
+  commands:
+    - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
 ---
 kind: pipeline
 name: sqlite-php7.0
@@ -501,6 +557,28 @@ trigger:
     - pull_request
     - push
 
+---
+kind: pipeline
+name: sqlite-php7.3
+
+steps:
+- name: submodules
+  image: docker:git
+  commands:
+    - git submodule update --init
+- name: sqlite-php7.3
+  image: nextcloudci/php7.3:php7.3-1
+  commands:
+    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
 ---
 kind: pipeline
 name: mysql-php7.0
@@ -604,6 +682,39 @@ trigger:
     - pull_request
     - push
 
+---
+kind: pipeline
+name: mysql-php7.3
+
+steps:
+- name: submodules
+  image: docker:git
+  commands:
+    - git submodule update --init
+- name: mysql-php7.3
+  image: nextcloudci/php7.3:php7.3-1
+  commands:
+    - 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:
+    - pull_request
+    - push
+
 ---
 kind: pipeline
 name: mysql5.6-php7.0
@@ -955,6 +1066,40 @@ trigger:
     - pull_request
     - push
 
+---
+kind: pipeline
+name: mysqlmb4-php7.3
+
+steps:
+- name: submodules
+  image: docker:git
+  commands:
+    - git submodule update --init
+- name: mysqlmb4-php7.3
+  image: nextcloudci/php7.3:php7.3-1
+  commands:
+    - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
+
+services:
+- name: mysqlmb4
+  image: mysql:5.7.22
+  environment:
+    MYSQL_ROOT_PASSWORD: owncloud
+    MYSQL_USER: oc_autotest
+    MYSQL_PASSWORD: owncloud
+    MYSQL_DATABASE: oc_autotest
+  command: [ "--innodb_large_prefix=true", "--innodb_file_format=barracuda", "--innodb_file_per_table=true" ]
+  tmpfs:
+    - /var/lib/mysql
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
 ---
 kind: pipeline
 name: integration-capabilities_features
@@ -1695,6 +1840,47 @@ trigger:
     - pull_request
     - push
 
+---
+kind: pipeline
+name: integration-ldap-openldap-numerical-id-features
+
+steps:
+- name: submodules
+  image: docker:git
+  commands:
+    - git submodule update --init
+- name: integration-ldap-openldap-numerical-id-features
+  image: nextcloudci/integration-php7.0:integration-php7.0-6
+  commands:
+    - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
+    - ./occ config:system:set redis host --value=cache
+    - ./occ config:system:set redis port --value=6379 --type=integer
+    - ./occ config:system:set redis timeout --value=0 --type=integer
+    - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local
+    - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed
+    - ./occ app:enable user_ldap
+    - cd build/integration
+    - ./run.sh ldap_features/openldap-numerical-id.feature
+
+services:
+- name: cache
+  image: redis
+- name: openldap
+  image: nextcloudci/openldap:openldap-7
+  environment:
+    SLAPD_DOMAIN: nextcloud.ci
+    SLAPD_ORGANIZATION: Nextcloud
+    SLAPD_PASSWORD: admin
+    SLAPD_ADDITIONAL_MODULES: memberof
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
 ---
 kind: pipeline
 name: integration-trashbin
@@ -1857,6 +2043,96 @@ trigger:
     - pull_request
     - push
 
+---
+kind: pipeline
+name: acceptance-app-files-sharing
+
+steps:
+- name: submodules
+  image: docker:git
+  commands:
+    - git submodule update --init
+- name: acceptance-app-files-sharing
+  image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
+  commands:
+    - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-sharing --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-sharing.feature
+
+services:
+- name: selenium
+  image: selenium/standalone-firefox:2.53.1-beryllium
+  environment:
+    # Reduce default log level for Selenium server (INFO) as it is too
+    # verbose.
+    JAVA_OPTS: -Dselenium.LOGGER.level=WARNING
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
+---
+kind: pipeline
+name: acceptance-app-files-sharing-link
+
+steps:
+- name: submodules
+  image: docker:git
+  commands:
+    - git submodule update --init
+- name: acceptance-app-files-sharing-link
+  image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
+  commands:
+    - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-sharing-link --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-sharing-link.feature
+
+services:
+- name: selenium
+  image: selenium/standalone-firefox:2.53.1-beryllium
+  environment:
+    # Reduce default log level for Selenium server (INFO) as it is too
+    # verbose.
+    JAVA_OPTS: -Dselenium.LOGGER.level=WARNING
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
+---
+kind: pipeline
+name: acceptance-app-files-tags
+
+steps:
+- name: submodules
+  image: docker:git
+  commands:
+    - git submodule update --init
+- name: acceptance-app-files-tags
+  image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
+  commands:
+    - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-tags --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-tags.feature
+
+services:
+- name: selenium
+  image: selenium/standalone-firefox:2.53.1-beryllium
+  environment:
+    # Reduce default log level for Selenium server (INFO) as it is too
+    # verbose.
+    JAVA_OPTS: -Dselenium.LOGGER.level=WARNING
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
 ---
 kind: pipeline
 name: acceptance-app-theming

.github/CONTRIBUTING.md

@@ -19,7 +19,7 @@ If you have questions about how to install or use Nextcloud, please direct these
 
 Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
 
-[template]: https://raw.githubusercontent.com/nextcloud/server/master/issue_template.md
+[template]: ./ISSUE_TEMPLATE.md
 [forum]: https://help.nextcloud.com/
 [irc]: https://webchat.freenode.net/?channels=nextcloud
 

.github/config.yml

@@ -0,0 +1,5 @@
+firstPRMergeComment: >
+    Thanks for your first pull request and welcome to the community!
+    Feel free to keep them coming! If you are looking for issues to tackle then have a look at this selection: https://github.com/nextcloud/server/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22
+
+    Most developers hang out on IRC. So join \#nextcloud-dev on Freenode for a chat!

.gitignore

@@ -13,6 +13,7 @@
 # ignore all apps except core ones
 /apps*/*
 !/apps/accessibility
+!/apps/cloud_federation_api
 !/apps/comments
 !/apps/dav
 !/apps/files

.htaccess

@@ -26,7 +26,7 @@
   </FilesMatch>
 
   # Let browsers cache WOFF files for a week
-  <FilesMatch "\.woff$">
+  <FilesMatch "\.woff2?$">
     Header set Cache-Control "max-age=604800"
   </FilesMatch>
 </IfModule>
@@ -60,6 +60,7 @@
   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/carddav /remote.php/dav/ [R=301,L]
   RewriteRule ^\.well-known/caldav /remote.php/dav/ [R=301,L]
   RewriteRule ^remote/(.*) remote.php [QSA,L]

.scrutinizer.yml

@@ -1,6 +1,13 @@
 before_commands:
   - 'git submodule update --init --recursive'
 
+build:
+    nodes:
+        analysis:
+            tests:
+                override:
+                    - php-scrutinizer-run
+
 checks:
     php:
         excluded_dependencies:

README.md

@@ -1,4 +1,4 @@
-# Nextcloud Server
+# Nextcloud Server ☁
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/server/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=master)
 [![codecov](https://codecov.io/gh/nextcloud/server/branch/master/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/209/badge)](https://bestpractices.coreinfrastructure.org/projects/209)
@@ -7,45 +7,102 @@
 
 **A safe home for all your data.**
 
-![](https://github.com/nextcloud/screenshots/blob/master/files/filelist.png)
+![](https://raw.githubusercontent.com/nextcloud/screenshots/master/files/Files%20Sharing.png)
 
-## Why is this so awesome?
+## Why is this so awesome? 🤩
 
-* :file_folder: **Access your Data** You can store your files, contacts, calendars and more on a server of your choosing.
-* :package: **Sync your Data** You keep your files, contacts, calendars and more synchronized amongst your devices.
-* :arrows_counterclockwise: **Share your Data** …by giving others access to the stuff you want them to see or to collaborate with.
-* :rocket: **Expandable with dozens of Apps** ...like [Calendar](https://github.com/nextcloud/calendar), [Contacts](https://github.com/nextcloud/contacts), [Mail](https://github.com/nextcloud/mail) and all those you can discover in our [App Store](https://apps.nextcloud.com)
-* :lock: **Security** with our encryption mechanisms, [HackerOne bounty program](https://hackerone.com/nextcloud) and two-factor authentication.
+* 📁 **Access your Data** You can store your files, contacts, calendars and more on a server of your choosing.
+* 🔄 **Sync your Data** You keep your files, contacts, calendars and more synchronized amongst your devices.
+* 🙌 **Share your Data** …by giving others access to the stuff you want them to see or to collaborate with.
+* 🚀 **Expandable with dozens of Apps** ...like [Calendar](https://github.com/nextcloud/calendar), [Contacts](https://github.com/nextcloud/contacts), [Mail](https://github.com/nextcloud/mail) and all those you can discover in our [App Store](https://apps.nextcloud.com)
+* 🔒 **Security** with our encryption mechanisms, [HackerOne bounty program](https://hackerone.com/nextcloud) and two-factor authentication.
 
-*You want to learn more about how you can use Nextcloud to access, share and protect your files, calendars, contacts, communication & more at home and at your Enterprise?* [**Learn about all our Features**](https://nextcloud.com/features).
+You want to learn more about how you can use Nextcloud to access, share and protect your files, calendars, contacts, communication & more at home and at your Enterprise? [**Learn about all our Features**](https://nextcloud.com/features).
 
-## Get your Nextcloud
+## Get your Nextcloud 🚚
 
-- [**Install** a server by yourself on your own hardware or by using one of our ready to use **Appliances**](https://nextcloud.com/install/#instructions-server)
-- [Buy one of the awesome **devices** coming with a preinstalled Nextcloud](https://nextcloud.com/devices/)
-- [Find a service **provider** who is hosting Nextcloud for you or your company](https://nextcloud.com/providers/)
+- ☑️ [**Simply sign up**](https://nextcloud.com/signup/) either through our website or through the apps directly.
+- 🖥 [**Install** a server by yourself](https://nextcloud.com/install/#instructions-server) on your own hardware or by using one of our ready to use **appliances**
+- 📦 Buy one of the [awesome **devices** coming with a preinstalled Nextcloud](https://nextcloud.com/devices/)
+- 🏢 Find a [service **provider**](https://nextcloud.com/providers/) who hosts Nextcloud for you or your company
 
-*Enterprise? Public Sector or Education user? You may want to have a look into the [**Enterprise Support Subscription**](https://nextcloud.com/enterprise/) provided by the Nextcloud GmbH*
+Enterprise? Public Sector or Education user? You may want to have a look into the [**Enterprise Support Subscription**](https://nextcloud.com/enterprise/) provided by the Nextcloud GmbH.
 
-## Get in touch
+## Get in touch 💬
 
-* :clipboard: [Forum](https://help.nextcloud.com)
-* :busts_in_silhouette: [Facebook](https://facebook.com/nextclouders)
-* :hatching_chick: [Twitter](https://twitter.com/Nextclouders)
-* :elephant: [Mastodon](https://mastodon.xyz/@nextcloud)
+* [📋 Forum](https://help.nextcloud.com)
+* [👥 Facebook](https://facebook.com/nextclouders)
+* [🐣 Twitter](https://twitter.com/Nextclouders)
+* [🐘 Mastodon](https://mastodon.xyz/@nextcloud)
 
-[…learn more about how to get support for Nextcloud here!](https://nextcloud.com/support)
+You can also [get support for Nextcloud](https://nextcloud.com/support)!
 
-## Join the team :family:
 
-### How to contribute
+## Join the team 👪
 
-1. [Set up your local development environment](https://docs.nextcloud.com/server/14/developer_manual/general/devenv.html) :rocket:
-2. [Pick a good first issue](https://github.com/nextcloud/server/labels/good%20first%20issue) :notebook:
-3. Create a branch, a [Pull Request](https://opensource.guide/how-to-contribute/#opening-a-pull-request) and `@mention` the people from the issue :computer:
-4. Wait for it to get merged and :tada:
+There are many ways to contribute, of which development is only one! Find out [how to get involved](https://nextcloud.com/contribute/), including as translator, designer, tester, helping others and much more! 😍
 
-### Contribution Guidelines
+
+### Development setup 👩‍💻
+
+1. 🚀 [Set up your local development environment](https://docs.nextcloud.com/server/14/developer_manual/general/devenv.html)
+2. 🐛 [Pick a good first issue](https://github.com/nextcloud/server/labels/good%20first%20issue)
+3. 👩‍🔧 Create a branch and make your changes. Remember to sign off your commits using `git commit -sm "Your commit message"`
+4. ⬆ Create a [pull request](https://opensource.guide/how-to-contribute/#opening-a-pull-request) and `@mention` the people from the issue to review
+5. 👍 Fix things that come up during review
+6. 🎉 Wait for it to get merged!
+
+Third-party components are handled as git submodules which have to be initialized first. So aside from the regular git checkout invoking `git submodule update --init` or a similar command is needed, for details see Git documentation.
+
+Several apps that are included by default in regular releases such as [First run wizard](https://github.com/nextcloud/firstrunwizard) or [Activity](https://github.com/nextcloud/activity) are missing in `master` and have to be installed manually by cloning them into the `apps` subfolder.
+
+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.
+
+
+### Building front-end code 🏗
+
+We move 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 `settings` subfolder:
+
+``` bash
+# install dependencies
+make dev-setup
+
+# build for development
+make build-js
+
+# build for development and watch edits
+make watch-js
+
+# build for production with minification
+make build-js-production
+
+# clean output files
+make clean
+```
+
+**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.
+
+If you don’t have Handlebars installed yet, you can do it with this terminal command:
+```
+sudo npm install -g handlebars
+```
+
+Then inside the root folder of your local Nextcloud development installation, run this command in the terminal every time you changed a `.handlebars` file to compile it:
+```
+./build/compile-handlebars-templates.sh
+```
+
+
+### Tools we use 🛠
+
+- [👀 BrowserStack](https://browserstack.com) for cross-browser testing
+- [🌊 WAVE](https://wave.webaim.org/extension/) for accessibility testing
+- [🚨 Lighthouse](https://developers.google.com/web/tools/lighthouse/) for testing of performance, accessibility and more
+
+
+## Contribution guidelines 📜
 
 All contributions to this repository from June, 16 2016 on are considered to be
 licensed under the AGPLv3 or any later version.
@@ -61,20 +118,6 @@ changed it substantially:
 
 Please read the [Code of Conduct](https://nextcloud.com/community/code-of-conduct/). This document offers some guidance to ensure Nextcloud participants can cooperate effectively in a positive and inspiring atmosphere, and to explain how together we can strengthen and support each other.
 
-Please review the [guidelines for contributing](https://github.com/nextcloud/server/blob/master/CONTRIBUTING.md) to this repository.
+Please review the [guidelines for contributing](.github/CONTRIBUTING.md) to this repository.
 
 More information how to contribute: [https://nextcloud.com/contribute/](https://nextcloud.com/contribute/)
-
-### Running master checkouts
-
-Third-party components are handled as git submodules which have to be initialized first. So aside from the regular git checkout invoking `git submodule update --init` or a similar command is needed, for details see Git documentation.
-
-Several apps that are included by default in regular releases such as [firstrunwizard](https://github.com/nextcloud/firstrunwizard) or [gallery](https://github.com/nextcloud/gallery) are missing in `master` and have to be installed manually.
-
-That aside Git checkouts can be handled the same as release archives.
-
-Note they should never be used on production systems.
-
-## Tools we use
-
-[![BrowserStack](https://user-images.githubusercontent.com/45821/41675934-61fa3442-74c4-11e8-8c8e-90768c56ba08.png)](https://www.browserstack.com/)

apps/accessibility/.babelrc

@@ -1,12 +0,0 @@
-{
-	"presets": [
-		[
-			"env",
-			{
-				"targets": {
-					"browsers": ["last 2 versions", "not ie <= 11"]
-				}
-			}
-		]
-	]
-}

apps/accessibility/.babelrc.js

@@ -0,0 +1,12 @@
+module.exports = {
+	presets: [
+		[
+			'@babel/preset-env',
+			{
+				targets: {
+					browsers: ['last 2 versions', 'ie >= 11']
+				}
+			}
+		]
+	]
+}

apps/accessibility/appinfo/app.php

@@ -27,4 +27,5 @@ $app = new \OCA\Accessibility\AppInfo\Application();
 // Separate from the constructor since the route are not initialized before that
 // 1. create the app
 // 2. generate css route and inject
-$app->injectCss();
+$app->injectCss();
+$app->injectJavascript();

apps/accessibility/appinfo/info.xml

@@ -5,19 +5,22 @@
     <name>Accessibility</name>
     <summary>Accessibility options for nextcloud</summary>
     <description><![CDATA[Provides multiple accessibilities options to ease your use of nextcloud]]></description>
-    <version>1.0.1</version>
+    <version>1.1.0</version>
     <licence>agpl</licence>
     <author>John Molakvoæ</author>
     <namespace>Accessibility</namespace>
-    <category>accessibility</category>
-    <default_enable/>
-    <dependencies>
-        <nextcloud min-version="14" max-version="14"/>
-    </dependencies>
     <default_enable/>
+
+    <category>customization</category>
+
     <bugs>https://github.com/nextcloud/server/issues</bugs>
+
+    <dependencies>
+        <nextcloud min-version="15" max-version="15"/>
+    </dependencies>
+
     <settings>
         <personal>OCA\Accessibility\Settings\Personal</personal>
         <personal-section>OCA\Accessibility\Settings\PersonalSection</personal-section>
     </settings>
-</info>
+</info>

apps/accessibility/appinfo/routes.php

@@ -22,8 +22,9 @@
  */
 
 return [
-    'routes' => [
+	'routes' => [
 		['name' => 'accessibility#getCss', 'url' => '/css/user-{md5}', 'verb' => 'GET'],
+		['name' => 'accessibility#getJavascript', 'url' => '/js/accessibility', 'verb' => 'GET'],
     ],
     'ocs' => [
 		[

apps/accessibility/css/fontdyslexic.scss

@@ -19,4 +19,4 @@
 	src: url('../fonts/OpenDyslexic-Bold.woff') format('woff');
 }
 
-$font-face: OpenDyslexic, 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+$font-face: OpenDyslexic, 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;

apps/accessibility/css/themehighcontrast.scss

@@ -1,29 +1,3 @@
-// Fonts
-@font-face {
-	font-family: 'Open Sans';
-	font-style: normal;
-	font-weight: normal;
-	src: local('Open Sans'), local('OpenSans'),
-		url('../../../core/fonts/OpenSans-Regular.woff') format('woff');
-}
-
-/* overriding default light */
-@font-face {
-	font-family: 'Open Sans';
-	font-style: normal;
-	font-weight: 300;
-	src: local('Open Sans'), local('OpenSans'),
-	url('../../../core/fonts/OpenSans-Regular.woff') format('woff');
-}
-
-@font-face {
-	font-family: 'Open Sans';
-	font-style: normal;
-	font-weight: 500 700;
-	src: local('Open Sans Bold'), local('OpenSans-Bold'),
-		url('../../../core/fonts/OpenSans-Bold.woff') format('woff');
-}
-
 // SCSS variables
 $color-main-text: #000;
 $color-main-background: #fff;
@@ -43,15 +17,9 @@ $color-box-shadow: $color-main-text;
 $color-border: darken($color-main-background, 50%);
 $color-border-dark: darken($color-main-background, 50%);
 
-$font-face: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
-
-
-// Font weight reset
-body {
-	font-weight: 400;
-}
-
 [class^='icon-'], [class*=' icon-'],
-.action {
+.action,
+#appmenu li a,
+.menutoggle {
 	opacity: 1 !important;
 }

apps/accessibility/lib/AppInfo/Application.php

@@ -62,4 +62,22 @@ class Application extends App {
 			}
 		}
 	}
+
+	public function injectJavascript() {
+		$linkToJs = $this->urlGenerator->linkToRoute(
+			$this->appName . '.accessibility.getJavascript',
+			[
+				'v' => \OC::$server->getConfig()->getAppValue('accessibility', 'cachebuster', '0'),
+			]
+		);
+
+		\OCP\Util::addHeader(
+			'script',
+			[
+				'src' => $linkToJs,
+				'nonce' => \OC::$server->getContentSecurityPolicyNonceManager()->getNonce()
+			],
+			''
+		);
+	}
 }

apps/accessibility/lib/Controller/AccessibilityController.php

@@ -28,6 +28,7 @@ use Leafo\ScssPhp\Formatter\Crunched;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataDisplayResponse;
+use OCP\AppFramework\Http\DataDownloadResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\App\IAppManager;
 use OCP\IConfig;
@@ -120,6 +121,7 @@ class AccessibilityController extends Controller {
 	/**
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
+	 * @NoSameSiteCookieRequired
 	 *
 	 * @return DataDisplayResponse
 	 */
@@ -165,8 +167,8 @@ class AccessibilityController extends Controller {
 		$appWebRoot = substr($this->appRoot, strlen($this->serverRoot) - strlen(\OC::$WEBROOT));
 		$css        = $this->rebaseUrls($css, $appWebRoot . '/css');
 
-		if (in_array('themedark', $userValues) && $this->iconsCacher->getCachedCSS() && $this->iconsCacher->getCachedCSS()->getSize() > 0) {
-			$iconsCss = $this->invertSvgIconsColor($this->iconsCacher->getCachedCSS()->getContent());
+		if (in_array('themedark', $userValues) && $this->iconsCacher->getCachedList() && $this->iconsCacher->getCachedList()->getSize() > 0) {
+			$iconsCss = $this->invertSvgIconsColor($this->iconsCacher->getCachedList()->getContent());
 			$css = $css . $iconsCss;
 		}
 
@@ -187,6 +189,33 @@ class AccessibilityController extends Controller {
 		return $response;
 	}
 
+	/**
+	 * @NoCSRFRequired
+	 * @PublicPage
+	 * @NoSameSiteCookieRequired
+	 *
+	 * @return DataDownloadResponse
+	 */
+	public function getJavascript(): DataDownloadResponse {
+		$user = $this->userSession->getUser();
+
+		if ($user === null) {
+			$theme = false;
+		} else {
+			$theme = $this->config->getUserValue($user->getUID(), $this->appName, 'theme', false);
+		}
+
+		$responseJS = '(function() {
+	OCA.Accessibility = {
+		theme: ' . json_encode($theme) . ',
+		
+	};
+})();';
+		$response = new DataDownloadResponse($responseJS, 'javascript', 'text/javascript');
+		$response->cacheFor(3600);
+		return $response;
+	}
+
 	/**
 	 * Return an array with the user theme & font settings
 	 *
@@ -231,7 +260,15 @@ class AccessibilityController extends Controller {
 	 * @return string
 	 */
 	private function invertSvgIconsColor(string $css) {
-		return str_replace(['/000', '/fff', '/***'], ['/***', '/000', '/fff'], $css);
+		return str_replace(
+			['color=000&', 'color=fff&', 'color=***&'],
+			['color=***&', 'color=000&', 'color=fff&'],
+			str_replace(
+				['color=000000&', 'color=ffffff&', 'color=******&'],
+				['color=******&', 'color=000000&', 'color=ffffff&'],
+				$css
+			)
+		);
 	}
 
 	/**

apps/accessibility/package.json

@@ -11,23 +11,23 @@
 		"build": "webpack --progress --hide-modules --config webpack.prod.js"
 	},
 	"dependencies": {
-		"axios": "^0.18.1",
-		"vue": "^2.5.16"
+		"axios": "^0.18.0",
+		"vue": "^2.5.17"
 	},
 	"browserslist": [
 		"last 2 versions",
 		"not ie <= 11"
 	],
 	"devDependencies": {
-		"babel-core": "^6.26.3",
-		"babel-loader": "^7.1.5",
-		"babel-preset-env": "^1.7.0",
-		"css-loader": "^1.0.0",
+		"@babel/core": "^7.1.2",
+		"@babel/preset-env": "^7.1.0",
+		"babel-loader": "^8.0.4",
+		"css-loader": "^1.0.1",
 		"file-loader": "^1.1.11",
-		"vue-loader": "^15.2.6",
-		"vue-template-compiler": "^2.5.16",
-		"webpack": "^4.16.1",
-		"webpack-cli": "^3.1.0",
-		"webpack-merge": "^4.1.3"
+		"vue-loader": "^15.4.2",
+		"vue-template-compiler": "^2.5.17",
+		"webpack": "^4.24.0",
+		"webpack-cli": "^3.1.2",
+		"webpack-merge": "^4.1.4"
 	}
 }

apps/accessibility/webpack.common.js

@@ -10,10 +10,6 @@ module.exports = {
 	},
 	module: {
 		rules: [
-			{
-				test: /\.css$/,
-				use: ['vue-style-loader', 'css-loader']
-			},
 			{
 				test: /\.vue$/,
 				loader: 'vue-loader'
@@ -22,21 +18,11 @@ module.exports = {
 				test: /\.js$/,
 				loader: 'babel-loader',
 				exclude: /node_modules/
-			},
-			{
-				test: /\.(png|jpg|gif|svg)$/,
-				loader: 'file-loader',
-				options: {
-					name: '[name].[ext]?[hash]'
-				}
 			}
 		]
 	},
 	plugins: [new VueLoaderPlugin()],
 	resolve: {
-		alias: {
-			vue$: 'vue/dist/vue.esm.js'
-		},
 		extensions: ['*', '.js', '.vue', '.json']
 	}
 };

apps/admin_audit/appinfo/info.xml

@@ -5,7 +5,7 @@
 	<name>Auditing / Logging</name>
 	<summary>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</summary>
 	<description>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</description>
-	<version>1.4.0</version>
+	<version>1.5.0</version>
 	<licence>agpl</licence>
 	<author>Nextcloud</author>
 	<namespace>AdminAudit</namespace>
@@ -15,7 +15,7 @@
 	<category>monitoring</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="14" max-version="14" />
+		<nextcloud min-version="15" max-version="15" />
 	</dependencies>
 	<background-jobs>
 		<job>OCA\AdminAudit\BackgroundJobs\Rotate</job>

apps/admin_audit/lib/Actions/AppManagement.php

@@ -41,7 +41,7 @@ class AppManagement extends Action {
 	 * @param string[] $groups
 	 */
 	public function enableAppForGroups(string $appName, array $groups) {
-		$this->log('App "%s" enabled for groups: %s',
+		$this->log('App "%1$s" enabled for groups: %2$s',
 			['app' => $appName, 'groups' => implode(', ', $groups)],
 			['app', 'groups']
 		);

apps/admin_audit/lib/Actions/Console.php

@@ -30,7 +30,7 @@ class Console extends Action {
 	 * @param $arguments
 	 */
 	public function runCommand(array $arguments) {
-		if ($arguments[1] === '_completion') {
+		if (!isset($arguments[1]) || $arguments[1] === '_completion') {
 			// Don't log autocompletion
 			return;
 		}

apps/cloud_federation_api/appinfo/info.xml

@@ -5,7 +5,7 @@
     <name>Cloud Federation API</name>
     <summary>Enable clouds to communicate with each other and exchange data</summary>
     <description>The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data.</description>
-    <version>0.0.1</version>
+    <version>0.1.0</version>
     <licence>agpl</licence>
     <author>Bjoern Schiessle</author>
     <namespace>CloudFederationAPI</namespace>
@@ -15,6 +15,6 @@
     <category>files</category>
     <bugs>https://github.com/nextcloud/cloud_federation/issues</bugs>
     <dependencies>
-        <nextcloud min-version="14" max-version="14"/>
+        <nextcloud min-version="15" max-version="15"/>
     </dependencies>
 </info>

apps/cloud_federation_api/lib/Capabilities.php

@@ -48,9 +48,10 @@ class Capabilities implements ICapability {
 				'enabled' => true,
 				'apiVersion' => '1.0-proposal1',
 				'endPoint' => substr($url, 0, strrpos($url, '/')),
-				'shareTypes' => [
+				'resourceTypes' => [
 					[
 						'name' => 'file',
+						'shareTypes' => ['user', 'group'],
 						'protocols' => [
 							'webdav' => '/public.php/webdav/',
 						]

apps/comments/appinfo/info.xml

@@ -5,7 +5,7 @@
 	<name>Comments</name>
 	<summary>Files app plugin to add comments to files</summary>
 	<description>Files app plugin to add comments to files</description>
-	<version>1.4.0</version>
+	<version>1.5.0</version>
 	<licence>agpl</licence>
 	<author>Arthur Schiwon</author>
 	<author>Vincent Petry</author>
@@ -17,7 +17,7 @@
 	<category>social</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="14" max-version="14" />
+		<nextcloud min-version="15" max-version="15" />
 	</dependencies>
 
 	<activity>

apps/comments/css/comments.scss

@@ -65,7 +65,7 @@
 #commentsTabView .comment {
 	position: relative;
 	/** padding bottom is little more so that the top and bottom gap look uniform **/
-	padding: 10px 0px 15px;
+	padding: 10px 0 15px;
 }
 
 #commentsTabView .comments .comment {
@@ -112,11 +112,11 @@
 	left: 0;
 	right: 0;
 	bottom: 0;
-	background: -moz-linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
-	background: -webkit-linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
-	background: -o-linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
-	background: -ms-linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
-	background: linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
+	background: -moz-linear-gradient(rgba(var(--color-main-background), 0), var(--color-main-background));
+	background: -webkit-linear-gradient(rgba(var(--color-main-background), 0), var(--color-main-background));
+	background: -o-linear-gradient(rgba(var(--color-main-background), 0), var(--color-main-background));
+	background: -ms-linear-gradient(rgba(var(--color-main-background), 0), var(--color-main-background));
+	background: linear-gradient(rgba(var(--color-main-background), 0), var(--color-main-background));
 	background-repeat: no-repeat;
 }
 

apps/comments/js/commentsmodifymenu.js

@@ -10,25 +10,12 @@
 
 /* global Handlebars */
 (function() {
-	var TEMPLATE_MENU =
-		'<ul>' +
-		'{{#each items}}' +
-		'<li>' +
-		'<a href="#" class="menuitem action {{name}} permanent" data-action="{{name}}">' +
-			'{{#if iconClass}}' +
-				'<span class="icon {{iconClass}}"></span>' +
-			'{{else}}' +
-				'<span class="no-icon"></span>' +
-			'{{/if}}' +
-			'<span>{{displayName}}</span>' +
-		'</li>' +
-		'{{/each}}' +
-		'</ul>';
 
 	/**
 	 * Construct a new CommentsModifyMenuinstance
 	 * @constructs CommentsModifyMenu
 	 * @memberof OC.Comments
+	 * @private
 	 */
 	var CommentsModifyMenu = OC.Backbone.View.extend({
 		tagName: 'div',
@@ -52,8 +39,6 @@
 			'click a.action': '_onClickAction'
 		},
 
-		template: Handlebars.compile(TEMPLATE_MENU),
-
 		/**
 		 * Event handler whenever an action has been clicked within the menu
 		 *
@@ -74,7 +59,7 @@
 		 * Renders the menu with the currently set items
 		 */
 		render: function() {
-			this.$el.html(this.template({
+			this.$el.html(OCA.Comments.Templates['commentsmodifymenu']({
 				items: this._scopes
 			}));
 		},
@@ -121,4 +106,4 @@
 
 	OCA.Comments = OCA.Comments || {};
 	OCA.Comments.CommentsModifyMenu = CommentsModifyMenu;
-})(OC, OCA);
+})(OC, OCA);

apps/comments/js/commentstabview.js

@@ -11,49 +11,6 @@
 /* global Handlebars, escapeHTML */
 
 (function(OC, OCA) {
-	var TEMPLATE =
-		'<ul class="comments">' +
-		'</ul>' +
-		'<div class="emptycontent hidden"><div class="icon-comment"></div>' +
-		'<p>{{emptyResultLabel}}</p></div>' +
-		'<input type="button" class="showMore hidden" value="{{moreLabel}}"' +
-		' name="show-more" id="show-more" />' +
-		'<div class="loading hidden" style="height: 50px"></div>';
-
-	var EDIT_COMMENT_TEMPLATE =
-		'<{{tag}} class="newCommentRow comment" data-id="{{id}}">' +
-		'    <div class="authorRow">' +
-		'        <div class="avatar currentUser" data-username="{{actorId}}"></div>' +
-		'        <div class="author currentUser">{{actorDisplayName}}</div>' +
-		'{{#if isEditMode}}' +
-		'        <div class="action-container">' +
-		'            <a href="#" class="action cancel icon icon-close has-tooltip" title="{{cancelText}}"></a>' +
-		'        </div>' +
-		'{{/if}}' +
-		'    </div>' +
-		'    <form class="newCommentForm">' +
-		'        <div contentEditable="true" class="message" data-placeholder="{{newMessagePlaceholder}}">{{message}}</div>' +
-		'        <input class="submit icon-confirm has-tooltip" type="submit" value="" title="{{submitText}}"/>' +
-		'        <div class="submitLoading icon-loading-small hidden"></div>'+
-		'    </form>' +
-		'</{{tag}}>';
-
-	var COMMENT_TEMPLATE =
-		'<li class="comment{{#if isUnread}} unread{{/if}}{{#if isLong}} collapsed{{/if}}" data-id="{{id}}">' +
-		'    <div class="authorRow">' +
-		'        <div class="avatar{{#if isUserAuthor}} currentUser{{/if}}" {{#if actorId}}data-username="{{actorId}}"{{/if}}> </div>' +
-		'        <div class="author{{#if isUserAuthor}} currentUser{{/if}}">{{actorDisplayName}}</div>' +
-		'{{#if isUserAuthor}}' +
-		'        <a href="#" class="action more icon icon-more has-tooltip"></a>' +
-		'        <div class="deleteLoading icon-loading-small hidden"></div>' +
-		'{{/if}}' +
-		'        <div class="date has-tooltip live-relative-timestamp" data-timestamp="{{timestamp}}" title="{{altDate}}">{{date}}</div>' +
-		'    </div>' +
-		'    <div class="message">{{{formattedMessage}}}</div>' +
-		'{{#if isLong}}' +
-		'    <div class="message-overlay"></div>' +
-		'{{/if}}' +
-		'</li>';
 
 	/**
 	 * @memberof OCA.Comments
@@ -93,22 +50,16 @@
 		},
 
 		template: function(params) {
-			if (!this._template) {
-				this._template = Handlebars.compile(TEMPLATE);
-			}
 			var currentUser = OC.getCurrentUser();
-			return this._template(_.extend({
+			return OCA.Comments.Templates['view'](_.extend({
 				actorId: currentUser.uid,
 				actorDisplayName: currentUser.displayName
 			}, params));
 		},
 
 		editCommentTemplate: function(params) {
-			if (!this._editCommentTemplate) {
-				this._editCommentTemplate = Handlebars.compile(EDIT_COMMENT_TEMPLATE);
-			}
 			var currentUser = OC.getCurrentUser();
-			return this._editCommentTemplate(_.extend({
+			return OCA.Comments.Templates['edit_comment'](_.extend({
 				actorId: currentUser.uid,
 				actorDisplayName: currentUser.displayName,
 				newMessagePlaceholder: t('comments', 'New comment …'),
@@ -119,10 +70,6 @@
 		},
 
 		commentTemplate: function(params) {
-			if (!this._commentTemplate) {
-				this._commentTemplate = Handlebars.compile(COMMENT_TEMPLATE);
-			}
-
 			params = _.extend({
 				editTooltip: t('comments', 'Edit comment'),
 				isUserAuthor: OC.getCurrentUser().uid === params.actorId,
@@ -135,13 +82,17 @@
 				params.actorDisplayName = t('comments', '[Deleted user]');
 			}
 
-			return this._commentTemplate(params);
+			return OCA.Comments.Templates['comment'](params);
 		},
 
 		getLabel: function() {
 			return t('comments', 'Comments');
 		},
 
+		getIcon: function() {
+			return 'icon-comment';
+		},
+
 		setFileInfo: function(fileInfo) {
 			if (fileInfo) {
 				this.model = fileInfo;
@@ -234,9 +185,6 @@
 		},
 
 		_onAutoComplete: function(query, callback) {
-			if(_.isEmpty(query)) {
-				return;
-			}
 			var s = this;
 			if(!_.isUndefined(this._autoCompleteRequestTimer)) {
 				clearTimeout(this._autoCompleteRequestTimer);
@@ -465,15 +413,22 @@
 					return;
 				}
 				var mention = '@' + mentions[i].mentionId;
+				if (mentions[i].mentionId.indexOf(' ') !== -1) {
+					mention = _.escape('@"' + mentions[i].mentionId + '"');
+				}
 
 				// escape possible regex characters in the name
 				mention = mention.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+				var regex = new RegExp("(^|\\s)(" + mention + ")\\b", 'g');
+				if (mentions[i].mentionId.indexOf(' ') !== -1) {
+					regex = new RegExp("(^|\\s)(" + mention + ")", 'g');
+				}
 
 				var displayName = this._composeHTMLMention(mentions[i].mentionId, mentions[i].mentionDisplayName);
 
 				// replace every mention either at the start of the input or after a whitespace
 				// followed by a non-word character.
-				message = message.replace(new RegExp("(^|\\s)(" + mention + ")\\b", 'g'),
+				message = message.replace(regex,
 					function(match, p1) {
 						// to  get number of whitespaces (0 vs 1) right
 						return p1+displayName;
@@ -651,9 +606,14 @@
 			var $comment = $el.clone();
 
 			$comment.find('.avatar-name-wrapper').each(function () {
-				var $this = $(this);
-				var $inserted = $this.parent();
-				$inserted.html('@' + $this.find('.avatar').data('username'));
+				var $this = $(this),
+					$inserted = $this.parent(),
+					userId = $this.find('.avatar').data('username');
+				if (userId.indexOf(' ') !== -1) {
+					$inserted.html('@"' + userId + '"');
+				} else {
+					$inserted.html('@' + userId);
+				}
 			});
 
 			$comment.html(OCP.Comments.richToPlain($comment.html()));

apps/comments/js/filesplugin.js

@@ -16,11 +16,6 @@
 		PROPERTY_COMMENTS_UNREAD:	'{' + OC.Files.Client.NS_OWNCLOUD + '}comments-unread'
 	});
 
-	var TEMPLATE_COMMENTS_UNREAD =
-		'<a class="action action-comment permanent" title="{{countMessage}}" href="#">' +
-		'<img class="svg" src="{{iconUrl}}"/>' +
-		'</a>';
-
 	OCA.Comments = _.extend({}, OCA.Comments);
 	if (!OCA.Comments) {
 		/**
@@ -39,10 +34,7 @@
 		],
 
 		_formatCommentCount: function(count) {
-			if (!this._commentsUnreadTemplate) {
-				this._commentsUnreadTemplate = Handlebars.compile(TEMPLATE_COMMENTS_UNREAD);
-			}
-			return this._commentsUnreadTemplate({
+			return OCA.Comments.Templates['filesplugin']({
 				count: count,
 				countMessage: n('comments', '%n unread comment', '%n unread comments', count),
 				iconUrl: OC.imagePath('core', 'actions/comment')

apps/comments/js/merged.json

@@ -1,5 +1,6 @@
 [
   "app.js",
+  "templates.js",
   "commentmodel.js",
   "commentcollection.js",
   "commentsummarymodel.js",

apps/comments/js/templates.js

@@ -0,0 +1,123 @@
+(function() {
+  var template = Handlebars.template, templates = OCA.Comments.Templates = OCA.Comments.Templates || {};
+templates['comment'] = template({"1":function(container,depth0,helpers,partials,data) {
+    return " unread";
+},"3":function(container,depth0,helpers,partials,data) {
+    return " collapsed";
+},"5":function(container,depth0,helpers,partials,data) {
+    return " currentUser";
+},"7":function(container,depth0,helpers,partials,data) {
+    var helper;
+
+  return "data-username=\""
+    + container.escapeExpression(((helper = (helper = helpers.actorId || (depth0 != null ? depth0.actorId : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"actorId","hash":{},"data":data}) : helper)))
+    + "\"";
+},"9":function(container,depth0,helpers,partials,data) {
+    return "			<a href=\"#\" class=\"action more icon icon-more has-tooltip\"></a>\n			<div class=\"deleteLoading icon-loading-small hidden\"></div>\n";
+},"11":function(container,depth0,helpers,partials,data) {
+    return "		<div class=\"message-overlay\"></div>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+
+  return "<li class=\"comment"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isUnread : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isLong : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\" data-id=\""
+    + alias4(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"id","hash":{},"data":data}) : helper)))
+    + "\">\n	<div class=\"authorRow\">\n		<div class=\"avatar"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isUserAuthor : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\" "
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.actorId : depth0),{"name":"if","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "> </div>\n		<div class=\"author"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isUserAuthor : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\">"
+    + alias4(((helper = (helper = helpers.actorDisplayName || (depth0 != null ? depth0.actorDisplayName : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"actorDisplayName","hash":{},"data":data}) : helper)))
+    + "</div>\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isUserAuthor : depth0),{"name":"if","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "		<div class=\"date has-tooltip live-relative-timestamp\" data-timestamp=\""
+    + alias4(((helper = (helper = helpers.timestamp || (depth0 != null ? depth0.timestamp : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"timestamp","hash":{},"data":data}) : helper)))
+    + "\" title=\""
+    + alias4(((helper = (helper = helpers.altDate || (depth0 != null ? depth0.altDate : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"altDate","hash":{},"data":data}) : helper)))
+    + "\">"
+    + alias4(((helper = (helper = helpers.date || (depth0 != null ? depth0.date : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"date","hash":{},"data":data}) : helper)))
+    + "</div>\n	</div>\n	<div class=\"message\">"
+    + ((stack1 = ((helper = (helper = helpers.formattedMessage || (depth0 != null ? depth0.formattedMessage : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"formattedMessage","hash":{},"data":data}) : helper))) != null ? stack1 : "")
+    + "</div>\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isLong : depth0),{"name":"if","hash":{},"fn":container.program(11, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "</li>\n";
+},"useData":true});
+templates['commentsmodifymenu'] = template({"1":function(container,depth0,helpers,partials,data) {
+    var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+
+  return "		<li>\n			<a href=\"#\" class=\"menuitem action "
+    + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
+    + " permanent\" data-action=\""
+    + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
+    + "\">\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.iconClass : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.program(4, data, 0),"data":data})) != null ? stack1 : "")
+    + "				<span>"
+    + alias4(((helper = (helper = helpers.displayName || (depth0 != null ? depth0.displayName : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"displayName","hash":{},"data":data}) : helper)))
+    + "</span>\n			</a>\n		</li>\n";
+},"2":function(container,depth0,helpers,partials,data) {
+    var helper;
+
+  return "					<span class=\"icon "
+    + container.escapeExpression(((helper = (helper = helpers.iconClass || (depth0 != null ? depth0.iconClass : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"iconClass","hash":{},"data":data}) : helper)))
+    + "\"></span>\n";
+},"4":function(container,depth0,helpers,partials,data) {
+    return "					<span class=\"no-icon\"></span>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "<ul>\n"
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.items : depth0),{"name":"each","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "</ul>\n";
+},"useData":true});
+templates['edit_comment'] = template({"1":function(container,depth0,helpers,partials,data) {
+    var helper;
+
+  return "			<div class=\"action-container\">\n				<a href=\"#\" class=\"action cancel icon icon-close has-tooltip\" title=\""
+    + container.escapeExpression(((helper = (helper = helpers.cancelText || (depth0 != null ? depth0.cancelText : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"cancelText","hash":{},"data":data}) : helper)))
+    + "\"></a>\n			</div>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+
+  return "<"
+    + alias4(((helper = (helper = helpers.tag || (depth0 != null ? depth0.tag : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"tag","hash":{},"data":data}) : helper)))
+    + " class=\"newCommentRow comment\" data-id=\""
+    + alias4(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"id","hash":{},"data":data}) : helper)))
+    + "\">\n	<div class=\"authorRow\">\n		<div class=\"avatar currentUser\" data-username=\""
+    + alias4(((helper = (helper = helpers.actorId || (depth0 != null ? depth0.actorId : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"actorId","hash":{},"data":data}) : helper)))
+    + "\"></div>\n		<div class=\"author currentUser\">"
+    + alias4(((helper = (helper = helpers.actorDisplayName || (depth0 != null ? depth0.actorDisplayName : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"actorDisplayName","hash":{},"data":data}) : helper)))
+    + "</div>\n"
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.isEditMode : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "	</div>\n	<form class=\"newCommentForm\">\n		<div contentEditable=\"true\" class=\"message\" data-placeholder=\""
+    + alias4(((helper = (helper = helpers.newMessagePlaceholder || (depth0 != null ? depth0.newMessagePlaceholder : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"newMessagePlaceholder","hash":{},"data":data}) : helper)))
+    + "\">"
+    + alias4(((helper = (helper = helpers.message || (depth0 != null ? depth0.message : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"message","hash":{},"data":data}) : helper)))
+    + "</div>\n		<input class=\"submit icon-confirm has-tooltip\" type=\"submit\" value=\"\" title=\""
+    + alias4(((helper = (helper = helpers.submitText || (depth0 != null ? depth0.submitText : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"submitText","hash":{},"data":data}) : helper)))
+    + "\"/>\n		<div class=\"submitLoading icon-loading-small hidden\"></div>\n	</form>\n</"
+    + alias4(((helper = (helper = helpers.tag || (depth0 != null ? depth0.tag : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"tag","hash":{},"data":data}) : helper)))
+    + ">\n";
+},"useData":true});
+templates['filesplugin'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+
+  return "<a class=\"action action-comment permanent\" title=\""
+    + alias4(((helper = (helper = helpers.countMessage || (depth0 != null ? depth0.countMessage : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"countMessage","hash":{},"data":data}) : helper)))
+    + "\" href=\"#\">\n	<img class=\"svg\" src=\""
+    + alias4(((helper = (helper = helpers.iconUrl || (depth0 != null ? depth0.iconUrl : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"iconUrl","hash":{},"data":data}) : helper)))
+    + "\"/>\n</a>\n";
+},"useData":true});
+templates['view'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+
+  return "<ul class=\"comments\">\n</ul>\n<div class=\"emptycontent hidden\"><div class=\"icon-comment\"></div>\n	<p>"
+    + alias4(((helper = (helper = helpers.emptyResultLabel || (depth0 != null ? depth0.emptyResultLabel : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"emptyResultLabel","hash":{},"data":data}) : helper)))
+    + "</p></div>\n<input type=\"button\" class=\"showMore hidden\" value=\""
+    + alias4(((helper = (helper = helpers.moreLabel || (depth0 != null ? depth0.moreLabel : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"moreLabel","hash":{},"data":data}) : helper)))
+    + "\" name=\"show-more\" id=\"show-more\" />\n<div class=\"loading hidden\" style=\"height: 50px\"></div>\n";
+},"useData":true});
+})();

apps/comments/js/templates/comment.handlebars

@@ -0,0 +1,15 @@
+<li class="comment{{#if isUnread}} unread{{/if}}{{#if isLong}} collapsed{{/if}}" data-id="{{id}}">
+	<div class="authorRow">
+		<div class="avatar{{#if isUserAuthor}} currentUser{{/if}}" {{#if actorId}}data-username="{{actorId}}"{{/if}}> </div>
+		<div class="author{{#if isUserAuthor}} currentUser{{/if}}">{{actorDisplayName}}</div>
+		{{#if isUserAuthor}}
+			<a href="#" class="action more icon icon-more has-tooltip"></a>
+			<div class="deleteLoading icon-loading-small hidden"></div>
+		{{/if}}
+		<div class="date has-tooltip live-relative-timestamp" data-timestamp="{{timestamp}}" title="{{altDate}}">{{date}}</div>
+	</div>
+	<div class="message">{{{formattedMessage}}}</div>
+	{{#if isLong}}
+		<div class="message-overlay"></div>
+	{{/if}}
+</li>

apps/comments/js/templates/commentsmodifymenu.handlebars

@@ -0,0 +1,14 @@
+<ul>
+	{{#each items}}
+		<li>
+			<a href="#" class="menuitem action {{name}} permanent" data-action="{{name}}">
+				{{#if iconClass}}
+					<span class="icon {{iconClass}}"></span>
+				{{else}}
+					<span class="no-icon"></span>
+				{{/if}}
+				<span>{{displayName}}</span>
+			</a>
+		</li>
+	{{/each}}
+</ul>

apps/comments/js/templates/edit_comment.handlebars

@@ -0,0 +1,16 @@
+<{{tag}} class="newCommentRow comment" data-id="{{id}}">
+	<div class="authorRow">
+		<div class="avatar currentUser" data-username="{{actorId}}"></div>
+		<div class="author currentUser">{{actorDisplayName}}</div>
+		{{#if isEditMode}}
+			<div class="action-container">
+				<a href="#" class="action cancel icon icon-close has-tooltip" title="{{cancelText}}"></a>
+			</div>
+		{{/if}}
+	</div>
+	<form class="newCommentForm">
+		<div contentEditable="true" class="message" data-placeholder="{{newMessagePlaceholder}}">{{message}}</div>
+		<input class="submit icon-confirm has-tooltip" type="submit" value="" title="{{submitText}}"/>
+		<div class="submitLoading icon-loading-small hidden"></div>
+	</form>
+</{{tag}}>

apps/comments/js/templates/filesplugin.handlebars

@@ -0,0 +1,3 @@
+<a class="action action-comment permanent" title="{{countMessage}}" href="#">
+	<img class="svg" src="{{iconUrl}}"/>
+</a>

apps/comments/js/templates/view.handlebars

@@ -0,0 +1,6 @@
+<ul class="comments">
+</ul>
+<div class="emptycontent hidden"><div class="icon-comment"></div>
+	<p>{{emptyResultLabel}}</p></div>
+<input type="button" class="showMore hidden" value="{{moreLabel}}" name="show-more" id="show-more" />
+<div class="loading hidden" style="height: 50px"></div>

apps/comments/l10n/ar.js

@@ -4,7 +4,6 @@ OC.L10N.register(
     "Comments" : "تعليقات",
     "You commented" : "قمت بكتابة تعليق",
     "%1$s commented" : "%1$s كتب تعليق",
-    "You commented on %1$s" : "لقد علقت على %1$s",
     "You commented on {file}" : "علقت على {file}",
     "%1$s commented on %2$s" : "%1$s كتب تعليق على %2$s",
     "{author} commented on {file}" : "{author} علّق على {file}",
@@ -21,7 +20,6 @@ OC.L10N.register(
     "Allowed characters {count} of {max}" : "عدد الأحرف المسموح بها {count} من {max}",
     "Error occurred while updating comment with id {id}" : "حصل خطأ أثناء تعديل التعليق رقم {id}",
     "Error occurred while posting comment" : "حصل خطأ أثناء إرسال التعليق",
-    "_%n unread comment_::_%n unread comments_" : ["%n تعليق غير مقروء","%n تعليق غير مقروء","تعليقان غير مقروءة","%n تعليقات غير مقروء","%n تعليق غير مقروء","%n تعليق غير مقروء"],
     "Comment" : "تعليق"
 },
 "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/comments/l10n/ar.json

@@ -2,7 +2,6 @@
     "Comments" : "تعليقات",
     "You commented" : "قمت بكتابة تعليق",
     "%1$s commented" : "%1$s كتب تعليق",
-    "You commented on %1$s" : "لقد علقت على %1$s",
     "You commented on {file}" : "علقت على {file}",
     "%1$s commented on %2$s" : "%1$s كتب تعليق على %2$s",
     "{author} commented on {file}" : "{author} علّق على {file}",
@@ -19,7 +18,6 @@
     "Allowed characters {count} of {max}" : "عدد الأحرف المسموح بها {count} من {max}",
     "Error occurred while updating comment with id {id}" : "حصل خطأ أثناء تعديل التعليق رقم {id}",
     "Error occurred while posting comment" : "حصل خطأ أثناء إرسال التعليق",
-    "_%n unread comment_::_%n unread comments_" : ["%n تعليق غير مقروء","%n تعليق غير مقروء","تعليقان غير مقروءة","%n تعليقات غير مقروء","%n تعليق غير مقروء","%n تعليق غير مقروء"],
     "Comment" : "تعليق"
 },"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/comments/l10n/ca.js

@@ -27,7 +27,6 @@ OC.L10N.register(
     "Error occurred while updating comment with id {id}" : "Hi ha hagut un error en actualitzar el comentari amb id {id}",
     "Error occurred while posting comment" : "Hi ha hagut un error en publicar el comentari",
     "_%n unread comment_::_%n unread comments_" : ["%n comentari no llegit","%n comentaris no llegits"],
-    "_1 new comment_::_{unread} new comments_" : ["1 comentari nou","{unread} comentaris nous"],
     "Comment" : "Comentari",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Hau estat esmentats a \"%s\" en un comentari d'un usuari que ja no existeix",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s us ha esmentat en un comentari a “%2$s”"

apps/comments/l10n/ca.json

@@ -25,7 +25,6 @@
     "Error occurred while updating comment with id {id}" : "Hi ha hagut un error en actualitzar el comentari amb id {id}",
     "Error occurred while posting comment" : "Hi ha hagut un error en publicar el comentari",
     "_%n unread comment_::_%n unread comments_" : ["%n comentari no llegit","%n comentaris no llegits"],
-    "_1 new comment_::_{unread} new comments_" : ["1 comentari nou","{unread} comentaris nous"],
     "Comment" : "Comentari",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Hau estat esmentats a \"%s\" en un comentari d'un usuari que ja no existeix",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s us ha esmentat en un comentari a “%2$s”"

apps/comments/l10n/da.js

@@ -27,7 +27,6 @@ OC.L10N.register(
     "Error occurred while updating comment with id {id}" : "Der opstod fejl under opdatering af kommentar med id {id}",
     "Error occurred while posting comment" : "Der opstod fejl under indsendelse af kommentar",
     "_%n unread comment_::_%n unread comments_" : ["%n ulæst kommentar","%n ulæste kommentarer"],
-    "_1 new comment_::_{unread} new comments_" : ["1 ny kommentar","{unread} nye kommentarer"],
     "Comment" : "Kommentér",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Du blev nævnt i \"%s”, I en kommentar af en bruger der er blevet slettet efterfølgende",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s nævnte dig i en kommentarer på “%2$s”"

apps/comments/l10n/da.json

@@ -25,7 +25,6 @@
     "Error occurred while updating comment with id {id}" : "Der opstod fejl under opdatering af kommentar med id {id}",
     "Error occurred while posting comment" : "Der opstod fejl under indsendelse af kommentar",
     "_%n unread comment_::_%n unread comments_" : ["%n ulæst kommentar","%n ulæste kommentarer"],
-    "_1 new comment_::_{unread} new comments_" : ["1 ny kommentar","{unread} nye kommentarer"],
     "Comment" : "Kommentér",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Du blev nævnt i \"%s”, I en kommentar af en bruger der er blevet slettet efterfølgende",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s nævnte dig i en kommentarer på “%2$s”"

apps/comments/l10n/el.js

@@ -12,22 +12,21 @@ OC.L10N.register(
     "<strong>Comments</strong> for files" : "<strong>Σχόλια</strong> για αρχεία",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Το όνομά σας αναφέρθηκε στο “{file}”, σε σχόλιο ενός χρήστη ο οποίος έχει πλέον διαγραφεί",
     "{user} mentioned you in a comment on “{file}”" : "Ο {user} σας ανέφερε σε σχόλιο στο “{file}”",
-    "Files app plugin to add comments to files" : "Επέκταση της εφαρμογής αρχείων που επιτρέπει την προσθήκη σχολίων σε αρχεία",
+    "Files app plugin to add comments to files" : "Επέκταση της εφαρμογής αρχείων που επιτρέπει την προσθήκη σχολίων σε αρχεία.",
     "Edit comment" : "Επεξεργασία σχολίου",
     "Delete comment" : "Διαγραφή σχολίου",
-    "New comment …" : "Νέο σχόλιο …",
+    "New comment …" : "Νέο σχόλιο ...",
     "Post" : "Δημοσίευση",
     "Cancel" : "Ακύρωση",
     "[Deleted user]" : "[Διαγραμμένος χρήστης]",
     "No comments yet, start the conversation!" : "Δεν υπάρχουν σχόλια, ξεκινήστε την συζήτηση!",
-    "More comments …" : "Περισσότερα σχόλια …",
+    "More comments …" : "Περισσότερα σχόλια ...",
     "Save" : "Αποθήκευση",
     "Allowed characters {count} of {max}" : "Επιτρεπόμενοι χαρακτήρες {count} από {max}",
     "Error occurred while retrieving comment with ID {id}" : "Παρουσιάστηκε σφάλμα κατά την ανάκτηση σχολίου με ID {id}",
-    "Error occurred while updating comment with id {id}" : "Ένα σφάλμα προέκυψε κατά την ενημέρωση του σχολίου με το id {id}",
+    "Error occurred while updating comment with id {id}" : "Ένα σφάλμα προέκυψε κατά την ενημέρωση του σχολίου με το αναγνωριστικό {id}",
     "Error occurred while posting comment" : "Ένα σφάλμα προέκυψε κατά την δημοσίευση σχολίου",
     "_%n unread comment_::_%n unread comments_" : ["%n αδιάβαστο σχόλιο","%n αδιάβαστα σχόλια"],
-    "_1 new comment_::_{unread} new comments_" : ["1 νέο σχόλιο","{unread} νέα σχόλια"],
     "Comment" : "Σχόλιο",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Το όνομά σας αναφέρθηκε στο \"%s\", σε σχόλιο ενός χρήστη ο οποίος έχει πλέον διαγραφεί",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s σας ανέφερε σε σχόλιο στο “%2$s”"

apps/comments/l10n/el.json

@@ -10,22 +10,21 @@
     "<strong>Comments</strong> for files" : "<strong>Σχόλια</strong> για αρχεία",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Το όνομά σας αναφέρθηκε στο “{file}”, σε σχόλιο ενός χρήστη ο οποίος έχει πλέον διαγραφεί",
     "{user} mentioned you in a comment on “{file}”" : "Ο {user} σας ανέφερε σε σχόλιο στο “{file}”",
-    "Files app plugin to add comments to files" : "Επέκταση της εφαρμογής αρχείων που επιτρέπει την προσθήκη σχολίων σε αρχεία",
+    "Files app plugin to add comments to files" : "Επέκταση της εφαρμογής αρχείων που επιτρέπει την προσθήκη σχολίων σε αρχεία.",
     "Edit comment" : "Επεξεργασία σχολίου",
     "Delete comment" : "Διαγραφή σχολίου",
-    "New comment …" : "Νέο σχόλιο …",
+    "New comment …" : "Νέο σχόλιο ...",
     "Post" : "Δημοσίευση",
     "Cancel" : "Ακύρωση",
     "[Deleted user]" : "[Διαγραμμένος χρήστης]",
     "No comments yet, start the conversation!" : "Δεν υπάρχουν σχόλια, ξεκινήστε την συζήτηση!",
-    "More comments …" : "Περισσότερα σχόλια …",
+    "More comments …" : "Περισσότερα σχόλια ...",
     "Save" : "Αποθήκευση",
     "Allowed characters {count} of {max}" : "Επιτρεπόμενοι χαρακτήρες {count} από {max}",
     "Error occurred while retrieving comment with ID {id}" : "Παρουσιάστηκε σφάλμα κατά την ανάκτηση σχολίου με ID {id}",
-    "Error occurred while updating comment with id {id}" : "Ένα σφάλμα προέκυψε κατά την ενημέρωση του σχολίου με το id {id}",
+    "Error occurred while updating comment with id {id}" : "Ένα σφάλμα προέκυψε κατά την ενημέρωση του σχολίου με το αναγνωριστικό {id}",
     "Error occurred while posting comment" : "Ένα σφάλμα προέκυψε κατά την δημοσίευση σχολίου",
     "_%n unread comment_::_%n unread comments_" : ["%n αδιάβαστο σχόλιο","%n αδιάβαστα σχόλια"],
-    "_1 new comment_::_{unread} new comments_" : ["1 νέο σχόλιο","{unread} νέα σχόλια"],
     "Comment" : "Σχόλιο",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Το όνομά σας αναφέρθηκε στο \"%s\", σε σχόλιο ενός χρήστη ο οποίος έχει πλέον διαγραφεί",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s σας ανέφερε σε σχόλιο στο “%2$s”"

apps/comments/l10n/eo.js

@@ -27,7 +27,6 @@ OC.L10N.register(
     "Error occurred while updating comment with id {id}" : "Eraro dum ĝisdatigo de komento kun identigilo {id}",
     "Error occurred while posting comment" : "Eraro dum sendo de komento",
     "_%n unread comment_::_%n unread comments_" : ["%n nelegataj komentoj","%n nelegataj komentoj"],
-    "_1 new comment_::_{unread} new comments_" : ["1 nova komento","{unread} novaj komentoj"],
     "Comment" : "Komento",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Vi estis menciita en „%s“, en komento de uzanto, kiu ekde tiam estis forigita",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s menciis vin en komento pri „%2$s“"

apps/comments/l10n/eo.json

@@ -25,7 +25,6 @@
     "Error occurred while updating comment with id {id}" : "Eraro dum ĝisdatigo de komento kun identigilo {id}",
     "Error occurred while posting comment" : "Eraro dum sendo de komento",
     "_%n unread comment_::_%n unread comments_" : ["%n nelegataj komentoj","%n nelegataj komentoj"],
-    "_1 new comment_::_{unread} new comments_" : ["1 nova komento","{unread} novaj komentoj"],
     "Comment" : "Komento",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Vi estis menciita en „%s“, en komento de uzanto, kiu ekde tiam estis forigita",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s menciis vin en komento pri „%2$s“"

apps/comments/l10n/eu.js

@@ -10,9 +10,7 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s %2$s-en iruzkin du",
     "{author} commented on {file}" : "{author}-(e)k {file}-en iruzkin du",
     "<strong>Comments</strong> for files" : "Fitxategientzako <strong>iruzkinak",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : " “{file}” fitxategian ezabatu izan den erabiltzaile batek aipatu zaitu",
     "{user} mentioned you in a comment on “{file}”" : "{user}-(e)k aipatu zaitu iruzkinean “{file}”",
-    "Files app plugin to add comments to files" : "Fitxategiei iruzkinak gehitzeko fitxategien aplikazioaren plugina",
     "Edit comment" : "Iruzkina editatu",
     "Delete comment" : "Ezabatu iruzkina",
     "New comment …" : "Iruzkin berria...",
@@ -24,12 +22,10 @@ OC.L10N.register(
     "Save" : "Gorde",
     "Allowed characters {count} of {max}" : "Onartutako karaktereak {max}-tik {count}",
     "Error occurred while retrieving comment with ID {id}" : "Errorea gertatu da {id} ID-a duen iruzkina berreskuratzerakoan",
-    "Error occurred while updating comment with id {id}" : "Errore bat gertatu da {id} id-a duen iruzkina aldatzerakoan",
-    "Error occurred while posting comment" : "Errore bat gertatu da iruzkina bidaltzerakoan",
+    "Error occurred while updating comment with id {id}" : "Akats bat gertatu da {id} id duen iruzkina aldatzerakoan",
+    "Error occurred while posting comment" : "Akats bat gertatu da iruzkina bidaltzerakoan",
     "_%n unread comment_::_%n unread comments_" : ["iruzkin %n irakurri gabe","%n iruzkin irakurri gabe"],
-    "_1 new comment_::_{unread} new comments_" : ["Iruzkin berri 1","{unread} iruzkin berri"],
     "Comment" : "Iruzkina",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "“%s” iruzkinean dagoeneko ezabatuta dagoen erabiltzaile batek aipatu zaitu.",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s-(e)k aipatu zaitu iruzkinean “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/eu.json

@@ -8,9 +8,7 @@
     "%1$s commented on %2$s" : "%1$s %2$s-en iruzkin du",
     "{author} commented on {file}" : "{author}-(e)k {file}-en iruzkin du",
     "<strong>Comments</strong> for files" : "Fitxategientzako <strong>iruzkinak",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : " “{file}” fitxategian ezabatu izan den erabiltzaile batek aipatu zaitu",
     "{user} mentioned you in a comment on “{file}”" : "{user}-(e)k aipatu zaitu iruzkinean “{file}”",
-    "Files app plugin to add comments to files" : "Fitxategiei iruzkinak gehitzeko fitxategien aplikazioaren plugina",
     "Edit comment" : "Iruzkina editatu",
     "Delete comment" : "Ezabatu iruzkina",
     "New comment …" : "Iruzkin berria...",
@@ -22,12 +20,10 @@
     "Save" : "Gorde",
     "Allowed characters {count} of {max}" : "Onartutako karaktereak {max}-tik {count}",
     "Error occurred while retrieving comment with ID {id}" : "Errorea gertatu da {id} ID-a duen iruzkina berreskuratzerakoan",
-    "Error occurred while updating comment with id {id}" : "Errore bat gertatu da {id} id-a duen iruzkina aldatzerakoan",
-    "Error occurred while posting comment" : "Errore bat gertatu da iruzkina bidaltzerakoan",
+    "Error occurred while updating comment with id {id}" : "Akats bat gertatu da {id} id duen iruzkina aldatzerakoan",
+    "Error occurred while posting comment" : "Akats bat gertatu da iruzkina bidaltzerakoan",
     "_%n unread comment_::_%n unread comments_" : ["iruzkin %n irakurri gabe","%n iruzkin irakurri gabe"],
-    "_1 new comment_::_{unread} new comments_" : ["Iruzkin berri 1","{unread} iruzkin berri"],
     "Comment" : "Iruzkina",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "“%s” iruzkinean dagoeneko ezabatuta dagoen erabiltzaile batek aipatu zaitu.",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s-(e)k aipatu zaitu iruzkinean “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/fi.js

@@ -26,7 +26,6 @@ OC.L10N.register(
     "Error occurred while updating comment with id {id}" : "Virhe päivittäessä kommenttia tunnisteella {id}",
     "Error occurred while posting comment" : "Virhe kommenttia lähettäessä",
     "_%n unread comment_::_%n unread comments_" : ["%n lukematon kommentti","%n lukematonta kommenttia"],
-    "_1 new comment_::_{unread} new comments_" : ["1 uusi kommentti","{unread} uutta kommenttia"],
     "Comment" : "Kommentti",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s mainitsi sinut kommentissa “%2$s”"
 },

apps/comments/l10n/fi.json

@@ -24,7 +24,6 @@
     "Error occurred while updating comment with id {id}" : "Virhe päivittäessä kommenttia tunnisteella {id}",
     "Error occurred while posting comment" : "Virhe kommenttia lähettäessä",
     "_%n unread comment_::_%n unread comments_" : ["%n lukematon kommentti","%n lukematonta kommenttia"],
-    "_1 new comment_::_{unread} new comments_" : ["1 uusi kommentti","{unread} uutta kommenttia"],
     "Comment" : "Kommentti",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s mainitsi sinut kommentissa “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"

apps/comments/l10n/hr.js

@@ -1,35 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Comments" : "Komentari",
-    "You commented" : "Vi ste komentirali",
-    "%1$s commented" : "Komentirao je %1$s",
-    "{author} commented" : "{autor} je komentirao",
-    "You commented on %1$s" : "Vi ste komentirali %1$s",
-    "You commented on {file}" : "Komentirali ste {file}",
-    "%1$s commented on %2$s" : "%1$s je komentirao %2$s",
-    "{author} commented on {file}" : "{author} je komentirao {file}",
-    "<strong>Comments</strong> for files" : "<strong>Komentari</strong> za datoteke",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Spomenuti ste u „{file}”, u komentaru korisnika koji je nakon toga izbrisan",
-    "{user} mentioned you in a comment on “{file}”" : "{user} vas je spomenuo u komentaru na „{file}”",
-    "Files app plugin to add comments to files" : "Dodatak za aplikaciju Datoteke za dodavanje komentara na datoteke",
-    "Edit comment" : "Uredi komentar",
-    "Delete comment" : "Izbriši komentar",
-    "New comment …" : "Novi komentar…",
-    "Post" : "Objavi",
-    "Cancel" : "Odustani",
-    "[Deleted user]" : "[Izbrisan korisnik]",
-    "No comments yet, start the conversation!" : "Još nema komentara, započnite razgovor!",
-    "More comments …" : "Više komentara...",
-    "Save" : "Spremi",
-    "Allowed characters {count} of {max}" : "Dopušteni znakovi {count} od {max}",
-    "Error occurred while retrieving comment with ID {id}" : "Došlo je do pogreške prilikom dohvaćanja komentara s ID-om {id}",
-    "Error occurred while updating comment with id {id}" : "Došlo je do pogreške prilikom ažuriranja komentara s ID-om {id}",
-    "Error occurred while posting comment" : "Došlo je do pogreške prilikom objavljivanja komentara",
-    "_%n unread comment_::_%n unread comments_" : ["%n nepročitani komentar","%n nepročitanih komentara","%n nepročitanih komentara"],
-    "_1 new comment_::_{unread} new comments_" : ["1 novi komentar","{unread} novih komentara","{unread} novih komentara"],
-    "Comment" : "Komentar",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Spomenuti ste u „%s”, u komentaru korisnika koji je nakon toga izbrisan",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s vas je spomenuo u komentaru na „%2$s”"
+    "Cancel" : "Odustanite",
+    "Save" : "Spremi"
 },
 "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/comments/l10n/hr.json

@@ -1,33 +1,5 @@
 { "translations": {
-    "Comments" : "Komentari",
-    "You commented" : "Vi ste komentirali",
-    "%1$s commented" : "Komentirao je %1$s",
-    "{author} commented" : "{autor} je komentirao",
-    "You commented on %1$s" : "Vi ste komentirali %1$s",
-    "You commented on {file}" : "Komentirali ste {file}",
-    "%1$s commented on %2$s" : "%1$s je komentirao %2$s",
-    "{author} commented on {file}" : "{author} je komentirao {file}",
-    "<strong>Comments</strong> for files" : "<strong>Komentari</strong> za datoteke",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Spomenuti ste u „{file}”, u komentaru korisnika koji je nakon toga izbrisan",
-    "{user} mentioned you in a comment on “{file}”" : "{user} vas je spomenuo u komentaru na „{file}”",
-    "Files app plugin to add comments to files" : "Dodatak za aplikaciju Datoteke za dodavanje komentara na datoteke",
-    "Edit comment" : "Uredi komentar",
-    "Delete comment" : "Izbriši komentar",
-    "New comment …" : "Novi komentar…",
-    "Post" : "Objavi",
-    "Cancel" : "Odustani",
-    "[Deleted user]" : "[Izbrisan korisnik]",
-    "No comments yet, start the conversation!" : "Još nema komentara, započnite razgovor!",
-    "More comments …" : "Više komentara...",
-    "Save" : "Spremi",
-    "Allowed characters {count} of {max}" : "Dopušteni znakovi {count} od {max}",
-    "Error occurred while retrieving comment with ID {id}" : "Došlo je do pogreške prilikom dohvaćanja komentara s ID-om {id}",
-    "Error occurred while updating comment with id {id}" : "Došlo je do pogreške prilikom ažuriranja komentara s ID-om {id}",
-    "Error occurred while posting comment" : "Došlo je do pogreške prilikom objavljivanja komentara",
-    "_%n unread comment_::_%n unread comments_" : ["%n nepročitani komentar","%n nepročitanih komentara","%n nepročitanih komentara"],
-    "_1 new comment_::_{unread} new comments_" : ["1 novi komentar","{unread} novih komentara","{unread} novih komentara"],
-    "Comment" : "Komentar",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Spomenuti ste u „%s”, u komentaru korisnika koji je nakon toga izbrisan",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s vas je spomenuo u komentaru na „%2$s”"
+    "Cancel" : "Odustanite",
+    "Save" : "Spremi"
 },"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/comments/l10n/hu.js

@@ -27,7 +27,6 @@ OC.L10N.register(
     "Error occurred while updating comment with id {id}" : "Hiba a(z) {id} azonosítójú hozzászólás frissítésekor",
     "Error occurred while posting comment" : "Hiba történt a hozzászólás küldése közben",
     "_%n unread comment_::_%n unread comments_" : ["%n olvasatlan hozzászólás","%n olvasatlan hozzászólás"],
-    "_1 new comment_::_{unread} new comments_" : ["1 új hozzászólás","{unread} új hozzászólás"],
     "Comment" : "Hozzászólás",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Megemlítették ennél: „%s”, egy már törölt felhasználó hozzászólásában",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s megemlítette egy hozzászólásban ennél: „%2$s”"

apps/comments/l10n/hu.json

@@ -25,7 +25,6 @@
     "Error occurred while updating comment with id {id}" : "Hiba a(z) {id} azonosítójú hozzászólás frissítésekor",
     "Error occurred while posting comment" : "Hiba történt a hozzászólás küldése közben",
     "_%n unread comment_::_%n unread comments_" : ["%n olvasatlan hozzászólás","%n olvasatlan hozzászólás"],
-    "_1 new comment_::_{unread} new comments_" : ["1 új hozzászólás","{unread} új hozzászólás"],
     "Comment" : "Hozzászólás",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Megemlítették ennél: „%s”, egy már törölt felhasználó hozzászólásában",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s megemlítette egy hozzászólásban ennél: „%2$s”"

apps/comments/l10n/is.js

@@ -27,7 +27,6 @@ OC.L10N.register(
     "Error occurred while updating comment with id {id}" : "Villa kom upp við að reyna að uppfæra athugasemd með auðkenninu {id}",
     "Error occurred while posting comment" : "Villa kom upp við að senda inn athugasemd",
     "_%n unread comment_::_%n unread comments_" : ["%n ólesin athugasemd","%n ólesnar athugasemdir"],
-    "_1 new comment_::_{unread} new comments_" : ["1 ný athugasemd","{unread} nýjar athugasemdir"],
     "Comment" : "Athugasemd",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Minnst var á þig í “%s”, í athugasemd frá notanda sem síðan þá hefur verið eytt",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s minntist á þig í athugasemd við “%2$s”"

apps/comments/l10n/is.json

@@ -25,7 +25,6 @@
     "Error occurred while updating comment with id {id}" : "Villa kom upp við að reyna að uppfæra athugasemd með auðkenninu {id}",
     "Error occurred while posting comment" : "Villa kom upp við að senda inn athugasemd",
     "_%n unread comment_::_%n unread comments_" : ["%n ólesin athugasemd","%n ólesnar athugasemdir"],
-    "_1 new comment_::_{unread} new comments_" : ["1 ný athugasemd","{unread} nýjar athugasemdir"],
     "Comment" : "Athugasemd",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Minnst var á þig í “%s”, í athugasemd frá notanda sem síðan þá hefur verið eytt",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s minntist á þig í athugasemd við “%2$s”"

apps/comments/l10n/ja.js

@@ -27,7 +27,6 @@ OC.L10N.register(
     "Error occurred while updating comment with id {id}" : "ID {id} のコメント更新中にエラーが発生しました",
     "Error occurred while posting comment" : "コメント投稿中にエラーが発生しました",
     "_%n unread comment_::_%n unread comments_" : ["%n の未読のコメント"],
-    "_1 new comment_::_{unread} new comments_" : ["の未読のコメント {unread}"],
     "Comment" : "コメント",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "削除されたユーザーのコメントで %s にあなたに言及しました",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s さんが “%2$s” のコメントであなたについて言及しました。"

apps/comments/l10n/ja.json

@@ -25,7 +25,6 @@
     "Error occurred while updating comment with id {id}" : "ID {id} のコメント更新中にエラーが発生しました",
     "Error occurred while posting comment" : "コメント投稿中にエラーが発生しました",
     "_%n unread comment_::_%n unread comments_" : ["%n の未読のコメント"],
-    "_1 new comment_::_{unread} new comments_" : ["の未読のコメント {unread}"],
     "Comment" : "コメント",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "削除されたユーザーのコメントで %s にあなたに言及しました",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s さんが “%2$s” のコメントであなたについて言及しました。"

apps/comments/l10n/ko.js

@@ -12,7 +12,6 @@ OC.L10N.register(
     "<strong>Comments</strong> for files" : "파일의 <strong>댓글</strong>",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "삭제된 사용자가 남긴 “{file}”의 댓글에서 여러분을 언급함",
     "{user} mentioned you in a comment on “{file}”" : "{user} 님이 “{file}”에 남긴 댓글에서 여러분을 언급함",
-    "Files app plugin to add comments to files" : "파일에 댓글을 남기는 파일 앱 플러그인",
     "Edit comment" : "댓글 편집",
     "Delete comment" : "댓글 삭제",
     "New comment …" : "새로운 댓글 …",
@@ -22,12 +21,10 @@ OC.L10N.register(
     "No comments yet, start the conversation!" : "아직 댓글이 없습니다. 대화를 시작하십시오!",
     "More comments …" : "더 많은 댓글 …",
     "Save" : "저장",
-    "Allowed characters {count} of {max}" : "{count}/{max}글자 사용 가능",
-    "Error occurred while retrieving comment with ID {id}" : "댓글 ID {id} 가져오기 오류",
+    "Allowed characters {count} of {max}" : "{count}/{max} 글자 사용 가능",
     "Error occurred while updating comment with id {id}" : "댓글 ID {id}을(를) 업데이트하는 동안 오류가 발생했습니다 ",
     "Error occurred while posting comment" : "댓글을 게시하는 중 오류가 발생했습니다",
     "_%n unread comment_::_%n unread comments_" : ["읽지 않은 댓글 %n개"],
-    "_1 new comment_::_{unread} new comments_" : ["새 댓글 {unread}개"],
     "Comment" : "설명",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "삭제된 사용자가 남긴 “%s”의 댓글에서 여러분을 언급함",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s 님이 “%2$s”에 남긴 댓글에서 여러분을 언급함"

apps/comments/l10n/ko.json

@@ -10,7 +10,6 @@
     "<strong>Comments</strong> for files" : "파일의 <strong>댓글</strong>",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "삭제된 사용자가 남긴 “{file}”의 댓글에서 여러분을 언급함",
     "{user} mentioned you in a comment on “{file}”" : "{user} 님이 “{file}”에 남긴 댓글에서 여러분을 언급함",
-    "Files app plugin to add comments to files" : "파일에 댓글을 남기는 파일 앱 플러그인",
     "Edit comment" : "댓글 편집",
     "Delete comment" : "댓글 삭제",
     "New comment …" : "새로운 댓글 …",
@@ -20,12 +19,10 @@
     "No comments yet, start the conversation!" : "아직 댓글이 없습니다. 대화를 시작하십시오!",
     "More comments …" : "더 많은 댓글 …",
     "Save" : "저장",
-    "Allowed characters {count} of {max}" : "{count}/{max}글자 사용 가능",
-    "Error occurred while retrieving comment with ID {id}" : "댓글 ID {id} 가져오기 오류",
+    "Allowed characters {count} of {max}" : "{count}/{max} 글자 사용 가능",
     "Error occurred while updating comment with id {id}" : "댓글 ID {id}을(를) 업데이트하는 동안 오류가 발생했습니다 ",
     "Error occurred while posting comment" : "댓글을 게시하는 중 오류가 발생했습니다",
     "_%n unread comment_::_%n unread comments_" : ["읽지 않은 댓글 %n개"],
-    "_1 new comment_::_{unread} new comments_" : ["새 댓글 {unread}개"],
     "Comment" : "설명",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "삭제된 사용자가 남긴 “%s”의 댓글에서 여러분을 언급함",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s 님이 “%2$s”에 남긴 댓글에서 여러분을 언급함"

apps/comments/l10n/lt_LT.js

@@ -11,7 +11,6 @@ OC.L10N.register(
     "{author} commented on {file}" : "{author} pakomentavo {file}",
     "<strong>Comments</strong> for files" : "<strong>Failų komentarai</strong>",
     "{user} mentioned you in a comment on “{file}”" : "{user} jus paminėjo komentare “{file}”",
-    "Files app plugin to add comments to files" : "Failų programėlės įskiepis, skirtas prie failų pridėti komentarus",
     "Edit comment" : "Taisyti komentarą",
     "Delete comment" : "Ištrinti komentarą",
     "New comment …" : "Naujas komentaras …",
@@ -22,11 +21,9 @@ OC.L10N.register(
     "More comments …" : "Daugiau",
     "Save" : "Įrašyti",
     "Allowed characters {count} of {max}" : "Leidžiama simbolių {count} iš {max}",
-    "Error occurred while retrieving comment with ID {id}" : "Klaida gaunant komentarą, kurio ID {id}",
     "Error occurred while updating comment with id {id}" : "Klaida bandant pataisyti komentarą pagal identifikavimo numerį {id}",
     "Error occurred while posting comment" : "Skelbiant komentarą, įvyko klaida",
-    "_%n unread comment_::_%n unread comments_" : ["%n neskaitytas komentaras","%n neskaityti komentarai","%n neskaitytų komentarų","%n neskaitytas komentaras"],
-    "_1 new comment_::_{unread} new comments_" : ["1 neskaitytas komentaras","{unread} neskaityti komentarai","{unread} neskaitytų komentarų","{unread} neskaitytas komentaras"],
+    "_%n unread comment_::_%n unread comments_" : ["%n neskaitytas komentaras","%n neskaityti komentarai","%n neskaitytų komentarų","%n neskaitytų komentarų"],
     "Comment" : "Komentaras",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s jus paminėjo komentare \"%2$s\""
 },

apps/comments/l10n/lt_LT.json

@@ -9,7 +9,6 @@
     "{author} commented on {file}" : "{author} pakomentavo {file}",
     "<strong>Comments</strong> for files" : "<strong>Failų komentarai</strong>",
     "{user} mentioned you in a comment on “{file}”" : "{user} jus paminėjo komentare “{file}”",
-    "Files app plugin to add comments to files" : "Failų programėlės įskiepis, skirtas prie failų pridėti komentarus",
     "Edit comment" : "Taisyti komentarą",
     "Delete comment" : "Ištrinti komentarą",
     "New comment …" : "Naujas komentaras …",
@@ -20,11 +19,9 @@
     "More comments …" : "Daugiau",
     "Save" : "Įrašyti",
     "Allowed characters {count} of {max}" : "Leidžiama simbolių {count} iš {max}",
-    "Error occurred while retrieving comment with ID {id}" : "Klaida gaunant komentarą, kurio ID {id}",
     "Error occurred while updating comment with id {id}" : "Klaida bandant pataisyti komentarą pagal identifikavimo numerį {id}",
     "Error occurred while posting comment" : "Skelbiant komentarą, įvyko klaida",
-    "_%n unread comment_::_%n unread comments_" : ["%n neskaitytas komentaras","%n neskaityti komentarai","%n neskaitytų komentarų","%n neskaitytas komentaras"],
-    "_1 new comment_::_{unread} new comments_" : ["1 neskaitytas komentaras","{unread} neskaityti komentarai","{unread} neskaitytų komentarų","{unread} neskaitytas komentaras"],
+    "_%n unread comment_::_%n unread comments_" : ["%n neskaitytas komentaras","%n neskaityti komentarai","%n neskaitytų komentarų","%n neskaitytų komentarų"],
     "Comment" : "Komentaras",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s jus paminėjo komentare \"%2$s\""
 },"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/comments/l10n/mk.js

@@ -1,35 +1,9 @@
 OC.L10N.register(
     "comments",
     {
-    "Comments" : "Коментари",
-    "You commented" : "Вие коментиравте",
-    "%1$s commented" : "%1$s коментиран",
-    "{author} commented" : "{author} коментираше",
-    "You commented on %1$s" : "Коментиравте на %1$s",
-    "You commented on {file}" : "Коментиравте на {file}",
-    "%1$s commented on %2$s" : "%1$s коментираше на %2$s",
-    "{author} commented on {file}" : "{author} коментираше на {file}",
-    "<strong>Comments</strong> for files" : "<strong>Коментари</strong> за датотеки",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Бевте спомнати на коментар на “{file}”, од корисник кој сега е избришан",
-    "{user} mentioned you in a comment on “{file}”" : "{user} те спомна во коментар на датотеката “{file}”",
-    "Files app plugin to add comments to files" : "Додади додаток за коментирање на датотеки",
-    "Edit comment" : "Измени го коментарот",
-    "Delete comment" : "Избриши коментар",
-    "New comment …" : "Нов коментар ...",
-    "Post" : "Испрати",
     "Cancel" : "Откажи",
-    "[Deleted user]" : "[Избришан корисник]",
-    "No comments yet, start the conversation!" : "Сеуште нема коментари, започнете разговор!",
-    "More comments …" : "Повеќе коментари ...",
     "Save" : "Сними",
-    "Allowed characters {count} of {max}" : "Дозволен број на карактери {count} од {max}",
-    "Error occurred while retrieving comment with ID {id}" : "Настана грешка при обидот за вчитување на коментарот со број {id}",
-    "Error occurred while updating comment with id {id}" : "Настана грешка при обидот за ажурирање на коментарот со број {id}",
-    "Error occurred while posting comment" : "Настана грешка при обидот за испраќање на коментарот",
-    "_%n unread comment_::_%n unread comments_" : ["%n непрочитан коментар","%n непрочитани коментари"],
-    "_1 new comment_::_{unread} new comments_" : ["1 нов коментар","{unread} нови коментари"],
     "Comment" : "Коментар",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Бевте спомнати на коментар на “%s”,од корисник кој сега е избришан",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s те спомна во коментар на датотеката “%2$s”"
+    "%1$s commented" : "%1$s коментиран"
 },
 "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");

apps/comments/l10n/mk.json

@@ -1,33 +1,7 @@
 { "translations": {
-    "Comments" : "Коментари",
-    "You commented" : "Вие коментиравте",
-    "%1$s commented" : "%1$s коментиран",
-    "{author} commented" : "{author} коментираше",
-    "You commented on %1$s" : "Коментиравте на %1$s",
-    "You commented on {file}" : "Коментиравте на {file}",
-    "%1$s commented on %2$s" : "%1$s коментираше на %2$s",
-    "{author} commented on {file}" : "{author} коментираше на {file}",
-    "<strong>Comments</strong> for files" : "<strong>Коментари</strong> за датотеки",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Бевте спомнати на коментар на “{file}”, од корисник кој сега е избришан",
-    "{user} mentioned you in a comment on “{file}”" : "{user} те спомна во коментар на датотеката “{file}”",
-    "Files app plugin to add comments to files" : "Додади додаток за коментирање на датотеки",
-    "Edit comment" : "Измени го коментарот",
-    "Delete comment" : "Избриши коментар",
-    "New comment …" : "Нов коментар ...",
-    "Post" : "Испрати",
     "Cancel" : "Откажи",
-    "[Deleted user]" : "[Избришан корисник]",
-    "No comments yet, start the conversation!" : "Сеуште нема коментари, започнете разговор!",
-    "More comments …" : "Повеќе коментари ...",
     "Save" : "Сними",
-    "Allowed characters {count} of {max}" : "Дозволен број на карактери {count} од {max}",
-    "Error occurred while retrieving comment with ID {id}" : "Настана грешка при обидот за вчитување на коментарот со број {id}",
-    "Error occurred while updating comment with id {id}" : "Настана грешка при обидот за ажурирање на коментарот со број {id}",
-    "Error occurred while posting comment" : "Настана грешка при обидот за испраќање на коментарот",
-    "_%n unread comment_::_%n unread comments_" : ["%n непрочитан коментар","%n непрочитани коментари"],
-    "_1 new comment_::_{unread} new comments_" : ["1 нов коментар","{unread} нови коментари"],
     "Comment" : "Коментар",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Бевте спомнати на коментар на “%s”,од корисник кој сега е избришан",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s те спомна во коментар на датотеката “%2$s”"
+    "%1$s commented" : "%1$s коментиран"
 },"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
 }

apps/comments/l10n/ru.js

@@ -27,7 +27,6 @@ OC.L10N.register(
     "Error occurred while updating comment with id {id}" : "При обновлении комментария с id {id} произошла ошибка",
     "Error occurred while posting comment" : "При сохранении комментария произошла ошибка",
     "_%n unread comment_::_%n unread comments_" : ["%n непрочитанный комментарий","%n непрочитанных комментариев","%n непрочитанных комментариев","%n непрочитанных комментариев"],
-    "_1 new comment_::_{unread} new comments_" : ["1 новый комментарий","{unread} новых комментариев","{unread} новых комментариев","{unread} новых комментариев"],
     "Comment" : "Комментарий",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Вы были упомянуты в комментарии к файлу «%s» пользователем, учётная запись которого была удалена",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s упомянул вас в комментарии к \"%2$s\""

apps/comments/l10n/ru.json

@@ -25,7 +25,6 @@
     "Error occurred while updating comment with id {id}" : "При обновлении комментария с id {id} произошла ошибка",
     "Error occurred while posting comment" : "При сохранении комментария произошла ошибка",
     "_%n unread comment_::_%n unread comments_" : ["%n непрочитанный комментарий","%n непрочитанных комментариев","%n непрочитанных комментариев","%n непрочитанных комментариев"],
-    "_1 new comment_::_{unread} new comments_" : ["1 новый комментарий","{unread} новых комментариев","{unread} новых комментариев","{unread} новых комментариев"],
     "Comment" : "Комментарий",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Вы были упомянуты в комментарии к файлу «%s» пользователем, учётная запись которого была удалена",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s упомянул вас в комментарии к \"%2$s\""

apps/comments/l10n/sk.js

@@ -27,7 +27,6 @@ OC.L10N.register(
     "Error occurred while updating comment with id {id}" : "Pri aktualizovaní komentára s id {id} nastala chyba",
     "Error occurred while posting comment" : "Pri odosielaní komentára nastala chyba",
     "_%n unread comment_::_%n unread comments_" : ["%n neprečítaný komentár","%n neprečítaných komentárov","%n neprečítaných komentárov","%n neprečítaných komentárov"],
-    "_1 new comment_::_{unread} new comments_" : ["1 nový komentár","{unread} nové komentáre","{unread} nových komentárov","{unread} nových komentárov"],
     "Comment" : "Komentár",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Boli ste spomenutý v \"%s\", v komentári používateľom ktorý bol už vymazaný",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s vás spomenul v komentári k \"%2$s\""

apps/comments/l10n/sk.json

@@ -25,7 +25,6 @@
     "Error occurred while updating comment with id {id}" : "Pri aktualizovaní komentára s id {id} nastala chyba",
     "Error occurred while posting comment" : "Pri odosielaní komentára nastala chyba",
     "_%n unread comment_::_%n unread comments_" : ["%n neprečítaný komentár","%n neprečítaných komentárov","%n neprečítaných komentárov","%n neprečítaných komentárov"],
-    "_1 new comment_::_{unread} new comments_" : ["1 nový komentár","{unread} nové komentáre","{unread} nových komentárov","{unread} nových komentárov"],
     "Comment" : "Komentár",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Boli ste spomenutý v \"%s\", v komentári používateľom ktorý bol už vymazaný",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s vás spomenul v komentári k \"%2$s\""

apps/comments/l10n/sl.js

@@ -8,18 +8,16 @@ OC.L10N.register(
     "<strong>Comments</strong> for files" : "<strong>Opombe</strong> za datoteke",
     "Edit comment" : "Uredi opombo",
     "Delete comment" : "Izbriši opombo",
-    "New comment …" : "Nova opomba ...",
+    "New comment …" : "Nov komentar ...",
     "Post" : "Objavi",
     "Cancel" : "Prekliči",
     "[Deleted user]" : "[Izbrisan uporabnik]",
     "No comments yet, start the conversation!" : "Ni še odzivov, bodite prvi!",
-    "More comments …" : "Več opomb ...",
+    "More comments …" : "Več komentarjev ....",
     "Save" : "Shrani",
     "Allowed characters {count} of {max}" : "Dovoljeni znaki: {count} od {max}",
-    "Error occurred while updating comment with id {id}" : "Prišlo je do napake med posodabljanjem opombe z oznako {id}",
-    "Error occurred while posting comment" : "Prišlo je do napake med objavo opombe",
-    "_%n unread comment_::_%n unread comments_" : ["%n  neprebrana opomba","%n  neprebrani opombi","%n  neprebrane opombe","%n neprebranih opomb"],
-    "_1 new comment_::_{unread} new comments_" : ["{unread} nova opomba","{unread} novi opombi","{unread} nove opombe","{unread} novih opomb"],
+    "Error occurred while updating comment with id {id}" : "Napaka se je zgodila med posodabljanjem komentarja z oznako {id}",
+    "Error occurred while posting comment" : "Napaka se je zgodila med predajo komentarja",
     "Comment" : "Opomba"
 },
 "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");

apps/comments/l10n/sl.json

@@ -6,18 +6,16 @@
     "<strong>Comments</strong> for files" : "<strong>Opombe</strong> za datoteke",
     "Edit comment" : "Uredi opombo",
     "Delete comment" : "Izbriši opombo",
-    "New comment …" : "Nova opomba ...",
+    "New comment …" : "Nov komentar ...",
     "Post" : "Objavi",
     "Cancel" : "Prekliči",
     "[Deleted user]" : "[Izbrisan uporabnik]",
     "No comments yet, start the conversation!" : "Ni še odzivov, bodite prvi!",
-    "More comments …" : "Več opomb ...",
+    "More comments …" : "Več komentarjev ....",
     "Save" : "Shrani",
     "Allowed characters {count} of {max}" : "Dovoljeni znaki: {count} od {max}",
-    "Error occurred while updating comment with id {id}" : "Prišlo je do napake med posodabljanjem opombe z oznako {id}",
-    "Error occurred while posting comment" : "Prišlo je do napake med objavo opombe",
-    "_%n unread comment_::_%n unread comments_" : ["%n  neprebrana opomba","%n  neprebrani opombi","%n  neprebrane opombe","%n neprebranih opomb"],
-    "_1 new comment_::_{unread} new comments_" : ["{unread} nova opomba","{unread} novi opombi","{unread} nove opombe","{unread} novih opomb"],
+    "Error occurred while updating comment with id {id}" : "Napaka se je zgodila med posodabljanjem komentarja z oznako {id}",
+    "Error occurred while posting comment" : "Napaka se je zgodila med predajo komentarja",
     "Comment" : "Opomba"
 },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
 }

apps/comments/l10n/tr.js

@@ -11,7 +11,7 @@ OC.L10N.register(
     "{author} commented on {file}" : "{author}, {file} hakkında yorum yaptı",
     "<strong>Comments</strong> for files" : "Dosyalar için <strong>yorumlar</strong>",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "“{file}” hakkında bir yorumda silinmiş bir kullanıcı tarafından anıldınız",
-    "{user} mentioned you in a comment on “{file}”" : "{user}, “{file}” hakkındaki bir yorumda sizi andı",
+    "{user} mentioned you in a comment on “{file}”" : "{user}, “{file}” hakkındaki bir yorumda sizden bahsetti",
     "Files app plugin to add comments to files" : "Dosyalara notlar eklenmesini sağlayan dosyalar uygulaması eki",
     "Edit comment" : "Yorumu düzenle",
     "Delete comment" : "Yorumu sil",
@@ -30,6 +30,6 @@ OC.L10N.register(
     "_1 new comment_::_{unread} new comments_" : ["1 yeni yorum","{unread} yeni yorum"],
     "Comment" : "Yorum",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "\"%s\" hakkında bir yorumda silinmiş bir kullanıcı tarafından anıldınız",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s, “%2$s” hakkındaki bir yorumda sizi andı"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s, “%2$s” hakkındaki bir yorumda sizden bahsetti"
 },
 "nplurals=2; plural=(n > 1);");

apps/comments/l10n/tr.json

@@ -9,7 +9,7 @@
     "{author} commented on {file}" : "{author}, {file} hakkında yorum yaptı",
     "<strong>Comments</strong> for files" : "Dosyalar için <strong>yorumlar</strong>",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "“{file}” hakkında bir yorumda silinmiş bir kullanıcı tarafından anıldınız",
-    "{user} mentioned you in a comment on “{file}”" : "{user}, “{file}” hakkındaki bir yorumda sizi andı",
+    "{user} mentioned you in a comment on “{file}”" : "{user}, “{file}” hakkındaki bir yorumda sizden bahsetti",
     "Files app plugin to add comments to files" : "Dosyalara notlar eklenmesini sağlayan dosyalar uygulaması eki",
     "Edit comment" : "Yorumu düzenle",
     "Delete comment" : "Yorumu sil",
@@ -28,6 +28,6 @@
     "_1 new comment_::_{unread} new comments_" : ["1 yeni yorum","{unread} yeni yorum"],
     "Comment" : "Yorum",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "\"%s\" hakkında bir yorumda silinmiş bir kullanıcı tarafından anıldınız",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s, “%2$s” hakkındaki bir yorumda sizi andı"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s, “%2$s” hakkındaki bir yorumda sizden bahsetti"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }

apps/comments/lib/Activity/Provider.php

@@ -204,7 +204,7 @@ class Provider implements IProvider {
 		try {
 			$comment = $this->commentsManager->get((string) $commentId);
 			$message = $comment->getMessage();
-			$message = str_replace("\n", '<br />', str_replace(['<', '>'], ['&lt;', '&gt;'], $message));
+			$message = str_replace(['<', '>', "\n"], ['&lt;', '&gt;', '<br />'], $message);
 
 			$mentionCount = 1;
 			$mentions = [];
@@ -213,8 +213,13 @@ class Provider implements IProvider {
 					continue;
 				}
 
+				$pattern = '/(^|\s)(' . '@' . $mention['id'] . ')(\b)/';
+				if (strpos($mention['id'], ' ') !== false) {
+					$pattern = '/(^|\s)(' . '@"' . $mention['id'] . '"' . ')(\b)?/';
+				}
+
 				$message = preg_replace(
-					'/(^|\s)(' . '@' . $mention['id'] . ')(\b)/',
+					$pattern,
 					//'${1}' . $this->regexSafeUser($mention['id'], $displayName) . '${3}',
 					'${1}' . '{mention' . $mentionCount . '}' . '${3}',
 					$message

apps/comments/lib/Notification/Notifier.php

@@ -24,10 +24,12 @@
 
 namespace OCA\Comments\Notification;
 
+use OCP\Comments\IComment;
 use OCP\Comments\ICommentsManager;
 use OCP\Comments\NotFoundException;
 use OCP\Files\IRootFolder;
 use OCP\IURLGenerator;
+use OCP\IUser;
 use OCP\IUserManager;
 use OCP\L10N\IFactory;
 use OCP\Notification\INotification;
@@ -83,14 +85,14 @@ class Notifier implements INotifier {
 		$l = $this->l10nFactory->get('comments', $languageCode);
 		$displayName = $comment->getActorId();
 		$isDeletedActor = $comment->getActorType() === ICommentsManager::DELETED_USER;
-		if($comment->getActorType() === 'users') {
+		if ($comment->getActorType() === 'users') {
 			$commenter = $this->userManager->get($comment->getActorId());
-			if(!is_null($commenter)) {
+			if ($commenter instanceof IUser) {
 				$displayName = $commenter->getDisplayName();
 			}
 		}
 
-		switch($notification->getSubject()) {
+		switch ($notification->getSubject()) {
 			case 'mention':
 				$parameters = $notification->getSubjectParameters();
 				if($parameters[0] !== 'files') {
@@ -103,47 +105,38 @@ class Notifier implements INotifier {
 				}
 				$node = $nodes[0];
 
-				if ($isDeletedActor) {
-					$notification->setParsedSubject($l->t(
-							'You were mentioned on “%s”, in a comment by a user that has since been deleted',
-							[$node->getName()]
-						))
-						->setRichSubject(
-							$l->t('You were mentioned on “{file}”, in a comment by a user that has since been deleted'),
-							[
-								'file' => [
-									'type' => 'file',
-									'id' => $comment->getObjectId(),
-									'name' => $node->getName(),
-									'path' => $node->getPath(),
-									'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $comment->getObjectId()]),
-								],
-							]
-						);
-				} else {
-					$notification->setParsedSubject($l->t(
-							'%1$s mentioned you in a comment on “%2$s”',
-							[$displayName, $node->getName()]
-						))
-						->setRichSubject(
-							$l->t('{user} mentioned you in a comment on “{file}”'),
-							[
-								'user' => [
-									'type' => 'user',
-									'id' => $comment->getActorId(),
-									'name' => $displayName,
-								],
-								'file' => [
-									'type' => 'file',
-									'id' => $comment->getObjectId(),
-									'name' => $node->getName(),
-									'path' => $node->getPath(),
-									'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $comment->getObjectId()]),
-								],
-							]
-						);
+				$path = rtrim($node->getPath(), '/');
+				if (strpos($path, '/' . $notification->getUser() . '/files/') === 0) {
+					// Remove /user/files/...
+					$fullPath = $path;
+					list(,,, $path) = explode('/', $fullPath, 4);
 				}
-				$notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')))
+				$subjectParameters = [
+					'file' => [
+						'type' => 'file',
+						'id' => $comment->getObjectId(),
+						'name' => $node->getName(),
+						'path' => $path,
+						'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $comment->getObjectId()]),
+					],
+				];
+
+				if ($isDeletedActor) {
+					$subject = $l->t('You were mentioned on “{file}”, in a comment by a user that has since been deleted');
+				} else {
+					$subject = $l->t('{user} mentioned you in a comment on “{file}”');
+					$subjectParameters['user'] = [
+						'type' => 'user',
+						'id' => $comment->getActorId(),
+						'name' => $displayName,
+					];
+				}
+				list($message, $messageParameters) = $this->commentToRichMessage($comment);
+				$notification->setRichSubject($subject, $subjectParameters)
+					->setParsedSubject($this->richToParsed($subject, $subjectParameters))
+					->setRichMessage($message, $messageParameters)
+					->setParsedMessage($this->richToParsed($message, $messageParameters))
+					->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')))
 					->setLink($this->url->linkToRouteAbsolute(
 						'comments.Notifications.view',
 						['id' => $comment->getId()])
@@ -155,6 +148,58 @@ class Notifier implements INotifier {
 			default:
 				throw new \InvalidArgumentException('Invalid subject');
 		}
+	}
 
+	public function commentToRichMessage(IComment $comment): array {
+		$message = $comment->getMessage();
+		$messageParameters = [];
+		$mentionTypeCount = [];
+		$mentions = $comment->getMentions();
+		foreach ($mentions as $mention) {
+			if ($mention['type'] === 'user') {
+				$user = $this->userManager->get($mention['id']);
+				if (!$user instanceof IUser) {
+					continue;
+				}
+			}
+			if (!array_key_exists($mention['type'], $mentionTypeCount)) {
+				$mentionTypeCount[$mention['type']] = 0;
+			}
+			$mentionTypeCount[$mention['type']]++;
+			// To keep a limited character set in parameter IDs ([a-zA-Z0-9-])
+			// the mention parameter ID does not include the mention ID (which
+			// could contain characters like '@' for user IDs) but a one-based
+			// index of the mentions of that type.
+			$mentionParameterId = 'mention-' . $mention['type'] . $mentionTypeCount[$mention['type']];
+			$message = str_replace('@' . $mention['id'], '{' . $mentionParameterId . '}', $message);
+			try {
+				$displayName = $this->commentsManager->resolveDisplayName($mention['type'], $mention['id']);
+			} catch (\OutOfBoundsException $e) {
+				// There is no registered display name resolver for the mention
+				// type, so the client decides what to display.
+				$displayName = '';
+			}
+			$messageParameters[$mentionParameterId] = [
+				'type' => $mention['type'],
+				'id' => $mention['id'],
+				'name' => $displayName
+			];
+		}
+		return [$message, $messageParameters];
+	}
+
+	public function richToParsed(string $message, array $parameters): string {
+		$placeholders = $replacements = [];
+		foreach ($parameters as $placeholder => $parameter) {
+			$placeholders[] = '{' . $placeholder . '}';
+			if ($parameter['type'] === 'user') {
+				$replacements[] = '@' . $parameter['name'];
+			} else if ($parameter['type'] === 'file') {
+				$replacements[] = $parameter['path'];
+			} else {
+				$replacements[] = $parameter['name'];
+			}
+		}
+		return str_replace($placeholders, $replacements, $message);
 	}
 }

apps/comments/tests/Unit/Notification/NotifierTest.php

@@ -93,13 +93,15 @@ class NotifierTest extends TestCase {
 	public function testPrepareSuccess() {
 		$fileName = 'Gre\'thor.odp';
 		$displayName = 'Huraga';
-		$message = 'Huraga mentioned you in a comment on “Gre\'thor.odp”';
+		$message = '@Huraga mentioned you in a comment on “Gre\'thor.odp”';
 
 		/** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */
 		$user = $this->createMock(IUser::class);
 		$user->expects($this->once())
 			->method('getDisplayName')
 			->willReturn($displayName);
+		/** @var IUser|\PHPUnit_Framework_MockObject_MockObject $you */
+		$you = $this->createMock(IUser::class);
 
 		/** @var Node|\PHPUnit_Framework_MockObject_MockObject $node */
 		$node = $this->createMock(Node::class);
@@ -107,6 +109,10 @@ class NotifierTest extends TestCase {
 			->expects($this->atLeastOnce())
 			->method('getName')
 			->willReturn($fileName);
+		$node
+			->expects($this->atLeastOnce())
+			->method('getPath')
+			->willReturn('/you/files/' . $fileName);
 
 		$userFolder = $this->createMock(Folder::class);
 		$this->folder->expects($this->once())
@@ -118,7 +124,7 @@ class NotifierTest extends TestCase {
 			->with('678')
 			->willReturn([$node]);
 
-		$this->notification->expects($this->once())
+		$this->notification->expects($this->exactly(2))
 			->method('getUser')
 			->willReturn('you');
 		$this->notification
@@ -143,6 +149,16 @@ class NotifierTest extends TestCase {
 			->method('setRichSubject')
 			->with('{user} mentioned you in a comment on “{file}”', $this->anything())
 			->willReturnSelf();
+		$this->notification
+			->expects($this->once())
+			->method('setRichMessage')
+			->with('Hi {mention-user1}!', ['mention-user1' => ['type' => 'user', 'id' => 'you', 'name' => 'Your name']])
+			->willReturnSelf();
+		$this->notification
+			->expects($this->once())
+			->method('setParsedMessage')
+			->with('Hi @Your name!')
+			->willReturnSelf();
 		$this->notification
 			->expects($this->once())
 			->method('setIcon')
@@ -171,17 +187,32 @@ class NotifierTest extends TestCase {
 			->expects($this->any())
 			->method('getActorType')
 			->willReturn('users');
+		$this->comment
+			->expects($this->any())
+			->method('getMessage')
+			->willReturn('Hi @you!');
+		$this->comment
+			->expects($this->any())
+			->method('getMentions')
+			->willReturn([['type' => 'user', 'id' => 'you']]);
 
 		$this->commentsManager
 			->expects($this->once())
 			->method('get')
 			->willReturn($this->comment);
+		$this->commentsManager
+			->expects($this->once())
+			->method('resolveDisplayName')
+			->with('user', 'you')
+			->willReturn('Your name');
 
 		$this->userManager
-			->expects($this->once())
+			->expects($this->exactly(2))
 			->method('get')
-			->with('huraga')
-			->willReturn($user);
+			->willReturnMap([
+				['huraga', $user],
+				['you', $you],
+			]);
 
 		$this->notifier->prepare($this->notification, $this->lc);
 	}
@@ -190,12 +221,19 @@ class NotifierTest extends TestCase {
 		$fileName = 'Gre\'thor.odp';
 		$message = 'You were mentioned on “Gre\'thor.odp”, in a comment by a user that has since been deleted';
 
+		/** @var IUser|\PHPUnit_Framework_MockObject_MockObject $you */
+		$you = $this->createMock(IUser::class);
+
 		/** @var Node|\PHPUnit_Framework_MockObject_MockObject $node */
 		$node = $this->createMock(Node::class);
 		$node
 			->expects($this->atLeastOnce())
 			->method('getName')
 			->willReturn($fileName);
+		$node
+			->expects($this->atLeastOnce())
+			->method('getPath')
+			->willReturn('/you/files/' . $fileName);
 
 		$userFolder = $this->createMock(Folder::class);
 		$this->folder->expects($this->once())
@@ -207,7 +245,7 @@ class NotifierTest extends TestCase {
 			->with('678')
 			->willReturn([$node]);
 
-		$this->notification->expects($this->once())
+		$this->notification->expects($this->exactly(2))
 			->method('getUser')
 			->willReturn('you');
 		$this->notification
@@ -232,6 +270,16 @@ class NotifierTest extends TestCase {
 			->method('setRichSubject')
 			->with('You were mentioned on “{file}”, in a comment by a user that has since been deleted', $this->anything())
 			->willReturnSelf();
+		$this->notification
+			->expects($this->once())
+			->method('setRichMessage')
+			->with('Hi {mention-user1}!', ['mention-user1' => ['type' => 'user', 'id' => 'you', 'name' => 'Your name']])
+			->willReturnSelf();
+		$this->notification
+			->expects($this->once())
+			->method('setParsedMessage')
+			->with('Hi @Your name!')
+			->willReturnSelf();
 		$this->notification
 			->expects($this->once())
 			->method('setIcon')
@@ -260,15 +308,30 @@ class NotifierTest extends TestCase {
 			->expects($this->any())
 			->method('getActorType')
 			->willReturn(ICommentsManager::DELETED_USER);
+		$this->comment
+			->expects($this->any())
+			->method('getMessage')
+			->willReturn('Hi @you!');
+		$this->comment
+			->expects($this->any())
+			->method('getMentions')
+			->willReturn([['type' => 'user', 'id' => 'you']]);
 
 		$this->commentsManager
 			->expects($this->once())
 			->method('get')
 			->willReturn($this->comment);
+		$this->commentsManager
+			->expects($this->once())
+			->method('resolveDisplayName')
+			->with('user', 'you')
+			->willReturn('Your name');
 
 		$this->userManager
-			->expects($this->never())
-			->method('get');
+			->expects($this->once())
+			->method('get')
+			->with('you')
+			->willReturn($you);
 
 		$this->notifier->prepare($this->notification, $this->lc);
 	}

apps/dav/appinfo/app.php

@@ -50,6 +50,34 @@ $eventDispatcher->addListener('OCP\Federation\TrustedServerEvent::remove',
 	}
 );
 
+$eventDispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createSubscription',
+	function(GenericEvent $event) use ($app) {
+		$jobList = $app->getContainer()->getServer()->getJobList();
+		$subscriptionData = $event->getArgument('subscriptionData');
+
+		$jobList->add(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
+			'principaluri' => $subscriptionData['principaluri'],
+			'uri' => $subscriptionData['uri']
+		]);
+	}
+);
+
+$eventDispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription',
+	function(GenericEvent $event) use ($app) {
+		$jobList = $app->getContainer()->getServer()->getJobList();
+		$subscriptionData = $event->getArgument('subscriptionData');
+
+		$jobList->remove(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
+			'principaluri' => $subscriptionData['principaluri'],
+			'uri' => $subscriptionData['uri']
+		]);
+
+		/** @var \OCA\DAV\CalDAV\CalDavBackend $calDavBackend */
+		$calDavBackend = $app->getContainer()->query(\OCA\DAV\CalDAV\CalDavBackend::class);
+		$calDavBackend->purgeAllCachedEventsForSubscription($subscriptionData['id']);
+	}
+);
+
 $eventHandler = function() use ($app) {
 	try {
 		$job = $app->getContainer()->query(\OCA\DAV\BackgroundJob\UpdateCalendarResourcesRoomsBackgroundJob::class);

apps/dav/appinfo/info.xml

@@ -5,7 +5,7 @@
 	<name>WebDAV</name>
 	<summary>WebDAV endpoint</summary>
 	<description>WebDAV endpoint</description>
-	<version>1.6.1</version>
+	<version>1.8.1</version>
 	<licence>agpl</licence>
 	<author>owncloud.org</author>
 	<namespace>DAV</namespace>
@@ -16,7 +16,7 @@
 	<category>integration</category>
 	<bugs>https://github.com/nextcloud/server/issues</bugs>
 	<dependencies>
-		<nextcloud min-version="14" max-version="14" />
+		<nextcloud min-version="15" max-version="15" />
 	</dependencies>
 
 	<background-jobs>
@@ -30,6 +30,7 @@
 			<step>OCA\DAV\Migration\FixBirthdayCalendarComponent</step>
 			<step>OCA\DAV\Migration\CalDAVRemoveEmptyValue</step>
 			<step>OCA\DAV\Migration\BuildCalendarSearchIndex</step>
+			<step>OCA\DAV\Migration\RefreshWebcalJobRegistrar</step>
 			<step>OCA\DAV\Migration\RemoveClassifiedEventActivity</step>
 		</post-migration>
 	</repair-steps>

apps/dav/composer/composer/autoload_classmap.php

@@ -14,6 +14,7 @@ return array(
     'OCA\\DAV\\BackgroundJob\\CleanupDirectLinksJob' => $baseDir . '/../lib/BackgroundJob/CleanupDirectLinksJob.php',
     'OCA\\DAV\\BackgroundJob\\CleanupInvitationTokenJob' => $baseDir . '/../lib/BackgroundJob/CleanupInvitationTokenJob.php',
     'OCA\\DAV\\BackgroundJob\\GenerateBirthdayCalendarBackgroundJob' => $baseDir . '/../lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php',
+    'OCA\\DAV\\BackgroundJob\\RefreshWebcalJob' => $baseDir . '/../lib/BackgroundJob/RefreshWebcalJob.php',
     'OCA\\DAV\\BackgroundJob\\UpdateCalendarResourcesRoomsBackgroundJob' => $baseDir . '/../lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php',
     'OCA\\DAV\\CalDAV\\Activity\\Backend' => $baseDir . '/../lib/CalDAV/Activity/Backend.php',
     'OCA\\DAV\\CalDAV\\Activity\\Filter\\Calendar' => $baseDir . '/../lib/CalDAV/Activity/Filter/Calendar.php',
@@ -27,6 +28,8 @@ return array(
     'OCA\\DAV\\CalDAV\\Activity\\Setting\\Todo' => $baseDir . '/../lib/CalDAV/Activity/Setting/Todo.php',
     'OCA\\DAV\\CalDAV\\BirthdayCalendar\\EnablePlugin' => $baseDir . '/../lib/CalDAV/BirthdayCalendar/EnablePlugin.php',
     'OCA\\DAV\\CalDAV\\BirthdayService' => $baseDir . '/../lib/CalDAV/BirthdayService.php',
+    'OCA\\DAV\\CalDAV\\CachedSubscription' => $baseDir . '/../lib/CalDAV/CachedSubscription.php',
+    'OCA\\DAV\\CalDAV\\CachedSubscriptionObject' => $baseDir . '/../lib/CalDAV/CachedSubscriptionObject.php',
     'OCA\\DAV\\CalDAV\\CalDavBackend' => $baseDir . '/../lib/CalDAV/CalDavBackend.php',
     'OCA\\DAV\\CalDAV\\Calendar' => $baseDir . '/../lib/CalDAV/Calendar.php',
     'OCA\\DAV\\CalDAV\\CalendarHome' => $baseDir . '/../lib/CalDAV/CalendarHome.php',
@@ -57,6 +60,7 @@ return array(
     'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\PropFilter' => $baseDir . '/../lib/CalDAV/Search/Xml/Filter/PropFilter.php',
     'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\SearchTermFilter' => $baseDir . '/../lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php',
     'OCA\\DAV\\CalDAV\\Search\\Xml\\Request\\CalendarSearchReport' => $baseDir . '/../lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php',
+    'OCA\\DAV\\CalDAV\\WebcalCaching\\Plugin' => $baseDir . '/../lib/CalDAV/WebcalCaching/Plugin.php',
     'OCA\\DAV\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
     'OCA\\DAV\\CardDAV\\AddressBook' => $baseDir . '/../lib/CardDAV/AddressBook.php',
     'OCA\\DAV\\CardDAV\\AddressBookImpl' => $baseDir . '/../lib/CardDAV/AddressBookImpl.php',
@@ -65,9 +69,11 @@ return array(
     'OCA\\DAV\\CardDAV\\ContactsManager' => $baseDir . '/../lib/CardDAV/ContactsManager.php',
     'OCA\\DAV\\CardDAV\\Converter' => $baseDir . '/../lib/CardDAV/Converter.php',
     'OCA\\DAV\\CardDAV\\ImageExportPlugin' => $baseDir . '/../lib/CardDAV/ImageExportPlugin.php',
+    'OCA\\DAV\\CardDAV\\MultiGetExportPlugin' => $baseDir . '/../lib/CardDAV/MultiGetExportPlugin.php',
     'OCA\\DAV\\CardDAV\\PhotoCache' => $baseDir . '/../lib/CardDAV/PhotoCache.php',
     'OCA\\DAV\\CardDAV\\Plugin' => $baseDir . '/../lib/CardDAV/Plugin.php',
     'OCA\\DAV\\CardDAV\\SyncService' => $baseDir . '/../lib/CardDAV/SyncService.php',
+    'OCA\\DAV\\CardDAV\\SystemAddressbook' => $baseDir . '/../lib/CardDAV/SystemAddressbook.php',
     'OCA\\DAV\\CardDAV\\UserAddressBooks' => $baseDir . '/../lib/CardDAV/UserAddressBooks.php',
     'OCA\\DAV\\CardDAV\\Xml\\Groups' => $baseDir . '/../lib/CardDAV/Xml/Groups.php',
     'OCA\\DAV\\Command\\CreateAddressBook' => $baseDir . '/../lib/Command/CreateAddressBook.php',
@@ -148,6 +154,7 @@ return array(
     'OCA\\DAV\\Migration\\BuildCalendarSearchIndexBackgroundJob' => $baseDir . '/../lib/Migration/BuildCalendarSearchIndexBackgroundJob.php',
     'OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue' => $baseDir . '/../lib/Migration/CalDAVRemoveEmptyValue.php',
     'OCA\\DAV\\Migration\\FixBirthdayCalendarComponent' => $baseDir . '/../lib/Migration/FixBirthdayCalendarComponent.php',
+    'OCA\\DAV\\Migration\\RefreshWebcalJobRegistrar' => $baseDir . '/../lib/Migration/RefreshWebcalJobRegistrar.php',
     'OCA\\DAV\\Migration\\RemoveClassifiedEventActivity' => $baseDir . '/../lib/Migration/RemoveClassifiedEventActivity.php',
     'OCA\\DAV\\Migration\\Version1004Date20170825134824' => $baseDir . '/../lib/Migration/Version1004Date20170825134824.php',
     'OCA\\DAV\\Migration\\Version1004Date20170919104507' => $baseDir . '/../lib/Migration/Version1004Date20170919104507.php',
@@ -156,6 +163,13 @@ return array(
     'OCA\\DAV\\Migration\\Version1005Date20180413093149' => $baseDir . '/../lib/Migration/Version1005Date20180413093149.php',
     'OCA\\DAV\\Migration\\Version1005Date20180530124431' => $baseDir . '/../lib/Migration/Version1005Date20180530124431.php',
     'OCA\\DAV\\Migration\\Version1006Date20180619154313' => $baseDir . '/../lib/Migration/Version1006Date20180619154313.php',
+    'OCA\\DAV\\Migration\\Version1006Date20180628111625' => $baseDir . '/../lib/Migration/Version1006Date20180628111625.php',
+    'OCA\\DAV\\Migration\\Version1008Date20181030113700' => $baseDir . '/../lib/Migration/Version1008Date20181030113700.php',
+    'OCA\\DAV\\Migration\\Version1008Date20181105104826' => $baseDir . '/../lib/Migration/Version1008Date20181105104826.php',
+    'OCA\\DAV\\Migration\\Version1008Date20181105104833' => $baseDir . '/../lib/Migration/Version1008Date20181105104833.php',
+    'OCA\\DAV\\Migration\\Version1008Date20181105110300' => $baseDir . '/../lib/Migration/Version1008Date20181105110300.php',
+    'OCA\\DAV\\Migration\\Version1008Date20181105112049' => $baseDir . '/../lib/Migration/Version1008Date20181105112049.php',
+    'OCA\\DAV\\Migration\\Version1008Date20181114084440' => $baseDir . '/../lib/Migration/Version1008Date20181114084440.php',
     'OCA\\DAV\\RootCollection' => $baseDir . '/../lib/RootCollection.php',
     'OCA\\DAV\\Server' => $baseDir . '/../lib/Server.php',
     'OCA\\DAV\\Settings\\CalDAVSettings' => $baseDir . '/../lib/Settings/CalDAVSettings.php',

apps/dav/composer/composer/autoload_static.php

@@ -29,6 +29,7 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\BackgroundJob\\CleanupDirectLinksJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupDirectLinksJob.php',
         'OCA\\DAV\\BackgroundJob\\CleanupInvitationTokenJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupInvitationTokenJob.php',
         'OCA\\DAV\\BackgroundJob\\GenerateBirthdayCalendarBackgroundJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php',
+        'OCA\\DAV\\BackgroundJob\\RefreshWebcalJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/RefreshWebcalJob.php',
         'OCA\\DAV\\BackgroundJob\\UpdateCalendarResourcesRoomsBackgroundJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php',
         'OCA\\DAV\\CalDAV\\Activity\\Backend' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Backend.php',
         'OCA\\DAV\\CalDAV\\Activity\\Filter\\Calendar' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Filter/Calendar.php',
@@ -42,6 +43,8 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\CalDAV\\Activity\\Setting\\Todo' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Setting/Todo.php',
         'OCA\\DAV\\CalDAV\\BirthdayCalendar\\EnablePlugin' => __DIR__ . '/..' . '/../lib/CalDAV/BirthdayCalendar/EnablePlugin.php',
         'OCA\\DAV\\CalDAV\\BirthdayService' => __DIR__ . '/..' . '/../lib/CalDAV/BirthdayService.php',
+        'OCA\\DAV\\CalDAV\\CachedSubscription' => __DIR__ . '/..' . '/../lib/CalDAV/CachedSubscription.php',
+        'OCA\\DAV\\CalDAV\\CachedSubscriptionObject' => __DIR__ . '/..' . '/../lib/CalDAV/CachedSubscriptionObject.php',
         'OCA\\DAV\\CalDAV\\CalDavBackend' => __DIR__ . '/..' . '/../lib/CalDAV/CalDavBackend.php',
         'OCA\\DAV\\CalDAV\\Calendar' => __DIR__ . '/..' . '/../lib/CalDAV/Calendar.php',
         'OCA\\DAV\\CalDAV\\CalendarHome' => __DIR__ . '/..' . '/../lib/CalDAV/CalendarHome.php',
@@ -72,6 +75,7 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\PropFilter' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Filter/PropFilter.php',
         'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\SearchTermFilter' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php',
         'OCA\\DAV\\CalDAV\\Search\\Xml\\Request\\CalendarSearchReport' => __DIR__ . '/..' . '/../lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php',
+        'OCA\\DAV\\CalDAV\\WebcalCaching\\Plugin' => __DIR__ . '/..' . '/../lib/CalDAV/WebcalCaching/Plugin.php',
         'OCA\\DAV\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
         'OCA\\DAV\\CardDAV\\AddressBook' => __DIR__ . '/..' . '/../lib/CardDAV/AddressBook.php',
         'OCA\\DAV\\CardDAV\\AddressBookImpl' => __DIR__ . '/..' . '/../lib/CardDAV/AddressBookImpl.php',
@@ -80,9 +84,11 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\CardDAV\\ContactsManager' => __DIR__ . '/..' . '/../lib/CardDAV/ContactsManager.php',
         'OCA\\DAV\\CardDAV\\Converter' => __DIR__ . '/..' . '/../lib/CardDAV/Converter.php',
         'OCA\\DAV\\CardDAV\\ImageExportPlugin' => __DIR__ . '/..' . '/../lib/CardDAV/ImageExportPlugin.php',
+        'OCA\\DAV\\CardDAV\\MultiGetExportPlugin' => __DIR__ . '/..' . '/../lib/CardDAV/MultiGetExportPlugin.php',
         'OCA\\DAV\\CardDAV\\PhotoCache' => __DIR__ . '/..' . '/../lib/CardDAV/PhotoCache.php',
         'OCA\\DAV\\CardDAV\\Plugin' => __DIR__ . '/..' . '/../lib/CardDAV/Plugin.php',
         'OCA\\DAV\\CardDAV\\SyncService' => __DIR__ . '/..' . '/../lib/CardDAV/SyncService.php',
+        'OCA\\DAV\\CardDAV\\SystemAddressbook' => __DIR__ . '/..' . '/../lib/CardDAV/SystemAddressbook.php',
         'OCA\\DAV\\CardDAV\\UserAddressBooks' => __DIR__ . '/..' . '/../lib/CardDAV/UserAddressBooks.php',
         'OCA\\DAV\\CardDAV\\Xml\\Groups' => __DIR__ . '/..' . '/../lib/CardDAV/Xml/Groups.php',
         'OCA\\DAV\\Command\\CreateAddressBook' => __DIR__ . '/..' . '/../lib/Command/CreateAddressBook.php',
@@ -163,6 +169,7 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\Migration\\BuildCalendarSearchIndexBackgroundJob' => __DIR__ . '/..' . '/../lib/Migration/BuildCalendarSearchIndexBackgroundJob.php',
         'OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue' => __DIR__ . '/..' . '/../lib/Migration/CalDAVRemoveEmptyValue.php',
         'OCA\\DAV\\Migration\\FixBirthdayCalendarComponent' => __DIR__ . '/..' . '/../lib/Migration/FixBirthdayCalendarComponent.php',
+        'OCA\\DAV\\Migration\\RefreshWebcalJobRegistrar' => __DIR__ . '/..' . '/../lib/Migration/RefreshWebcalJobRegistrar.php',
         'OCA\\DAV\\Migration\\RemoveClassifiedEventActivity' => __DIR__ . '/..' . '/../lib/Migration/RemoveClassifiedEventActivity.php',
         'OCA\\DAV\\Migration\\Version1004Date20170825134824' => __DIR__ . '/..' . '/../lib/Migration/Version1004Date20170825134824.php',
         'OCA\\DAV\\Migration\\Version1004Date20170919104507' => __DIR__ . '/..' . '/../lib/Migration/Version1004Date20170919104507.php',
@@ -171,6 +178,13 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\Migration\\Version1005Date20180413093149' => __DIR__ . '/..' . '/../lib/Migration/Version1005Date20180413093149.php',
         'OCA\\DAV\\Migration\\Version1005Date20180530124431' => __DIR__ . '/..' . '/../lib/Migration/Version1005Date20180530124431.php',
         'OCA\\DAV\\Migration\\Version1006Date20180619154313' => __DIR__ . '/..' . '/../lib/Migration/Version1006Date20180619154313.php',
+        'OCA\\DAV\\Migration\\Version1006Date20180628111625' => __DIR__ . '/..' . '/../lib/Migration/Version1006Date20180628111625.php',
+        'OCA\\DAV\\Migration\\Version1008Date20181030113700' => __DIR__ . '/..' . '/../lib/Migration/Version1008Date20181030113700.php',
+        'OCA\\DAV\\Migration\\Version1008Date20181105104826' => __DIR__ . '/..' . '/../lib/Migration/Version1008Date20181105104826.php',
+        'OCA\\DAV\\Migration\\Version1008Date20181105104833' => __DIR__ . '/..' . '/../lib/Migration/Version1008Date20181105104833.php',
+        'OCA\\DAV\\Migration\\Version1008Date20181105110300' => __DIR__ . '/..' . '/../lib/Migration/Version1008Date20181105110300.php',
+        'OCA\\DAV\\Migration\\Version1008Date20181105112049' => __DIR__ . '/..' . '/../lib/Migration/Version1008Date20181105112049.php',
+        'OCA\\DAV\\Migration\\Version1008Date20181114084440' => __DIR__ . '/..' . '/../lib/Migration/Version1008Date20181114084440.php',
         'OCA\\DAV\\RootCollection' => __DIR__ . '/..' . '/../lib/RootCollection.php',
         'OCA\\DAV\\Server' => __DIR__ . '/..' . '/../lib/Server.php',
         'OCA\\DAV\\Settings\\CalDAVSettings' => __DIR__ . '/..' . '/../lib/Settings/CalDAVSettings.php',

apps/dav/l10n/ca.js

@@ -6,8 +6,8 @@ OC.L10N.register(
     "Personal" : "Personal",
     "{actor} created calendar {calendar}" : "{actor} ha creat el calendari {calendar}",
     "You created calendar {calendar}" : "Heu creat el calendari {calendar}",
-    "{actor} deleted calendar {calendar}" : "{actor} ha suprimit el calendari {calendar}",
-    "You deleted calendar {calendar}" : "Heu suprimit el calendari {calendar}",
+    "{actor} deleted calendar {calendar}" : "{actor} ha eliminat el calendari {calendar}",
+    "You deleted calendar {calendar}" : "Heu eliminat el calendari {calendar}",
     "{actor} updated calendar {calendar}" : "{actor} ha actualitzat el calendari {calendar}",
     "You updated calendar {calendar}" : "Heu actualitzat el calendari {calendar}",
     "You shared calendar {calendar} as public link" : "Heu compartit el calendari {calendar} amb un enllaç públic",
@@ -25,15 +25,15 @@ OC.L10N.register(
     "{actor} unshared calendar {calendar} from group {group}" : "{actor} calendari no publicat {calendar} del grup {grup}",
     "{actor} created event {event} in calendar {calendar}" : "{actor} ha creat l'esdeveniment {event} al calendari {calendar}",
     "You created event {event} in calendar {calendar}" : "Heu creat l'esdeveniment {event} al calendari {calendar}",
-    "{actor} deleted event {event} from calendar {calendar}" : "{actor} ha suprimit l'esdeveniment {esdeveniment} del calendari {calendar}",
+    "{actor} deleted event {event} from calendar {calendar}" : "{actor} eliminat esdeveniment {esdeveniment} del calendari {calendar}",
     "You deleted event {event} from calendar {calendar}" : "Heu suprimit l'esdeveniment {event} del calendari {calendar}",
     "{actor} updated event {event} in calendar {calendar}" : "{actor} esdeveniment actualitzat {esdeveniment} al calendari {calendar}",
     "You updated event {event} in calendar {calendar}" : "Heu actualitzat l'esdeveniment {event} al calendari {calendar}",
     "Busy" : "Ocupat",
     "{actor} created todo {todo} in list {calendar}" : "{actor} ha creat la tasca {todo} a {calendar}",
     "You created todo {todo} in list {calendar}" : "Heu creat la tasca {todo} a {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} ha suprimit la tasca {todo} de la llista {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Heu suprimit la tasca {todo} de la llista {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} ha eliminat la tasca {todo} a {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Heu eliminat la tasca {todo} a {calendar}",
     "{actor} updated todo {todo} in list {calendar}" : "{actor} ha actualitzat la tasca {todo} a {calendar}",
     "You updated todo {todo} in list {calendar}" : "Heu actualitzat la tasca {todo} a {calendar}",
     "{actor} solved todo {todo} in list {calendar}" : "{actor} ha resolt la tasca {todo} a {calendar}",
@@ -43,24 +43,7 @@ OC.L10N.register(
     "A <strong>calendar</strong> was modified" : "El <strong>calendari</strong> has estat modificat",
     "A calendar <strong>event</strong> was modified" : "S'ha modificat un <strong> esdeveniment </strong> del calendari",
     "A calendar <strong>todo</strong> was modified" : "S'ha modificat una <strong>tasca</strong> d'un calendari",
-    "Death of %s" : "Mort de %s",
     "Contact birthdays" : "Aniversaris dels contactes",
-    "Calendar:" : "Calendari:",
-    "Date:" : "Data:",
-    "Where:" : "On:",
-    "Description:" : "Descripció:",
-    "Untitled event" : "Esdeveniment sense títol",
-    "_%n year_::_%n years_" : ["%n any","%n anys"],
-    "_%n month_::_%n months_" : ["%n mes","%n mesos"],
-    "_%n day_::_%n days_" : ["%n dia","%n dies"],
-    "_%n hour_::_%n hours_" : ["%n hora","%n hores"],
-    "_%n minute_::_%n minutes_" : ["%n minut","%n minuts"],
-    "%s (in %s)" : "%s (d'aquí a %s)",
-    "%s (%s ago)" : "%s (fa %s)",
-    "Calendar: %s" : "Calendari: %s",
-    "Date: %s" : "Data: %s",
-    "Description: %s" : "Descripció: %s",
-    "Where: %s" : "On: %s",
     "%1$s via %2$s" : "%1$s via %2$s",
     "Invitation canceled" : "Invitació cancel·lada",
     "Hello %s," : "Hola %s,",
@@ -69,6 +52,8 @@ OC.L10N.register(
     "The meeting »%1$s« with %2$s was updated." : "La reunió »%1$s« amb %2$s ha estat actualitzada.",
     "%1$s invited you to »%2$s«" : "%1$s us ha convidat a »%2$s«",
     "When:" : "Quan:",
+    "Where:" : "On:",
+    "Description:" : "Descripció:",
     "Link:" : "Enllaç:",
     "Accept" : "Accepta",
     "Decline" : "Rebutja",
@@ -96,8 +81,6 @@ OC.L10N.register(
     "Automatically generate a birthday calendar" : "Genera automàticament un calendari d’aniversari",
     "Birthday calendars will be generated by a background job." : "Els calendaris d'aniversari es generaran per un procés en segon pla..",
     "Hence they will not be available immediately after enabling but will show up after some time." : "Per tant, no estaran disponibles immediatament després d'habilitar-los, però apareixeran d'aquí una estona.",
-    "Send notifications for events" : "Envia notificacions per als esdeveniments",
-    "Notifications will be send through background jobs, so these need to happen often enough." : "Les notificacions s'enviaran a través de tasques en segon terme; per tant, cal que succeeixin prou sovint.",
     "%s via %s" : "%s via %s",
     "The meeting »%s« with %s was canceled." : "La reunió »%s« amb %s ha estat cancel·lada.",
     "The meeting »%s« with %s was updated." : "La reunió »%s« amb %s ha estat actualitzada.",

apps/dav/l10n/ca.json

@@ -4,8 +4,8 @@
     "Personal" : "Personal",
     "{actor} created calendar {calendar}" : "{actor} ha creat el calendari {calendar}",
     "You created calendar {calendar}" : "Heu creat el calendari {calendar}",
-    "{actor} deleted calendar {calendar}" : "{actor} ha suprimit el calendari {calendar}",
-    "You deleted calendar {calendar}" : "Heu suprimit el calendari {calendar}",
+    "{actor} deleted calendar {calendar}" : "{actor} ha eliminat el calendari {calendar}",
+    "You deleted calendar {calendar}" : "Heu eliminat el calendari {calendar}",
     "{actor} updated calendar {calendar}" : "{actor} ha actualitzat el calendari {calendar}",
     "You updated calendar {calendar}" : "Heu actualitzat el calendari {calendar}",
     "You shared calendar {calendar} as public link" : "Heu compartit el calendari {calendar} amb un enllaç públic",
@@ -23,15 +23,15 @@
     "{actor} unshared calendar {calendar} from group {group}" : "{actor} calendari no publicat {calendar} del grup {grup}",
     "{actor} created event {event} in calendar {calendar}" : "{actor} ha creat l'esdeveniment {event} al calendari {calendar}",
     "You created event {event} in calendar {calendar}" : "Heu creat l'esdeveniment {event} al calendari {calendar}",
-    "{actor} deleted event {event} from calendar {calendar}" : "{actor} ha suprimit l'esdeveniment {esdeveniment} del calendari {calendar}",
+    "{actor} deleted event {event} from calendar {calendar}" : "{actor} eliminat esdeveniment {esdeveniment} del calendari {calendar}",
     "You deleted event {event} from calendar {calendar}" : "Heu suprimit l'esdeveniment {event} del calendari {calendar}",
     "{actor} updated event {event} in calendar {calendar}" : "{actor} esdeveniment actualitzat {esdeveniment} al calendari {calendar}",
     "You updated event {event} in calendar {calendar}" : "Heu actualitzat l'esdeveniment {event} al calendari {calendar}",
     "Busy" : "Ocupat",
     "{actor} created todo {todo} in list {calendar}" : "{actor} ha creat la tasca {todo} a {calendar}",
     "You created todo {todo} in list {calendar}" : "Heu creat la tasca {todo} a {calendar}",
-    "{actor} deleted todo {todo} from list {calendar}" : "{actor} ha suprimit la tasca {todo} de la llista {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Heu suprimit la tasca {todo} de la llista {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} ha eliminat la tasca {todo} a {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Heu eliminat la tasca {todo} a {calendar}",
     "{actor} updated todo {todo} in list {calendar}" : "{actor} ha actualitzat la tasca {todo} a {calendar}",
     "You updated todo {todo} in list {calendar}" : "Heu actualitzat la tasca {todo} a {calendar}",
     "{actor} solved todo {todo} in list {calendar}" : "{actor} ha resolt la tasca {todo} a {calendar}",
@@ -41,24 +41,7 @@
     "A <strong>calendar</strong> was modified" : "El <strong>calendari</strong> has estat modificat",
     "A calendar <strong>event</strong> was modified" : "S'ha modificat un <strong> esdeveniment </strong> del calendari",
     "A calendar <strong>todo</strong> was modified" : "S'ha modificat una <strong>tasca</strong> d'un calendari",
-    "Death of %s" : "Mort de %s",
     "Contact birthdays" : "Aniversaris dels contactes",
-    "Calendar:" : "Calendari:",
-    "Date:" : "Data:",
-    "Where:" : "On:",
-    "Description:" : "Descripció:",
-    "Untitled event" : "Esdeveniment sense títol",
-    "_%n year_::_%n years_" : ["%n any","%n anys"],
-    "_%n month_::_%n months_" : ["%n mes","%n mesos"],
-    "_%n day_::_%n days_" : ["%n dia","%n dies"],
-    "_%n hour_::_%n hours_" : ["%n hora","%n hores"],
-    "_%n minute_::_%n minutes_" : ["%n minut","%n minuts"],
-    "%s (in %s)" : "%s (d'aquí a %s)",
-    "%s (%s ago)" : "%s (fa %s)",
-    "Calendar: %s" : "Calendari: %s",
-    "Date: %s" : "Data: %s",
-    "Description: %s" : "Descripció: %s",
-    "Where: %s" : "On: %s",
     "%1$s via %2$s" : "%1$s via %2$s",
     "Invitation canceled" : "Invitació cancel·lada",
     "Hello %s," : "Hola %s,",
@@ -67,6 +50,8 @@
     "The meeting »%1$s« with %2$s was updated." : "La reunió »%1$s« amb %2$s ha estat actualitzada.",
     "%1$s invited you to »%2$s«" : "%1$s us ha convidat a »%2$s«",
     "When:" : "Quan:",
+    "Where:" : "On:",
+    "Description:" : "Descripció:",
     "Link:" : "Enllaç:",
     "Accept" : "Accepta",
     "Decline" : "Rebutja",
@@ -94,8 +79,6 @@
     "Automatically generate a birthday calendar" : "Genera automàticament un calendari d’aniversari",
     "Birthday calendars will be generated by a background job." : "Els calendaris d'aniversari es generaran per un procés en segon pla..",
     "Hence they will not be available immediately after enabling but will show up after some time." : "Per tant, no estaran disponibles immediatament després d'habilitar-los, però apareixeran d'aquí una estona.",
-    "Send notifications for events" : "Envia notificacions per als esdeveniments",
-    "Notifications will be send through background jobs, so these need to happen often enough." : "Les notificacions s'enviaran a través de tasques en segon terme; per tant, cal que succeeixin prou sovint.",
     "%s via %s" : "%s via %s",
     "The meeting »%s« with %s was canceled." : "La reunió »%s« amb %s ha estat cancel·lada.",
     "The meeting »%s« with %s was updated." : "La reunió »%s« amb %s ha estat actualitzada.",

apps/dav/l10n/cs.js

@@ -43,10 +43,7 @@ OC.L10N.register(
     "A <strong>calendar</strong> was modified" : "<strong>Kalendář</strong> byl změněn",
     "A calendar <strong>event</strong> was modified" : "<strong>Událost</strong> v kalendáři byla změněna",
     "A calendar <strong>todo</strong> was modified" : "<strong>Úkol</strong> v kalendáři byl změněn",
-    "Death of %s" : "Smrt %s",
     "Contact birthdays" : "Narozeniny kontaktů",
-    "Where:" : "Kde:",
-    "Description:" : "Popis:",
     "%1$s via %2$s" : "%1$s prostřednictvím %2$s",
     "Invitation canceled" : "Pozvánka zrušena",
     "Hello %s," : "Dobrý den %s,",
@@ -55,6 +52,8 @@ OC.L10N.register(
     "The meeting »%1$s« with %2$s was updated." : "Setkání „%1$s“ s %2$s bylo zrušeno.",
     "%1$s invited you to »%2$s«" : "%1$s vás pozval(a) na „%2$s“",
     "When:" : "Kdy:",
+    "Where:" : "Kde:",
+    "Description:" : "Popis:",
     "Link:" : "Odkaz:",
     "Accept" : "Přijmout",
     "Decline" : "Zamítnout",

apps/dav/l10n/cs.json

@@ -41,10 +41,7 @@
     "A <strong>calendar</strong> was modified" : "<strong>Kalendář</strong> byl změněn",
     "A calendar <strong>event</strong> was modified" : "<strong>Událost</strong> v kalendáři byla změněna",
     "A calendar <strong>todo</strong> was modified" : "<strong>Úkol</strong> v kalendáři byl změněn",
-    "Death of %s" : "Smrt %s",
     "Contact birthdays" : "Narozeniny kontaktů",
-    "Where:" : "Kde:",
-    "Description:" : "Popis:",
     "%1$s via %2$s" : "%1$s prostřednictvím %2$s",
     "Invitation canceled" : "Pozvánka zrušena",
     "Hello %s," : "Dobrý den %s,",
@@ -53,6 +50,8 @@
     "The meeting »%1$s« with %2$s was updated." : "Setkání „%1$s“ s %2$s bylo zrušeno.",
     "%1$s invited you to »%2$s«" : "%1$s vás pozval(a) na „%2$s“",
     "When:" : "Kdy:",
+    "Where:" : "Kde:",
+    "Description:" : "Popis:",
     "Link:" : "Odkaz:",
     "Accept" : "Přijmout",
     "Decline" : "Zamítnout",

apps/dav/l10n/da.js

@@ -43,12 +43,12 @@ OC.L10N.register(
     "A calendar <strong>event</strong> was modified" : "En kalender <strong>begivenhed</strong> er blevet ændret",
     "A calendar <strong>todo</strong> was modified" : "En kalender  <strong>opgave</strong> blev ændret",
     "Contact birthdays" : "Kontakt fødselsdag",
-    "Where:" : "Hvor:",
-    "Description:" : "Beskrivelse:",
     "Invitation canceled" : "Invitation annulleret",
     "Hello %s," : "Goddag %s,",
     "Invitation updated" : "Invitation opdateret ",
     "When:" : "Hvornår:",
+    "Where:" : "Hvor:",
+    "Description:" : "Beskrivelse:",
     "Link:" : "Link:",
     "Accept" : "Accepter",
     "Decline" : "Afvis",

apps/dav/l10n/da.json

@@ -41,12 +41,12 @@
     "A calendar <strong>event</strong> was modified" : "En kalender <strong>begivenhed</strong> er blevet ændret",
     "A calendar <strong>todo</strong> was modified" : "En kalender  <strong>opgave</strong> blev ændret",
     "Contact birthdays" : "Kontakt fødselsdag",
-    "Where:" : "Hvor:",
-    "Description:" : "Beskrivelse:",
     "Invitation canceled" : "Invitation annulleret",
     "Hello %s," : "Goddag %s,",
     "Invitation updated" : "Invitation opdateret ",
     "When:" : "Hvornår:",
+    "Where:" : "Hvor:",
+    "Description:" : "Beskrivelse:",
     "Link:" : "Link:",
     "Accept" : "Accepter",
     "Decline" : "Afvis",

apps/dav/l10n/de.js

@@ -43,24 +43,7 @@ OC.L10N.register(
     "A <strong>calendar</strong> was modified" : "Ein <strong>Kalender</strong> wurde bearbeitet",
     "A calendar <strong>event</strong> was modified" : "Ein Kalender-<strong>Ereignis</strong> wurde bearbeitet",
     "A calendar <strong>todo</strong> was modified" : "Eine Kalender-<strong>Aufgabe</strong> wurde bearbeitet",
-    "Death of %s" : "Todestag von %s",
     "Contact birthdays" : "Geburtstage von Kontakten",
-    "Calendar:" : "Kalender:",
-    "Date:" : "Datum:",
-    "Where:" : "Wo:",
-    "Description:" : "Beschreibung:",
-    "Untitled event" : "Unbenanntes Ereignis",
-    "_%n year_::_%n years_" : ["%n Jahr","%n Jahre"],
-    "_%n month_::_%n months_" : ["%n  Monat","%n  Monate"],
-    "_%n day_::_%n days_" : ["%n Tag","%n Tage"],
-    "_%n hour_::_%n hours_" : ["%n Stunde","%n Stunden"],
-    "_%n minute_::_%n minutes_" : ["%n Minute","%n Minuten"],
-    "%s (in %s)" : "%s (in %s)",
-    "%s (%s ago)" : "%s (vor %s)",
-    "Calendar: %s" : "Kalender: %s",
-    "Date: %s" : "Datum: %s",
-    "Description: %s" : "Beschreibung: %s",
-    "Where: %s" : "Ort: %s",
     "%1$s via %2$s" : "%1$s über %2$s",
     "Invitation canceled" : "Einladung abgebrochen",
     "Hello %s," : "Hallo %s,",
@@ -69,6 +52,8 @@ OC.L10N.register(
     "The meeting »%1$s« with %2$s was updated." : "Der Termin  »%1$s« mit  %2$s wurde aktualisiert.",
     "%1$s invited you to »%2$s«" : "%1$s hat Dich zu »%2$s« eingeladen",
     "When:" : "Wann:",
+    "Where:" : "Wo:",
+    "Description:" : "Beschreibung:",
     "Link:" : "Link:",
     "Accept" : "Akzeptieren",
     "Decline" : "Ablehnen",
@@ -96,9 +81,6 @@ OC.L10N.register(
     "Automatically generate a birthday calendar" : "Automatisch einen Kalender für Geburtstage erstellen",
     "Birthday calendars will be generated by a background job." : "Kalender für Geburtstage werden von einem Hintergrund-Auftrag erstellt",
     "Hence they will not be available immediately after enabling but will show up after some time." : "Die Einträge werden nicht sofort angezeigt. Nach der Aktivierung wird es ein wenig dauern bis zur Anzeige.",
-    "Send notifications for events" : "Sende Benachrichtigungen für Ereignisse",
-    "Notifications will be send through background jobs, so these need to happen often enough." : "Benachrichtigungen werden von Hintergrundjobs erstellt, sodass diese häufig genug ausgeführt werden müssen.",
-    "Enable notifications for events via push" : "Benachrichtigungen für Ereignisse per Push aktivieren",
     "%s via %s" : "%s über %s",
     "The meeting »%s« with %s was canceled." : "Der Termin »%s« mit %s wurde abgesagt.",
     "The meeting »%s« with %s was updated." : "Der Termin  »%s« mit  %s wurde aktualisiert.",

apps/dav/l10n/de.json

@@ -41,24 +41,7 @@
     "A <strong>calendar</strong> was modified" : "Ein <strong>Kalender</strong> wurde bearbeitet",
     "A calendar <strong>event</strong> was modified" : "Ein Kalender-<strong>Ereignis</strong> wurde bearbeitet",
     "A calendar <strong>todo</strong> was modified" : "Eine Kalender-<strong>Aufgabe</strong> wurde bearbeitet",
-    "Death of %s" : "Todestag von %s",
     "Contact birthdays" : "Geburtstage von Kontakten",
-    "Calendar:" : "Kalender:",
-    "Date:" : "Datum:",
-    "Where:" : "Wo:",
-    "Description:" : "Beschreibung:",
-    "Untitled event" : "Unbenanntes Ereignis",
-    "_%n year_::_%n years_" : ["%n Jahr","%n Jahre"],
-    "_%n month_::_%n months_" : ["%n  Monat","%n  Monate"],
-    "_%n day_::_%n days_" : ["%n Tag","%n Tage"],
-    "_%n hour_::_%n hours_" : ["%n Stunde","%n Stunden"],
-    "_%n minute_::_%n minutes_" : ["%n Minute","%n Minuten"],
-    "%s (in %s)" : "%s (in %s)",
-    "%s (%s ago)" : "%s (vor %s)",
-    "Calendar: %s" : "Kalender: %s",
-    "Date: %s" : "Datum: %s",
-    "Description: %s" : "Beschreibung: %s",
-    "Where: %s" : "Ort: %s",
     "%1$s via %2$s" : "%1$s über %2$s",
     "Invitation canceled" : "Einladung abgebrochen",
     "Hello %s," : "Hallo %s,",
@@ -67,6 +50,8 @@
     "The meeting »%1$s« with %2$s was updated." : "Der Termin  »%1$s« mit  %2$s wurde aktualisiert.",
     "%1$s invited you to »%2$s«" : "%1$s hat Dich zu »%2$s« eingeladen",
     "When:" : "Wann:",
+    "Where:" : "Wo:",
+    "Description:" : "Beschreibung:",
     "Link:" : "Link:",
     "Accept" : "Akzeptieren",
     "Decline" : "Ablehnen",
@@ -94,9 +79,6 @@
     "Automatically generate a birthday calendar" : "Automatisch einen Kalender für Geburtstage erstellen",
     "Birthday calendars will be generated by a background job." : "Kalender für Geburtstage werden von einem Hintergrund-Auftrag erstellt",
     "Hence they will not be available immediately after enabling but will show up after some time." : "Die Einträge werden nicht sofort angezeigt. Nach der Aktivierung wird es ein wenig dauern bis zur Anzeige.",
-    "Send notifications for events" : "Sende Benachrichtigungen für Ereignisse",
-    "Notifications will be send through background jobs, so these need to happen often enough." : "Benachrichtigungen werden von Hintergrundjobs erstellt, sodass diese häufig genug ausgeführt werden müssen.",
-    "Enable notifications for events via push" : "Benachrichtigungen für Ereignisse per Push aktivieren",
     "%s via %s" : "%s über %s",
     "The meeting »%s« with %s was canceled." : "Der Termin »%s« mit %s wurde abgesagt.",
     "The meeting »%s« with %s was updated." : "Der Termin  »%s« mit  %s wurde aktualisiert.",

apps/dav/l10n/de_DE.js

@@ -43,24 +43,7 @@ OC.L10N.register(
     "A <strong>calendar</strong> was modified" : "Ein <strong>Kalender</strong> wurde bearbeitet",
     "A calendar <strong>event</strong> was modified" : "Ein Kalender-<strong>Ereignis</strong> wurde bearbeitet",
     "A calendar <strong>todo</strong> was modified" : "Eine Kalender-<strong>Aufgabe</strong> wurde bearbeitet",
-    "Death of %s" : "Todestag von %s",
     "Contact birthdays" : "Geburtstage von Kontakten",
-    "Calendar:" : "Kalender:",
-    "Date:" : "Datum:",
-    "Where:" : "Wo:",
-    "Description:" : "Beschreibung:",
-    "Untitled event" : "Unbenanntes Ereignis",
-    "_%n year_::_%n years_" : ["%n Jahr","%n Jahre"],
-    "_%n month_::_%n months_" : ["%n Monat","%n Monate"],
-    "_%n day_::_%n days_" : ["%n Tag","%n Tage"],
-    "_%n hour_::_%n hours_" : ["%n Stunde","%n Stunden"],
-    "_%n minute_::_%n minutes_" : ["%n Minute","%n Minuten"],
-    "%s (in %s)" : "%s (in %s)",
-    "%s (%s ago)" : "%s (vor %s)",
-    "Calendar: %s" : "Kalender: %s",
-    "Date: %s" : "Datum: %s",
-    "Description: %s" : "Beschreibung: %s",
-    "Where: %s" : "Ort: %s",
     "%1$s via %2$s" : "%1$s über %2$s",
     "Invitation canceled" : "Einladung abgebrochen",
     "Hello %s," : "Hallo %s,",
@@ -69,6 +52,8 @@ OC.L10N.register(
     "The meeting »%1$s« with %2$s was updated." : "Der Termin »%1$s« mit %2$s wurde aktualisiert.",
     "%1$s invited you to »%2$s«" : "%1$s hat Sie zu »%2$s« eingeladen",
     "When:" : "Wann:",
+    "Where:" : "Wo:",
+    "Description:" : "Beschreibung:",
     "Link:" : "Link:",
     "Accept" : "Akzeptieren",
     "Decline" : "Ablehnen",
@@ -96,9 +81,6 @@ OC.L10N.register(
     "Automatically generate a birthday calendar" : "Automatisch einen Kalender für Geburtstage erstellen",
     "Birthday calendars will be generated by a background job." : "Kalender für Geburtstage werden von einem Hintergrund-Auftrag erstellt",
     "Hence they will not be available immediately after enabling but will show up after some time." : "Die Einträge werden nicht sofort angezeigt. Nach der Aktivierung wird es ein wenig dauern bis zur Anzeige.",
-    "Send notifications for events" : "Sende Benachrichtigungen für Ereignisse",
-    "Notifications will be send through background jobs, so these need to happen often enough." : "Benachrichtigungen werden von Hintergrundjobs erstellt, sodass diese häufig genug ausgeführt werden müssen.",
-    "Enable notifications for events via push" : "Benachrichtigungen für Ereignisse per Push aktivieren",
     "%s via %s" : "%s über %s",
     "The meeting »%s« with %s was canceled." : "Der Termin »%s« mit %s wurde abgesagt.",
     "The meeting »%s« with %s was updated." : "Der Termin »%s« mit %s wurde aktualisiert.",

apps/dav/l10n/de_DE.json

@@ -41,24 +41,7 @@
     "A <strong>calendar</strong> was modified" : "Ein <strong>Kalender</strong> wurde bearbeitet",
     "A calendar <strong>event</strong> was modified" : "Ein Kalender-<strong>Ereignis</strong> wurde bearbeitet",
     "A calendar <strong>todo</strong> was modified" : "Eine Kalender-<strong>Aufgabe</strong> wurde bearbeitet",
-    "Death of %s" : "Todestag von %s",
     "Contact birthdays" : "Geburtstage von Kontakten",
-    "Calendar:" : "Kalender:",
-    "Date:" : "Datum:",
-    "Where:" : "Wo:",
-    "Description:" : "Beschreibung:",
-    "Untitled event" : "Unbenanntes Ereignis",
-    "_%n year_::_%n years_" : ["%n Jahr","%n Jahre"],
-    "_%n month_::_%n months_" : ["%n Monat","%n Monate"],
-    "_%n day_::_%n days_" : ["%n Tag","%n Tage"],
-    "_%n hour_::_%n hours_" : ["%n Stunde","%n Stunden"],
-    "_%n minute_::_%n minutes_" : ["%n Minute","%n Minuten"],
-    "%s (in %s)" : "%s (in %s)",
-    "%s (%s ago)" : "%s (vor %s)",
-    "Calendar: %s" : "Kalender: %s",
-    "Date: %s" : "Datum: %s",
-    "Description: %s" : "Beschreibung: %s",
-    "Where: %s" : "Ort: %s",
     "%1$s via %2$s" : "%1$s über %2$s",
     "Invitation canceled" : "Einladung abgebrochen",
     "Hello %s," : "Hallo %s,",
@@ -67,6 +50,8 @@
     "The meeting »%1$s« with %2$s was updated." : "Der Termin »%1$s« mit %2$s wurde aktualisiert.",
     "%1$s invited you to »%2$s«" : "%1$s hat Sie zu »%2$s« eingeladen",
     "When:" : "Wann:",
+    "Where:" : "Wo:",
+    "Description:" : "Beschreibung:",
     "Link:" : "Link:",
     "Accept" : "Akzeptieren",
     "Decline" : "Ablehnen",
@@ -94,9 +79,6 @@
     "Automatically generate a birthday calendar" : "Automatisch einen Kalender für Geburtstage erstellen",
     "Birthday calendars will be generated by a background job." : "Kalender für Geburtstage werden von einem Hintergrund-Auftrag erstellt",
     "Hence they will not be available immediately after enabling but will show up after some time." : "Die Einträge werden nicht sofort angezeigt. Nach der Aktivierung wird es ein wenig dauern bis zur Anzeige.",
-    "Send notifications for events" : "Sende Benachrichtigungen für Ereignisse",
-    "Notifications will be send through background jobs, so these need to happen often enough." : "Benachrichtigungen werden von Hintergrundjobs erstellt, sodass diese häufig genug ausgeführt werden müssen.",
-    "Enable notifications for events via push" : "Benachrichtigungen für Ereignisse per Push aktivieren",
     "%s via %s" : "%s über %s",
     "The meeting »%s« with %s was canceled." : "Der Termin »%s« mit %s wurde abgesagt.",
     "The meeting »%s« with %s was updated." : "Der Termin »%s« mit %s wurde aktualisiert.",

apps/dav/l10n/el.js

@@ -29,7 +29,6 @@ OC.L10N.register(
     "You deleted event {event} from calendar {calendar}" : "Διαγράψατε το συμβάν {event} από το ημερολόγιο {calendar}",
     "{actor} updated event {event} in calendar {calendar}" : "Ο {actor} ενημέρωσε το γεγονός {event} στο ημερολόγιο {calendar}",
     "You updated event {event} in calendar {calendar}" : "Ενημερώσατε το συμβάν {event} στο ημερολόγιο {calendar}",
-    "Busy" : "Απασχολημένος",
     "{actor} created todo {todo} in list {calendar}" : "{actor} δημιούργησε την εκκρεμότητα {todo} στη λίστα {ημερολόγιο}",
     "You created todo {todo} in list {calendar}" : "Δημιουργήσατε την εκκρεμότητα {todo} στη λίστα {ημερολόγιο}",
     "{actor} deleted todo {todo} from list {calendar}" : "Ο {actor} διέγραψε την εκκρεμότητα  {todo} από τη  λίστα {ημερολόγιο}",
@@ -44,40 +43,28 @@ OC.L10N.register(
     "A calendar <strong>event</strong> was modified" : "Τροποποιήθηκε ένα <strong>γεγονός</strong> του ημερολογίου",
     "A calendar <strong>todo</strong> was modified" : "Ενός ημερολογίου η <strong>εκκρεμότητα</strong> τροποποιήθηκε",
     "Contact birthdays" : "Γενέθλια επαφών",
-    "Where:" : "Που:",
-    "Description:" : "Περιγραφή:",
-    "Untitled event" : "Συμβάν χωρίς τίτλο",
     "%1$s via %2$s" : "%1$s μέσω %2$s",
     "Invitation canceled" : "Η πρόσκληση ακυρώθηκε.",
     "Hello %s," : "Γεια σου %s,",
-    "The meeting »%1$s« with %2$s was canceled." : "Το meeting »%1$s« με τον/την %2$s ακυρώθηκε.",
     "Invitation updated" : "Ενημερώθηκε η πρόσκληση.",
-    "The meeting »%1$s« with %2$s was updated." : "Το meeting » %1$s« με τον/την %2$s ενημερώθηκε.",
-    "%1$s invited you to »%2$s«" : "Ο %1$s σας προσκάλεσε στο »%2$s«",
     "When:" : "Πότε:",
+    "Where:" : "Που:",
+    "Description:" : "Περιγραφή:",
     "Link:" : "Σύνδεσμος:",
     "Accept" : "Αποδοχή",
     "Decline" : "Απόρριψη",
-    "More options …" : "Περισσότερες επιλογές...",
-    "More options at %s" : "Περισσότερες επιλογές στο %s",
     "Contacts" : "Επαφές",
     "WebDAV" : "WebDAV",
-    "WebDAV endpoint" : "Τερματικό WebDAV",
     "Technical details" : "Τεχνικές λεπτομέρειες",
     "Remote Address: %s" : "Απομακρυσμένη Διεύθυνση: %s",
     "Request ID: %s" : "ID Αιτήματος: %s",
-    "Please contact the organizer directly." : "Παρακαλώ επικοινωνήστε απ' ευθείας με τον διοργανωτή.",
-    "Are you accepting the invitation?" : "Αποδέχεστε την πρόσκληση;",
     "Save" : "Αποθήκευση",
-    "Your attendance was updated successfully." : "Η παρουσία σας ενημερώθηκε με επιτυχία.",
     "Send invitations to attendees" : "Αποστολή προσκλήσεων στους συμμετέχοντες.",
     "Automatically generate a birthday calendar" : "Δημιουργία ημερολογίου γενεθλίων αυτόματα",
     "Birthday calendars will be generated by a background job." : "Τα ημερολόγια γενεθλίων θα δημιουργηθούν από μία εργασία παρασκηνίου.",
-    "Notifications will be send through background jobs, so these need to happen often enough." : "Οι ειδοποιήσεις θα αποστέλλονται μέσω εργασιών στο παρασκήνιο, οπότε αυτές πρέπει να συμβαίνουν αρκετά συχνά.",
     "%s via %s" : "%s μέσω %s",
     "The meeting »%s« with %s was canceled." : "Το meeting »%s« με τον/την %s ακυρώθηκε.",
     "The meeting »%s« with %s was updated." : "Το meeting » %s « με τον/την %s ενημερώθηκε.",
-    "%s invited you to »%s«" : "Ο %s σας προσκάλεσε στο  »%s«",
     "Please make sure to properly set up the email settings above." : "Παρακαλούμε σιγουρευθείτε οτι θα ενημερώσετε τις ρυθμίσεις email, παραπάνω."
 },
 "nplurals=2; plural=(n != 1);");

apps/dav/l10n/el.json

@@ -27,7 +27,6 @@
     "You deleted event {event} from calendar {calendar}" : "Διαγράψατε το συμβάν {event} από το ημερολόγιο {calendar}",
     "{actor} updated event {event} in calendar {calendar}" : "Ο {actor} ενημέρωσε το γεγονός {event} στο ημερολόγιο {calendar}",
     "You updated event {event} in calendar {calendar}" : "Ενημερώσατε το συμβάν {event} στο ημερολόγιο {calendar}",
-    "Busy" : "Απασχολημένος",
     "{actor} created todo {todo} in list {calendar}" : "{actor} δημιούργησε την εκκρεμότητα {todo} στη λίστα {ημερολόγιο}",
     "You created todo {todo} in list {calendar}" : "Δημιουργήσατε την εκκρεμότητα {todo} στη λίστα {ημερολόγιο}",
     "{actor} deleted todo {todo} from list {calendar}" : "Ο {actor} διέγραψε την εκκρεμότητα  {todo} από τη  λίστα {ημερολόγιο}",
@@ -42,40 +41,28 @@
     "A calendar <strong>event</strong> was modified" : "Τροποποιήθηκε ένα <strong>γεγονός</strong> του ημερολογίου",
     "A calendar <strong>todo</strong> was modified" : "Ενός ημερολογίου η <strong>εκκρεμότητα</strong> τροποποιήθηκε",
     "Contact birthdays" : "Γενέθλια επαφών",
-    "Where:" : "Που:",
-    "Description:" : "Περιγραφή:",
-    "Untitled event" : "Συμβάν χωρίς τίτλο",
     "%1$s via %2$s" : "%1$s μέσω %2$s",
     "Invitation canceled" : "Η πρόσκληση ακυρώθηκε.",
     "Hello %s," : "Γεια σου %s,",
-    "The meeting »%1$s« with %2$s was canceled." : "Το meeting »%1$s« με τον/την %2$s ακυρώθηκε.",
     "Invitation updated" : "Ενημερώθηκε η πρόσκληση.",
-    "The meeting »%1$s« with %2$s was updated." : "Το meeting » %1$s« με τον/την %2$s ενημερώθηκε.",
-    "%1$s invited you to »%2$s«" : "Ο %1$s σας προσκάλεσε στο »%2$s«",
     "When:" : "Πότε:",
+    "Where:" : "Που:",
+    "Description:" : "Περιγραφή:",
     "Link:" : "Σύνδεσμος:",
     "Accept" : "Αποδοχή",
     "Decline" : "Απόρριψη",
-    "More options …" : "Περισσότερες επιλογές...",
-    "More options at %s" : "Περισσότερες επιλογές στο %s",
     "Contacts" : "Επαφές",
     "WebDAV" : "WebDAV",
-    "WebDAV endpoint" : "Τερματικό WebDAV",
     "Technical details" : "Τεχνικές λεπτομέρειες",
     "Remote Address: %s" : "Απομακρυσμένη Διεύθυνση: %s",
     "Request ID: %s" : "ID Αιτήματος: %s",
-    "Please contact the organizer directly." : "Παρακαλώ επικοινωνήστε απ' ευθείας με τον διοργανωτή.",
-    "Are you accepting the invitation?" : "Αποδέχεστε την πρόσκληση;",
     "Save" : "Αποθήκευση",
-    "Your attendance was updated successfully." : "Η παρουσία σας ενημερώθηκε με επιτυχία.",
     "Send invitations to attendees" : "Αποστολή προσκλήσεων στους συμμετέχοντες.",
     "Automatically generate a birthday calendar" : "Δημιουργία ημερολογίου γενεθλίων αυτόματα",
     "Birthday calendars will be generated by a background job." : "Τα ημερολόγια γενεθλίων θα δημιουργηθούν από μία εργασία παρασκηνίου.",
-    "Notifications will be send through background jobs, so these need to happen often enough." : "Οι ειδοποιήσεις θα αποστέλλονται μέσω εργασιών στο παρασκήνιο, οπότε αυτές πρέπει να συμβαίνουν αρκετά συχνά.",
     "%s via %s" : "%s μέσω %s",
     "The meeting »%s« with %s was canceled." : "Το meeting »%s« με τον/την %s ακυρώθηκε.",
     "The meeting »%s« with %s was updated." : "Το meeting » %s « με τον/την %s ενημερώθηκε.",
-    "%s invited you to »%s«" : "Ο %s σας προσκάλεσε στο  »%s«",
     "Please make sure to properly set up the email settings above." : "Παρακαλούμε σιγουρευθείτε οτι θα ενημερώσετε τις ρυθμίσεις email, παραπάνω."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/dav/l10n/en_GB.js

@@ -43,12 +43,12 @@ OC.L10N.register(
     "A calendar <strong>event</strong> was modified" : "A calendar <strong>event</strong> was modified",
     "A calendar <strong>todo</strong> was modified" : "A calendar <strong>todo</strong> was modified",
     "Contact birthdays" : "Contact birthdays",
-    "Where:" : "Where:",
-    "Description:" : "Description:",
     "Invitation canceled" : "Invitation canceled",
     "Hello %s," : "Hello %s,",
     "Invitation updated" : "Invitation updated",
     "When:" : "When:",
+    "Where:" : "Where:",
+    "Description:" : "Description:",
     "Link:" : "Link:",
     "Contacts" : "Contacts",
     "WebDAV" : "WebDAV",

apps/dav/l10n/en_GB.json

@@ -41,12 +41,12 @@
     "A calendar <strong>event</strong> was modified" : "A calendar <strong>event</strong> was modified",
     "A calendar <strong>todo</strong> was modified" : "A calendar <strong>todo</strong> was modified",
     "Contact birthdays" : "Contact birthdays",
-    "Where:" : "Where:",
-    "Description:" : "Description:",
     "Invitation canceled" : "Invitation canceled",
     "Hello %s," : "Hello %s,",
     "Invitation updated" : "Invitation updated",
     "When:" : "When:",
+    "Where:" : "Where:",
+    "Description:" : "Description:",
     "Link:" : "Link:",
     "Contacts" : "Contacts",
     "WebDAV" : "WebDAV",

apps/dav/l10n/eo.js

@@ -44,12 +44,6 @@ OC.L10N.register(
     "A calendar <strong>event</strong> was modified" : "Kalendara <strong>okazaĵo</strong> estis modifita",
     "A calendar <strong>todo</strong> was modified" : "Kalendara <strong>farendaĵo</strong> estis modifita",
     "Contact birthdays" : "Kontaktaj datrevenoj",
-    "Calendar:" : "Kalendaro:",
-    "Date:" : "Dato:",
-    "Where:" : "Kie:",
-    "Description:" : "Priskribo:",
-    "Untitled event" : "Sentitola okazaĵo",
-    "_%n year_::_%n years_" : ["%n jaro","%n jaroj"],
     "%1$s via %2$s" : "%1$s pere de %2$s",
     "Invitation canceled" : "Invito nuligita",
     "Hello %s," : "Saluton %s,",
@@ -58,6 +52,8 @@ OC.L10N.register(
     "The meeting »%1$s« with %2$s was updated." : "La kunsido „%1$s“ kun %2$s estis ĝisdatigita.",
     "%1$s invited you to »%2$s«" : "%1$s invitis vin al „%2$s“",
     "When:" : "Kiam:",
+    "Where:" : "Kie:",
+    "Description:" : "Priskribo:",
     "Link:" : "Ligilo:",
     "Accept" : "Akcepti",
     "Decline" : "Malakcepti",

apps/dav/l10n/eo.json

@@ -42,12 +42,6 @@
     "A calendar <strong>event</strong> was modified" : "Kalendara <strong>okazaĵo</strong> estis modifita",
     "A calendar <strong>todo</strong> was modified" : "Kalendara <strong>farendaĵo</strong> estis modifita",
     "Contact birthdays" : "Kontaktaj datrevenoj",
-    "Calendar:" : "Kalendaro:",
-    "Date:" : "Dato:",
-    "Where:" : "Kie:",
-    "Description:" : "Priskribo:",
-    "Untitled event" : "Sentitola okazaĵo",
-    "_%n year_::_%n years_" : ["%n jaro","%n jaroj"],
     "%1$s via %2$s" : "%1$s pere de %2$s",
     "Invitation canceled" : "Invito nuligita",
     "Hello %s," : "Saluton %s,",
@@ -56,6 +50,8 @@
     "The meeting »%1$s« with %2$s was updated." : "La kunsido „%1$s“ kun %2$s estis ĝisdatigita.",
     "%1$s invited you to »%2$s«" : "%1$s invitis vin al „%2$s“",
     "When:" : "Kiam:",
+    "Where:" : "Kie:",
+    "Description:" : "Priskribo:",
     "Link:" : "Ligilo:",
     "Accept" : "Akcepti",
     "Decline" : "Malakcepti",

apps/dav/l10n/es.js

@@ -44,22 +44,6 @@ OC.L10N.register(
     "A calendar <strong>event</strong> was modified" : "Un <strong>evento</strong> del calendario fue modificado.",
     "A calendar <strong>todo</strong> was modified" : "Una <strong>lista de tareas</strong> fue modificada",
     "Contact birthdays" : "Cumpleaños del contacto",
-    "Calendar:" : "Calendario:",
-    "Date:" : "Fecha:",
-    "Where:" : "Dónde:",
-    "Description:" : "Descripción:",
-    "Untitled event" : "Evento sin título",
-    "_%n year_::_%n years_" : ["%n año","%naños"],
-    "_%n month_::_%n months_" : ["%n mes","%n meses"],
-    "_%n day_::_%n days_" : ["%n día","%n días"],
-    "_%n hour_::_%n hours_" : ["%n hora","%n horas"],
-    "_%n minute_::_%n minutes_" : ["%n minuto","%n minutos"],
-    "%s (in %s)" : "%s (en %s)",
-    "%s (%s ago)" : "%s (hace %s)",
-    "Calendar: %s" : "Calendario: %s",
-    "Date: %s" : "Fecha: %s",
-    "Description: %s" : "Descripción: %s",
-    "Where: %s" : "Lugar: %s",
     "%1$s via %2$s" : "%1$s vía %2$s",
     "Invitation canceled" : "Invitación cancelada",
     "Hello %s," : "Hola, %s:",
@@ -68,6 +52,8 @@ OC.L10N.register(
     "The meeting »%1$s« with %2$s was updated." : "La reunión »%1$s« con %2$s se ha actualizado.",
     "%1$s invited you to »%2$s«" : "%1$s te ha invitado a »%2$s«",
     "When:" : "Cuándo:",
+    "Where:" : "Dónde:",
+    "Description:" : "Descripción:",
     "Link:" : "Enlace:",
     "Accept" : "Aceptar",
     "Decline" : "Rechazar",
@@ -95,8 +81,6 @@ OC.L10N.register(
     "Automatically generate a birthday calendar" : "Generar automáticamente un calendario de cumpleaños",
     "Birthday calendars will be generated by a background job." : "Los calendarios de cumpleaños se generarán mediante un trabajo en segundo plano.",
     "Hence they will not be available immediately after enabling but will show up after some time." : "Por ello, no estarán disponibles inmediatamente tras activarlos, sino que aparecerán después de cierto tiempo.",
-    "Send notifications for events" : "Enviar notificaciones de los eventos",
-    "Notifications will be send through background jobs, so these need to happen often enough." : "Las notificaciones se enviarán a través de trabajos en segundo plano, por lo que estos deben llevarse a cabo con cierta frecuencia.",
     "%s via %s" : "%s vía %s",
     "The meeting »%s« with %s was canceled." : "La reunión »%s« con %s se ha cancelado.",
     "The meeting »%s« with %s was updated." : "La reunión »%s« con %s se ha actualizado.",