Merge pull request #5991 from nextcloud/stable11-bump-version

[stable11] Update version
[tx-robot] updated from transifex
2017-08-06 20:24:51 +02:00 · 2017-08-06 00:08:42 +00:00 · 2017-08-05 20:09:39 +02:00 · 2017-08-05 00:08:29 +00:00 · 2017-08-04 00:08:37 +00:00 · 2017-08-03 00:08:24 +00:00
4515 changed files with 197750 additions and 99714 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
@@ -1,87 +1,490 @@
-build:
+pipeline:
+  clone:
+    image: plugins/git
+    depth: 1
  jsunit:
-    image: nextcloudci/jsunit:1.0.6
+    image: nextcloudci/jsunit:jsunit-5
    commands:
      - ./autotest-js.sh
-  nodb-php5.4:
-    image: nextcloudci/php5.4:1.0.7
+      - 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:
-      - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
-      - git submodule update --init
-      - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
-  nodb-php5.5:
-    image: nextcloudci/php5.5:1.0.7
+      - bash ./build/autoloaderchecker.sh
+    when:
+      matrix:
+        TESTS: check-autoloader
+  app-check-code:
+    image: nextcloudci/php7.0:php7.0-7
    commands:
-      - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
-      - git submodule update --init
-      - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
+      - ./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
+  files-check:
+    image: nextcloudci/php7.0:php7.0-7
+    commands:
+      - php ./build/files-checker.php
+    when:
+      matrix:
+        TESTS: files-check
+  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:1.0.6
+    image: nextcloudci/php5.6:php5.6-7
    commands:
-      - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
-      - git submodule update --init
      - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
+    when:
+      matrix:
+        DB: NODB
+        PHP: 5.6
  nodb-php7.0:
-    image: nextcloudci/php7.0:1.0.9
+    image: nextcloudci/php7.0:php7.0-7
    commands:
-      - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
-      - git submodule update --init
      - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
-  sqlite-php5.4:
-    image: nextcloudci/php5.4:1.0.7
+    when:
+      matrix:
+        DB: NODB
+        PHP: "7.0"
+  nodb-php7.1:
+    image: nextcloudci/php7.1:php7.1-11
    commands:
-      - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
-      - git submodule update --init
-      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
-  sqlite-php5.5:
-    image: nextcloudci/php5.5:1.0.7
-    commands:
-      - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
-      - git submodule update --init
-      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
+      - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
+    when:
+      matrix:
+        DB: NODB
+        PHP: 7.1
  sqlite-php5.6:
-    image: nextcloudci/php5.6:1.0.6
+    image: nextcloudci/php5.6:php5.6-7
    commands:
-      - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
-      - git submodule update --init
      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
+    when:
+      matrix:
+        DB: sqlite
+        PHP: 5.6
  sqlite-php7.0:
-    image: nextcloudci/php7.0:1.0.9
+    image: nextcloudci/php7.0:php7.0-7
    commands:
-      - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
-      - git submodule update --init
      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
-  mysql-php5.6:
-    image: nextcloudci/php5.6:1.0.6
+    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:
-      - sleep 15 # gives the database enough time to initialize
-      - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
-      - git submodule update --init
      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
+    when:
+      matrix:
+        DB: mysql
+        PHP: 5.6
  postgres-php5.6:
-    image: nextcloudci/php5.6:1.0.6
+    image: nextcloudci/php5.6:php5.6-7
    commands:
      - sleep 10 # gives the database enough time to initialize
-      - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
-      - git submodule update --init
      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
-  integration:
-    image: nextcloudci/php7.0:1.0.9
+    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:
-      - rm -rf data/* config/config.php # TODO: remove this - temporary fix for CI issues
-      - git submodule update --init
      - ./occ maintenance:install --admin-pass=admin
      - cd build/integration
-      - ./run.sh
+      - ./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: files-check
+    - TESTS: htaccess-checker
+    - TESTS: nodb-codecov
+      ENABLE_REDIS: true
+    - TESTS: db-codecov
+      ENABLE_REDIS: true
+    - 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
+      ENABLE_REDIS: true
+    - DB: NODB
+      PHP: 7.0
+      ENABLE_REDIS: true
+    - DB: NODB
+      PHP: 7.1
+      ENABLE_REDIS: true
+    - DB: sqlite
+      PHP: 5.6
+      ENABLE_REDIS: true
+    - DB: sqlite
+      PHP: 7.0
+      ENABLE_REDIS: true
+    - DB: sqlite
+      PHP: 7.1
+      ENABLE_REDIS: true
+    - DB: mysql
+      PHP: 5.6
+      ENABLE_REDIS: true
+    - DB: postgres
+      PHP: 5.6
+      ENABLE_REDIS: true
+    - DB: mysqlmb4
+      PHP: 5.6
+      ENABLE_REDIS: true

-compose:
+services:
  cache:
    image: redis
+    when:
+      matrix:
+       ENABLE_REDIS: true
  postgres:
    image: postgres
    environment:
      - POSTGRES_USER=oc_autotest
-      - POSTGRES_PASSWORD=oc_autotest
+      - POSTGRES_PASSWORD=owncloud
+    when:
+      matrix:
+        DB: postgres
  mysql:
    image: mysql
    environment:
@@ -89,3 +492,19 @@ compose:
      - 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
+
+branches: [ master, stable* ]
@@ -7,6 +7,7 @@
 /config/mount.php
 /apps/inc.php
 /assets
+/.htaccess

 # ignore all apps except core ones
 /apps*/*
@@ -15,11 +16,13 @@
 !/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
@@ -27,6 +30,8 @@
 !/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
@@ -69,7 +74,7 @@ RCS/*
 .project
 .settings

-# netbeans 
+# netbeans
 nbproject

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

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

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

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

 # puphpet
 puphpet
@@ -117,6 +124,7 @@ Vagrantfile
 # Tests - auto-generated files
 /data-autotest
 /tests/coverage*
+/tests/css
 /tests/karma-coverage
 /tests/autoconfig*
 /tests/autotest*
@@ -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
@@ -38,8 +43,8 @@
  </IfModule>
 </IfModule>
 <IfModule mod_php7.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 default_charset 'UTF-8'
@@ -39,6 +39,7 @@ 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>
@@ -302,18 +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 <rullzer@owncloud.com> Roeland Douma <rullzer@users.noreply.github.com>
+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>
@@ -2,12 +2,6 @@
  "maxReviewers": 3,
  "numFilesToCheck": 5,
  "alwaysNotifyForPaths": [
-    {
-      "name": "DeepDiver1975",
-      "files": [
-        "apps/dav/**"
-      ]
-    },
    {
      "name": "nickvergessen",
      "files": [
@@ -25,7 +19,10 @@
    }
  ],
  "userBlacklist": [
+    "DeepDiver1975",
+    "nextcloud-bot",
    "owncloud-bot",
+    "PVince81",
    "scrutinizer-auto-fixer",
    "th3fallen",
    "zander"
@@ -1,58 +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 [ '$TC' = 'syntax' ]; then 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 .; fi"
-  - sh -c "if [ '$TC' = 'app:check-code' ]; then ./occ app:check-code admin_audit; ./occ app:check-code comments; ./occ app:check-code federation; fi"
-  - 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
-    - php: 5.4
-      env: DB=sqlite;TC=syntax;TEST_DAV=0
-    - php: 5.5
-      env: DB=sqlite;TC=syntax;TEST_DAV=0
-    - php: 5.6
-      env: DB=sqlite;TC=syntax;TEST_DAV=0
-    - php: 7.0
-      env: DB=sqlite;TC=syntax;TEST_DAV=0
-    - php: 5.4
-      env: DB=sqlite;TC=app:check-code;TEST_DAV=0
-
-  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,5 +1,6 @@
-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>
@@ -18,14 +19,16 @@ ownCloud is written by:
 - Bernhard Posselt <dev@bernhard-posselt.com>
 - Bernhard Reiter <ockham@raz.or.at>
 - Birk Borkason <daniel.niccoli@gmail.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 Weiske <cweiske@cweiske.de>
 - Christoph Schaefer <christophł@wolkesicher.de>
@@ -40,12 +43,13 @@ ownCloud is written by:
 - 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>
- - 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>
 - Florin Peter <github@florin-peter.de>
 - Francesco Rovelli <francesco.rovelli@gmail.com>
@@ -66,11 +70,13 @@ ownCloud is written by:
 - 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>
@@ -119,7 +125,6 @@ ownCloud is written by:
 - 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>
@@ -132,9 +137,9 @@ 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>
@@ -145,6 +150,8 @@ ownCloud is written by:
 - 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>
@@ -154,13 +161,16 @@ ownCloud is written by:
 - 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 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>
@@ -174,9 +184,11 @@ 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>
@@ -184,12 +196,14 @@ ownCloud is written by:
 - j-ed <juergen@eisfair.org>
 - jknockaert <jasper@knockaert.nl>
 - josh4trunks <joshruehlig@gmail.com>
+ - karakayasemi <karakayasemi@itu.edu.tr>
 - macjohnny <estebanmarin@gmx.ch>
 - 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.
+
@@ -11,7 +11,7 @@ If you have questions about how to install or use Nextcloud, 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/nextcloud/core/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
+* 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/)

@@ -19,7 +19,7 @@ If you have questions about how to install or use Nextcloud, please direct these

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

-[template]: https://raw.github.com/nextcloud/core/master/issue_template.md
+[template]: https://raw.githubusercontent.com/nextcloud/server/master/issue_template.md
 [forum]: https://help.nextcloud.com/
 [irc]: https://webchat.freenode.net/?channels=nextcloud

@@ -29,11 +29,38 @@ Thanks for wanting to contribute source code to Nextcloud. That's great!

 Please read the [Developer Manuals][devmanual] to learn how to create your first application or how to test the Nextcloud 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.

-[devmanual]: https://docs.nextcloud.org/server/10/developer_manual/
+### 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].
@@ -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,33 +1,39 @@
-# Nextcloud
-[![Build Status](https://drone.weasel.rocks/api/badges/nextcloud/server/status.svg)](https://drone.weasel.rocks/nextcloud/server)
+# Nextcloud Server
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/server/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=master)
+[![codecov](https://codecov.io/gh/nextcloud/server/branch/master/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/209/badge)](https://bestpractices.coreinfrastructure.org/projects/209)
 [![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)

-Please stay tuned while we get all the repositories up.
-
-Meanwhile check out https://nextcloud.com and follow us on https://twitter.com/nextclouders
-
-If you want to [contribute](https://nextcloud.com/contribute/), you are very welcome:
-
- on our IRC channels #nextcloud & #nextcloud-dev irc://#nextcloud-dev@freenode.net (on freenode) and
- our forum at https://help.nextcloud.com
-
-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.
-
-if you want to join the Github organization just let us know and we’ll add you! :)
-
-*This is by the community, for the community. Everyone is welcome! :)*
+**A safe home for all your data.**

 ![](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.
+
+*You want to learn more about how you can use Nextcloud to access, share and protect your files, calendars, contacts, communication & more at home and at your Enterprise?* [**Learn about all our Features**](https://nextcloud.com/features).
+
+## Get your Nextcloud
+
+- [**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://help.nextcloud.com)
+* :busts_in_silhouette: [Facebook](https://facebook.com/nextclouders)
+* :hatching_chick: [Twitter](https://twitter.com/Nextclouders)
+
+[…learn more about how to get support for Nextcloud here!](https://nextcloud.com/support)

 ## Contribution Guidelines

@@ -36,20 +42,25 @@ 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 he
+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>)
 ```

-More information how to contribute: https://nextcloud.com/contribute/
+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.

-## Support
-Learn about the different ways you can get support for Nextcloud: https://nextcloud.com/support/
+Please review the [guidelines for contributing](https://github.com/nextcloud/server/blob/master/CONTRIBUTING.md) to this repository.

-## Get in touch
-* :clipboard: [Forum](https://help.nextcloud.com)
-* :hash: [IRC channel](https://webchat.freenode.net/?channels=nextcloud)
-* :busts_in_silhouette: [Facebook] (https://facebook.com/nextclouders)
-* :hatching_chick: [Twitter](https://twitter.com/Nextclouders)
+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.
@@ -1,5 +1,8 @@
 <?php
 /**
+
+ *
+ * @author Bjoern Schiessle <bjoern@schiessle.org>
 * @author Lukas Reschke <lukas@statuscode.ch>
 *
 * @license GNU AGPL version 3 or any later version
@@ -2,17 +2,14 @@
 <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>
+	<description>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</description>
 	<licence>AGPL</licence>
 	<author>Nextcloud</author>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<dependencies>
-		<owncloud min-version="9.0" max-version="9.1" />
+		<nextcloud min-version="11" max-version="11" />
 	</dependencies>
 	<types>
 		<logging/>
 	</types>
-	<default_enable/>
 </info>
@@ -2,6 +2,8 @@
 /**
 * @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
@@ -39,18 +41,28 @@ class Action {
 	 * @param string $text
 	 * @param array $params
 	 * @param array $elements
+	 * @param bool $obfuscateParameters
 	 */
 	public function log($text,
 						array $params,
-						array $elements) {
+						array $elements,
+						$obfuscateParameters = false) {
 		foreach($elements as $element) {
 			if(!isset($params[$element])) {
-				$this->logger->critical(
-					sprintf(
-						'$params["'.$element.'"] was missing. Transferred value: %s',
-						print_r($params, true)
-					)
-				);
+				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;
 			}
 		}
@@ -2,6 +2,8 @@
 /**
 * @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
@@ -32,7 +34,8 @@ class Auth extends Action {
 			$params,
 			[
 				'uid',
-			]
+			],
+			true
 		);
 	}

@@ -42,7 +45,8 @@ class Auth extends Action {
 			$params,
 			[
 				'uid',
-			]
+			],
+			true
 		);
 	}

@@ -2,6 +2,8 @@
 /**
 * @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
@@ -2,6 +2,9 @@
 /**
 * @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
@@ -2,6 +2,8 @@
 /**
 * @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
@@ -2,6 +2,8 @@
 /**
 * @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
@@ -23,9 +25,6 @@
 namespace OCA\Admin_Audit\Actions;


-use OCP\ILogger;
-use OCP\IUserSession;
-
 class Trashbin extends Action {

 	public function delete($params) {
@@ -2,6 +2,9 @@
 /**
 * @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
@@ -2,6 +2,8 @@
 /**
 * @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
@@ -2,6 +2,8 @@
 /**
 * @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
@@ -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,30 +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;
-});
-
-$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);
-};
-
-$eventDispatcher->addListener(\OCP\Comments\CommentsEvent::EVENT_ADD, $managerListener);
-
 $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);
 	});
 });
+
+$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')];
+	}
+);
+
+$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;
+});
@@ -6,11 +6,25 @@
 	<licence>AGPL</licence>
 	<author>Arthur Schiwon, Vincent Petry</author>
 	<default_enable/>
-	<version>0.3.0</version>
+	<version>1.1.0</version>
 	<dependencies>
-		<owncloud min-version="9.1" max-version="9.1" />
+		<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>
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @author Lukas Reschke <lukas@statuscode.ch>
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
 *
 * @copyright Copyright (c) 2016, ownCloud, Inc.
 * @license AGPL-3.0
@@ -19,7 +20,9 @@
 *
 */

-$app = new \OCA\UpdateNotification\AppInfo\Application();
-/** @var OCA\UpdateNotification\Controller\AdminController $controller */
-$controller = $app->getContainer()->query('AdminController');
-return $controller->displayPanel()->render();
+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('keydown 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() {
@@ -276,9 +307,12 @@
 			$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;
 		},

@@ -344,7 +378,6 @@
 				}
 			});

-
 			return false;
 		},

@@ -353,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);
@@ -360,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();

@@ -379,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() {
-						$submit.removeClass('hidden');
-						$loading.addClass('hidden');
-						$textArea.prop('disabled', false);
-
-						OC.Notification.showTemporary(t('comments', 'Error occurred while updating comment with id {id}', {id: commentId}));
+						self._onSubmitError($form, commentId);
 					}
 				});
 			} else {
@@ -408,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() {
-						$submit.removeClass('hidden');
-						$loading.addClass('hidden');
-						$textArea.prop('disabled', false);
-
-						OC.Notification.showTemporary(t('comments', 'Error occurred while posting comment'));
+						self._onSubmitError($form);
 					}
 				});
 			}
@@ -426,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
@@ -437,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')
 			});
 		},
@@ -0,0 +1,34 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Comments" : "Kommentare",
+    "Unknown user" : "Onbekende gebruiker",
+    "New comment …" : "Nuwe kommentaar…",
+    "Delete comment" : "Skrap kommentaar",
+    "Post" : "Plaas",
+    "Cancel" : "Kanselleer",
+    "Edit comment" : "Wysig kommentaar",
+    "[Deleted user]" : "[Geskrapte gebruiker]",
+    "No comments yet, start the conversation!" : "Nog geen kommentaar, begin die gesprek!",
+    "More comments …" : "Nog kommentare …",
+    "Save" : "Bewaar",
+    "Allowed characters {count} of {max}" : "Toegelate karakters {telling} van {maks}",
+    "Error occurred while retrieving comment with id {id}" : "’n Fout het voorgekom toe kommentaar met id {id} opgehaal is",
+    "Error occurred while updating comment with id {id}" : "’n Fout het voorgekom toe kommentaar met id {id} bygewerk is",
+    "Error occurred while posting comment" : "’n Fout het voorgekom toe kommentaar geplaas is",
+    "_%n unread comment_::_%n unread comments_" : ["%n ongeleesde kommentaar","%n ongeleeste kommentare"],
+    "Comment" : "Kommentaar",
+    "You commented" : "U het kommentaar gelewer",
+    "%1$s commented" : "%1$s het kommentaar gelewer",
+    "{author} commented" : "{outeur} het kommentaar gelewer",
+    "You commented on %1$s" : "U het op %1$s kommentaar gelewer",
+    "You commented on {file}" : "U het op {lêer} kommentaar gelewer",
+    "%1$s commented on %2$s" : "%1$s het op %2$s kommentaar gelewer",
+    "{author} commented on {file}" : "{outeur} het op {lêer} kommentaar gelewer",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> vir lêers",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "’n (Nou) geskrapte gebruiker het u in ’n kommentaar op “%s” genoem",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "’n (Nou) geskrapte gebruiker het u in ’n kommentaar op “{lêer}” genoem",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s het u in ’n kommentaar op “%2$s” genoem",
+    "{user} mentioned you in a comment on “{file}”" : "{gebruiker} het u in ’n kommentaar oor “{lêer}” genoem"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,32 @@
+{ "translations": {
+    "Comments" : "Kommentare",
+    "Unknown user" : "Onbekende gebruiker",
+    "New comment …" : "Nuwe kommentaar…",
+    "Delete comment" : "Skrap kommentaar",
+    "Post" : "Plaas",
+    "Cancel" : "Kanselleer",
+    "Edit comment" : "Wysig kommentaar",
+    "[Deleted user]" : "[Geskrapte gebruiker]",
+    "No comments yet, start the conversation!" : "Nog geen kommentaar, begin die gesprek!",
+    "More comments …" : "Nog kommentare …",
+    "Save" : "Bewaar",
+    "Allowed characters {count} of {max}" : "Toegelate karakters {telling} van {maks}",
+    "Error occurred while retrieving comment with id {id}" : "’n Fout het voorgekom toe kommentaar met id {id} opgehaal is",
+    "Error occurred while updating comment with id {id}" : "’n Fout het voorgekom toe kommentaar met id {id} bygewerk is",
+    "Error occurred while posting comment" : "’n Fout het voorgekom toe kommentaar geplaas is",
+    "_%n unread comment_::_%n unread comments_" : ["%n ongeleesde kommentaar","%n ongeleeste kommentare"],
+    "Comment" : "Kommentaar",
+    "You commented" : "U het kommentaar gelewer",
+    "%1$s commented" : "%1$s het kommentaar gelewer",
+    "{author} commented" : "{outeur} het kommentaar gelewer",
+    "You commented on %1$s" : "U het op %1$s kommentaar gelewer",
+    "You commented on {file}" : "U het op {lêer} kommentaar gelewer",
+    "%1$s commented on %2$s" : "%1$s het op %2$s kommentaar gelewer",
+    "{author} commented on {file}" : "{outeur} het op {lêer} kommentaar gelewer",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> vir lêers",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "’n (Nou) geskrapte gebruiker het u in ’n kommentaar op “%s” genoem",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "’n (Nou) geskrapte gebruiker het u in ’n kommentaar op “{lêer}” genoem",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s het u in ’n kommentaar op “%2$s” genoem",
+    "{user} mentioned you in a comment on “{file}”" : "{gebruiker} het u in ’n kommentaar oor “{lêer}” genoem"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -1,23 +1,29 @@
 OC.L10N.register(
    "comments",
    {
-    "Type in a new comment..." : "اكتب تعليق جديد...",
+    "Comments" : "تعليقات",
+    "New comment …" : "تعليق جديد",
    "Delete comment" : "حذف التعليق",
-    "Post" : "مشاركة",
+    "Post" : "ارسال",
    "Cancel" : "إلغاء",
    "Edit comment" : "تعديل التعليق",
    "[Deleted user]" : "[مستخدم محذوف]",
-    "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}",
+    "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..." : "مزيد من التعليقات...",
-    "Save" : "حفظ",
-    "Allowed characters {count} of {max}" : "عدد الأحرف المسموح بها {عدد} من {العدد الأقصى}",
-    "{count} unread comments" : "{عدد} الرسائل الغير مقروءة",
-    "Comment" : "تعليق",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>تعليقات</strong> للملفات <em>(دائماً مصنف في جدول)</em>",
-    "You commented" : "قمت بكتابة تعليق",
-    "%1$s commented" : "%1$s قام بكتابة تعليق",
-    "You commented on %2$s" : "انت قمت بكتابة تعليق على %2$s",
-    "%1$s commented on %2$s" : "%1$s قام بكتابة تعليق على %2$s"
+    "{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,21 +1,27 @@
 { "translations": {
-    "Type in a new comment..." : "اكتب تعليق جديد...",
+    "Comments" : "تعليقات",
+    "New comment …" : "تعليق جديد",
    "Delete comment" : "حذف التعليق",
-    "Post" : "مشاركة",
+    "Post" : "ارسال",
    "Cancel" : "إلغاء",
    "Edit comment" : "تعديل التعليق",
    "[Deleted user]" : "[مستخدم محذوف]",
-    "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}",
+    "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..." : "مزيد من التعليقات...",
-    "Save" : "حفظ",
-    "Allowed characters {count} of {max}" : "عدد الأحرف المسموح بها {عدد} من {العدد الأقصى}",
-    "{count} unread comments" : "{عدد} الرسائل الغير مقروءة",
-    "Comment" : "تعليق",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>تعليقات</strong> للملفات <em>(دائماً مصنف في جدول)</em>",
-    "You commented" : "قمت بكتابة تعليق",
-    "%1$s commented" : "%1$s قام بكتابة تعليق",
-    "You commented on %2$s" : "انت قمت بكتابة تعليق على %2$s",
-    "%1$s commented on %2$s" : "%1$s قام بكتابة تعليق على %2$s"
+    "{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,34 @@
 OC.L10N.register(
    "comments",
    {
+    "Comments" : "Comentarios",
+    "Unknown user" : "Usuariu desconocíu",
+    "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"
+    "Allowed characters {count} of {max}" : "{count} caráuteres almitíos de {max}",
+    "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",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentariu ensin lleer","%n comentarios ensin lleer"],
+    "Comment" : "Comentariu",
+    "You commented" : "Comentesti",
+    "%1$s commented" : "%1$s comentó",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Comentesti en %1$s",
+    "You commented on {file}" : "Comentesti en {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{autor} comentó en {ficheru}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> pa ficheros",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuariu (agora) desaniciáu mentóte nun comentariu de «%s»",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuariu (agora) desaniciáu mentóte nun comentariu de «{file}»",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mentóte nun comentariu de «%2$s»",
+    "{user} mentioned you in a comment on “{file}”" : "{user} mentóte nun comentariu de «{file}»"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,6 +1,32 @@
 { "translations": {
+    "Comments" : "Comentarios",
+    "Unknown user" : "Usuariu desconocíu",
+    "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"
+    "Allowed characters {count} of {max}" : "{count} caráuteres almitíos de {max}",
+    "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",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentariu ensin lleer","%n comentarios ensin lleer"],
+    "Comment" : "Comentariu",
+    "You commented" : "Comentesti",
+    "%1$s commented" : "%1$s comentó",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Comentesti en %1$s",
+    "You commented on {file}" : "Comentesti en {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{autor} comentó en {ficheru}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> pa ficheros",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuariu (agora) desaniciáu mentóte nun comentariu de «%s»",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuariu (agora) desaniciáu mentóte nun comentariu de «{file}»",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mentóte nun comentariu de «%2$s»",
+    "{user} mentioned you in a comment on “{file}”" : "{user} mentóte nun comentariu de «{file}»"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -0,0 +1,34 @@
+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" : "Запазване",
+    "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}”"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,32 @@
+{ "translations": {
+    "Comments" : "Коментари",
+    "Unknown user" : "Непознат потребител",
+    "New comment …" : "Нов коментар...",
+    "Delete comment" : "Изтрий коментар",
+    "Post" : "Публикация",
+    "Cancel" : "Отказ",
+    "Edit comment" : "Редактирай коментра",
+    "[Deleted user]" : "[Изтрит потребител]",
+    "No comments yet, start the conversation!" : "Все-още няма коментари, започни разговор!",
+    "More comments …" : "Още коментари...",
+    "Save" : "Запазване",
+    "Allowed characters {count} of {max}" : "Позволени символи {count} от {max}",
+    "Error occurred while retrieving comment with id {id}" : "Възникна грешка по време на извличане на коментар с код {id}",
+    "Error occurred while updating comment with id {id}" : "Възникна грешка по време на обновяване на коментар с код {id}",
+    "Error occurred while posting comment" : "Възникна грешка по време на изпращане на коментар",
+    "_%n unread comment_::_%n unread comments_" : ["%n непрочетен коментар","%n непрочетени коментари"],
+    "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}”"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -1,20 +1,39 @@
 OC.L10N.register(
    "comments",
    {
-    "Type in a new comment..." : "Напиши нов коментар...",
+    "Comments" : "Коментари",
+    "Unknown user" : "Непознат потребител",
+    "New comment …" : "Нов коментар...",
    "Delete comment" : "Изтрий коментар",
    "Post" : "Публикация",
    "Cancel" : "Отказ",
    "Edit comment" : "Редактирай коментра",
    "[Deleted user]" : "[Изтрит потребител]",
-    "Comments" : "Коментари",
-    "No other comments available" : "Няма други коментари",
-    "More comments..." : "Още коментари...",
+    "No comments yet, start the conversation!" : "Все-още няма коментари, започни разговор!",
+    "More comments …" : "Още коментари...",
    "Save" : "Запазване",
    "Allowed characters {count} of {max}" : "Позволени символи {count} от {max}",
-    "{count} unread comments" : "{count} нечетени коментари",
+    "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" : "Коментар",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Коментари</strong> на файлове <em>(винаги изписвани в stream-а)</em>",
-    "You commented" : "Вие коментирахте"
+    "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,18 +1,37 @@
 { "translations": {
-    "Type in a new comment..." : "Напиши нов коментар...",
+    "Comments" : "Коментари",
+    "Unknown user" : "Непознат потребител",
+    "New comment …" : "Нов коментар...",
    "Delete comment" : "Изтрий коментар",
    "Post" : "Публикация",
    "Cancel" : "Отказ",
    "Edit comment" : "Редактирай коментра",
    "[Deleted user]" : "[Изтрит потребител]",
-    "Comments" : "Коментари",
-    "No other comments available" : "Няма други коментари",
-    "More comments..." : "Още коментари...",
+    "No comments yet, start the conversation!" : "Все-още няма коментари, започни разговор!",
+    "More comments …" : "Още коментари...",
    "Save" : "Запазване",
    "Allowed characters {count} of {max}" : "Позволени символи {count} от {max}",
-    "{count} unread comments" : "{count} нечетени коментари",
+    "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" : "Коментар",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Коментари</strong> на файлове <em>(винаги изписвани в stream-а)</em>",
-    "You commented" : "Вие коментирахте"
+    "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,23 +1,34 @@
 OC.L10N.register(
    "comments",
    {
-    "Type in a new comment..." : "Escriu en un nou comentari...",
+    "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]",
-    "Comments" : "Comentaris",
-    "No other comments available" : "No hi han altres comentaris disponibles",
-    "More comments..." : "Més comentaris",
+    "No comments yet, start the conversation!" : "Encara no hi ha comentaris. Comenceu la conversa!",
+    "More comments …" : "Més comentaris...",
    "Save" : "Desa",
-    "Allowed characters {count} of {max}" : "caracters Permessos {count} de {max}",
-    "{count} unread comments" : "{count} comentaris no llegits",
+    "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",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentaris</strong> per arxius <em>(sempre llistat en corrent)",
-    "You commented" : "Has comentat",
-    "%1$s commented" : "%1$s comentat",
-    "You commented on %2$s" : "Has comentat a %2$s",
-    "%1$s commented on %2$s" : "%1$s ha comentat a %2$s"
+    "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}”"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,21 +1,32 @@
 { "translations": {
-    "Type in a new comment..." : "Escriu en un nou comentari...",
+    "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]",
-    "Comments" : "Comentaris",
-    "No other comments available" : "No hi han altres comentaris disponibles",
-    "More comments..." : "Més comentaris",
+    "No comments yet, start the conversation!" : "Encara no hi ha comentaris. Comenceu la conversa!",
+    "More comments …" : "Més comentaris...",
    "Save" : "Desa",
-    "Allowed characters {count} of {max}" : "caracters Permessos {count} de {max}",
-    "{count} unread comments" : "{count} comentaris no llegits",
+    "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",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentaris</strong> per arxius <em>(sempre llistat en corrent)",
-    "You commented" : "Has comentat",
-    "%1$s commented" : "%1$s comentat",
-    "You commented on %2$s" : "Has comentat a %2$s",
-    "%1$s commented on %2$s" : "%1$s ha comentat a %2$s"
+    "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}”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -0,0 +1,34 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Comments" : "Komentáře",
+    "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 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}”"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
@@ -0,0 +1,32 @@
+{ "translations": {
+    "Comments" : "Komentáře",
+    "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 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}”"
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
@@ -1,26 +1,39 @@
 OC.L10N.register(
    "comments",
    {
-    "Type in a new comment..." : "Zadat nový komentář...",
+    "Comments" : "Komentáře",
+    "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]",
-    "Comments" : "Komentáře",
-    "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",
-    "{count} unread comments" : "{count} nepřečtených komentářů",
+    "_%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ář",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Komentáře</strong> pro soubory <em>(vždy uvedeny v proudu)</em>",
    "You commented" : "Okomentoval(a) jsi",
    "%1$s commented" : "%1$s okomentován",
-    "You commented on %2$s" : "Okomentoval(a) jsi %2$s",
-    "%1$s commented on %2$s" : "%1$s okomentoval %2$s"
+    "{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ářů",
+    "You commented on %2$s" : "Okomentoval(a) jsi %2$s"
 },
 "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
@@ -1,24 +1,37 @@
 { "translations": {
-    "Type in a new comment..." : "Zadat nový komentář...",
+    "Comments" : "Komentáře",
+    "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]",
-    "Comments" : "Komentáře",
-    "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",
-    "{count} unread comments" : "{count} nepřečtených komentářů",
+    "_%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ář",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Komentáře</strong> pro soubory <em>(vždy uvedeny v proudu)</em>",
    "You commented" : "Okomentoval(a) jsi",
    "%1$s commented" : "%1$s okomentován",
-    "You commented on %2$s" : "Okomentoval(a) jsi %2$s",
-    "%1$s commented on %2$s" : "%1$s okomentoval %2$s"
+    "{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ářů",
+    "You commented on %2$s" : "Okomentoval(a) jsi %2$s"
 },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
 }
@@ -1,25 +1,34 @@
 OC.L10N.register(
    "comments",
    {
-    "Type in a new comment..." : "Indtast en ny kommentar...",
+    "Comments" : "Kommentarer",
+    "Unknown user" : "Ukendt bruger",
+    "New comment …" : "Ny kommentar ...",
    "Delete comment" : "Slet kommentar",
    "Post" : "Indlæg",
    "Cancel" : "Annullér",
    "Edit comment" : "Rediger kommentar",
-    "[Deleted user]" : "[Deleted user]",
-    "Comments" : "Kommentarer",
-    "No other comments available" : "Ingen andre kommentarer tilgængelige",
-    "More comments..." : "Flere kommentarer...",
+    "[Deleted user]" : "[Slettet user]",
+    "No comments yet, start the conversation!" : "Ingen kommentarer endnu, start samtalen!",
+    "More comments …" : "Flere kommentarer...",
    "Save" : "Gem",
    "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",
-    "{count} unread comments" : "{count} ulæste kommentarer",
+    "_%n unread comment_::_%n unread comments_" : ["%n ulæst kommentar","%n ulæste kommentarer"],
    "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"
+    "{author} commented" : "{author} kommenterede",
+    "You commented on %1$s" : "Du kommenterede %1$s",
+    "You commented on {file}" : "Du kommenterede {file}",
+    "%1$s commented on %2$s" : "%1$s kommenterede %2$s",
+    "{author} commented on {file}" : "{author} kommenterede {file}",
+    "<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> for filer",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "En (nu) slettet bruger nævnte dig i en kommentarer på “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "En (nu) slettet bruger nævnte dig i en kommentarer på \"{file}\"",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s nævnte dig i en kommentarer på “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} nævnte dig i en kommentarer på \"{file}\""
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,23 +1,32 @@
 { "translations": {
-    "Type in a new comment..." : "Indtast en ny kommentar...",
+    "Comments" : "Kommentarer",
+    "Unknown user" : "Ukendt bruger",
+    "New comment …" : "Ny kommentar ...",
    "Delete comment" : "Slet kommentar",
    "Post" : "Indlæg",
    "Cancel" : "Annullér",
    "Edit comment" : "Rediger kommentar",
-    "[Deleted user]" : "[Deleted user]",
-    "Comments" : "Kommentarer",
-    "No other comments available" : "Ingen andre kommentarer tilgængelige",
-    "More comments..." : "Flere kommentarer...",
+    "[Deleted user]" : "[Slettet user]",
+    "No comments yet, start the conversation!" : "Ingen kommentarer endnu, start samtalen!",
+    "More comments …" : "Flere kommentarer...",
    "Save" : "Gem",
    "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",
-    "{count} unread comments" : "{count} ulæste kommentarer",
+    "_%n unread comment_::_%n unread comments_" : ["%n ulæst kommentar","%n ulæste kommentarer"],
    "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"
+    "{author} commented" : "{author} kommenterede",
+    "You commented on %1$s" : "Du kommenterede %1$s",
+    "You commented on {file}" : "Du kommenterede {file}",
+    "%1$s commented on %2$s" : "%1$s kommenterede %2$s",
+    "{author} commented on {file}" : "{author} kommenterede {file}",
+    "<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> for filer",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "En (nu) slettet bruger nævnte dig i en kommentarer på “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "En (nu) slettet bruger nævnte dig i en kommentarer på \"{file}\"",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s nævnte dig i en kommentarer på “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} nævnte dig i en kommentarer på \"{file}\""
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,26 +1,34 @@
 OC.L10N.register(
    "comments",
    {
-    "Type in a new comment..." : "Bitte gib einen neuen Kommentar ein...",
+    "Comments" : "Kommentare",
+    "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]",
-    "Comments" : "Kommentare",
-    "No other comments available" : "Keine weiteren 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",
-    "{count} unread comments" : "{count} ungelesene Kommentare",
+    "_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
    "Comment" : "Kommentar",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentare</strong> für Dateien<em>(immer im Stream aufgelistet)</em>",
    "You commented" : "Von Dir kommentiert",
-    "%1$s commented" : "%1$s kommentiert",
-    "You commented on %2$s" : "Du hast %2$s kommentiert",
-    "%1$s commented on %2$s" : "%1$s kommentierte %2$s"
+    "%1$s commented" : "%1$s kommentierte",
+    "{author} commented" : "{author} kommentierte",
+    "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 Benutzer hat Dich in einem Kommentar zu \"%s\" erwähnt",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Benutzer hat Dich in einem Kommentar zu “{file}” erwähnt",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Dich in einem Kommentar zu “%2$s” erwähnt ",
+    "{user} mentioned you in a comment on “{file}”" : "{user} hat Dich in einem Kommentar zu “{file}” erwähnt "
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,24 +1,32 @@
 { "translations": {
-    "Type in a new comment..." : "Bitte gib einen neuen Kommentar ein...",
+    "Comments" : "Kommentare",
+    "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]",
-    "Comments" : "Kommentare",
-    "No other comments available" : "Keine weiteren 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",
-    "{count} unread comments" : "{count} ungelesene Kommentare",
+    "_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
    "Comment" : "Kommentar",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentare</strong> für Dateien<em>(immer im Stream aufgelistet)</em>",
    "You commented" : "Von Dir kommentiert",
-    "%1$s commented" : "%1$s kommentiert",
-    "You commented on %2$s" : "Du hast %2$s kommentiert",
-    "%1$s commented on %2$s" : "%1$s kommentierte %2$s"
+    "%1$s commented" : "%1$s kommentierte",
+    "{author} commented" : "{author} kommentierte",
+    "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 Benutzer hat Dich in einem Kommentar zu \"%s\" erwähnt",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Benutzer hat Dich in einem Kommentar zu “{file}” erwähnt",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Dich in einem Kommentar zu “%2$s” erwähnt ",
+    "{user} mentioned you in a comment on “{file}”" : "{user} hat Dich in einem Kommentar zu “{file}” erwähnt "
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,26 +1,34 @@
 OC.L10N.register(
    "comments",
    {
-    "Type in a new comment..." : "Neuen Kommentar eingeben...",
+    "Comments" : "Kommentare",
+    "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]",
-    "Comments" : "Kommentare",
-    "No other comments available" : "Keine weiteren 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",
-    "{count} unread comments" : "[count] ungelesene Kommentare",
+    "_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
    "Comment" : "Kommentar",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentare</strong> für Dateien<em>(immer im Stream aufgelistet)</em>",
    "You commented" : "Sie haben kommentiert",
-    "%1$s commented" : "%1$s kommentiert",
-    "You commented on %2$s" : "Sie haben %2$s kommentiert",
-    "%1$s commented on %2$s" : "%1$s kommentierte %2$s"
+    "%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"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,24 +1,32 @@
 { "translations": {
-    "Type in a new comment..." : "Neuen Kommentar eingeben...",
+    "Comments" : "Kommentare",
+    "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]",
-    "Comments" : "Kommentare",
-    "No other comments available" : "Keine weiteren 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",
-    "{count} unread comments" : "[count] ungelesene Kommentare",
+    "_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
    "Comment" : "Kommentar",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentare</strong> für Dateien<em>(immer im Stream aufgelistet)</em>",
    "You commented" : "Sie haben kommentiert",
-    "%1$s commented" : "%1$s kommentiert",
-    "You commented on %2$s" : "Sie haben %2$s kommentiert",
-    "%1$s commented on %2$s" : "%1$s kommentierte %2$s"
+    "%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"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,22 +1,34 @@
 OC.L10N.register(
    "comments",
    {
-    "Type in a new comment..." : "Αυτό είναι ένα νέο σχόλιο...",
+    "Comments" : "Σχόλια",
+    "Unknown user" : "Άγνωστος χρήστης",
+    "New comment …" : "Νέο σχόλιο ...",
    "Delete comment" : "Διαγραφή σχολίου",
    "Post" : "Δημοσίευση",
-    "Cancel" : "Άκυρο",
+    "Cancel" : "Ακύρωση",
    "Edit comment" : "Επεξεργασία σχολίου",
-    "[Deleted user]" : "[Διαγραφή χρήστη]",
-    "Comments" : "Σχόλια",
-    "No other comments available" : "Δεν υπάρχουν άλλα διαθέσιμα σχόλια",
-    "More comments..." : "Περισσότερα σχόλια...",
+    "[Deleted user]" : "[Διαγραμμένος χρήστης]",
+    "No comments yet, start the conversation!" : "Δεν υπάρχουν σχόλια, ξεκινήστε την συζήτηση!",
+    "More comments …" : "Περισσότερα σχόλια ...",
    "Save" : "Αποθήκευση",
    "Allowed characters {count} of {max}" : "Επιτρεπόμενοι χαρακτήρες {count} από {max}",
-    "{count} unread comments" : "{count} μη αναγνωσμένα σχόλια",
+    "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 σχολίασε",
-    "You commented on %2$s" : "Σχολιάσατε στο %2$s",
-    "%1$s commented on %2$s" : "%1$s σχολίασε στο %2$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}”"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,20 +1,32 @@
 { "translations": {
-    "Type in a new comment..." : "Αυτό είναι ένα νέο σχόλιο...",
+    "Comments" : "Σχόλια",
+    "Unknown user" : "Άγνωστος χρήστης",
+    "New comment …" : "Νέο σχόλιο ...",
    "Delete comment" : "Διαγραφή σχολίου",
    "Post" : "Δημοσίευση",
-    "Cancel" : "Άκυρο",
+    "Cancel" : "Ακύρωση",
    "Edit comment" : "Επεξεργασία σχολίου",
-    "[Deleted user]" : "[Διαγραφή χρήστη]",
-    "Comments" : "Σχόλια",
-    "No other comments available" : "Δεν υπάρχουν άλλα διαθέσιμα σχόλια",
-    "More comments..." : "Περισσότερα σχόλια...",
+    "[Deleted user]" : "[Διαγραμμένος χρήστης]",
+    "No comments yet, start the conversation!" : "Δεν υπάρχουν σχόλια, ξεκινήστε την συζήτηση!",
+    "More comments …" : "Περισσότερα σχόλια ...",
    "Save" : "Αποθήκευση",
    "Allowed characters {count} of {max}" : "Επιτρεπόμενοι χαρακτήρες {count} από {max}",
-    "{count} unread comments" : "{count} μη αναγνωσμένα σχόλια",
+    "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 σχολίασε",
-    "You commented on %2$s" : "Σχολιάσατε στο %2$s",
-    "%1$s commented on %2$s" : "%1$s σχολίασε στο %2$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}”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,26 +1,34 @@
 OC.L10N.register(
    "comments",
    {
-    "Type in a new comment..." : "Type a new comment...",
+    "Comments" : "Comments",
+    "Unknown user" : "Unknown user",
+    "New comment …" : "New comment …",
    "Delete comment" : "Delete comment",
    "Post" : "Post",
    "Cancel" : "Cancel",
    "Edit comment" : "Edit comment",
    "[Deleted user]" : "[Deleted user]",
-    "Comments" : "Comments",
-    "No other comments available" : "No other comments available",
-    "More comments..." : "More comments...",
+    "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",
-    "{count} unread comments" : "{count} unread comments",
+    "_%n unread comment_::_%n unread comments_" : ["%n unread comment","%n unread comments"],
    "Comment" : "Comment",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comments</strong> for files <em>(always listed in stream)</em>",
    "You commented" : "You commented",
    "%1$s commented" : "%1$s commented",
-    "You commented on %2$s" : "You commented on %2$s",
-    "%1$s commented on %2$s" : "%1$s commented on %2$s"
+    "{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}”"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,24 +1,32 @@
 { "translations": {
-    "Type in a new comment..." : "Type a new comment...",
+    "Comments" : "Comments",
+    "Unknown user" : "Unknown user",
+    "New comment …" : "New comment …",
    "Delete comment" : "Delete comment",
    "Post" : "Post",
    "Cancel" : "Cancel",
    "Edit comment" : "Edit comment",
    "[Deleted user]" : "[Deleted user]",
-    "Comments" : "Comments",
-    "No other comments available" : "No other comments available",
-    "More comments..." : "More comments...",
+    "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",
-    "{count} unread comments" : "{count} unread comments",
+    "_%n unread comment_::_%n unread comments_" : ["%n unread comment","%n unread comments"],
    "Comment" : "Comment",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comments</strong> for files <em>(always listed in stream)</em>",
    "You commented" : "You commented",
    "%1$s commented" : "%1$s commented",
-    "You commented on %2$s" : "You commented on %2$s",
-    "%1$s commented on %2$s" : "%1$s commented on %2$s"
+    "{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}”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,26 +1,34 @@
 OC.L10N.register(
    "comments",
    {
-    "Type in a new comment..." : "Escribe un nuevo comentario...",
+    "Comments" : "Comentarios",
+    "Unknown user" : "Usuario desconocido",
+    "New comment …" : "Comentario nuevo",
    "Delete comment" : "Borrar comentario",
    "Post" : "Publicar",
    "Cancel" : "Cancelar",
    "Edit comment" : "Editar comentario",
    "[Deleted user]" : "[Usuario eliminado]",
-    "Comments" : "Comentarios",
-    "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",
-    "{count} unread comments" : "{count} comentarios no leídos",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentario sin leer","%n comentarios sin leer"],
    "Comment" : "Comentario",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentarios</strong> de archivos <em>(siempre se listarán en stream)</em>",
    "You commented" : "Has comentado",
    "%1$s commented" : "%1$s comentados",
-    "You commented on %2$s" : "Has comentado en %2$s",
-    "%1$s commented on %2$s" : "%1$s comentados en %2$s"
+    "{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}”"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,24 +1,32 @@
 { "translations": {
-    "Type in a new comment..." : "Escribe un nuevo comentario...",
+    "Comments" : "Comentarios",
+    "Unknown user" : "Usuario desconocido",
+    "New comment …" : "Comentario nuevo",
    "Delete comment" : "Borrar comentario",
    "Post" : "Publicar",
    "Cancel" : "Cancelar",
    "Edit comment" : "Editar comentario",
    "[Deleted user]" : "[Usuario eliminado]",
-    "Comments" : "Comentarios",
-    "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",
-    "{count} unread comments" : "{count} comentarios no leídos",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentario sin leer","%n comentarios sin leer"],
    "Comment" : "Comentario",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentarios</strong> de archivos <em>(siempre se listarán en stream)</em>",
    "You commented" : "Has comentado",
    "%1$s commented" : "%1$s comentados",
-    "You commented on %2$s" : "Has comentado en %2$s",
-    "%1$s commented on %2$s" : "%1$s comentados en %2$s"
+    "{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}”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,25 +1,25 @@
 OC.L10N.register(
    "comments",
    {
-    "Type in a new comment..." : "Escribir un nuevo comentario",
    "Delete comment" : "Eliminar comentario",
    "Post" : "Publicar",
    "Cancel" : "Cancelar",
    "Edit comment" : "Modificar comentario",
    "[Deleted user]" : "[Usuario eliminado]",
    "Comments" : "Comentarios",
-    "No other comments available" : "No hay mas comentarios",
-    "More comments..." : "Mas 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",
-    "{count} unread comments" : "{count} comentarios no leídos",
    "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"
+    "%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);");
@@ -1,23 +1,23 @@
 { "translations": {
-    "Type in a new comment..." : "Escribir un nuevo comentario",
    "Delete comment" : "Eliminar comentario",
    "Post" : "Publicar",
    "Cancel" : "Cancelar",
    "Edit comment" : "Modificar comentario",
    "[Deleted user]" : "[Usuario eliminado]",
    "Comments" : "Comentarios",
-    "No other comments available" : "No hay mas comentarios",
-    "More comments..." : "Mas 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",
-    "{count} unread comments" : "{count} comentarios no leídos",
    "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"
+    "%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,7 +1,34 @@
 OC.L10N.register(
    "comments",
    {
+    "Comments" : "Comentarios",
+    "Unknown user" : "Usuario desconocido",
+    "New comment …" : "Nuevo comentario ...",
+    "Delete comment" : "Borrar comentario",
+    "Post" : "Post",
    "Cancel" : "Cancelar",
-    "Save" : "Guardar"
+    "Edit comment" : "Editar comentario",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "No hay comentarios aún, iniciar la conversación!",
+    "More comments …" : "Más comentarios ...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} of {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 publicar un comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentar",
+    "You commented" : "Ud. ha comentado",
+    "%1$s commented" : "%1$s comentados",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Ud. ah comentado en %1$s",
+    "You commented on {file}" : "Ud. ha comentado en {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Un (now) usuario borrado te ha mencionado en un comentario en “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un (now) usuario borrado the ha mencionado en un comentario en “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te ha mencionado en un comentario en “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te ha mencionado en un comentario en “{file}”"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,5 +1,32 @@
 { "translations": {
+    "Comments" : "Comentarios",
+    "Unknown user" : "Usuario desconocido",
+    "New comment …" : "Nuevo comentario ...",
+    "Delete comment" : "Borrar comentario",
+    "Post" : "Post",
    "Cancel" : "Cancelar",
-    "Save" : "Guardar"
+    "Edit comment" : "Editar comentario",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "No hay comentarios aún, iniciar la conversación!",
+    "More comments …" : "Más comentarios ...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} of {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 publicar un comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentar",
+    "You commented" : "Ud. ha comentado",
+    "%1$s commented" : "%1$s comentados",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Ud. ah comentado en %1$s",
+    "You commented on {file}" : "Ud. ha comentado en {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Un (now) usuario borrado te ha mencionado en un comentario en “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un (now) usuario borrado the ha mencionado en un comentario en “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te ha mencionado en un comentario en “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te ha mencionado en un comentario en “{file}”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,8 +1,34 @@
 OC.L10N.register(
    "comments",
    {
+    "Comments" : "Comentarios",
+    "Unknown user" : "Usuario desconocido",
+    "New comment …" : "Comentario nuevo ...",
+    "Delete comment" : "Borrar comentario",
+    "Post" : "Publicar",
    "Cancel" : "Cancelar",
+    "Edit comment" : "Editar comentario",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
+    "More comments …" : "Más comentarios ...",
    "Save" : "Guardar",
-    "Comment" : "Comentario"
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while retrieving comment with id {id}" : "Se presentó un error al recuperar el comentario con Id {id}",
+    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
+    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentario",
+    "You commented" : "Comentaste",
+    "%1$s commented" : "%1$s comentó",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Usted comentó en %1$s",
+    "You commented on {file}" : "Hiciste un comentario de {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario 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}”"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,6 +1,32 @@
 { "translations": {
+    "Comments" : "Comentarios",
+    "Unknown user" : "Usuario desconocido",
+    "New comment …" : "Comentario nuevo ...",
+    "Delete comment" : "Borrar comentario",
+    "Post" : "Publicar",
    "Cancel" : "Cancelar",
+    "Edit comment" : "Editar comentario",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
+    "More comments …" : "Más comentarios ...",
    "Save" : "Guardar",
-    "Comment" : "Comentario"
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while retrieving comment with id {id}" : "Se presentó un error al recuperar el comentario con Id {id}",
+    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
+    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentario",
+    "You commented" : "Comentaste",
+    "%1$s commented" : "%1$s comentó",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Usted comentó en %1$s",
+    "You commented on {file}" : "Hiciste un comentario de {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario 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}”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,8 +1,30 @@
 OC.L10N.register(
    "comments",
    {
+    "Comments" : "Iruzkinak",
+    "New comment …" : "Iruzkin berria...",
+    "Delete comment" : "Ezabatu iruzkina",
    "Cancel" : "Ezeztatu",
+    "Edit comment" : "Iruzkina aldatu",
+    "No comments yet, start the conversation!" : "Oraindik ez dago iruzkinik, izan zaites lehena zerbait esanez!",
+    "More comments …" : "Iruzkin gehiago...",
    "Save" : "Gorde",
-    "Comment" : "Iruzkina"
+    "Error occurred while retrieving comment with id {id}" : "Akatsa gertatu da {id} id duen iruzkina berreskuratzerakoan",
+    "Error occurred while updating comment with id {id}" : "Akats bat gertatu da {id} id duen iruzkina aldatzerakoan",
+    "Error occurred while posting comment" : "Akats bat gertatu da iruzkina bidaltzerakoan",
+    "_%n unread comment_::_%n unread comments_" : ["iruzkin %n irakurri gabe","%n iruzkin irakurri gabe"],
+    "Comment" : "Iruzkina",
+    "You commented" : "Iruzkindu duzu",
+    "%1$s commented" : "%1$s iruzkin du",
+    "{author} commented" : "{author} iruzkin du",
+    "You commented on %1$s" : "%1$s-en Iruzkin duzu",
+    "You commented on {file}" : "{file}-en Iruzkin duzu",
+    "%1$s commented on %2$s" : "%1$s %2$s-en iruzkin du",
+    "{author} commented on {file}" : "{author} {file}-en iruzkin du",
+    "<strong>Comments</strong> for files" : "Fitxategientzako <strong>iruzkinak</ strong> ",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "(Orain) Ezabatutako erabiltzaile batek aipatu zaitu iruzkinean \"%s\"",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "(Orain) Ezabatutako erabiltzaile batek aipatu zaitu iruzkinean “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s aipatu zaitu iruzkinean \"“%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} aipatu zaitu iruzkinean “{file}”"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,6 +1,28 @@
 { "translations": {
+    "Comments" : "Iruzkinak",
+    "New comment …" : "Iruzkin berria...",
+    "Delete comment" : "Ezabatu iruzkina",
    "Cancel" : "Ezeztatu",
+    "Edit comment" : "Iruzkina aldatu",
+    "No comments yet, start the conversation!" : "Oraindik ez dago iruzkinik, izan zaites lehena zerbait esanez!",
+    "More comments …" : "Iruzkin gehiago...",
    "Save" : "Gorde",
-    "Comment" : "Iruzkina"
+    "Error occurred while retrieving comment with id {id}" : "Akatsa gertatu da {id} id duen iruzkina berreskuratzerakoan",
+    "Error occurred while updating comment with id {id}" : "Akats bat gertatu da {id} id duen iruzkina aldatzerakoan",
+    "Error occurred while posting comment" : "Akats bat gertatu da iruzkina bidaltzerakoan",
+    "_%n unread comment_::_%n unread comments_" : ["iruzkin %n irakurri gabe","%n iruzkin irakurri gabe"],
+    "Comment" : "Iruzkina",
+    "You commented" : "Iruzkindu duzu",
+    "%1$s commented" : "%1$s iruzkin du",
+    "{author} commented" : "{author} iruzkin du",
+    "You commented on %1$s" : "%1$s-en Iruzkin duzu",
+    "You commented on {file}" : "{file}-en Iruzkin duzu",
+    "%1$s commented on %2$s" : "%1$s %2$s-en iruzkin du",
+    "{author} commented on {file}" : "{author} {file}-en iruzkin du",
+    "<strong>Comments</strong> for files" : "Fitxategientzako <strong>iruzkinak</ strong> ",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "(Orain) Ezabatutako erabiltzaile batek aipatu zaitu iruzkinean \"%s\"",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "(Orain) Ezabatutako erabiltzaile batek aipatu zaitu iruzkinean “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s aipatu zaitu iruzkinean \"“%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} aipatu zaitu iruzkinean “{file}”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -0,0 +1,34 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Comments" : "Kommentit",
+    "Unknown user" : "Tuntematon käyttäjä",
+    "New comment …" : "Uusi kommentti…",
+    "Delete comment" : "Poista kommentti",
+    "Post" : "Lähetä",
+    "Cancel" : "Peruuta",
+    "Edit comment" : "Muokkaa kommenttia",
+    "[Deleted user]" : "[Poistettu käyttäjä]",
+    "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",
+    "{author} commented" : "{author} kommentoi",
+    "You commented on %1$s" : "Kommentoit %1$s",
+    "You commented on {file}" : "Kommentoit tiedostoa {file}",
+    "%1$s commented on %2$s" : "%1$s kommentoi kohdetta %2$s",
+    "{author} commented on {file}" : "{author} kommentoi tiedostoa {file}",
+    "<strong>Comments</strong> for files" : "Tiedostojen <strong>kommentit</strong>",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Poistettu käyttäjä mainitsi sinut kommentissa \"%s\"",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Poistettu käyttäjä mainitsi sinut tiedoston \"{file}\" kommentissa",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mainitsi sinut kommentissa “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} mainitsi sinut tiedoston \"{file}\" kommentissa"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,32 @@
+{ "translations": {
+    "Comments" : "Kommentit",
+    "Unknown user" : "Tuntematon käyttäjä",
+    "New comment …" : "Uusi kommentti…",
+    "Delete comment" : "Poista kommentti",
+    "Post" : "Lähetä",
+    "Cancel" : "Peruuta",
+    "Edit comment" : "Muokkaa kommenttia",
+    "[Deleted user]" : "[Poistettu käyttäjä]",
+    "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",
+    "{author} commented" : "{author} kommentoi",
+    "You commented on %1$s" : "Kommentoit %1$s",
+    "You commented on {file}" : "Kommentoit tiedostoa {file}",
+    "%1$s commented on %2$s" : "%1$s kommentoi kohdetta %2$s",
+    "{author} commented on {file}" : "{author} kommentoi tiedostoa {file}",
+    "<strong>Comments</strong> for files" : "Tiedostojen <strong>kommentit</strong>",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Poistettu käyttäjä mainitsi sinut kommentissa \"%s\"",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Poistettu käyttäjä mainitsi sinut tiedoston \"{file}\" kommentissa",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mainitsi sinut kommentissa “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} mainitsi sinut tiedoston \"{file}\" kommentissa"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -1,26 +1,30 @@
 OC.L10N.register(
    "comments",
    {
-    "Type in a new comment..." : "Kirjoita uusi kommentti...",
+    "Comments" : "Kommentit",
+    "New comment …" : "Uusi kommentti …",
    "Delete comment" : "Poista kommentti",
    "Post" : "Lähetä",
    "Cancel" : "Peruuta",
    "Edit comment" : "Muokkaa kommenttia",
    "[Deleted user]" : "[Poistettu käyttäjä]",
-    "Comments" : "Kommentit",
-    "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ä",
-    "{count} unread comments" : "{count} lukematonta kommenttia",
+    "_%n unread comment_::_%n unread comments_" : ["%n lukematon kommentti","%n lukematonta kommenttia"],
    "Comment" : "Kommentti",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentit</strong> tiedostoille <em>(aina listattu luettelossa)</em>",
    "You commented" : "Kommentoit",
    "%1$s commented" : "%1$s kommentoi",
-    "You commented on %2$s" : "Kommentoit %2$s",
-    "%1$s commented on %2$s" : "%1$s kommentoi kohdetta %2$s"
+    "%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",
+    "You commented on %2$s" : "Kommentoit %2$s"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,24 +1,28 @@
 { "translations": {
-    "Type in a new comment..." : "Kirjoita uusi kommentti...",
+    "Comments" : "Kommentit",
+    "New comment …" : "Uusi kommentti …",
    "Delete comment" : "Poista kommentti",
    "Post" : "Lähetä",
    "Cancel" : "Peruuta",
    "Edit comment" : "Muokkaa kommenttia",
    "[Deleted user]" : "[Poistettu käyttäjä]",
-    "Comments" : "Kommentit",
-    "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ä",
-    "{count} unread comments" : "{count} lukematonta kommenttia",
+    "_%n unread comment_::_%n unread comments_" : ["%n lukematon kommentti","%n lukematonta kommenttia"],
    "Comment" : "Kommentti",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Kommentit</strong> tiedostoille <em>(aina listattu luettelossa)</em>",
    "You commented" : "Kommentoit",
    "%1$s commented" : "%1$s kommentoi",
-    "You commented on %2$s" : "Kommentoit %2$s",
-    "%1$s commented on %2$s" : "%1$s kommentoi kohdetta %2$s"
+    "%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",
+    "You commented on %2$s" : "Kommentoit %2$s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,26 +1,34 @@
 OC.L10N.register(
    "comments",
    {
-    "Type in a new comment..." : "Écrire un nouveau commentaire...",
+    "Comments" : "Commentaires",
+    "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é]",
-    "Comments" : "Commentaires",
-    "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",
-    "{count} unread comments" : "{count} commentaires non lus",
+    "_%n unread comment_::_%n unread comments_" : ["%n commentaire non lu","%n commentaires non lus"],
    "Comment" : "Commenter",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Commentaires</strong> pour les fichiers <em>(toujours listés dans le flux)</em>",
    "You commented" : "Vous avez commenté",
    "%1$s commented" : "%1$s a commenté",
-    "You commented on %2$s" : "Vous avez commenté %2$s",
-    "%1$s commented on %2$s" : "%1$s a commenté %2$s"
+    "{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}”"
 },
 "nplurals=2; plural=(n > 1);");
@@ -1,24 +1,32 @@
 { "translations": {
-    "Type in a new comment..." : "Écrire un nouveau commentaire...",
+    "Comments" : "Commentaires",
+    "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é]",
-    "Comments" : "Commentaires",
-    "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",
-    "{count} unread comments" : "{count} commentaires non lus",
+    "_%n unread comment_::_%n unread comments_" : ["%n commentaire non lu","%n commentaires non lus"],
    "Comment" : "Commenter",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Commentaires</strong> pour les fichiers <em>(toujours listés dans le flux)</em>",
    "You commented" : "Vous avez commenté",
    "%1$s commented" : "%1$s a commenté",
-    "You commented on %2$s" : "Vous avez commenté %2$s",
-    "%1$s commented on %2$s" : "%1$s a commenté %2$s"
+    "{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}”"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
@@ -1,8 +1,34 @@
 OC.L10N.register(
    "comments",
    {
+    "Comments" : "Comentarios",
+    "Unknown user" : "Usuario descoñecido",
+    "New comment …" : "Comentario novo …",
+    "Delete comment" : "Eliminar comentario",
+    "Post" : "Publicar",
    "Cancel" : "Cancelar",
+    "Edit comment" : "Editar comentario",
+    "[Deleted user]" : "[Usuario eliminado]",
+    "No comments yet, start the conversation!" : "Aínda non hai comentarios, comeza a conversa!",
+    "More comments …" : "Máis comentarios …",
    "Save" : "Gardar",
-    "Comment" : "Comentario"
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while retrieving comment with id {id}" : "Produciuse un erro ao recuperar o comentario co ID {id}",
+    "Error occurred while updating comment with id {id}" : "Produciuse un erro ao actualizar o comentario co ID {id}",
+    "Error occurred while posting comment" : "Produciuse un erro ao publicar o comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentario sen ler","%n comentarios sen ler"],
+    "Comment" : "Comentario",
+    "You commented" : "Vostede comentou",
+    "%1$s commented" : "%1$s comentados",
+    "{author} commented" : "{author} comentou",
+    "You commented on %1$s" : "Vostede comentou en %1$s",
+    "You commented on {file}" : "Vostede comentou en {file}",
+    "%1$s commented on %2$s" : "%1$s comentados en %2$s",
+    "{author} commented on {file}" : "{author} comentou en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> para ficheiros",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (agora) eliminado, mencionouno a vostede nun comentario en «%s»",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (agora) eliminado, mencionouno a vostede nun comentario en «{file}»",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mencionouno a vostede nun comentario en «%2$s»",
+    "{user} mentioned you in a comment on “{file}”" : "{user} mencionouno a vostede nun comentario en «{file}»"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,6 +1,32 @@
 { "translations": {
+    "Comments" : "Comentarios",
+    "Unknown user" : "Usuario descoñecido",
+    "New comment …" : "Comentario novo …",
+    "Delete comment" : "Eliminar comentario",
+    "Post" : "Publicar",
    "Cancel" : "Cancelar",
+    "Edit comment" : "Editar comentario",
+    "[Deleted user]" : "[Usuario eliminado]",
+    "No comments yet, start the conversation!" : "Aínda non hai comentarios, comeza a conversa!",
+    "More comments …" : "Máis comentarios …",
    "Save" : "Gardar",
-    "Comment" : "Comentario"
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while retrieving comment with id {id}" : "Produciuse un erro ao recuperar o comentario co ID {id}",
+    "Error occurred while updating comment with id {id}" : "Produciuse un erro ao actualizar o comentario co ID {id}",
+    "Error occurred while posting comment" : "Produciuse un erro ao publicar o comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentario sen ler","%n comentarios sen ler"],
+    "Comment" : "Comentario",
+    "You commented" : "Vostede comentou",
+    "%1$s commented" : "%1$s comentados",
+    "{author} commented" : "{author} comentou",
+    "You commented on %1$s" : "Vostede comentou en %1$s",
+    "You commented on {file}" : "Vostede comentou en {file}",
+    "%1$s commented on %2$s" : "%1$s comentados en %2$s",
+    "{author} commented on {file}" : "{author} comentou en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> para ficheiros",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (agora) eliminado, mencionouno a vostede nun comentario en «%s»",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (agora) eliminado, mencionouno a vostede nun comentario en «{file}»",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mencionouno a vostede nun comentario en «%2$s»",
+    "{user} mentioned you in a comment on “{file}”" : "{user} mencionouno a vostede nun comentario en «{file}»"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,26 +1,25 @@
 OC.L10N.register(
    "comments",
    {
-    "Type in a new comment..." : "יש להכניס תגובה חדשה...",
    "Delete comment" : "מחיקת תגובה",
    "Post" : "פרסום",
    "Cancel" : "ביטול",
    "Edit comment" : "עריכת תגובה",
    "[Deleted user]" : "[משתמשים מוסרים]",
    "Comments" : "תגובות",
-    "No other comments available" : "אין תגובות אחרות זמינות",
-    "More comments..." : "תגובות נוספות...",
    "Save" : "שמירה",
    "Allowed characters {count} of {max}" : "תווים מותרים {count} מתוך {max}",
    "Error occurred while retrieving comment with id {id}" : "שגיאה אירעה כאשר אוחזרה תגובה עם מספר זיהוי {id}",
    "Error occurred while updating comment with id {id}" : "שגיאה אירעה כאשר עודכנה תגובה עם מספר זיהוי {id}",
    "Error occurred while posting comment" : "אירעה שגיאה בזמן פרסום תגובה",
-    "{count} unread comments" : "{count} תגובות שלא נקראו",
    "Comment" : "תגובה",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>תגובות</strong> עבור קבצים <em>(תמיד נרשמים בהזרמת מדיה)</em>",
    "You commented" : "הערות שלך",
    "%1$s commented" : "התקבלו תגובות %1$s",
    "You commented on %2$s" : "הערות שלך ב- %2$s",
-    "%1$s commented on %2$s" : "התקבלו תגובות %1$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,24 +1,23 @@
 { "translations": {
-    "Type in a new comment..." : "יש להכניס תגובה חדשה...",
    "Delete comment" : "מחיקת תגובה",
    "Post" : "פרסום",
    "Cancel" : "ביטול",
    "Edit comment" : "עריכת תגובה",
    "[Deleted user]" : "[משתמשים מוסרים]",
    "Comments" : "תגובות",
-    "No other comments available" : "אין תגובות אחרות זמינות",
-    "More comments..." : "תגובות נוספות...",
    "Save" : "שמירה",
    "Allowed characters {count} of {max}" : "תווים מותרים {count} מתוך {max}",
    "Error occurred while retrieving comment with id {id}" : "שגיאה אירעה כאשר אוחזרה תגובה עם מספר זיהוי {id}",
    "Error occurred while updating comment with id {id}" : "שגיאה אירעה כאשר עודכנה תגובה עם מספר זיהוי {id}",
    "Error occurred while posting comment" : "אירעה שגיאה בזמן פרסום תגובה",
-    "{count} unread comments" : "{count} תגובות שלא נקראו",
    "Comment" : "תגובה",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>תגובות</strong> עבור קבצים <em>(תמיד נרשמים בהזרמת מדיה)</em>",
    "You commented" : "הערות שלך",
    "%1$s commented" : "התקבלו תגובות %1$s",
    "You commented on %2$s" : "הערות שלך ב- %2$s",
-    "%1$s commented on %2$s" : "התקבלו תגובות %1$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);"
 }
@@ -0,0 +1,34 @@
+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",
+    "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}”"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,32 @@
+{ "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",
+    "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}”"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -1,26 +1,39 @@
 OC.L10N.register(
    "comments",
    {
-    "Type in a new comment..." : "Új hozzászólás írása...",
+    "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ó]",
-    "Comments" : "Hozzászólások",
-    "No other comments available" : "Nincs több hozzászólás.",
-    "More comments..." : "Több hozzászólás...",
+    "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",
    "Allowed characters {count} of {max}" : "Engedélyezett karakterek: {count} / {max}",
-    "Error occurred while retrieving comment with id {id}" : "Hiba a {id} azonosítójú megjegyzés visszanyerése közben.",
-    "Error occurred while updating comment with id {id}" : "Hiba a {id} azonosítójú megjegyzés frissítése közben.",
-    "Error occurred while posting comment" : "Hiba történt a megjegyzés küldése közben",
-    "{count} unread comments" : "{count} olvasatlan hozzászólás",
+    "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",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Hozzászólás</strong> a fájlokhoz <em>(mindig listázásra kerül a hírfolyamon)</em>",
-    "You commented" : "Hozzászólt",
+    "You commented" : "Hozzászóltál",
    "%1$s commented" : "%1$s hozzászólt",
-    "You commented on %2$s" : "Hozzászólt ehhez: %2$s",
-    "%1$s commented on %2$s" : "%1$s hozzászólt ehhez: %2$s"
+    "{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,24 +1,37 @@
 { "translations": {
-    "Type in a new comment..." : "Új hozzászólás írása...",
+    "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ó]",
-    "Comments" : "Hozzászólások",
-    "No other comments available" : "Nincs több hozzászólás.",
-    "More comments..." : "Több hozzászólás...",
+    "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",
    "Allowed characters {count} of {max}" : "Engedélyezett karakterek: {count} / {max}",
-    "Error occurred while retrieving comment with id {id}" : "Hiba a {id} azonosítójú megjegyzés visszanyerése közben.",
-    "Error occurred while updating comment with id {id}" : "Hiba a {id} azonosítójú megjegyzés frissítése közben.",
-    "Error occurred while posting comment" : "Hiba történt a megjegyzés küldése közben",
-    "{count} unread comments" : "{count} olvasatlan hozzászólás",
+    "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",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Hozzászólás</strong> a fájlokhoz <em>(mindig listázásra kerül a hírfolyamon)</em>",
-    "You commented" : "Hozzászólt",
+    "You commented" : "Hozzászóltál",
    "%1$s commented" : "%1$s hozzászólt",
-    "You commented on %2$s" : "Hozzászólt ehhez: %2$s",
-    "%1$s commented on %2$s" : "%1$s hozzászólt ehhez: %2$s"
+    "{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,34 @@
 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}”"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,5 +1,32 @@
 { "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}”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,20 +1,25 @@
 OC.L10N.register(
    "comments",
    {
-    "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]",
    "Comments" : "Komentar",
-    "No other comments available" : "Tidak ada komentar lainnya",
-    "More comments..." : "Komentar lainya...",
    "Save" : "Simpan",
    "Allowed characters {count} of {max}" : "Karakter yang diizinkan {count} dari {max}",
-    "{count} unread comments" : "{count} komentar belum dibaca",
+    "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",
-    "%1$s commented on %2$s" : "%1$s dikomentari pada %2$s"
+    "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,18 +1,23 @@
 { "translations": {
-    "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]",
    "Comments" : "Komentar",
-    "No other comments available" : "Tidak ada komentar lainnya",
-    "More comments..." : "Komentar lainya...",
    "Save" : "Simpan",
    "Allowed characters {count} of {max}" : "Karakter yang diizinkan {count} dari {max}",
-    "{count} unread comments" : "{count} komentar belum dibaca",
+    "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",
-    "%1$s commented on %2$s" : "%1$s dikomentari pada %2$s"
+    "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,22 +1,34 @@
 OC.L10N.register(
    "comments",
    {
-    "Type in a new comment..." : "Skrifaðu inn nýja athugasemd...",
+    "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]",
-    "Comments" : "Athugasemdir",
-    "No other comments available" : "Engar aðrar athugasemdir eru tiltækar",
-    "More comments..." : "Fleiri athugasemdir...",
+    "No comments yet, start the conversation!" : "Engar athugasemdir ennþá, byrjaðu umræðuna!",
+    "More comments …" : "Fleiri athugasemdir ...",
    "Save" : "Vista",
    "Allowed characters {count} of {max}" : "Leyfður stafafjöldi {count} af {max}",
-    "{count} unread comments" : "{count} ólesnar athugasemdir",
+    "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",
-    "You commented on %2$s" : "Þú settir inn athugasemd við %2$s",
-    "%1$s commented on %2$s" : "%1$s setti inn athugasemd um %2$s"
+    "{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}”"
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
@@ -1,20 +1,32 @@
 { "translations": {
-    "Type in a new comment..." : "Skrifaðu inn nýja athugasemd...",
+    "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]",
-    "Comments" : "Athugasemdir",
-    "No other comments available" : "Engar aðrar athugasemdir eru tiltækar",
-    "More comments..." : "Fleiri athugasemdir...",
+    "No comments yet, start the conversation!" : "Engar athugasemdir ennþá, byrjaðu umræðuna!",
+    "More comments …" : "Fleiri athugasemdir ...",
    "Save" : "Vista",
    "Allowed characters {count} of {max}" : "Leyfður stafafjöldi {count} af {max}",
-    "{count} unread comments" : "{count} ólesnar athugasemdir",
+    "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",
-    "You commented on %2$s" : "Þú settir inn athugasemd við %2$s",
-    "%1$s commented on %2$s" : "%1$s setti inn athugasemd um %2$s"
+    "{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}”"
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
@@ -1,26 +1,34 @@
 OC.L10N.register(
    "comments",
    {
-    "Type in a new comment..." : "Digita un nuovo commento...",
+    "Comments" : "Commenti",
+    "Unknown user" : "Utente sconosciuto",
+    "New comment …" : "Nuovo commento...",
    "Delete comment" : "Elimina commento",
    "Post" : "Commento",
    "Cancel" : "Annulla",
    "Edit comment" : "Modifica commento",
    "[Deleted user]" : "[Utente eliminato]",
-    "Comments" : "Commenti",
-    "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.",
-    "{count} unread comments" : "{count} commenti non letti",
+    "_%n unread comment_::_%n unread comments_" : ["%n commento non letto","%n commenti non letti"],
    "Comment" : "Commento",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Commenti</strong> sui file <em>(elencati sempre nel flusso)</em>",
    "You commented" : "Hai commentato",
    "%1$s commented" : "%1$s ha commentato",
-    "You commented on %2$s" : "Hai commentato su %2$s",
-    "%1$s commented on %2$s" : "%1$s ha commentato %2$s"
+    "{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}\"."
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,24 +1,32 @@
 { "translations": {
-    "Type in a new comment..." : "Digita un nuovo commento...",
+    "Comments" : "Commenti",
+    "Unknown user" : "Utente sconosciuto",
+    "New comment …" : "Nuovo commento...",
    "Delete comment" : "Elimina commento",
    "Post" : "Commento",
    "Cancel" : "Annulla",
    "Edit comment" : "Modifica commento",
    "[Deleted user]" : "[Utente eliminato]",
-    "Comments" : "Commenti",
-    "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.",
-    "{count} unread comments" : "{count} commenti non letti",
+    "_%n unread comment_::_%n unread comments_" : ["%n commento non letto","%n commenti non letti"],
    "Comment" : "Commento",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Commenti</strong> sui file <em>(elencati sempre nel flusso)</em>",
    "You commented" : "Hai commentato",
    "%1$s commented" : "%1$s ha commentato",
-    "You commented on %2$s" : "Hai commentato su %2$s",
-    "%1$s commented on %2$s" : "%1$s ha commentato %2$s"
+    "{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}\"."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -1,26 +1,34 @@
 OC.L10N.register(
    "comments",
    {
-    "Type in a new comment..." : "新しいコメントを入力...",
+    "Comments" : "コメント",
+    "Unknown user" : "不明なユーザー",
+    "New comment …" : "新しいコメント...",
    "Delete comment" : "コメントを削除",
    "Post" : "追加",
    "Cancel" : "キャンセル",
    "Edit comment" : "コメントを編集",
    "[Deleted user]" : "[削除済みユーザー]",
-    "Comments" : "コメント",
-    "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" : "コメント投稿時にエラーが発生",
-    "{count} unread comments" : "未読コメント数 {count}",
+    "_%n unread comment_::_%n unread comments_" : ["%n の未読のコメント"],
    "Comment" : "コメント",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "ファイルに対する<strong>コメント</strong><em>(常時ストリームに表示)</em>",
    "You commented" : "コメント済",
    "%1$s commented" : "%1$s がコメントを追加",
-    "You commented on %2$s" : "%2$s にコメント済",
-    "%1$s commented on %2$s" : "%2$s について、%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}” のコメントであなたについて言及しました。"
 },
 "nplurals=1; plural=0;");
@@ -1,24 +1,32 @@
 { "translations": {
-    "Type in a new comment..." : "新しいコメントを入力...",
+    "Comments" : "コメント",
+    "Unknown user" : "不明なユーザー",
+    "New comment …" : "新しいコメント...",
    "Delete comment" : "コメントを削除",
    "Post" : "追加",
    "Cancel" : "キャンセル",
    "Edit comment" : "コメントを編集",
    "[Deleted user]" : "[削除済みユーザー]",
-    "Comments" : "コメント",
-    "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" : "コメント投稿時にエラーが発生",
-    "{count} unread comments" : "未読コメント数 {count}",
+    "_%n unread comment_::_%n unread comments_" : ["%n の未読のコメント"],
    "Comment" : "コメント",
-    "<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "ファイルに対する<strong>コメント</strong><em>(常時ストリームに表示)</em>",
    "You commented" : "コメント済",
    "%1$s commented" : "%1$s がコメントを追加",
-    "You commented on %2$s" : "%2$s にコメント済",
-    "%1$s commented on %2$s" : "%2$s について、%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}” のコメントであなたについて言及しました。"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
@@ -1,20 +1,34 @@
 OC.L10N.register(
    "comments",
    {
-    "Type in a new comment..." : "새 댓글을 입력하십시오...",
+    "Comments" : "댓글",
+    "Unknown user" : "알 수 없는 사용자",
+    "New comment …" : "새로운 댓글 …",
    "Delete comment" : "댓글 삭제",
    "Post" : "게시",
    "Cancel" : "취소",
    "Edit comment" : "댓글 편집",
    "[Deleted user]" : "[삭제된 사용자]",
-    "Comments" : "댓글",
-    "No other comments available" : "더 이상 댓글 없음",
-    "More comments..." : "더 많은 댓글...",
+    "No comments yet, start the conversation!" : "아직 댓글이 없습니다. 대화를 시작하십시오!",
+    "More comments …" : "더 많은 댓글 …",
    "Save" : "저장",
    "Allowed characters {count} of {max}" : "{count}/{max} 글자 사용 가능",
-    "{count} unread comments" : "읽지 않은 댓글 {count}개",
+    "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 님의 댓글",
-    "%1$s commented on %2$s" : "%2$s에 %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}”에 남긴 댓글에서 여러분을 언급함"
 },
 "nplurals=1; plural=0;");
@@ -1,18 +1,32 @@
 { "translations": {
-    "Type in a new comment..." : "새 댓글을 입력하십시오...",
+    "Comments" : "댓글",
+    "Unknown user" : "알 수 없는 사용자",
+    "New comment …" : "새로운 댓글 …",
    "Delete comment" : "댓글 삭제",
    "Post" : "게시",
    "Cancel" : "취소",
    "Edit comment" : "댓글 편집",
    "[Deleted user]" : "[삭제된 사용자]",
-    "Comments" : "댓글",
-    "No other comments available" : "더 이상 댓글 없음",
-    "More comments..." : "더 많은 댓글...",
+    "No comments yet, start the conversation!" : "아직 댓글이 없습니다. 대화를 시작하십시오!",
+    "More comments …" : "더 많은 댓글 …",
    "Save" : "저장",
    "Allowed characters {count} of {max}" : "{count}/{max} 글자 사용 가능",
-    "{count} unread comments" : "읽지 않은 댓글 {count}개",
+    "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 님의 댓글",
-    "%1$s commented on %2$s" : "%2$s에 %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}”에 남긴 댓글에서 여러분을 언급함"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
@@ -1,8 +1,34 @@
 OC.L10N.register(
    "comments",
    {
-    "Cancel" : "Atšaukti",
-    "Save" : "Išsaugoti",
-    "Comment" : "Komentaras"
+    "Comments" : "Komentarai",
+    "Unknown user" : "Nežinomas naudotojas",
+    "New comment …" : "Naujas komentaras …",
+    "Delete comment" : "Ištrinti komentarą",
+    "Post" : "Įrašas",
+    "Cancel" : "Atsisakyti",
+    "Edit comment" : "Redaguoti komentarą",
+    "[Deleted user]" : "[Ištrintas naudotojas]",
+    "No comments yet, start the conversation!" : "Kol kas komentarų nėra, pradėkite pokalbį!",
+    "More comments …" : "Daugiau komentarų …",
+    "Save" : "Įrašyti",
+    "Allowed characters {count} of {max}" : "Leidžiama simbolių {count} iš {max}",
+    "Error occurred while retrieving comment with id {id}" : "Klaida bandant parodyti komentarą pagal identifikavimo numerį {id}",
+    "Error occurred while updating comment with id {id}" : "Klaida bandant pataisyti komentarą pagal identifikavimo numerį {id}",
+    "Error occurred while posting comment" : "Skelbiant komentarą, įvyko klaida",
+    "_%n unread comment_::_%n unread comments_" : ["%n neskaitytas komentaras","%n neskaityti komentarai","%n neskaitytų komentarų"],
+    "Comment" : "Komentaras",
+    "You commented" : "Jūs pakomentavote",
+    "%1$s commented" : "%1$s pakomentavo",
+    "{author} commented" : "{author} pakomentavo",
+    "You commented on %1$s" : "Pakomentavote %1$s",
+    "You commented on {file}" : "Pakomentavote {file}",
+    "%1$s commented on %2$s" : "%1$s pakomentavo %2$s",
+    "{author} commented on {file}" : "{author} pakomentavo {file}",
+    "<strong>Comments</strong> for files" : "<strong>Failų komentarai</strong>",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Ištrintas vartotojas paminėjo jus komentare \"%s\"",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ištrintas vartotojas paminėjo jus komentare \"{file}\"",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s paminėjo jus komentare \"%2$s\"",
+    "{user} mentioned you in a comment on “{file}”" : "{user} paminėjo jus komentare “{file}”"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);");
@@ -1,6 +1,32 @@
 { "translations": {
-    "Cancel" : "Atšaukti",
-    "Save" : "Išsaugoti",
-    "Comment" : "Komentaras"
+    "Comments" : "Komentarai",
+    "Unknown user" : "Nežinomas naudotojas",
+    "New comment …" : "Naujas komentaras …",
+    "Delete comment" : "Ištrinti komentarą",
+    "Post" : "Įrašas",
+    "Cancel" : "Atsisakyti",
+    "Edit comment" : "Redaguoti komentarą",
+    "[Deleted user]" : "[Ištrintas naudotojas]",
+    "No comments yet, start the conversation!" : "Kol kas komentarų nėra, pradėkite pokalbį!",
+    "More comments …" : "Daugiau komentarų …",
+    "Save" : "Įrašyti",
+    "Allowed characters {count} of {max}" : "Leidžiama simbolių {count} iš {max}",
+    "Error occurred while retrieving comment with id {id}" : "Klaida bandant parodyti komentarą pagal identifikavimo numerį {id}",
+    "Error occurred while updating comment with id {id}" : "Klaida bandant pataisyti komentarą pagal identifikavimo numerį {id}",
+    "Error occurred while posting comment" : "Skelbiant komentarą, įvyko klaida",
+    "_%n unread comment_::_%n unread comments_" : ["%n neskaitytas komentaras","%n neskaityti komentarai","%n neskaitytų komentarų"],
+    "Comment" : "Komentaras",
+    "You commented" : "Jūs pakomentavote",
+    "%1$s commented" : "%1$s pakomentavo",
+    "{author} commented" : "{author} pakomentavo",
+    "You commented on %1$s" : "Pakomentavote %1$s",
+    "You commented on {file}" : "Pakomentavote {file}",
+    "%1$s commented on %2$s" : "%1$s pakomentavo %2$s",
+    "{author} commented on {file}" : "{author} pakomentavo {file}",
+    "<strong>Comments</strong> for files" : "<strong>Failų komentarai</strong>",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Ištrintas vartotojas paminėjo jus komentare \"%s\"",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ištrintas vartotojas paminėjo jus komentare \"{file}\"",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s paminėjo jus komentare \"%2$s\"",
+    "{user} mentioned you in a comment on “{file}”" : "{user} paminėjo jus komentare “{file}”"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
@@ -1,8 +1,32 @@
 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}”"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
--- 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>`