Increase patchlevel to 4

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Merge pull request #3519 from nextcloud/final-stable11-version
2017-02-17 01:15:06 +01:00 · 2017-02-17 01:11:10 +01:00 · 2017-02-17 00:38:36 +01:00 · 2017-02-17 00:05:18 +01:00 · 2017-02-16 23:02:07 +01:00 · 2017-02-16 23:01:56 +01:00
6496 changed files with 714660 additions and 369566 deletions
@@ -0,0 +1,11 @@
+codecov:
+  branch: master
+
+coverage:
+  precision: 2
+  round: down
+  range: "70...100"
+
+comment:
+  layout: "header, diff, changes, uncovered, tree"
+  behavior: default
@@ -0,0 +1,486 @@
+pipeline:
+  clone:
+    image: plugins/git
+    depth: 1
+  jsunit:
+    image: nextcloudci/jsunit:jsunit-5
+    commands:
+      - ./autotest-js.sh
+      - curl -o codecov.sh https://codecov.io/bash
+      - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5; fi"
+      - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5; fi"
+    when:
+      matrix:
+        TESTS: jsunit
+  check-autoloader:
+    image: nextcloudci/php7.0:php7.0-7
+    commands:
+      - bash ./build/autoloaderchecker.sh
+    when:
+      matrix:
+        TESTS: check-autoloader
+  app-check-code:
+    image: nextcloudci/php7.0:php7.0-7
+    commands:
+      - ./occ app:check-code admin_audit
+      - ./occ app:check-code comments
+      - ./occ app:check-code federation
+      - ./occ app:check-code sharebymail
+      - ./occ app:check-code systemtags
+      - ./occ app:check-code theming
+      - ./occ app:check-code workflowengine
+    when:
+      matrix:
+        TESTS: app-check-code
+  signed-off-check:
+    image: nextcloudci/php7.0:php7.0-7
+    commands:
+      - php ./build/signed-off-checker.php
+    when:
+      matrix:
+        TESTS: signed-off-check
+  htaccess-checker:
+    image: nextcloudci/php7.0:php7.0-7
+    commands:
+      - php ./build/htaccess-checker.php
+    when:
+      matrix:
+        TESTS: htaccess-checker
+  syntax-php5.6:
+    image: nextcloudci/php5.6:php5.6-7
+    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 .
+    when:
+      matrix:
+        TESTS: syntax-php5.6
+  syntax-php7.0:
+    image: nextcloudci/php7.0:php7.0-7
+    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 .
+    when:
+      matrix:
+        TESTS: syntax-php7.0
+  syntax-php7.1:
+    image: nextcloudci/php7.1:php7.1-11
+    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 .
+    when:
+      matrix:
+        TESTS: syntax-php7.1
+  litmus-v1:
+    image: nextcloudci/litmus-php7.0:litmus-php7.0-4
+    commands:
+      - bash tests/travis/install.sh sqlite
+      - bash apps/dav/tests/travis/litmus-v1/script.sh
+    when:
+      matrix:
+        TESTS: litmus-v1
+  litmus-v2:
+    image: nextcloudci/litmus-php7.0:litmus-php7.0-4
+    commands:
+      - bash tests/travis/install.sh sqlite
+      - bash apps/dav/tests/travis/litmus-v2/script.sh
+    when:
+      matrix:
+        TESTS: litmus-v2
+  caldavtester-new-endpoint:
+    image: nextcloudci/litmus-php7.0:litmus-php7.0-4
+    commands:
+      - bash tests/travis/install.sh sqlite
+      - bash apps/dav/tests/travis/caldav/install.sh
+      - bash apps/dav/tests/travis/caldav/script-new-endpoint.sh
+    when:
+      matrix:
+        TESTS: caldavtester-new-endpoint
+  caldavtester-old-endpoint:
+    image: nextcloudci/litmus-php7.0:litmus-php7.0-4
+    commands:
+      - bash tests/travis/install.sh sqlite
+      - bash apps/dav/tests/travis/caldav/install.sh
+      - bash apps/dav/tests/travis/caldav/script-old-endpoint.sh
+    when:
+      matrix:
+        TESTS: caldavtester-old-endpoint
+  carddavtester-new-endpoint:
+    image: nextcloudci/litmus-php7.0:litmus-php7.0-4
+    commands:
+      - bash tests/travis/install.sh sqlite
+      - bash apps/dav/tests/travis/carddav/install.sh
+      - bash apps/dav/tests/travis/carddav/script-new-endpoint.sh
+    when:
+      matrix:
+        TESTS: carddavtester-new-endpoint
+  carddavtester-old-endpoint:
+    image: nextcloudci/litmus-php7.0:litmus-php7.0-4
+    commands:
+      - bash tests/travis/install.sh sqlite
+      - bash apps/dav/tests/travis/carddav/install.sh
+      - bash apps/dav/tests/travis/carddav/script-old-endpoint.sh
+    when:
+      matrix:
+        TESTS: carddavtester-old-endpoint
+  nodb-php5.6:
+    image: nextcloudci/php5.6:php5.6-7
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
+    when:
+      matrix:
+        DB: NODB
+        PHP: 5.6
+  nodb-php7.0:
+    image: nextcloudci/php7.0:php7.0-7
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
+    when:
+      matrix:
+        DB: NODB
+        PHP: "7.0"
+  nodb-php7.1:
+    image: nextcloudci/php7.1:php7.1-11
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
+    when:
+      matrix:
+        DB: NODB
+        PHP: 7.1
+  sqlite-php5.6:
+    image: nextcloudci/php5.6:php5.6-7
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
+    when:
+      matrix:
+        DB: sqlite
+        PHP: 5.6
+  sqlite-php7.0:
+    image: nextcloudci/php7.0:php7.0-7
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
+    when:
+      matrix:
+        DB: sqlite
+        PHP: "7.0"
+  sqlite-php7.1:
+    image: nextcloudci/php7.1:php7.1-11
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
+    when:
+      matrix:
+        DB: sqlite
+        PHP: 7.1
+  mysql-php5.6:
+    image: nextcloudci/php5.6:php5.6-7
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
+    when:
+      matrix:
+        DB: mysql
+        PHP: 5.6
+  postgres-php5.6:
+    image: nextcloudci/php5.6:php5.6-7
+    commands:
+      - sleep 10 # gives the database enough time to initialize
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
+    when:
+      matrix:
+        DB: postgres
+        PHP: 5.6
+  mysqlmb4-php5.6:
+    image: nextcloudci/php5.6:php5.6-7
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
+    when:
+      matrix:
+        DB: mysqlmb4
+        PHP: 5.6
+  integration-capabilities_features:
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
+    commands:
+      - ./occ maintenance:install --admin-pass=admin
+      - cd build/integration
+      - ./run.sh capabilities_features/capabilities.feature
+    when:
+      matrix:
+        TESTS: integration-capabilities_features
+  integration-federation_features:
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
+    commands:
+      - ./occ maintenance:install --admin-pass=admin
+      - cd build/integration
+      - ./run.sh federation_features/federated.feature
+    when:
+      matrix:
+        TESTS: integration-federation_features
+  integration-auth:
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
+    commands:
+      - ./occ maintenance:install --admin-pass=admin
+      - cd build/integration
+      - ./run.sh features/auth.feature
+    when:
+      matrix:
+        TESTS: integration-auth
+  integration-carddav:
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
+    commands:
+      - ./occ maintenance:install --admin-pass=admin
+      - cd build/integration
+      - ./run.sh features/carddav.feature
+    when:
+      matrix:
+        TESTS: integration-carddav
+  integration-dav-v2:
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
+    commands:
+      - ./occ maintenance:install --admin-pass=admin
+      - cd build/integration
+      - ./run.sh features/dav-v2.feature
+    when:
+      matrix:
+        TESTS: integration-dav-v2
+  integration-ocs-v1:
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
+    commands:
+      - ./occ maintenance:install --admin-pass=admin
+      - cd build/integration
+      - ./run.sh features/ocs-v1.feature
+    when:
+      matrix:
+        TESTS: integration-ocs-v1
+  integration-sharing-v1:
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
+    commands:
+      - ./occ maintenance:install --admin-pass=admin
+      - cd build/integration
+      - ./run.sh features/sharing-v1.feature
+    when:
+      matrix:
+        TESTS: integration-sharing-v1
+  integration-checksums-v1:
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
+    commands:
+      - ./occ maintenance:install --admin-pass=admin
+      - cd build/integration
+      - ./run.sh features/checksums.feature
+    when:
+      matrix:
+        TESTS: integration-checksums
+  integration-external-storage:
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
+    commands:
+      - ./occ maintenance:install --admin-pass=admin
+      - cd build/integration
+      - ./run.sh features/external-storage.feature
+    when:
+      matrix:
+        TESTS: integration-external-storage
+  integration-provisioning-v1:
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
+    commands:
+      - ./occ maintenance:install --admin-pass=admin
+      - cd build/integration
+      - ./run.sh features/provisioning-v1.feature
+    when:
+      matrix:
+        TESTS: integration-provisioning-v1
+  integration-tags:
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
+    commands:
+      - ./occ maintenance:install --admin-pass=admin
+      - cd build/integration
+      - ./run.sh features/tags.feature
+    when:
+      matrix:
+        TESTS: integration-tags
+  integration-caldav:
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
+    commands:
+      - ./occ maintenance:install --admin-pass=admin
+      - cd build/integration
+      - ./run.sh features/caldav.feature
+    when:
+      matrix:
+        TESTS: integration-caldav
+  integration-comments:
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
+    commands:
+      - ./occ maintenance:install --admin-pass=admin
+      - cd build/integration
+      - ./run.sh features/comments.feature
+    when:
+      matrix:
+        TESTS: integration-comments
+  integration-favorites:
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
+    commands:
+      - ./occ maintenance:install --admin-pass=admin
+      - cd build/integration
+      - ./run.sh features/favorites.feature
+    when:
+      matrix:
+        TESTS: integration-favorites
+  integration-provisioning-v2:
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
+    commands:
+      - ./occ maintenance:install --admin-pass=admin
+      - cd build/integration
+      - ./run.sh features/provisioning-v2.feature
+    when:
+      matrix:
+        TESTS: integration-provisioning-v2
+  integration-webdav-related:
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
+    commands:
+      - ./occ maintenance:install --admin-pass=admin
+      - cd build/integration
+      - ./run.sh features/webdav-related.feature
+    when:
+      matrix:
+        TESTS: integration-webdav-related
+  integration-sharees-features:
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
+    commands:
+      - ./occ maintenance:install --admin-pass=admin
+      - cd build/integration
+      - ./run.sh sharees_features/sharees.feature
+    when:
+      matrix:
+        TESTS: integration-sharees-features
+  integration-setup-features:
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
+    commands:
+      - cd build/integration
+      - ./run.sh setup_features/setup.feature
+    when:
+      matrix:
+        TESTS: integration-setup-features
+  integration-filesdrop-features:
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
+    commands:
+      - ./occ maintenance:install --admin-pass=admin
+      - cd build/integration
+      - ./run.sh filesdrop_features/filesdrop.feature
+    when:
+      matrix:
+        TESTS: integration-filesdrop-features
+  integration-ldap-features:
+      image: nextcloudci/integration-php7.0:integration-php7.0-3
+      commands:
+        - ./occ maintenance:install --admin-pass=admin
+        - ./occ app:enable user_ldap
+        - cd build/integration
+        - ./run.sh ldap_features/ldap-ocs.feature
+      when:
+        matrix:
+          TESTS: integration-ldap-features
+  nodb-codecov:
+    image: nextcloudci/php7.0:php7.0-7
+    commands:
+      - TEST_SELECTION=NODB ./autotest.sh sqlite
+      - wget https://codecov.io/bash -O codecov.sh
+      - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
+      - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
+    when:
+      matrix:
+        TESTS: nodb-codecov
+  db-codecov:
+    image: nextcloudci/php7.0:php7.0-7
+    commands:
+      - TEST_SELECTION=QUICKDB ./autotest.sh sqlite
+      - wget https://codecov.io/bash -O codecov.sh
+      - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
+      - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
+    when:
+      matrix:
+        TESTS: db-codecov
+matrix:
+  include:
+    - TESTS: signed-off-check
+    - TESTS: htaccess-checker
+    - TESTS: nodb-codecov
+    - TESTS: db-codecov    
+    - TESTS: integration-capabilities_features
+    - TESTS: integration-federation_features
+    - TESTS: integration-auth
+    - TESTS: integration-carddav
+    - TESTS: integration-dav-v2
+    - TESTS: integration-ocs-v1
+    - TESTS: integration-sharing-v1
+    - TESTS: integration-checksums
+    - TESTS: integration-external-storage
+    - TESTS: integration-provisioning-v1
+    - TESTS: integration-tags
+    - TESTS: integration-caldav
+    - TESTS: integration-comments
+    - TESTS: integration-favorites
+    - TESTS: integration-provisioning-v2
+    - TESTS: integration-webdav-related
+    - TESTS: integration-sharees-features
+    - TESTS: integration-setup-features
+    - TESTS: integration-filesdrop-features
+    - TESTS: integration-ldap-features
+    - TESTS: jsunit
+    - TESTS: check-autoloader
+    - TESTS: app-check-code
+    - TESTS: syntax-php5.6
+    - TESTS: syntax-php7.0
+    - TESTS: syntax-php7.1
+    - TESTS: litmus-v1
+    - TESTS: litmus-v2
+    - TESTS: caldavtester-old-endpoint
+    - TESTS: caldavtester-new-endpoint
+    - TESTS: carddavtester-new-endpoint
+    - TESTS: carddavtester-old-endpoint
+    - DB: NODB
+      PHP: 5.6
+    - DB: NODB
+      PHP: 7.0
+    - DB: NODB
+      PHP: 7.1
+    - DB: sqlite
+      PHP: 5.6
+    - DB: sqlite
+      PHP: 7.0
+    - DB: sqlite
+      PHP: 7.1
+    - DB: mysql
+      PHP: 5.6
+    - DB: postgres
+      PHP: 5.6
+    - DB: mysqlmb4
+      PHP: 5.6
+
+services:
+  cache:
+    image: redis
+  postgres:
+    image: postgres
+    environment:
+      - POSTGRES_USER=oc_autotest
+      - POSTGRES_PASSWORD=oc_autotest
+    when:
+      matrix:
+        DB: postgres
+  mysql:
+    image: mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD=owncloud
+      - MYSQL_USER=oc_autotest
+      - MYSQL_PASSWORD=owncloud
+      - MYSQL_DATABASE=oc_autotest
+    when:
+      matrix:
+        DB: mysql
+  mysqlmb4:
+    image: mysql
+    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" ]
+    when:
+      matrix:
+        DB: mysqlmb4
@@ -3,9 +3,11 @@
 /owncloud
 /config/config.php
 /config/*.config.php
+/config/mimetype*.json
 /config/mount.php
 /apps/inc.php
 /assets
+/.htaccess

 # ignore all apps except core ones
 /apps*/*
@@ -14,15 +16,22 @@
 !/apps/files
 !/apps/federation
 !/apps/federatedfilesharing
+!/apps/sharebymail
 !/apps/encryption
 !/apps/files_external
 !/apps/files_sharing
 !/apps/files_trashbin
 !/apps/files_versions
+!/apps/lookup_server_connector
 !/apps/user_ldap
 !/apps/provisioning_api
 !/apps/systemtags
+!/apps/testing
+!/apps/admin_audit
 !/apps/updatenotification
+!/apps/theming
+!/apps/twofactor_backupcodes
+!/apps/workflowengine
 /apps/files_external/3rdparty/irodsphp/PHPUnitTest
 /apps/files_external/3rdparty/irodsphp/web
 /apps/files_external/3rdparty/irodsphp/prods/test
@@ -65,7 +74,7 @@ RCS/*
 .project
 .settings

-# netbeans 
+# netbeans
 nbproject

 # phpStorm
@@ -84,7 +93,7 @@ nbproject

 # ack(-grep)
 .ackrc
-	
+
 # Mac OS
 .DS_Store

@@ -99,9 +108,11 @@ nbproject
 /build/node_modules/

 # nodejs
+/build/bin
 /build/lib/
 /build/jsdocs/
 /npm-debug.log
+/PhantomJS_*

 # puphpet
 puphpet
@@ -113,6 +124,7 @@ Vagrantfile
 # Tests - auto-generated files
 /data-autotest
 /tests/coverage*
+/tests/css
 /tests/karma-coverage
 /tests/autoconfig*
 /tests/autotest*
@@ -1,3 +1,3 @@
 [submodule "3rdparty"]
 	path = 3rdparty
-	url = https://github.com/owncloud/3rdparty.git
+	url = https://github.com/nextcloud/3rdparty.git
@@ -20,14 +20,19 @@
    SetEnv modHeadersAvailable true
  </IfModule>

-  # Add cache control for CSS and JS files
-  <FilesMatch "\.(css|js)$">
-    Header set Cache-Control "max-age=7200, public"
+  # Add cache control for static resources
+  <FilesMatch "\.(css|js|svg|gif)$">
+    Header set Cache-Control "max-age=15778463"
+  </FilesMatch>
+  
+  # Let browsers cache WOFF files for a week
+  <FilesMatch "\.woff$">
+    Header set Cache-Control "max-age=604800"
  </FilesMatch>
 </IfModule>
 <IfModule mod_php5.c>
-  php_value upload_max_filesize 513M
-  php_value post_max_size 513M
+  php_value upload_max_filesize 511M
+  php_value post_max_size 511M
  php_value memory_limit 512M
  php_value mbstring.func_overload 0
  php_value always_populate_raw_post_data -1
@@ -37,6 +42,17 @@
    SetEnv htaccessWorking true
  </IfModule>
 </IfModule>
+<IfModule mod_php7.c>
+  php_value upload_max_filesize 511M
+  php_value post_max_size 511M
+  php_value memory_limit 512M
+  php_value mbstring.func_overload 0
+  php_value default_charset 'UTF-8'
+  php_value output_buffering 0
+  <IfModule mod_env.c>
+    SetEnv htaccessWorking true
+  </IfModule>
+</IfModule>
 <IfModule mod_rewrite.c>
  RewriteEngine on
  RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
@@ -45,27 +61,9 @@
  RewriteRule ^\.well-known/carddav /remote.php/dav/ [R=301,L]
  RewriteRule ^\.well-known/caldav /remote.php/dav/ [R=301,L]
  RewriteRule ^remote/(.*) remote.php [QSA,L]
-  RewriteRule ^(build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
+  RewriteRule ^(?:build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
  RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/.*
-  RewriteRule ^(\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
-
-  # Rewrite rules for `front_controller_active`
-  Options -MultiViews
-  RewriteRule ^core/js/oc.js$ index.php/core/js/oc.js [PT,E=PATH_INFO:$1]
-  RewriteRule ^core/preview.png$ index.php/core/preview.png [PT,E=PATH_INFO:$1]
-  RewriteCond %{REQUEST_FILENAME} !\.(css|js|svg|gif|png|html|ttf|woff|ico)$
-  RewriteCond %{REQUEST_FILENAME} !core/img/favicon.ico$
-  RewriteCond %{REQUEST_FILENAME} !/remote.php
-  RewriteCond %{REQUEST_FILENAME} !/public.php
-  RewriteCond %{REQUEST_FILENAME} !/cron.php
-  RewriteCond %{REQUEST_FILENAME} !/core/ajax/update.php
-  RewriteCond %{REQUEST_FILENAME} !/status.php
-  RewriteCond %{REQUEST_FILENAME} !/ocs/v1.php
-  RewriteCond %{REQUEST_FILENAME} !/ocs/v2.php
-  RewriteCond %{REQUEST_FILENAME} !/updater/
-  RewriteCond %{REQUEST_FILENAME} !/ocs-provider/
-  RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/.*
-  RewriteRule .* index.php [PT,E=PATH_INFO:$1]
+  RewriteRule ^(?:\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
 </IfModule>
 <IfModule mod_mime.c>
  AddType image/svg+xml svg svgz
@@ -0,0 +1,2 @@
+pattern = "(?i):shipit:|:\\+1:|LGTM|👍"
+self_approval_off = true
@@ -16,8 +16,8 @@ Andreas Schönebeck <aschoenebeck@web.de>
 Andreas Ergenzinger <andreas.ergenzinger@gmx.de> AndreasErgenzinger <andreas.ergenzinger@gmx.de>
 Andrew Brown <andrew@casabrown.com>
 André Gaul <gaul@web-yard.de>
-Arthur Schiwon <blizzz@owncloud.com> Arthur Schiwon <blizzz@arthur-schiwon.de>
-Arthur Schiwon <blizzz@owncloud.com> blizzz <blizzz@owncloud.com>
+Arthur Schiwon <blizzz@arthur-schiwon.de> Arthur Schiwon <blizzz@owncloud.com>
+Arthur Schiwon <blizzz@arthur-schiwon.de> blizzz <blizzz@owncloud.com>
 Artur Duque de Souza <asouza@kde.org>
 Axel Roenn <axel@mpim-bonn.mpg.de>
 Bagera <victor@baquero-wihlborg.se>
@@ -30,14 +30,16 @@ Benjamin Diele <benjamin@diele.be>
 Benjamin Liles <benliles@arch.tamu.edu>
 Bernhard Posselt <dev@bernhard-posselt.com> Bernhard Posselt <nukeawhale@gmail.com>
 Bernhard Posselt <dev@bernhard-posselt.com> Bernhard Posselt <Raydiation@users.noreply.github.com>
+Bernhard Posselt <dev@bernhard-posselt.com> Bernhard Posselt <BernhardPosselt@users.noreply.github.com>
 Bernhard Reiter <ockham@raz.or.at>
 Birk Borkason <daniel.niccoli@gmail.com>
-Björn Schießle <schiessle@owncloud.com> Bjoern Schiessle <schiesbn@woody.(none)>
-Björn Schießle <schiessle@owncloud.com> Björn Schießle <bjoern@schiessle.org>
-Björn Schießle <schiessle@owncloud.com> Björn Schießle <schiesbn@potato.(none)>
-Björn Schießle <schiessle@owncloud.com> Björn Schiessle <schiessle@owncloud.com>
-Björn Schießle <schiessle@owncloud.com> Bjoern Schießle <schiessle@owncloud.com>
-Björn Schießle <schiessle@owncloud.com> Bjoern Schiessle <schiessle@owncloud.com>
+Björn Schießle <bjoern@schiessle.org> Bjoern Schiessle <schiesbn@woody.(none)>
+Björn Schießle <bjoern@schiessle.org> Björn Schießle <schiessle@owncloud.com>
+Björn Schießle <bjoern@schiessle.org> Björn Schießle <schiesbn@potato.(none)>
+Björn Schießle <bjoern@schiessle.org> Björn Schiessle <schiessle@owncloud.com>
+Björn Schießle <bjoern@schiessle.org> Bjoern Schießle <schiessle@owncloud.com>
+Björn Schießle <bjoern@schiessle.org> Bjoern Schiessle <schiessle@owncloud.com>
+Björn Schießle <bjoern@schiessle.org> Björn Schießle <schiessle@owncloud.com>
 BlackEagle <ike.devolder@gmail.com>
 Boris Rybalkin <ribalkin@gmail.com>
 Borjan Tchakaloff <borjan@tchakaloff.fr>
@@ -61,6 +63,8 @@ Christian Berendt <berendt@b1-systems.de>
 Christian Kampka <christian@kampka.net>
 Christian Koch <koch.chris@gmail.com>
 Christian Reiner <github@christian-reiner.info> Christian Reiner <arkascha@balder.site>
+Christoph Wurst <christoph@owncloud.com> Christoph Wurst <ChristophWurst@users.noreply.github.com>
+Christoph Wurst <christoph@owncloud.com> Christoph Wurst <christoph@winzerhof-wurst.at>
 Christopher Bunn <b11.chris@gmail.com>
 Christopher Schäpers <kondou@ts.unde.re> Christopher <kondou@ts.unde.re>
 Christopher Schäpers <kondou@ts.unde.re> kondou <kondou@ts.unde.re>
@@ -123,11 +127,11 @@ Florian Vichot <florian.vichot@gmail.com>
 Florin Peter <github@florin-peter.de> Florin Peter <fp@datawerk.de>
 Florin Peter <github@florin-peter.de> FlorinPeter <github@florin-peter.de>
 Francesco Piraneo G. <fpiraneo@iface.ch>
-Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <frank@dev.(none)>
-Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <frank@devel.(none)>
-Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <frank@oc.(none)>
-Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <karlitschek@gmx.de>
-Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <karlitschek@kde.org>
+Frank Karlitschek <frank@karlitschek.de> Frank Karlitschek <frank@dev.(none)>
+Frank Karlitschek <frank@karlitschek.de> Frank Karlitschek <frank@devel.(none)>
+Frank Karlitschek <frank@karlitschek.de> Frank Karlitschek <frank@oc.(none)>
+Frank Karlitschek <frank@karlitschek.de> Frank Karlitschek <frank@owncloud.org>
+Frank Karlitschek <frank@karlitschek.de> Frank Karlitschek <karlitschek@kde.org>
 François Kubler <francois@kubler.org>
 Frédéric Fortier <frederic.fortier@oronospolytechnique.com> Frédéric Fortier <frederic.fortier@polymtl.ca>
 Frederik Gladhorn <gladhorn@kde.org>
@@ -179,7 +183,8 @@ Jesús Macias <jmacias@solidgear.es> Jesus Macias <jmacias@full-on-net.com>
 jknockaert <jasper@knockaert.nl>
 Joan <aseques@gmail.com>
 Joar Wandborg <git@wandborg.com>
-Joas Schilling <nickvergessen@owncloud.com> Joas Schilling <nickvergessen@gmx.de>
+Joas Schilling <coding@schilljs.com> Joas Schilling <nickvergessen@gmx.de>
+Joas Schilling <coding@schilljs.com> Joas Schilling <nickvergessen@owncloud.com>
 joel hansson <joel.hansson@gmail.com>
 Johan Björk <johanimon@gmail.com>
 Johannes Twittmann <github.com@deryo.de>
@@ -206,8 +211,8 @@ Sebastian Döll <sebastian.doell@libasys.de> libasys <sebastian.doell@libasys.de
 Lode Hoste <zillode@zillode.be>
 lolozere <laurent@chedanne.pro>
 Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it>
-Lukas Reschke <lukas@owncloud.com> Lukas Reschke <lukas@owncloud.org>
-Lukas Reschke <lukas@owncloud.com> Lukas Reschke <lukas@statuscode.ch>
+Lukas Reschke <lukas@statuscode.ch> Lukas Reschke <lukas@owncloud.com>
+Lukas Reschke <lukas@statuscode.ch> Lukas Reschke <lukas@owncloud.org>
 Luke Policinski <lpolicinski@gmail.com>
 Lyonel Vincent <lyonel@ezix.org>
 macjohnny <estebanmarin@gmx.ch>
@@ -298,17 +303,18 @@ Riccardo Iaconelli <riccardo@kde.org>
 Richard Clarkson <robert@trash-mail.com>
 rnveach <rveach02@gmail.com>
 Robert Jäckel <rjaeckel@users.noreply.github.com>
-Robin Appelman <icewind@owncloud.com> icewind1991 <icewind1991@gmail.com>
-Robin Appelman <icewind@owncloud.com> icewind1991 <robin@icewind.nl>
-Robin Appelman <icewind@owncloud.com> Robin <Robin Appelman icewind1991@gmail.com>
-Robin Appelman <icewind@owncloud.com> Robin <robin@Amaya.(none)>
-Robin Appelman <icewind@owncloud.com> Robin Appelman <icewind1991@gmail.com>
-Robin Appelman <icewind@owncloud.com> Robin Appelman <icewind1991@gmail>
-Robin Appelman <icewind@owncloud.com> Robin Appelman <robin@icewind.nl>
+Robin Appelman <robin@icewind.nl> icewind1991 <icewind1991@gmail.com>
+Robin Appelman <robin@icewind.nl> icewind1991 <robin@icewind.nl>
+Robin Appelman <robin@icewind.nl> Robin <Robin Appelman icewind1991@gmail.com>
+Robin Appelman <robin@icewind.nl> Robin <robin@Amaya.(none)>
+Robin Appelman <robin@icewind.nl> Robin Appelman <icewind1991@gmail.com>
+Robin Appelman <robin@icewind.nl> Robin Appelman <icewind1991@gmail>
+Robin Appelman <robin@icewind.nl> Robin Appelman <icewind@owncloud.com>
 Robin McCorkell <robin@mccorkell.me.uk> Robin McCorkell <rmccorkell@karoshi.org.uk>
 Robin McCorkell <robin@mccorkell.me.uk> Robin McCorkell <rmccorkell@owncloud.com>
 Rodrigo Hjort <rodrigo.hjort@gmail.com>
-Roeland Jago Douma <rullzer@owncloud.com> Roeland Jago Douma <roeland@famdouma.nl>
+Roeland Jago Douma <roeland@famdouma.nl> Roeland Jago Douma <rullzer@owncloud.com>
+Roeland Jago Douma <roeland@famdouma.nl> Roeland Douma <rullzer@users.noreply.github.com>
 rok <brejktru@gmail.com>
 Roland Hager <roland.hager@tu-berlin.de>
 Roland van Laar <roland@micite.net>
@@ -368,6 +374,7 @@ TheSFReader <TheSFReader@gmail.com>
 Thibaut GRIDEL <tgridel@free.fr>
 thomas <thomas@thomas-VirtualBox.(none)>
 Thomas Müller <thomas.mueller@tmit.eu> Thomas Mueller <thomas.mueller@tmit.eu>
+Thomas Müller <thomas.mueller@tmit.eu> Thomas Müller <DeepDiver1975@users.noreply.github.com>
 Thomas Olsen <tol@tanghus>
 Thomas Schmidt <tschmidt@suse.de>
 Thomas Tanghus <thomas@tanghus.net>
@@ -2,19 +2,13 @@
  "maxReviewers": 3,
  "numFilesToCheck": 5,
  "alwaysNotifyForPaths": [
-    {
-      "name": "DeepDiver1975",
-      "files": [
-        "apps/dav/**"
-      ]
-    },
    {
      "name": "nickvergessen",
      "files": [
-        "lib/private/activity/**",
-        "lib/private/notification/**",
-        "lib/public/activity/**",
-        "lib/public/notification/**"
+        "lib/private/Activity/**",
+        "lib/private/Notification/**",
+        "lib/public/Activity/**",
+        "lib/public/Notification/**"
      ]
    },
    {
@@ -25,7 +19,10 @@
    }
  ],
  "userBlacklist": [
+    "DeepDiver1975",
+    "nextcloud-bot",
    "owncloud-bot",
+    "PVince81",
    "scrutinizer-auto-fixer",
    "th3fallen",
    "zander"
@@ -1,3 +1,6 @@
+before_commands:
+  - 'git submodule update --init --recursive'
+
 filter:
    excluded_paths:
        - '3rdparty/*'
@@ -17,7 +20,7 @@ filter:
        - 'settings/l10n/*'
        - 'tests/*'
        - 'build/*'
-
+        - 'lib/composer/*'

 imports:
    - javascript
@@ -1,46 +0,0 @@
-sudo: false
-language: php
-php:
-  - 5.4
-
-env:
-  global:
-    - TEST_DAV=$(tests/travis/changed_app.sh dav)
-    - TC=litmus-v2
-  matrix:
-    - DB=sqlite
-
-branches:
-  only:
-    - master
-#    - /^stable\d+(\.\d+)?$/
-
-addons:
-  apt:
-    packages:
-    - realpath
-
-before_install:
-  - sh -c "if [ '$TEST_DAV' = '1' ]; then bash tests/travis/before_install.sh $DB; fi"
-
-install:
-  - sh -c "if [ '$TEST_DAV' = '1' ]; then bash tests/travis/install.sh $DB; fi"
-  - sh -c "if [ '$TEST_DAV' = '1' ]; then bash apps/dav/tests/travis/$TC/install.sh; fi"
-
-
-script:
-  - sh -c "if [ '$TEST_DAV' != '1' ]; then echo \"Not testing DAV\"; fi"
-  - sh -c "if [ '$TEST_DAV' = '1' ]; then echo \"Testing DAV\"; fi"
-
-  - sh -c "if [ '$TEST_DAV' = '1' ]; then bash apps/dav/tests/travis/$TC/script.sh; fi"
-
-matrix:
-  include:
-    - php: 5.4
-      env: DB=pgsql;TC=litmus-v1
-    - php: 5.4
-      env: DB=sqlite;TC=carddav
-    - php: 5.4
-      env: DB=sqlite;TC=caldav
-
-  fast_finish: true
@@ -1,5 +1,5 @@
-upload_max_filesize=513M
-post_max_size=513M
+upload_max_filesize=511M
+post_max_size=511M
 memory_limit=512M
 mbstring.func_overload=0
 always_populate_raw_post_data=-1
@@ -1,15 +1,16 @@
-ownCloud is written by:
+Nextcloud is written by:
 - AW-UC <git@a-wesemann.de>
+ - Aaron Wood <aaronjwood@gmail.com>
+ - Achim Königs <garfonso@tratschtante.de>
 - Adam Williamson <awilliam@redhat.com>
 - Administrator <Administrator@WINDOWS-2012>
 - Aldo "xoen" Giambelluca <xoen@xoen.org>
 - Alex Weirig <alex.weirig@technolink.lu>
 - Alexander Bergolth <leo@strike.wu.ac.at>
- - Andreas Böhler <dev@aboehler.at>
 - Andreas Fischer <bantu@owncloud.com>
 - Andrew Brown <andrew@casabrown.com>
 - André Gaul <gaul@web-yard.de>
- - Arthur Schiwon <blizzz@owncloud.com>
+ - Arthur Schiwon <blizzz@arthur-schiwon.de>
 - Bart Visscher <bartv@thisnet.nl>
 - Bartek Przybylski <bart.p.pl@gmail.com>
 - Bastien Ho <bastienho@urbancube.fr>
@@ -18,38 +19,41 @@ ownCloud is written by:
 - Bernhard Posselt <dev@bernhard-posselt.com>
 - Bernhard Reiter <ockham@raz.or.at>
 - Birk Borkason <daniel.niccoli@gmail.com>
- - Björn Schießle <schiessle@owncloud.com>
+ - Bjoern Schiessle <bjoern@schiessle.org>
+ - Björn Schießle <bjoern@schiessle.org>
 - Borjan Tchakaloff <borjan@tchakaloff.fr>
 - Brice Maron <brice@bmaron.net>
 - Byron Marohn <combustible@live.com>
- - C Montero-Luque <cml@owncloud.com>
+ - Carla Schroder <carla@owncloud.com>
 - Carlos Cerrillo <ccerrillo@gmail.com>
+ - Carlos Damken <carlos@damken.com>
 - Christian Berendt <berendt@b1-systems.de>
+ - Christian Jürges <christian@eqipe.ch>
 - Christian Kampka <christian@kampka.net>
- - Christian Schnidrig <christian.schnidrig@switch.ch>
 - Christian Weiske <cweiske@cweiske.de>
 - Christoph Schaefer <christophł@wolkesicher.de>
+ - Christoph Wurst <christoph@owncloud.com>
 - Christopher Schäpers <kondou@ts.unde.re>
 - Christopher T. Johnson <ctjctj@gmail.com>
 - Clark Tomlinson <fallen013@gmail.com>
 - Craig Morrissey <craig@owncloud.com>
 - Dan Bartram <daneybartram@gmail.com>
 - Daniel Hansson <enoch85@gmail.com>
+ - Daniel Jagszent <daniel@jagszent.de>
 - Daniel Molkentin <daniel@molkentin.de>
 - Daniel Tosello <tosello.daniel@gmail.com>
 - David Prévot <taffit@debian.org>
+ - David Toledo <dtoledo@solidgear.es>
 - Dominik Schmidt <dev@dominik-schmidt.de>
- - Donald Buczek <buczek@molgen.mpg.de>
- - Edward Crompton <edward.crompton@gmail.com>
 - Fabian Henze <flyser42@gmx.de>
 - Faruk Uzun <farukuzun@collabora.com>
 - Felix Böhm <felixboehm@gmx.de>
 - Felix Moeller <mail@felixmoeller.de>
 - Florian Preinstorfer <nblock@archlinux.us>
 - Florian Pritz <bluewind@xinu.at>
- - Florian Scholz <FlorianScholz@bgstyle.de>
 - Florin Peter <github@florin-peter.de>
- - Frank Karlitschek <frank@owncloud.org>
+ - Francesco Rovelli <francesco.rovelli@gmail.com>
+ - Frank Karlitschek <frank@karlitschek.de>
 - François Kubler <francois@kubler.org>
 - Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
 - Gadzy <dev@gadzy.fr>
@@ -61,15 +65,19 @@ ownCloud is written by:
 - Individual IT Services <info@individual-it.net>
 - Jakob Sack <mail@jakobsack.de>
 - Jan-Christoph Borchardt <hey@jancborchardt.net>
+ - Jarrett <JetUni@users.noreply.github.com>
 - Jean-Louis Dupond <jean-louis@dupond.be>
 - Jens-Christian Fischer <jens-christian.fischer@switch.ch>
 - Jesús Macias <jmacias@solidgear.es>
 - Joachim Bauch <bauch@struktur.de>
- - Joas Schilling <nickvergessen@owncloud.com>
+ - Joachim Sokolowski <github@sokolowski.org>
+ - Joas Schilling <coding@schilljs.com>
 - Johan Björk <johanimon@gmail.com>
+ - Johannes Ernst <jernst@indiecomputing.com>
 - Johannes Willnecker <johannes@willnecker.com>
 - Jonny007-MKD <1-23-4-5@web.de>
- - Jost Baron <Jost.Baron@gmx.de>
+ - Juan Pablo Villafáñez <jvillafanez@solidgear.es>
+ - Julius Haertl <jus@bitgrid.net>
 - Jörn Friedrich Dreyer <jfd@butonic.de>
 - Kamil Domanski <kdomanski@kdemail.net>
 - Klaas Freitag <freitag@owncloud.com>
@@ -80,9 +88,10 @@ ownCloud is written by:
 - Lennart Rosam <lennart.rosam@medien-systempartner.de>
 - Leonardo Diez <leio10@users.noreply.github.com>
 - Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it>
- - Lukas Reschke <lukas@owncloud.com>
+ - Lukas Reschke <lukas@statuscode.ch>
 - Luke Policinski <lpolicinski@gmail.com>
 - Lyonel Vincent <lyonel@ezix.org>
+ - Manish Bisht <manish.bisht490@gmail.com>
 - Mario Kolling <mario.kolling@serpro.gov.br>
 - Markus Goetz <markus@woboq.com>
 - Martin Konrad <info@martin-konrad.net>
@@ -95,7 +104,6 @@ ownCloud is written by:
 - Michael Kuhn <suraia@ikkoku.de>
 - Michael Roitzsch <reactorcontrol@icloud.com>
 - Michael Roth <michael.roth@rz.uni-augsburg.de>
- - Michael Telatynski <7t3chguy@gmail.com>
 - Michael U <mdusher@users.noreply.github.com>
 - Miguel Prokop <miguel.prokop@vtu.com>
 - Mitar <mitar.git@tnode.com>
@@ -112,12 +120,14 @@ ownCloud is written by:
 - Pascal de Bruijn <pmjdebruijn@pcode.nl>
 - Patrick Paysant <ppaysant@linagora.com>
 - Pellaeon Lin <nfsmwlin@gmail.com>
+ - Petr Svoboda <weits666@gmail.com>
+ - Phiber2000 <phiber2000@gmx.de>
 - Phil Davis <phil.davis@inf.org>
 - Philipp Kapfer <philipp.kapfer@gmx.at>
 - Philippe Jung <phil.jung@free.fr>
- - Philippe Le Brouster <plb@nebkha.net>
 - Pierre Jochem <pierrejochem@msn.com>
 - Pierre Ozoux <pierre@ozoux.net>
+ - Piotr Filiciak <piotr@filiciak.pl>
 - Qingping Hou <dave2008713@gmail.com>
 - Raghu Nayyar <hey@raghunayyar.com>
 - Raghu Nayyar <me@iraghu.com>
@@ -127,35 +137,40 @@ ownCloud is written by:
 - RealRancor <Fisch.666@gmx.de>
 - Remco Brenninkmeijer <requist1@starmail.nl>
 - Renaud Fortier <Renaud.Fortier@fsaa.ulaval.ca>
- - Robin Appelman <icewind@owncloud.com>
+ - Robin Appelman <robin@icewind.nl>
 - Robin McCorkell <robin@mccorkell.me.uk>
- - Roeland Jago Douma <rullzer@owncloud.com>
+ - Roeland Jago Douma <roeland@famdouma.nl>
 - Roman Geber <rgeber@owncloudapps.com>
 - Roman Kreisel <mail@romankreisel.de>
 - Ross Nicoll <jrn@jrn.me.uk>
 - SA <stephen@mthosting.net>
 - Sam Tuke <mail@samtuke.com>
 - Sander <brantje@gmail.com>
- - Sascha Schmidt <realriot@realriot.de>
 - Sean Comeau <sean@ftlnetworks.ca>
 - Sebastian Döll <sebastian.doell@libasys.de>
+ - Senorsen <senorsen.zhang@gmail.com>
 - Serge Martin <edb@sigluy.net>
+ - Sergio Bertolin <sbertolin@solidgear.es>
+ - Sergio Bertolín <sbertolin@solidgear.es>
 - Simon Könnecke <simonkoennecke@gmail.com>
 - Sjors van der Pluijm <sjors@desjors.nl>
 - Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
 - Stefan Rado <owncloud@sradonia.net>
+ - Stefan Weil <sw@weilnetz.de>
 - Steffen Lindner <mail@steffen-lindner.de>
 - Stephan Peijnik <speijnik@anexia-it.com>
 - TheSFReader <TheSFReader@gmail.com>
 - Thibaut GRIDEL <tgridel@free.fr>
+ - Thomas Citharel <tcit@tcit.fr>
 - Thomas Müller <thomas.mueller@tmit.eu>
- - Thomas Schmidt <tschmidt@suse.de>
+ - Thomas Pulzer <t.pulzer@kniel.de>
 - Thomas Tanghus <thomas@tanghus.net>
 - Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
 - Tim Dettrick <t.dettrick@uq.edu.au>
 - Tobia De Koninck <tobia@ledfan.be>
 - Tobias Kaminsky <tobias@kaminsky.me>
 - Tom Needham <tom@owncloud.com>
+ - Torben Dannhauer <torben@dannhauer.de>
 - Victor Dubiniuk <dubiniuk@owncloud.com>
 - Viktor Szépe <viktor@szepe.net>
 - Vincent Chan <plus.vincchan@gmail.com>
@@ -169,21 +184,26 @@ ownCloud is written by:
 - cmeh <cmeh@users.noreply.github.com>
 - dampfklon <me@dampfklon.de>
 - davidgumberg <davidnoizgumberg@gmail.com>
+ - davitol <dtoledo@solidgear.es>
 - derkostka <sebastian.kostka@gmail.com>
 - eduardo <eduardo@vnexu.net>
 - fabian <fabian@web2.0-apps.de>
+ - felixboehm <felix@webhippie.de>
 - goodkiller <markopraakli@gmail.com>
 - helix84 <helix84@centrum.sk>
 - hkjolhede <hkjolhede@gmail.com>
 - ideaship <ideaship@users.noreply.github.com>
 - j-ed <juergen@eisfair.org>
 - jknockaert <jasper@knockaert.nl>
+ - josh4trunks <joshruehlig@gmail.com>
+ - karakayasemi <karakayasemi@itu.edu.tr>
 - macjohnny <estebanmarin@gmx.ch>
- - marc0s <marcos@tenak.net>
 - martin-rueegg <martin.rueegg@metaworx.ch>
 - martin.mattel@diemattels.at <martin.mattel@diemattels.at>
 - michag86 <micha_g@arcor.de>
+ - mmccarn <mmccarn-github@mmsionline.us>
 - nishiki <nishiki@yaegashi.fr>
+ - oparoz <owncloud@interfasys.ch>
 - root <root@oc.(none)>
 - scambra <sergio@entrecables.com>
 - scolebrook <scolebrook@mac.com>
@@ -0,0 +1,20 @@
+ChangeLog
+=========
+
+NC 11 (????-??-??)
+------------------
+* PHP 5.4 and 5.5 no longer supported
+* PHP 7.1 support
+* OC_L10N removed use \OCP\IL10N (#1948)
+* Preview handling is improved by sharing previews:
+  * Preview sharing (shared files/external storages)
+  * Previews are stored in the AppData
+  * Previews are served faster by not first converting them to image objects
+* Core preview route changed:
+  * Route for the urlgenerator changed from 'core_ajax_preview' to 'core.Preview.getPreview'
+  * $urlGenerator->linkToRoute('core_ajax_preview', ...) => $urlGenerator->linkToRoute('core.Preview.getPreview', ...)
+* Avatars are cached
+* Avatars are moved to AppData
+  * For existing avatars this happens automatically in a background job which means that on upgrade you might
+    not see your avatar right away. However after the job has run it should show up again automatically.
+
@@ -1,6 +1,6 @@
 ## Submitting issues

-If you have questions about how to install or use ownCloud, please direct these to the [mailing list][mailinglist] or our [forum][forum]. We are also available on [IRC][irc].
+If you have questions about how to install or use Nextcloud, please direct these to our [forum][forum]. We are also available on [IRC][irc].

 ### Short version

@@ -11,40 +11,58 @@ If you have questions about how to install or use ownCloud, please direct these
  - Go to one of the repositories, click "issues" and type any word in the top search/command bar.
  - You can also filter by appending e. g. "state:open" to the search string.
  - More info on [search syntax within github](https://help.github.com/articles/searching-issues)
-* This repository ([core](https://github.com/owncloud/core/issues)) is *only* for issues within the ownCloud core code. This also includes the apps: files, encryption, external storage, sharing, deleted files, versions, LDAP, and WebDAV Auth
-* __SECURITY__: Report any potential security bug to us via [our HackerOne page](https://hackerone.com/owncloud) or security@owncloud.com following our [security policy](https://owncloud.org/security/) instead of filing an issue in our bug tracker
-* The issues in other components should be reported in their respective repositories: 
-  - [Android client](https://github.com/owncloud/android/issues)
-  - [iOS client](https://github.com/owncloud/ios/issues)
-  - [Desktop client](https://github.com/owncloud/client/issues)
-  - [Documentation](https://github.com/owncloud/documentation/issues)
-  - [ownCloud apps](https://github.com/owncloud/core/wiki/Maintainers#apps-repo)
+* This repository ([server](https://github.com/nextcloud/server/issues)) is *only* for issues within the Nextcloud Server code. This also includes the apps: files, encryption, external storage, sharing, deleted files, versions, LDAP, and WebDAV Auth
+* __SECURITY__: Report any potential security bug to us via [our HackerOne page](https://hackerone.com/nextcloud) or security@nextcloud.com following our [security policy](https://nextcloud.com/security/) instead of filing an issue in our bug tracker.
+* The issues in other components should be reported in their respective repositories: You will find them in our [GitHub Organization](https://github.com/nextcloud/)

 * Report the issue using our [template][template], it includes all the information we need to track down the issue.

 Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.

-[template]: https://raw.github.com/owncloud/core/master/issue_template.md
-[mailinglist]: https://mailman.owncloud.org/mailman/listinfo/owncloud
-[forum]: https://forum.owncloud.org/
-[irc]: https://webchat.freenode.net/?channels=owncloud&uio=d4
+[template]: https://raw.githubusercontent.com/nextcloud/server/master/issue_template.md
+[forum]: https://help.nextcloud.com/
+[irc]: https://webchat.freenode.net/?channels=nextcloud

 ## Contributing to Source Code

-Thanks for wanting to contribute source code to ownCloud. That's great!
+Thanks for wanting to contribute source code to Nextcloud. That's great!

-Before we're able to merge your code into the ownCloud core, you need to sign our [Contributor Agreement][agreement].
+Please read the [Developer Manuals][devmanual] to learn how to create your first application or how to test the Nextcloud code with PHPUnit.

-Please read the [Developer Manuals][devmanual] to learn how to create your first application or how to test the ownCloud code with PHPUnit.
+### Tests

 In order to constantly increase the quality of our software we can no longer accept pull request which submit un-tested code.
 It is a must have that changed and added code segments are unit tested.
 In some areas unit testing is hard (aka almost impossible) as of today - in these areas refactoring WHILE fixing a bug is encouraged to enable unit testing.

-[agreement]: https://owncloud.org/about/contributor-agreement/
-[devmanual]: https://owncloud.org/dev
+### Sign your work
+
+We use the Developer Certificate of Origin (DCO) as a additional safeguard
+for the Nextcloud project. This is a well established and widely used
+mechanism to assure contributors have confirmed their right to license
+their contribution under the project's license.
+Please read [contribute/developer-certificate-of-origin][dcofile].
+If you can certify it, then just add a line to every git commit message:
+
+````
+  Signed-off-by: Random J Developer <random@developer.example.org>
+````
+
+Use your real name (sorry, no pseudonyms or anonymous contributions).
+If you set your `user.name` and `user.email` git configs, you can sign your
+commit automatically with `git commit -s`. You can also use git [aliases](https://git-scm.com/book/tr/v2/Git-Basics-Git-Aliases)
+like `git config --global alias.ci 'commit -s'`. Now you can commit with
+`git ci` and the commit will be signed.
+
+### Apply a license
+
+In case you are not sure how to add or update the license header correctly please have a look at [contribute/HowToApplyALicense.md][applyalicense]
+
+[devmanual]: https://docs.nextcloud.org/server/11/developer_manual/
+[dcofile]: https://github.com/nextcloud/server/blob/master/contribute/developer-certificate-of-origin
+[applyalicense]: https://github.com/nextcloud/server/blob/master/contribute/HowToApplyALicense.md

 ## Translations
 Please submit translations via [Transifex][transifex].

-[transifex]: https://www.transifex.com/projects/p/owncloud/
+[transifex]: https://www.transifex.com/nextcloud
@@ -1,5 +1,5 @@
-Files in ownCloud are licensed under the Affero General Public License version 3,
-the text of which can be found in COPYING-AGPL, or any later version of the AGPL,
+Files in Nextcloud are licensed under the Affero General Public License version 3,
+the text of which can be found in COPYING, or any later version of the AGPL,
 unless otherwise noted.

 Licensing of components:
@@ -12,4 +12,4 @@ Licensing of components:
 All unmodified files from these and other sources retain their original copyright
 and license notices: see the relevant individual files.

-Attribution information for ownCloud is contained in the AUTHORS file.
+Attribution information for Nextcloud is contained in the AUTHORS file.
@@ -1,47 +1,66 @@
-# ownCloud Core
+# 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)
+[![irc](https://img.shields.io/badge/IRC-%23nextcloud%20on%20freenode-orange.svg)](https://webchat.freenode.net/?channels=nextcloud)
+[![irc](https://img.shields.io/badge/IRC-%23nextcloud--dev%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-dev)

-[![Build Status](https://ci.owncloud.org/job/server-master-linux/badge/icon)](https://ci.owncloud.org/job/server-master-linux/)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/owncloud/core/badges/quality-score.png?s=ce2f5ded03d4ac628e9ee5c767243fa7412e644f)](https://scrutinizer-ci.com/g/owncloud/core/)
-[![CodeClimate](https://codeclimate.com/github/owncloud/core/badges/gpa.svg)](https://codeclimate.com/github/owncloud/core)
-[![Coverity](https://scan.coverity.com/projects/6893/badge.svg)](https://scan.coverity.com/projects/owncloud-core)
-[![Dependency Status](https://www.versioneye.com/user/projects/54f4a2384f3108959a000a16/badge.svg?style=flat)](https://www.versioneye.com/user/projects/54f4a2384f3108959a000a16)
-[![Dependency Status](https://www.versioneye.com/user/projects/54d1f76f3ca0840b190000c0/badge.svg?style=flat)](https://www.versioneye.com/user/projects/54d1f76f3ca0840b190000c0)
+**A safe home for all your data.**

-**[ownCloud](http://ownCloud.org) gives you freedom and control over your own data.
-A personal cloud which runs on your own server.**
-
-![](https://github.com/owncloud/screenshots/blob/master/files/sidebar_1.png)
+![](https://github.com/nextcloud/screenshots/blob/master/files/filelist.png)

 ## 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** You share your data with others, and give them access to your latest photo galleries, your calendar or anything else you want them to see.
-* :rocket: **Expandable with dozens of Apps** ...like Calendar, Contacts, Mail or News.
-* :cloud: **All Benefits of the Cloud** ...on your own Server.
-* :lock: **Encryption** You can encrypt data in transit with secure https connections. You can enable the encryption app to encrypt data on storage for improved security and privacy.
-* ...
+* :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 authentification.

-## Installation instructions
-https://doc.owncloud.org/server/9.0/developer_manual/app/index.html
+*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).

-## Contribution Guidelines
-https://owncloud.org/contribute/
+## Get your Nextcloud

-## Support
-Learn about the different ways you can get support for ownCloud: https://owncloud.org/support/
+- [**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/)
+
+*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
-* :clipboard: [Forum](https://forum.owncloud.org)
-* :envelope: [Mailing list](https://mailman.owncloud.org/mailman/listinfo)
-* :hash: [IRC channel](https://webchat.freenode.net/?channels=owncloud)
-* :busts_in_silhouette: [Facebook] (https://facebook.com/ownclouders)
-* :hatching_chick: [Twitter](https://twitter.com/ownClouders)

-## Important notice on translations
-Please submit translations via Transifex:
-https://www.transifex.com/projects/p/owncloud/
+* :clipboard: [Forum](https://help.nextcloud.com)
+* :busts_in_silhouette: [Facebook](https://facebook.com/nextclouders)
+* :hatching_chick: [Twitter](https://twitter.com/Nextclouders)

-[![Transifex](https://www.transifex.com/projects/p/owncloud/resource/core/chart/image_png)](https://www.transifex.com/projects/p/owncloud/)
+[…learn more about how to get support for Nextcloud here!](https://nextcloud.com/support)

-For more detailed information about translations:
-http://doc.owncloud.org/server/9.0/developer_manual/core/translation.html
+## Contribution Guidelines
+
+All contributions to this repository from June, 16 2016 on are considered to be
+licensed under the AGPLv3 or any later version.
+
+Nextcloud doesn't require a CLA (Contributor License Agreement).
+The copyright belongs to all the individual contributors. Therefore we recommend
+that every contributor adds following line to the header of a file, if they
+changed it substantially:
+
+```
+@copyright Copyright (c) <year>, <your name> (<your email address>)
+```
+
+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.
+
+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 by default included in regular releases like [firstrunwizard](https://github.com/nextcloud/firstrunwizard) or [gallery](https://github.com/nextcloud/gallery) are missing in `master` and have to be installed manually as required.
+
+That aside Git checkouts can be handled the same as release archives.
+
+Note they should never be used on production systems.
@@ -0,0 +1,30 @@
+<?php
+/**
+
+ *
+ * @author Bjoern Schiessle <bjoern@schiessle.org>
+ * @author Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+$logger = \OC::$server->getLogger();
+$userSession = \OC::$server->getUserSession();
+$groupManager = \OC::$server->getGroupManager();
+
+$auditLogger = new \OCA\Admin_Audit\AuditLogger($logger, $userSession, $groupManager);
+$auditLogger->registerHooks();
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<info>
+	<id>admin_audit</id>
+	<name>Auditing / Logging</name>
+	<description>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</description>
+	<licence>AGPL</licence>
+	<author>Nextcloud</author>
+	<version>1.1.0</version>
+	<dependencies>
+		<nextcloud min-version="11" max-version="11" />
+	</dependencies>
+	<types>
+		<logging/>
+	</types>
+</info>
@@ -0,0 +1,88 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @author Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Admin_Audit\Actions;
+
+use OCP\ILogger;
+
+class Action {
+	/** @var ILogger */
+	private $logger;
+
+	/**
+	 * @param ILogger $logger
+	 */
+	public function __construct(ILogger $logger) {
+		$this->logger = $logger;
+	}
+
+	/**
+	 * Log a single action with a log level of info
+	 *
+	 * @param string $text
+	 * @param array $params
+	 * @param array $elements
+	 * @param bool $obfuscateParameters
+	 */
+	public function log($text,
+						array $params,
+						array $elements,
+						$obfuscateParameters = false) {
+		foreach($elements as $element) {
+			if(!isset($params[$element])) {
+				if ($obfuscateParameters) {
+					$this->logger->critical(
+						'$params["'.$element.'"] was missing.',
+						['app' => 'admin_audit']
+					);
+				} else {
+					$this->logger->critical(
+						sprintf(
+							'$params["'.$element.'"] was missing. Transferred value: %s',
+							print_r($params, true)
+						),
+						['app' => 'admin_audit']
+					);
+				}
+				return;
+			}
+		}
+
+		$replaceArray = [];
+		foreach($elements as $element) {
+			if($params[$element] instanceof \DateTime) {
+				$params[$element] = $params[$element]->format('Y-m-d H:i:s');
+			}
+			$replaceArray[] = $params[$element];
+		}
+
+		$this->logger->info(
+			vsprintf(
+				$text,
+				$replaceArray
+			),
+			[
+				'app' => 'admin_audit'
+			]
+		);
+	}
+}
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @author Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Admin_Audit\Actions;
+
+/**
+ * Class Auth logs all auth related actions
+ *
+ * @package OCA\Admin_Audit\Actions
+ */
+class Auth extends Action {
+	public function loginAttempt(array $params) {
+		$this->log(
+			'Login attempt: "%s"',
+			$params,
+			[
+				'uid',
+			],
+			true
+		);
+	}
+
+	public function loginSuccessful(array $params) {
+		$this->log(
+			'Login successful: "%s"',
+			$params,
+			[
+				'uid',
+			],
+			true
+		);
+	}
+
+	public function logout(array $params) {
+		$this->log(
+			'Logout occurred',
+			[],
+			[]
+		);
+	}
+}
@@ -0,0 +1,137 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @author Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Admin_Audit\Actions;
+
+/**
+ * Class Files logs the actions to files
+ *
+ * @package OCA\Admin_Audit\Actions
+ */
+class Files extends Action {
+	/**
+	 * Logs file read actions
+	 *
+	 * @param array $params
+	 */
+	public function read(array $params) {
+		$this->log(
+			'File accessed: "%s"',
+			$params,
+			[
+				'path',
+			]
+		);
+	}
+
+	/**
+	 * Logs rename actions of files
+	 *
+	 * @param array $params
+	 */
+	public function rename(array $params) {
+		$this->log(
+			'File renamed: "%s" to "%s"',
+			$params,
+			[
+				'oldpath',
+				'newpath',
+			]
+		);
+	}
+
+	/**
+	 * Logs creation of files
+	 *
+	 * @param array $params
+	 */
+	public function create(array $params) {
+		$this->log(
+			'File created: "%s"',
+			$params,
+			[
+				'path',
+			]
+		);
+	}
+
+	/**
+	 * Logs copying of files
+	 *
+	 * @param array $params
+	 */
+	public function copy(array $params) {
+		$this->log(
+			'File copied: "%s" to "%s"',
+			$params,
+			[
+				'oldpath',
+				'newpath',
+			]
+		);
+	}
+
+	/**
+	 * Logs writing of files
+	 *
+	 * @param array $params
+	 */
+	public function write(array $params) {
+		$this->log(
+			'File written to: "%s"',
+			$params,
+			[
+				'path',
+			]
+		);
+	}
+
+	/**
+	 * Logs update of files
+	 *
+	 * @param array $params
+	 */
+	public function update(array $params) {
+		$this->log(
+			'File updated: "%s"',
+			$params,
+			[
+				'path',
+			]
+		);
+	}
+
+	/**
+	 * Logs deletions of files
+	 *
+	 * @param array $params
+	 */
+	public function delete(array $params) {
+		$this->log(
+			'File deleted: "%s"',
+			$params,
+			[
+				'path',
+			]
+		);
+	}
+}
@@ -0,0 +1,76 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
+ *
+ * @author Bjoern Schiessle <bjoern@schiessle.org>
+ * @author Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\Admin_Audit\Actions;
+
+
+use OCA\Admin_Audit\Actions\Action;
+use OCP\IGroup;
+use OCP\IUser;
+
+/**
+ * Class GroupManagement logs all group manager related events
+ *
+ * @package OCA\Admin_Audit
+ */
+class GroupManagement extends Action {
+
+	/**
+	 * log add user to group event
+	 *
+	 * @param IGroup $group
+	 * @param IUser $user
+	 */
+	public function addUser(IGroup $group, IUser $user) {
+		$this->log('User "%s" added to group "%s"',
+			[
+				'group' => $group->getGID(),
+				'user' => $user->getUID()
+			],
+			[
+				'user', 'group'
+			]
+		);
+	}
+
+	/**
+	 * log remove user from group event
+	 *
+	 * @param IGroup $group
+	 * @param IUser $user
+	 */
+	public function removeUser(IGroup $group, IUser $user) {
+		$this->log('User "%s" removed from group "%s"',
+			[
+				'group' => $group->getGID(),
+				'user' => $user->getUID()
+			],
+			[
+				'user', 'group'
+			]
+		);
+	}
+
+}
@@ -0,0 +1,191 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @author Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Admin_Audit\Actions;
+use OCP\Share;
+
+/**
+ * Class Sharing logs the sharing actions
+ *
+ * @package OCA\Admin_Audit\Actions
+ */
+class Sharing extends Action {
+	/**
+	 * Logs sharing of data
+	 *
+	 * @param array $params
+	 */
+	public function shared(array $params) {
+		if($params['shareType'] === Share::SHARE_TYPE_LINK) {
+			$this->log(
+				'The %s "%s" with ID "%s" has been shared via link with permissions "%s" (Share ID: %s)',
+				$params,
+				[
+					'itemType',
+					'itemTarget',
+					'itemSource',
+					'permissions',
+					'id',
+				]
+			);
+		} elseif($params['shareType'] === Share::SHARE_TYPE_USER) {
+			$this->log(
+				'The %s "%s" with ID "%s" has been shared to the user "%s" with permissions "%s"  (Share ID: %s)',
+				$params,
+				[
+					'itemType',
+					'itemTarget',
+					'itemSource',
+					'shareWith',
+					'permissions',
+					'id',
+				]
+			);
+		} elseif($params['shareType'] === Share::SHARE_TYPE_GROUP) {
+			$this->log(
+				'The %s "%s" with ID "%s" has been shared to the group "%s" with permissions "%s"  (Share ID: %s)',
+				$params,
+				[
+					'itemType',
+					'itemTarget',
+					'itemSource',
+					'shareWith',
+					'permissions',
+					'id',
+				]
+			);
+		}
+	}
+
+	/**
+	 * Logs unsharing of data
+	 *
+	 * @param array $params
+	 */
+	public function unshare(array $params) {
+		if($params['shareType'] === Share::SHARE_TYPE_LINK) {
+			$this->log(
+				'The %s "%s" with ID "%s" has been unshared (Share ID: %s)',
+				$params,
+				[
+					'itemType',
+					'fileTarget',
+					'itemSource',
+					'id',
+				]
+			);
+		} elseif($params['shareType'] === Share::SHARE_TYPE_USER) {
+			$this->log(
+				'The %s "%s" with ID "%s" has been unshared from the user "%s" (Share ID: %s)',
+				$params,
+				[
+					'itemType',
+					'fileTarget',
+					'itemSource',
+					'shareWith',
+					'id',
+				]
+			);
+		} elseif($params['shareType'] === Share::SHARE_TYPE_GROUP) {
+			$this->log(
+				'The %s "%s" with ID "%s" has been unshared from the group "%s" (Share ID: %s)',
+				$params,
+				[
+					'itemType',
+					'fileTarget',
+					'itemSource',
+					'shareWith',
+					'id',
+				]
+			);
+		}
+	}
+
+	/**
+	 * Logs the updating of permission changes for shares
+	 *
+	 * @param array $params
+	 */
+	public function updatePermissions(array $params) {
+		$this->log(
+			'The permissions of the shared %s "%s" with ID "%s" have been changed to "%s"',
+			$params,
+			[
+				'itemType',
+				'path',
+				'itemSource',
+				'permissions',
+			]
+		);
+	}
+
+	/**
+	 * Logs the password changes for a share
+	 *
+	 * @param array $params
+	 */
+	public function updatePassword(array $params) {
+		$this->log(
+			'The password of the publicly shared %s "%s" with ID "%s" has been changed',
+			$params,
+			[
+				'itemType',
+				'token',
+				'itemSource',
+			]
+		);
+	}
+
+	/**
+	 * Logs the expiration date changes for a share
+	 *
+	 * @param array $params
+	 */
+	public function updateExpirationDate(array $params) {
+		$this->log(
+			'The expiration date of the publicly shared %s with ID "%s" has been changed to "%s"',
+			$params,
+			[
+				'itemType',
+				'itemSource',
+				'date',
+			]
+		);
+	}
+
+	/**
+	 * Logs access of shared files
+	 *
+	 * @param array $params
+	 */
+	public function shareAccessed(array $params) {
+		$this->log(
+			'The shared %s with the token "%s" by "%s" has been accessed.',
+			$params,
+			[
+				'itemType',
+				'token',
+				'uidOwner',
+			]
+		);
+	}
+}
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
+ *
+ * @author Bjoern Schiessle <bjoern@schiessle.org>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\Admin_Audit\Actions;
+
+
+class Trashbin extends Action {
+
+	public function delete($params) {
+		$this->log('File "%s" deleted from trash bin.',
+			['path' => $params['path']], ['path']
+		);
+	}
+
+	public function restore($params) {
+		$this->log('File "%s" restored from trash bin.',
+			['path' => $params['filePath']], ['path']
+		);
+	}
+
+}
@@ -0,0 +1,81 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @author Bjoern Schiessle <bjoern@schiessle.org>
+ * @author Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Admin_Audit\Actions;
+use OCP\IUser;
+
+/**
+ * Class UserManagement logs all user management related actions.
+ *
+ * @package OCA\Admin_Audit\Actions
+ */
+class UserManagement extends Action {
+	/**
+	 * Log creation of users
+	 *
+	 * @param array $params
+	 */
+	public function create(array $params) {
+		$this->log(
+			'User created: "%s"',
+			$params,
+			[
+				'uid',
+			]
+		);
+	}
+
+	/**
+	 * Log deletion of users
+	 *
+	 * @param array $params
+	 */
+	public function delete(array $params) {
+		$this->log(
+			'User deleted: "%s"',
+			$params,
+			[
+				'uid',
+			]
+		);
+	}
+
+	/**
+	 * Logs changing of the user scope
+	 *
+	 * @param IUser $user
+	 */
+	public function setPassword(IUser $user) {
+		if($user->getBackendClassName() === 'Database') {
+			$this->log(
+				'Password of user "%s" has been changed',
+				[
+					'user' => $user->getUID(),
+				],
+				[
+					'user',
+				]
+			);
+		}
+	}
+}
@@ -0,0 +1,47 @@
+<?php
+/**
+ * @copyright Bjoern Schiessle <bjoern@schiessle.org>
+ *
+ * @author Bjoern Schiessle <bjoern@schiessle.org>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\Admin_Audit\Actions;
+
+
+class Versions extends Action {
+
+	public function rollback($params) {
+		$this->log('Version "%s" of "%s" was restored.',
+			[
+				'version' => $params['revision'],
+				'path' => $params['path']
+			],
+			['version', 'path']
+		);
+	}
+
+	public function delete($params) {
+		$this->log('Version "%s" was deleted.',
+			['path' => $params['path']],
+			['path']
+		);
+	}
+
+}
@@ -0,0 +1,188 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
+ *
+ * @author Bjoern Schiessle <bjoern@schiessle.org>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\Admin_Audit;
+
+
+use OC\Files\Filesystem;
+use OCA\Admin_Audit\Actions\Auth;
+use OCA\Admin_Audit\Actions\Files;
+use OCA\Admin_Audit\Actions\GroupManagement;
+use OCA\Admin_Audit\Actions\Sharing;
+use OCA\Admin_Audit\Actions\Trashbin;
+use OCA\Admin_Audit\Actions\UserManagement;
+use OCA\Admin_Audit\Actions\Versions;
+use OCP\IGroupManager;
+use OCP\ILogger;
+use OCP\IUserSession;
+use OCP\Util;
+
+class AuditLogger {
+
+	/** @var ILogger */
+	private $logger;
+
+	/** @var IUserSession */
+	private $userSession;
+	
+	/** @var IGroupManager */
+	private $groupManager;
+
+	/**
+	 * AuditLogger constructor.
+	 *
+	 * @param ILogger $logger
+	 * @param IUserSession $userSession
+	 * @param IGroupManager $groupManager
+	 */
+	public function __construct(ILogger $logger,
+								IUserSession $userSession, 
+								IGroupManager $groupManager) {
+		$this->logger = $logger;
+		$this->userSession = $userSession;
+		$this->groupManager = $groupManager;
+	}
+
+	/**
+	 * register hooks in order to log them
+	 */
+	public function registerHooks() {
+		$this->userManagementHooks();
+		$this->groupHooks();
+		$this->sharingHooks();
+		$this->authHooks();
+		$this->fileHooks();
+		$this->trashbinHooks();
+		$this->versionsHooks();
+	}
+
+	/**
+	 * connect to user management hooks
+	 */
+	private function userManagementHooks() {
+		$userActions = new UserManagement($this->logger);
+
+		Util::connectHook('OC_User', 'post_createUser',	$userActions, 'create');
+		Util::connectHook('OC_User', 'post_deleteUser',	$userActions, 'delete');
+		$this->userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
+	}
+	
+	private function groupHooks()  {
+		$groupActions = new GroupManagement($this->logger);
+		$this->groupManager->listen('\OC\Group', 'postRemoveUser',  [$groupActions, 'removeUser']);
+		$this->groupManager->listen('\OC\Group', 'postAddUser',  [$groupActions, 'addUser']);
+	}
+
+	/**
+	 * connect to sharing events
+	 */
+	private function sharingHooks() {
+		$shareActions = new Sharing($this->logger);
+
+		Util::connectHook('OCP\Share', 'post_shared', $shareActions, 'shared');
+		Util::connectHook('OCP\Share', 'post_unshare', $shareActions, 'unshare');
+		Util::connectHook('OCP\Share', 'post_update_permissions', $shareActions, 'updatePermissions');
+		Util::connectHook('OCP\Share', 'post_update_password', $shareActions, 'updatePassword');
+		Util::connectHook('OCP\Share', 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
+		Util::connectHook('OCP\Share', 'share_link_access', $shareActions, 'shareAccessed');
+	}
+
+	/**
+	 * connect to authentication event and related actions
+	 */
+	private function authHooks() {
+		$authActions = new Auth($this->logger);
+
+		Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
+		Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
+		Util::connectHook('OC_User', 'logout', $authActions, 'logout');
+	}
+
+
+	/**
+	 * connect to file hooks
+	 */
+	private function fileHooks() {
+		$fileActions = new Files($this->logger);
+
+		Util::connectHook(
+			Filesystem::CLASSNAME,
+			Filesystem::signal_post_rename,
+			$fileActions,
+			'rename'
+		);
+		Util::connectHook(
+			Filesystem::CLASSNAME,
+			Filesystem::signal_post_create,
+			$fileActions,
+			'create'
+		);
+		Util::connectHook(
+			Filesystem::CLASSNAME,
+			Filesystem::signal_post_copy,
+			$fileActions,
+			'copy'
+		);
+		Util::connectHook(
+			Filesystem::CLASSNAME,
+			Filesystem::signal_post_write,
+			$fileActions,
+			'write'
+		);
+		Util::connectHook(
+			Filesystem::CLASSNAME,
+			Filesystem::signal_post_update,
+			$fileActions,
+			'update'
+		);
+		Util::connectHook(
+			Filesystem::CLASSNAME,
+			Filesystem::signal_read,
+			$fileActions,
+			'read'
+		);
+		Util::connectHook(
+			Filesystem::CLASSNAME,
+			Filesystem::signal_delete,
+			$fileActions,
+			'delete'
+		);
+	}
+
+	public function versionsHooks() {
+		$versionsActions = new Versions($this->logger);
+		Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
+		Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete');
+	}
+
+	/**
+	 * connect to trash bin hooks
+	 */
+	private function trashbinHooks() {
+		$trashActions = new Trashbin($this->logger);
+		Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
+		Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
+	}
+
+}
@@ -1,301 +0,0 @@
-<?php
-/**
- * @author Joas Schilling <nickvergessen@owncloud.com>
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OCA\Comments\Activity;
-
-use OCP\Activity\IExtension;
-use OCP\Activity\IManager;
-use OCP\Comments\ICommentsManager;
-use OCP\Comments\NotFoundException;
-use OCP\IL10N;
-use OCP\IURLGenerator;
-use OCP\L10N\IFactory;
-
-/**
- * Class Extension
- *
- * @package OCA\Comments\Activity
- */
-class Extension implements IExtension {
-	const APP_NAME = 'comments';
-
-	const ADD_COMMENT_SUBJECT = 'add_comment_subject';
-	const ADD_COMMENT_MESSAGE = 'add_comment_message';
-
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var ICommentsManager */
-	protected $commentsManager;
-
-	/** @var IURLGenerator */
-	protected $URLGenerator;
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IManager $activityManager
-	 * @param ICommentsManager $commentsManager
-	 * @param IURLGenerator $URLGenerator
-	 */
-	public function __construct(IFactory $languageFactory, IManager $activityManager, ICommentsManager $commentsManager, IURLGenerator $URLGenerator) {
-		$this->languageFactory = $languageFactory;
-		$this->activityManager = $activityManager;
-		$this->commentsManager = $commentsManager;
-		$this->URLGenerator = $URLGenerator;
-	}
-
-	protected function getL10N($languageCode = null) {
-		return $this->languageFactory->get(self::APP_NAME, $languageCode);
-	}
-
-	/**
-	 * The extension can return an array of additional notification types.
-	 * If no additional types are to be added false is to be returned
-	 *
-	 * @param string $languageCode
-	 * @return array|false
-	 */
-	public function getNotificationTypes($languageCode) {
-		$l = $this->getL10N($languageCode);
-
-		return array(
-			self::APP_NAME => (string) $l->t('<strong>Comments</strong> for files'),
-		);
-	}
-
-	/**
-	 * For a given method additional types to be displayed in the settings can be returned.
-	 * In case no additional types are to be added false is to be returned.
-	 *
-	 * @param string $method
-	 * @return array|false
-	 */
-	public function getDefaultTypes($method) {
-		return $method === self::METHOD_STREAM ? [self::APP_NAME] : false;
-	}
-
-	/**
-	 * A string naming the css class for the icon to be used can be returned.
-	 * If no icon is known for the given type false is to be returned.
-	 *
-	 * @param string $type
-	 * @return string|false
-	 */
-	public function getTypeIcon($type) {
-		switch ($type) {
-			case self::APP_NAME:
-				return false;
-		}
-
-		return false;
-	}
-
-	/**
-	 * The extension can translate a given message to the requested languages.
-	 * If no translation is available false is to be returned.
-	 *
-	 * @param string $app
-	 * @param string $text
-	 * @param array $params
-	 * @param boolean $stripPath
-	 * @param boolean $highlightParams
-	 * @param string $languageCode
-	 * @return string|false
-	 */
-	public function translate($app, $text, $params, $stripPath, $highlightParams, $languageCode) {
-		if ($app !== self::APP_NAME) {
-			return false;
-		}
-
-		$l = $this->getL10N($languageCode);
-
-		if ($this->activityManager->isFormattingFilteredObject()) {
-			$translation = $this->translateShort($text, $l, $params);
-			if ($translation !== false) {
-				return $translation;
-			}
-		}
-
-		return $this->translateLong($text, $l, $params);
-	}
-
-	/**
-	 * @param string $text
-	 * @param IL10N $l
-	 * @param array $params
-	 * @return bool|string
-	 */
-	protected function translateShort($text, IL10N $l, array $params) {
-
-		switch ($text) {
-			case self::ADD_COMMENT_SUBJECT:
-				return (string) $l->t('%1$s commented', $params);
-			case self::ADD_COMMENT_MESSAGE:
-				return $this->convertParameterToComment($params[0], 120);
-		}
-
-		return false;
-	}
-
-	/**
-	 * @param string $text
-	 * @param IL10N $l
-	 * @param array $params
-	 * @return bool|string
-	 */
-	protected function translateLong($text, IL10N $l, array $params) {
-
-		switch ($text) {
-			case self::ADD_COMMENT_SUBJECT:
-				return (string) $l->t('%1$s commented on %2$s', $params);
-			case self::ADD_COMMENT_MESSAGE:
-				return $this->convertParameterToComment($params[0]);
-		}
-
-		return false;
-	}
-
-	/**
-	 * The extension can define the type of parameters for translation
-	 *
-	 * Currently known types are:
-	 * * file		=> will strip away the path of the file and add a tooltip with it
-	 * * username	=> will add the avatar of the user
-	 *
-	 * @param string $app
-	 * @param string $text
-	 * @return array|false
-	 */
-	public function getSpecialParameterList($app, $text) {
-		if ($app === self::APP_NAME) {
-			switch ($text) {
-				case self::ADD_COMMENT_SUBJECT:
-					return [
-						0 => 'username',
-						1 => 'file',
-					];
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * The extension can define the parameter grouping by returning the index as integer.
-	 * In case no grouping is required false is to be returned.
-	 *
-	 * @param array $activity
-	 * @return integer|false
-	 */
-	public function getGroupParameter($activity) {
-		return false;
-	}
-
-	/**
-	 * The extension can define additional navigation entries. The array returned has to contain two keys 'top'
-	 * and 'apps' which hold arrays with the relevant entries.
-	 * If no further entries are to be added false is no be returned.
-	 *
-	 * @return array|false
-	 */
-	public function getNavigation() {
-		$l = $this->getL10N();
-		return [
-			'apps' => [],
-			'top' => [
-				self::APP_NAME => [
-					'id' => self::APP_NAME,
-					'name' => (string) $l->t('Comments'),
-					'url' => $this->URLGenerator->linkToRoute('activity.Activities.showList', ['filter' => self::APP_NAME]),
-				],
-			],
-		];
-	}
-
-	/**
-	 * The extension can check if a custom filter (given by a query string like filter=abc) is valid or not.
-	 *
-	 * @param string $filterValue
-	 * @return boolean
-	 */
-	public function isFilterValid($filterValue) {
-		return $filterValue === self::APP_NAME;
-	}
-
-	/**
-	 * The extension can filter the types based on the filter if required.
-	 * In case no filter is to be applied false is to be returned unchanged.
-	 *
-	 * @param array $types
-	 * @param string $filter
-	 * @return array|false
-	 */
-	public function filterNotificationTypes($types, $filter) {
-		if ($filter === self::APP_NAME) {
-			return array_intersect($types, [self::APP_NAME]);
-		}
-		return false;
-	}
-
-	/**
-	 * For a given filter the extension can specify the sql query conditions including parameters for that query.
-	 * In case the extension does not know the filter false is to be returned.
-	 * The query condition and the parameters are to be returned as array with two elements.
-	 * E.g. return array('`app` = ? and `message` like ?', array('mail', 'ownCloud%'));
-	 *
-	 * @param string $filter
-	 * @return array|false
-	 */
-	public function getQueryForFilter($filter) {
-		return false;
-	}
-
-	/**
-	 * @param string $parameter
-	 * @return string
-	 */
-	protected function convertParameterToComment($parameter, $maxLength = 0) {
-		if (preg_match('/^\<parameter\>(\d*)\<\/parameter\>$/', $parameter, $matches)) {
-			try {
-				$comment = $this->commentsManager->get((int) $matches[1]);
-				$message = $comment->getMessage();
-				$message = str_replace("\n", '<br />', str_replace(['<', '>'], ['&lt;', '&gt;'], $message));
-
-				if ($maxLength && isset($message[$maxLength + 20])) {
-					$findSpace = strpos($message, ' ', $maxLength);
-					if ($findSpace !== false && $findSpace < $maxLength + 20) {
-						return substr($message, 0, $findSpace) . '…';
-					}
-					return substr($message, 0, $maxLength + 20) . '…';
-				}
-
-				return $message;
-			} catch (NotFoundException $e) {
-				return '';
-			}
-		}
-
-		return '';
-	}
-}
@@ -1,128 +0,0 @@
-<?php
-/**
- * @author Joas Schilling <nickvergessen@owncloud.com>
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OCA\Comments\Activity;
-
-use OCP\Activity\IManager;
-use OCP\App\IAppManager;
-use OCP\Comments\CommentsEvent;
-use OCP\Files\Config\IMountProviderCollection;
-use OCP\Files\IRootFolder;
-use OCP\Files\Node;
-use OCP\IUser;
-use OCP\IUserSession;
-use OCP\Share;
-
-class Listener {
-	/** @var IManager */
-	protected $activityManager;
-	/** @var IUserSession */
-	protected $session;
-	/** @var \OCP\App\IAppManager */
-	protected $appManager;
-	/** @var \OCP\Files\Config\IMountProviderCollection */
-	protected $mountCollection;
-	/** @var \OCP\Files\IRootFolder */
-	protected $rootFolder;
-
-	/**
-	 * Listener constructor.
-	 *
-	 * @param IManager $activityManager
-	 * @param IUserSession $session
-	 * @param IAppManager $appManager
-	 * @param IMountProviderCollection $mountCollection
-	 * @param IRootFolder $rootFolder
-	 */
-	public function __construct(IManager $activityManager,
-								IUserSession $session,
-								IAppManager $appManager,
-								IMountProviderCollection $mountCollection,
-								IRootFolder $rootFolder) {
-		$this->activityManager = $activityManager;
-		$this->session = $session;
-		$this->appManager = $appManager;
-		$this->mountCollection = $mountCollection;
-		$this->rootFolder = $rootFolder;
-	}
-
-	/**
-	 * @param CommentsEvent $event
-	 */
-	public function commentEvent(CommentsEvent $event) {
-		if ($event->getComment()->getObjectType() !== 'files'
-			|| !in_array($event->getEvent(), [CommentsEvent::EVENT_ADD])
-			|| !$this->appManager->isInstalled('activity')) {
-			// Comment not for file, not adding a comment or no activity-app enabled (save the energy)
-			return;
-		}
-
-		// Get all mount point owners
-		$cache = $this->mountCollection->getMountCache();
-		$mounts = $cache->getMountsForFileId($event->getComment()->getObjectId());
-		if (empty($mounts)) {
-			return;
-		}
-
-		$users = [];
-		foreach ($mounts as $mount) {
-			$owner = $mount->getUser()->getUID();
-			$ownerFolder = $this->rootFolder->getUserFolder($owner);
-			$nodes = $ownerFolder->getById($event->getComment()->getObjectId());
-			if (!empty($nodes)) {
-				/** @var Node $node */
-				$node = array_shift($nodes);
-				$path = $node->getPath();
-				if (strpos($path, '/' . $owner . '/files/') === 0) {
-					$path = substr($path, strlen('/' . $owner . '/files'));
-				}
-				// Get all users that have access to the mount point
-				$users = array_merge($users, Share::getUsersSharingFile($path, $owner, true, true));
-			}
-		}
-
-		$actor = $this->session->getUser();
-		if ($actor instanceof IUser) {
-			$actor = $actor->getUID();
-		} else {
-			$actor = '';
-		}
-
-		$activity = $this->activityManager->generateEvent();
-		$activity->setApp(Extension::APP_NAME)
-			->setType(Extension::APP_NAME)
-			->setAuthor($actor)
-			->setObject($event->getComment()->getObjectType(), $event->getComment()->getObjectId())
-			->setMessage(Extension::ADD_COMMENT_MESSAGE, [
-				$event->getComment()->getId(),
-			]);
-
-		foreach ($users as $user => $path) {
-			$activity->setAffectedUser($user);
-
-			$activity->setSubject(Extension::ADD_COMMENT_SUBJECT, [
-				$actor,
-				$path,
-			]);
-			$this->activityManager->publish($activity);
-		}
-	}
-}
@@ -1,9 +1,10 @@
 <?php
 /**
- * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ *
+ * @author Joas Schilling <coding@schilljs.com>
 * @author Vincent Petry <pvince81@owncloud.com>
 *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
 * @license AGPL-3.0
 *
 * This code is free software: you can redistribute it and/or modify
@@ -31,23 +32,45 @@ $eventDispatcher->addListener(
 		\OCP\Util::addScript('comments', 'commentsummarymodel');
 		\OCP\Util::addScript('comments', 'commentstabview');
 		\OCP\Util::addScript('comments', 'filesplugin');
+		\OCP\Util::addScript('comments', 'activitytabviewplugin');
 		\OCP\Util::addStyle('comments', 'comments');
 	}
 );

-$activityManager = \OC::$server->getActivityManager();
-$activityManager->registerExtension(function() {
-	$application = new \OCP\AppFramework\App('comments');
-	/** @var \OCA\Comments\Activity\Extension $extension */
-	$extension = $application->getContainer()->query('OCA\Comments\Activity\Extension');
-	return $extension;
+$eventDispatcher->addListener(\OCP\Comments\CommentsEntityEvent::EVENT_ENTITY, function(\OCP\Comments\CommentsEntityEvent $event) {
+	$event->addEntityCollection('files', function($name) {
+		$nodes = \OC::$server->getUserFolder()->getById(intval($name));
+		return !empty($nodes);
+	});
 });

-$managerListener = function(\OCP\Comments\CommentsEvent $event) use ($activityManager) {
-	$application = new \OCP\AppFramework\App('comments');
-	/** @var \OCA\Comments\Activity\Listener $listener */
-	$listener = $application->getContainer()->query('OCA\Comments\Activity\Listener');
-	$listener->commentEvent($event);
-};
+$notificationManager = \OC::$server->getNotificationManager();
+$notificationManager->registerNotifier(
+	function() {
+		$application = new \OCP\AppFramework\App('comments');
+		return $application->getContainer()->query(\OCA\Comments\Notification\Notifier::class);
+	},
+	function () {
+		$l = \OC::$server->getL10N('comments');
+		return ['id' => 'comments', 'name' => $l->t('Comments')];
+	}
+);

-$eventDispatcher->addListener(\OCP\Comments\CommentsEvent::EVENT_ADD, $managerListener);
+$commentsManager = \OC::$server->getCommentsManager();
+$commentsManager->registerEventHandler(function () {
+	$application = new \OCP\AppFramework\App('comments');
+	/** @var \OCA\Comments\EventHandler $handler */
+	$handler = $application->getContainer()->query(\OCA\Comments\EventHandler::class);
+	return $handler;
+});
+$commentsManager->registerDisplayNameResolver('user', function($id) {
+	$manager = \OC::$server->getUserManager();
+	$user = $manager->get($id);
+	if(is_null($user)) {
+		$l = \OC::$server->getL10N('comments');
+		$displayName = $l->t('Unknown user');
+	} else {
+		$displayName = $user->getDisplayName();
+	}
+	return $displayName;
+});
@@ -4,13 +4,27 @@
 	<name>Comments</name>
 	<description>Files app plugin to add comments to files</description>
 	<licence>AGPL</licence>
-	<author>Arthur Shiwon, Vincent Petry</author>
+	<author>Arthur Schiwon, Vincent Petry</author>
 	<default_enable/>
-	<version>0.2</version>
+	<version>1.1.0</version>
 	<dependencies>
-		<owncloud min-version="9.0" max-version="9.0" />
+		<nextcloud min-version="11" max-version="11" />
 	</dependencies>
 	<types>
 		<logging/>
 	</types>
+
+	<activity>
+		<settings>
+			<setting>OCA\Comments\Activity\Setting</setting>
+		</settings>
+
+		<filters>
+			<filter>OCA\Comments\Activity\Filter</filter>
+		</filters>
+
+		<providers>
+			<provider>OCA\Comments\Activity\Provider</provider>
+		</providers>
+	</activity>
 </info>
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+use \OCA\Comments\AppInfo\Application;
+
+$application = new Application();
+$application->registerRoutes($this, ['routes' => [
+	['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
+]]);
@@ -8,70 +8,99 @@
 *
 */

+#commentsTabView .emptycontent {
+	margin-top: 0;
+}
+
 #commentsTabView .newCommentForm {
+	position: relative;
 	margin-bottom: 20px;
 }

 #commentsTabView .newCommentForm .message {
-	width: 90%;
-	resize: vertical;
+	width: calc(100% - 81px); /* 36 (left margin) + 30 (right padding) + 15 (right padding of surrounding box) */
+	margin-left: 36px;
+	padding-right: 30px;
+	display: block;
+}
+
+#commentsTabView .newCommentForm .submit {
+	position: absolute;
+	bottom: 0px;
+	right: 8px;
+	width: 30px;
+	margin: 0;
+	padding: 7px 9px;
+	background-color: transparent;
+	border: none;
+	opacity: .3;
+}
+#commentsTabView .newCommentForm .submit:hover,
+#commentsTabView .newCommentForm .submit:focus {
+	opacity: 1;
 }

 #commentsTabView .newCommentForm .submitLoading {
 	background-position: left;
 }

-#commentsTabView .comment {
-	margin-bottom: 30px;
+#commentsTabView .newCommentForm .cancel {
+	margin-right: 6px;
 }

-#commentsTabView .comment .avatar {
-	width: 28px;
-	height: 28px;
-	line-height: 28px;
+#commentsTabView .newCommentForm textarea {
+	resize: none;
 }

 #commentsTabView .comment {
 	position: relative;
 	z-index: 1;
+	margin-bottom: 30px;
 }

+#commentsTabView .comment .avatar {
+	width: 32px;
+	height: 32px;
+	line-height: 32px;
+}
+
+#commentsTabView .comment .message .avatar {
+	display: inline-block;
+}
+
+#activityTabView li.comment.collapsed .activitymessage,
 #commentsTabView .comment.collapsed .message {
-	white-space: -moz-pre-wrap !important;  /* Mozilla, since 1999 */
-	white-space: -webkit-pre-wrap; /*Chrome & Safari */ 
-	white-space: -pre-wrap;      /* Opera 4-6 */
-	white-space: -o-pre-wrap;    /* Opera 7 */
-	white-space: pre-wrap;       /* css-3 */
-	word-wrap: break-word;       /* Internet Explorer 5.5+ */
-	word-break: break-all;
-	white-space: normal;
+	white-space: pre-wrap;
 }

+#activityTabView li.comment.collapsed .activitymessage,
 #commentsTabView .comment.collapsed .message {
 	max-height: 70px;
 	overflow: hidden;
 }

+#activityTabView li.comment .message-overlay,
 #commentsTabView .comment .message-overlay {
 	display: none;
 }

+#activityTabView li.comment.collapsed .message-overlay,
 #commentsTabView .comment.collapsed .message-overlay {
 	display: block;
-    position: absolute;
+	position: absolute;
 	z-index: 2;
-    height: 50px;
-    pointer-events: none;
+	height: 50px;
+	pointer-events: none;
 	left: 0;
 	right: 0;
-    bottom: 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));
 	filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#00FFFFFF', endColorstr='#FFFFFFFF');
-    background-repeat: no-repeat;
+	background-repeat: no-repeat;
 }

 #commentsTabView .authorRow>div {
@@ -80,17 +109,24 @@
 }

 #commentsTabView .comment .authorRow {
-	margin-bottom: 5px;
 	position: relative;
 }

-#commentsTabView .comment .author {
-	font-weight: bold;
+#commentsTabView .comment .author,
+#commentsTabView .comment .date {
+	opacity: .5;
+}
+#commentsTabView .comment .author {
+	margin-left: 5px;
 }
-
 #commentsTabView .comment .date {
 	position: absolute;
 	right: 0;
+	top: 5px;
+}
+
+#commentsTabView .comments li .message {
+	padding-left: 40px;
 }

 #commentsTabView .comment .action {
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32" viewBox="0 0 32 32"><path fill="#fff" d="M16 3C7.163 3 0 7.925 0 14s7.163 11 16 11c.5 0 .98-.032 1.47-.063L26 32v-9.406c3.658-2.017 6-5.12 6-8.595 0-6.076-7.164-11-16-11z"/></svg>
@@ -0,0 +1,59 @@
+/*
+ * @author Joas Schilling <coding@schilljs.com>
+ * Copyright (c) 2016
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ */
+
+(function() {
+	OCA.Comments.ActivityTabViewPlugin = {
+
+		/**
+		 * Prepare activity for display
+		 *
+		 * @param {OCA.Activity.ActivityModel} model for this activity
+		 * @param {jQuery} $el jQuery handle for this activity
+		 * @param {string} view The view that displayes this activity
+		 */
+		prepareModelForDisplay: function (model, $el, view) {
+			if (model.get('app') !== 'comments' || model.get('type') !== 'comments') {
+				return;
+			}
+
+			if (view === 'ActivityTabView') {
+				$el.addClass('comment');
+				if (model.get('message') && this._isLong(model.get('message'))) {
+					$el.addClass('collapsed');
+					var $overlay = $('<div>').addClass('message-overlay');
+					$el.find('.activitymessage').after($overlay);
+					$el.on('click', this._onClickCollapsedComment);
+				}
+			}
+		},
+
+		/*
+		 * Copy of CommentsTabView._onClickComment()
+		 */
+		_onClickCollapsedComment: function(ev) {
+			var $row = $(ev.target);
+			if (!$row.is('.comment')) {
+				$row = $row.closest('.comment');
+			}
+			$row.removeClass('collapsed');
+		},
+
+		/*
+		 * Copy of CommentsTabView._isLong()
+		 */
+		_isLong: function(message) {
+			return message.length > 250 || (message.match(/\n/g) || []).length > 1;
+		}
+	};
+
+
+})();
+
+OC.Plugins.register('OCA.Activity.RenderingPlugins', OCA.Comments.ActivityTabViewPlugin);
@@ -35,7 +35,8 @@
 			'creationDateTime': '{' + NS_OWNCLOUD + '}creationDateTime',
 			'objectType': '{' + NS_OWNCLOUD + '}objectType',
 			'objectId': '{' + NS_OWNCLOUD + '}objectId',
-			'isUnread': '{' + NS_OWNCLOUD + '}isUnread'
+			'isUnread': '{' + NS_OWNCLOUD + '}isUnread',
+			'mentions': '{' + NS_OWNCLOUD + '}mentions'
 		},

 		parse: function(data) {
@@ -48,8 +49,30 @@
 				creationDateTime: data.creationDateTime,
 				objectType: data.objectType,
 				objectId: data.objectId,
-				isUnread: (data.isUnread === 'true')
+				isUnread: (data.isUnread === 'true'),
+				mentions: this._parseMentions(data.mentions)
 			};
+		},
+
+		_parseMentions: function(mentions) {
+			if(_.isUndefined(mentions)) {
+				return {};
+			}
+			var result = {};
+			for(var i in mentions) {
+				var mention = mentions[i];
+				if(_.isUndefined(mention.localName) || mention.localName !== 'mention') {
+					continue;
+				}
+				result[i] = {};
+				for (var child = mention.firstChild; child; child = child.nextSibling) {
+					if(_.isUndefined(child.localName) || !child.localName.startsWith('mention')) {
+						continue;
+					}
+					result[i][child.localName] = child.textContent;
+				}
+			}
+			return result;
 		}
 	});

@@ -14,7 +14,8 @@
 	var TEMPLATE =
 		'<ul class="comments">' +
 		'</ul>' +
-		'<div class="empty hidden">{{emptyResultLabel}}</div>' +
+		'<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>';
@@ -31,10 +32,10 @@
 		'{{/if}}' +
 		'    </div>' +
 		'    <form class="newCommentForm">' +
-		'        <textarea class="message" placeholder="{{newMessagePlaceholder}}">{{{message}}}</textarea>' +
-		'        <input class="submit" type="submit" value="{{submitText}}" />' +
+		'        <textarea rows="1" class="message" placeholder="{{newMessagePlaceholder}}">{{message}}</textarea>' +
+		'        <input class="submit icon-confirm" type="submit" value="" />' +
 		'{{#if isEditMode}}' +
-		'        <input class="cancel" type="button" value="{{cancelText}}" />' +
+		'        <input class="cancel pull-right" type="button" value="{{cancelText}}" />' +
 		'{{/if}}' +
 		'        <div class="submitLoading icon-loading-small hidden"></div>'+
 		'    </form>' +
@@ -50,7 +51,7 @@
 		'{{#if isUserAuthor}}' +
 		'        <a href="#" class="action edit icon icon-rename has-tooltip" title="{{editTooltip}}"></a>' +
 		'{{/if}}' +
-		'        <div class="date has-tooltip" title="{{altDate}}">{{date}}</div>' +
+		'        <div class="date has-tooltip live-relative-timestamp" data-timestamp="{{timestamp}}" title="{{altDate}}">{{date}}</div>' +
 		'    </div>' +
 		'    <div class="message">{{{formattedMessage}}}</div>' +
 		'{{#if isLong}}' +
@@ -113,7 +114,7 @@
 				avatarEnabled: this._avatarsEnabled,
 				actorId: currentUser.uid,
 				actorDisplayName: currentUser.displayName,
-				newMessagePlaceholder: t('comments', 'Type in a new comment...'),
+				newMessagePlaceholder: t('comments', 'New comment …'),
 				deleteTooltip: t('comments', 'Delete comment'),
 				submitText: t('comments', 'Post'),
 				cancelText: t('comments', 'Cancel')
@@ -162,25 +163,28 @@

 		render: function() {
 			this.$el.html(this.template({
-				emptyResultLabel: t('comments', 'No other comments available'),
-				moreLabel: t('comments', 'More comments...')
+				emptyResultLabel: t('comments', 'No comments yet, start the conversation!'),
+				moreLabel: t('comments', 'More comments …')
 			}));
 			this.$el.find('.comments').before(this.editCommentTemplate({}));
 			this.$el.find('.has-tooltip').tooltip();
 			this.$container = this.$el.find('ul.comments');
 			if (this._avatarsEnabled) {
-				this.$el.find('.avatar').avatar(OC.getCurrentUser().uid, 28);
+				this.$el.find('.avatar').avatar(OC.getCurrentUser().uid, 32);
 			}
 			this.delegateEvents();
-			this.$el.find('textarea').on('keyup input change', this._onTypeComment);
+			this.$el.find('.message').on('keydown input change', this._onTypeComment);
+
+			autosize(this.$el.find('.newCommentRow textarea'))
 		},

 		_formatItem: function(commentModel) {
 			var timestamp = new Date(commentModel.get('creationDateTime')).getTime();
 			var data = _.extend({
+				timestamp: timestamp,
 				date: OC.Util.relativeModifiedDate(timestamp),
 				altDate: OC.Util.formatDate(timestamp),
-				formattedMessage: this._formatMessage(commentModel.get('message'))
+				formattedMessage: this._formatMessage(commentModel.get('message'), commentModel.get('mentions'))
 			}, commentModel.attributes);
 			return data;
 		},
@@ -200,7 +204,7 @@
 		_onEndRequest: function(type) {
 			var fileInfoModel = this.model;
 			this._toggleLoading(false);
-			this.$el.find('.empty').toggleClass('hidden', !!this.collection.length);
+			this.$el.find('.emptycontent').toggleClass('hidden', !!this.collection.length);
 			this.$el.find('.showMore').toggleClass('hidden', !this.collection.hasMoreResults());

 			if (type !== 'REPORT') {
@@ -238,7 +242,7 @@
 			if(this._avatarsEnabled) {
 				$el.find('.avatar').each(function() {
 					var $this = $(this);
-					$this.avatar($this.attr('data-username'), 28);
+					$this.avatar($this.attr('data-username'), 32);
 				});
 			}
 		},
@@ -247,8 +251,35 @@
 		 * Convert a message to be displayed in HTML,
 		 * converts newlines to <br> tags.
 		 */
-		_formatMessage: function(message) {
-			return escapeHTML(message).replace(/\n/g, '<br/>');
+		_formatMessage: function(message, mentions) {
+			message = escapeHTML(message).replace(/\n/g, '<br/>');
+
+			for(var i in mentions) {
+				var mention = '@' + mentions[i].mentionId;
+
+				var avatar = '';
+				if(this._avatarsEnabled) {
+					avatar = '<div class="avatar" '
+						+ 'data-user="' + _.escape(mentions[i].mentionId) + '"'
+						+' data-user-display-name="'
+						+ _.escape(mentions[i].mentionDisplayName) + '"></div>';
+				}
+
+				// escape possible regex characters in the name
+				mention = mention.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+				var displayName = avatar + ' <strong>'+ _.escape(mentions[i].mentionDisplayName)+'</strong>';
+
+				// 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'),
+					function(match, p1) {
+						// to  get number of whitespaces (0 vs 1) right
+						return p1+displayName;
+					}
+				);
+			}
+
+			return message;
 		},

 		nextPage: function() {
@@ -273,12 +304,15 @@
 			// spawn form
 			$comment.after($formRow);
 			$formRow.data('commentEl', $comment);
-			$formRow.find('textarea').on('keyup input change', this._onTypeComment);
+			$formRow.find('textarea').on('keydown input change', this._onTypeComment);

 			// copy avatar element from original to avoid flickering
-			$formRow.find('.avatar').replaceWith($comment.find('.avatar').clone());
+			$formRow.find('.avatar:first').replaceWith($comment.find('.avatar:first').clone());
 			$formRow.find('.has-tooltip').tooltip();

+			// Enable autosize
+			autosize($formRow.find('textarea'));
+
 			return false;
 		},

@@ -301,6 +335,11 @@
 			var limitExceeded = (len > this._commentMaxLength);
 			$field.toggleClass('error', limitExceeded);
 			$submitButton.prop('disabled', limitExceeded);
+
+			//submits form on ctrl+Enter or cmd+Enter
+			if (ev.keyCode === 13 && (ev.ctrlKey || ev.metaKey)) {
+				$submitButton.click();
+			}
 		},

 		_onClickComment: function(ev) {
@@ -332,14 +371,13 @@
 					$comment.data('commentEl').remove();
 					$comment.remove();
 				},
-				error: function(msg) {
+				error: function() {
 					$loading.addClass('hidden');
 					$comment.removeClass('disabled');
-					OC.Notification.showTemporary(msg);
+					OC.Notification.showTemporary(t('comments', 'Error occurred while retrieving comment with id {id}', {id: commentId}));
 				}
 			});

-
 			return false;
 		},

@@ -348,6 +386,48 @@
 			this.nextPage();
 		},

+		/**
+		 * takes care of updating comment elements after submit (either new
+		 * comment or edit).
+		 *
+		 * @param {OC.Backbone.Model} model
+		 * @param {jQuery} $form
+		 * @param {string|undefined} commentId
+		 * @private
+		 */
+		_onSubmitSuccess: function(model, $form, commentId) {
+			var self = this;
+			var $submit = $form.find('.submit');
+			var $loading = $form.find('.submitLoading');
+			var $textArea = $form.find('.message');
+
+			model.fetch({
+				success: function(model) {
+					$submit.removeClass('hidden');
+					$loading.addClass('hidden');
+					var $target;
+
+					if(!_.isUndefined(commentId)) {
+						var $row = $form.closest('.comment');
+						$target = $row.data('commentEl');
+						$target.removeClass('hidden');
+						$row.remove();
+					} else {
+						$target = $('.commentsTabView .comments').find('li:first');
+						$textArea.val('').prop('disabled', false);
+					}
+
+					$target.find('.message')
+						.html(self._formatMessage(model.get('message'), model.get('mentions')))
+						.find('.avatar')
+						.each(function () { $(this).avatar(); });
+				},
+				error: function () {
+					self._onSubmitError($form, commentId);
+				}
+			});
+		},
+
 		_onSubmitComment: function(e) {
 			var self = this;
 			var $form = $(e.target);
@@ -355,7 +435,7 @@
 			var currentUser = OC.getCurrentUser();
 			var $submit = $form.find('.submit');
 			var $loading = $form.find('.submitLoading');
-			var $textArea = $form.find('textarea');
+			var $textArea = $form.find('.message');
 			var message = $textArea.val().trim();
 			e.preventDefault();

@@ -374,21 +454,10 @@
 					message: $textArea.val()
 				}, {
 					success: function(model) {
-						var $row = $form.closest('.comment');
-						$submit.removeClass('hidden');
-						$loading.addClass('hidden');
-						$row.data('commentEl')
-							.removeClass('hidden')
-							.find('.message')
-							.html(self._formatMessage(model.get('message')));
-						$row.remove();
+						self._onSubmitSuccess(model, $form, commentId);
 					},
-					error: function(msg) {
-						$submit.removeClass('hidden');
-						$loading.addClass('hidden');
-						$textArea.prop('disabled', false);
-
-						OC.Notification.showTemporary(msg);
+					error: function() {
+						self._onSubmitError($form, commentId);
 					}
 				});
 			} else {
@@ -403,17 +472,11 @@
 					at: 0,
 					// wait for real creation before adding
 					wait: true,
-					success: function() {
-						$submit.removeClass('hidden');
-						$loading.addClass('hidden');
-						$textArea.val('').prop('disabled', false);
+					success: function(model) {
+						self._onSubmitSuccess(model, $form);
 					},
-					error: function(msg) {
-						$submit.removeClass('hidden');
-						$loading.addClass('hidden');
-						$textArea.prop('disabled', false);
-
-						OC.Notification.showTemporary(msg);
+					error: function() {
+						self._onSubmitError($form);
 					}
 				});
 			}
@@ -421,6 +484,26 @@
 			return false;
 		},

+		/**
+		 * takes care of updating the UI after an error on submit (either new
+		 * comment or edit).
+		 *
+		 * @param {jQuery} $form
+		 * @param {string|undefined} commentId
+		 * @private
+		 */
+		_onSubmitError: function($form, commentId) {
+			$form.find('.submit').removeClass('hidden');
+			$form.find('.submitLoading').addClass('hidden');
+			$form.find('.message').prop('disabled', false);
+
+			if(!_.isUndefined(commentId)) {
+				OC.Notification.showTemporary(t('comments', 'Error occurred while updating comment with id {id}', {id: commentId}));
+			} else {
+				OC.Notification.showTemporary(t('comments', 'Error occurred while posting comment'));
+			}
+		},
+
 		/**
 		 * Returns whether the given message is long and needs
 		 * collapsing
@@ -432,4 +515,3 @@

 	OCA.Comments.CommentsTabView = CommentsTabView;
 })(OC, OCA);
-
@@ -39,7 +39,7 @@
 			}
 			return this._commentsUnreadTemplate({
 				count: count,
-				countMessage: t('comments', '{count} unread comments', {count: count}),
+				countMessage: n('comments', '%n unread comment', '%n unread comments', count),
 				iconUrl: OC.imagePath('core', 'actions/comment')
 			});
 		},
@@ -1,8 +1,29 @@
 OC.L10N.register(
    "comments",
    {
+    "Comments" : "تعليقات",
+    "New comment …" : "تعليق جديد",
+    "Delete comment" : "حذف التعليق",
+    "Post" : "ارسال",
    "Cancel" : "إلغاء",
+    "Edit comment" : "تعديل التعليق",
+    "[Deleted user]" : "[مستخدم محذوف]",
+    "No comments yet, start the conversation!" : "لا يوجد تعليقات, ابدأ النقاش الآن!",
+    "More comments …" : "مزيد من التعليقات...",
    "Save" : "حفظ",
-    "Comment" : "تعليق"
+    "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" : "حصل خطأ أثناء إرسال التعليق",
+    "Comment" : "تعليق",
+    "You commented" : "قمت بكتابة تعليق",
+    "%1$s commented" : "%1$s كتب تعليق",
+    "%1$s commented on %2$s" : "%1$s كتب تعليق على %2$s",
+    "<strong>Comments</strong> for files" : "<strong>تعليقات</strong> على الملفات",
+    "Type in a new comment..." : "اكتب تعليق جديد...",
+    "No other comments available" : "لا يوجد تعليقات أخرى متاحة",
+    "More comments..." : "مزيد من التعليقات...",
+    "{count} unread comments" : "{count} الرسائل الغير مقروءة",
+    "You commented on %2$s" : "انت قمت بكتابة تعليق على %2$s"
 },
 "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;");
@@ -1,6 +1,27 @@
 { "translations": {
+    "Comments" : "تعليقات",
+    "New comment …" : "تعليق جديد",
+    "Delete comment" : "حذف التعليق",
+    "Post" : "ارسال",
    "Cancel" : "إلغاء",
+    "Edit comment" : "تعديل التعليق",
+    "[Deleted user]" : "[مستخدم محذوف]",
+    "No comments yet, start the conversation!" : "لا يوجد تعليقات, ابدأ النقاش الآن!",
+    "More comments …" : "مزيد من التعليقات...",
    "Save" : "حفظ",
-    "Comment" : "تعليق"
+    "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" : "حصل خطأ أثناء إرسال التعليق",
+    "Comment" : "تعليق",
+    "You commented" : "قمت بكتابة تعليق",
+    "%1$s commented" : "%1$s كتب تعليق",
+    "%1$s commented on %2$s" : "%1$s كتب تعليق على %2$s",
+    "<strong>Comments</strong> for files" : "<strong>تعليقات</strong> على الملفات",
+    "Type in a new comment..." : "اكتب تعليق جديد...",
+    "No other comments available" : "لا يوجد تعليقات أخرى متاحة",
+    "More comments..." : "مزيد من التعليقات...",
+    "{count} unread comments" : "{count} الرسائل الغير مقروءة",
+    "You commented on %2$s" : "انت قمت بكتابة تعليق على %2$s"
 },"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;"
 }
@@ -1,8 +1,28 @@
 OC.L10N.register(
    "comments",
    {
+    "Comments" : "Comentarios",
+    "New comment …" : "Comentariu nuevu...",
+    "Delete comment" : "Desaniciar comentariu",
+    "Post" : "Espublizar",
    "Cancel" : "Encaboxar",
+    "Edit comment" : "Editar comentariu",
+    "[Deleted user]" : "[Usuariu desaniciáu]",
+    "No comments yet, start the conversation!" : "Entá nun hai comentarios. ¡Entama una conversación!",
+    "More comments …" : "Más comentarios...",
    "Save" : "Guardar",
-    "Comment" : "Comentariu"
+    "Error occurred while retrieving comment with id {id}" : "Asocedió un fallu entrín se recibía'l comentariu cola ID {id}",
+    "Error occurred while updating comment with id {id}" : "Asocedió un fallu entrín s'anovaba'l comentariu cola ID {id}",
+    "Error occurred while posting comment" : "Asocedieron fallos entrín s'espublizaba'l comentariu",
+    "Comment" : "Comentariu",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> pa ficheros",
+    "You commented" : "Comentesti",
+    "%1$s commented" : "%1$s comentó",
+    "You commented on %2$s" : "Comentesti en %2$s",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "Type in a new comment..." : "Teclexa un comentariu nuevu...",
+    "No other comments available" : "Nun hai otros comentarios disponibles",
+    "More comments..." : "Más comentarios...",
+    "{count} unread comments" : "{count} comentarios ensin lleer"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,6 +1,26 @@
 { "translations": {
+    "Comments" : "Comentarios",
+    "New comment …" : "Comentariu nuevu...",
+    "Delete comment" : "Desaniciar comentariu",
+    "Post" : "Espublizar",
    "Cancel" : "Encaboxar",
+    "Edit comment" : "Editar comentariu",
+    "[Deleted user]" : "[Usuariu desaniciáu]",
+    "No comments yet, start the conversation!" : "Entá nun hai comentarios. ¡Entama una conversación!",
+    "More comments …" : "Más comentarios...",
    "Save" : "Guardar",
-    "Comment" : "Comentariu"
+    "Error occurred while retrieving comment with id {id}" : "Asocedió un fallu entrín se recibía'l comentariu cola ID {id}",
+    "Error occurred while updating comment with id {id}" : "Asocedió un fallu entrín s'anovaba'l comentariu cola ID {id}",
+    "Error occurred while posting comment" : "Asocedieron fallos entrín s'espublizaba'l comentariu",
+    "Comment" : "Comentariu",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> pa ficheros",
+    "You commented" : "Comentesti",
+    "%1$s commented" : "%1$s comentó",
+    "You commented on %2$s" : "Comentesti en %2$s",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "Type in a new comment..." : "Teclexa un comentariu nuevu...",
+    "No other comments available" : "Nun hai otros comentarios disponibles",
+    "More comments..." : "Más comentarios...",
+    "{count} unread comments" : "{count} comentarios ensin lleer"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,8 +1,39 @@
 OC.L10N.register(
    "comments",
    {
+    "Comments" : "Коментари",
+    "Unknown user" : "Непознат потребител",
+    "New comment …" : "Нов коментар...",
+    "Delete comment" : "Изтрий коментар",
+    "Post" : "Публикация",
    "Cancel" : "Отказ",
+    "Edit comment" : "Редактирай коментра",
+    "[Deleted user]" : "[Изтрит потребител]",
+    "No comments yet, start the conversation!" : "Все-още няма коментари, започни разговор!",
+    "More comments …" : "Още коментари...",
    "Save" : "Запазване",
-    "Comment" : "Коментар"
+    "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 непрочетени коментари"],
+    "Comment" : "Коментар",
+    "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> за файлове",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "(Токущо) изтрит потребител те коментира в “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "(Токущо) изтрит потребител те спомена в коментар за “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s те спомена в коментар за “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} те спомена в коментар за “{file}”",
+    "Type in a new comment..." : "Напиши нов коментар...",
+    "No other comments available" : "Няма други коментари",
+    "More comments..." : "Още коментари...",
+    "{count} unread comments" : "{count} непрочетени коментари",
+    "You commented on %2$s" : "Ти коментира за %2$s"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,6 +1,37 @@
 { "translations": {
+    "Comments" : "Коментари",
+    "Unknown user" : "Непознат потребител",
+    "New comment …" : "Нов коментар...",
+    "Delete comment" : "Изтрий коментар",
+    "Post" : "Публикация",
    "Cancel" : "Отказ",
+    "Edit comment" : "Редактирай коментра",
+    "[Deleted user]" : "[Изтрит потребител]",
+    "No comments yet, start the conversation!" : "Все-още няма коментари, започни разговор!",
+    "More comments …" : "Още коментари...",
    "Save" : "Запазване",
-    "Comment" : "Коментар"
+    "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 непрочетени коментари"],
+    "Comment" : "Коментар",
+    "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> за файлове",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "(Токущо) изтрит потребител те коментира в “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "(Токущо) изтрит потребител те спомена в коментар за “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s те спомена в коментар за “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} те спомена в коментар за “{file}”",
+    "Type in a new comment..." : "Напиши нов коментар...",
+    "No other comments available" : "Няма други коментари",
+    "More comments..." : "Още коментари...",
+    "{count} unread comments" : "{count} непрочетени коментари",
+    "You commented on %2$s" : "Ти коментира за %2$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,8 +1,39 @@
 OC.L10N.register(
    "comments",
    {
+    "Comments" : "Comentaris",
+    "Unknown user" : "Usuari desconegut",
+    "New comment …" : "Nou comentari...",
+    "Delete comment" : "Esborrar comentari",
+    "Post" : "Publica",
    "Cancel" : "Cancel·la",
+    "Edit comment" : "Editar comentari",
+    "[Deleted user]" : "[usuari Esborrat]",
+    "No comments yet, start the conversation!" : "Encara no hi ha comentaris. Comenceu la conversa!",
+    "More comments …" : "Més comentaris...",
    "Save" : "Desa",
-    "Comment" : "Comentari"
+    "Allowed characters {count} of {max}" : "{count} caràcters permesos de {max}",
+    "Error occurred while retrieving comment with id {id}" : "Hi ha hagut un error en extraure el comentari amb id {id}",
+    "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"],
+    "Comment" : "Comentari",
+    "You commented" : "Heu comentat",
+    "%1$s commented" : "%1$s ha comentat",
+    "{author} commented" : "{author} ha comentat",
+    "You commented on %1$s" : "Heu comentat a %1$s",
+    "You commented on {file}" : "Heu comentat a {file}",
+    "%1$s commented on %2$s" : "%1$s ha comentat a %2$s",
+    "{author} commented on {file}" : "{author} ha comentat a {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentaris</strong> per arxius",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuari (ara) esborrat us ha nomenat en un comentari a “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuari (ara) esborrat us ha nomenat en un comentari de “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s us ha nomenat en un comentari a “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} us ha nomenat en un comentari de “{file}”",
+    "Type in a new comment..." : "Escriviu un nou comentari...",
+    "No other comments available" : "No hi ha altres comentaris disponibles",
+    "More comments..." : "Més comentaris...",
+    "{count} unread comments" : "{count} comentaris no llegits",
+    "You commented on %2$s" : "Heu comentat a %2$s"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,6 +1,37 @@
 { "translations": {
+    "Comments" : "Comentaris",
+    "Unknown user" : "Usuari desconegut",
+    "New comment …" : "Nou comentari...",
+    "Delete comment" : "Esborrar comentari",
+    "Post" : "Publica",
    "Cancel" : "Cancel·la",
+    "Edit comment" : "Editar comentari",
+    "[Deleted user]" : "[usuari Esborrat]",
+    "No comments yet, start the conversation!" : "Encara no hi ha comentaris. Comenceu la conversa!",
+    "More comments …" : "Més comentaris...",
    "Save" : "Desa",
-    "Comment" : "Comentari"
+    "Allowed characters {count} of {max}" : "{count} caràcters permesos de {max}",
+    "Error occurred while retrieving comment with id {id}" : "Hi ha hagut un error en extraure el comentari amb id {id}",
+    "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"],
+    "Comment" : "Comentari",
+    "You commented" : "Heu comentat",
+    "%1$s commented" : "%1$s ha comentat",
+    "{author} commented" : "{author} ha comentat",
+    "You commented on %1$s" : "Heu comentat a %1$s",
+    "You commented on {file}" : "Heu comentat a {file}",
+    "%1$s commented on %2$s" : "%1$s ha comentat a %2$s",
+    "{author} commented on {file}" : "{author} ha comentat a {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentaris</strong> per arxius",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuari (ara) esborrat us ha nomenat en un comentari a “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuari (ara) esborrat us ha nomenat en un comentari de “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s us ha nomenat en un comentari a “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} us ha nomenat en un comentari de “{file}”",
+    "Type in a new comment..." : "Escriviu un nou comentari...",
+    "No other comments available" : "No hi ha altres comentaris disponibles",
+    "More comments..." : "Més comentaris...",
+    "{count} unread comments" : "{count} comentaris no llegits",
+    "You commented on %2$s" : "Heu comentat a %2$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,21 +1,39 @@
 OC.L10N.register(
    "comments",
    {
-    "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
-    "%1$s commented" : "%1$s okomentován",
-    "%1$s commented on %2$s" : "%1$s okomentoval %2$s",
    "Comments" : "Komentáře",
-    "Type in a new comment..." : "Zadat nový komentář...",
+    "Unknown user" : "Neznámý uživatel",
+    "New comment …" : "Nový komentář ...",
    "Delete comment" : "Smazat komentář",
    "Post" : "Zveřejnit",
    "Cancel" : "Zrušit",
    "Edit comment" : "Upravit komentář",
    "[Deleted user]" : "[Smazaný uživatel]",
-    "No other comments available" : "Nejsou dostupné žádné další komentáře",
-    "More comments..." : "Více komentářů...",
+    "No comments yet, start the conversation!" : "Zatím bez komentářů, začněte konverzaci!",
+    "More comments …" : "Více komentářů ...",
    "Save" : "Uložit",
    "Allowed characters {count} of {max}" : "Povolených znaků {count} z {max}",
+    "Error occurred while retrieving comment with id {id}" : "Došlo k chybě při načítání komentáře s id {id}",
+    "Error occurred while updating comment with id {id}" : "Došlo k chybě při aktualizování komentáře s id {id}",
+    "Error occurred while posting comment" : "Došlo k chybě při zveřejňování komentáře",
+    "_%n unread comment_::_%n unread comments_" : ["%n nepřečtený komentář","%n nepřečtené komentáře","%n nepřečtených komentářů"],
+    "Comment" : "Komentář",
+    "You commented" : "Okomentoval(a) jsi",
+    "%1$s commented" : "%1$s okomentován",
+    "{author} commented" : "{author} okomentoval(a)",
+    "You commented on %1$s" : "Okomentoval(a) jste %1$s",
+    "You commented on {file}" : "Okomentoval(a) jste {file}",
+    "%1$s commented on %2$s" : "%1$s okomentoval %2$s",
+    "{author} commented on {file}" : "{author} okomentoval(a) {file}",
+    "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní již smazaný uživatel vás zmínil v komentáři u \"{file}\"",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s",
+    "{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil v komentáři u “{file}”",
+    "Type in a new comment..." : "Zadat nový komentář...",
+    "No other comments available" : "Nejsou dostupné žádné další komentáře",
+    "More comments..." : "Více komentářů...",
    "{count} unread comments" : "{count} nepřečtených komentářů",
-    "Comment" : "Komentář"
+    "You commented on %2$s" : "Okomentoval(a) jsi %2$s"
 },
 "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
@@ -1,19 +1,37 @@
 { "translations": {
-    "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
-    "%1$s commented" : "%1$s okomentován",
-    "%1$s commented on %2$s" : "%1$s okomentoval %2$s",
    "Comments" : "Komentáře",
-    "Type in a new comment..." : "Zadat nový komentář...",
+    "Unknown user" : "Neznámý uživatel",
+    "New comment …" : "Nový komentář ...",
    "Delete comment" : "Smazat komentář",
    "Post" : "Zveřejnit",
    "Cancel" : "Zrušit",
    "Edit comment" : "Upravit komentář",
    "[Deleted user]" : "[Smazaný uživatel]",
-    "No other comments available" : "Nejsou dostupné žádné další komentáře",
-    "More comments..." : "Více komentářů...",
+    "No comments yet, start the conversation!" : "Zatím bez komentářů, začněte konverzaci!",
+    "More comments …" : "Více komentářů ...",
    "Save" : "Uložit",
    "Allowed characters {count} of {max}" : "Povolených znaků {count} z {max}",
+    "Error occurred while retrieving comment with id {id}" : "Došlo k chybě při načítání komentáře s id {id}",
+    "Error occurred while updating comment with id {id}" : "Došlo k chybě při aktualizování komentáře s id {id}",
+    "Error occurred while posting comment" : "Došlo k chybě při zveřejňování komentáře",
+    "_%n unread comment_::_%n unread comments_" : ["%n nepřečtený komentář","%n nepřečtené komentáře","%n nepřečtených komentářů"],
+    "Comment" : "Komentář",
+    "You commented" : "Okomentoval(a) jsi",
+    "%1$s commented" : "%1$s okomentován",
+    "{author} commented" : "{author} okomentoval(a)",
+    "You commented on %1$s" : "Okomentoval(a) jste %1$s",
+    "You commented on {file}" : "Okomentoval(a) jste {file}",
+    "%1$s commented on %2$s" : "%1$s okomentoval %2$s",
+    "{author} commented on {file}" : "{author} okomentoval(a) {file}",
+    "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní již smazaný uživatel vás zmínil v komentáři u \"{file}\"",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s",
+    "{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil v komentáři u “{file}”",
+    "Type in a new comment..." : "Zadat nový komentář...",
+    "No other comments available" : "Nejsou dostupné žádné další komentáře",
+    "More comments..." : "Více komentářů...",
    "{count} unread comments" : "{count} nepřečtených komentářů",
-    "Comment" : "Komentář"
+    "You commented on %2$s" : "Okomentoval(a) jsi %2$s"
 },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
 }
@@ -1,8 +1,25 @@
 OC.L10N.register(
    "comments",
    {
+    "Delete comment" : "Slet kommentar",
+    "Post" : "Indlæg",
    "Cancel" : "Annullér",
+    "Edit comment" : "Rediger kommentar",
+    "[Deleted user]" : "[Deleted user]",
+    "Comments" : "Kommentarer",
    "Save" : "Gem",
-    "Comment" : "Kommentér"
+    "Allowed characters {count} of {max}" : "Tilladte tegn {count} af {max}",
+    "Error occurred while retrieving comment with id {id}" : "Der opstod fejl under hentning af kommentar med id {id}",
+    "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",
+    "Comment" : "Kommentér",
+    "You commented" : "Du kommenterede",
+    "%1$s commented" : "%1$s kommenterede",
+    "You commented on %2$s" : "Du kommenterede %2$s",
+    "%1$s commented on %2$s" : "%1$s kommenterede %2$s",
+    "Type in a new comment..." : "Indtast en ny kommentar...",
+    "No other comments available" : "Ingen andre kommentarer tilgængelige",
+    "More comments..." : "Flere kommentarer...",
+    "{count} unread comments" : "{count} ulæste kommentarer"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,6 +1,23 @@
 { "translations": {
+    "Delete comment" : "Slet kommentar",
+    "Post" : "Indlæg",
    "Cancel" : "Annullér",
+    "Edit comment" : "Rediger kommentar",
+    "[Deleted user]" : "[Deleted user]",
+    "Comments" : "Kommentarer",
    "Save" : "Gem",
-    "Comment" : "Kommentér"
+    "Allowed characters {count} of {max}" : "Tilladte tegn {count} af {max}",
+    "Error occurred while retrieving comment with id {id}" : "Der opstod fejl under hentning af kommentar med id {id}",
+    "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",
+    "Comment" : "Kommentér",
+    "You commented" : "Du kommenterede",
+    "%1$s commented" : "%1$s kommenterede",
+    "You commented on %2$s" : "Du kommenterede %2$s",
+    "%1$s commented on %2$s" : "%1$s kommenterede %2$s",
+    "Type in a new comment..." : "Indtast en ny kommentar...",
+    "No other comments available" : "Ingen andre kommentarer tilgængelige",
+    "More comments..." : "Flere kommentarer...",
+    "{count} unread comments" : "{count} ulæste kommentarer"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,21 +1,39 @@
 OC.L10N.register(
    "comments",
    {
-    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
-    "%1$s commented" : "%1$s kommentiert",
-    "%1$s commented on %2$s" : "%1$s kommentiert %2$s",
    "Comments" : "Kommentare",
-    "Type in a new comment..." : "Gebe bitte einen neuen Kommentar ein...",
+    "Unknown user" : "Unbekannter Benutzer",
+    "New comment …" : "Neuer Kommentar ...",
    "Delete comment" : "Kommentar löschen",
    "Post" : "Speichern",
    "Cancel" : "Abbrechen",
    "Edit comment" : "Kommentar bearbeiten",
    "[Deleted user]" : "[Gelöschter Benutzer]",
-    "No other comments available" : "Keine andere Kommentare vorhanden",
-    "More comments..." : "Weitere Kommentare...",
+    "No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginne die Diskussion!",
+    "More comments …" : "Weitere Kommentare ...",
    "Save" : "Speichern",
    "Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}",
+    "Error occurred while retrieving comment with id {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
+    "Error occurred while updating comment with id {id}" : "Es ist ein Fehler beim Aktualisieren des Kommentars mit der ID {id} aufgetreten",
+    "Error occurred while posting comment" : "Es ist ein Fehler beim Veröffentlichen des Kommentars aufgetreten",
+    "_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
+    "Comment" : "Kommentar",
+    "You commented" : "Von Dir kommentiert",
+    "%1$s commented" : "%1$s kommentiert",
+    "{author} commented" : "{author} kommentiert",
+    "You commented on %1$s" : "Du hast %1$s kommentiert",
+    "You commented on {file}" : "Du hast {file} kommentiert",
+    "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
+    "{author} commented on {file}" : "{author} hat {file} kommentiert",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Nutzer erwähnt dich in einem Kommentar zu \"%s\"",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Nutzer erwähnt dich in einem Kommentar zu “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s erwähnt Dich in einem Kommentar zu “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} erwähnt Dich in einem Kommentar zu “{file}”",
+    "Type in a new comment..." : "Neuen Kommentar eingeben...",
+    "No other comments available" : "Keine weiteren Kommentare vorhanden",
+    "More comments..." : "Weitere Kommentare...",
    "{count} unread comments" : "{count} ungelesene Kommentare",
-    "Comment" : "Kommentar"
+    "You commented on %2$s" : "Du hast %2$s kommentiert"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,19 +1,37 @@
 { "translations": {
-    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
-    "%1$s commented" : "%1$s kommentiert",
-    "%1$s commented on %2$s" : "%1$s kommentiert %2$s",
    "Comments" : "Kommentare",
-    "Type in a new comment..." : "Gebe bitte einen neuen Kommentar ein...",
+    "Unknown user" : "Unbekannter Benutzer",
+    "New comment …" : "Neuer Kommentar ...",
    "Delete comment" : "Kommentar löschen",
    "Post" : "Speichern",
    "Cancel" : "Abbrechen",
    "Edit comment" : "Kommentar bearbeiten",
    "[Deleted user]" : "[Gelöschter Benutzer]",
-    "No other comments available" : "Keine andere Kommentare vorhanden",
-    "More comments..." : "Weitere Kommentare...",
+    "No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginne die Diskussion!",
+    "More comments …" : "Weitere Kommentare ...",
    "Save" : "Speichern",
    "Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}",
+    "Error occurred while retrieving comment with id {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
+    "Error occurred while updating comment with id {id}" : "Es ist ein Fehler beim Aktualisieren des Kommentars mit der ID {id} aufgetreten",
+    "Error occurred while posting comment" : "Es ist ein Fehler beim Veröffentlichen des Kommentars aufgetreten",
+    "_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
+    "Comment" : "Kommentar",
+    "You commented" : "Von Dir kommentiert",
+    "%1$s commented" : "%1$s kommentiert",
+    "{author} commented" : "{author} kommentiert",
+    "You commented on %1$s" : "Du hast %1$s kommentiert",
+    "You commented on {file}" : "Du hast {file} kommentiert",
+    "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
+    "{author} commented on {file}" : "{author} hat {file} kommentiert",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Nutzer erwähnt dich in einem Kommentar zu \"%s\"",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Nutzer erwähnt dich in einem Kommentar zu “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s erwähnt Dich in einem Kommentar zu “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} erwähnt Dich in einem Kommentar zu “{file}”",
+    "Type in a new comment..." : "Neuen Kommentar eingeben...",
+    "No other comments available" : "Keine weiteren Kommentare vorhanden",
+    "More comments..." : "Weitere Kommentare...",
    "{count} unread comments" : "{count} ungelesene Kommentare",
-    "Comment" : "Kommentar"
+    "You commented on %2$s" : "Du hast %2$s kommentiert"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,21 +1,39 @@
 OC.L10N.register(
    "comments",
    {
-    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
-    "%1$s commented" : "%1$s kommentiert",
-    "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
    "Comments" : "Kommentare",
-    "Type in a new comment..." : "Neuer Kommentar...",
+    "Unknown user" : "Unbekannter Benutzer",
+    "New comment …" : "Neuer Kommentar ...",
    "Delete comment" : "Kommentar löschen",
    "Post" : "Speichern",
    "Cancel" : "Abbrechen",
    "Edit comment" : "Kommentar bearbeiten",
    "[Deleted user]" : "[gelöschter Benutzer]",
-    "No other comments available" : "Keine anderen Kommentare verfügbar",
-    "More comments..." : "Weitere Kommentare...",
+    "No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginnen Sie die Diskussion!",
+    "More comments …" : "Weitere Kommentare ...",
    "Save" : "Speichern",
    "Allowed characters {count} of {max}" : "{count} von {max} Zeichen benutzt",
+    "Error occurred while retrieving comment with id {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
+    "Error occurred while updating comment with id {id}" : "Es ist ein Fehler beim Aktualisieren des Kommentars mit der ID {id} aufgetreten",
+    "Error occurred while posting comment" : "Es ist ein Fehler beim Veröffentlichen des Kommentars aufgetreten",
+    "_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
+    "Comment" : "Kommentar",
+    "You commented" : "Sie haben kommentiert",
+    "%1$s commented" : "%1$s kommentierte",
+    "{author} commented" : "{author} kommentierte",
+    "You commented on %1$s" : "Sie haben %1$s kommentiert",
+    "You commented on {file}" : "Sie haben {file} kommentiert",
+    "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
+    "{author} commented on {file}" : "{author} hat {file} kommentiert",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Benutzer hat Sie in einem Kommentar zu \"%s\" erwähnt",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Benutzer hat Sie in einem Kommentar zu “{file}” erwähnt",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Sie in einem Kommentar zu “%2$s” erwähnt.",
+    "{user} mentioned you in a comment on “{file}”" : "{user} hat Sie in einem Kommentar zu “{file}” erwähnt",
+    "Type in a new comment..." : "Neuen Kommentar eingeben...",
+    "No other comments available" : "Keine weiteren Kommentare verfügbar",
+    "More comments..." : "Weitere Kommentare...",
    "{count} unread comments" : "[count] ungelesene Kommentare",
-    "Comment" : "Kommentar"
+    "You commented on %2$s" : "Sie haben %2$s kommentiert"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,19 +1,37 @@
 { "translations": {
-    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
-    "%1$s commented" : "%1$s kommentiert",
-    "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
    "Comments" : "Kommentare",
-    "Type in a new comment..." : "Neuer Kommentar...",
+    "Unknown user" : "Unbekannter Benutzer",
+    "New comment …" : "Neuer Kommentar ...",
    "Delete comment" : "Kommentar löschen",
    "Post" : "Speichern",
    "Cancel" : "Abbrechen",
    "Edit comment" : "Kommentar bearbeiten",
    "[Deleted user]" : "[gelöschter Benutzer]",
-    "No other comments available" : "Keine anderen Kommentare verfügbar",
-    "More comments..." : "Weitere Kommentare...",
+    "No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginnen Sie die Diskussion!",
+    "More comments …" : "Weitere Kommentare ...",
    "Save" : "Speichern",
    "Allowed characters {count} of {max}" : "{count} von {max} Zeichen benutzt",
+    "Error occurred while retrieving comment with id {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
+    "Error occurred while updating comment with id {id}" : "Es ist ein Fehler beim Aktualisieren des Kommentars mit der ID {id} aufgetreten",
+    "Error occurred while posting comment" : "Es ist ein Fehler beim Veröffentlichen des Kommentars aufgetreten",
+    "_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
+    "Comment" : "Kommentar",
+    "You commented" : "Sie haben kommentiert",
+    "%1$s commented" : "%1$s kommentierte",
+    "{author} commented" : "{author} kommentierte",
+    "You commented on %1$s" : "Sie haben %1$s kommentiert",
+    "You commented on {file}" : "Sie haben {file} kommentiert",
+    "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
+    "{author} commented on {file}" : "{author} hat {file} kommentiert",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Benutzer hat Sie in einem Kommentar zu \"%s\" erwähnt",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Benutzer hat Sie in einem Kommentar zu “{file}” erwähnt",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Sie in einem Kommentar zu “%2$s” erwähnt.",
+    "{user} mentioned you in a comment on “{file}”" : "{user} hat Sie in einem Kommentar zu “{file}” erwähnt",
+    "Type in a new comment..." : "Neuen Kommentar eingeben...",
+    "No other comments available" : "Keine weiteren Kommentare verfügbar",
+    "More comments..." : "Weitere Kommentare...",
    "{count} unread comments" : "[count] ungelesene Kommentare",
-    "Comment" : "Kommentar"
+    "You commented on %2$s" : "Sie haben %2$s kommentiert"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -2,12 +2,30 @@ OC.L10N.register(
    "comments",
    {
    "Comments" : "Σχόλια",
-    "Type in a new comment..." : "Αυτό είναι ένα νέο σχόλιο...",
+    "Unknown user" : "Άγνωστος χρήστης",
+    "New comment …" : "Νέο σχόλιο ...",
    "Delete comment" : "Διαγραφή σχολίου",
+    "Post" : "Δημοσίευση",
    "Cancel" : "Άκυρο",
    "Edit comment" : "Επεξεργασία σχολίου",
-    "More comments..." : "Περισσότερα σχόλια...",
+    "[Deleted user]" : "[Διαγραφή χρήστη]",
+    "No comments yet, start the conversation!" : "Δεν υπάρχουν σχόλια, ξεκινήστε την συζήτηση!",
+    "More comments …" : "Περισσότερα σχόλια ...",
    "Save" : "Αποθήκευση",
-    "Comment" : "Σχόλιο"
+    "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 αδιάβαστα σχόλια"],
+    "Comment" : "Σχόλιο",
+    "You commented" : "Σχολιάσατε",
+    "%1$s commented" : "%1$s σχολίασε",
+    "%1$s commented on %2$s" : "%1$s σχολίασε στο %2$s",
+    "<strong>Comments</strong> for files" : "<strong>Σχόλια</strong> για αρχεία",
+    "Type in a new comment..." : "Αυτό είναι ένα νέο σχόλιο...",
+    "No other comments available" : "Δεν υπάρχουν άλλα διαθέσιμα σχόλια",
+    "More comments..." : "Περισσότερα σχόλια...",
+    "{count} unread comments" : "{count} μη αναγνωσμένα σχόλια",
+    "You commented on %2$s" : "Σχολιάσατε στο %2$s"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,11 +1,29 @@
 { "translations": {
    "Comments" : "Σχόλια",
-    "Type in a new comment..." : "Αυτό είναι ένα νέο σχόλιο...",
+    "Unknown user" : "Άγνωστος χρήστης",
+    "New comment …" : "Νέο σχόλιο ...",
    "Delete comment" : "Διαγραφή σχολίου",
+    "Post" : "Δημοσίευση",
    "Cancel" : "Άκυρο",
    "Edit comment" : "Επεξεργασία σχολίου",
-    "More comments..." : "Περισσότερα σχόλια...",
+    "[Deleted user]" : "[Διαγραφή χρήστη]",
+    "No comments yet, start the conversation!" : "Δεν υπάρχουν σχόλια, ξεκινήστε την συζήτηση!",
+    "More comments …" : "Περισσότερα σχόλια ...",
    "Save" : "Αποθήκευση",
-    "Comment" : "Σχόλιο"
+    "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 αδιάβαστα σχόλια"],
+    "Comment" : "Σχόλιο",
+    "You commented" : "Σχολιάσατε",
+    "%1$s commented" : "%1$s σχολίασε",
+    "%1$s commented on %2$s" : "%1$s σχολίασε στο %2$s",
+    "<strong>Comments</strong> for files" : "<strong>Σχόλια</strong> για αρχεία",
+    "Type in a new comment..." : "Αυτό είναι ένα νέο σχόλιο...",
+    "No other comments available" : "Δεν υπάρχουν άλλα διαθέσιμα σχόλια",
+    "More comments..." : "Περισσότερα σχόλια...",
+    "{count} unread comments" : "{count} μη αναγνωσμένα σχόλια",
+    "You commented on %2$s" : "Σχολιάσατε στο %2$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,21 +1,39 @@
 OC.L10N.register(
    "comments",
    {
-    "<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
-    "%1$s commented" : "%1$s commented",
-    "%1$s commented on %2$s" : "%1$s commented on %2$s",
    "Comments" : "Comments",
-    "Type in a new comment..." : "Type in a new comment...",
+    "Unknown user" : "Unknown user",
+    "New comment …" : "New comment …",
    "Delete comment" : "Delete comment",
    "Post" : "Post",
    "Cancel" : "Cancel",
    "Edit comment" : "Edit comment",
    "[Deleted user]" : "[Deleted user]",
+    "No comments yet, start the conversation!" : "No comments yet, start the conversation!",
+    "More comments …" : "More comments …",
+    "Save" : "Save",
+    "Allowed characters {count} of {max}" : "Allowed characters: {count} of {max}",
+    "Error occurred while retrieving comment with id {id}" : "Error occurred while retrieving comment with id {id}",
+    "Error occurred while updating comment with id {id}" : "Error occurred while updating comment with id {id}",
+    "Error occurred while posting comment" : "Error occurred while posting comment",
+    "_%n unread comment_::_%n unread comments_" : ["%n unread comment","%n unread comments"],
+    "Comment" : "Comment",
+    "You commented" : "You commented",
+    "%1$s commented" : "%1$s commented",
+    "{author} commented" : "{author} commented",
+    "You commented on %1$s" : "You commented on %1$s",
+    "You commented on {file}" : "You commented on {file}",
+    "%1$s commented on %2$s" : "%1$s commented on %2$s",
+    "{author} commented on {file}" : "{author} commented on {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "A (now) deleted user mentioned you in a comment on “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mentioned you in a comment on “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} mentioned you in a comment on “{file}”",
+    "Type in a new comment..." : "Type a new comment...",
    "No other comments available" : "No other comments available",
    "More comments..." : "More comments...",
-    "Save" : "Save",
-    "Allowed characters {count} of {max}" : "Allowed characters {count} of {max}",
    "{count} unread comments" : "{count} unread comments",
-    "Comment" : "Comment"
+    "You commented on %2$s" : "You commented on %2$s"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,19 +1,37 @@
 { "translations": {
-    "<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
-    "%1$s commented" : "%1$s commented",
-    "%1$s commented on %2$s" : "%1$s commented on %2$s",
    "Comments" : "Comments",
-    "Type in a new comment..." : "Type in a new comment...",
+    "Unknown user" : "Unknown user",
+    "New comment …" : "New comment …",
    "Delete comment" : "Delete comment",
    "Post" : "Post",
    "Cancel" : "Cancel",
    "Edit comment" : "Edit comment",
    "[Deleted user]" : "[Deleted user]",
+    "No comments yet, start the conversation!" : "No comments yet, start the conversation!",
+    "More comments …" : "More comments …",
+    "Save" : "Save",
+    "Allowed characters {count} of {max}" : "Allowed characters: {count} of {max}",
+    "Error occurred while retrieving comment with id {id}" : "Error occurred while retrieving comment with id {id}",
+    "Error occurred while updating comment with id {id}" : "Error occurred while updating comment with id {id}",
+    "Error occurred while posting comment" : "Error occurred while posting comment",
+    "_%n unread comment_::_%n unread comments_" : ["%n unread comment","%n unread comments"],
+    "Comment" : "Comment",
+    "You commented" : "You commented",
+    "%1$s commented" : "%1$s commented",
+    "{author} commented" : "{author} commented",
+    "You commented on %1$s" : "You commented on %1$s",
+    "You commented on {file}" : "You commented on {file}",
+    "%1$s commented on %2$s" : "%1$s commented on %2$s",
+    "{author} commented on {file}" : "{author} commented on {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "A (now) deleted user mentioned you in a comment on “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mentioned you in a comment on “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} mentioned you in a comment on “{file}”",
+    "Type in a new comment..." : "Type a new comment...",
    "No other comments available" : "No other comments available",
    "More comments..." : "More comments...",
-    "Save" : "Save",
-    "Allowed characters {count} of {max}" : "Allowed characters {count} of {max}",
    "{count} unread comments" : "{count} unread comments",
-    "Comment" : "Comment"
+    "You commented on %2$s" : "You commented on %2$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,21 +1,20 @@
 OC.L10N.register(
    "comments",
    {
-    "<strong>Comments</strong> for files" : "<strong>Komentoj</strong> por dosieroj",
-    "%1$s commented" : "%1$s komentis",
-    "%1$s commented on %2$s" : "%1$s komentis %2$s",
-    "Comments" : "Komentoj",
    "Type in a new comment..." : "Tajpu novan komenton...",
    "Delete comment" : "Forigi komenton",
    "Post" : "Afiŝi",
    "Cancel" : "Nuligi",
    "Edit comment" : "Redakti komenton",
    "[Deleted user]" : "[Forigita uzanto]",
+    "Comments" : "Komentoj",
    "No other comments available" : "Neniu alia komento disponeblas",
    "More comments..." : "Pli da komentoj...",
    "Save" : "Konservi",
    "Allowed characters {count} of {max}" : "Permesataj karakteroj: {count} el {max}",
    "{count} unread comments" : "{count} nelegitaj komentoj",
-    "Comment" : "Komento"
+    "Comment" : "Komento",
+    "%1$s commented" : "%1$s komentis",
+    "%1$s commented on %2$s" : "%1$s komentis %2$s"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,19 +1,18 @@
 { "translations": {
-    "<strong>Comments</strong> for files" : "<strong>Komentoj</strong> por dosieroj",
-    "%1$s commented" : "%1$s komentis",
-    "%1$s commented on %2$s" : "%1$s komentis %2$s",
-    "Comments" : "Komentoj",
    "Type in a new comment..." : "Tajpu novan komenton...",
    "Delete comment" : "Forigi komenton",
    "Post" : "Afiŝi",
    "Cancel" : "Nuligi",
    "Edit comment" : "Redakti komenton",
    "[Deleted user]" : "[Forigita uzanto]",
+    "Comments" : "Komentoj",
    "No other comments available" : "Neniu alia komento disponeblas",
    "More comments..." : "Pli da komentoj...",
    "Save" : "Konservi",
    "Allowed characters {count} of {max}" : "Permesataj karakteroj: {count} el {max}",
    "{count} unread comments" : "{count} nelegitaj komentoj",
-    "Comment" : "Komento"
+    "Comment" : "Komento",
+    "%1$s commented" : "%1$s komentis",
+    "%1$s commented on %2$s" : "%1$s komentis %2$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,21 +1,39 @@
 OC.L10N.register(
    "comments",
    {
-    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos",
-    "%1$s commented" : "%1$s comentados",
-    "%1$s commented on %2$s" : "%1$s comentados en %2$s",
    "Comments" : "Comentarios",
-    "Type in a new comment..." : "Ingrese un nuevo comentario...",
+    "Unknown user" : "Usuario desconocido",
+    "New comment …" : "Comentario nuevo",
    "Delete comment" : "Borrar comentario",
    "Post" : "Publicar",
    "Cancel" : "Cancelar",
    "Edit comment" : "Editar comentario",
    "[Deleted user]" : "[Usuario eliminado]",
-    "No other comments available" : "No hay otros comentarios disponibles",
-    "More comments..." : "Más comentarios...",
+    "No comments yet, start the conversation!" : "¡No hay comentarios, empieza la conversación!",
+    "More comments …" : "Más comentarios ...",
    "Save" : "Guardar",
    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while retrieving comment with id {id}" : "Se ha producido un error al recuperar el comentario con ID {id}",
+    "Error occurred while updating comment with id {id}" : "Se ha producido un error al actualizar el comentario con ID {id}",
+    "Error occurred while posting comment" : "Se ha producido un error al enviar el comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentario sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentario",
+    "You commented" : "Has comentado",
+    "%1$s commented" : "%1$s comentados",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Has comentado en %1$s",
+    "You commented on {file}" : "Usted comentó Has comentado en  {file}",
+    "%1$s commented on %2$s" : "%1$s comentados en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> para archivos",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) eliminado, te mencionó en un comentario en “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) eliminado, te mencionó en un comentario en “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
+    "Type in a new comment..." : "Escribe un nuevo comentario...",
+    "No other comments available" : "No hay otros comentarios disponibles",
+    "More comments..." : "Más comentarios...",
    "{count} unread comments" : "{count} comentarios no leídos",
-    "Comment" : "Comentario"
+    "You commented on %2$s" : "Has comentado en %2$s"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,19 +1,37 @@
 { "translations": {
-    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos",
-    "%1$s commented" : "%1$s comentados",
-    "%1$s commented on %2$s" : "%1$s comentados en %2$s",
    "Comments" : "Comentarios",
-    "Type in a new comment..." : "Ingrese un nuevo comentario...",
+    "Unknown user" : "Usuario desconocido",
+    "New comment …" : "Comentario nuevo",
    "Delete comment" : "Borrar comentario",
    "Post" : "Publicar",
    "Cancel" : "Cancelar",
    "Edit comment" : "Editar comentario",
    "[Deleted user]" : "[Usuario eliminado]",
-    "No other comments available" : "No hay otros comentarios disponibles",
-    "More comments..." : "Más comentarios...",
+    "No comments yet, start the conversation!" : "¡No hay comentarios, empieza la conversación!",
+    "More comments …" : "Más comentarios ...",
    "Save" : "Guardar",
    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while retrieving comment with id {id}" : "Se ha producido un error al recuperar el comentario con ID {id}",
+    "Error occurred while updating comment with id {id}" : "Se ha producido un error al actualizar el comentario con ID {id}",
+    "Error occurred while posting comment" : "Se ha producido un error al enviar el comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentario sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentario",
+    "You commented" : "Has comentado",
+    "%1$s commented" : "%1$s comentados",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Has comentado en %1$s",
+    "You commented on {file}" : "Usted comentó Has comentado en  {file}",
+    "%1$s commented on %2$s" : "%1$s comentados en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> para archivos",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) eliminado, te mencionó en un comentario en “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) eliminado, te mencionó en un comentario en “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
+    "Type in a new comment..." : "Escribe un nuevo comentario...",
+    "No other comments available" : "No hay otros comentarios disponibles",
+    "More comments..." : "Más comentarios...",
    "{count} unread comments" : "{count} comentarios no leídos",
-    "Comment" : "Comentario"
+    "You commented on %2$s" : "Has comentado en %2$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -0,0 +1,25 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Delete comment" : "Eliminar comentario",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "Edit comment" : "Modificar comentario",
+    "[Deleted user]" : "[Usuario eliminado]",
+    "Comments" : "Comentarios",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while retrieving comment with id {id}" : "Se produjo error al recuperar comentario con id {id}",
+    "Error occurred while updating comment with id {id}" : "Se produjo error al actualizar comentario con id {id}",
+    "Error occurred while posting comment" : "Se produjo error al publicar comentario",
+    "Comment" : "Comentario",
+    "You commented" : "Has comentado",
+    "%1$s commented" : "%1$s comentado",
+    "You commented on %2$s" : "Has comentado en %2$s",
+    "%1$s commented on %2$s" : "%1$s comentado en %2$s",
+    "Type in a new comment..." : "Escribir un nuevo comentario",
+    "No other comments available" : "No hay mas comentarios",
+    "More comments..." : "Mas comentarios...",
+    "{count} unread comments" : "{count} comentarios no leídos"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,23 @@
+{ "translations": {
+    "Delete comment" : "Eliminar comentario",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "Edit comment" : "Modificar comentario",
+    "[Deleted user]" : "[Usuario eliminado]",
+    "Comments" : "Comentarios",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while retrieving comment with id {id}" : "Se produjo error al recuperar comentario con id {id}",
+    "Error occurred while updating comment with id {id}" : "Se produjo error al actualizar comentario con id {id}",
+    "Error occurred while posting comment" : "Se produjo error al publicar comentario",
+    "Comment" : "Comentario",
+    "You commented" : "Has comentado",
+    "%1$s commented" : "%1$s comentado",
+    "You commented on %2$s" : "Has comentado en %2$s",
+    "%1$s commented on %2$s" : "%1$s comentado en %2$s",
+    "Type in a new comment..." : "Escribir un nuevo comentario",
+    "No other comments available" : "No hay mas comentarios",
+    "More comments..." : "Mas comentarios...",
+    "{count} unread comments" : "{count} comentarios no leídos"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -1,19 +1,22 @@
 OC.L10N.register(
    "comments",
    {
-    "%1$s commented on %2$s" : "%1$s kommenteeris %2$s",
-    "Comments" : "Kommentaarid",
    "Type in a new comment..." : "Kirjuta uus komentaar...",
    "Delete comment" : "Kustuta kommentaar",
    "Post" : "Postita",
    "Cancel" : "Loobu",
    "Edit comment" : "Muuda kommentaari",
    "[Deleted user]" : "[Kustutatud kasutaja]",
+    "Comments" : "Kommentaarid",
    "No other comments available" : "Ühtegi teist kommentaari pole saadaval",
    "More comments..." : "Veel kommentaare...",
    "Save" : "Salvesta",
    "Allowed characters {count} of {max}" : "Lubatud märkide arv {count}/{max}",
    "{count} unread comments" : "{count} lugemata kommentaari",
-    "Comment" : "Kommentaar"
+    "Comment" : "Kommentaar",
+    "You commented" : "Sa kommenteerisid",
+    "%1$s commented" : "%1$s kommenteeris",
+    "You commented on %2$s" : "Sa kommenteerisid %2$s",
+    "%1$s commented on %2$s" : "%1$s kommenteeris %2$s"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,17 +1,20 @@
 { "translations": {
-    "%1$s commented on %2$s" : "%1$s kommenteeris %2$s",
-    "Comments" : "Kommentaarid",
    "Type in a new comment..." : "Kirjuta uus komentaar...",
    "Delete comment" : "Kustuta kommentaar",
    "Post" : "Postita",
    "Cancel" : "Loobu",
    "Edit comment" : "Muuda kommentaari",
    "[Deleted user]" : "[Kustutatud kasutaja]",
+    "Comments" : "Kommentaarid",
    "No other comments available" : "Ühtegi teist kommentaari pole saadaval",
    "More comments..." : "Veel kommentaare...",
    "Save" : "Salvesta",
    "Allowed characters {count} of {max}" : "Lubatud märkide arv {count}/{max}",
    "{count} unread comments" : "{count} lugemata kommentaari",
-    "Comment" : "Kommentaar"
+    "Comment" : "Kommentaar",
+    "You commented" : "Sa kommenteerisid",
+    "%1$s commented" : "%1$s kommenteeris",
+    "You commented on %2$s" : "Sa kommenteerisid %2$s",
+    "%1$s commented on %2$s" : "%1$s kommenteeris %2$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,21 +1,30 @@
 OC.L10N.register(
    "comments",
    {
-    "<strong>Comments</strong> for files" : "<strong>Kommentit</strong> tiedostoille",
-    "%1$s commented" : "%1$s kommentoi",
-    "%1$s commented on %2$s" : "%1$s kommentoi kohdetta %2$s",
    "Comments" : "Kommentit",
-    "Type in a new comment..." : "Kirjoita uusi kommentti...",
+    "New comment …" : "Uusi kommentti …",
    "Delete comment" : "Poista kommentti",
    "Post" : "Lähetä",
    "Cancel" : "Peruuta",
    "Edit comment" : "Muokkaa kommenttia",
    "[Deleted user]" : "[Poistettu käyttäjä]",
-    "No other comments available" : "Ei muita kommentteja saatavilla",
-    "More comments..." : "Lisää kommentteja...",
+    "No comments yet, start the conversation!" : "Ei kommentteja vielä. Aloita keskustelu!",
+    "More comments …" : "Lisää kommentteja …",
    "Save" : "Tallenna",
    "Allowed characters {count} of {max}" : "Sallittujen merkkien määrä {count}/{max}",
+    "Error occurred while retrieving comment with id {id}" : "Virhe noutaessa kommenttia tunnisteella {id}",
+    "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"],
+    "Comment" : "Kommentti",
+    "You commented" : "Kommentoit",
+    "%1$s commented" : "%1$s kommentoi",
+    "%1$s commented on %2$s" : "%1$s kommentoi kohdetta %2$s",
+    "<strong>Comments</strong> for files" : "Tiedostojen <strong>kommentit</strong>",
+    "Type in a new comment..." : "Kirjoita uusi kommentti...",
+    "No other comments available" : "Ei muita kommentteja saatavilla",
+    "More comments..." : "Lisää kommentteja...",
    "{count} unread comments" : "{count} lukematonta kommenttia",
-    "Comment" : "Kommentti"
+    "You commented on %2$s" : "Kommentoit %2$s"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,19 +1,28 @@
 { "translations": {
-    "<strong>Comments</strong> for files" : "<strong>Kommentit</strong> tiedostoille",
-    "%1$s commented" : "%1$s kommentoi",
-    "%1$s commented on %2$s" : "%1$s kommentoi kohdetta %2$s",
    "Comments" : "Kommentit",
-    "Type in a new comment..." : "Kirjoita uusi kommentti...",
+    "New comment …" : "Uusi kommentti …",
    "Delete comment" : "Poista kommentti",
    "Post" : "Lähetä",
    "Cancel" : "Peruuta",
    "Edit comment" : "Muokkaa kommenttia",
    "[Deleted user]" : "[Poistettu käyttäjä]",
-    "No other comments available" : "Ei muita kommentteja saatavilla",
-    "More comments..." : "Lisää kommentteja...",
+    "No comments yet, start the conversation!" : "Ei kommentteja vielä. Aloita keskustelu!",
+    "More comments …" : "Lisää kommentteja …",
    "Save" : "Tallenna",
    "Allowed characters {count} of {max}" : "Sallittujen merkkien määrä {count}/{max}",
+    "Error occurred while retrieving comment with id {id}" : "Virhe noutaessa kommenttia tunnisteella {id}",
+    "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"],
+    "Comment" : "Kommentti",
+    "You commented" : "Kommentoit",
+    "%1$s commented" : "%1$s kommentoi",
+    "%1$s commented on %2$s" : "%1$s kommentoi kohdetta %2$s",
+    "<strong>Comments</strong> for files" : "Tiedostojen <strong>kommentit</strong>",
+    "Type in a new comment..." : "Kirjoita uusi kommentti...",
+    "No other comments available" : "Ei muita kommentteja saatavilla",
+    "More comments..." : "Lisää kommentteja...",
    "{count} unread comments" : "{count} lukematonta kommenttia",
-    "Comment" : "Kommentti"
+    "You commented on %2$s" : "Kommentoit %2$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "I-cancel"
+},
+"nplurals=2; plural=(n > 1);");
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Cancel" : "I-cancel"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
@@ -1,21 +1,39 @@
 OC.L10N.register(
    "comments",
    {
-    "<strong>Comments</strong> for files" : "<strong>Commentaires</strong> pour les fichiers",
-    "%1$s commented" : "%1$s a commenté",
-    "%1$s commented on %2$s" : "%1$s a commenté %2$s",
    "Comments" : "Commentaires",
-    "Type in a new comment..." : "Écrire un nouveau commentaire...",
+    "Unknown user" : "Utilisateur inconnu",
+    "New comment …" : "Nouveau commentaire...",
    "Delete comment" : "Supprimer le commentaire",
    "Post" : "Poster",
    "Cancel" : "Annuler",
    "Edit comment" : "Modifier le commentaire",
    "[Deleted user]" : "[Utilisateur supprimé]",
-    "No other comments available" : "Aucun autre commentaire",
-    "More comments..." : "Plus de commentaires...",
+    "No comments yet, start the conversation!" : "Aucun commentaire actuellement, débutez une conversation !",
+    "More comments …" : "Plus de commentaires ...",
    "Save" : "Enregistrer",
    "Allowed characters {count} of {max}" : "{count} sur {max} caractères autorisés",
+    "Error occurred while retrieving comment with id {id}" : "Une erreur est survenue lors de la récupération du commentaire avec l'id {id}",
+    "Error occurred while updating comment with id {id}" : "Une erreur est survenue lors de la mise à jour du commentaire avec l'id {id}",
+    "Error occurred while posting comment" : "Une erreur est survenue lors de l'envoi du commentaire",
+    "_%n unread comment_::_%n unread comments_" : ["%n commentaire non lu","%n commentaires non lus"],
+    "Comment" : "Commenter",
+    "You commented" : "Vous avez commenté",
+    "%1$s commented" : "%1$s a commenté",
+    "{author} commented" : "{author} a commenté",
+    "You commented on %1$s" : "Vous avez commenté %1$s",
+    "You commented on {file}" : "Vous avez commenté sur {file}",
+    "%1$s commented on %2$s" : "%1$s a commenté %2$s",
+    "{author} commented on {file}" : "{author} a commenté sur {file}",
+    "<strong>Comments</strong> for files" : "<strong>Commentaires</strong> pour les fichiers",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Un utilisateur (maintenant supprimé) vous a mentionné dans un commentaire sur “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un utilisateur (maintenant supprimé) vous a mentionné dans un commentaire sur “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s vous a mentionné⋅e dans un commentaire sur “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} vous a mentionné⋅e dans un commentaire sur “{file}”",
+    "Type in a new comment..." : "Écrire un nouveau commentaire...",
+    "No other comments available" : "Aucun autre commentaire",
+    "More comments..." : "Plus de commentaires...",
    "{count} unread comments" : "{count} commentaires non lus",
-    "Comment" : "Commenter"
+    "You commented on %2$s" : "Vous avez commenté %2$s"
 },
 "nplurals=2; plural=(n > 1);");
@@ -1,19 +1,37 @@
 { "translations": {
-    "<strong>Comments</strong> for files" : "<strong>Commentaires</strong> pour les fichiers",
-    "%1$s commented" : "%1$s a commenté",
-    "%1$s commented on %2$s" : "%1$s a commenté %2$s",
    "Comments" : "Commentaires",
-    "Type in a new comment..." : "Écrire un nouveau commentaire...",
+    "Unknown user" : "Utilisateur inconnu",
+    "New comment …" : "Nouveau commentaire...",
    "Delete comment" : "Supprimer le commentaire",
    "Post" : "Poster",
    "Cancel" : "Annuler",
    "Edit comment" : "Modifier le commentaire",
    "[Deleted user]" : "[Utilisateur supprimé]",
-    "No other comments available" : "Aucun autre commentaire",
-    "More comments..." : "Plus de commentaires...",
+    "No comments yet, start the conversation!" : "Aucun commentaire actuellement, débutez une conversation !",
+    "More comments …" : "Plus de commentaires ...",
    "Save" : "Enregistrer",
    "Allowed characters {count} of {max}" : "{count} sur {max} caractères autorisés",
+    "Error occurred while retrieving comment with id {id}" : "Une erreur est survenue lors de la récupération du commentaire avec l'id {id}",
+    "Error occurred while updating comment with id {id}" : "Une erreur est survenue lors de la mise à jour du commentaire avec l'id {id}",
+    "Error occurred while posting comment" : "Une erreur est survenue lors de l'envoi du commentaire",
+    "_%n unread comment_::_%n unread comments_" : ["%n commentaire non lu","%n commentaires non lus"],
+    "Comment" : "Commenter",
+    "You commented" : "Vous avez commenté",
+    "%1$s commented" : "%1$s a commenté",
+    "{author} commented" : "{author} a commenté",
+    "You commented on %1$s" : "Vous avez commenté %1$s",
+    "You commented on {file}" : "Vous avez commenté sur {file}",
+    "%1$s commented on %2$s" : "%1$s a commenté %2$s",
+    "{author} commented on {file}" : "{author} a commenté sur {file}",
+    "<strong>Comments</strong> for files" : "<strong>Commentaires</strong> pour les fichiers",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Un utilisateur (maintenant supprimé) vous a mentionné dans un commentaire sur “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un utilisateur (maintenant supprimé) vous a mentionné dans un commentaire sur “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s vous a mentionné⋅e dans un commentaire sur “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} vous a mentionné⋅e dans un commentaire sur “{file}”",
+    "Type in a new comment..." : "Écrire un nouveau commentaire...",
+    "No other comments available" : "Aucun autre commentaire",
+    "More comments..." : "Plus de commentaires...",
    "{count} unread comments" : "{count} commentaires non lus",
-    "Comment" : "Commenter"
+    "You commented on %2$s" : "Vous avez commenté %2$s"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
@@ -1,21 +1,25 @@
 OC.L10N.register(
    "comments",
    {
-    "<strong>Comments</strong> for files" : "<strong>תגובות</strong> לקבצים",
-    "%1$s commented" : "התקבלו תגובות %1$s",
-    "%1$s commented on %2$s" : "התקבלו תגובות %1$s ב- %2$s ",
-    "Comments" : "תגובות",
-    "Type in a new comment..." : "יש להכניס תגובה חדשה...",
    "Delete comment" : "מחיקת תגובה",
    "Post" : "פרסום",
    "Cancel" : "ביטול",
    "Edit comment" : "עריכת תגובה",
    "[Deleted user]" : "[משתמשים מוסרים]",
-    "No other comments available" : "אין תגובות אחרות זמינות",
-    "More comments..." : "תגובות נוספות...",
+    "Comments" : "תגובות",
    "Save" : "שמירה",
    "Allowed characters {count} of {max}" : "תווים מותרים {count} מתוך {max}",
-    "{count} unread comments" : "{count} תגובות שלא נקראו",
-    "Comment" : "תגובה"
+    "Error occurred while retrieving comment with id {id}" : "שגיאה אירעה כאשר אוחזרה תגובה עם מספר זיהוי {id}",
+    "Error occurred while updating comment with id {id}" : "שגיאה אירעה כאשר עודכנה תגובה עם מספר זיהוי {id}",
+    "Error occurred while posting comment" : "אירעה שגיאה בזמן פרסום תגובה",
+    "Comment" : "תגובה",
+    "You commented" : "הערות שלך",
+    "%1$s commented" : "התקבלו תגובות %1$s",
+    "You commented on %2$s" : "הערות שלך ב- %2$s",
+    "%1$s commented on %2$s" : "התקבלו תגובות %1$s ב- %2$s ",
+    "Type in a new comment..." : "יש להכניס תגובה חדשה...",
+    "No other comments available" : "אין תגובות אחרות זמינות",
+    "More comments..." : "תגובות נוספות...",
+    "{count} unread comments" : "{count} תגובות שלא נקראו"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,19 +1,23 @@
 { "translations": {
-    "<strong>Comments</strong> for files" : "<strong>תגובות</strong> לקבצים",
-    "%1$s commented" : "התקבלו תגובות %1$s",
-    "%1$s commented on %2$s" : "התקבלו תגובות %1$s ב- %2$s ",
-    "Comments" : "תגובות",
-    "Type in a new comment..." : "יש להכניס תגובה חדשה...",
    "Delete comment" : "מחיקת תגובה",
    "Post" : "פרסום",
    "Cancel" : "ביטול",
    "Edit comment" : "עריכת תגובה",
    "[Deleted user]" : "[משתמשים מוסרים]",
-    "No other comments available" : "אין תגובות אחרות זמינות",
-    "More comments..." : "תגובות נוספות...",
+    "Comments" : "תגובות",
    "Save" : "שמירה",
    "Allowed characters {count} of {max}" : "תווים מותרים {count} מתוך {max}",
-    "{count} unread comments" : "{count} תגובות שלא נקראו",
-    "Comment" : "תגובה"
+    "Error occurred while retrieving comment with id {id}" : "שגיאה אירעה כאשר אוחזרה תגובה עם מספר זיהוי {id}",
+    "Error occurred while updating comment with id {id}" : "שגיאה אירעה כאשר עודכנה תגובה עם מספר זיהוי {id}",
+    "Error occurred while posting comment" : "אירעה שגיאה בזמן פרסום תגובה",
+    "Comment" : "תגובה",
+    "You commented" : "הערות שלך",
+    "%1$s commented" : "התקבלו תגובות %1$s",
+    "You commented on %2$s" : "הערות שלך ב- %2$s",
+    "%1$s commented on %2$s" : "התקבלו תגובות %1$s ב- %2$s ",
+    "Type in a new comment..." : "יש להכניס תגובה חדשה...",
+    "No other comments available" : "אין תגובות אחרות זמינות",
+    "More comments..." : "תגובות נוספות...",
+    "{count} unread comments" : "{count} תגובות שלא נקראו"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,8 +1,39 @@
 OC.L10N.register(
    "comments",
    {
+    "Comments" : "Hozzászólások",
+    "Unknown user" : "Ismeretlen felhasználó",
+    "New comment …" : "Új hozzászólás...",
+    "Delete comment" : "Hozzászólás törlése",
+    "Post" : "Küldés",
    "Cancel" : "Mégsem",
+    "Edit comment" : "Hozzászólás szerkesztése",
+    "[Deleted user]" : "[Törölt felhasználó]",
+    "No comments yet, start the conversation!" : "Még nincsenek hozzászólások, kezdd el a beszélgetést!",
+    "More comments …" : "Több hozzászólás...",
    "Save" : "Mentés",
-    "Comment" : "Komment"
+    "Allowed characters {count} of {max}" : "Engedélyezett karakterek: {count} / {max}",
+    "Error occurred while retrieving comment with id {id}" : "Hiba a következő azonosítójú hozzászólás letöltése közben: {id}",
+    "Error occurred while updating comment with id {id}" : "Hiba a következő azonosítójú hozzászólás frissítése közben: {id}",
+    "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"],
+    "Comment" : "Hozzászólás",
+    "You commented" : "Hozzászóltál",
+    "%1$s commented" : "%1$s hozzászólt",
+    "{author} commented" : "{author} hozzászólt",
+    "You commented on %1$s" : "Hozzászoltál ehhez: %1$s",
+    "You commented on {file}" : "Hozzászóltál ehhez: {file}",
+    "%1$s commented on %2$s" : "%1$s hozzászólt ehhez: %2$s",
+    "{author} commented on {file}" : "{author} hozzászólt ehhez: {file}",
+    "<strong>Comments</strong> for files" : "<strong>Hozzászólások</strong> fájlokhoz",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Egy (most) törölt felhasználó megemlített egy hozzászólásban itt: “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Egy (most) törölt felhasználó megemlített egy hozzászólásban itt: “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s megemlített egy hozzászólásban itt: “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} megemlített egy hozzászólásban itt: “{file}”",
+    "Type in a new comment..." : "Új hozzászólás írása...",
+    "No other comments available" : "Nincs több hozzászólás.",
+    "More comments..." : "Több hozzászólás...",
+    "{count} unread comments" : "{count} olvasatlan hozzászólás",
+    "You commented on %2$s" : "Hozzászólt ehhez: %2$s"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,6 +1,37 @@
 { "translations": {
+    "Comments" : "Hozzászólások",
+    "Unknown user" : "Ismeretlen felhasználó",
+    "New comment …" : "Új hozzászólás...",
+    "Delete comment" : "Hozzászólás törlése",
+    "Post" : "Küldés",
    "Cancel" : "Mégsem",
+    "Edit comment" : "Hozzászólás szerkesztése",
+    "[Deleted user]" : "[Törölt felhasználó]",
+    "No comments yet, start the conversation!" : "Még nincsenek hozzászólások, kezdd el a beszélgetést!",
+    "More comments …" : "Több hozzászólás...",
    "Save" : "Mentés",
-    "Comment" : "Komment"
+    "Allowed characters {count} of {max}" : "Engedélyezett karakterek: {count} / {max}",
+    "Error occurred while retrieving comment with id {id}" : "Hiba a következő azonosítójú hozzászólás letöltése közben: {id}",
+    "Error occurred while updating comment with id {id}" : "Hiba a következő azonosítójú hozzászólás frissítése közben: {id}",
+    "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"],
+    "Comment" : "Hozzászólás",
+    "You commented" : "Hozzászóltál",
+    "%1$s commented" : "%1$s hozzászólt",
+    "{author} commented" : "{author} hozzászólt",
+    "You commented on %1$s" : "Hozzászoltál ehhez: %1$s",
+    "You commented on {file}" : "Hozzászóltál ehhez: {file}",
+    "%1$s commented on %2$s" : "%1$s hozzászólt ehhez: %2$s",
+    "{author} commented on {file}" : "{author} hozzászólt ehhez: {file}",
+    "<strong>Comments</strong> for files" : "<strong>Hozzászólások</strong> fájlokhoz",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Egy (most) törölt felhasználó megemlített egy hozzászólásban itt: “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Egy (most) törölt felhasználó megemlített egy hozzászólásban itt: “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s megemlített egy hozzászólásban itt: “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} megemlített egy hozzászólásban itt: “{file}”",
+    "Type in a new comment..." : "Új hozzászólás írása...",
+    "No other comments available" : "Nincs több hozzászólás.",
+    "More comments..." : "Több hozzászólás...",
+    "{count} unread comments" : "{count} olvasatlan hozzászólás",
+    "You commented on %2$s" : "Hozzászólt ehhez: %2$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,7 +1,39 @@
 OC.L10N.register(
    "comments",
    {
+    "Comments" : "Commentarios",
+    "Unknown user" : "Usator incognite",
+    "New comment …" : "Nove commentario ...",
+    "Delete comment" : "Deler commentario",
+    "Post" : "Publicar",
    "Cancel" : "Cancellar",
-    "Save" : "Salveguardar"
+    "Edit comment" : "Modificar commentario",
+    "[Deleted user]" : "[Usator delite]",
+    "No comments yet, start the conversation!" : "Il ha nulle commentarios ancora, initia le conversation!",
+    "More comments …" : "Plus commentarios ...",
+    "Save" : "Salveguardar",
+    "Allowed characters {count} of {max}" : "{count} characteres permittite de {max}",
+    "Error occurred while retrieving comment with id {id}" : "Un error occurreva durante le recuperation del commentario identificate per {id}",
+    "Error occurred while updating comment with id {id}" : "Un error occurreva durante le actualisation del commentario identificate per {id}",
+    "Error occurred while posting comment" : "Un error occurreva durante le publication del commentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n commentario non legite","%n commentarios non legite"],
+    "Comment" : "Commentario",
+    "You commented" : "Tu commentava",
+    "%1$s commented" : "%1$s commentava",
+    "{author} commented" : "{author} commentava",
+    "You commented on %1$s" : "Tu commentava in %1$s",
+    "You commented on {file}" : "Tu commentava in {file}",
+    "%1$s commented on %2$s" : "%1$s commentava in %2$s",
+    "{author} commented on {file}" : "{author} commentava in {file}",
+    "<strong>Comments</strong> for files" : "<strong>Commentarios</strong> pro files",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Un (ora) delite usator mentionava tu in un commentario in “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un (ora) delite usator mentionava tu in un commentario in “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mentionava tu in un commentario in “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} mentionava tu in un commentario in “{file}”",
+    "Type in a new comment..." : "Scribe in un nove commentario...",
+    "No other comments available" : "Nulle altere commentarios disponibile",
+    "More comments..." : "Plus commentarios...",
+    "{count} unread comments" : "{count} commentarios non legite",
+    "You commented on %2$s" : "Tu commentava in %2$s"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,5 +1,37 @@
 { "translations": {
+    "Comments" : "Commentarios",
+    "Unknown user" : "Usator incognite",
+    "New comment …" : "Nove commentario ...",
+    "Delete comment" : "Deler commentario",
+    "Post" : "Publicar",
    "Cancel" : "Cancellar",
-    "Save" : "Salveguardar"
+    "Edit comment" : "Modificar commentario",
+    "[Deleted user]" : "[Usator delite]",
+    "No comments yet, start the conversation!" : "Il ha nulle commentarios ancora, initia le conversation!",
+    "More comments …" : "Plus commentarios ...",
+    "Save" : "Salveguardar",
+    "Allowed characters {count} of {max}" : "{count} characteres permittite de {max}",
+    "Error occurred while retrieving comment with id {id}" : "Un error occurreva durante le recuperation del commentario identificate per {id}",
+    "Error occurred while updating comment with id {id}" : "Un error occurreva durante le actualisation del commentario identificate per {id}",
+    "Error occurred while posting comment" : "Un error occurreva durante le publication del commentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n commentario non legite","%n commentarios non legite"],
+    "Comment" : "Commentario",
+    "You commented" : "Tu commentava",
+    "%1$s commented" : "%1$s commentava",
+    "{author} commented" : "{author} commentava",
+    "You commented on %1$s" : "Tu commentava in %1$s",
+    "You commented on {file}" : "Tu commentava in {file}",
+    "%1$s commented on %2$s" : "%1$s commentava in %2$s",
+    "{author} commented on {file}" : "{author} commentava in {file}",
+    "<strong>Comments</strong> for files" : "<strong>Commentarios</strong> pro files",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Un (ora) delite usator mentionava tu in un commentario in “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un (ora) delite usator mentionava tu in un commentario in “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mentionava tu in un commentario in “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} mentionava tu in un commentario in “{file}”",
+    "Type in a new comment..." : "Scribe in un nove commentario...",
+    "No other comments available" : "Nulle altere commentarios disponibile",
+    "More comments..." : "Plus commentarios...",
+    "{count} unread comments" : "{count} commentarios non legite",
+    "You commented on %2$s" : "Tu commentava in %2$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,21 +1,25 @@
 OC.L10N.register(
    "comments",
    {
-    "<strong>Comments</strong> for files" : "<strong>Komentar</strong> untuk berkas",
-    "%1$s commented" : "%1$s dikomentari",
-    "%1$s commented on %2$s" : "%1$s dikomentari pada %2$s",
-    "Comments" : "Komentar",
-    "Type in a new comment..." : "Ketik di komentar baru...",
    "Delete comment" : "Hapus komentar",
    "Post" : "Posting",
    "Cancel" : "Batal",
    "Edit comment" : "Sunting komentar",
    "[Deleted user]" : "[Hapus pengguna]",
-    "No other comments available" : "Tidak ada komentar lainnya",
-    "More comments..." : "Komentar lainya...",
+    "Comments" : "Komentar",
    "Save" : "Simpan",
    "Allowed characters {count} of {max}" : "Karakter yang diizinkan {count} dari {max}",
-    "{count} unread comments" : "{count} komentar belum dibaca",
-    "Comment" : "Komentar"
+    "Error occurred while retrieving comment with id {id}" : "Terjadi kesalahan saat mendapatkan komentar dengan id {id}",
+    "Error occurred while updating comment with id {id}" : "Terjadi kesalahan saat memperbarui komentar dengan id {id}",
+    "Error occurred while posting comment" : "Terjadi kesalahan saat memosting komentar",
+    "Comment" : "Komentar",
+    "You commented" : "Anda berkomentar",
+    "%1$s commented" : "%1$s dikomentari",
+    "You commented on %2$s" : "Anda berkomentar di %2$s",
+    "%1$s commented on %2$s" : "%1$s dikomentari pada %2$s",
+    "Type in a new comment..." : "Ketik di komentar baru...",
+    "No other comments available" : "Tidak ada komentar lainnya",
+    "More comments..." : "Komentar lainya...",
+    "{count} unread comments" : "{count} komentar belum dibaca"
 },
 "nplurals=1; plural=0;");
@@ -1,19 +1,23 @@
 { "translations": {
-    "<strong>Comments</strong> for files" : "<strong>Komentar</strong> untuk berkas",
-    "%1$s commented" : "%1$s dikomentari",
-    "%1$s commented on %2$s" : "%1$s dikomentari pada %2$s",
-    "Comments" : "Komentar",
-    "Type in a new comment..." : "Ketik di komentar baru...",
    "Delete comment" : "Hapus komentar",
    "Post" : "Posting",
    "Cancel" : "Batal",
    "Edit comment" : "Sunting komentar",
    "[Deleted user]" : "[Hapus pengguna]",
-    "No other comments available" : "Tidak ada komentar lainnya",
-    "More comments..." : "Komentar lainya...",
+    "Comments" : "Komentar",
    "Save" : "Simpan",
    "Allowed characters {count} of {max}" : "Karakter yang diizinkan {count} dari {max}",
-    "{count} unread comments" : "{count} komentar belum dibaca",
-    "Comment" : "Komentar"
+    "Error occurred while retrieving comment with id {id}" : "Terjadi kesalahan saat mendapatkan komentar dengan id {id}",
+    "Error occurred while updating comment with id {id}" : "Terjadi kesalahan saat memperbarui komentar dengan id {id}",
+    "Error occurred while posting comment" : "Terjadi kesalahan saat memosting komentar",
+    "Comment" : "Komentar",
+    "You commented" : "Anda berkomentar",
+    "%1$s commented" : "%1$s dikomentari",
+    "You commented on %2$s" : "Anda berkomentar di %2$s",
+    "%1$s commented on %2$s" : "%1$s dikomentari pada %2$s",
+    "Type in a new comment..." : "Ketik di komentar baru...",
+    "No other comments available" : "Tidak ada komentar lainnya",
+    "More comments..." : "Komentar lainya...",
+    "{count} unread comments" : "{count} komentar belum dibaca"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
@@ -1,8 +1,39 @@
 OC.L10N.register(
    "comments",
    {
+    "Comments" : "Athugasemdir",
+    "Unknown user" : "Óþekktur notandi",
+    "New comment …" : "Ný athugasemd ...",
+    "Delete comment" : "Eyða athugasemd",
+    "Post" : "Senda",
    "Cancel" : "Hætta við",
+    "Edit comment" : "Breyta athugasemd",
+    "[Deleted user]" : "[Eyddur notandi]",
+    "No comments yet, start the conversation!" : "Engar athugasemdir ennþá, byrjaðu umræðuna!",
+    "More comments …" : "Fleiri athugasemdir ...",
    "Save" : "Vista",
-    "Comment" : "Athugasemd"
+    "Allowed characters {count} of {max}" : "Leyfður stafafjöldi {count} af {max}",
+    "Error occurred while retrieving comment with id {id}" : "Villa kom upp við að reyna að ná í athugasemd með auðkenninu {id}",
+    "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"],
+    "Comment" : "Athugasemd",
+    "You commented" : "Þú settir inn athugasemd",
+    "%1$s commented" : "%1$s setti inn athugasemd",
+    "{author} commented" : "{author} setti inn athugasemd",
+    "You commented on %1$s" : "Þú settir inn athugasemd við %1$s",
+    "You commented on {file}" : "Þú settir inn athugasemd við {file}",
+    "%1$s commented on %2$s" : "%1$s setti inn athugasemd um %2$s",
+    "{author} commented on {file}" : "{author} setti inn athugasemd við {file}",
+    "<strong>Comments</strong> for files" : "<strong>Athugasemdir</strong> við skrár",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Notandi (sem nú er búið að eyða) minntist á þig í athugasemd við “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Notandi (sem nú er búið að eyða) minntist á þig í athugasemd við “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s minntist á þig í athugasemd við “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} minntist á þig í athugasemd við “{file}”",
+    "Type in a new comment..." : "Skrifaðu inn nýja athugasemd...",
+    "No other comments available" : "Engar aðrar athugasemdir eru tiltækar",
+    "More comments..." : "Fleiri athugasemdir...",
+    "{count} unread comments" : "{count} ólesnar athugasemdir",
+    "You commented on %2$s" : "Þú settir inn athugasemd við %2$s"
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
@@ -1,6 +1,37 @@
 { "translations": {
+    "Comments" : "Athugasemdir",
+    "Unknown user" : "Óþekktur notandi",
+    "New comment …" : "Ný athugasemd ...",
+    "Delete comment" : "Eyða athugasemd",
+    "Post" : "Senda",
    "Cancel" : "Hætta við",
+    "Edit comment" : "Breyta athugasemd",
+    "[Deleted user]" : "[Eyddur notandi]",
+    "No comments yet, start the conversation!" : "Engar athugasemdir ennþá, byrjaðu umræðuna!",
+    "More comments …" : "Fleiri athugasemdir ...",
    "Save" : "Vista",
-    "Comment" : "Athugasemd"
+    "Allowed characters {count} of {max}" : "Leyfður stafafjöldi {count} af {max}",
+    "Error occurred while retrieving comment with id {id}" : "Villa kom upp við að reyna að ná í athugasemd með auðkenninu {id}",
+    "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"],
+    "Comment" : "Athugasemd",
+    "You commented" : "Þú settir inn athugasemd",
+    "%1$s commented" : "%1$s setti inn athugasemd",
+    "{author} commented" : "{author} setti inn athugasemd",
+    "You commented on %1$s" : "Þú settir inn athugasemd við %1$s",
+    "You commented on {file}" : "Þú settir inn athugasemd við {file}",
+    "%1$s commented on %2$s" : "%1$s setti inn athugasemd um %2$s",
+    "{author} commented on {file}" : "{author} setti inn athugasemd við {file}",
+    "<strong>Comments</strong> for files" : "<strong>Athugasemdir</strong> við skrár",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Notandi (sem nú er búið að eyða) minntist á þig í athugasemd við “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Notandi (sem nú er búið að eyða) minntist á þig í athugasemd við “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s minntist á þig í athugasemd við “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} minntist á þig í athugasemd við “{file}”",
+    "Type in a new comment..." : "Skrifaðu inn nýja athugasemd...",
+    "No other comments available" : "Engar aðrar athugasemdir eru tiltækar",
+    "More comments..." : "Fleiri athugasemdir...",
+    "{count} unread comments" : "{count} ólesnar athugasemdir",
+    "You commented on %2$s" : "Þú settir inn athugasemd við %2$s"
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
@@ -1,21 +1,39 @@
 OC.L10N.register(
    "comments",
    {
-    "<strong>Comments</strong> for files" : "<strong>Commenti</strong> sui file",
-    "%1$s commented" : "%1$s ha commentato",
-    "%1$s commented on %2$s" : "%1$s ha commentato %2$s",
    "Comments" : "Commenti",
-    "Type in a new comment..." : "Digita un nuovo commento...",
+    "Unknown user" : "Utente sconosciuto",
+    "New comment …" : "Nuovo commento...",
    "Delete comment" : "Elimina commento",
    "Post" : "Commento",
    "Cancel" : "Annulla",
    "Edit comment" : "Modifica commento",
    "[Deleted user]" : "[Utente eliminato]",
-    "No other comments available" : "Non sono disponibili altri commenti",
-    "More comments..." : "Altri commenti...",
+    "No comments yet, start the conversation!" : "Ancora nessun commento, inizia la conversazione!",
+    "More comments …" : "Altri commenti...",
    "Save" : "Salva",
    "Allowed characters {count} of {max}" : "Caratteri consentiti {count} di {max}",
+    "Error occurred while retrieving comment with id {id}" : "Si è verificato un errore durante il tentativo di recupero del commento con id {id}",
+    "Error occurred while updating comment with id {id}" : "Si è verificato un errore durante il tentativo di aggiornamento del commento con id {id}",
+    "Error occurred while posting comment" : "Si è verificato un errore durante la pubblicazione del commento.",
+    "_%n unread comment_::_%n unread comments_" : ["%n commento non letto","%n commenti non letti"],
+    "Comment" : "Commento",
+    "You commented" : "Hai commentato",
+    "%1$s commented" : "%1$s ha commentato",
+    "{author} commented" : "{author} ha commentato",
+    "You commented on %1$s" : "Hai commentato su %1$s",
+    "You commented on {file}" : "Hai commentato su {file}",
+    "%1$s commented on %2$s" : "%1$s ha commentato %2$s",
+    "{author} commented on {file}" : "{author} ha commentato su {file}",
+    "<strong>Comments</strong> for files" : "<strong>Commenti</strong> sui file",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Un utente eliminato (ora) ti ha menzionato in un commento su \"%s\".",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un utente eliminato (ora) ti ha menzionato in un commento su \"{file}\".",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s ti ha menzionato in un commento su \"%2$s\"",
+    "{user} mentioned you in a comment on “{file}”" : "{user} ti ha menzionato in un commento su \"{file}\".",
+    "Type in a new comment..." : "Digita un nuovo commento...",
+    "No other comments available" : "Non sono disponibili altri commenti",
+    "More comments..." : "Altri commenti...",
    "{count} unread comments" : "{count} commenti non letti",
-    "Comment" : "Commento"
+    "You commented on %2$s" : "Hai commentato su %2$s"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,19 +1,37 @@
 { "translations": {
-    "<strong>Comments</strong> for files" : "<strong>Commenti</strong> sui file",
-    "%1$s commented" : "%1$s ha commentato",
-    "%1$s commented on %2$s" : "%1$s ha commentato %2$s",
    "Comments" : "Commenti",
-    "Type in a new comment..." : "Digita un nuovo commento...",
+    "Unknown user" : "Utente sconosciuto",
+    "New comment …" : "Nuovo commento...",
    "Delete comment" : "Elimina commento",
    "Post" : "Commento",
    "Cancel" : "Annulla",
    "Edit comment" : "Modifica commento",
    "[Deleted user]" : "[Utente eliminato]",
-    "No other comments available" : "Non sono disponibili altri commenti",
-    "More comments..." : "Altri commenti...",
+    "No comments yet, start the conversation!" : "Ancora nessun commento, inizia la conversazione!",
+    "More comments …" : "Altri commenti...",
    "Save" : "Salva",
    "Allowed characters {count} of {max}" : "Caratteri consentiti {count} di {max}",
+    "Error occurred while retrieving comment with id {id}" : "Si è verificato un errore durante il tentativo di recupero del commento con id {id}",
+    "Error occurred while updating comment with id {id}" : "Si è verificato un errore durante il tentativo di aggiornamento del commento con id {id}",
+    "Error occurred while posting comment" : "Si è verificato un errore durante la pubblicazione del commento.",
+    "_%n unread comment_::_%n unread comments_" : ["%n commento non letto","%n commenti non letti"],
+    "Comment" : "Commento",
+    "You commented" : "Hai commentato",
+    "%1$s commented" : "%1$s ha commentato",
+    "{author} commented" : "{author} ha commentato",
+    "You commented on %1$s" : "Hai commentato su %1$s",
+    "You commented on {file}" : "Hai commentato su {file}",
+    "%1$s commented on %2$s" : "%1$s ha commentato %2$s",
+    "{author} commented on {file}" : "{author} ha commentato su {file}",
+    "<strong>Comments</strong> for files" : "<strong>Commenti</strong> sui file",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Un utente eliminato (ora) ti ha menzionato in un commento su \"%s\".",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un utente eliminato (ora) ti ha menzionato in un commento su \"{file}\".",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s ti ha menzionato in un commento su \"%2$s\"",
+    "{user} mentioned you in a comment on “{file}”" : "{user} ti ha menzionato in un commento su \"{file}\".",
+    "Type in a new comment..." : "Digita un nuovo commento...",
+    "No other comments available" : "Non sono disponibili altri commenti",
+    "More comments..." : "Altri commenti...",
    "{count} unread comments" : "{count} commenti non letti",
-    "Comment" : "Commento"
+    "You commented on %2$s" : "Hai commentato su %2$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,21 +1,39 @@
 OC.L10N.register(
    "comments",
    {
-    "<strong>Comments</strong> for files" : "ファイルについての<strong>コメント</strong>",
-    "%1$s commented" : "%1$s がコメントを追加",
-    "%1$s commented on %2$s" : "%2$s について、%1$s がコメントしました",
    "Comments" : "コメント",
-    "Type in a new comment..." : "新しいコメントを入力...",
+    "Unknown user" : "不明なユーザー",
+    "New comment …" : "新しいコメント...",
    "Delete comment" : "コメントを削除",
    "Post" : "追加",
    "Cancel" : "キャンセル",
    "Edit comment" : "コメントを編集",
    "[Deleted user]" : "[削除済みユーザー]",
-    "No other comments available" : "コメントはありません",
-    "More comments..." : "コメントをさらに表示...",
+    "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} のコメントを取得する際にエラーが発生",
+    "Error occurred while updating comment with id {id}" : "コメントID {id} のコメントをアップロードする際にエラーが発生",
+    "Error occurred while posting comment" : "コメント投稿時にエラーが発生",
+    "_%n unread comment_::_%n unread comments_" : ["%n の未読のコメント"],
+    "Comment" : "コメント",
+    "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" : "%2$s について、%1$s がコメントしました",
+    "{author} commented on {file}" : "{author} が{file} にコメントしました",
+    "<strong>Comments</strong> for files" : "ファイルの<strong>コメント</ strong>",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "(現在)削除されたユーザーが \"%s\" のコメントであなたのことについて言及しました",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "(現在)削除されたユーザーが \"{file}\" のコメントであなたのことについて言及しました",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s さんが “%2$s” のコメントであなたについて言及しました。",
+    "{user} mentioned you in a comment on “{file}”" : "{user} さんが ““{file}” のコメントであなたについて言及しました。",
+    "Type in a new comment..." : "新しいコメントを入力...",
+    "No other comments available" : "コメントはありません",
+    "More comments..." : "コメントをさらに表示...",
    "{count} unread comments" : "未読コメント数 {count}",
-    "Comment" : "コメント"
+    "You commented on %2$s" : "%2$s にコメント済"
 },
 "nplurals=1; plural=0;");
@@ -1,19 +1,37 @@
 { "translations": {
-    "<strong>Comments</strong> for files" : "ファイルについての<strong>コメント</strong>",
-    "%1$s commented" : "%1$s がコメントを追加",
-    "%1$s commented on %2$s" : "%2$s について、%1$s がコメントしました",
    "Comments" : "コメント",
-    "Type in a new comment..." : "新しいコメントを入力...",
+    "Unknown user" : "不明なユーザー",
+    "New comment …" : "新しいコメント...",
    "Delete comment" : "コメントを削除",
    "Post" : "追加",
    "Cancel" : "キャンセル",
    "Edit comment" : "コメントを編集",
    "[Deleted user]" : "[削除済みユーザー]",
-    "No other comments available" : "コメントはありません",
-    "More comments..." : "コメントをさらに表示...",
+    "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} のコメントを取得する際にエラーが発生",
+    "Error occurred while updating comment with id {id}" : "コメントID {id} のコメントをアップロードする際にエラーが発生",
+    "Error occurred while posting comment" : "コメント投稿時にエラーが発生",
+    "_%n unread comment_::_%n unread comments_" : ["%n の未読のコメント"],
+    "Comment" : "コメント",
+    "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" : "%2$s について、%1$s がコメントしました",
+    "{author} commented on {file}" : "{author} が{file} にコメントしました",
+    "<strong>Comments</strong> for files" : "ファイルの<strong>コメント</ strong>",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "(現在)削除されたユーザーが \"%s\" のコメントであなたのことについて言及しました",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "(現在)削除されたユーザーが \"{file}\" のコメントであなたのことについて言及しました",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s さんが “%2$s” のコメントであなたについて言及しました。",
+    "{user} mentioned you in a comment on “{file}”" : "{user} さんが ““{file}” のコメントであなたについて言及しました。",
+    "Type in a new comment..." : "新しいコメントを入力...",
+    "No other comments available" : "コメントはありません",
+    "More comments..." : "コメントをさらに表示...",
    "{count} unread comments" : "未読コメント数 {count}",
-    "Comment" : "コメント"
+    "You commented on %2$s" : "%2$s にコメント済"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
@@ -1,8 +1,31 @@
 OC.L10N.register(
    "comments",
    {
+    "Comments" : "댓글",
+    "Unknown user" : "알려지지 않은 사용자",
+    "New comment …" : "새로운 댓글 ...",
+    "Delete comment" : "댓글 삭제",
+    "Post" : "게시",
    "Cancel" : "취소",
+    "Edit comment" : "댓글 편집",
+    "[Deleted user]" : "[삭제된 사용자]",
+    "No comments yet, start the conversation!" : "아직 댓글이 없습니다. 대화를 시작합니다!",
+    "More comments …" : "더 많은 댓글...",
    "Save" : "저장",
-    "Comment" : "설명"
+    "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개"],
+    "Comment" : "설명",
+    "You commented" : "댓글을 달았습니다",
+    "%1$s commented" : "%1$s 님의 댓글",
+    "%1$s commented on %2$s" : "%2$s에 %1$s 님이 댓글 남김",
+    "<strong>Comments</strong> for files" : "파일의 <strong>댓글</strong>",
+    "Type in a new comment..." : "새 댓글을 입력하십시오...",
+    "No other comments available" : "더 이상 댓글 없음",
+    "More comments..." : "더 많은 댓글...",
+    "{count} unread comments" : "읽지 않은 댓글 {count}개",
+    "You commented on %2$s" : "%2$s에 댓글 남김"
 },
 "nplurals=1; plural=0;");
@@ -1,6 +1,29 @@
 { "translations": {
+    "Comments" : "댓글",
+    "Unknown user" : "알려지지 않은 사용자",
+    "New comment …" : "새로운 댓글 ...",
+    "Delete comment" : "댓글 삭제",
+    "Post" : "게시",
    "Cancel" : "취소",
+    "Edit comment" : "댓글 편집",
+    "[Deleted user]" : "[삭제된 사용자]",
+    "No comments yet, start the conversation!" : "아직 댓글이 없습니다. 대화를 시작합니다!",
+    "More comments …" : "더 많은 댓글...",
    "Save" : "저장",
-    "Comment" : "설명"
+    "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개"],
+    "Comment" : "설명",
+    "You commented" : "댓글을 달았습니다",
+    "%1$s commented" : "%1$s 님의 댓글",
+    "%1$s commented on %2$s" : "%2$s에 %1$s 님이 댓글 남김",
+    "<strong>Comments</strong> for files" : "파일의 <strong>댓글</strong>",
+    "Type in a new comment..." : "새 댓글을 입력하십시오...",
+    "No other comments available" : "더 이상 댓글 없음",
+    "More comments..." : "더 많은 댓글...",
+    "{count} unread comments" : "읽지 않은 댓글 {count}개",
+    "You commented on %2$s" : "%2$s에 댓글 남김"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
@@ -2,6 +2,7 @@ OC.L10N.register(
    "comments",
    {
    "Cancel" : "Ofbriechen",
-    "Save" : "Späicheren"
+    "Save" : "Späicheren",
+    "Comment" : "Kommentar"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,5 +1,6 @@
 { "translations": {
    "Cancel" : "Ofbriechen",
-    "Save" : "Späicheren"
+    "Save" : "Späicheren",
+    "Comment" : "Kommentar"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,8 +1,37 @@
 OC.L10N.register(
    "comments",
    {
+    "Comments" : "Komentāri",
+    "Unknown user" : "Nezināms lietotājs",
+    "New comment …" : "Jauns komentārs...",
+    "Delete comment" : "Dzēst komentāru",
+    "Post" : "Pievienot",
    "Cancel" : "Atcelt",
+    "Edit comment" : "Rediģēt komentāru",
+    "[Deleted user]" : "[Dzēsts lietotājs]",
+    "No comments yet, start the conversation!" : "Vēl nav komentāru, uzsāciet sarunu!",
+    "More comments …" : "Vairāk komentāri...",
    "Save" : "Saglabāt",
-    "Comment" : "Komentārs"
+    "Allowed characters {count} of {max}" : "Atļautās zīmes {count} no {max}",
+    "Error occurred while retrieving comment with id {id}" : "Notika kļūda saņemot komentāru ar id {id}",
+    "Error occurred while updating comment with id {id}" : "Kļūda atjauninot komentāru ar id {id}",
+    "Error occurred while posting comment" : "Notika kļūda pievienojot komentāru",
+    "_%n unread comment_::_%n unread comments_" : ["%n nelasīti komentāri","%n nelasīti komentāri","%n nelasīti komentāri"],
+    "Comment" : "Komentārs",
+    "You commented" : "Tu komentēji",
+    "%1$s commented" : "%1$s komentēja",
+    "{author} commented" : "{author} komentēja",
+    "You commented on %1$s" : "Tu komentēji %1$s",
+    "You commented on {file}" : "Tu komentēji {file}",
+    "%1$s commented on %2$s" : "%1$s komentēja %2$s",
+    "{author} commented on {file}" : "{author} komentārs {file}",
+    "<strong>Comments</strong> for files" : "<strong>Komentāri</strong> datnēm",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s minēja jūs komentārā “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} minēja jūs komentārā “{file}”",
+    "Type in a new comment..." : "Raksti jaunu komentāru...",
+    "No other comments available" : "Nav pieejami citi komentāri",
+    "More comments..." : "Vairāk komentāri...",
+    "{count} unread comments" : "{count} neizlasītu komentāru",
+    "You commented on %2$s" : "Tu komentēji %2$s"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
@@ -1,6 +1,35 @@
 { "translations": {
+    "Comments" : "Komentāri",
+    "Unknown user" : "Nezināms lietotājs",
+    "New comment …" : "Jauns komentārs...",
+    "Delete comment" : "Dzēst komentāru",
+    "Post" : "Pievienot",
    "Cancel" : "Atcelt",
+    "Edit comment" : "Rediģēt komentāru",
+    "[Deleted user]" : "[Dzēsts lietotājs]",
+    "No comments yet, start the conversation!" : "Vēl nav komentāru, uzsāciet sarunu!",
+    "More comments …" : "Vairāk komentāri...",
    "Save" : "Saglabāt",
-    "Comment" : "Komentārs"
+    "Allowed characters {count} of {max}" : "Atļautās zīmes {count} no {max}",
+    "Error occurred while retrieving comment with id {id}" : "Notika kļūda saņemot komentāru ar id {id}",
+    "Error occurred while updating comment with id {id}" : "Kļūda atjauninot komentāru ar id {id}",
+    "Error occurred while posting comment" : "Notika kļūda pievienojot komentāru",
+    "_%n unread comment_::_%n unread comments_" : ["%n nelasīti komentāri","%n nelasīti komentāri","%n nelasīti komentāri"],
+    "Comment" : "Komentārs",
+    "You commented" : "Tu komentēji",
+    "%1$s commented" : "%1$s komentēja",
+    "{author} commented" : "{author} komentēja",
+    "You commented on %1$s" : "Tu komentēji %1$s",
+    "You commented on {file}" : "Tu komentēji {file}",
+    "%1$s commented on %2$s" : "%1$s komentēja %2$s",
+    "{author} commented on {file}" : "{author} komentārs {file}",
+    "<strong>Comments</strong> for files" : "<strong>Komentāri</strong> datnēm",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s minēja jūs komentārā “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} minēja jūs komentārā “{file}”",
+    "Type in a new comment..." : "Raksti jaunu komentāru...",
+    "No other comments available" : "Nav pieejami citi komentāri",
+    "More comments..." : "Vairāk komentāri...",
+    "{count} unread comments" : "{count} neizlasītu komentāru",
+    "You commented on %2$s" : "Tu komentēji %2$s"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
 }
@@ -1,9 +1,9 @@
 OC.L10N.register(
    "comments",
    {
-    "%1$s commented" : "%1$s коментиран",
    "Cancel" : "Откажи",
    "Save" : "Сними",
-    "Comment" : "Коментар"
+    "Comment" : "Коментар",
+    "%1$s commented" : "%1$s коментиран"
 },
 "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
@@ -1,7 +1,7 @@
 { "translations": {
-    "%1$s commented" : "%1$s коментиран",
    "Cancel" : "Откажи",
    "Save" : "Сними",
-    "Comment" : "Коментар"
+    "Comment" : "Коментар",
+    "%1$s commented" : "%1$s коментиран"
 },"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
 }
@@ -1,21 +1,39 @@
 OC.L10N.register(
    "comments",
    {
-    "<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> for filer",
-    "%1$s commented" : "%1$s kommentert",
-    "%1$s commented on %2$s" : "%1$s kommenterte %2$s",
    "Comments" : "Kommentarer",
-    "Type in a new comment..." : "Skriv inn en ny kommentar...",
+    "Unknown user" : "Ukjent bruker",
+    "New comment …" : "Ny kommentar",
    "Delete comment" : "Slett kommentar",
    "Post" : "Send",
    "Cancel" : "Avbryt",
    "Edit comment" : "Rediger kommentar",
    "[Deleted user]" : "[Slettet bruker]",
-    "No other comments available" : "Ingen andre kommentarer tilgjengelig",
-    "More comments..." : "Flere kommentarer..",
+    "No comments yet, start the conversation!" : "Ingen kommentarer enda, start diskusjonen!",
+    "More comments …" : "Flere kommentarer..",
    "Save" : "Lagre",
    "Allowed characters {count} of {max}" : "Antall tegn tillatt {count} av {max}",
+    "Error occurred while retrieving comment with id {id}" : "En feil oppstod under henting av kommentar med id {id}",
+    "Error occurred while updating comment with id {id}" : "En feil oppstod under oppdatering av kommentar med id {id}",
+    "Error occurred while posting comment" : "En feil oppstod under posting av kommentar",
+    "_%n unread comment_::_%n unread comments_" : ["%n ulest kommentar","%n uleste kommentarer"],
+    "Comment" : "Kommentar",
+    "You commented" : "Du kommenterte",
+    "%1$s commented" : "%1$s kommentert",
+    "{author} commented" : "{author} kommenterte",
+    "You commented on %1$s" : "Du kommenterte på %1$s",
+    "You commented on {file}" : "Du kommenterte på {file}",
+    "%1$s commented on %2$s" : "%1$s kommenterte %2$s",
+    "{author} commented on {file}" : "{author} kommenterte på {file}",
+    "<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> for filer",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "En (now) slettet bruker nevnte deg i en kommentar til “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "A (now) slettet bruker nevnte deg i en kommentar til “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s nevnte deg i en kommentar på “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} nevnte deg i en kommentar på “{file}”",
+    "Type in a new comment..." : "Skriv inn en ny kommentar...",
+    "No other comments available" : "Ingen andre kommentarer tilgjengelig",
+    "More comments..." : "Flere kommentarer..",
    "{count} unread comments" : "{count} uleste kommentarer",
-    "Comment" : "Kommentar"
+    "You commented on %2$s" : "Du kommenterte til %2$s"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,19 +1,37 @@
 { "translations": {
-    "<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> for filer",
-    "%1$s commented" : "%1$s kommentert",
-    "%1$s commented on %2$s" : "%1$s kommenterte %2$s",
    "Comments" : "Kommentarer",
-    "Type in a new comment..." : "Skriv inn en ny kommentar...",
+    "Unknown user" : "Ukjent bruker",
+    "New comment …" : "Ny kommentar",
    "Delete comment" : "Slett kommentar",
    "Post" : "Send",
    "Cancel" : "Avbryt",
    "Edit comment" : "Rediger kommentar",
    "[Deleted user]" : "[Slettet bruker]",
-    "No other comments available" : "Ingen andre kommentarer tilgjengelig",
-    "More comments..." : "Flere kommentarer..",
+    "No comments yet, start the conversation!" : "Ingen kommentarer enda, start diskusjonen!",
+    "More comments …" : "Flere kommentarer..",
    "Save" : "Lagre",
    "Allowed characters {count} of {max}" : "Antall tegn tillatt {count} av {max}",
+    "Error occurred while retrieving comment with id {id}" : "En feil oppstod under henting av kommentar med id {id}",
+    "Error occurred while updating comment with id {id}" : "En feil oppstod under oppdatering av kommentar med id {id}",
+    "Error occurred while posting comment" : "En feil oppstod under posting av kommentar",
+    "_%n unread comment_::_%n unread comments_" : ["%n ulest kommentar","%n uleste kommentarer"],
+    "Comment" : "Kommentar",
+    "You commented" : "Du kommenterte",
+    "%1$s commented" : "%1$s kommentert",
+    "{author} commented" : "{author} kommenterte",
+    "You commented on %1$s" : "Du kommenterte på %1$s",
+    "You commented on {file}" : "Du kommenterte på {file}",
+    "%1$s commented on %2$s" : "%1$s kommenterte %2$s",
+    "{author} commented on {file}" : "{author} kommenterte på {file}",
+    "<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> for filer",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "En (now) slettet bruker nevnte deg i en kommentar til “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "A (now) slettet bruker nevnte deg i en kommentar til “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s nevnte deg i en kommentar på “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} nevnte deg i en kommentar på “{file}”",
+    "Type in a new comment..." : "Skriv inn en ny kommentar...",
+    "No other comments available" : "Ingen andre kommentarer tilgjengelig",
+    "More comments..." : "Flere kommentarer..",
    "{count} unread comments" : "{count} uleste kommentarer",
-    "Comment" : "Kommentar"
+    "You commented on %2$s" : "Du kommenterte til %2$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,21 +1,39 @@
 OC.L10N.register(
    "comments",
    {
-    "<strong>Comments</strong> for files" : "<strong>Reacties</strong> voor bestanden",
-    "%1$s commented" : "%1$s heeft gereageerd",
-    "%1$s commented on %2$s" : "%1$s heeft gereageerd op %2$s",
    "Comments" : "Reacties",
-    "Type in a new comment..." : "Type een nieuwe reactie...",
+    "Unknown user" : "Onbekende gebruiker",
+    "New comment …" : "Nieuwe reactie ...",
    "Delete comment" : "Verwijder reactie",
    "Post" : "Reageer",
    "Cancel" : "Annuleren",
    "Edit comment" : "Bewerk reactie",
    "[Deleted user]" : "[Verwijderde gebruiker]",
+    "No comments yet, start the conversation!" : "Nog geen reacties, start de discussie!",
+    "More comments …" : "Meer reacties ...",
+    "Save" : "Opslaan",
+    "Allowed characters {count} of {max}" : "{count} van de {max} toegestane tekens",
+    "Error occurred while retrieving comment with id {id}" : "Er trad een fout op bij het ophalen van reactie met id {id}",
+    "Error occurred while updating comment with id {id}" : "Er trad een fout op bij het bijwerken van reactie met id {id}",
+    "Error occurred while posting comment" : "Er trad een fout op bij plaatsen reactie",
+    "_%n unread comment_::_%n unread comments_" : ["%n ongelezen reactie","%n ongelezen reacties"],
+    "Comment" : "Reactie",
+    "You commented" : "Je reageerde",
+    "%1$s commented" : "%1$s heeft gereageerd",
+    "{author} commented" : "{author} reageerde",
+    "You commented on %1$s" : "Je reageerde op %1$s",
+    "You commented on {file}" : "Je reageerde op {file}",
+    "%1$s commented on %2$s" : "%1$s heeft gereageerd op %2$s",
+    "{author} commented on {file}" : "{author} reageerde op {file}",
+    "<strong>Comments</strong> for files" : "<strong>Reacties</strong> voor bestanden",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Een (nu) verwijderde gebruiker vermeldde jou in een reactie op \"%s\"",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Een (nu) verwijderde gebruiker vermeldde jou in een reactie op {file}\"",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s vermeldde jou in een reactie op “%2$s\"",
+    "{user} mentioned you in a comment on “{file}”" : "{user} vermeldde jou in een reactie op “{file}\"",
+    "Type in a new comment..." : "Type een nieuwe reactie...",
    "No other comments available" : "Geen andere reacties beschikbaar",
    "More comments..." : "Meer reacties...",
-    "Save" : "Bewaren",
-    "Allowed characters {count} of {max}" : "{count} van de {max} toegestane tekens",
    "{count} unread comments" : "{count} ongelezen reacties",
-    "Comment" : "Reactie"
+    "You commented on %2$s" : "Je reageerde op %2$s"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,19 +1,37 @@
 { "translations": {
-    "<strong>Comments</strong> for files" : "<strong>Reacties</strong> voor bestanden",
-    "%1$s commented" : "%1$s heeft gereageerd",
-    "%1$s commented on %2$s" : "%1$s heeft gereageerd op %2$s",
    "Comments" : "Reacties",
-    "Type in a new comment..." : "Type een nieuwe reactie...",
+    "Unknown user" : "Onbekende gebruiker",
+    "New comment …" : "Nieuwe reactie ...",
    "Delete comment" : "Verwijder reactie",
    "Post" : "Reageer",
    "Cancel" : "Annuleren",
    "Edit comment" : "Bewerk reactie",
    "[Deleted user]" : "[Verwijderde gebruiker]",
+    "No comments yet, start the conversation!" : "Nog geen reacties, start de discussie!",
+    "More comments …" : "Meer reacties ...",
+    "Save" : "Opslaan",
+    "Allowed characters {count} of {max}" : "{count} van de {max} toegestane tekens",
+    "Error occurred while retrieving comment with id {id}" : "Er trad een fout op bij het ophalen van reactie met id {id}",
+    "Error occurred while updating comment with id {id}" : "Er trad een fout op bij het bijwerken van reactie met id {id}",
+    "Error occurred while posting comment" : "Er trad een fout op bij plaatsen reactie",
+    "_%n unread comment_::_%n unread comments_" : ["%n ongelezen reactie","%n ongelezen reacties"],
+    "Comment" : "Reactie",
+    "You commented" : "Je reageerde",
+    "%1$s commented" : "%1$s heeft gereageerd",
+    "{author} commented" : "{author} reageerde",
+    "You commented on %1$s" : "Je reageerde op %1$s",
+    "You commented on {file}" : "Je reageerde op {file}",
+    "%1$s commented on %2$s" : "%1$s heeft gereageerd op %2$s",
+    "{author} commented on {file}" : "{author} reageerde op {file}",
+    "<strong>Comments</strong> for files" : "<strong>Reacties</strong> voor bestanden",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Een (nu) verwijderde gebruiker vermeldde jou in een reactie op \"%s\"",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Een (nu) verwijderde gebruiker vermeldde jou in een reactie op {file}\"",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s vermeldde jou in een reactie op “%2$s\"",
+    "{user} mentioned you in a comment on “{file}”" : "{user} vermeldde jou in een reactie op “{file}\"",
+    "Type in a new comment..." : "Type een nieuwe reactie...",
    "No other comments available" : "Geen andere reacties beschikbaar",
    "More comments..." : "Meer reacties...",
-    "Save" : "Bewaren",
-    "Allowed characters {count} of {max}" : "{count} van de {max} toegestane tekens",
    "{count} unread comments" : "{count} ongelezen reacties",
-    "Comment" : "Reactie"
+    "You commented on %2$s" : "Je reageerde op %2$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32" viewBox="0 0 32 32"><path fill="#fff" d="M16 3C7.163 3 0 7.925 0 14s7.163 11 16 11c.5 0 .98-.032 1.47-.063L26 32v-9.406c3.658-2.017 6-5.12 6-8.595 0-6.076-7.164-11-16-11z"/></svg>`