Increase version for 9.0.5RC2

Merge pull request #26049 from owncloud/stable9-cath-needs-upgrade-non-cli
[Stable9] Pass web requests to occ controller if upgrade is needed
2016-09-07 20:35:51 +02:00 · 2016-09-07 19:49:32 +02:00 · 2016-09-07 10:54:43 +02:00 · 2016-09-07 08:09:48 +02:00 · 2016-09-07 07:43:17 +02:00 · 2016-09-07 00:17:10 +03:00
3875 changed files with 174379 additions and 37316 deletions
@@ -9,17 +9,20 @@

 # ignore all apps except core ones
 /apps*/*
+!/apps/comments
+!/apps/dav
 !/apps/files
-!/apps/files_encryption
+!/apps/federation
+!/apps/federatedfilesharing
 !/apps/encryption
-!/apps/encryption_dummy
 !/apps/files_external
 !/apps/files_sharing
 !/apps/files_trashbin
 !/apps/files_versions
 !/apps/user_ldap
-!/apps/user_webdavauth
-!apps/provisioning_api
+!/apps/provisioning_api
+!/apps/systemtags
+!/apps/updatenotification
 /apps/files_external/3rdparty/irodsphp/PHPUnitTest
 /apps/files_external/3rdparty/irodsphp/web
 /apps/files_external/3rdparty/irodsphp/prods/test
@@ -78,6 +81,9 @@ nbproject

 # vim ex mode
 .vimrc
+
+# ack(-grep)
+.ackrc
 	
 # Mac OS
 .DS_Store
@@ -114,3 +120,4 @@ Vagrantfile
 /tests/data/testimage-copy.png
 /config/config-autotest-backup.php
 /config/autoconfig.php
+clover.xml
@@ -1,10 +1,12 @@
-# Version: 8.2.0
 <IfModule mod_headers.c>
-  <IfModule mod_fcgid.c>
-    <IfModule mod_setenvif.c>
+  <IfModule mod_setenvif.c>
+    <IfModule mod_fcgid.c>
       SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1
       RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
    </IfModule>
+    <IfModule mod_proxy_fcgi.c>
+       SetEnvIfNoCase Authorization "(.+)" HTTP_AUTHORIZATION=$1
+    </IfModule>
  </IfModule>

  <IfModule mod_env.c>
@@ -13,6 +15,8 @@
    Header set X-XSS-Protection "1; mode=block"
    Header set X-Robots-Tag "none"
    Header set X-Frame-Options "SAMEORIGIN"
+    Header set X-Download-Options "noopen"
+    Header set X-Permitted-Cross-Domain-Policies "none"
    SetEnv modHeadersAvailable true
  </IfModule>

@@ -33,17 +37,27 @@
    SetEnv htaccessWorking true
  </IfModule>
 </IfModule>
+<IfModule mod_php7.c>
+  php_value upload_max_filesize 513M
+  php_value post_max_size 513M
+  php_value memory_limit 512M
+  php_value mbstring.func_overload 0
+  php_value default_charset 'UTF-8'
+  php_value output_buffering 0
+  <IfModule mod_env.c>
+    SetEnv htaccessWorking true
+  </IfModule>
+</IfModule>
 <IfModule mod_rewrite.c>
  RewriteEngine on
  RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
  RewriteRule ^\.well-known/host-meta /public.php?service=host-meta [QSA,L]
  RewriteRule ^\.well-known/host-meta\.json /public.php?service=host-meta-json [QSA,L]
-  RewriteRule ^\.well-known/carddav /remote.php/carddav/ [R=301,L]
-  RewriteRule ^\.well-known/caldav /remote.php/caldav/ [R=301,L]
-  RewriteRule ^apps/calendar/caldav\.php remote.php/caldav/ [QSA,L]
-  RewriteRule ^apps/contacts/carddav\.php remote.php/carddav/ [QSA,L]
+  RewriteRule ^\.well-known/carddav /remote.php/dav/ [R=301,L]
+  RewriteRule ^\.well-known/caldav /remote.php/dav/ [R=301,L]
  RewriteRule ^remote/(.*) remote.php [QSA,L]
  RewriteRule ^(build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
+  RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/.*
  RewriteRule ^(\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
 </IfModule>
 <IfModule mod_mime.c>
@@ -129,6 +129,7 @@ Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <frank@oc.(none)>
 Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <karlitschek@gmx.de>
 Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <karlitschek@kde.org>
 François Kubler <francois@kubler.org>
+Frédéric Fortier <frederic.fortier@oronospolytechnique.com> Frédéric Fortier <frederic.fortier@polymtl.ca>
 Frederik Gladhorn <gladhorn@kde.org>
 Gadzy <dev@gadzy.fr>
 ganomi <ganomi@gmail.com>
@@ -173,8 +174,8 @@ Jean-Louis Dupond <jean-louis@dupond.be>
 Jenkins for ownCloud <owncloud-bot@tmit.eu> Jenkins for ownCloud <thomas.mueller@tmit.eu>
 Jens-Christian Fischer <jens-christian.fischer@switch.ch>
 Jernej Virag <jernej.virag@gmail.com>
-Jesus Macias <jmacias@full-on-net.com>
 Jesus Macias Portela <jesus.macias.portela@gmail.com>
+Jesús Macias <jmacias@solidgear.es> Jesus Macias <jmacias@full-on-net.com>
 jknockaert <jasper@knockaert.nl>
 Joan <aseques@gmail.com>
 Joar Wandborg <git@wandborg.com>
@@ -304,9 +305,10 @@ 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 McCorkell <rmccorkell@karoshi.org.uk> Robin McCorkell <rmccorkell@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 <roeland@famdouma.nl>
+Roeland Jago Douma <rullzer@owncloud.com> Roeland Jago Douma <roeland@famdouma.nl>
 rok <brejktru@gmail.com>
 Roland Hager <roland.hager@tu-berlin.de>
 Roland van Laar <roland@micite.net>
@@ -0,0 +1,33 @@
+{
+  "maxReviewers": 3,
+  "numFilesToCheck": 5,
+  "alwaysNotifyForPaths": [
+    {
+      "name": "DeepDiver1975",
+      "files": [
+        "apps/dav/**"
+      ]
+    },
+    {
+      "name": "nickvergessen",
+      "files": [
+        "lib/private/activity/**",
+        "lib/private/notification/**",
+        "lib/public/activity/**",
+        "lib/public/notification/**"
+      ]
+    },
+    {
+      "name": "Xenopathic",
+      "files": [
+        "apps/files_external/**"
+      ]
+    }
+  ],
+  "userBlacklist": [
+    "owncloud-bot",
+    "scrutinizer-auto-fixer",
+    "th3fallen",
+    "zander"
+  ]
+}
@@ -6,6 +6,7 @@ filter:
        - 'l10n/*'
        - 'core/l10n/*'
        - 'apps/*/l10n/*'
+        - 'apps/*/tests/*'
        - 'lib/l10n/*'
        - 'core/vendor/*'
        - 'core/js/tests/lib/*.js'
@@ -13,12 +14,11 @@ filter:
        - 'core/js/jquery-showpassword.js'
        - 'core/js/jquery-tipsy.js'
        - 'core/js/placeholders.js'
+        - 'settings/l10n/*'
+        - 'tests/*'
+        - 'build/*'


 imports:
    - javascript
    - php
-
-tools:
-    external_code_coverage:
-        timeout: 7200    # Timeout in seconds. 120 minutes
@@ -0,0 +1,55 @@
+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 && vendor/bin/parallel-lint --exclude vendor/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude vendor/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .; 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
+
+  fast_finish: true
@@ -1,26 +1,199 @@
 ownCloud is written by:
-	Frank Karlitschek
-	Robin Appelman
-	Jakob Sack
-	Jan-Christoph Borchardt
-	Michael Gapczynski
-	Arthur Schiwon
-	Bart Visscher
-	Georg Ehrke
-	Brice Maron
-	Tom Needham
-	Marvin Thomas Rabe
-	Florian Pritz
-	Bartek Przybylski
-	Thomas Müller
-	Klaas Freitag
-	Sam Tuke
-	Simon Birnbach
-	Lukas Reschke
-	Christian Reiner
-	Daniel Molkentin
-	Vincent Petry
-	…
+ - AW-UC <git@a-wesemann.de>
+ - Adam Williamson <awilliam@redhat.com>
+ - Administrator <Administrator@WINDOWS-2012>
+ - Aldo "xoen" Giambelluca <xoen@xoen.org>
+ - Alex Weirig <alex.weirig@technolink.lu>
+ - Alexander Bergolth <leo@strike.wu.ac.at>
+ - Andreas Böhler <dev@aboehler.at>
+ - Andreas Fischer <bantu@owncloud.com>
+ - Andrew Brown <andrew@casabrown.com>
+ - André Gaul <gaul@web-yard.de>
+ - Arthur Schiwon <blizzz@owncloud.com>
+ - Bart Visscher <bartv@thisnet.nl>
+ - Bartek Przybylski <bart.p.pl@gmail.com>
+ - Bastien Ho <bastienho@urbancube.fr>
+ - Benjamin Diele <benjamin@diele.be>
+ - Benjamin Liles <benliles@arch.tamu.edu>
+ - Bernhard Posselt <dev@bernhard-posselt.com>
+ - Bernhard Reiter <ockham@raz.or.at>
+ - Birk Borkason <daniel.niccoli@gmail.com>
+ - Björn Schießle <schiessle@owncloud.com>
+ - Borjan Tchakaloff <borjan@tchakaloff.fr>
+ - Brice Maron <brice@bmaron.net>
+ - Byron Marohn <combustible@live.com>
+ - C Montero-Luque <cml@owncloud.com>
+ - Carlos Cerrillo <ccerrillo@gmail.com>
+ - Christian Berendt <berendt@b1-systems.de>
+ - Christian Kampka <christian@kampka.net>
+ - Christian Schnidrig <christian.schnidrig@switch.ch>
+ - Christian Weiske <cweiske@cweiske.de>
+ - Christoph Schaefer <christophł@wolkesicher.de>
+ - Christopher Schäpers <kondou@ts.unde.re>
+ - Christopher T. Johnson <ctjctj@gmail.com>
+ - Clark Tomlinson <fallen013@gmail.com>
+ - Craig Morrissey <craig@owncloud.com>
+ - Dan Bartram <daneybartram@gmail.com>
+ - Daniel Hansson <enoch85@gmail.com>
+ - Daniel Molkentin <daniel@molkentin.de>
+ - Daniel Tosello <tosello.daniel@gmail.com>
+ - David Prévot <taffit@debian.org>
+ - Dominik Schmidt <dev@dominik-schmidt.de>
+ - Donald Buczek <buczek@molgen.mpg.de>
+ - Edward Crompton <edward.crompton@gmail.com>
+ - Fabian Henze <flyser42@gmx.de>
+ - Faruk Uzun <farukuzun@collabora.com>
+ - Felix Böhm <felixboehm@gmx.de>
+ - Felix Moeller <mail@felixmoeller.de>
+ - Florian Preinstorfer <nblock@archlinux.us>
+ - Florian Pritz <bluewind@xinu.at>
+ - Florian Scholz <FlorianScholz@bgstyle.de>
+ - Florin Peter <github@florin-peter.de>
+ - Frank Karlitschek <frank@owncloud.org>
+ - François Kubler <francois@kubler.org>
+ - Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
+ - Gadzy <dev@gadzy.fr>
+ - Georg Ehrke <georg@owncloud.com>
+ - Guillaume AMAT <guillaume.amat@informatique-libre.com>
+ - Hasso Tepper <hasso@zone.ee>
+ - Hendrik Leppelsack <hendrik@leppelsack.de>
+ - Hugo Gonzalez Labrador <hglavra@gmail.com>
+ - Individual IT Services <info@individual-it.net>
+ - Jakob Sack <mail@jakobsack.de>
+ - Jan-Christoph Borchardt <hey@jancborchardt.net>
+ - Jean-Louis Dupond <jean-louis@dupond.be>
+ - Jens-Christian Fischer <jens-christian.fischer@switch.ch>
+ - Jesús Macias <jmacias@solidgear.es>
+ - Joachim Bauch <bauch@struktur.de>
+ - Joas Schilling <nickvergessen@owncloud.com>
+ - Johan Björk <johanimon@gmail.com>
+ - Johannes Willnecker <johannes@willnecker.com>
+ - Jonny007-MKD <1-23-4-5@web.de>
+ - Jost Baron <Jost.Baron@gmx.de>
+ - Jörn Friedrich Dreyer <jfd@butonic.de>
+ - Kamil Domanski <kdomanski@kdemail.net>
+ - Klaas Freitag <freitag@owncloud.com>
+ - Lars <winnetou+github@catolic.de>
+ - Laurens Post <Crote@users.noreply.github.com>
+ - Laurens Post <lkpost@scept.re>
+ - Lennart Rosam <hello@takuto.de>
+ - Lennart Rosam <lennart.rosam@medien-systempartner.de>
+ - Leonardo Diez <leio10@users.noreply.github.com>
+ - Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it>
+ - Lukas Reschke <lukas@owncloud.com>
+ - Luke Policinski <lpolicinski@gmail.com>
+ - Lyonel Vincent <lyonel@ezix.org>
+ - Mario Kolling <mario.kolling@serpro.gov.br>
+ - Markus Goetz <markus@woboq.com>
+ - Martin Konrad <info@martin-konrad.net>
+ - Martin Konrad <konrad@frib.msu.edu>
+ - Martin Mattel <martin.mattel@diemattels.at>
+ - Marvin Thomas Rabe <mrabe@marvinrabe.de>
+ - Masaki Kawabata Neto <masaki.kawabata@gmail.com>
+ - Michael Gapczynski <GapczynskiM@gmail.com>
+ - Michael Göhler <somebody.here@gmx.de>
+ - Michael Kuhn <suraia@ikkoku.de>
+ - Michael Roitzsch <reactorcontrol@icloud.com>
+ - Michael Roth <michael.roth@rz.uni-augsburg.de>
+ - Michael Telatynski <7t3chguy@gmail.com>
+ - Michael U <mdusher@users.noreply.github.com>
+ - Miguel Prokop <miguel.prokop@vtu.com>
+ - Mitar <mitar.git@tnode.com>
+ - Morris Jobke <hey@morrisjobke.de>
+ - Nicolai Ehemann <en@enlightened.de>
+ - Nicolas Grekas <nicolas.grekas@gmail.com>
+ - Nmz <nemesiz@nmz.lt>
+ - Normal Ra <normalraw@gmail.com>
+ - Oliver Gasser <oliver.gasser@gmail.com>
+ - Oliver Kohl D.Sc. <oliver@kohl.bz>
+ - Olivier Paroz <github@oparoz.com>
+ - Otto Sabart <ottosabart@seberm.com>
+ - Owen Winkler <a_github@midnightcircus.com>
+ - Pascal de Bruijn <pmjdebruijn@pcode.nl>
+ - Patrick Paysant <ppaysant@linagora.com>
+ - Pellaeon Lin <nfsmwlin@gmail.com>
+ - 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>
+ - Qingping Hou <dave2008713@gmail.com>
+ - Raghu Nayyar <hey@raghunayyar.com>
+ - Raghu Nayyar <me@iraghu.com>
+ - Ralph Krimmel <rkrimme1@gwdg.de>
+ - Ramiro Aparicio <rapariciog@gmail.com>
+ - Randolph Carter <RandolphCarter@fantasymail.de>
+ - RealRancor <Fisch.666@gmx.de>
+ - Remco Brenninkmeijer <requist1@starmail.nl>
+ - Renaud Fortier <Renaud.Fortier@fsaa.ulaval.ca>
+ - Robin Appelman <icewind@owncloud.com>
+ - Robin McCorkell <robin@mccorkell.me.uk>
+ - Roeland Jago Douma <rullzer@owncloud.com>
+ - Roman Geber <rgeber@owncloudapps.com>
+ - Roman Kreisel <mail@romankreisel.de>
+ - Ross Nicoll <jrn@jrn.me.uk>
+ - SA <stephen@mthosting.net>
+ - Sam Tuke <mail@samtuke.com>
+ - Sander <brantje@gmail.com>
+ - Sascha Schmidt <realriot@realriot.de>
+ - Sean Comeau <sean@ftlnetworks.ca>
+ - Sebastian Döll <sebastian.doell@libasys.de>
+ - Serge Martin <edb@sigluy.net>
+ - Simon Könnecke <simonkoennecke@gmail.com>
+ - Sjors van der Pluijm <sjors@desjors.nl>
+ - Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
+ - Stefan Rado <owncloud@sradonia.net>
+ - Steffen Lindner <mail@steffen-lindner.de>
+ - Stephan Peijnik <speijnik@anexia-it.com>
+ - TheSFReader <TheSFReader@gmail.com>
+ - Thibaut GRIDEL <tgridel@free.fr>
+ - Thomas Müller <thomas.mueller@tmit.eu>
+ - Thomas Schmidt <tschmidt@suse.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>
+ - Victor Dubiniuk <dubiniuk@owncloud.com>
+ - Viktor Szépe <viktor@szepe.net>
+ - Vincent Chan <plus.vincchan@gmail.com>
+ - Vincent Cloutier <vincent1cloutier@gmail.com>
+ - Vincent Petry <pvince81@owncloud.com>
+ - Volkan Gezer <volkangezer@gmail.com>
+ - adrien <adrien.waksberg@believedigital.com>
+ - alexweirig <alex.weirig@technolink.lu>
+ - brumsel <brumsel@losecatcher.de>
+ - cetra3 <peter@parashift.com.au>
+ - cmeh <cmeh@users.noreply.github.com>
+ - dampfklon <me@dampfklon.de>
+ - davidgumberg <davidnoizgumberg@gmail.com>
+ - derkostka <sebastian.kostka@gmail.com>
+ - eduardo <eduardo@vnexu.net>
+ - fabian <fabian@web2.0-apps.de>
+ - goodkiller <markopraakli@gmail.com>
+ - helix84 <helix84@centrum.sk>
+ - hkjolhede <hkjolhede@gmail.com>
+ - ideaship <ideaship@users.noreply.github.com>
+ - j-ed <juergen@eisfair.org>
+ - jknockaert <jasper@knockaert.nl>
+ - macjohnny <estebanmarin@gmx.ch>
+ - marc0s <marcos@tenak.net>
+ - martin-rueegg <martin.rueegg@metaworx.ch>
+ - martin.mattel@diemattels.at <martin.mattel@diemattels.at>
+ - michag86 <micha_g@arcor.de>
+ - nishiki <nishiki@yaegashi.fr>
+ - root <root@oc.(none)>
+ - scambra <sergio@entrecables.com>
+ - scolebrook <scolebrook@mac.com>
+ - shkdee <louis.traynard@m4x.org>
+ - sualko <klaus@jsxc.org>
+ - tbartenstein <tbartenstein@users.noreply.github.com>
+ - tbelau666 <thomas.belau@gmx.de>
+ - unclejamal3000 <andreas.pramhaas@posteo.de>
+ - v1r0x <vinzenz.rosenkranz@gmail.com>
+ - voxsim <Simon Vocella>

 With help from many libraries and frameworks including:
 	Open Collaboration Services
@@ -12,26 +12,14 @@ If you have questions about how to install or use ownCloud, please direct these
  - You can also filter by appending e. g. "state:open" to the search string.
  - More info on [search syntax within github](https://help.github.com/articles/searching-issues)
 * This repository ([core](https://github.com/owncloud/core/issues)) is *only* for issues within the ownCloud core code. This also includes the apps: files, encryption, external storage, sharing, deleted files, versions, LDAP, and WebDAV Auth
-* __SECURITY__: Report any potential security bug to security@owncloud.com following our [security policy](https://owncloud.org/security/) instead of filing an issue in our bug tracker
+* __SECURITY__: Report any potential security bug to us via [our HackerOne page](https://hackerone.com/owncloud) or security@owncloud.com following our [security policy](https://owncloud.org/security/) instead of filing an issue in our bug tracker
 * The issues in other components should be reported in their respective repositories: 
  - [Android client](https://github.com/owncloud/android/issues)
-  - [iOS client](https://github.com/owncloud/ios-issues/issues)
-  - [Desktop client](https://github.com/owncloud/mirall/issues)
+  - [iOS client](https://github.com/owncloud/ios/issues)
+  - [Desktop client](https://github.com/owncloud/client/issues)
  - [Documentation](https://github.com/owncloud/documentation/issues)
-  - Apps:
-      - [Activity](https://github.com/owncloud/activity/issues)
-      - [Bookmarks](https://github.com/owncloud/bookmarks/issues)
-      - [Calendar](https://github.com/owncloud/calendar/issues)
-      - [Contacts](https://github.com/owncloud/contacts/issues)
-      - [Documents](https://github.com/owncloud/documents/issues)
-      - [Gallery](https://github.com/owncloud/gallery/issues)
-      - [Mail](https://github.com/owncloud/mail/issues)
-      - [Music](https://github.com/owncloud/music/issues)
-      - [News](https://github.com/owncloud/news/issues)
-      - [Notes](https://github.com/owncloud/notes/issues)
-      - [Shorty](https://github.com/owncloud/shorty/issues)
-      - [Tasks](https://github.com/owncloud/tasks/issues)
-      - [All other apps](https://github.com/owncloud/apps/issues)
+  - [ownCloud apps](https://github.com/owncloud/core/wiki/Maintainers#apps-repo)
+
 * Report the issue using our [template][template], it includes all the information we need to track down the issue.

 Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
@@ -0,0 +1,137 @@
+#!groovy
+/*
+ * This Jenkinsfile is intended to run on https://ci.owncloud.org and may fail anywhere else.
+ * It makes assumptions about plugins being installed, labels mapping to nodes that can build what is needed, etc.
+ */
+
+timestampedNode('SLAVE') {
+    stage 'Checkout'
+        checkout scm
+        sh '''git submodule update --init'''
+
+    stage 'JavaScript Testing'
+        executeAndReport('tests/autotest-results-js.xml') {
+            sh '''./autotest-js.sh'''
+        }
+
+    stage 'PHPUnit'
+        executeAndReport('tests/autotest-results-sqlite.xml') {
+            sh '''
+            export NOCOVERAGE=1
+            unset USEDOCKER
+            phpenv local 7.0
+            ./autotest.sh sqlite
+            '''
+        }
+        executeAndReport('tests/autotest-results-mysql.xml') {
+            sh '''
+            export NOCOVERAGE=1
+            unset USEDOCKER
+            phpenv local 5.4
+            ./autotest.sh mysql
+            '''
+        }
+        executeAndReport('tests/autotest-results-pgsql.xml') {
+            sh '''
+            export NOCOVERAGE=1
+            unset USEDOCKER
+            phpenv local 5.6
+            ./autotest.sh pgsql
+            '''
+        }
+        executeAndReport('tests/autotest-results-oci.xml') {
+            sh '''
+            export NOCOVERAGE=1
+            unset USEDOCKER
+            phpenv local 5.5
+            ./autotest.sh oci
+            '''
+        }
+
+    stage 'Files External Testing'
+        executeAndReport('tests/autotest-external-results-sqlite-webdav-ownCloud.xml') {
+            sh '''phpenv local 7.0
+            export NOCOVERAGE=1
+            unset USEDOCKER
+            ./autotest-external.sh sqlite webdav-ownCloud
+            '''
+        }
+        executeAndReport('tests/autotest-external-results-sqlite-smb-silvershell.xml') {
+            sh '''phpenv local 7.0
+            export NOCOVERAGE=1
+            unset USEDOCKER
+            ./autotest-external.sh sqlite smb-silvershell
+            '''
+        }
+        executeAndReport('tests/autotest-external-results-sqlite-swift-ceph.xml') {
+            sh '''phpenv local 7.0
+            export NOCOVERAGE=1
+            unset USEDOCKER
+            ./autotest-external.sh sqlite swift-ceph
+            '''
+        }
+        executeAndReport('tests/autotest-external-results-sqlite-smb-windows.xml') {
+            sh '''phpenv local 7.0
+            export NOCOVERAGE=1
+            unset USEDOCKER
+            ./autotest-external.sh sqlite smb-windows
+            '''
+        }
+
+        step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-external-results-sqlite.xml'])
+
+    stage 'Primary Objectstore Test - Swift'
+        executeAndReport('tests/autotest-results-mysql.xml') {
+            sh '''phpenv local 7.0
+
+            export NOCOVERAGE=1
+            export RUN_OBJECTSTORE_TESTS=1
+            export PRIMARY_STORAGE_CONFIG="swift"
+            unset USEDOCKER
+
+            rm tests/autotest-results-*.xml
+            ./autotest.sh mysql
+            '''
+        }
+
+    stage 'Integration Testing'
+        executeAndReport('build/integration/output/*.xml') {
+            sh '''phpenv local 7.0
+            rm -rf config/config.php
+            ./occ maintenance:install --admin-pass=admin
+            rm -rf build/integration/output
+            rm -rf build/integration/vendor
+            rm -rf build/integration/composer.lock
+            cd build/integration
+            ./run.sh
+           '''
+        }
+}
+
+void executeAndReport(String testResultLocation, def body) {
+    def failed = false
+    // We're wrapping this in a timeout - if it takes longer, kill it.
+    try {
+        timeout(time: 120, unit: 'MINUTES') {
+            body.call()
+        }
+    } catch (Exception e) {
+        failed = true
+        echo "Test execution failed: ${e}"
+    } finally {
+        step([$class: 'JUnitResultArchiver', testResults: testResultLocation])
+    }
+
+    if (failed) {
+        error "Test execution failed. Terminating the build"
+    }
+}
+
+// Runs the given body within a Timestamper wrapper on the given label.
+def timestampedNode(String label, Closure body) {
+    node(label) {
+        wrap([$class: 'TimestamperBuildWrapper']) {
+            body.call()
+        }
+    }
+}
@@ -1,38 +1,47 @@
-# ownCloud
-
-[ownCloud](http://ownCloud.org) gives you freedom and control over your own data.
-A personal cloud which runs on your own server.
-
-### Build Status on [Jenkins CI](https://ci.owncloud.org/)
-Git master: [![Build Status](https://ci.owncloud.org/job/server-master-linux/badge/icon)](https://ci.owncloud.org/job/server-master-linux/)
-
-Quality: 
- - Scrutinizer: [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/owncloud/core/badges/quality-score.png?s=ce2f5ded03d4ac628e9ee5c767243fa7412e644f)](https://scrutinizer-ci.com/g/owncloud/core/)
- - CodeClimate: [![Code Climate](https://codeclimate.com/github/owncloud/core/badges/gpa.svg)](https://codeclimate.com/github/owncloud/core)
-
-Dependencies:
+# ownCloud Core

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

-### Installation instructions
-https://doc.owncloud.org/server/8.2/developer_manual/app/index.html
+**[ownCloud](http://ownCloud.org) gives you freedom and control over your own data.
+A personal cloud which runs on your own server.**

-### Contribution Guidelines
+![](https://github.com/owncloud/screenshots/blob/master/files/sidebar_1.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.
+* ...
+
+## Installation instructions
+https://doc.owncloud.org/server/9.0/developer_manual/app/index.html
+
+## Contribution Guidelines
 https://owncloud.org/contribute/

-### Get in touch
-* [Forum](https://forum.owncloud.org)
-* [Mailing list](https://mailman.owncloud.org/mailman/listinfo)
-* [IRC channel](https://webchat.freenode.net/?channels=owncloud)
-* [Twitter](https://twitter.com/ownClouders)
+## Support
+Learn about the different ways you can get support for ownCloud: https://owncloud.org/support/

-### Important notice on translations
+## Get in touch
+* :clipboard: [Forum](https://forum.owncloud.org)
+* :envelope: [Mailing list](https://mailman.owncloud.org/mailman/listinfo)
+* :hash: [IRC channel](https://webchat.freenode.net/?channels=owncloud)
+* :busts_in_silhouette: [Facebook] (https://facebook.com/ownclouders)
+* :hatching_chick: [Twitter](https://twitter.com/ownClouders)
+
+## Important notice on translations
 Please submit translations via Transifex:
 https://www.transifex.com/projects/p/owncloud/

 [![Transifex](https://www.transifex.com/projects/p/owncloud/resource/core/chart/image_png)](https://www.transifex.com/projects/p/owncloud/)

 For more detailed information about translations:
-http://doc.owncloud.org/server/8.2/developer_manual/core/translation.html
+http://doc.owncloud.org/server/9.0/developer_manual/core/translation.html
@@ -0,0 +1,322 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Comments\Activity;
+
+use OCP\Activity\IExtension;
+use OCP\Activity\IManager;
+use OCP\Comments\ICommentsManager;
+use OCP\Comments\NotFoundException;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\L10N\IFactory;
+
+/**
+ * Class Extension
+ *
+ * @package OCA\Comments\Activity
+ */
+class Extension implements IExtension {
+	const APP_NAME = 'comments';
+
+	const ADD_COMMENT_SUBJECT = 'add_comment_subject';
+	const ADD_COMMENT_MESSAGE = 'add_comment_message';
+
+	/** @var IFactory */
+	protected $languageFactory;
+
+	/** @var IManager */
+	protected $activityManager;
+
+	/** @var ICommentsManager */
+	protected $commentsManager;
+
+	/** @var IURLGenerator */
+	protected $URLGenerator;
+
+	/**
+	 * @param IFactory $languageFactory
+	 * @param IManager $activityManager
+	 * @param ICommentsManager $commentsManager
+	 * @param IURLGenerator $URLGenerator
+	 */
+	public function __construct(IFactory $languageFactory, IManager $activityManager, ICommentsManager $commentsManager, IURLGenerator $URLGenerator) {
+		$this->languageFactory = $languageFactory;
+		$this->activityManager = $activityManager;
+		$this->commentsManager = $commentsManager;
+		$this->URLGenerator = $URLGenerator;
+	}
+
+	protected function getL10N($languageCode = null) {
+		return $this->languageFactory->get(self::APP_NAME, $languageCode);
+	}
+
+	/**
+	 * The extension can return an array of additional notification types.
+	 * If no additional types are to be added false is to be returned
+	 *
+	 * @param string $languageCode
+	 * @return array|false
+	 */
+	public function getNotificationTypes($languageCode) {
+		$l = $this->getL10N($languageCode);
+
+		return array(
+			self::APP_NAME => (string) $l->t('<strong>Comments</strong> for files'),
+		);
+	}
+
+	/**
+	 * For a given method additional types to be displayed in the settings can be returned.
+	 * In case no additional types are to be added false is to be returned.
+	 *
+	 * @param string $method
+	 * @return array|false
+	 */
+	public function getDefaultTypes($method) {
+		return $method === self::METHOD_STREAM ? [self::APP_NAME] : false;
+	}
+
+	/**
+	 * A string naming the css class for the icon to be used can be returned.
+	 * If no icon is known for the given type false is to be returned.
+	 *
+	 * @param string $type
+	 * @return string|false
+	 */
+	public function getTypeIcon($type) {
+		switch ($type) {
+			case self::APP_NAME:
+				return 'icon-comment';
+		}
+
+		return false;
+	}
+
+	/**
+	 * The extension can translate a given message to the requested languages.
+	 * If no translation is available false is to be returned.
+	 *
+	 * @param string $app
+	 * @param string $text
+	 * @param array $params
+	 * @param boolean $stripPath
+	 * @param boolean $highlightParams
+	 * @param string $languageCode
+	 * @return string|false
+	 */
+	public function translate($app, $text, $params, $stripPath, $highlightParams, $languageCode) {
+		if ($app !== self::APP_NAME) {
+			return false;
+		}
+
+		$l = $this->getL10N($languageCode);
+
+		if ($this->activityManager->isFormattingFilteredObject()) {
+			$translation = $this->translateShort($text, $l, $params);
+			if ($translation !== false) {
+				return $translation;
+			}
+		}
+
+		return $this->translateLong($text, $l, $params);
+	}
+
+	/**
+	 * @param string $text
+	 * @param IL10N $l
+	 * @param array $params
+	 * @return bool|string
+	 */
+	protected function translateShort($text, IL10N $l, array $params) {
+
+		switch ($text) {
+			case self::ADD_COMMENT_SUBJECT:
+				if ($this->authorIsCurrentUser($params[0])) {
+					return (string) $l->t('You commented');
+				}
+				return (string) $l->t('%1$s commented', $params);
+			case self::ADD_COMMENT_MESSAGE:
+				return $this->convertParameterToComment($params[0], 120);
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param string $text
+	 * @param IL10N $l
+	 * @param array $params
+	 * @return bool|string
+	 */
+	protected function translateLong($text, IL10N $l, array $params) {
+
+		switch ($text) {
+			case self::ADD_COMMENT_SUBJECT:
+				if ($this->authorIsCurrentUser($params[0])) {
+					return (string) $l->t('You commented on %2$s', $params);
+				}
+				return (string) $l->t('%1$s commented on %2$s', $params);
+			case self::ADD_COMMENT_MESSAGE:
+				return $this->convertParameterToComment($params[0]);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Check if the author is the current user
+	 *
+	 * @param string $user Parameter e.g. `<user display-name="admin">admin</user>`
+	 * @return bool
+	 */
+	protected function authorIsCurrentUser($user) {
+		try {
+			return strip_tags($user) === $this->activityManager->getCurrentUserId();
+		} catch (\UnexpectedValueException $e) {
+			// FIXME this is awkward, but we have no access to the current user in emails
+			return false;
+		}
+	}
+
+	/**
+	 * The extension can define the type of parameters for translation
+	 *
+	 * Currently known types are:
+	 * * file		=> will strip away the path of the file and add a tooltip with it
+	 * * username	=> will add the avatar of the user
+	 *
+	 * @param string $app
+	 * @param string $text
+	 * @return array|false
+	 */
+	public function getSpecialParameterList($app, $text) {
+		if ($app === self::APP_NAME) {
+			switch ($text) {
+				case self::ADD_COMMENT_SUBJECT:
+					return [
+						0 => 'username',
+						1 => 'file',
+					];
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * The extension can define the parameter grouping by returning the index as integer.
+	 * In case no grouping is required false is to be returned.
+	 *
+	 * @param array $activity
+	 * @return integer|false
+	 */
+	public function getGroupParameter($activity) {
+		return false;
+	}
+
+	/**
+	 * The extension can define additional navigation entries. The array returned has to contain two keys 'top'
+	 * and 'apps' which hold arrays with the relevant entries.
+	 * If no further entries are to be added false is no be returned.
+	 *
+	 * @return array|false
+	 */
+	public function getNavigation() {
+		$l = $this->getL10N();
+		return [
+			'apps' => [],
+			'top' => [
+				self::APP_NAME => [
+					'id' => self::APP_NAME,
+					'name' => (string) $l->t('Comments'),
+					'url' => $this->URLGenerator->linkToRoute('activity.Activities.showList', ['filter' => self::APP_NAME]),
+				],
+			],
+		];
+	}
+
+	/**
+	 * The extension can check if a custom filter (given by a query string like filter=abc) is valid or not.
+	 *
+	 * @param string $filterValue
+	 * @return boolean
+	 */
+	public function isFilterValid($filterValue) {
+		return $filterValue === self::APP_NAME;
+	}
+
+	/**
+	 * The extension can filter the types based on the filter if required.
+	 * In case no filter is to be applied false is to be returned unchanged.
+	 *
+	 * @param array $types
+	 * @param string $filter
+	 * @return array|false
+	 */
+	public function filterNotificationTypes($types, $filter) {
+		if ($filter === self::APP_NAME) {
+			return array_intersect($types, [self::APP_NAME]);
+		}
+		return false;
+	}
+
+	/**
+	 * For a given filter the extension can specify the sql query conditions including parameters for that query.
+	 * In case the extension does not know the filter false is to be returned.
+	 * The query condition and the parameters are to be returned as array with two elements.
+	 * E.g. return array('`app` = ? and `message` like ?', array('mail', 'ownCloud%'));
+	 *
+	 * @param string $filter
+	 * @return array|false
+	 */
+	public function getQueryForFilter($filter) {
+		return false;
+	}
+
+	/**
+	 * @param string $parameter
+	 * @return string
+	 */
+	protected function convertParameterToComment($parameter, $maxLength = 0) {
+		if (preg_match('/^\<parameter\>(\d*)\<\/parameter\>$/', $parameter, $matches)) {
+			try {
+				$comment = $this->commentsManager->get((int) $matches[1]);
+				$message = $comment->getMessage();
+				$message = str_replace("\n", '<br />', str_replace(['<', '>'], ['&lt;', '&gt;'], $message));
+
+				if ($maxLength && isset($message[$maxLength + 20])) {
+					$findSpace = strpos($message, ' ', $maxLength);
+					if ($findSpace !== false && $findSpace < $maxLength + 20) {
+						return substr($message, 0, $findSpace) . '…';
+					}
+					return substr($message, 0, $maxLength + 20) . '…';
+				}
+
+				return $message;
+			} catch (NotFoundException $e) {
+				return '';
+			}
+		}
+
+		return '';
+	}
+}
@@ -0,0 +1,128 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Comments\Activity;
+
+use OCP\Activity\IManager;
+use OCP\App\IAppManager;
+use OCP\Comments\CommentsEvent;
+use OCP\Files\Config\IMountProviderCollection;
+use OCP\Files\IRootFolder;
+use OCP\Files\Node;
+use OCP\IUser;
+use OCP\IUserSession;
+use OCP\Share;
+
+class Listener {
+	/** @var IManager */
+	protected $activityManager;
+	/** @var IUserSession */
+	protected $session;
+	/** @var \OCP\App\IAppManager */
+	protected $appManager;
+	/** @var \OCP\Files\Config\IMountProviderCollection */
+	protected $mountCollection;
+	/** @var \OCP\Files\IRootFolder */
+	protected $rootFolder;
+
+	/**
+	 * Listener constructor.
+	 *
+	 * @param IManager $activityManager
+	 * @param IUserSession $session
+	 * @param IAppManager $appManager
+	 * @param IMountProviderCollection $mountCollection
+	 * @param IRootFolder $rootFolder
+	 */
+	public function __construct(IManager $activityManager,
+								IUserSession $session,
+								IAppManager $appManager,
+								IMountProviderCollection $mountCollection,
+								IRootFolder $rootFolder) {
+		$this->activityManager = $activityManager;
+		$this->session = $session;
+		$this->appManager = $appManager;
+		$this->mountCollection = $mountCollection;
+		$this->rootFolder = $rootFolder;
+	}
+
+	/**
+	 * @param CommentsEvent $event
+	 */
+	public function commentEvent(CommentsEvent $event) {
+		if ($event->getComment()->getObjectType() !== 'files'
+			|| !in_array($event->getEvent(), [CommentsEvent::EVENT_ADD])
+			|| !$this->appManager->isInstalled('activity')) {
+			// Comment not for file, not adding a comment or no activity-app enabled (save the energy)
+			return;
+		}
+
+		// Get all mount point owners
+		$cache = $this->mountCollection->getMountCache();
+		$mounts = $cache->getMountsForFileId($event->getComment()->getObjectId());
+		if (empty($mounts)) {
+			return;
+		}
+
+		$users = [];
+		foreach ($mounts as $mount) {
+			$owner = $mount->getUser()->getUID();
+			$ownerFolder = $this->rootFolder->getUserFolder($owner);
+			$nodes = $ownerFolder->getById($event->getComment()->getObjectId());
+			if (!empty($nodes)) {
+				/** @var Node $node */
+				$node = array_shift($nodes);
+				$path = $node->getPath();
+				if (strpos($path, '/' . $owner . '/files/') === 0) {
+					$path = substr($path, strlen('/' . $owner . '/files'));
+				}
+				// Get all users that have access to the mount point
+				$users = array_merge($users, Share::getUsersSharingFile($path, $owner, true, true));
+			}
+		}
+
+		$actor = $this->session->getUser();
+		if ($actor instanceof IUser) {
+			$actor = $actor->getUID();
+		} else {
+			$actor = '';
+		}
+
+		$activity = $this->activityManager->generateEvent();
+		$activity->setApp(Extension::APP_NAME)
+			->setType(Extension::APP_NAME)
+			->setAuthor($actor)
+			->setObject($event->getComment()->getObjectType(), $event->getComment()->getObjectId())
+			->setMessage(Extension::ADD_COMMENT_MESSAGE, [
+				$event->getComment()->getId(),
+			]);
+
+		foreach ($users as $user => $path) {
+			$activity->setAffectedUser($user);
+
+			$activity->setSubject(Extension::ADD_COMMENT_SUBJECT, [
+				$actor,
+				$path,
+			]);
+			$this->activityManager->publish($activity);
+		}
+	}
+}
@@ -0,0 +1,53 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.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
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+$eventDispatcher = \OC::$server->getEventDispatcher();
+$eventDispatcher->addListener(
+	'OCA\Files::loadAdditionalScripts',
+	function() {
+		\OCP\Util::addScript('oc-backbone-webdav');
+		\OCP\Util::addScript('comments', 'app');
+		\OCP\Util::addScript('comments', 'commentmodel');
+		\OCP\Util::addScript('comments', 'commentcollection');
+		\OCP\Util::addScript('comments', 'commentsummarymodel');
+		\OCP\Util::addScript('comments', 'commentstabview');
+		\OCP\Util::addScript('comments', 'filesplugin');
+		\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);
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<info>
+	<id>comments</id>
+	<name>Comments</name>
+	<description>Files app plugin to add comments to files</description>
+	<licence>AGPL</licence>
+	<author>Arthur Shiwon, Vincent Petry</author>
+	<default_enable/>
+	<version>0.2</version>
+	<dependencies>
+		<owncloud min-version="9.0" max-version="9.0" />
+	</dependencies>
+	<types>
+		<logging/>
+	</types>
+</info>
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2016
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+#commentsTabView .newCommentForm {
+	margin-bottom: 20px;
+}
+
+#commentsTabView .newCommentForm .message {
+	width: 90%;
+	resize: vertical;
+}
+
+#commentsTabView .newCommentForm .submitLoading {
+	background-position: left;
+}
+
+#commentsTabView .comment {
+	margin-bottom: 30px;
+}
+
+#commentsTabView .comment .avatar {
+	width: 28px;
+	height: 28px;
+	line-height: 28px;
+}
+
+#commentsTabView .comment {
+	position: relative;
+	z-index: 1;
+}
+
+#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;
+}
+
+#commentsTabView .comment.collapsed .message {
+	max-height: 70px;
+	overflow: hidden;
+}
+
+#commentsTabView .comment .message-overlay {
+	display: none;
+}
+
+#commentsTabView .comment.collapsed .message-overlay {
+	display: block;
+    position: absolute;
+	z-index: 2;
+    height: 50px;
+    pointer-events: none;
+	left: 0;
+	right: 0;
+    bottom: 0;
+	background: -moz-linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
+	background: -webkit-linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
+	background: -o-linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
+	background: -ms-linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
+	background: linear-gradient(rgba(255,255,255,0), rgba(255,255,255,1));
+	filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#00FFFFFF', endColorstr='#FFFFFFFF');
+    background-repeat: no-repeat;
+}
+
+#commentsTabView .authorRow>div {
+	display: inline-block;
+	vertical-align: middle;
+}
+
+#commentsTabView .comment .authorRow {
+	margin-bottom: 5px;
+	position: relative;
+}
+
+#commentsTabView .comment .author {
+	font-weight: bold;
+}
+
+#commentsTabView .comment .date {
+	position: absolute;
+	right: 0;
+}
+
+#commentsTabView .comment .action {
+	opacity: 0;
+	vertical-align: middle;
+	display: inline-block;
+}
+
+#commentsTabView .comment:hover .action {
+	opacity: 0.3;
+}
+
+#commentsTabView .comment .action:hover {
+	opacity: 1;
+}
+
+#commentsTabView .comment .action.delete {
+	position: absolute;
+	right: 0;
+}
+
+#commentsTabView .comment.disabled {
+	opacity: 0.3;
+}
+
+#commentsTabView .comment.disabled .action {
+	visibility: hidden;
+}
+
+#commentsTabView .message.error {
+	color: #e9322d;
+	border-color: #e9322d;
+	-webkit-box-shadow: 0 0 6px #f8b9b7;
+	-moz-box-shadow: 0 0 6px #f8b9b7;
+	box-shadow: 0 0 6px #f8b9b7;
+}
+
+.app-files .action-comment {
+	padding: 16px 14px;
+}
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2016 Vincent Petry <pvince81@owncloud.com>
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	if (!OCA.Comments) {
+		/**
+		 * @namespace
+		 */
+		OCA.Comments = {};
+	}
+
+})();
+
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2016
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function(OC, OCA) {
+
+	/**
+	 * @class OCA.Comments.CommentCollection
+	 * @classdesc
+	 *
+	 * Collection of comments assigned to a file
+	 *
+	 */
+	var CommentCollection = OC.Backbone.Collection.extend(
+		/** @lends OCA.Comments.CommentCollection.prototype */ {
+
+		sync: OC.Backbone.davSync,
+
+		model: OCA.Comments.CommentModel,
+
+		/**
+		 * Object type
+		 *
+		 * @type string
+		 */
+		_objectType: 'files',
+
+		/**
+		 * Object id
+		 *
+		 * @type string
+		 */
+		_objectId: null,
+
+		/**
+		 * True if there are no more page results left to fetch
+		 *
+		 * @type bool
+		 */
+		_endReached: false,
+
+		/**
+		 * Number of comments to fetch per page
+		 *
+		 * @type int
+		 */
+		_limit : 20,
+
+		/**
+		 * Initializes the collection
+		 *
+		 * @param {string} [options.objectType] object type
+		 * @param {string} [options.objectId] object id
+		 */
+		initialize: function(models, options) {
+			options = options || {};
+			if (options.objectType) {
+				this._objectType = options.objectType;
+			}
+			if (options.objectId) {
+				this._objectId = options.objectId;
+			}
+		},
+
+		url: function() {
+			return OC.linkToRemote('dav') + '/comments/' +
+				encodeURIComponent(this._objectType) + '/' +
+				encodeURIComponent(this._objectId) + '/';
+		},
+
+		setObjectId: function(objectId) {
+			this._objectId = objectId;
+		},
+
+		hasMoreResults: function() {
+			return !this._endReached;
+		},
+
+		reset: function() {
+			this._endReached = false;
+			this._summaryModel = null;
+			return OC.Backbone.Collection.prototype.reset.apply(this, arguments);
+		},
+
+		/**
+		 * Fetch the next set of results
+		 */
+		fetchNext: function(options) {
+			var self = this;
+			if (!this.hasMoreResults()) {
+				return null;
+			}
+
+			var body = '<?xml version="1.0" encoding="utf-8" ?>\n' +
+				'<oc:filter-comments xmlns:D="DAV:" xmlns:oc="http://owncloud.org/ns">\n' +
+				// load one more so we know there is more
+				'    <oc:limit>' + (this._limit + 1) + '</oc:limit>\n' +
+				'    <oc:offset>' + this.length + '</oc:offset>\n' +
+				'</oc:filter-comments>\n';
+
+			options = options || {};
+			var success = options.success;
+			options = _.extend({
+				remove: false,
+				parse: true,
+				data: body,
+				davProperties: CommentCollection.prototype.model.prototype.davProperties,
+				success: function(resp) {
+					if (resp.length <= self._limit) {
+						// no new entries, end reached
+						self._endReached = true;
+					} else {
+						// remove last entry, for next page load
+						resp = _.initial(resp);
+					}
+					if (!self.set(resp, options)) {
+						return false;
+					}
+					if (success) {
+						success.apply(null, arguments);
+					}
+					self.trigger('sync', 'REPORT', self, options);
+				}
+			}, options);
+
+			return this.sync('REPORT', this, options);
+		},
+
+		/**
+		 * Returns the matching summary model
+		 *
+		 * @return {OCA.Comments.CommentSummaryModel} summary model
+		 */
+		getSummaryModel: function() {
+			if (!this._summaryModel) {
+				this._summaryModel = new OCA.Comments.CommentSummaryModel({
+					id: this._objectId,
+					objectType: this._objectType
+				});
+			}
+			return this._summaryModel;
+		},
+
+		/**
+		 * Updates the read marker for this comment thread
+		 *
+		 * @param {Date} [date] optional date, defaults to now
+		 * @param {Object} [options] backbone options
+		 */
+		updateReadMarker: function(date, options) {
+			options = options || {};
+
+			return this.getSummaryModel().save({
+				readMarker: (date || new Date()).toUTCString()
+			}, options);
+		}
+	});
+
+	OCA.Comments.CommentCollection = CommentCollection;
+})(OC, OCA);
+
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2016
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function(OC, OCA) {
+	var NS_OWNCLOUD = 'http://owncloud.org/ns';
+	/**
+	 * @class OCA.Comments.CommentModel
+	 * @classdesc
+	 *
+	 * Comment
+	 *
+	 */
+	var CommentModel = OC.Backbone.Model.extend(
+		/** @lends OCA.Comments.CommentModel.prototype */ {
+		sync: OC.Backbone.davSync,
+
+		defaults: {
+			actorType: 'users',
+			objectType: 'files'
+		},
+
+		davProperties: {
+			'id': '{' + NS_OWNCLOUD + '}id',
+			'message': '{' + NS_OWNCLOUD + '}message',
+			'actorType': '{' + NS_OWNCLOUD + '}actorType',
+			'actorId': '{' + NS_OWNCLOUD + '}actorId',
+			'actorDisplayName': '{' + NS_OWNCLOUD + '}actorDisplayName',
+			'creationDateTime': '{' + NS_OWNCLOUD + '}creationDateTime',
+			'objectType': '{' + NS_OWNCLOUD + '}objectType',
+			'objectId': '{' + NS_OWNCLOUD + '}objectId',
+			'isUnread': '{' + NS_OWNCLOUD + '}isUnread'
+		},
+
+		parse: function(data) {
+			return {
+				id: data.id,
+				message: data.message,
+				actorType: data.actorType,
+				actorId: data.actorId,
+				actorDisplayName: data.actorDisplayName,
+				creationDateTime: data.creationDateTime,
+				objectType: data.objectType,
+				objectId: data.objectId,
+				isUnread: (data.isUnread === 'true')
+			};
+		}
+	});
+
+	OCA.Comments.CommentModel = CommentModel;
+})(OC, OCA);
+
@@ -0,0 +1,435 @@
+/*
+ * Copyright (c) 2016
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+/* global Handlebars, escapeHTML */
+
+(function(OC, OCA) {
+	var TEMPLATE =
+		'<ul class="comments">' +
+		'</ul>' +
+		'<div class="empty hidden">{{emptyResultLabel}}</div>' +
+		'<input type="button" class="showMore hidden" value="{{moreLabel}}"' +
+		' name="show-more" id="show-more" />' +
+		'<div class="loading hidden" style="height: 50px"></div>';
+
+	var EDIT_COMMENT_TEMPLATE =
+		'<div class="newCommentRow comment" data-id="{{id}}">' +
+		'    <div class="authorRow">' +
+		'        {{#if avatarEnabled}}' +
+		'        <div class="avatar" data-username="{{actorId}}"></div>' +
+		'        {{/if}}' +
+		'        <div class="author">{{actorDisplayName}}</div>' +
+		'{{#if isEditMode}}' +
+		'        <a href="#" class="action delete icon icon-delete has-tooltip" title="{{deleteTooltip}}"></a>' +
+		'{{/if}}' +
+		'    </div>' +
+		'    <form class="newCommentForm">' +
+		'        <textarea class="message" placeholder="{{newMessagePlaceholder}}">{{message}}</textarea>' +
+		'        <input class="submit" type="submit" value="{{submitText}}" />' +
+		'{{#if isEditMode}}' +
+		'        <input class="cancel" type="button" value="{{cancelText}}" />' +
+		'{{/if}}' +
+		'        <div class="submitLoading icon-loading-small hidden"></div>'+
+		'    </form>' +
+		'</div>';
+
+	var COMMENT_TEMPLATE =
+		'<li class="comment{{#if isUnread}} unread{{/if}}{{#if isLong}} collapsed{{/if}}" data-id="{{id}}">' +
+		'    <div class="authorRow">' +
+		'        {{#if avatarEnabled}}' +
+		'        <div class="avatar" {{#if actorId}}data-username="{{actorId}}"{{/if}}> </div>' +
+		'        {{/if}}' +
+		'        <div class="author">{{actorDisplayName}}</div>' +
+		'{{#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>' +
+		'    <div class="message">{{{formattedMessage}}}</div>' +
+		'{{#if isLong}}' +
+		'    <div class="message-overlay"></div>' +
+		'{{/if}}' +
+		'</li>';
+
+	/**
+	 * @memberof OCA.Comments
+	 */
+	var CommentsTabView = OCA.Files.DetailTabView.extend(
+		/** @lends OCA.Comments.CommentsTabView.prototype */ {
+		id: 'commentsTabView',
+		className: 'tab commentsTabView',
+
+		events: {
+			'submit .newCommentForm': '_onSubmitComment',
+			'click .showMore': '_onClickShowMore',
+			'click .action.edit': '_onClickEditComment',
+			'click .action.delete': '_onClickDeleteComment',
+			'click .cancel': '_onClickCloseComment',
+			'click .comment': '_onClickComment'
+		},
+
+		_commentMaxLength: 1000,
+
+		initialize: function() {
+			OCA.Files.DetailTabView.prototype.initialize.apply(this, arguments);
+			this.collection = new OCA.Comments.CommentCollection();
+			this.collection.on('request', this._onRequest, this);
+			this.collection.on('sync', this._onEndRequest, this);
+			this.collection.on('add', this._onAddModel, this);
+
+			this._avatarsEnabled = !!OC.config.enable_avatars;
+
+			this._commentMaxThreshold = this._commentMaxLength * 0.9;
+
+			// TODO: error handling
+			_.bindAll(this, '_onTypeComment');
+		},
+
+		template: function(params) {
+			if (!this._template) {
+				this._template = Handlebars.compile(TEMPLATE);
+			}
+			var currentUser = OC.getCurrentUser();
+			return this._template(_.extend({
+				avatarEnabled: this._avatarsEnabled,
+				actorId: currentUser.uid,
+				actorDisplayName: currentUser.displayName
+			}, params));
+		},
+
+		editCommentTemplate: function(params) {
+			if (!this._editCommentTemplate) {
+				this._editCommentTemplate = Handlebars.compile(EDIT_COMMENT_TEMPLATE);
+			}
+			var currentUser = OC.getCurrentUser();
+			return this._editCommentTemplate(_.extend({
+				avatarEnabled: this._avatarsEnabled,
+				actorId: currentUser.uid,
+				actorDisplayName: currentUser.displayName,
+				newMessagePlaceholder: t('comments', 'Type in a new comment...'),
+				deleteTooltip: t('comments', 'Delete comment'),
+				submitText: t('comments', 'Post'),
+				cancelText: t('comments', 'Cancel')
+			}, params));
+		},
+
+		commentTemplate: function(params) {
+			if (!this._commentTemplate) {
+				this._commentTemplate = Handlebars.compile(COMMENT_TEMPLATE);
+			}
+
+			params = _.extend({
+				avatarEnabled: this._avatarsEnabled,
+				editTooltip: t('comments', 'Edit comment'),
+				isUserAuthor: OC.getCurrentUser().uid === params.actorId,
+				isLong: this._isLong(params.message)
+			}, params);
+
+			if (params.actorType === 'deleted_users') {
+				// makes the avatar a X
+				params.actorId = null;
+				params.actorDisplayName = t('comments', '[Deleted user]');
+			}
+
+			return this._commentTemplate(params);
+		},
+
+		getLabel: function() {
+			return t('comments', 'Comments');
+		},
+
+		setFileInfo: function(fileInfo) {
+			if (fileInfo) {
+				this.model = fileInfo;
+				this.render();
+				this.collection.setObjectId(fileInfo.id);
+				// reset to first page
+				this.collection.reset([], {silent: true});
+				this.nextPage();
+			} else {
+				this.model = null;
+				this.render();
+				this.collection.reset();
+			}
+		},
+
+		render: function() {
+			this.$el.html(this.template({
+				emptyResultLabel: t('comments', 'No other comments available'),
+				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.delegateEvents();
+			this.$el.find('textarea').on('keyup input change', this._onTypeComment);
+		},
+
+		_formatItem: function(commentModel) {
+			var timestamp = new Date(commentModel.get('creationDateTime')).getTime();
+			var data = _.extend({
+				date: OC.Util.relativeModifiedDate(timestamp),
+				altDate: OC.Util.formatDate(timestamp),
+				formattedMessage: this._formatMessage(commentModel.get('message'))
+			}, commentModel.attributes);
+			return data;
+		},
+
+		_toggleLoading: function(state) {
+			this._loading = state;
+			this.$el.find('.loading').toggleClass('hidden', !state);
+		},
+
+		_onRequest: function(type) {
+			if (type === 'REPORT') {
+				this._toggleLoading(true);
+				this.$el.find('.showMore').addClass('hidden');
+			}
+		},
+
+		_onEndRequest: function(type) {
+			var fileInfoModel = this.model;
+			this._toggleLoading(false);
+			this.$el.find('.empty').toggleClass('hidden', !!this.collection.length);
+			this.$el.find('.showMore').toggleClass('hidden', !this.collection.hasMoreResults());
+
+			if (type !== 'REPORT') {
+				return;
+			}
+
+			// find first unread comment
+			var firstUnreadComment = this.collection.findWhere({isUnread: true});
+			if (firstUnreadComment) {
+				// update read marker
+				this.collection.updateReadMarker(
+					null,
+					{
+						success: function() {
+							fileInfoModel.set('commentsUnread', 0);
+						}
+					}
+				);
+			}
+		},
+
+		_onAddModel: function(model, collection, options) {
+			var $el = $(this.commentTemplate(this._formatItem(model)));
+			if (!_.isUndefined(options.at) && collection.length > 1) {
+				this.$container.find('li').eq(options.at).before($el);
+			} else {
+				this.$container.append($el);
+			}
+
+			this._postRenderItem($el);
+		},
+
+		_postRenderItem: function($el) {
+			$el.find('.has-tooltip').tooltip();
+			if(this._avatarsEnabled) {
+				$el.find('.avatar').each(function() {
+					var $this = $(this);
+					$this.avatar($this.attr('data-username'), 28);
+				});
+			}
+		},
+
+		/**
+		 * Convert a message to be displayed in HTML,
+		 * converts newlines to <br> tags.
+		 */
+		_formatMessage: function(message) {
+			return escapeHTML(message).replace(/\n/g, '<br/>');
+		},
+
+		nextPage: function() {
+			if (this._loading || !this.collection.hasMoreResults()) {
+				return;
+			}
+
+			this.collection.fetchNext();
+		},
+
+		_onClickEditComment: function(ev) {
+			ev.preventDefault();
+			var $comment = $(ev.target).closest('.comment');
+			var commentId = $comment.data('id');
+			var commentToEdit = this.collection.get(commentId);
+			var $formRow = $(this.editCommentTemplate(_.extend({
+				isEditMode: true,
+				submitText: t('comments', 'Save')
+			}, commentToEdit.attributes)));
+
+			$comment.addClass('hidden').removeClass('collapsed');
+			// spawn form
+			$comment.after($formRow);
+			$formRow.data('commentEl', $comment);
+			$formRow.find('textarea').on('keyup input change', this._onTypeComment);
+
+			// copy avatar element from original to avoid flickering
+			$formRow.find('.avatar').replaceWith($comment.find('.avatar').clone());
+			$formRow.find('.has-tooltip').tooltip();
+
+			return false;
+		},
+
+		_onTypeComment: function(ev) {
+			var $field = $(ev.target);
+			var len = $field.val().length;
+			var $submitButton = $field.data('submitButtonEl');
+			if (!$submitButton) {
+				$submitButton = $field.closest('form').find('.submit');
+				$field.data('submitButtonEl', $submitButton);
+			}
+			$field.tooltip('hide');
+			if (len > this._commentMaxThreshold) {
+				$field.attr('data-original-title', t('comments', 'Allowed characters {count} of {max}', {count: len, max: this._commentMaxLength}));
+				$field.tooltip({trigger: 'manual'});
+				$field.tooltip('show');
+				$field.addClass('error');
+			}
+
+			var limitExceeded = (len > this._commentMaxLength);
+			$field.toggleClass('error', limitExceeded);
+			$submitButton.prop('disabled', limitExceeded);
+		},
+
+		_onClickComment: function(ev) {
+			var $row = $(ev.target);
+			if (!$row.is('.comment')) {
+				$row = $row.closest('.comment');
+			}
+			$row.removeClass('collapsed');
+		},
+
+		_onClickCloseComment: function(ev) {
+			ev.preventDefault();
+			var $row = $(ev.target).closest('.comment');
+			$row.data('commentEl').removeClass('hidden');
+			$row.remove();
+			return false;
+		},
+
+		_onClickDeleteComment: function(ev) {
+			ev.preventDefault();
+			var $comment = $(ev.target).closest('.comment');
+			var commentId = $comment.data('id');
+			var $loading = $comment.find('.submitLoading');
+
+			$comment.addClass('disabled');
+			$loading.removeClass('hidden');
+			this.collection.get(commentId).destroy({
+				success: function() {
+					$comment.data('commentEl').remove();
+					$comment.remove();
+				},
+				error: function(msg) {
+					$loading.addClass('hidden');
+					$comment.removeClass('disabled');
+					OC.Notification.showTemporary(msg);
+				}
+			});
+
+
+			return false;
+		},
+
+		_onClickShowMore: function(ev) {
+			ev.preventDefault();
+			this.nextPage();
+		},
+
+		_onSubmitComment: function(e) {
+			var self = this;
+			var $form = $(e.target);
+			var commentId = $form.closest('.comment').data('id');
+			var currentUser = OC.getCurrentUser();
+			var $submit = $form.find('.submit');
+			var $loading = $form.find('.submitLoading');
+			var $textArea = $form.find('textarea');
+			var message = $textArea.val().trim();
+			e.preventDefault();
+
+			if (!message.length || message.length > this._commentMaxLength) {
+				return;
+			}
+
+			$textArea.prop('disabled', true);
+			$submit.addClass('hidden');
+			$loading.removeClass('hidden');
+
+			if (commentId) {
+				// edit mode
+				var comment = this.collection.get(commentId);
+				comment.save({
+					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();
+					},
+					error: function(msg) {
+						$submit.removeClass('hidden');
+						$loading.addClass('hidden');
+						$textArea.prop('disabled', false);
+
+						OC.Notification.showTemporary(msg);
+					}
+				});
+			} else {
+				this.collection.create({
+					actorId: currentUser.uid,
+					actorDisplayName: currentUser.displayName,
+					actorType: 'users',
+					verb: 'comment',
+					message: $textArea.val(),
+					creationDateTime: (new Date()).toUTCString()
+				}, {
+					at: 0,
+					// wait for real creation before adding
+					wait: true,
+					success: function() {
+						$submit.removeClass('hidden');
+						$loading.addClass('hidden');
+						$textArea.val('').prop('disabled', false);
+					},
+					error: function(msg) {
+						$submit.removeClass('hidden');
+						$loading.addClass('hidden');
+						$textArea.prop('disabled', false);
+
+						OC.Notification.showTemporary(msg);
+					}
+				});
+			}
+
+			return false;
+		},
+
+		/**
+		 * Returns whether the given message is long and needs
+		 * collapsing
+		 */
+		_isLong: function(message) {
+			return message.length > 250 || (message.match(/\n/g) || []).length > 1;
+		}
+	});
+
+	OCA.Comments.CommentsTabView = CommentsTabView;
+})(OC, OCA);
+
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2016
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function(OC, OCA) {
+	var NS_OWNCLOUD = 'http://owncloud.org/ns';
+	/**
+	 * @class OCA.Comments.CommentSummaryModel
+	 * @classdesc
+	 *
+	 * Model containing summary information related to comments
+	 * like the read marker. 
+	 *
+	 */
+	var CommentSummaryModel = OC.Backbone.Model.extend(
+		/** @lends OCA.Comments.CommentSummaryModel.prototype */ {
+		sync: OC.Backbone.davSync,
+
+		/**
+		 * Object type
+		 *
+		 * @type string
+		 */
+		_objectType: 'files',
+
+		/**
+		 * Object id
+		 *
+		 * @type string
+		 */
+		_objectId: null,
+
+		davProperties: {
+			'readMarker': '{' + NS_OWNCLOUD + '}readMarker'
+		},
+
+		/**
+		 * Initializes the summary model
+		 *
+		 * @param {string} [options.objectType] object type
+		 * @param {string} [options.objectId] object id
+		 */
+		initialize: function(attrs, options) {
+			options = options || {};
+			if (options.objectType) {
+				this._objectType = options.objectType;
+			}
+		},
+
+		url: function() {
+			return OC.linkToRemote('dav') + '/comments/' +
+				encodeURIComponent(this._objectType) + '/' +
+				encodeURIComponent(this.id) + '/';
+		}
+	});
+
+	OCA.Comments.CommentSummaryModel = CommentSummaryModel;
+})(OC, OCA);
+
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2016 Vincent Petry <pvince81@owncloud.com>
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+/* global Handlebars */
+
+(function() {
+	var TEMPLATE_COMMENTS_UNREAD =
+		'<a class="action action-comment permanent" title="{{countMessage}}" href="#">' +
+		'<img class="svg" src="{{iconUrl}}"/>' +
+		'</a>';
+
+	OCA.Comments = _.extend({}, OCA.Comments);
+	if (!OCA.Comments) {
+		/**
+		 * @namespace
+		 */
+		OCA.Comments = {};
+	}
+
+	/**
+	 * @namespace
+	 */
+	OCA.Comments.FilesPlugin = {
+		ignoreLists: [
+			'files_trashbin',
+			'files.public'
+		],
+
+		_formatCommentCount: function(count) {
+			if (!this._commentsUnreadTemplate) {
+				this._commentsUnreadTemplate = Handlebars.compile(TEMPLATE_COMMENTS_UNREAD);
+			}
+			return this._commentsUnreadTemplate({
+				count: count,
+				countMessage: t('comments', '{count} unread comments', {count: count}),
+				iconUrl: OC.imagePath('core', 'actions/comment')
+			});
+		},
+
+		attach: function(fileList) {
+			var self = this;
+			if (this.ignoreLists.indexOf(fileList.id) >= 0) {
+				return;
+			}
+
+			fileList.registerTabView(new OCA.Comments.CommentsTabView('commentsTabView'));
+
+			var NS_OC = 'http://owncloud.org/ns';
+
+			var oldGetWebdavProperties = fileList._getWebdavProperties;
+			fileList._getWebdavProperties = function() {
+				var props = oldGetWebdavProperties.apply(this, arguments);
+				props.push('{' + NS_OC + '}comments-unread');
+				return props;
+			};
+
+			fileList.filesClient.addFileInfoParser(function(response) {
+				var data = {};
+				var props = response.propStat[0].properties;
+				var commentsUnread = props['{' + NS_OC + '}comments-unread'];
+				if (!_.isUndefined(commentsUnread) && commentsUnread !== '') {
+					data.commentsUnread = parseInt(commentsUnread, 10);
+				}
+				return data;
+			});
+
+			fileList.$el.addClass('has-comments');
+			var oldCreateRow = fileList._createRow;
+			fileList._createRow = function(fileData) {
+				var $tr = oldCreateRow.apply(this, arguments);
+				if (fileData.commentsUnread) {
+					$tr.attr('data-comments-unread', fileData.commentsUnread);
+				}
+				return $tr;
+			};
+
+			// register "comment" action for reading comments
+			fileList.fileActions.registerAction({
+				name: 'Comment',
+				displayName: t('comments', 'Comment'),
+				mime: 'all',
+				permissions: OC.PERMISSION_READ,
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				render: function(actionSpec, isDefault, context) {
+					var $file = context.$file;
+					var unreadComments = $file.data('comments-unread');
+					if (unreadComments) {
+						var $actionLink = $(self._formatCommentCount(unreadComments));
+						context.$file.find('a.name>span.fileactions').append($actionLink);
+						return $actionLink;
+					}
+					return '';
+				},
+				actionHandler: function(fileName, context) {
+					context.$file.find('.action-comment').tooltip('hide');
+					// open sidebar in comments section
+					context.fileList.showDetailsView(fileName, 'commentsTabView');
+				}
+			});
+
+			// add attribute to "elementToFile"
+			var oldElementToFile = fileList.elementToFile;
+			fileList.elementToFile = function($el) {
+				var fileInfo = oldElementToFile.apply(this, arguments);
+				var commentsUnread = $el.data('comments-unread');
+				if (commentsUnread) {
+					fileInfo.commentsUnread = commentsUnread;
+				}
+				return fileInfo;
+			};
+		}
+	};
+
+})();
+
+OC.Plugins.register('OCA.Files.FileList', OCA.Comments.FilesPlugin);
@@ -1,6 +1,6 @@
 OC.L10N.register(
-    "settings",
+    "comments",
    {
-    "Password" : "Passcode"
+    "Cancel" : "Kanselleer"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,4 +1,4 @@
 { "translations": {
-    "Download" : "Download"
+    "Cancel" : "Kanselleer"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "إلغاء",
+    "Save" : "حفظ",
+    "Comment" : "تعليق"
+},
+"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "إلغاء",
+    "Save" : "حفظ",
+    "Comment" : "تعليق"
+},"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
+}
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "Encaboxar",
+    "Save" : "Guardar",
+    "Comment" : "Comentariu"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "Encaboxar",
+    "Save" : "Guardar",
+    "Comment" : "Comentariu"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "Dayandır",
+    "Save" : "Saxla",
+    "Comment" : "Komentariya"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "Dayandır",
+    "Save" : "Saxla",
+    "Comment" : "Komentariya"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "Отказ",
+    "Save" : "Запазване",
+    "Comment" : "Коментар"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "Отказ",
+    "Save" : "Запазване",
+    "Comment" : "Коментар"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "বাতিল",
+    "Save" : "সংরক্ষণ",
+    "Comment" : "মন্তব্য"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "বাতিল",
+    "Save" : "সংরক্ষণ",
+    "Comment" : "মন্তব্য"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "বাতিল করা",
+    "Save" : "সেভ"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Cancel" : "বাতিল করা",
+    "Save" : "সেভ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "Odustani",
+    "Save" : "Spremi",
+    "Comment" : "Komentar"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "Odustani",
+    "Save" : "Spremi",
+    "Comment" : "Komentar"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "Cancel·la",
+    "Save" : "Desa",
+    "Comment" : "Comentari"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "Cancel·la",
+    "Save" : "Desa",
+    "Comment" : "Comentari"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "comments",
+    {
+    "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
+    "%1$s commented" : "%1$s okomentován",
+    "%1$s commented on %2$s" : "%1$s okomentoval %2$s",
+    "Comments" : "Komentáře",
+    "Type in a new comment..." : "Zadat nový komentář...",
+    "Delete comment" : "Smazat komentář",
+    "Post" : "Zveřejnit",
+    "Cancel" : "Zrušit",
+    "Edit comment" : "Upravit komentář",
+    "[Deleted user]" : "[Smazaný uživatel]",
+    "No other comments available" : "Nejsou dostupné žádné další komentáře",
+    "More comments..." : "Více komentářů...",
+    "Save" : "Uložit",
+    "Allowed characters {count} of {max}" : "Povolených znaků {count} z {max}",
+    "{count} unread comments" : "{count} nepřečtených komentářů",
+    "Comment" : "Komentář",
+    "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
@@ -0,0 +1,20 @@
+{ "translations": {
+    "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
+    "%1$s commented" : "%1$s okomentován",
+    "%1$s commented on %2$s" : "%1$s okomentoval %2$s",
+    "Comments" : "Komentáře",
+    "Type in a new comment..." : "Zadat nový komentář...",
+    "Delete comment" : "Smazat komentář",
+    "Post" : "Zveřejnit",
+    "Cancel" : "Zrušit",
+    "Edit comment" : "Upravit komentář",
+    "[Deleted user]" : "[Smazaný uživatel]",
+    "No other comments available" : "Nejsou dostupné žádné další komentáře",
+    "More comments..." : "Více komentářů...",
+    "Save" : "Uložit",
+    "Allowed characters {count} of {max}" : "Povolených znaků {count} z {max}",
+    "{count} unread comments" : "{count} nepřečtených komentářů",
+    "Comment" : "Komentář",
+    "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů"
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "Diddymu",
+    "Save" : "Cadw"
+},
+"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Cancel" : "Diddymu",
+    "Save" : "Cadw"
+},"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"
+}
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "Annullér",
+    "Save" : "Gem",
+    "Comment" : "Kommentér"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "Annullér",
+    "Save" : "Gem",
+    "Comment" : "Kommentér"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "comments",
+    {
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
+    "%1$s commented" : "%1$s kommentiert",
+    "%1$s commented on %2$s" : "%1$s kommentiert %2$s",
+    "Comments" : "Kommentare",
+    "Type in a new comment..." : "Gebe bitte einen neuen Kommentar ein...",
+    "Delete comment" : "Kommentar löschen",
+    "Post" : "Speichern",
+    "Cancel" : "Abbrechen",
+    "Edit comment" : "Kommentar bearbeiten",
+    "[Deleted user]" : "[Gelöschter Benutzer]",
+    "No other comments available" : "Keine andere Kommentare vorhanden",
+    "More comments..." : "Weitere Kommentare...",
+    "Save" : "Speichern",
+    "Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}",
+    "{count} unread comments" : "{count} ungelesene Kommentare",
+    "Comment" : "Kommentar",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,20 @@
+{ "translations": {
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
+    "%1$s commented" : "%1$s kommentiert",
+    "%1$s commented on %2$s" : "%1$s kommentiert %2$s",
+    "Comments" : "Kommentare",
+    "Type in a new comment..." : "Gebe bitte einen neuen Kommentar ein...",
+    "Delete comment" : "Kommentar löschen",
+    "Post" : "Speichern",
+    "Cancel" : "Abbrechen",
+    "Edit comment" : "Kommentar bearbeiten",
+    "[Deleted user]" : "[Gelöschter Benutzer]",
+    "No other comments available" : "Keine andere Kommentare vorhanden",
+    "More comments..." : "Weitere Kommentare...",
+    "Save" : "Speichern",
+    "Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}",
+    "{count} unread comments" : "{count} ungelesene Kommentare",
+    "Comment" : "Kommentar",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "Abbrechen",
+    "Save" : "Speichern"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Cancel" : "Abbrechen",
+    "Save" : "Speichern"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "comments",
+    {
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
+    "%1$s commented" : "%1$s kommentiert",
+    "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
+    "Comments" : "Kommentare",
+    "Type in a new comment..." : "Neuer Kommentar...",
+    "Delete comment" : "Kommentar löschen",
+    "Post" : "Speichern",
+    "Cancel" : "Abbrechen",
+    "Edit comment" : "Kommentar bearbeiten",
+    "[Deleted user]" : "[gelöschter Benutzer]",
+    "No other comments available" : "Keine anderen Kommentare verfügbar",
+    "More comments..." : "Weitere Kommentare...",
+    "Save" : "Speichern",
+    "Allowed characters {count} of {max}" : "{count} von {max} Zeichen benutzt",
+    "{count} unread comments" : "[count] ungelesene Kommentare",
+    "Comment" : "Kommentar",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,20 @@
+{ "translations": {
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
+    "%1$s commented" : "%1$s kommentiert",
+    "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
+    "Comments" : "Kommentare",
+    "Type in a new comment..." : "Neuer Kommentar...",
+    "Delete comment" : "Kommentar löschen",
+    "Post" : "Speichern",
+    "Cancel" : "Abbrechen",
+    "Edit comment" : "Kommentar bearbeiten",
+    "[Deleted user]" : "[gelöschter Benutzer]",
+    "No other comments available" : "Keine anderen Kommentare verfügbar",
+    "More comments..." : "Weitere Kommentare...",
+    "Save" : "Speichern",
+    "Allowed characters {count} of {max}" : "{count} von {max} Zeichen benutzt",
+    "{count} unread comments" : "[count] ungelesene Kommentare",
+    "Comment" : "Kommentar",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,13 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Comments" : "Σχόλια",
+    "Type in a new comment..." : "Αυτό είναι ένα νέο σχόλιο...",
+    "Delete comment" : "Διαγραφή σχολίου",
+    "Cancel" : "Άκυρο",
+    "Edit comment" : "Επεξεργασία σχολίου",
+    "More comments..." : "Περισσότερα σχόλια...",
+    "Save" : "Αποθήκευση",
+    "Comment" : "Σχόλιο"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,11 @@
+{ "translations": {
+    "Comments" : "Σχόλια",
+    "Type in a new comment..." : "Αυτό είναι ένα νέο σχόλιο...",
+    "Delete comment" : "Διαγραφή σχολίου",
+    "Cancel" : "Άκυρο",
+    "Edit comment" : "Επεξεργασία σχολίου",
+    "More comments..." : "Περισσότερα σχόλια...",
+    "Save" : "Αποθήκευση",
+    "Comment" : "Σχόλιο"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "comments",
+    {
+    "<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
+    "%1$s commented" : "%1$s commented",
+    "%1$s commented on %2$s" : "%1$s commented on %2$s",
+    "Comments" : "Comments",
+    "Type in a new comment..." : "Type in a new comment...",
+    "Delete comment" : "Delete comment",
+    "Post" : "Post",
+    "Cancel" : "Cancel",
+    "Edit comment" : "Edit comment",
+    "[Deleted user]" : "[Deleted user]",
+    "No other comments available" : "No other comments available",
+    "More comments..." : "More comments...",
+    "Save" : "Save",
+    "Allowed characters {count} of {max}" : "Allowed characters {count} of {max}",
+    "{count} unread comments" : "{count} unread comments",
+    "Comment" : "Comment",
+    "<strong>Comments</strong> for files" : "<strong>Comments</strong> for files"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,20 @@
+{ "translations": {
+    "<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
+    "%1$s commented" : "%1$s commented",
+    "%1$s commented on %2$s" : "%1$s commented on %2$s",
+    "Comments" : "Comments",
+    "Type in a new comment..." : "Type in a new comment...",
+    "Delete comment" : "Delete comment",
+    "Post" : "Post",
+    "Cancel" : "Cancel",
+    "Edit comment" : "Edit comment",
+    "[Deleted user]" : "[Deleted user]",
+    "No other comments available" : "No other comments available",
+    "More comments..." : "More comments...",
+    "Save" : "Save",
+    "Allowed characters {count} of {max}" : "Allowed characters {count} of {max}",
+    "{count} unread comments" : "{count} unread comments",
+    "Comment" : "Comment",
+    "<strong>Comments</strong> for files" : "<strong>Comments</strong> for files"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "comments",
+    {
+    "<strong>Comments</strong> for files" : "<strong>Komentoj</strong> por dosieroj",
+    "%1$s commented" : "%1$s komentis",
+    "%1$s commented on %2$s" : "%1$s komentis %2$s",
+    "Comments" : "Komentoj",
+    "Type in a new comment..." : "Tajpu novan komenton...",
+    "Delete comment" : "Forigi komenton",
+    "Post" : "Afiŝi",
+    "Cancel" : "Nuligi",
+    "Edit comment" : "Redakti komenton",
+    "[Deleted user]" : "[Forigita uzanto]",
+    "No other comments available" : "Neniu alia komento disponeblas",
+    "More comments..." : "Pli da komentoj...",
+    "Save" : "Konservi",
+    "Allowed characters {count} of {max}" : "Permesataj karakteroj: {count} el {max}",
+    "{count} unread comments" : "{count} nelegitaj komentoj",
+    "Comment" : "Komento",
+    "<strong>Comments</strong> for files" : "<strong>Komentoj</strong> por dosieroj"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,20 @@
+{ "translations": {
+    "<strong>Comments</strong> for files" : "<strong>Komentoj</strong> por dosieroj",
+    "%1$s commented" : "%1$s komentis",
+    "%1$s commented on %2$s" : "%1$s komentis %2$s",
+    "Comments" : "Komentoj",
+    "Type in a new comment..." : "Tajpu novan komenton...",
+    "Delete comment" : "Forigi komenton",
+    "Post" : "Afiŝi",
+    "Cancel" : "Nuligi",
+    "Edit comment" : "Redakti komenton",
+    "[Deleted user]" : "[Forigita uzanto]",
+    "No other comments available" : "Neniu alia komento disponeblas",
+    "More comments..." : "Pli da komentoj...",
+    "Save" : "Konservi",
+    "Allowed characters {count} of {max}" : "Permesataj karakteroj: {count} el {max}",
+    "{count} unread comments" : "{count} nelegitaj komentoj",
+    "Comment" : "Komento",
+    "<strong>Comments</strong> for files" : "<strong>Komentoj</strong> por dosieroj"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "comments",
+    {
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos",
+    "%1$s commented" : "%1$s comentados",
+    "%1$s commented on %2$s" : "%1$s comentados en %2$s",
+    "Comments" : "Comentarios",
+    "Type in a new comment..." : "Ingrese un nuevo comentario...",
+    "Delete comment" : "Borrar comentario",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "Edit comment" : "Editar comentario",
+    "[Deleted user]" : "[Usuario eliminado]",
+    "No other comments available" : "No hay otros comentarios disponibles",
+    "More comments..." : "Más comentarios...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "{count} unread comments" : "{count} comentarios no leídos",
+    "Comment" : "Comentario",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,20 @@
+{ "translations": {
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos",
+    "%1$s commented" : "%1$s comentados",
+    "%1$s commented on %2$s" : "%1$s comentados en %2$s",
+    "Comments" : "Comentarios",
+    "Type in a new comment..." : "Ingrese un nuevo comentario...",
+    "Delete comment" : "Borrar comentario",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "Edit comment" : "Editar comentario",
+    "[Deleted user]" : "[Usuario eliminado]",
+    "No other comments available" : "No hay otros comentarios disponibles",
+    "More comments..." : "Más comentarios...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "{count} unread comments" : "{count} comentarios no leídos",
+    "Comment" : "Comentario",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "Cancelar",
+    "Save" : "Guardar"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Cancel" : "Cancelar",
+    "Save" : "Guardar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -1,6 +1,6 @@
 OC.L10N.register(
-    "user_ldap",
+    "comments",
    {
-    "Password" : "Passcode"
+    "Cancel" : "Cancelar"
 },
 "nplurals=2; plural=(n != 1);");
@@ -1,4 +1,4 @@
 { "translations": {
-    "Password" : "Passcode"
+    "Cancel" : "Cancelar"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "Cancelar",
+    "Save" : "Guardar",
+    "Comment" : "Comentario"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "Cancelar",
+    "Save" : "Guardar",
+    "Comment" : "Comentario"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,19 @@
+OC.L10N.register(
+    "comments",
+    {
+    "%1$s commented on %2$s" : "%1$s kommenteeris %2$s",
+    "Comments" : "Kommentaarid",
+    "Type in a new comment..." : "Kirjuta uus komentaar...",
+    "Delete comment" : "Kustuta kommentaar",
+    "Post" : "Postita",
+    "Cancel" : "Loobu",
+    "Edit comment" : "Muuda kommentaari",
+    "[Deleted user]" : "[Kustutatud kasutaja]",
+    "No other comments available" : "Ühtegi teist kommentaari pole saadaval",
+    "More comments..." : "Veel kommentaare...",
+    "Save" : "Salvesta",
+    "Allowed characters {count} of {max}" : "Lubatud märkide arv {count}/{max}",
+    "{count} unread comments" : "{count} lugemata kommentaari",
+    "Comment" : "Kommentaar"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,17 @@
+{ "translations": {
+    "%1$s commented on %2$s" : "%1$s kommenteeris %2$s",
+    "Comments" : "Kommentaarid",
+    "Type in a new comment..." : "Kirjuta uus komentaar...",
+    "Delete comment" : "Kustuta kommentaar",
+    "Post" : "Postita",
+    "Cancel" : "Loobu",
+    "Edit comment" : "Muuda kommentaari",
+    "[Deleted user]" : "[Kustutatud kasutaja]",
+    "No other comments available" : "Ühtegi teist kommentaari pole saadaval",
+    "More comments..." : "Veel kommentaare...",
+    "Save" : "Salvesta",
+    "Allowed characters {count} of {max}" : "Lubatud märkide arv {count}/{max}",
+    "{count} unread comments" : "{count} lugemata kommentaari",
+    "Comment" : "Kommentaar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "Ezeztatu",
+    "Save" : "Gorde",
+    "Comment" : "Iruzkina"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "Ezeztatu",
+    "Save" : "Gorde",
+    "Comment" : "Iruzkina"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "منصرف شدن",
+    "Save" : "ذخیره",
+    "Comment" : "نظر"
+},
+"nplurals=1; plural=0;");
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "منصرف شدن",
+    "Save" : "ذخیره",
+    "Comment" : "نظر"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "comments",
+    {
+    "<strong>Comments</strong> for files" : "<strong>Kommentit</strong> tiedostoille",
+    "%1$s commented" : "%1$s kommentoi",
+    "%1$s commented on %2$s" : "%1$s kommentoi kohdetta %2$s",
+    "Comments" : "Kommentit",
+    "Type in a new comment..." : "Kirjoita uusi kommentti...",
+    "Delete comment" : "Poista kommentti",
+    "Post" : "Lähetä",
+    "Cancel" : "Peruuta",
+    "Edit comment" : "Muokkaa kommenttia",
+    "[Deleted user]" : "[Poistettu käyttäjä]",
+    "No other comments available" : "Ei muita kommentteja saatavilla",
+    "More comments..." : "Lisää kommentteja...",
+    "Save" : "Tallenna",
+    "Allowed characters {count} of {max}" : "Sallittujen merkkien määrä {count}/{max}",
+    "{count} unread comments" : "{count} lukematonta kommenttia",
+    "Comment" : "Kommentti",
+    "<strong>Comments</strong> for files" : "<strong>Kommentit</strong> tiedostoille"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,20 @@
+{ "translations": {
+    "<strong>Comments</strong> for files" : "<strong>Kommentit</strong> tiedostoille",
+    "%1$s commented" : "%1$s kommentoi",
+    "%1$s commented on %2$s" : "%1$s kommentoi kohdetta %2$s",
+    "Comments" : "Kommentit",
+    "Type in a new comment..." : "Kirjoita uusi kommentti...",
+    "Delete comment" : "Poista kommentti",
+    "Post" : "Lähetä",
+    "Cancel" : "Peruuta",
+    "Edit comment" : "Muokkaa kommenttia",
+    "[Deleted user]" : "[Poistettu käyttäjä]",
+    "No other comments available" : "Ei muita kommentteja saatavilla",
+    "More comments..." : "Lisää kommentteja...",
+    "Save" : "Tallenna",
+    "Allowed characters {count} of {max}" : "Sallittujen merkkien määrä {count}/{max}",
+    "{count} unread comments" : "{count} lukematonta kommenttia",
+    "Comment" : "Kommentti",
+    "<strong>Comments</strong> for files" : "<strong>Kommentit</strong> tiedostoille"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "comments",
+    {
+    "<strong>Comments</strong> for files" : "<strong>Commentaires</strong> pour les fichiers",
+    "%1$s commented" : "%1$s a commenté",
+    "%1$s commented on %2$s" : "%1$s a commenté %2$s",
+    "Comments" : "Commentaires",
+    "Type in a new comment..." : "Écrire un nouveau commentaire...",
+    "Delete comment" : "Supprimer le commentaire",
+    "Post" : "Poster",
+    "Cancel" : "Annuler",
+    "Edit comment" : "Modifier le commentaire",
+    "[Deleted user]" : "[Utilisateur supprimé]",
+    "No other comments available" : "Aucun autre commentaire",
+    "More comments..." : "Plus de commentaires...",
+    "Save" : "Enregistrer",
+    "Allowed characters {count} of {max}" : "{count} sur {max} caractères autorisés",
+    "{count} unread comments" : "{count} commentaires non lus",
+    "Comment" : "Commenter",
+    "<strong>Comments</strong> for files" : "<strong>Commentaires</strong> pour les fichiers"
+},
+"nplurals=2; plural=(n > 1);");
@@ -0,0 +1,20 @@
+{ "translations": {
+    "<strong>Comments</strong> for files" : "<strong>Commentaires</strong> pour les fichiers",
+    "%1$s commented" : "%1$s a commenté",
+    "%1$s commented on %2$s" : "%1$s a commenté %2$s",
+    "Comments" : "Commentaires",
+    "Type in a new comment..." : "Écrire un nouveau commentaire...",
+    "Delete comment" : "Supprimer le commentaire",
+    "Post" : "Poster",
+    "Cancel" : "Annuler",
+    "Edit comment" : "Modifier le commentaire",
+    "[Deleted user]" : "[Utilisateur supprimé]",
+    "No other comments available" : "Aucun autre commentaire",
+    "More comments..." : "Plus de commentaires...",
+    "Save" : "Enregistrer",
+    "Allowed characters {count} of {max}" : "{count} sur {max} caractères autorisés",
+    "{count} unread comments" : "{count} commentaires non lus",
+    "Comment" : "Commenter",
+    "<strong>Comments</strong> for files" : "<strong>Commentaires</strong> pour les fichiers"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "Cancelar",
+    "Save" : "Gardar",
+    "Comment" : "Comentario"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "Cancelar",
+    "Save" : "Gardar",
+    "Comment" : "Comentario"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "comments",
+    {
+    "<strong>Comments</strong> for files" : "<strong>תגובות</strong> לקבצים",
+    "%1$s commented" : "התקבלו תגובות %1$s",
+    "%1$s commented on %2$s" : "התקבלו תגובות %1$s ב- %2$s ",
+    "Comments" : "תגובות",
+    "Type in a new comment..." : "יש להכניס תגובה חדשה...",
+    "Delete comment" : "מחיקת תגובה",
+    "Post" : "פרסום",
+    "Cancel" : "ביטול",
+    "Edit comment" : "עריכת תגובה",
+    "[Deleted user]" : "[משתמשים מוסרים]",
+    "No other comments available" : "אין תגובות אחרות זמינות",
+    "More comments..." : "תגובות נוספות...",
+    "Save" : "שמירה",
+    "Allowed characters {count} of {max}" : "תווים מותרים {count} מתוך {max}",
+    "{count} unread comments" : "{count} תגובות שלא נקראו",
+    "Comment" : "תגובה",
+    "<strong>Comments</strong> for files" : "<strong>תגובות</strong> לקבצים"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,20 @@
+{ "translations": {
+    "<strong>Comments</strong> for files" : "<strong>תגובות</strong> לקבצים",
+    "%1$s commented" : "התקבלו תגובות %1$s",
+    "%1$s commented on %2$s" : "התקבלו תגובות %1$s ב- %2$s ",
+    "Comments" : "תגובות",
+    "Type in a new comment..." : "יש להכניס תגובה חדשה...",
+    "Delete comment" : "מחיקת תגובה",
+    "Post" : "פרסום",
+    "Cancel" : "ביטול",
+    "Edit comment" : "עריכת תגובה",
+    "[Deleted user]" : "[משתמשים מוסרים]",
+    "No other comments available" : "אין תגובות אחרות זמינות",
+    "More comments..." : "תגובות נוספות...",
+    "Save" : "שמירה",
+    "Allowed characters {count} of {max}" : "תווים מותרים {count} מתוך {max}",
+    "{count} unread comments" : "{count} תגובות שלא נקראו",
+    "Comment" : "תגובה",
+    "<strong>Comments</strong> for files" : "<strong>תגובות</strong> לקבצים"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "रद्द करें ",
+    "Save" : "सहेजें"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Cancel" : "रद्द करें ",
+    "Save" : "सहेजें"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "Odustanite",
+    "Save" : "Spremi"
+},
+"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Cancel" : "Odustanite",
+    "Save" : "Spremi"
+},"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
+}
@@ -0,0 +1,13 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "Mégsem",
+    "Save" : "Mentés",
+    "Comment" : "Komment",
+    "<strong>Comments</strong> for files" : "<strong>Hozzászólások</strong> a fájlokhoz",
+    "Delete comment" : "Hozzászólás törlése",
+    "Edit comment" : "Hozzászólás szerkesztése",
+    "No other comments available" : "Nincs több hozzászólás.",
+    "Post" : "Küldés"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,11 @@
+{ "translations": {
+    "Cancel" : "Mégsem",
+    "Save" : "Mentés",
+    "Comment" : "Komment",
+    "<strong>Comments</strong> for files" : "<strong>Hozzászólások</strong> a fájlokhoz",
+    "Delete comment" : "Hozzászólás törlése",
+    "Edit comment" : "Hozzászólás szerkesztése",
+    "No other comments available" : "Nincs több hozzászólás.",
+    "Post" : "Küldés"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "Չեղարկել",
+    "Save" : "Պահպանել"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Cancel" : "Չեղարկել",
+    "Save" : "Պահպանել"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "Cancellar",
+    "Save" : "Salveguardar"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Cancel" : "Cancellar",
+    "Save" : "Salveguardar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "comments",
+    {
+    "<strong>Comments</strong> for files" : "<strong>Komentar</strong> untuk berkas",
+    "%1$s commented" : "%1$s dikomentari",
+    "%1$s commented on %2$s" : "%1$s dikomentari pada %2$s",
+    "Comments" : "Komentar",
+    "Type in a new comment..." : "Ketik di komentar baru...",
+    "Delete comment" : "Hapus komentar",
+    "Post" : "Posting",
+    "Cancel" : "Batal",
+    "Edit comment" : "Sunting komentar",
+    "[Deleted user]" : "[Hapus pengguna]",
+    "No other comments available" : "Tidak ada komentar lainnya",
+    "More comments..." : "Komentar lainya...",
+    "Save" : "Simpan",
+    "Allowed characters {count} of {max}" : "Karakter yang diizinkan {count} dari {max}",
+    "{count} unread comments" : "{count} komentar belum dibaca",
+    "Comment" : "Komentar",
+    "<strong>Comments</strong> for files" : "<strong>Komentar</strong> untuk berkas"
+},
+"nplurals=1; plural=0;");
@@ -0,0 +1,20 @@
+{ "translations": {
+    "<strong>Comments</strong> for files" : "<strong>Komentar</strong> untuk berkas",
+    "%1$s commented" : "%1$s dikomentari",
+    "%1$s commented on %2$s" : "%1$s dikomentari pada %2$s",
+    "Comments" : "Komentar",
+    "Type in a new comment..." : "Ketik di komentar baru...",
+    "Delete comment" : "Hapus komentar",
+    "Post" : "Posting",
+    "Cancel" : "Batal",
+    "Edit comment" : "Sunting komentar",
+    "[Deleted user]" : "[Hapus pengguna]",
+    "No other comments available" : "Tidak ada komentar lainnya",
+    "More comments..." : "Komentar lainya...",
+    "Save" : "Simpan",
+    "Allowed characters {count} of {max}" : "Karakter yang diizinkan {count} dari {max}",
+    "{count} unread comments" : "{count} komentar belum dibaca",
+    "Comment" : "Komentar",
+    "<strong>Comments</strong> for files" : "<strong>Komentar</strong> untuk berkas"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
@@ -0,0 +1,13 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "Hætta við",
+    "Save" : "Vista",
+    "Comment" : "Athugasemd",
+    "<strong>Comments</strong> for files" : "<strong>Athugasemdir</strong> við skrár",
+    "Delete comment" : "Eyða athugasemd",
+    "Edit comment" : "Breyta athugasemd",
+    "No other comments available" : "Engar aðrar athugasemdir eru tiltækar",
+    "Post" : "Senda"
+},
+"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
@@ -0,0 +1,11 @@
+{ "translations": {
+    "Cancel" : "Hætta við",
+    "Save" : "Vista",
+    "Comment" : "Athugasemd",
+    "<strong>Comments</strong> for files" : "<strong>Athugasemdir</strong> við skrár",
+    "Delete comment" : "Eyða athugasemd",
+    "Edit comment" : "Breyta athugasemd",
+    "No other comments available" : "Engar aðrar athugasemdir eru tiltækar",
+    "Post" : "Senda"
+},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
+}
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "comments",
+    {
+    "<strong>Comments</strong> for files" : "<strong>Commenti</strong> sui file",
+    "%1$s commented" : "%1$s ha commentato",
+    "%1$s commented on %2$s" : "%1$s ha commentato %2$s",
+    "Comments" : "Commenti",
+    "Type in a new comment..." : "Digita un nuovo commento...",
+    "Delete comment" : "Elimina commento",
+    "Post" : "Commento",
+    "Cancel" : "Annulla",
+    "Edit comment" : "Modifica commento",
+    "[Deleted user]" : "[Utente eliminato]",
+    "No other comments available" : "Non sono disponibili altri commenti",
+    "More comments..." : "Altri commenti...",
+    "Save" : "Salva",
+    "Allowed characters {count} of {max}" : "Caratteri consentiti {count} di {max}",
+    "{count} unread comments" : "{count} commenti non letti",
+    "Comment" : "Commento",
+    "<strong>Comments</strong> for files" : "<strong>Commenti</strong> sui file"
+},
+"nplurals=2; plural=(n != 1);");
@@ -0,0 +1,20 @@
+{ "translations": {
+    "<strong>Comments</strong> for files" : "<strong>Commenti</strong> sui file",
+    "%1$s commented" : "%1$s ha commentato",
+    "%1$s commented on %2$s" : "%1$s ha commentato %2$s",
+    "Comments" : "Commenti",
+    "Type in a new comment..." : "Digita un nuovo commento...",
+    "Delete comment" : "Elimina commento",
+    "Post" : "Commento",
+    "Cancel" : "Annulla",
+    "Edit comment" : "Modifica commento",
+    "[Deleted user]" : "[Utente eliminato]",
+    "No other comments available" : "Non sono disponibili altri commenti",
+    "More comments..." : "Altri commenti...",
+    "Save" : "Salva",
+    "Allowed characters {count} of {max}" : "Caratteri consentiti {count} di {max}",
+    "{count} unread comments" : "{count} commenti non letti",
+    "Comment" : "Commento",
+    "<strong>Comments</strong> for files" : "<strong>Commenti</strong> sui file"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "comments",
+    {
+    "<strong>Comments</strong> for files" : "ファイルについての<strong>コメント</strong>",
+    "%1$s commented" : "%1$s がコメントを追加",
+    "%1$s commented on %2$s" : "%2$s について、%1$s がコメントしました",
+    "Comments" : "コメント",
+    "Type in a new comment..." : "新しいコメントを入力...",
+    "Delete comment" : "コメントを削除",
+    "Post" : "追加",
+    "Cancel" : "キャンセル",
+    "Edit comment" : "コメントを編集",
+    "[Deleted user]" : "[削除済みユーザー]",
+    "No other comments available" : "コメントはありません",
+    "More comments..." : "コメントをさらに表示...",
+    "Save" : "保存",
+    "Allowed characters {count} of {max}" : "入力文字数  {count} / {max}",
+    "{count} unread comments" : "未読コメント数 {count}",
+    "Comment" : "コメント",
+    "<strong>Comments</strong> for files" : "ファイルについての<strong>コメント</strong>"
+},
+"nplurals=1; plural=0;");
@@ -0,0 +1,20 @@
+{ "translations": {
+    "<strong>Comments</strong> for files" : "ファイルについての<strong>コメント</strong>",
+    "%1$s commented" : "%1$s がコメントを追加",
+    "%1$s commented on %2$s" : "%2$s について、%1$s がコメントしました",
+    "Comments" : "コメント",
+    "Type in a new comment..." : "新しいコメントを入力...",
+    "Delete comment" : "コメントを削除",
+    "Post" : "追加",
+    "Cancel" : "キャンセル",
+    "Edit comment" : "コメントを編集",
+    "[Deleted user]" : "[削除済みユーザー]",
+    "No other comments available" : "コメントはありません",
+    "More comments..." : "コメントをさらに表示...",
+    "Save" : "保存",
+    "Allowed characters {count} of {max}" : "入力文字数  {count} / {max}",
+    "{count} unread comments" : "未読コメント数 {count}",
+    "Comment" : "コメント",
+    "<strong>Comments</strong> for files" : "ファイルについての<strong>コメント</strong>"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "comments",
+    {
+    "Cancel" : "უარყოფა",
+    "Save" : "შენახვა"
+},
+"nplurals=1; plural=0;");
--- a/Show More
+++ b/Show More