Merge pull request #14421 from nextcloud/version/noid/14.0.8

14.0.8

.drone.yml

@@ -66,6 +66,22 @@ pipeline:
     when:
       matrix:
         TESTS: syntax-php7.1
+  syntax-php7.2:
+    image: nextcloudci/php7.2:php7.2-12
+    commands:
+      - composer install
+      - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php --exclude 3rdparty/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php .
+    when:
+      matrix:
+        TESTS: syntax-php7.2
+  syntax-php7.3:
+    image: nextcloudci/php7.3:php7.3-1
+    commands:
+      - composer install
+      - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php --exclude 3rdparty/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php .
+    when:
+      matrix:
+        TESTS: syntax-php7.3
   phan:
     image: nextcloudci/php7.2:php7.2-12
     commands:
@@ -191,6 +207,14 @@ pipeline:
       matrix:
         DB: NODB
         PHP: 7.2
+  nodb-php7.3:
+    image: nextcloudci/php7.3:php7.3-1
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
+    when:
+      matrix:
+        DB: NODB
+        PHP: 7.3
   sqlite-php7.0:
     image: nextcloudci/php7.0:php7.0-19
     commands:
@@ -215,6 +239,14 @@ pipeline:
       matrix:
         DB: sqlite
         PHP: 7.2
+  sqlite-php7.3:
+    image: nextcloudci/php7.3:php7.3-1
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
+    when:
+      matrix:
+        DB: sqlite
+        PHP: 7.3
   mysql-php7.0:
     image: nextcloudci/php7.0:php7.0-19
     commands:
@@ -239,6 +271,14 @@ pipeline:
       matrix:
         DB: mysql
         PHP: 7.2
+  mysql-php7.3:
+    image: nextcloudci/php7.3:php7.3-1
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
+    when:
+      matrix:
+        DB: mysql
+        PHP: 7.3
   mysql5.6-php7.0:
     image: nextcloudci/php7.0:php7.0-19
     commands:
@@ -284,7 +324,7 @@ pipeline:
     image: nextcloudci/php7.1:php7.1-16
     commands:
       - sleep 10 # gives the database enough time to initialize
-      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
+      - POSTGRES=${POSTGRES} NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
     when:
       matrix:
         DB: postgres
@@ -313,6 +353,14 @@ pipeline:
       matrix:
         DB: mysqlmb4
         PHP: 7.2
+  mysqlmb4-php7.3:
+    image: nextcloudci/php7.3:php7.3-1
+    commands:
+      - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
+    when:
+      matrix:
+        DB: mysqlmb4
+        PHP: 7.3
   integration-capabilities_features:
     image: nextcloudci/integration-php7.0:integration-php7.0-8
     commands:
@@ -566,6 +614,11 @@ pipeline:
       image: nextcloudci/integration-php7.0:integration-php7.0-6
       commands:
         - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
+        - ./occ config:system:set redis host --value=cache
+        - ./occ config:system:set redis port --value=6379 --type=integer
+        - ./occ config:system:set redis timeout --value=0 --type=integer
+        - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local
+        - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed
         - ./occ app:enable user_ldap
         - cd build/integration
         - ./run.sh ldap_features/ldap-openldap.feature
@@ -576,6 +629,11 @@ pipeline:
         image: nextcloudci/integration-php7.0:integration-php7.0-6
         commands:
           - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
+          - ./occ config:system:set redis host --value=cache
+          - ./occ config:system:set redis port --value=6379 --type=integer
+          - ./occ config:system:set redis timeout --value=0 --type=integer
+          - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local
+          - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed
           - ./occ app:enable user_ldap
           - cd build/integration
           - ./run.sh ldap_features/openldap-uid-username.feature
@@ -630,6 +688,27 @@ pipeline:
       when:
         matrix:
           TESTS-ACCEPTANCE: app-files
+  acceptance-app-files-sharing:
+      image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
+      commands:
+        - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-sharing --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-sharing.feature
+      when:
+        matrix:
+          TESTS-ACCEPTANCE: app-files-sharing
+  acceptance-app-files-sharing-link:
+      image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
+      commands:
+        - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-sharing-link --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-sharing-link.feature
+      when:
+        matrix:
+          TESTS-ACCEPTANCE: app-files-sharing-link
+  acceptance-app-files-tags:
+      image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
+      commands:
+        - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-tags --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-tags.feature
+      when:
+        matrix:
+          TESTS-ACCEPTANCE: app-files-tags
   acceptance-app-theming:
       image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
       commands:
@@ -769,6 +848,9 @@ matrix:
     - DB: NODB
       PHP: 7.2
       ENABLE_REDIS: false
+    - DB: NODB
+      PHP: 7.3
+      ENABLE_REDIS: false
     - DB: sqlite
       PHP: 7.0
       ENABLE_REDIS: true
@@ -778,6 +860,9 @@ matrix:
     - DB: sqlite
       PHP: 7.2
       ENABLE_REDIS: false
+    - DB: sqlite
+      PHP: 7.3
+      ENABLE_REDIS: false
     - DB: mysql
       PHP: 7.0
       ENABLE_REDIS: true
@@ -787,6 +872,9 @@ matrix:
     - DB: mysql
       PHP: 7.2
       ENABLE_REDIS: false
+    - DB: mysql
+      PHP: 7.3
+      ENABLE_REDIS: false
     - DB: mysql5.6
       PHP: 7.0
       ENABLE_REDIS: true
@@ -820,6 +908,9 @@ matrix:
     - DB: mysqlmb4
       PHP: 7.2
       ENABLE_REDIS: false
+    - DB: mysqlmb4
+      PHP: 7.3
+      ENABLE_REDIS: false
     - TESTS: integration-capabilities_features
     - TESTS: integration-federation_features
     - TESTS: integration-maintenance-mode
@@ -850,8 +941,10 @@ matrix:
     - TESTS: integration-ldap-features
     - TESTS: integration-ldap-openldap-features
       ENABLE_OPENLDAP: true
+      ENABLE_REDIS: true
     - TESTS: integration-ldap-openldap-uid-features
       ENABLE_OPENLDAP: true
+      ENABLE_REDIS: true
     - TESTS: integration-trashbin
     - TESTS: integration-remote-api
     - TESTS: integration-download
@@ -861,6 +954,12 @@ matrix:
       TESTS-ACCEPTANCE: app-comments
     - TESTS: acceptance
       TESTS-ACCEPTANCE: app-files
+    - TESTS: acceptance
+      TESTS-ACCEPTANCE: app-files-sharing
+    - TESTS: acceptance
+      TESTS-ACCEPTANCE: app-files-sharing-link
+    - TESTS: acceptance
+      TESTS-ACCEPTANCE: app-files-tags
     - TESTS: acceptance
       TESTS-ACCEPTANCE: app-theming
     - TESTS: acceptance
@@ -874,6 +973,8 @@ matrix:
     - TESTS: jsunit
     - TESTS: syntax-php7.0
     - TESTS: syntax-php7.1
+    - TESTS: syntax-php7.2
+    - TESTS: syntax-php7.3
     - TESTS: phan
     - TESTS: litmus-v1
     - TESTS: litmus-v2
@@ -936,6 +1037,7 @@ services:
     image: postgres:9
     environment:
       - POSTGRES_USER=oc_autotest
+      - POSTGRES_DB=oc_autotest_dummy
       - POSTGRES_PASSWORD=owncloud
     tmpfs:
       - /var/lib/postgresql/data
@@ -947,6 +1049,7 @@ services:
       image: postgres:10
       environment:
         - POSTGRES_USER=oc_autotest
+        - POSTGRES_DB=oc_autotest_dummy
         - POSTGRES_PASSWORD=owncloud
       tmpfs:
         - /var/lib/postgresql/data
@@ -1032,7 +1135,7 @@ services:
       matrix:
         TESTS: acceptance
   openldap:
-    image: nextcloudci/openldap:openldap-4
+    image: nextcloudci/openldap:openldap-6
     environment:
       - SLAPD_DOMAIN=nextcloud.ci
       - SLAPD_ORGANIZATION=Nextcloud
@@ -1042,4 +1145,4 @@ services:
       matrix:
         ENABLE_OPENLDAP: true
 
-branches: [ master, stable* ]
+branches: [ master, stable14 ]

.htaccess

@@ -16,6 +16,7 @@
     Header set X-Robots-Tag "none"
     Header set X-Download-Options "noopen"
     Header set X-Permitted-Cross-Domain-Policies "none"
+    Header set Referrer-Policy "no-referrer"
     SetEnv modHeadersAvailable true
   </IfModule>
 

apps/accessibility/appinfo/routes.php

@@ -23,7 +23,7 @@
 
 return [
     'routes' => [
-        ['name' => 'accessibility#getCss', 'url' => '/css/user-{md5}.css', 'verb' => 'GET'],
+		['name' => 'accessibility#getCss', 'url' => '/css/user-{md5}', 'verb' => 'GET'],
     ],
     'ocs' => [
 		[

apps/accessibility/lib/AppInfo/Application.php

@@ -54,8 +54,10 @@ class Application extends App {
 		$loggedUser = $this->userSession->getUser();
 		if (!is_null($loggedUser)) {
 			$userValues = $this->config->getUserKeys($loggedUser->getUID(), $this->appName);
+			// we want to check if any theme or font is enabled.
 			if (count($userValues) > 0) {
-				$linkToCSS = $this->urlGenerator->linkToRoute($this->appName . '.accessibility.getCss', ['md5' => md5(implode('-', $userValues))]);
+				$hash = $this->config->getUserValue($loggedUser->getUID(), $this->appName, 'icons-css', md5(implode('-', $userValues)));
+				$linkToCSS = $this->urlGenerator->linkToRoute($this->appName . '.accessibility.getCss', ['md5' => $hash]);
 				\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
 			}
 		}

apps/accessibility/lib/Controller/AccessibilityController.php

@@ -181,6 +181,9 @@ class AccessibilityController extends Controller {
 		$response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
 		$response->addHeader('Pragma', 'cache');
 
+		// store current cache hash
+		$this->config->setUserValue($this->userSession->getUser()->getUID(), $this->appName, 'icons-css', md5($css));
+
 		return $response;
 	}
 

apps/accessibility/lib/Controller/ConfigController.php

@@ -36,6 +36,9 @@ class ConfigController extends OCSController {
 	/** @var string */
 	protected $appName;
 
+	/** @var string */
+	protected $userId;
+
 	/** @var string */
 	protected $serverRoot;
 
@@ -67,6 +70,7 @@ class ConfigController extends OCSController {
 		$this->config                = $config;
 		$this->userSession           = $userSession;
 		$this->accessibilityProvider = $accessibilityProvider;
+		$this->userId				 = $userSession->getUser()->getUID();
 	}
 
 	/**
@@ -79,8 +83,8 @@ class ConfigController extends OCSController {
 	 */
 	public function getConfig(): DataResponse {
 		return new DataResponse([
-			'theme' => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false),
-			'font' => $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false)
+			'theme' => $this->config->getUserValue($this->userId, $this->appName, 'theme', false),
+			'font' => $this->config->getUserValue($this->userId, $this->appName, 'font', false)
 		]);
 	}
 
@@ -95,20 +99,28 @@ class ConfigController extends OCSController {
 	 */
 	public function setConfig(string $key, $value): DataResponse {
 		if ($key === 'theme' || $key === 'font') {
-			$themes = $this->accessibilityProvider->getThemes();
-			$fonts  = $this->accessibilityProvider->getFonts();
 
 			if ($value === false) {
-				$this->config->deleteUserValue($this->userSession->getUser()->getUID(), $this->appName, $key);
+				$this->config->deleteUserValue($this->userId, $this->appName, $key);
+				$userValues = $this->config->getUserKeys($this->userId, $this->appName);
+
+				// remove hash if no settings selected
+				if (count($userValues) === 1 && $userValues[0] === 'icons-css') {
+					$this->config->deleteUserValue($this->userId, $this->appName, 'icons-css');
+				}
+
 				return new DataResponse();
 			}
 
+			$themes = $this->accessibilityProvider->getThemes();
+			$fonts  = $this->accessibilityProvider->getFonts();
+
 			$availableOptions = array_map(function($option) {
 				return $option['id'];
 			}, array_merge($themes, $fonts));
 
 			if (in_array($value, $availableOptions)) {
-				$this->config->setUserValue($this->userSession->getUser()->getUID(), $this->appName, $key, $value);
+				$this->config->setUserValue($this->userId, $this->appName, $key, $value);
 				return new DataResponse();
 			}
 

apps/accessibility/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "accessibility",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -3448,9 +3448,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.10",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
+      "version": "4.17.11",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
       "dev": true
     },
     "lodash.camelcase": {

apps/accessibility/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "accessibility",
 	"description": "Provides multiple accessibilities options to ease your use of nextcloud",
-	"version": "1.0.1",
+	"version": "1.0.2",
 	"author": "John Molakvoæ <skjnldsv@protonmail.com>",
 	"license": "agpl",
 	"private": true,

apps/accessibility/src/App.vue

@@ -24,7 +24,7 @@ import preview from './components/itemPreview';
 import axios from 'axios';
 
 export default {
-	name: 'app',
+	name: 'Accessibility',
 	components: { preview },
 	beforeMount() {
 		// importing server data into the app
@@ -54,7 +54,7 @@ export default {
 			};
 		},
 		tokenHeaders() {
-			return { headers: { requesttoken: OC.requestToken } }
+			return { headers: { requesttoken: OC.requestToken } };
 		}
 	},
 	methods: {
@@ -73,8 +73,11 @@ export default {
 		 * @param {string} id the data of the change
 		 */
 		selectItem(type, id) {
-			axios
-				.post(OC.linkToOCS('apps/accessibility/api/v1/config', 2) + type, {value: id}, this.tokenHeaders)
+			axios.post(
+					OC.linkToOCS('apps/accessibility/api/v1/config', 2) + type,
+					{ value: id },
+					this.tokenHeaders
+				)
 				.then(response => {
 					this.serverData[type] = id;
 
@@ -84,11 +87,23 @@ export default {
 						// insert new css
 						let link = document.createElement('link');
 						link.rel = 'stylesheet';
-						link.href = OC.generateUrl('/apps/accessibility/css/user-style.css');
-						document.head.appendChild(link)
+						link.href = OC.generateUrl('/apps/accessibility/css/user-style.css') + '?v=' + new Date().getTime();
+						document.head.appendChild(link);
 					} else {
-						// force update
-						link.href = link.href.split('?')[0] + '?v=' + new Date().getTime();
+						// compare arrays
+						if (
+							JSON.stringify(Object.values(this.selected)) ===
+							JSON.stringify([false, false])
+						) {
+							// if nothing is selected, blindly remove the css
+							link.remove();
+						} else {
+							// force update
+							link.href =
+								link.href.split('?')[0] +
+								'?v=' +
+								new Date().getTime();
+						}
 					}
 				})
 				.catch(err => {

apps/admin_audit/composer/composer/ClassLoader.php

@@ -279,7 +279,7 @@ class ClassLoader
      */
     public function setApcuPrefix($apcuPrefix)
     {
-        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
     }
 
     /**

apps/cloud_federation_api/appinfo/info.xml

@@ -4,7 +4,7 @@
     <id>cloud_federation_api</id>
     <name>Cloud Federation API</name>
     <summary>Enable clouds to communicate with each other and exchange data</summary>
-    <description>The Coud Federation API enabled various Nextcloud instances to communitcate with each other and to exchange data</description>
+    <description>The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data.</description>
     <version>0.0.1</version>
     <licence>agpl</licence>
     <author>Bjoern Schiessle</author>

apps/comments/.l10nignore

@@ -0,0 +1,2 @@
+# compiled vue templates
+js/templates.js

apps/comments/composer/composer/ClassLoader.php

@@ -279,7 +279,7 @@ class ClassLoader
      */
     public function setApcuPrefix($apcuPrefix)
     {
-        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
     }
 
     /**

apps/comments/css/comments.scss

@@ -22,6 +22,9 @@
 	padding: 10px;
 	min-height: 44px;
 	margin: 0;
+
+	/* Prevent the text from overlapping with the submit button. */
+	padding-right: 30px;
 }
 
 #commentsTabView .newCommentForm {
@@ -130,7 +133,7 @@
 	 adding this brings them closer to the element**/
 	margin-top: 5px;
 }
-#commentsTabView .comments li .message .avatar-name-wrapper,
+
 .atwho-view-ul * .avatar-name-wrapper,
 #commentsTabView .comment .authorRow {
 	position: relative;
@@ -141,24 +144,34 @@
 
 #commentsTabView .comment:not(.newCommentRow) .message .avatar-name-wrapper:not(.currentUser),
 #commentsTabView .comment:not(.newCommentRow) .message .avatar-name-wrapper:not(.currentUser) .avatar,
+#commentsTabView .comment:not(.newCommentRow) .message .avatar-name-wrapper:not(.currentUser) .avatar img,
 #commentsTabView .comment .authorRow .avatar:not(.currentUser),
 #commentsTabView .comment .authorRow .author:not(.currentUser) {
 	cursor: pointer;
 }
 
 .atwho-view-ul .avatar-name-wrapper,
-.atwho-view-ul .avatar-name-wrapper .avatar {
+.atwho-view-ul .avatar-name-wrapper .avatar,
+.atwho-view-ul .avatar-name-wrapper .avatar img {
 	cursor: pointer;
 }
 
 #commentsTabView .comments li .message .atwho-inserted,
 #commentsTabView .newCommentForm .atwho-inserted {
 	.avatar-name-wrapper {
+		/* Make the wrapper the positioning context of its child contacts
+		 * menu. */
+		position: relative;
+
 		display: inline;
 		vertical-align: top;
 		background-color: var(--color-background-dark);
 		border-radius: 50vh;
 		padding: 1px 7px 1px 1px;
+
+		/* Ensure that the avatar and the user name will be kept together. */
+		white-space: nowrap;
+
 		.avatar {
 			img {
 				vertical-align: top;
@@ -171,6 +184,15 @@
 			margin-left: 0;
 			margin-right: 2px;
 		}
+		strong {
+			/* Ensure that the user name is shown in bold, as different browsers
+			 * use different font weights for strong elements. */
+			font-weight: bold;
+		}
+	}
+	.avatar-name-wrapper.currentUser {
+		background-color: var(--color-primary);
+		color: var(--color-primary-text);
 	}
 }
 
@@ -231,4 +253,9 @@
 
 .app-files .action-comment {
 	padding: 16px 14px;
-}
+}
+
+#commentsTabView .comment .message .contactsmenu-popover {
+	left: -6px;
+	top: 24px;
+}

apps/comments/js/commentstabview.js

@@ -196,24 +196,26 @@
 					sorter: function (q, items) { return items; }
 				},
 				displayTpl: function (item) {
-					return '<li>'
-						+ '<span class="avatar-name-wrapper">'
-						+ '<div class="avatar" '
-						+ ' data-username="' + escapeHTML(item.id) + '"'	// for avatars
-						+ ' data-user="' + escapeHTML(item.id) + '"'		// for contactsmenu
-						+ ' data-user-display-name="' + escapeHTML(item.label) + '"></div>'
-						+ ' <strong>' + escapeHTML(item.label) + '</strong>'
-						+ '</span></li>';
+					return '<li>' +
+						'<span class="avatar-name-wrapper">' +
+							'<span class="avatar" ' +
+									'data-username="' + escapeHTML(item.id) + '" ' + // for avatars
+									'data-user="' + escapeHTML(item.id) + '" ' + // for contactsmenu
+									'data-user-display-name="' + escapeHTML(item.label) + '">' +
+							'</span>' +
+							'<strong>' + escapeHTML(item.label) + '</strong>' +
+						'</span></li>';
 				},
 				insertTpl: function (item) {
-					return ''
-						+ '<span class="avatar-name-wrapper">'
-						+ '<div class="avatar" '
-						+ ' data-username="' + escapeHTML(item.id) + '"'	// for avatars
-						+ ' data-user="' + escapeHTML(item.id) + '"'		// for contactsmenu
-						+ ' data-user-display-name="' + escapeHTML(item.label) + '"></div>'
-						+ ' <strong>' + escapeHTML(item.label) + '</strong>'
-						+ '</span>';
+					return '' +
+						'<span class="avatar-name-wrapper">' +
+							'<span class="avatar" ' +
+									'data-username="' + escapeHTML(item.id) + '" ' + // for avatars
+									'data-user="' + escapeHTML(item.id) + '" ' + // for contactsmenu
+									'data-user-display-name="' + escapeHTML(item.label) + '">' +
+							'</span>' +
+							'<strong>' + escapeHTML(item.label) + '</strong>' +
+						'</span>';
 				},
 				searchKey: "label"
 			});
@@ -224,7 +226,7 @@
 					// passing the whole comments form would re-apply and request
 					// avatars from the server
 					$(je.target).find(
-						'div[data-username="' + $el.find('[data-username]').data('username') + '"]'
+						'span[data-username="' + $el.find('[data-username]').data('username') + '"]'
 					).parent(),
 					editionMode
 				);
@@ -440,14 +442,13 @@
 				return;
 			}
 
-			$el.find('.avatar').each(function() {
-				var avatar = $(this);
-				var strong = $(this).next();
-				var appendTo = $(this).parent();
+			$el.find('.avatar-name-wrapper').each(function() {
+				var $this = $(this);
+				var $avatar = $this.find('.avatar');
 
-				var username = $(this).data('username');
-				if (username !== oc_current_user) {
-					$.merge(avatar, strong).contactsMenu(avatar.data('user'), 0, appendTo);
+				var user = $avatar.data('user');
+				if (user !== OC.getCurrentUser().uid) {
+					$this.contactsMenu(user, 0, $this);
 				}
 			});
 		},
@@ -486,20 +487,22 @@
 		},
 
 		_composeHTMLMention: function(uid, displayName) {
-			var avatar = '<div class="avatar" '
-				+ 'data-username="' + _.escape(uid) + '"'
-				+ ' data-user="' + _.escape(uid) + '"'
-				+ ' data-user-display-name="'
-				+ _.escape(displayName) + '"></div>';
+			var avatar = '' +
+				'<span class="avatar" ' +
+						'data-username="' + _.escape(uid) + '" ' +
+						'data-user="' + _.escape(uid) + '" ' +
+						'data-user-display-name="' + _.escape(displayName) + '">' +
+				'</span>';
 
 			var isCurrentUser = (uid === OC.getCurrentUser().uid);
 
-			return ''
-				+ '<span class="atwho-inserted" contenteditable="false">'
-				+ '<span class="avatar-name-wrapper' + (isCurrentUser ? ' currentUser' : '') + '">'
-				+ avatar + ' <strong>'+ _.escape(displayName)+'</strong>'
-				+ '</span>'
-				+ '</span>';
+			return '' +
+				'<span class="atwho-inserted" contenteditable="false">' +
+					'<span class="avatar-name-wrapper' + (isCurrentUser ? ' currentUser' : '') + '">' +
+						avatar +
+						'<strong>' + _.escape(displayName) + '</strong>' +
+					'</span>' +
+				'</span>';
 		},
 
 		nextPage: function() {

apps/comments/js/search.js

@@ -92,7 +92,9 @@
 					.css('background-image', 'url(' + OC.imagePath('core', 'actions/comment') + ')')
 					.css('opacity', '.4');
 				var dir = OC.dirname(result.path);
-				if (dir === '') {
+				// "result.path" does not include a leading "/", so "OC.dirname"
+				// returns the path itself for files or folders in the root.
+				if (dir === result.path) {
 					dir = '/';
 				}
 				$row.find('td.info a').attr('href',

apps/comments/l10n/af.js

@@ -1,22 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "Wysig kommentaar",
-    "Delete comment" : "Skrap kommentaar",
-    "New comment …" : "Nuwe kommentaar…",
-    "Post" : "Plaas",
-    "Cancel" : "Kanselleer",
-    "[Deleted user]" : "[Geskrapte gebruiker]",
     "Comments" : "Kommentare",
-    "No comments yet, start the conversation!" : "Nog geen kommentaar, begin die gesprek!",
-    "More comments …" : "Nog kommentare …",
-    "Save" : "Bewaar",
-    "Allowed characters {count} of {max}" : "Toegelate karakters {telling} van {maks}",
-    "Error occurred while retrieving comment with ID {id}" : "’n Fout het voorgekom toe kommentaar met id {id} opgehaal is",
-    "Error occurred while updating comment with id {id}" : "’n Fout het voorgekom toe kommentaar met id {id} bygewerk is",
-    "Error occurred while posting comment" : "’n Fout het voorgekom toe kommentaar geplaas is",
-    "_%n unread comment_::_%n unread comments_" : ["%n ongeleesde kommentaar","%n ongeleeste kommentare"],
-    "Comment" : "Kommentaar",
     "You commented" : "U het kommentaar gelewer",
     "%1$s commented" : "%1$s het kommentaar gelewer",
     "{author} commented" : "{outeur} het kommentaar gelewer",
@@ -25,12 +10,25 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s het op %2$s kommentaar gelewer",
     "{author} commented on {file}" : "{outeur} het op {lêer} kommentaar gelewer",
     "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> vir lêers",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Jy was genoem op \"%s\", in die kommentaar van 'n gebruiker wat intussen geskrap is.",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Jy was genoem op “{lêer}”, in die kommentaar van 'n gebruiker wat intussen geskrap is.",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s het u in ’n kommentaar op “%2$s” genoem",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Jy is genoem op “{lêer}”, in die kommentaar van 'n gebruiker wat intussen geskrap is.",
     "{user} mentioned you in a comment on “{file}”" : "{gebruiker} het u in ’n kommentaar oor “{lêer}” genoem",
-    "Unknown user" : "Onbekende gebruiker",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "’n (Nou) geskrapte gebruiker het u in ’n kommentaar op “%s” genoem",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "’n (Nou) geskrapte gebruiker het u in ’n kommentaar op “{lêer}” genoem"
+    "Files app plugin to add comments to files" : "Lêertoepinprop om kommentaar op lêers te lewer",
+    "Edit comment" : "Wysig kommentaar",
+    "Delete comment" : "Skrap kommentaar",
+    "New comment …" : "Nuwe kommentaar…",
+    "Post" : "Plaas",
+    "Cancel" : "Kanselleer",
+    "[Deleted user]" : "[Geskrapte gebruiker]",
+    "No comments yet, start the conversation!" : "Nog geen kommentaar, begin die gesprek!",
+    "More comments …" : "Nog kommentare …",
+    "Save" : "Bewaar",
+    "Allowed characters {count} of {max}" : "Toegelate karakters {telling} van {maks}",
+    "Error occurred while retrieving comment with ID {id}" : "’n Fout het voorgekom toe kommentaar met ID {id} opgehaal is",
+    "Error occurred while updating comment with id {id}" : "’n Fout het voorgekom toe kommentaar met ID {id} bygewerk is",
+    "Error occurred while posting comment" : "’n Fout het voorgekom toe kommentaar geplaas is",
+    "_%n unread comment_::_%n unread comments_" : ["%n ongelese kommentaar","%n ongelese kommentare"],
+    "Comment" : "Kommentaar",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Jy was genoem op \"%s\", in die kommentaar van 'n gebruiker wat intussen geskrap is.",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s het u in ’n kommentaar op “%2$s” genoem"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/af.json

@@ -1,20 +1,5 @@
 { "translations": {
-    "Edit comment" : "Wysig kommentaar",
-    "Delete comment" : "Skrap kommentaar",
-    "New comment …" : "Nuwe kommentaar…",
-    "Post" : "Plaas",
-    "Cancel" : "Kanselleer",
-    "[Deleted user]" : "[Geskrapte gebruiker]",
     "Comments" : "Kommentare",
-    "No comments yet, start the conversation!" : "Nog geen kommentaar, begin die gesprek!",
-    "More comments …" : "Nog kommentare …",
-    "Save" : "Bewaar",
-    "Allowed characters {count} of {max}" : "Toegelate karakters {telling} van {maks}",
-    "Error occurred while retrieving comment with ID {id}" : "’n Fout het voorgekom toe kommentaar met id {id} opgehaal is",
-    "Error occurred while updating comment with id {id}" : "’n Fout het voorgekom toe kommentaar met id {id} bygewerk is",
-    "Error occurred while posting comment" : "’n Fout het voorgekom toe kommentaar geplaas is",
-    "_%n unread comment_::_%n unread comments_" : ["%n ongeleesde kommentaar","%n ongeleeste kommentare"],
-    "Comment" : "Kommentaar",
     "You commented" : "U het kommentaar gelewer",
     "%1$s commented" : "%1$s het kommentaar gelewer",
     "{author} commented" : "{outeur} het kommentaar gelewer",
@@ -23,12 +8,25 @@
     "%1$s commented on %2$s" : "%1$s het op %2$s kommentaar gelewer",
     "{author} commented on {file}" : "{outeur} het op {lêer} kommentaar gelewer",
     "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> vir lêers",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Jy was genoem op \"%s\", in die kommentaar van 'n gebruiker wat intussen geskrap is.",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Jy was genoem op “{lêer}”, in die kommentaar van 'n gebruiker wat intussen geskrap is.",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s het u in ’n kommentaar op “%2$s” genoem",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Jy is genoem op “{lêer}”, in die kommentaar van 'n gebruiker wat intussen geskrap is.",
     "{user} mentioned you in a comment on “{file}”" : "{gebruiker} het u in ’n kommentaar oor “{lêer}” genoem",
-    "Unknown user" : "Onbekende gebruiker",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "’n (Nou) geskrapte gebruiker het u in ’n kommentaar op “%s” genoem",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "’n (Nou) geskrapte gebruiker het u in ’n kommentaar op “{lêer}” genoem"
+    "Files app plugin to add comments to files" : "Lêertoepinprop om kommentaar op lêers te lewer",
+    "Edit comment" : "Wysig kommentaar",
+    "Delete comment" : "Skrap kommentaar",
+    "New comment …" : "Nuwe kommentaar…",
+    "Post" : "Plaas",
+    "Cancel" : "Kanselleer",
+    "[Deleted user]" : "[Geskrapte gebruiker]",
+    "No comments yet, start the conversation!" : "Nog geen kommentaar, begin die gesprek!",
+    "More comments …" : "Nog kommentare …",
+    "Save" : "Bewaar",
+    "Allowed characters {count} of {max}" : "Toegelate karakters {telling} van {maks}",
+    "Error occurred while retrieving comment with ID {id}" : "’n Fout het voorgekom toe kommentaar met ID {id} opgehaal is",
+    "Error occurred while updating comment with id {id}" : "’n Fout het voorgekom toe kommentaar met ID {id} bygewerk is",
+    "Error occurred while posting comment" : "’n Fout het voorgekom toe kommentaar geplaas is",
+    "_%n unread comment_::_%n unread comments_" : ["%n ongelese kommentaar","%n ongelese kommentare"],
+    "Comment" : "Kommentaar",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Jy was genoem op \"%s\", in die kommentaar van 'n gebruiker wat intussen geskrap is.",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s het u in ’n kommentaar op “%2$s” genoem"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/ar.js

@@ -1,26 +1,25 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "تعديل التعليق",
-    "Delete comment" : "حذف التعليق",
-    "New comment …" : "تعليق جديد",
-    "Post" : "ارسال",
-    "Cancel" : "إلغاء",
-    "[Deleted user]" : "[مستخدم محذوف]",
     "Comments" : "تعليقات",
-    "No comments yet, start the conversation!" : "لا يوجد تعليقات, ابدأ النقاش الآن!",
-    "More comments …" : "مزيد من التعليقات...",
-    "Save" : "حفظ",
-    "Allowed characters {count} of {max}" : "عدد الأحرف المسموح بها {count} من {max}",
-    "Error occurred while updating comment with id {id}" : "حصل خطأ أثناء تعديل التعليق رقم {id}",
-    "Error occurred while posting comment" : "حصل خطأ أثناء إرسال التعليق",
-    "Comment" : "تعليق",
     "You commented" : "قمت بكتابة تعليق",
     "%1$s commented" : "%1$s كتب تعليق",
     "You commented on {file}" : "علقت على {file}",
     "%1$s commented on %2$s" : "%1$s كتب تعليق على %2$s",
     "{author} commented on {file}" : "{author} علّق على {file}",
     "<strong>Comments</strong> for files" : "<strong>تعليقات</strong> على الملفات",
-    "Unknown user" : "مستخدم غير معروف"
+    "Edit comment" : "تعديل التعليق",
+    "Delete comment" : "حذف التعليق",
+    "New comment …" : "تعليق جديد",
+    "Post" : "ارسال",
+    "Cancel" : "إلغاء",
+    "[Deleted user]" : "[مستخدم محذوف]",
+    "No comments yet, start the conversation!" : "لا يوجد تعليقات, ابدأ النقاش الآن!",
+    "More comments …" : "مزيد من التعليقات...",
+    "Save" : "حفظ",
+    "Allowed characters {count} of {max}" : "عدد الأحرف المسموح بها {count} من {max}",
+    "Error occurred while updating comment with id {id}" : "حصل خطأ أثناء تعديل التعليق رقم {id}",
+    "Error occurred while posting comment" : "حصل خطأ أثناء إرسال التعليق",
+    "Comment" : "تعليق"
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");

apps/comments/l10n/ar.json

@@ -1,24 +1,23 @@
 { "translations": {
-    "Edit comment" : "تعديل التعليق",
-    "Delete comment" : "حذف التعليق",
-    "New comment …" : "تعليق جديد",
-    "Post" : "ارسال",
-    "Cancel" : "إلغاء",
-    "[Deleted user]" : "[مستخدم محذوف]",
     "Comments" : "تعليقات",
-    "No comments yet, start the conversation!" : "لا يوجد تعليقات, ابدأ النقاش الآن!",
-    "More comments …" : "مزيد من التعليقات...",
-    "Save" : "حفظ",
-    "Allowed characters {count} of {max}" : "عدد الأحرف المسموح بها {count} من {max}",
-    "Error occurred while updating comment with id {id}" : "حصل خطأ أثناء تعديل التعليق رقم {id}",
-    "Error occurred while posting comment" : "حصل خطأ أثناء إرسال التعليق",
-    "Comment" : "تعليق",
     "You commented" : "قمت بكتابة تعليق",
     "%1$s commented" : "%1$s كتب تعليق",
     "You commented on {file}" : "علقت على {file}",
     "%1$s commented on %2$s" : "%1$s كتب تعليق على %2$s",
     "{author} commented on {file}" : "{author} علّق على {file}",
     "<strong>Comments</strong> for files" : "<strong>تعليقات</strong> على الملفات",
-    "Unknown user" : "مستخدم غير معروف"
+    "Edit comment" : "تعديل التعليق",
+    "Delete comment" : "حذف التعليق",
+    "New comment …" : "تعليق جديد",
+    "Post" : "ارسال",
+    "Cancel" : "إلغاء",
+    "[Deleted user]" : "[مستخدم محذوف]",
+    "No comments yet, start the conversation!" : "لا يوجد تعليقات, ابدأ النقاش الآن!",
+    "More comments …" : "مزيد من التعليقات...",
+    "Save" : "حفظ",
+    "Allowed characters {count} of {max}" : "عدد الأحرف المسموح بها {count} من {max}",
+    "Error occurred while updating comment with id {id}" : "حصل خطأ أثناء تعديل التعليق رقم {id}",
+    "Error occurred while posting comment" : "حصل خطأ أثناء إرسال التعليق",
+    "Comment" : "تعليق"
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }

apps/comments/l10n/ast.js

@@ -1,21 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "Editar comentariu",
-    "Delete comment" : "Desaniciar comentariu",
-    "New comment …" : "Comentariu nuevu...",
-    "Post" : "Espublizar",
-    "Cancel" : "Encaboxar",
-    "[Deleted user]" : "[Usuariu desaniciáu]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "Entá nun hai comentarios. ¡Entama una conversación!",
-    "More comments …" : "Más comentarios...",
-    "Save" : "Guardar",
-    "Allowed characters {count} of {max}" : "{count} caráuteres almitíos de {max}",
-    "Error occurred while updating comment with id {id}" : "Asocedió un fallu entrín s'anovaba'l comentariu cola ID {id}",
-    "Error occurred while posting comment" : "Asocedieron fallos entrín s'espublizaba'l comentariu",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentariu ensin lleer","%n comentarios ensin lleer"],
-    "Comment" : "Comentariu",
     "You commented" : "Comentesti",
     "%1$s commented" : "%1$s comentó",
     "{author} commented" : "{author} comentó",
@@ -24,10 +10,21 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{autor} comentó en {ficheru}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> pa ficheros",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mentóte nun comentariu de «%2$s»",
     "{user} mentioned you in a comment on “{file}”" : "{user} mentóte nun comentariu de «{file}»",
-    "Unknown user" : "Usuariu desconocíu",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuariu (agora) desaniciáu mentóte nun comentariu de «%s»",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuariu (agora) desaniciáu mentóte nun comentariu de «{file}»"
+    "Edit comment" : "Editar comentariu",
+    "Delete comment" : "Desaniciar comentariu",
+    "New comment …" : "Comentariu nuevu...",
+    "Post" : "Espublizar",
+    "Cancel" : "Encaboxar",
+    "[Deleted user]" : "[Usuariu desaniciáu]",
+    "No comments yet, start the conversation!" : "Entá nun hai comentarios. ¡Entama una conversación!",
+    "More comments …" : "Más comentarios...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "{count} caráuteres almitíos de {max}",
+    "Error occurred while updating comment with id {id}" : "Asocedió un fallu entrín s'anovaba'l comentariu cola ID {id}",
+    "Error occurred while posting comment" : "Asocedieron fallos entrín s'espublizaba'l comentariu",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentariu ensin lleer","%n comentarios ensin lleer"],
+    "Comment" : "Comentariu",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mentóte nun comentariu de «%2$s»"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/ast.json

@@ -1,19 +1,5 @@
 { "translations": {
-    "Edit comment" : "Editar comentariu",
-    "Delete comment" : "Desaniciar comentariu",
-    "New comment …" : "Comentariu nuevu...",
-    "Post" : "Espublizar",
-    "Cancel" : "Encaboxar",
-    "[Deleted user]" : "[Usuariu desaniciáu]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "Entá nun hai comentarios. ¡Entama una conversación!",
-    "More comments …" : "Más comentarios...",
-    "Save" : "Guardar",
-    "Allowed characters {count} of {max}" : "{count} caráuteres almitíos de {max}",
-    "Error occurred while updating comment with id {id}" : "Asocedió un fallu entrín s'anovaba'l comentariu cola ID {id}",
-    "Error occurred while posting comment" : "Asocedieron fallos entrín s'espublizaba'l comentariu",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentariu ensin lleer","%n comentarios ensin lleer"],
-    "Comment" : "Comentariu",
     "You commented" : "Comentesti",
     "%1$s commented" : "%1$s comentó",
     "{author} commented" : "{author} comentó",
@@ -22,10 +8,21 @@
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{autor} comentó en {ficheru}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> pa ficheros",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mentóte nun comentariu de «%2$s»",
     "{user} mentioned you in a comment on “{file}”" : "{user} mentóte nun comentariu de «{file}»",
-    "Unknown user" : "Usuariu desconocíu",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuariu (agora) desaniciáu mentóte nun comentariu de «%s»",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuariu (agora) desaniciáu mentóte nun comentariu de «{file}»"
+    "Edit comment" : "Editar comentariu",
+    "Delete comment" : "Desaniciar comentariu",
+    "New comment …" : "Comentariu nuevu...",
+    "Post" : "Espublizar",
+    "Cancel" : "Encaboxar",
+    "[Deleted user]" : "[Usuariu desaniciáu]",
+    "No comments yet, start the conversation!" : "Entá nun hai comentarios. ¡Entama una conversación!",
+    "More comments …" : "Más comentarios...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "{count} caráuteres almitíos de {max}",
+    "Error occurred while updating comment with id {id}" : "Asocedió un fallu entrín s'anovaba'l comentariu cola ID {id}",
+    "Error occurred while posting comment" : "Asocedieron fallos entrín s'espublizaba'l comentariu",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentariu ensin lleer","%n comentarios ensin lleer"],
+    "Comment" : "Comentariu",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mentóte nun comentariu de «%2$s»"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/bg.js

@@ -1,21 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "Редактирай коментра",
-    "Delete comment" : "Изтрий коментар",
-    "New comment …" : "Нов коментар...",
-    "Post" : "Публикация",
-    "Cancel" : "Отказ",
-    "[Deleted user]" : "[Изтрит потребител]",
     "Comments" : "Коментари",
-    "No comments yet, start the conversation!" : "Все-още няма коментари, започни разговор!",
-    "More comments …" : "Още коментари...",
-    "Save" : "Запазване",
-    "Allowed characters {count} of {max}" : "Позволени символи {count} от {max}",
-    "Error occurred while updating comment with id {id}" : "Възникна грешка по време на обновяване на коментар с код {id}",
-    "Error occurred while posting comment" : "Възникна грешка по време на изпращане на коментар",
-    "_%n unread comment_::_%n unread comments_" : ["%n непрочетен коментар","%n непрочетени коментари"],
-    "Comment" : "Коментар",
     "You commented" : "Вие коментирахте",
     "%1$s commented" : "%1$s коментира",
     "{author} commented" : "{author} коментира",
@@ -24,12 +10,23 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s коментиран за %2$s",
     "{author} commented on {file}" : "{author} коментира за {file}",
     "<strong>Comments</strong> for files" : "<strong>Коментари</strong> за файлове",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Бяхте споменат/а на “%s”, в коментар от потребител, който вече е изтрит",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Бяхте споменат/а към “{file}”, в коментар от потребител, който вече е изтрит",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s те спомена в коментар за “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} те спомена в коментар за “{file}”",
-    "Unknown user" : "Непознат потребител",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "(Токущо) изтрит потребител те коментира в “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "(Токущо) изтрит потребител те спомена в коментар за “{file}”"
+    "Edit comment" : "Редактирай коментра",
+    "Delete comment" : "Изтрий коментар",
+    "New comment …" : "Нов коментар...",
+    "Post" : "Публикация",
+    "Cancel" : "Отказ",
+    "[Deleted user]" : "[Изтрит потребител]",
+    "No comments yet, start the conversation!" : "Все още няма коментари, започнете разговор!",
+    "More comments …" : "Още коментари...",
+    "Save" : "Запазване",
+    "Allowed characters {count} of {max}" : "Позволени символи {count} от {max}",
+    "Error occurred while updating comment with id {id}" : "Възникна грешка по време на обновяване на коментар с код {id}",
+    "Error occurred while posting comment" : "Възникна грешка по време на изпращане на коментар",
+    "_%n unread comment_::_%n unread comments_" : ["%n непрочетен коментар","%n непрочетени коментари"],
+    "Comment" : "Коментар",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Бяхте споменат/а на “%s”, в коментар от потребител, който вече е изтрит",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s те спомена в коментар за “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/bg.json

@@ -1,19 +1,5 @@
 { "translations": {
-    "Edit comment" : "Редактирай коментра",
-    "Delete comment" : "Изтрий коментар",
-    "New comment …" : "Нов коментар...",
-    "Post" : "Публикация",
-    "Cancel" : "Отказ",
-    "[Deleted user]" : "[Изтрит потребител]",
     "Comments" : "Коментари",
-    "No comments yet, start the conversation!" : "Все-още няма коментари, започни разговор!",
-    "More comments …" : "Още коментари...",
-    "Save" : "Запазване",
-    "Allowed characters {count} of {max}" : "Позволени символи {count} от {max}",
-    "Error occurred while updating comment with id {id}" : "Възникна грешка по време на обновяване на коментар с код {id}",
-    "Error occurred while posting comment" : "Възникна грешка по време на изпращане на коментар",
-    "_%n unread comment_::_%n unread comments_" : ["%n непрочетен коментар","%n непрочетени коментари"],
-    "Comment" : "Коментар",
     "You commented" : "Вие коментирахте",
     "%1$s commented" : "%1$s коментира",
     "{author} commented" : "{author} коментира",
@@ -22,12 +8,23 @@
     "%1$s commented on %2$s" : "%1$s коментиран за %2$s",
     "{author} commented on {file}" : "{author} коментира за {file}",
     "<strong>Comments</strong> for files" : "<strong>Коментари</strong> за файлове",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Бяхте споменат/а на “%s”, в коментар от потребител, който вече е изтрит",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Бяхте споменат/а към “{file}”, в коментар от потребител, който вече е изтрит",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s те спомена в коментар за “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} те спомена в коментар за “{file}”",
-    "Unknown user" : "Непознат потребител",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "(Токущо) изтрит потребител те коментира в “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "(Токущо) изтрит потребител те спомена в коментар за “{file}”"
+    "Edit comment" : "Редактирай коментра",
+    "Delete comment" : "Изтрий коментар",
+    "New comment …" : "Нов коментар...",
+    "Post" : "Публикация",
+    "Cancel" : "Отказ",
+    "[Deleted user]" : "[Изтрит потребител]",
+    "No comments yet, start the conversation!" : "Все още няма коментари, започнете разговор!",
+    "More comments …" : "Още коментари...",
+    "Save" : "Запазване",
+    "Allowed characters {count} of {max}" : "Позволени символи {count} от {max}",
+    "Error occurred while updating comment with id {id}" : "Възникна грешка по време на обновяване на коментар с код {id}",
+    "Error occurred while posting comment" : "Възникна грешка по време на изпращане на коментар",
+    "_%n unread comment_::_%n unread comments_" : ["%n непрочетен коментар","%n непрочетени коментари"],
+    "Comment" : "Коментар",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Бяхте споменат/а на “%s”, в коментар от потребител, който вече е изтрит",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s те спомена в коментар за “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/ca.js

@@ -1,21 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "Editar comentari",
-    "Delete comment" : "Esborrar comentari",
-    "New comment …" : "Nou comentari...",
-    "Post" : "Publica",
-    "Cancel" : "Cancel·la",
-    "[Deleted user]" : "[usuari Esborrat]",
     "Comments" : "Comentaris",
-    "No comments yet, start the conversation!" : "Encara no hi ha comentaris. Comenceu la conversa!",
-    "More comments …" : "Més comentaris...",
-    "Save" : "Desa",
-    "Allowed characters {count} of {max}" : "{count} caràcters permesos de {max}",
-    "Error occurred while updating comment with id {id}" : "Hi ha hagut un error en actualitzar el comentari amb id {id}",
-    "Error occurred while posting comment" : "Hi ha hagut un error en publicar el comentari",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentari no llegit","%n comentaris no llegits"],
-    "Comment" : "Comentari",
     "You commented" : "Heu comentat",
     "%1$s commented" : "%1$s ha comentat",
     "{author} commented" : "{author} ha comentat",
@@ -24,12 +10,23 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s ha comentat a %2$s",
     "{author} commented on {file}" : "{author} ha comentat a {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentaris</strong> per arxius",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Has estat mencionat a \"%s\" en un comentari d'un usuari que ja no existeix",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Has estat mencionat a \"{file}\" en un comentari d'un usuari que ja no existeix",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s us ha nomenat en un comentari a “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} us ha nomenat en un comentari de “{file}”",
-    "Unknown user" : "Usuari desconegut",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuari (ara) esborrat us ha nomenat en un comentari a “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuari (ara) esborrat us ha nomenat en un comentari de “{file}”"
+    "Edit comment" : "Editar comentari",
+    "Delete comment" : "Esborrar comentari",
+    "New comment …" : "Nou comentari...",
+    "Post" : "Publica",
+    "Cancel" : "Cancel·la",
+    "[Deleted user]" : "[usuari Esborrat]",
+    "No comments yet, start the conversation!" : "Encara no hi ha comentaris. Comenceu la conversa!",
+    "More comments …" : "Més comentaris...",
+    "Save" : "Desa",
+    "Allowed characters {count} of {max}" : "{count} caràcters permesos de {max}",
+    "Error occurred while updating comment with id {id}" : "Hi ha hagut un error en actualitzar el comentari amb id {id}",
+    "Error occurred while posting comment" : "Hi ha hagut un error en publicar el comentari",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentari no llegit","%n comentaris no llegits"],
+    "Comment" : "Comentari",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Has estat mencionat a \"%s\" en un comentari d'un usuari que ja no existeix",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s us ha nomenat en un comentari a “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/ca.json

@@ -1,19 +1,5 @@
 { "translations": {
-    "Edit comment" : "Editar comentari",
-    "Delete comment" : "Esborrar comentari",
-    "New comment …" : "Nou comentari...",
-    "Post" : "Publica",
-    "Cancel" : "Cancel·la",
-    "[Deleted user]" : "[usuari Esborrat]",
     "Comments" : "Comentaris",
-    "No comments yet, start the conversation!" : "Encara no hi ha comentaris. Comenceu la conversa!",
-    "More comments …" : "Més comentaris...",
-    "Save" : "Desa",
-    "Allowed characters {count} of {max}" : "{count} caràcters permesos de {max}",
-    "Error occurred while updating comment with id {id}" : "Hi ha hagut un error en actualitzar el comentari amb id {id}",
-    "Error occurred while posting comment" : "Hi ha hagut un error en publicar el comentari",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentari no llegit","%n comentaris no llegits"],
-    "Comment" : "Comentari",
     "You commented" : "Heu comentat",
     "%1$s commented" : "%1$s ha comentat",
     "{author} commented" : "{author} ha comentat",
@@ -22,12 +8,23 @@
     "%1$s commented on %2$s" : "%1$s ha comentat a %2$s",
     "{author} commented on {file}" : "{author} ha comentat a {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentaris</strong> per arxius",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Has estat mencionat a \"%s\" en un comentari d'un usuari que ja no existeix",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Has estat mencionat a \"{file}\" en un comentari d'un usuari que ja no existeix",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s us ha nomenat en un comentari a “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} us ha nomenat en un comentari de “{file}”",
-    "Unknown user" : "Usuari desconegut",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuari (ara) esborrat us ha nomenat en un comentari a “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuari (ara) esborrat us ha nomenat en un comentari de “{file}”"
+    "Edit comment" : "Editar comentari",
+    "Delete comment" : "Esborrar comentari",
+    "New comment …" : "Nou comentari...",
+    "Post" : "Publica",
+    "Cancel" : "Cancel·la",
+    "[Deleted user]" : "[usuari Esborrat]",
+    "No comments yet, start the conversation!" : "Encara no hi ha comentaris. Comenceu la conversa!",
+    "More comments …" : "Més comentaris...",
+    "Save" : "Desa",
+    "Allowed characters {count} of {max}" : "{count} caràcters permesos de {max}",
+    "Error occurred while updating comment with id {id}" : "Hi ha hagut un error en actualitzar el comentari amb id {id}",
+    "Error occurred while posting comment" : "Hi ha hagut un error en publicar el comentari",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentari no llegit","%n comentaris no llegits"],
+    "Comment" : "Comentari",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Has estat mencionat a \"%s\" en un comentari d'un usuari que ja no existeix",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s us ha nomenat en un comentari a “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/cs.js

@@ -1,13 +1,24 @@
 OC.L10N.register(
     "comments",
     {
+    "Comments" : "Komentáře",
+    "You commented" : "Okomentovali jste",
+    "%1$s commented" : "%1$s okomentován",
+    "{author} commented" : "{author} okomentoval(a)",
+    "You commented on %1$s" : "Okomentovali jste %1$s",
+    "You commented on {file}" : "Okomentovali jste {file}",
+    "%1$s commented on %2$s" : "%1$s okomentoval %2$s",
+    "{author} commented on {file}" : "{author} okomentoval(a) {file}",
+    "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v souboru “{file}”, v komentáři od uživatele, který byl později smazán",
+    "{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil(a) v komentáři u „{file}“",
+    "Files app plugin to add comments to files" : "Zásuvný modul do aplikace Soubory pro přidávání komentářů k souborům",
     "Edit comment" : "Upravit komentář",
     "Delete comment" : "Smazat komentář",
     "New comment …" : "Nový komentář…",
     "Post" : "Zveřejnit",
     "Cancel" : "Storno",
     "[Deleted user]" : "[Smazaný uživatel]",
-    "Comments" : "Komentáře",
     "No comments yet, start the conversation!" : "Zatím bez komentářů, začněte konverzaci!",
     "More comments …" : "Více komentářů…",
     "Save" : "Uložit",
@@ -17,20 +28,7 @@ OC.L10N.register(
     "Error occurred while posting comment" : "Došlo k chybě při zveřejňování komentáře",
     "_%n unread comment_::_%n unread comments_" : ["%n nepřečtený komentář","%n nepřečtené komentáře","%n nepřečtených komentářů","%n nepřečtených komentářů"],
     "Comment" : "Komentář",
-    "You commented" : "Okomentovali jste",
-    "%1$s commented" : "%1$s okomentován",
-    "{author} commented" : "{author} okomentoval",
-    "You commented on %1$s" : "Okomentoval(a) jste %1$s",
-    "You commented on {file}" : "Okomentoval(a) jste {file}",
-    "%1$s commented on %2$s" : "%1$s okomentoval %2$s",
-    "{author} commented on {file}" : "{author} okomentoval(a) {file}",
-    "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v “%s”, v komentáři od uživatele, který byl později smazán",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v souboru “{file}”, v komentáři od uživatele, který byl později smazán",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s",
-    "{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil v komentáři u “{file}”",
-    "Unknown user" : "Neznámý uživatel",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní již smazaný uživatel vás zmínil v komentáři u \"{file}\""
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v „%s“, v komentáři od uživatele, který byl později smazán",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s"
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");

apps/comments/l10n/cs.json

@@ -1,11 +1,22 @@
 { "translations": {
+    "Comments" : "Komentáře",
+    "You commented" : "Okomentovali jste",
+    "%1$s commented" : "%1$s okomentován",
+    "{author} commented" : "{author} okomentoval(a)",
+    "You commented on %1$s" : "Okomentovali jste %1$s",
+    "You commented on {file}" : "Okomentovali jste {file}",
+    "%1$s commented on %2$s" : "%1$s okomentoval %2$s",
+    "{author} commented on {file}" : "{author} okomentoval(a) {file}",
+    "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v souboru “{file}”, v komentáři od uživatele, který byl později smazán",
+    "{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil(a) v komentáři u „{file}“",
+    "Files app plugin to add comments to files" : "Zásuvný modul do aplikace Soubory pro přidávání komentářů k souborům",
     "Edit comment" : "Upravit komentář",
     "Delete comment" : "Smazat komentář",
     "New comment …" : "Nový komentář…",
     "Post" : "Zveřejnit",
     "Cancel" : "Storno",
     "[Deleted user]" : "[Smazaný uživatel]",
-    "Comments" : "Komentáře",
     "No comments yet, start the conversation!" : "Zatím bez komentářů, začněte konverzaci!",
     "More comments …" : "Více komentářů…",
     "Save" : "Uložit",
@@ -15,20 +26,7 @@
     "Error occurred while posting comment" : "Došlo k chybě při zveřejňování komentáře",
     "_%n unread comment_::_%n unread comments_" : ["%n nepřečtený komentář","%n nepřečtené komentáře","%n nepřečtených komentářů","%n nepřečtených komentářů"],
     "Comment" : "Komentář",
-    "You commented" : "Okomentovali jste",
-    "%1$s commented" : "%1$s okomentován",
-    "{author} commented" : "{author} okomentoval",
-    "You commented on %1$s" : "Okomentoval(a) jste %1$s",
-    "You commented on {file}" : "Okomentoval(a) jste {file}",
-    "%1$s commented on %2$s" : "%1$s okomentoval %2$s",
-    "{author} commented on {file}" : "{author} okomentoval(a) {file}",
-    "<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v “%s”, v komentáři od uživatele, který byl později smazán",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v souboru “{file}”, v komentáři od uživatele, který byl později smazán",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s",
-    "{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil v komentáři u “{file}”",
-    "Unknown user" : "Neznámý uživatel",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní již smazaný uživatel vás zmínil v komentáři u \"{file}\""
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v „%s“, v komentáři od uživatele, který byl později smazán",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s"
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
 }

apps/comments/l10n/da.js

@@ -1,21 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "Rediger kommentar",
-    "Delete comment" : "Slet kommentar",
-    "New comment …" : "Ny kommentar ...",
-    "Post" : "Indlæg",
-    "Cancel" : "Annullér",
-    "[Deleted user]" : "[Slettet user]",
     "Comments" : "Kommentarer",
-    "No comments yet, start the conversation!" : "Ingen kommentarer endnu, start samtalen!",
-    "More comments …" : "Flere kommentarer...",
-    "Save" : "Gem",
-    "Allowed characters {count} of {max}" : "Tilladte tegn {count} af {max}",
-    "Error occurred while updating comment with id {id}" : "Der opstod fejl under opdatering af kommentar med id {id}",
-    "Error occurred while posting comment" : "Der opstod fejl under indsendelse af kommentar",
-    "_%n unread comment_::_%n unread comments_" : ["%n ulæst kommentar","%n ulæste kommentarer"],
-    "Comment" : "Kommentér",
     "You commented" : "Du kommenterede",
     "%1$s commented" : "%1$s kommenterede",
     "{author} commented" : "{author} kommenterede",
@@ -24,12 +10,23 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s kommenterede %2$s",
     "{author} commented on {file}" : "{author} kommenterede {file}",
     "<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> for filer",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Du blev nævnt i \"%s”, I en kommentar af en bruger der er blevet slettet efterfølgende",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du blev nævnt i \"{file}”, I en kommentar af en bruger der siden er blevet slettet",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s nævnte dig i en kommentarer på “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} nævnte dig i en kommentarer på \"{file}\"",
-    "Unknown user" : "Ukendt bruger",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "En (nu) slettet bruger nævnte dig i en kommentarer på “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "En (nu) slettet bruger nævnte dig i en kommentarer på \"{file}\""
+    "Edit comment" : "Rediger kommentar",
+    "Delete comment" : "Slet kommentar",
+    "New comment …" : "Ny kommentar ...",
+    "Post" : "Indlæg",
+    "Cancel" : "Annullér",
+    "[Deleted user]" : "[Slettet user]",
+    "No comments yet, start the conversation!" : "Ingen kommentarer endnu, start samtalen!",
+    "More comments …" : "Flere kommentarer...",
+    "Save" : "Gem",
+    "Allowed characters {count} of {max}" : "Tilladte tegn {count} af {max}",
+    "Error occurred while updating comment with id {id}" : "Der opstod fejl under opdatering af kommentar med id {id}",
+    "Error occurred while posting comment" : "Der opstod fejl under indsendelse af kommentar",
+    "_%n unread comment_::_%n unread comments_" : ["%n ulæst kommentar","%n ulæste kommentarer"],
+    "Comment" : "Kommentér",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Du blev nævnt i \"%s”, I en kommentar af en bruger der er blevet slettet efterfølgende",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s nævnte dig i en kommentarer på “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/da.json

@@ -1,19 +1,5 @@
 { "translations": {
-    "Edit comment" : "Rediger kommentar",
-    "Delete comment" : "Slet kommentar",
-    "New comment …" : "Ny kommentar ...",
-    "Post" : "Indlæg",
-    "Cancel" : "Annullér",
-    "[Deleted user]" : "[Slettet user]",
     "Comments" : "Kommentarer",
-    "No comments yet, start the conversation!" : "Ingen kommentarer endnu, start samtalen!",
-    "More comments …" : "Flere kommentarer...",
-    "Save" : "Gem",
-    "Allowed characters {count} of {max}" : "Tilladte tegn {count} af {max}",
-    "Error occurred while updating comment with id {id}" : "Der opstod fejl under opdatering af kommentar med id {id}",
-    "Error occurred while posting comment" : "Der opstod fejl under indsendelse af kommentar",
-    "_%n unread comment_::_%n unread comments_" : ["%n ulæst kommentar","%n ulæste kommentarer"],
-    "Comment" : "Kommentér",
     "You commented" : "Du kommenterede",
     "%1$s commented" : "%1$s kommenterede",
     "{author} commented" : "{author} kommenterede",
@@ -22,12 +8,23 @@
     "%1$s commented on %2$s" : "%1$s kommenterede %2$s",
     "{author} commented on {file}" : "{author} kommenterede {file}",
     "<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> for filer",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Du blev nævnt i \"%s”, I en kommentar af en bruger der er blevet slettet efterfølgende",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du blev nævnt i \"{file}”, I en kommentar af en bruger der siden er blevet slettet",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s nævnte dig i en kommentarer på “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} nævnte dig i en kommentarer på \"{file}\"",
-    "Unknown user" : "Ukendt bruger",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "En (nu) slettet bruger nævnte dig i en kommentarer på “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "En (nu) slettet bruger nævnte dig i en kommentarer på \"{file}\""
+    "Edit comment" : "Rediger kommentar",
+    "Delete comment" : "Slet kommentar",
+    "New comment …" : "Ny kommentar ...",
+    "Post" : "Indlæg",
+    "Cancel" : "Annullér",
+    "[Deleted user]" : "[Slettet user]",
+    "No comments yet, start the conversation!" : "Ingen kommentarer endnu, start samtalen!",
+    "More comments …" : "Flere kommentarer...",
+    "Save" : "Gem",
+    "Allowed characters {count} of {max}" : "Tilladte tegn {count} af {max}",
+    "Error occurred while updating comment with id {id}" : "Der opstod fejl under opdatering af kommentar med id {id}",
+    "Error occurred while posting comment" : "Der opstod fejl under indsendelse af kommentar",
+    "_%n unread comment_::_%n unread comments_" : ["%n ulæst kommentar","%n ulæste kommentarer"],
+    "Comment" : "Kommentér",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Du blev nævnt i \"%s”, I en kommentar af en bruger der er blevet slettet efterfølgende",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s nævnte dig i en kommentarer på “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/de.js

@@ -1,13 +1,24 @@
 OC.L10N.register(
     "comments",
     {
+    "Comments" : "Kommentare",
+    "You commented" : "Von Dir kommentiert",
+    "%1$s commented" : "%1$s kommentierte",
+    "{author} commented" : "{author} kommentierte",
+    "You commented on %1$s" : "Du hast %1$s kommentiert",
+    "You commented on {file}" : "Du hast {file} kommentiert",
+    "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
+    "{author} commented on {file}" : "{author} hat {file} kommentiert",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"{file}\" von einem bereits gelöschten Nutzer erwähnt",
+    "{user} mentioned you in a comment on “{file}”" : "{user} hat Dich in einem Kommentar zu “{file}” erwähnt ",
+    "Files app plugin to add comments to files" : "Ein Plugin für die Dateien-App zum Kommentieren von Dateien",
     "Edit comment" : "Kommentar bearbeiten",
     "Delete comment" : "Kommentar löschen",
     "New comment …" : "Neuer Kommentar …",
     "Post" : "Speichern",
     "Cancel" : "Abbrechen",
     "[Deleted user]" : "[Gelöschter Benutzer]",
-    "Comments" : "Kommentare",
     "No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginne die Diskussion!",
     "More comments …" : "Weitere Kommentare…",
     "Save" : "Speichern",
@@ -17,21 +28,7 @@ OC.L10N.register(
     "Error occurred while posting comment" : "Es ist ein Fehler beim Veröffentlichen des Kommentars aufgetreten",
     "_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
     "Comment" : "Kommentar",
-    "You commented" : "Von Dir kommentiert",
-    "%1$s commented" : "%1$s kommentierte",
-    "{author} commented" : "{author} kommentierte",
-    "You commented on %1$s" : "Du hast %1$s kommentiert",
-    "You commented on {file}" : "Du hast {file} kommentiert",
-    "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
-    "{author} commented on {file}" : "{author} hat {file} kommentiert",
-    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"%s\" von einem bereits gelöschten Nutzer erwähnt",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"{file}\" von einem bereits gelöschten Nutzer erwähnt",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Dich in einem Kommentar zu “%2$s” erwähnt ",
-    "{user} mentioned you in a comment on “{file}”" : "{user} hat Dich in einem Kommentar zu “{file}” erwähnt ",
-    "Files app plugin to add comments to files" : "Ein Plugin für die Dateien-App zum Kommentieren von Dateien",
-    "Unknown user" : "Unbekannter Benutzer",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Benutzer hat Dich in einem Kommentar zu \"%s\" erwähnt",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Benutzer hat Dich in einem Kommentar zu “{file}” erwähnt"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Dich in einem Kommentar zu “%2$s” erwähnt "
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/de.json

@@ -1,11 +1,22 @@
 { "translations": {
+    "Comments" : "Kommentare",
+    "You commented" : "Von Dir kommentiert",
+    "%1$s commented" : "%1$s kommentierte",
+    "{author} commented" : "{author} kommentierte",
+    "You commented on %1$s" : "Du hast %1$s kommentiert",
+    "You commented on {file}" : "Du hast {file} kommentiert",
+    "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
+    "{author} commented on {file}" : "{author} hat {file} kommentiert",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"{file}\" von einem bereits gelöschten Nutzer erwähnt",
+    "{user} mentioned you in a comment on “{file}”" : "{user} hat Dich in einem Kommentar zu “{file}” erwähnt ",
+    "Files app plugin to add comments to files" : "Ein Plugin für die Dateien-App zum Kommentieren von Dateien",
     "Edit comment" : "Kommentar bearbeiten",
     "Delete comment" : "Kommentar löschen",
     "New comment …" : "Neuer Kommentar …",
     "Post" : "Speichern",
     "Cancel" : "Abbrechen",
     "[Deleted user]" : "[Gelöschter Benutzer]",
-    "Comments" : "Kommentare",
     "No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginne die Diskussion!",
     "More comments …" : "Weitere Kommentare…",
     "Save" : "Speichern",
@@ -15,21 +26,7 @@
     "Error occurred while posting comment" : "Es ist ein Fehler beim Veröffentlichen des Kommentars aufgetreten",
     "_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
     "Comment" : "Kommentar",
-    "You commented" : "Von Dir kommentiert",
-    "%1$s commented" : "%1$s kommentierte",
-    "{author} commented" : "{author} kommentierte",
-    "You commented on %1$s" : "Du hast %1$s kommentiert",
-    "You commented on {file}" : "Du hast {file} kommentiert",
-    "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
-    "{author} commented on {file}" : "{author} hat {file} kommentiert",
-    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"%s\" von einem bereits gelöschten Nutzer erwähnt",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"{file}\" von einem bereits gelöschten Nutzer erwähnt",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Dich in einem Kommentar zu “%2$s” erwähnt ",
-    "{user} mentioned you in a comment on “{file}”" : "{user} hat Dich in einem Kommentar zu “{file}” erwähnt ",
-    "Files app plugin to add comments to files" : "Ein Plugin für die Dateien-App zum Kommentieren von Dateien",
-    "Unknown user" : "Unbekannter Benutzer",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Benutzer hat Dich in einem Kommentar zu \"%s\" erwähnt",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Benutzer hat Dich in einem Kommentar zu “{file}” erwähnt"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Dich in einem Kommentar zu “%2$s” erwähnt "
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/de_DE.js

@@ -1,13 +1,24 @@
 OC.L10N.register(
     "comments",
     {
+    "Comments" : "Kommentare",
+    "You commented" : "Sie haben kommentiert",
+    "%1$s commented" : "%1$s kommentierte",
+    "{author} commented" : "{author} kommentierte",
+    "You commented on %1$s" : "Sie haben %1$s kommentiert",
+    "You commented on {file}" : "Sie haben {file} kommentiert",
+    "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
+    "{author} commented on {file}" : "{author} hat {file} kommentiert",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Sie wurden in einem Kommentar auf \"{file}\" von einem bereits gelöschten Nutzer erwähnt",
+    "{user} mentioned you in a comment on “{file}”" : "{user} hat Sie in einem Kommentar zu “{file}” erwähnt",
+    "Files app plugin to add comments to files" : "Ein Plugin für die Dateien-App zum Kommentieren von Dateien",
     "Edit comment" : "Kommentar bearbeiten",
     "Delete comment" : "Kommentar löschen",
     "New comment …" : "Neuer Kommentar …",
     "Post" : "Speichern",
     "Cancel" : "Abbrechen",
     "[Deleted user]" : "[gelöschter Benutzer]",
-    "Comments" : "Kommentare",
     "No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginnen Sie die Diskussion!",
     "More comments …" : "Weitere Kommentare …",
     "Save" : "Speichern",
@@ -17,21 +28,7 @@ OC.L10N.register(
     "Error occurred while posting comment" : "Es ist ein Fehler beim Veröffentlichen des Kommentars aufgetreten",
     "_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
     "Comment" : "Kommentar",
-    "You commented" : "Sie haben kommentiert",
-    "%1$s commented" : "%1$s kommentierte",
-    "{author} commented" : "{author} kommentierte",
-    "You commented on %1$s" : "Sie haben %1$s kommentiert",
-    "You commented on {file}" : "Sie haben {file} kommentiert",
-    "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
-    "{author} commented on {file}" : "{author} hat {file} kommentiert",
-    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Sie wurden in einem Kommentar auf \"%s\" von einem bereits gelöschten Nutzer erwähnt",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Sie wurden in einem Kommentar auf \"{file}\" von einem bereits gelöschten Nutzer erwähnt",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Sie in einem Kommentar zu “%2$s” erwähnt.",
-    "{user} mentioned you in a comment on “{file}”" : "{user} hat Sie in einem Kommentar zu “{file}” erwähnt",
-    "Files app plugin to add comments to files" : "Ein Plugin für die Dateien-App zum Kommentieren von Dateien",
-    "Unknown user" : "Unbekannter Benutzer",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Benutzer hat Sie in einem Kommentar zu \"%s\" erwähnt",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Benutzer hat Sie in einem Kommentar zu “{file}” erwähnt"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Sie in einem Kommentar zu “%2$s” erwähnt."
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/de_DE.json

@@ -1,11 +1,22 @@
 { "translations": {
+    "Comments" : "Kommentare",
+    "You commented" : "Sie haben kommentiert",
+    "%1$s commented" : "%1$s kommentierte",
+    "{author} commented" : "{author} kommentierte",
+    "You commented on %1$s" : "Sie haben %1$s kommentiert",
+    "You commented on {file}" : "Sie haben {file} kommentiert",
+    "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
+    "{author} commented on {file}" : "{author} hat {file} kommentiert",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Sie wurden in einem Kommentar auf \"{file}\" von einem bereits gelöschten Nutzer erwähnt",
+    "{user} mentioned you in a comment on “{file}”" : "{user} hat Sie in einem Kommentar zu “{file}” erwähnt",
+    "Files app plugin to add comments to files" : "Ein Plugin für die Dateien-App zum Kommentieren von Dateien",
     "Edit comment" : "Kommentar bearbeiten",
     "Delete comment" : "Kommentar löschen",
     "New comment …" : "Neuer Kommentar …",
     "Post" : "Speichern",
     "Cancel" : "Abbrechen",
     "[Deleted user]" : "[gelöschter Benutzer]",
-    "Comments" : "Kommentare",
     "No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginnen Sie die Diskussion!",
     "More comments …" : "Weitere Kommentare …",
     "Save" : "Speichern",
@@ -15,21 +26,7 @@
     "Error occurred while posting comment" : "Es ist ein Fehler beim Veröffentlichen des Kommentars aufgetreten",
     "_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
     "Comment" : "Kommentar",
-    "You commented" : "Sie haben kommentiert",
-    "%1$s commented" : "%1$s kommentierte",
-    "{author} commented" : "{author} kommentierte",
-    "You commented on %1$s" : "Sie haben %1$s kommentiert",
-    "You commented on {file}" : "Sie haben {file} kommentiert",
-    "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
-    "{author} commented on {file}" : "{author} hat {file} kommentiert",
-    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Sie wurden in einem Kommentar auf \"%s\" von einem bereits gelöschten Nutzer erwähnt",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Sie wurden in einem Kommentar auf \"{file}\" von einem bereits gelöschten Nutzer erwähnt",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Sie in einem Kommentar zu “%2$s” erwähnt.",
-    "{user} mentioned you in a comment on “{file}”" : "{user} hat Sie in einem Kommentar zu “{file}” erwähnt",
-    "Files app plugin to add comments to files" : "Ein Plugin für die Dateien-App zum Kommentieren von Dateien",
-    "Unknown user" : "Unbekannter Benutzer",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Benutzer hat Sie in einem Kommentar zu \"%s\" erwähnt",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Benutzer hat Sie in einem Kommentar zu “{file}” erwähnt"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Sie in einem Kommentar zu “%2$s” erwähnt."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/el.js

@@ -1,21 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "Επεξεργασία σχολίου",
-    "Delete comment" : "Διαγραφή σχολίου",
-    "New comment …" : "Νέο σχόλιο ...",
-    "Post" : "Δημοσίευση",
-    "Cancel" : "Ακύρωση",
-    "[Deleted user]" : "[Διαγραμμένος χρήστης]",
     "Comments" : "Σχόλια",
-    "No comments yet, start the conversation!" : "Δεν υπάρχουν σχόλια, ξεκινήστε την συζήτηση!",
-    "More comments …" : "Περισσότερα σχόλια ...",
-    "Save" : "Αποθήκευση",
-    "Allowed characters {count} of {max}" : "Επιτρεπόμενοι χαρακτήρες {count} από {max}",
-    "Error occurred while updating comment with id {id}" : "Ένα σφάλμα προέκυψε κατά την ενημέρωση του σχολίου με το αναγνωριστικό {id}",
-    "Error occurred while posting comment" : "Ένα σφάλμα προέκυψε κατά την δημοσίευση σχολίου",
-    "_%n unread comment_::_%n unread comments_" : ["%n αδιάβαστο σχόλιο","%n αδιάβαστα σχόλια"],
-    "Comment" : "Σχόλιο",
     "You commented" : "Σχολιάσατε",
     "%1$s commented" : "%1$s σχολίασε",
     "{author} commented" : "Ο {author} σχολίασε",
@@ -24,10 +10,22 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s σχολίασε στο %2$s",
     "{author} commented on {file}" : "Ο {author} σχολίασε στο {file}",
     "<strong>Comments</strong> for files" : "<strong>Σχόλια</strong> για αρχεία",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s σας ανέφερε σε σχόλιο στο “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "Ο {user} σας ανέφερε σε σχόλιο στο “{file}”",
-    "Unknown user" : "Άγνωστος χρήστης",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Ο (πρόσφατα) διεγραμμένος χρήστης σας ανέφερε σε σχόλιο στο “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ο (πρόσφατα) διεγραμμένος χρήστης σας ανέφερε σε σχόλιο στο “{file}”"
+    "Edit comment" : "Επεξεργασία σχολίου",
+    "Delete comment" : "Διαγραφή σχολίου",
+    "New comment …" : "Νέο σχόλιο ...",
+    "Post" : "Δημοσίευση",
+    "Cancel" : "Ακύρωση",
+    "[Deleted user]" : "[Διαγραμμένος χρήστης]",
+    "No comments yet, start the conversation!" : "Δεν υπάρχουν σχόλια, ξεκινήστε την συζήτηση!",
+    "More comments …" : "Περισσότερα σχόλια ...",
+    "Save" : "Αποθήκευση",
+    "Allowed characters {count} of {max}" : "Επιτρεπόμενοι χαρακτήρες {count} από {max}",
+    "Error occurred while retrieving comment with ID {id}" : "Παρουσιάστηκε σφάλμα κατά την ανάκτηση σχολίου με ID {id}",
+    "Error occurred while updating comment with id {id}" : "Ένα σφάλμα προέκυψε κατά την ενημέρωση του σχολίου με το αναγνωριστικό {id}",
+    "Error occurred while posting comment" : "Ένα σφάλμα προέκυψε κατά την δημοσίευση σχολίου",
+    "_%n unread comment_::_%n unread comments_" : ["%n αδιάβαστο σχόλιο","%n αδιάβαστα σχόλια"],
+    "Comment" : "Σχόλιο",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s σας ανέφερε σε σχόλιο στο “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/el.json

@@ -1,19 +1,5 @@
 { "translations": {
-    "Edit comment" : "Επεξεργασία σχολίου",
-    "Delete comment" : "Διαγραφή σχολίου",
-    "New comment …" : "Νέο σχόλιο ...",
-    "Post" : "Δημοσίευση",
-    "Cancel" : "Ακύρωση",
-    "[Deleted user]" : "[Διαγραμμένος χρήστης]",
     "Comments" : "Σχόλια",
-    "No comments yet, start the conversation!" : "Δεν υπάρχουν σχόλια, ξεκινήστε την συζήτηση!",
-    "More comments …" : "Περισσότερα σχόλια ...",
-    "Save" : "Αποθήκευση",
-    "Allowed characters {count} of {max}" : "Επιτρεπόμενοι χαρακτήρες {count} από {max}",
-    "Error occurred while updating comment with id {id}" : "Ένα σφάλμα προέκυψε κατά την ενημέρωση του σχολίου με το αναγνωριστικό {id}",
-    "Error occurred while posting comment" : "Ένα σφάλμα προέκυψε κατά την δημοσίευση σχολίου",
-    "_%n unread comment_::_%n unread comments_" : ["%n αδιάβαστο σχόλιο","%n αδιάβαστα σχόλια"],
-    "Comment" : "Σχόλιο",
     "You commented" : "Σχολιάσατε",
     "%1$s commented" : "%1$s σχολίασε",
     "{author} commented" : "Ο {author} σχολίασε",
@@ -22,10 +8,22 @@
     "%1$s commented on %2$s" : "%1$s σχολίασε στο %2$s",
     "{author} commented on {file}" : "Ο {author} σχολίασε στο {file}",
     "<strong>Comments</strong> for files" : "<strong>Σχόλια</strong> για αρχεία",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s σας ανέφερε σε σχόλιο στο “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "Ο {user} σας ανέφερε σε σχόλιο στο “{file}”",
-    "Unknown user" : "Άγνωστος χρήστης",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Ο (πρόσφατα) διεγραμμένος χρήστης σας ανέφερε σε σχόλιο στο “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ο (πρόσφατα) διεγραμμένος χρήστης σας ανέφερε σε σχόλιο στο “{file}”"
+    "Edit comment" : "Επεξεργασία σχολίου",
+    "Delete comment" : "Διαγραφή σχολίου",
+    "New comment …" : "Νέο σχόλιο ...",
+    "Post" : "Δημοσίευση",
+    "Cancel" : "Ακύρωση",
+    "[Deleted user]" : "[Διαγραμμένος χρήστης]",
+    "No comments yet, start the conversation!" : "Δεν υπάρχουν σχόλια, ξεκινήστε την συζήτηση!",
+    "More comments …" : "Περισσότερα σχόλια ...",
+    "Save" : "Αποθήκευση",
+    "Allowed characters {count} of {max}" : "Επιτρεπόμενοι χαρακτήρες {count} από {max}",
+    "Error occurred while retrieving comment with ID {id}" : "Παρουσιάστηκε σφάλμα κατά την ανάκτηση σχολίου με ID {id}",
+    "Error occurred while updating comment with id {id}" : "Ένα σφάλμα προέκυψε κατά την ενημέρωση του σχολίου με το αναγνωριστικό {id}",
+    "Error occurred while posting comment" : "Ένα σφάλμα προέκυψε κατά την δημοσίευση σχολίου",
+    "_%n unread comment_::_%n unread comments_" : ["%n αδιάβαστο σχόλιο","%n αδιάβαστα σχόλια"],
+    "Comment" : "Σχόλιο",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s σας ανέφερε σε σχόλιο στο “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/en_GB.js

@@ -1,13 +1,23 @@
 OC.L10N.register(
     "comments",
     {
+    "Comments" : "Comments",
+    "You commented" : "You commented",
+    "%1$s commented" : "%1$s commented",
+    "{author} commented" : "{author} commented",
+    "You commented on %1$s" : "You commented on %1$s",
+    "You commented on {file}" : "You commented on {file}",
+    "%1$s commented on %2$s" : "%1$s commented on %2$s",
+    "{author} commented on {file}" : "{author} commented on {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "You were mentioned on “{file}”, in a comment by a user that has since been deleted",
+    "{user} mentioned you in a comment on “{file}”" : "{user} mentioned you in a comment on “{file}”",
     "Edit comment" : "Edit comment",
     "Delete comment" : "Delete comment",
     "New comment …" : "New comment …",
     "Post" : "Post",
     "Cancel" : "Cancel",
     "[Deleted user]" : "[Deleted user]",
-    "Comments" : "Comments",
     "No comments yet, start the conversation!" : "No comments yet, start the conversation!",
     "More comments …" : "More comments …",
     "Save" : "Save",
@@ -17,20 +27,7 @@ OC.L10N.register(
     "Error occurred while posting comment" : "Error occurred while posting comment",
     "_%n unread comment_::_%n unread comments_" : ["%n unread comment","%n unread comments"],
     "Comment" : "Comment",
-    "You commented" : "You commented",
-    "%1$s commented" : "%1$s commented",
-    "{author} commented" : "{author} commented",
-    "You commented on %1$s" : "You commented on %1$s",
-    "You commented on {file}" : "You commented on {file}",
-    "%1$s commented on %2$s" : "%1$s commented on %2$s",
-    "{author} commented on {file}" : "{author} commented on {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "You were mentioned on “%s”, in a comment by a user that has since been deleted",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "You were mentioned on “{file}”, in a comment by a user that has since been deleted",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mentioned you in a comment on “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} mentioned you in a comment on “{file}”",
-    "Unknown user" : "Unknown user",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "A (now) deleted user mentioned you in a comment on “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mentioned you in a comment on “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/en_GB.json

@@ -1,11 +1,21 @@
 { "translations": {
+    "Comments" : "Comments",
+    "You commented" : "You commented",
+    "%1$s commented" : "%1$s commented",
+    "{author} commented" : "{author} commented",
+    "You commented on %1$s" : "You commented on %1$s",
+    "You commented on {file}" : "You commented on {file}",
+    "%1$s commented on %2$s" : "%1$s commented on %2$s",
+    "{author} commented on {file}" : "{author} commented on {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "You were mentioned on “{file}”, in a comment by a user that has since been deleted",
+    "{user} mentioned you in a comment on “{file}”" : "{user} mentioned you in a comment on “{file}”",
     "Edit comment" : "Edit comment",
     "Delete comment" : "Delete comment",
     "New comment …" : "New comment …",
     "Post" : "Post",
     "Cancel" : "Cancel",
     "[Deleted user]" : "[Deleted user]",
-    "Comments" : "Comments",
     "No comments yet, start the conversation!" : "No comments yet, start the conversation!",
     "More comments …" : "More comments …",
     "Save" : "Save",
@@ -15,20 +25,7 @@
     "Error occurred while posting comment" : "Error occurred while posting comment",
     "_%n unread comment_::_%n unread comments_" : ["%n unread comment","%n unread comments"],
     "Comment" : "Comment",
-    "You commented" : "You commented",
-    "%1$s commented" : "%1$s commented",
-    "{author} commented" : "{author} commented",
-    "You commented on %1$s" : "You commented on %1$s",
-    "You commented on {file}" : "You commented on {file}",
-    "%1$s commented on %2$s" : "%1$s commented on %2$s",
-    "{author} commented on {file}" : "{author} commented on {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "You were mentioned on “%s”, in a comment by a user that has since been deleted",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "You were mentioned on “{file}”, in a comment by a user that has since been deleted",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mentioned you in a comment on “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} mentioned you in a comment on “{file}”",
-    "Unknown user" : "Unknown user",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "A (now) deleted user mentioned you in a comment on “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mentioned you in a comment on “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/eo.js

@@ -1,20 +1,34 @@
 OC.L10N.register(
     "comments",
     {
-    "Type in a new comment..." : "Tajpu novan komenton...",
+    "Comments" : "Komentoj",
+    "You commented" : "Vi komentis",
+    "%1$s commented" : "%1$s komentis",
+    "{author} commented" : "{author} komentis",
+    "You commented on %1$s" : "Vi komentis %1$s",
+    "You commented on {file}" : "Vi komentis pri {file}",
+    "%1$s commented on %2$s" : "%1$s komentis %2$s",
+    "{author} commented on {file}" : "{author} komentis pri {file}",
+    "<strong>Comments</strong> for files" : "<strong>Komentoj</strong> por dosieroj",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Vi estis menciita en „{file}“, en komento de uzanto, kiu ekde tiam estis forigita",
+    "{user} mentioned you in a comment on “{file}”" : "{user} menciis vin en komento pri „{file}“",
+    "Files app plugin to add comments to files" : "Kromprogramo por la aplikaĵo „Dosieroj“ por aldoni komentojn al dosieroj",
+    "Edit comment" : "Redakti komenton",
     "Delete comment" : "Forigi komenton",
+    "New comment …" : "Nova komento …",
     "Post" : "Afiŝi",
     "Cancel" : "Nuligi",
-    "Edit comment" : "Redakti komenton",
     "[Deleted user]" : "[Forigita uzanto]",
-    "Comments" : "Komentoj",
-    "No other comments available" : "Neniu alia komento disponeblas",
-    "More comments..." : "Pli da komentoj...",
+    "No comments yet, start the conversation!" : "Neniu komento, ekkonversaciu!",
+    "More comments …" : "Pli da komentoj...",
     "Save" : "Konservi",
-    "Allowed characters {count} of {max}" : "Permesataj karakteroj: {count} el {max}",
-    "{count} unread comments" : "{count} nelegitaj komentoj",
+    "Allowed characters {count} of {max}" : "{count} el {max} signoj maksimume",
+    "Error occurred while retrieving comment with ID {id}" : "Eraro dum ricevo de komento kun identigilo {id}",
+    "Error occurred while updating comment with id {id}" : "Eraro dum ĝisdatigo de komento kun identigilo {id}",
+    "Error occurred while posting comment" : "Eraro dum sendo de komento",
+    "_%n unread comment_::_%n unread comments_" : ["%n nelegataj komentoj","%n nelegataj komentoj"],
     "Comment" : "Komento",
-    "%1$s commented" : "%1$s komentis",
-    "%1$s commented on %2$s" : "%1$s komentis %2$s"
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Vi estis menciita en „%s“, en komento de uzanto, kiu ekde tiam estis forigita",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s menciis vin en komento pri „%2$s“"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/eo.json

@@ -1,18 +1,32 @@
 { "translations": {
-    "Type in a new comment..." : "Tajpu novan komenton...",
+    "Comments" : "Komentoj",
+    "You commented" : "Vi komentis",
+    "%1$s commented" : "%1$s komentis",
+    "{author} commented" : "{author} komentis",
+    "You commented on %1$s" : "Vi komentis %1$s",
+    "You commented on {file}" : "Vi komentis pri {file}",
+    "%1$s commented on %2$s" : "%1$s komentis %2$s",
+    "{author} commented on {file}" : "{author} komentis pri {file}",
+    "<strong>Comments</strong> for files" : "<strong>Komentoj</strong> por dosieroj",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Vi estis menciita en „{file}“, en komento de uzanto, kiu ekde tiam estis forigita",
+    "{user} mentioned you in a comment on “{file}”" : "{user} menciis vin en komento pri „{file}“",
+    "Files app plugin to add comments to files" : "Kromprogramo por la aplikaĵo „Dosieroj“ por aldoni komentojn al dosieroj",
+    "Edit comment" : "Redakti komenton",
     "Delete comment" : "Forigi komenton",
+    "New comment …" : "Nova komento …",
     "Post" : "Afiŝi",
     "Cancel" : "Nuligi",
-    "Edit comment" : "Redakti komenton",
     "[Deleted user]" : "[Forigita uzanto]",
-    "Comments" : "Komentoj",
-    "No other comments available" : "Neniu alia komento disponeblas",
-    "More comments..." : "Pli da komentoj...",
+    "No comments yet, start the conversation!" : "Neniu komento, ekkonversaciu!",
+    "More comments …" : "Pli da komentoj...",
     "Save" : "Konservi",
-    "Allowed characters {count} of {max}" : "Permesataj karakteroj: {count} el {max}",
-    "{count} unread comments" : "{count} nelegitaj komentoj",
+    "Allowed characters {count} of {max}" : "{count} el {max} signoj maksimume",
+    "Error occurred while retrieving comment with ID {id}" : "Eraro dum ricevo de komento kun identigilo {id}",
+    "Error occurred while updating comment with id {id}" : "Eraro dum ĝisdatigo de komento kun identigilo {id}",
+    "Error occurred while posting comment" : "Eraro dum sendo de komento",
+    "_%n unread comment_::_%n unread comments_" : ["%n nelegataj komentoj","%n nelegataj komentoj"],
     "Comment" : "Komento",
-    "%1$s commented" : "%1$s komentis",
-    "%1$s commented on %2$s" : "%1$s komentis %2$s"
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Vi estis menciita en „%s“, en komento de uzanto, kiu ekde tiam estis forigita",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s menciis vin en komento pri „%2$s“"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/es.js

@@ -1,13 +1,24 @@
 OC.L10N.register(
     "comments",
     {
+    "Comments" : "Comentarios",
+    "You commented" : "Has comentado",
+    "%1$s commented" : "%1$s comentados",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Has comentado en %1$s",
+    "You commented on {file}" : "Has comentado en  {file}",
+    "%1$s commented on %2$s" : "%1$s comentados en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> para archivos",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te han mencionado en \"{file}\", en un comentario de un usuario que después ha sido eliminado",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
+    "Files app plugin to add comments to files" : "Plugin de la app de Archivos para añadir comentarios a archivos.",
     "Edit comment" : "Editar comentario",
     "Delete comment" : "Borrar comentario",
     "New comment …" : "Nuevo comentario",
     "Post" : "Publicar",
     "Cancel" : "Cancelar",
     "[Deleted user]" : "[Usuario eliminado]",
-    "Comments" : "Comentarios",
     "No comments yet, start the conversation!" : "¡No hay comentarios, empieza la conversación!",
     "More comments …" : "Más comentarios ...",
     "Save" : "Guardar",
@@ -17,21 +28,7 @@ OC.L10N.register(
     "Error occurred while posting comment" : "Se ha producido un error al enviar el comentario",
     "_%n unread comment_::_%n unread comments_" : ["%n comentario sin leer","%nComentarios no leídos"],
     "Comment" : "Comentar",
-    "You commented" : "Has comentado",
-    "%1$s commented" : "%1$s comentados",
-    "{author} commented" : "{author} comentó",
-    "You commented on %1$s" : "Has comentado en %1$s",
-    "You commented on {file}" : "Has comentado en  {file}",
-    "%1$s commented on %2$s" : "%1$s comentados en %2$s",
-    "{author} commented on {file}" : "{author} comentó en {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> para archivos",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te han mencionado en \"%s\", en un comentario por un usuario que después ha sido eliminado",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te han mencionado en \"{file}\", en un comentario de un usuario que después ha sido eliminado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Files app plugin to add comments to files" : "Plugin de la app de Archivos para añadir comentarios a archivos.",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) eliminado, te mencionó en un comentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) eliminado, te mencionó en un comentario en “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/es.json

@@ -1,11 +1,22 @@
 { "translations": {
+    "Comments" : "Comentarios",
+    "You commented" : "Has comentado",
+    "%1$s commented" : "%1$s comentados",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Has comentado en %1$s",
+    "You commented on {file}" : "Has comentado en  {file}",
+    "%1$s commented on %2$s" : "%1$s comentados en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> para archivos",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te han mencionado en \"{file}\", en un comentario de un usuario que después ha sido eliminado",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
+    "Files app plugin to add comments to files" : "Plugin de la app de Archivos para añadir comentarios a archivos.",
     "Edit comment" : "Editar comentario",
     "Delete comment" : "Borrar comentario",
     "New comment …" : "Nuevo comentario",
     "Post" : "Publicar",
     "Cancel" : "Cancelar",
     "[Deleted user]" : "[Usuario eliminado]",
-    "Comments" : "Comentarios",
     "No comments yet, start the conversation!" : "¡No hay comentarios, empieza la conversación!",
     "More comments …" : "Más comentarios ...",
     "Save" : "Guardar",
@@ -15,21 +26,7 @@
     "Error occurred while posting comment" : "Se ha producido un error al enviar el comentario",
     "_%n unread comment_::_%n unread comments_" : ["%n comentario sin leer","%nComentarios no leídos"],
     "Comment" : "Comentar",
-    "You commented" : "Has comentado",
-    "%1$s commented" : "%1$s comentados",
-    "{author} commented" : "{author} comentó",
-    "You commented on %1$s" : "Has comentado en %1$s",
-    "You commented on {file}" : "Has comentado en  {file}",
-    "%1$s commented on %2$s" : "%1$s comentados en %2$s",
-    "{author} commented on {file}" : "{author} comentó en {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> para archivos",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te han mencionado en \"%s\", en un comentario por un usuario que después ha sido eliminado",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te han mencionado en \"{file}\", en un comentario de un usuario que después ha sido eliminado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Files app plugin to add comments to files" : "Plugin de la app de Archivos para añadir comentarios a archivos.",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) eliminado, te mencionó en un comentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) eliminado, te mencionó en un comentario en “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/es_419.js

@@ -1,21 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "Editar comentario",
-    "Delete comment" : "Borrar comentario",
-    "New comment …" : "Comentario nuevo ...",
-    "Post" : "Publicar",
-    "Cancel" : "Cancelar",
-    "[Deleted user]" : "[Usuario borrado]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
-    "More comments …" : "Más comentarios ...",
-    "Save" : "Guardar",
-    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
-    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
-    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
-    "Comment" : "Comentario",
     "You commented" : "Comentaste",
     "%1$s commented" : "%1$s comentó",
     "{author} commented" : "{author} comentó",
@@ -24,12 +10,23 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{author} comentó en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "Edit comment" : "Editar comentario",
+    "Delete comment" : "Borrar comentario",
+    "New comment …" : "Comentario nuevo ...",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
+    "More comments …" : "Más comentarios ...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
+    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentario",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/es_419.json

@@ -1,19 +1,5 @@
 { "translations": {
-    "Edit comment" : "Editar comentario",
-    "Delete comment" : "Borrar comentario",
-    "New comment …" : "Comentario nuevo ...",
-    "Post" : "Publicar",
-    "Cancel" : "Cancelar",
-    "[Deleted user]" : "[Usuario borrado]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
-    "More comments …" : "Más comentarios ...",
-    "Save" : "Guardar",
-    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
-    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
-    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
-    "Comment" : "Comentario",
     "You commented" : "Comentaste",
     "%1$s commented" : "%1$s comentó",
     "{author} commented" : "{author} comentó",
@@ -22,12 +8,23 @@
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{author} comentó en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "Edit comment" : "Editar comentario",
+    "Delete comment" : "Borrar comentario",
+    "New comment …" : "Comentario nuevo ...",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
+    "More comments …" : "Más comentarios ...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
+    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentario",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/es_AR.js

@@ -1,21 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "Editar comentario",
-    "Delete comment" : "Borrar comentario",
-    "New comment …" : "Nuevo comentario ...",
-    "Post" : "Post",
-    "Cancel" : "Cancelar",
-    "[Deleted user]" : "[Usuario borrado]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "No hay comentarios aún, iniciar la conversación!",
-    "More comments …" : "Más comentarios ...",
-    "Save" : "Guardar",
-    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} of {max}",
-    "Error occurred while updating comment with id {id}" : "Se ha producido un error al actualizar el comentario con id {id}",
-    "Error occurred while posting comment" : "Se ha producido un error al publicar un comentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
-    "Comment" : "Comentar",
     "You commented" : "Ud. ha comentado",
     "%1$s commented" : "%1$s comentados",
     "{author} commented" : "{author} comentó",
@@ -24,10 +10,24 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{author} comentó en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te ha mencionado en un comentario en “%2$s”",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Usted fue mencionado en “{file}”, en un comentario de un usuario que ya ha sido eliminado",
     "{user} mentioned you in a comment on “{file}”" : "{user} te ha mencionado en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un (now) usuario borrado te ha mencionado en un comentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un (now) usuario borrado the ha mencionado en un comentario en “{file}”"
+    "Files app plugin to add comments to files" : "Complemento de aplicación de archivos para agregar comentarios a los archivos.",
+    "Edit comment" : "Editar comentario",
+    "Delete comment" : "Borrar comentario",
+    "New comment …" : "Nuevo comentario ...",
+    "Post" : "Post",
+    "Cancel" : "Cancelar",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "No hay comentarios aún, iniciar la conversación!",
+    "More comments …" : "Más comentarios ...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} of {max}",
+    "Error occurred while retrieving comment with ID {id}" : "Se produjo un error al recuperar el comentario con ID {id}",
+    "Error occurred while updating comment with id {id}" : "Se ha producido un error al actualizar el comentario con id {id}",
+    "Error occurred while posting comment" : "Se ha producido un error al publicar un comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentar",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te ha mencionado en un comentario en “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/es_AR.json

@@ -1,19 +1,5 @@
 { "translations": {
-    "Edit comment" : "Editar comentario",
-    "Delete comment" : "Borrar comentario",
-    "New comment …" : "Nuevo comentario ...",
-    "Post" : "Post",
-    "Cancel" : "Cancelar",
-    "[Deleted user]" : "[Usuario borrado]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "No hay comentarios aún, iniciar la conversación!",
-    "More comments …" : "Más comentarios ...",
-    "Save" : "Guardar",
-    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} of {max}",
-    "Error occurred while updating comment with id {id}" : "Se ha producido un error al actualizar el comentario con id {id}",
-    "Error occurred while posting comment" : "Se ha producido un error al publicar un comentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
-    "Comment" : "Comentar",
     "You commented" : "Ud. ha comentado",
     "%1$s commented" : "%1$s comentados",
     "{author} commented" : "{author} comentó",
@@ -22,10 +8,24 @@
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{author} comentó en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te ha mencionado en un comentario en “%2$s”",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Usted fue mencionado en “{file}”, en un comentario de un usuario que ya ha sido eliminado",
     "{user} mentioned you in a comment on “{file}”" : "{user} te ha mencionado en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un (now) usuario borrado te ha mencionado en un comentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un (now) usuario borrado the ha mencionado en un comentario en “{file}”"
+    "Files app plugin to add comments to files" : "Complemento de aplicación de archivos para agregar comentarios a los archivos.",
+    "Edit comment" : "Editar comentario",
+    "Delete comment" : "Borrar comentario",
+    "New comment …" : "Nuevo comentario ...",
+    "Post" : "Post",
+    "Cancel" : "Cancelar",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "No hay comentarios aún, iniciar la conversación!",
+    "More comments …" : "Más comentarios ...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} of {max}",
+    "Error occurred while retrieving comment with ID {id}" : "Se produjo un error al recuperar el comentario con ID {id}",
+    "Error occurred while updating comment with id {id}" : "Se ha producido un error al actualizar el comentario con id {id}",
+    "Error occurred while posting comment" : "Se ha producido un error al publicar un comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentar",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te ha mencionado en un comentario en “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/es_CL.js

@@ -1,13 +1,23 @@
 OC.L10N.register(
     "comments",
     {
+    "Comments" : "Comentarios",
+    "You commented" : "Comentaste",
+    "%1$s commented" : "%1$s comentó",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Usted comentó en %1$s",
+    "You commented on {file}" : "Hiciste un comentario de {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
     "Edit comment" : "Editar comentario",
     "Delete comment" : "Borrar comentario",
     "New comment …" : "Comentario nuevo ...",
     "Post" : "Publicar",
     "Cancel" : "Cancelar",
     "[Deleted user]" : "[Usuario borrado]",
-    "Comments" : "Comentarios",
     "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
     "More comments …" : "Más comentarios ...",
     "Save" : "Guardar",
@@ -17,20 +27,7 @@ OC.L10N.register(
     "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
     "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
     "Comment" : "Comentario",
-    "You commented" : "Comentaste",
-    "%1$s commented" : "%1$s comentó",
-    "{author} commented" : "{author} comentó",
-    "You commented on %1$s" : "Usted comentó en %1$s",
-    "You commented on {file}" : "Hiciste un comentario de {file}",
-    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
-    "{author} commented on {file}" : "{author} comentó en {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/es_CL.json

@@ -1,11 +1,21 @@
 { "translations": {
+    "Comments" : "Comentarios",
+    "You commented" : "Comentaste",
+    "%1$s commented" : "%1$s comentó",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Usted comentó en %1$s",
+    "You commented on {file}" : "Hiciste un comentario de {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
     "Edit comment" : "Editar comentario",
     "Delete comment" : "Borrar comentario",
     "New comment …" : "Comentario nuevo ...",
     "Post" : "Publicar",
     "Cancel" : "Cancelar",
     "[Deleted user]" : "[Usuario borrado]",
-    "Comments" : "Comentarios",
     "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
     "More comments …" : "Más comentarios ...",
     "Save" : "Guardar",
@@ -15,20 +25,7 @@
     "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
     "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
     "Comment" : "Comentario",
-    "You commented" : "Comentaste",
-    "%1$s commented" : "%1$s comentó",
-    "{author} commented" : "{author} comentó",
-    "You commented on %1$s" : "Usted comentó en %1$s",
-    "You commented on {file}" : "Hiciste un comentario de {file}",
-    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
-    "{author} commented on {file}" : "{author} comentó en {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/es_CO.js

@@ -1,13 +1,23 @@
 OC.L10N.register(
     "comments",
     {
+    "Comments" : "Comentarios",
+    "You commented" : "Comentaste",
+    "%1$s commented" : "%1$s comentó",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Usted comentó en %1$s",
+    "You commented on {file}" : "Hiciste un comentario de {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
     "Edit comment" : "Editar comentario",
     "Delete comment" : "Borrar comentario",
     "New comment …" : "Comentario nuevo ...",
     "Post" : "Publicar",
     "Cancel" : "Cancelar",
     "[Deleted user]" : "[Usuario borrado]",
-    "Comments" : "Comentarios",
     "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
     "More comments …" : "Más comentarios ...",
     "Save" : "Guardar",
@@ -17,20 +27,7 @@ OC.L10N.register(
     "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
     "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
     "Comment" : "Comentario",
-    "You commented" : "Comentaste",
-    "%1$s commented" : "%1$s comentó",
-    "{author} commented" : "{author} comentó",
-    "You commented on %1$s" : "Usted comentó en %1$s",
-    "You commented on {file}" : "Hiciste un comentario de {file}",
-    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
-    "{author} commented on {file}" : "{author} comentó en {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/es_CO.json

@@ -1,11 +1,21 @@
 { "translations": {
+    "Comments" : "Comentarios",
+    "You commented" : "Comentaste",
+    "%1$s commented" : "%1$s comentó",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Usted comentó en %1$s",
+    "You commented on {file}" : "Hiciste un comentario de {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
     "Edit comment" : "Editar comentario",
     "Delete comment" : "Borrar comentario",
     "New comment …" : "Comentario nuevo ...",
     "Post" : "Publicar",
     "Cancel" : "Cancelar",
     "[Deleted user]" : "[Usuario borrado]",
-    "Comments" : "Comentarios",
     "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
     "More comments …" : "Más comentarios ...",
     "Save" : "Guardar",
@@ -15,20 +25,7 @@
     "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
     "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
     "Comment" : "Comentario",
-    "You commented" : "Comentaste",
-    "%1$s commented" : "%1$s comentó",
-    "{author} commented" : "{author} comentó",
-    "You commented on %1$s" : "Usted comentó en %1$s",
-    "You commented on {file}" : "Hiciste un comentario de {file}",
-    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
-    "{author} commented on {file}" : "{author} comentó en {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/es_CR.js

@@ -1,13 +1,23 @@
 OC.L10N.register(
     "comments",
     {
+    "Comments" : "Comentarios",
+    "You commented" : "Comentaste",
+    "%1$s commented" : "%1$s comentó",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Usted comentó en %1$s",
+    "You commented on {file}" : "Hiciste un comentario de {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
     "Edit comment" : "Editar comentario",
     "Delete comment" : "Borrar comentario",
     "New comment …" : "Comentario nuevo ...",
     "Post" : "Publicar",
     "Cancel" : "Cancelar",
     "[Deleted user]" : "[Usuario borrado]",
-    "Comments" : "Comentarios",
     "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
     "More comments …" : "Más comentarios ...",
     "Save" : "Guardar",
@@ -17,20 +27,7 @@ OC.L10N.register(
     "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
     "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
     "Comment" : "Comentario",
-    "You commented" : "Comentaste",
-    "%1$s commented" : "%1$s comentó",
-    "{author} commented" : "{author} comentó",
-    "You commented on %1$s" : "Usted comentó en %1$s",
-    "You commented on {file}" : "Hiciste un comentario de {file}",
-    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
-    "{author} commented on {file}" : "{author} comentó en {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/es_CR.json

@@ -1,11 +1,21 @@
 { "translations": {
+    "Comments" : "Comentarios",
+    "You commented" : "Comentaste",
+    "%1$s commented" : "%1$s comentó",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Usted comentó en %1$s",
+    "You commented on {file}" : "Hiciste un comentario de {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
     "Edit comment" : "Editar comentario",
     "Delete comment" : "Borrar comentario",
     "New comment …" : "Comentario nuevo ...",
     "Post" : "Publicar",
     "Cancel" : "Cancelar",
     "[Deleted user]" : "[Usuario borrado]",
-    "Comments" : "Comentarios",
     "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
     "More comments …" : "Más comentarios ...",
     "Save" : "Guardar",
@@ -15,20 +25,7 @@
     "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
     "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
     "Comment" : "Comentario",
-    "You commented" : "Comentaste",
-    "%1$s commented" : "%1$s comentó",
-    "{author} commented" : "{author} comentó",
-    "You commented on %1$s" : "Usted comentó en %1$s",
-    "You commented on {file}" : "Hiciste un comentario de {file}",
-    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
-    "{author} commented on {file}" : "{author} comentó en {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/es_DO.js

@@ -1,13 +1,23 @@
 OC.L10N.register(
     "comments",
     {
+    "Comments" : "Comentarios",
+    "You commented" : "Comentaste",
+    "%1$s commented" : "%1$s comentó",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Usted comentó en %1$s",
+    "You commented on {file}" : "Hiciste un comentario de {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
     "Edit comment" : "Editar comentario",
     "Delete comment" : "Borrar comentario",
     "New comment …" : "Comentario nuevo ...",
     "Post" : "Publicar",
     "Cancel" : "Cancelar",
     "[Deleted user]" : "[Usuario borrado]",
-    "Comments" : "Comentarios",
     "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
     "More comments …" : "Más comentarios ...",
     "Save" : "Guardar",
@@ -17,20 +27,7 @@ OC.L10N.register(
     "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
     "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
     "Comment" : "Comentario",
-    "You commented" : "Comentaste",
-    "%1$s commented" : "%1$s comentó",
-    "{author} commented" : "{author} comentó",
-    "You commented on %1$s" : "Usted comentó en %1$s",
-    "You commented on {file}" : "Hiciste un comentario de {file}",
-    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
-    "{author} commented on {file}" : "{author} comentó en {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/es_DO.json

@@ -1,11 +1,21 @@
 { "translations": {
+    "Comments" : "Comentarios",
+    "You commented" : "Comentaste",
+    "%1$s commented" : "%1$s comentó",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Usted comentó en %1$s",
+    "You commented on {file}" : "Hiciste un comentario de {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
     "Edit comment" : "Editar comentario",
     "Delete comment" : "Borrar comentario",
     "New comment …" : "Comentario nuevo ...",
     "Post" : "Publicar",
     "Cancel" : "Cancelar",
     "[Deleted user]" : "[Usuario borrado]",
-    "Comments" : "Comentarios",
     "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
     "More comments …" : "Más comentarios ...",
     "Save" : "Guardar",
@@ -15,20 +25,7 @@
     "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
     "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
     "Comment" : "Comentario",
-    "You commented" : "Comentaste",
-    "%1$s commented" : "%1$s comentó",
-    "{author} commented" : "{author} comentó",
-    "You commented on %1$s" : "Usted comentó en %1$s",
-    "You commented on {file}" : "Hiciste un comentario de {file}",
-    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
-    "{author} commented on {file}" : "{author} comentó en {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/es_EC.js

@@ -1,13 +1,23 @@
 OC.L10N.register(
     "comments",
     {
+    "Comments" : "Comentarios",
+    "You commented" : "Comentaste",
+    "%1$s commented" : "%1$s comentó",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Usted comentó en %1$s",
+    "You commented on {file}" : "Hiciste un comentario de {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
     "Edit comment" : "Editar comentario",
     "Delete comment" : "Borrar comentario",
     "New comment …" : "Comentario nuevo ...",
     "Post" : "Publicar",
     "Cancel" : "Cancelar",
     "[Deleted user]" : "[Usuario borrado]",
-    "Comments" : "Comentarios",
     "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
     "More comments …" : "Más comentarios ...",
     "Save" : "Guardar",
@@ -17,20 +27,7 @@ OC.L10N.register(
     "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
     "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
     "Comment" : "Comentario",
-    "You commented" : "Comentaste",
-    "%1$s commented" : "%1$s comentó",
-    "{author} commented" : "{author} comentó",
-    "You commented on %1$s" : "Usted comentó en %1$s",
-    "You commented on {file}" : "Hiciste un comentario de {file}",
-    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
-    "{author} commented on {file}" : "{author} comentó en {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/es_EC.json

@@ -1,11 +1,21 @@
 { "translations": {
+    "Comments" : "Comentarios",
+    "You commented" : "Comentaste",
+    "%1$s commented" : "%1$s comentó",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Usted comentó en %1$s",
+    "You commented on {file}" : "Hiciste un comentario de {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
     "Edit comment" : "Editar comentario",
     "Delete comment" : "Borrar comentario",
     "New comment …" : "Comentario nuevo ...",
     "Post" : "Publicar",
     "Cancel" : "Cancelar",
     "[Deleted user]" : "[Usuario borrado]",
-    "Comments" : "Comentarios",
     "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
     "More comments …" : "Más comentarios ...",
     "Save" : "Guardar",
@@ -15,20 +25,7 @@
     "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
     "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
     "Comment" : "Comentario",
-    "You commented" : "Comentaste",
-    "%1$s commented" : "%1$s comentó",
-    "{author} commented" : "{author} comentó",
-    "You commented on %1$s" : "Usted comentó en %1$s",
-    "You commented on {file}" : "Hiciste un comentario de {file}",
-    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
-    "{author} commented on {file}" : "{author} comentó en {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/es_GT.js

@@ -1,13 +1,23 @@
 OC.L10N.register(
     "comments",
     {
+    "Comments" : "Comentarios",
+    "You commented" : "Comentaste",
+    "%1$s commented" : "%1$s comentó",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Usted comentó en %1$s",
+    "You commented on {file}" : "Hiciste un comentario de {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
     "Edit comment" : "Editar comentario",
     "Delete comment" : "Borrar comentario",
     "New comment …" : "Comentario nuevo ...",
     "Post" : "Publicar",
     "Cancel" : "Cancelar",
     "[Deleted user]" : "[Usuario borrado]",
-    "Comments" : "Comentarios",
     "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
     "More comments …" : "Más comentarios ...",
     "Save" : "Guardar",
@@ -17,20 +27,7 @@ OC.L10N.register(
     "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
     "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
     "Comment" : "Comentario",
-    "You commented" : "Comentaste",
-    "%1$s commented" : "%1$s comentó",
-    "{author} commented" : "{author} comentó",
-    "You commented on %1$s" : "Usted comentó en %1$s",
-    "You commented on {file}" : "Hiciste un comentario de {file}",
-    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
-    "{author} commented on {file}" : "{author} comentó en {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/es_GT.json

@@ -1,11 +1,21 @@
 { "translations": {
+    "Comments" : "Comentarios",
+    "You commented" : "Comentaste",
+    "%1$s commented" : "%1$s comentó",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Usted comentó en %1$s",
+    "You commented on {file}" : "Hiciste un comentario de {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
     "Edit comment" : "Editar comentario",
     "Delete comment" : "Borrar comentario",
     "New comment …" : "Comentario nuevo ...",
     "Post" : "Publicar",
     "Cancel" : "Cancelar",
     "[Deleted user]" : "[Usuario borrado]",
-    "Comments" : "Comentarios",
     "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
     "More comments …" : "Más comentarios ...",
     "Save" : "Guardar",
@@ -15,20 +25,7 @@
     "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
     "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
     "Comment" : "Comentario",
-    "You commented" : "Comentaste",
-    "%1$s commented" : "%1$s comentó",
-    "{author} commented" : "{author} comentó",
-    "You commented on %1$s" : "Usted comentó en %1$s",
-    "You commented on {file}" : "Hiciste un comentario de {file}",
-    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
-    "{author} commented on {file}" : "{author} comentó en {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/es_HN.js

@@ -1,21 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "Editar comentario",
-    "Delete comment" : "Borrar comentario",
-    "New comment …" : "Comentario nuevo ...",
-    "Post" : "Publicar",
-    "Cancel" : "Cancelar",
-    "[Deleted user]" : "[Usuario borrado]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
-    "More comments …" : "Más comentarios ...",
-    "Save" : "Guardar",
-    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
-    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
-    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
-    "Comment" : "Comentario",
     "You commented" : "Comentaste",
     "%1$s commented" : "%1$s comentó",
     "{author} commented" : "{author} comentó",
@@ -24,12 +10,23 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{author} comentó en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "Edit comment" : "Editar comentario",
+    "Delete comment" : "Borrar comentario",
+    "New comment …" : "Comentario nuevo ...",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
+    "More comments …" : "Más comentarios ...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
+    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentario",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/es_HN.json

@@ -1,19 +1,5 @@
 { "translations": {
-    "Edit comment" : "Editar comentario",
-    "Delete comment" : "Borrar comentario",
-    "New comment …" : "Comentario nuevo ...",
-    "Post" : "Publicar",
-    "Cancel" : "Cancelar",
-    "[Deleted user]" : "[Usuario borrado]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
-    "More comments …" : "Más comentarios ...",
-    "Save" : "Guardar",
-    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
-    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
-    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
-    "Comment" : "Comentario",
     "You commented" : "Comentaste",
     "%1$s commented" : "%1$s comentó",
     "{author} commented" : "{author} comentó",
@@ -22,12 +8,23 @@
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{author} comentó en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "Edit comment" : "Editar comentario",
+    "Delete comment" : "Borrar comentario",
+    "New comment …" : "Comentario nuevo ...",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
+    "More comments …" : "Más comentarios ...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
+    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentario",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/es_MX.js

@@ -1,13 +1,23 @@
 OC.L10N.register(
     "comments",
     {
+    "Comments" : "Comentarios",
+    "You commented" : "Comentaste",
+    "%1$s commented" : "%1$s comentó",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Usted comentó en %1$s",
+    "You commented on {file}" : "Hiciste un comentario de {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
     "Edit comment" : "Editar comentario",
     "Delete comment" : "Borrar comentario",
     "New comment …" : "Comentario nuevo ...",
     "Post" : "Publicar",
     "Cancel" : "Cancelar",
     "[Deleted user]" : "[Usuario borrado]",
-    "Comments" : "Comentarios",
     "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
     "More comments …" : "Más comentarios ...",
     "Save" : "Guardar",
@@ -17,20 +27,7 @@ OC.L10N.register(
     "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
     "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
     "Comment" : "Comentario",
-    "You commented" : "Comentaste",
-    "%1$s commented" : "%1$s comentó",
-    "{author} commented" : "{author} comentó",
-    "You commented on %1$s" : "Usted comentó en %1$s",
-    "You commented on {file}" : "Hiciste un comentario de {file}",
-    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
-    "{author} commented on {file}" : "{author} comentó en {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/es_MX.json

@@ -1,11 +1,21 @@
 { "translations": {
+    "Comments" : "Comentarios",
+    "You commented" : "Comentaste",
+    "%1$s commented" : "%1$s comentó",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Usted comentó en %1$s",
+    "You commented on {file}" : "Hiciste un comentario de {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
     "Edit comment" : "Editar comentario",
     "Delete comment" : "Borrar comentario",
     "New comment …" : "Comentario nuevo ...",
     "Post" : "Publicar",
     "Cancel" : "Cancelar",
     "[Deleted user]" : "[Usuario borrado]",
-    "Comments" : "Comentarios",
     "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
     "More comments …" : "Más comentarios ...",
     "Save" : "Guardar",
@@ -15,20 +25,7 @@
     "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
     "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
     "Comment" : "Comentario",
-    "You commented" : "Comentaste",
-    "%1$s commented" : "%1$s comentó",
-    "{author} commented" : "{author} comentó",
-    "You commented on %1$s" : "Usted comentó en %1$s",
-    "You commented on {file}" : "Hiciste un comentario de {file}",
-    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
-    "{author} commented on {file}" : "{author} comentó en {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/es_NI.js

@@ -1,21 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "Editar comentario",
-    "Delete comment" : "Borrar comentario",
-    "New comment …" : "Comentario nuevo ...",
-    "Post" : "Publicar",
-    "Cancel" : "Cancelar",
-    "[Deleted user]" : "[Usuario borrado]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
-    "More comments …" : "Más comentarios ...",
-    "Save" : "Guardar",
-    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
-    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
-    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
-    "Comment" : "Comentario",
     "You commented" : "Comentaste",
     "%1$s commented" : "%1$s comentó",
     "{author} commented" : "{author} comentó",
@@ -24,12 +10,23 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{author} comentó en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "Edit comment" : "Editar comentario",
+    "Delete comment" : "Borrar comentario",
+    "New comment …" : "Comentario nuevo ...",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
+    "More comments …" : "Más comentarios ...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
+    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentario",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/es_NI.json

@@ -1,19 +1,5 @@
 { "translations": {
-    "Edit comment" : "Editar comentario",
-    "Delete comment" : "Borrar comentario",
-    "New comment …" : "Comentario nuevo ...",
-    "Post" : "Publicar",
-    "Cancel" : "Cancelar",
-    "[Deleted user]" : "[Usuario borrado]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
-    "More comments …" : "Más comentarios ...",
-    "Save" : "Guardar",
-    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
-    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
-    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
-    "Comment" : "Comentario",
     "You commented" : "Comentaste",
     "%1$s commented" : "%1$s comentó",
     "{author} commented" : "{author} comentó",
@@ -22,12 +8,23 @@
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{author} comentó en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "Edit comment" : "Editar comentario",
+    "Delete comment" : "Borrar comentario",
+    "New comment …" : "Comentario nuevo ...",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
+    "More comments …" : "Más comentarios ...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
+    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentario",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/es_PA.js

@@ -1,21 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "Editar comentario",
-    "Delete comment" : "Borrar comentario",
-    "New comment …" : "Comentario nuevo ...",
-    "Post" : "Publicar",
-    "Cancel" : "Cancelar",
-    "[Deleted user]" : "[Usuario borrado]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
-    "More comments …" : "Más comentarios ...",
-    "Save" : "Guardar",
-    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
-    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
-    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
-    "Comment" : "Comentario",
     "You commented" : "Comentaste",
     "%1$s commented" : "%1$s comentó",
     "{author} commented" : "{author} comentó",
@@ -24,12 +10,23 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{author} comentó en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "Edit comment" : "Editar comentario",
+    "Delete comment" : "Borrar comentario",
+    "New comment …" : "Comentario nuevo ...",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
+    "More comments …" : "Más comentarios ...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
+    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentario",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/es_PA.json

@@ -1,19 +1,5 @@
 { "translations": {
-    "Edit comment" : "Editar comentario",
-    "Delete comment" : "Borrar comentario",
-    "New comment …" : "Comentario nuevo ...",
-    "Post" : "Publicar",
-    "Cancel" : "Cancelar",
-    "[Deleted user]" : "[Usuario borrado]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
-    "More comments …" : "Más comentarios ...",
-    "Save" : "Guardar",
-    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
-    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
-    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
-    "Comment" : "Comentario",
     "You commented" : "Comentaste",
     "%1$s commented" : "%1$s comentó",
     "{author} commented" : "{author} comentó",
@@ -22,12 +8,23 @@
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{author} comentó en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "Edit comment" : "Editar comentario",
+    "Delete comment" : "Borrar comentario",
+    "New comment …" : "Comentario nuevo ...",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
+    "More comments …" : "Más comentarios ...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
+    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentario",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/es_PE.js

@@ -1,21 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "Editar comentario",
-    "Delete comment" : "Borrar comentario",
-    "New comment …" : "Comentario nuevo ...",
-    "Post" : "Publicar",
-    "Cancel" : "Cancelar",
-    "[Deleted user]" : "[Usuario borrado]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
-    "More comments …" : "Más comentarios ...",
-    "Save" : "Guardar",
-    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
-    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
-    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
-    "Comment" : "Comentario",
     "You commented" : "Comentaste",
     "%1$s commented" : "%1$s comentó",
     "{author} commented" : "{author} comentó",
@@ -24,12 +10,23 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{author} comentó en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "Edit comment" : "Editar comentario",
+    "Delete comment" : "Borrar comentario",
+    "New comment …" : "Comentario nuevo ...",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
+    "More comments …" : "Más comentarios ...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
+    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentario",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/es_PE.json

@@ -1,19 +1,5 @@
 { "translations": {
-    "Edit comment" : "Editar comentario",
-    "Delete comment" : "Borrar comentario",
-    "New comment …" : "Comentario nuevo ...",
-    "Post" : "Publicar",
-    "Cancel" : "Cancelar",
-    "[Deleted user]" : "[Usuario borrado]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
-    "More comments …" : "Más comentarios ...",
-    "Save" : "Guardar",
-    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
-    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
-    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
-    "Comment" : "Comentario",
     "You commented" : "Comentaste",
     "%1$s commented" : "%1$s comentó",
     "{author} commented" : "{author} comentó",
@@ -22,12 +8,23 @@
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{author} comentó en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "Edit comment" : "Editar comentario",
+    "Delete comment" : "Borrar comentario",
+    "New comment …" : "Comentario nuevo ...",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
+    "More comments …" : "Más comentarios ...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
+    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentario",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/es_PR.js

@@ -1,21 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "Editar comentario",
-    "Delete comment" : "Borrar comentario",
-    "New comment …" : "Comentario nuevo ...",
-    "Post" : "Publicar",
-    "Cancel" : "Cancelar",
-    "[Deleted user]" : "[Usuario borrado]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
-    "More comments …" : "Más comentarios ...",
-    "Save" : "Guardar",
-    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
-    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
-    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
-    "Comment" : "Comentario",
     "You commented" : "Comentaste",
     "%1$s commented" : "%1$s comentó",
     "{author} commented" : "{author} comentó",
@@ -24,12 +10,23 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{author} comentó en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "Edit comment" : "Editar comentario",
+    "Delete comment" : "Borrar comentario",
+    "New comment …" : "Comentario nuevo ...",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
+    "More comments …" : "Más comentarios ...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
+    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentario",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/es_PR.json

@@ -1,19 +1,5 @@
 { "translations": {
-    "Edit comment" : "Editar comentario",
-    "Delete comment" : "Borrar comentario",
-    "New comment …" : "Comentario nuevo ...",
-    "Post" : "Publicar",
-    "Cancel" : "Cancelar",
-    "[Deleted user]" : "[Usuario borrado]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
-    "More comments …" : "Más comentarios ...",
-    "Save" : "Guardar",
-    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
-    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
-    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
-    "Comment" : "Comentario",
     "You commented" : "Comentaste",
     "%1$s commented" : "%1$s comentó",
     "{author} commented" : "{author} comentó",
@@ -22,12 +8,23 @@
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{author} comentó en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "Edit comment" : "Editar comentario",
+    "Delete comment" : "Borrar comentario",
+    "New comment …" : "Comentario nuevo ...",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
+    "More comments …" : "Más comentarios ...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
+    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentario",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/es_PY.js

@@ -1,21 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "Editar comentario",
-    "Delete comment" : "Borrar comentario",
-    "New comment …" : "Comentario nuevo ...",
-    "Post" : "Publicar",
-    "Cancel" : "Cancelar",
-    "[Deleted user]" : "[Usuario borrado]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
-    "More comments …" : "Más comentarios ...",
-    "Save" : "Guardar",
-    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
-    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
-    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
-    "Comment" : "Comentario",
     "You commented" : "Comentaste",
     "%1$s commented" : "%1$s comentó",
     "{author} commented" : "{author} comentó",
@@ -24,12 +10,23 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{author} comentó en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "Edit comment" : "Editar comentario",
+    "Delete comment" : "Borrar comentario",
+    "New comment …" : "Comentario nuevo ...",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
+    "More comments …" : "Más comentarios ...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
+    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentario",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/es_PY.json

@@ -1,19 +1,5 @@
 { "translations": {
-    "Edit comment" : "Editar comentario",
-    "Delete comment" : "Borrar comentario",
-    "New comment …" : "Comentario nuevo ...",
-    "Post" : "Publicar",
-    "Cancel" : "Cancelar",
-    "[Deleted user]" : "[Usuario borrado]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
-    "More comments …" : "Más comentarios ...",
-    "Save" : "Guardar",
-    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
-    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
-    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
-    "Comment" : "Comentario",
     "You commented" : "Comentaste",
     "%1$s commented" : "%1$s comentó",
     "{author} commented" : "{author} comentó",
@@ -22,12 +8,23 @@
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{author} comentó en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "Edit comment" : "Editar comentario",
+    "Delete comment" : "Borrar comentario",
+    "New comment …" : "Comentario nuevo ...",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
+    "More comments …" : "Más comentarios ...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
+    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentario",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/es_SV.js

@@ -1,13 +1,23 @@
 OC.L10N.register(
     "comments",
     {
+    "Comments" : "Comentarios",
+    "You commented" : "Comentaste",
+    "%1$s commented" : "%1$s comentó",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Usted comentó en %1$s",
+    "You commented on {file}" : "Hiciste un comentario de {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
     "Edit comment" : "Editar comentario",
     "Delete comment" : "Borrar comentario",
     "New comment …" : "Comentario nuevo ...",
     "Post" : "Publicar",
     "Cancel" : "Cancelar",
     "[Deleted user]" : "[Usuario borrado]",
-    "Comments" : "Comentarios",
     "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
     "More comments …" : "Más comentarios ...",
     "Save" : "Guardar",
@@ -17,20 +27,7 @@ OC.L10N.register(
     "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
     "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
     "Comment" : "Comentario",
-    "You commented" : "Comentaste",
-    "%1$s commented" : "%1$s comentó",
-    "{author} commented" : "{author} comentó",
-    "You commented on %1$s" : "Usted comentó en %1$s",
-    "You commented on {file}" : "Hiciste un comentario de {file}",
-    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
-    "{author} commented on {file}" : "{author} comentó en {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/es_SV.json

@@ -1,11 +1,21 @@
 { "translations": {
+    "Comments" : "Comentarios",
+    "You commented" : "Comentaste",
+    "%1$s commented" : "%1$s comentó",
+    "{author} commented" : "{author} comentó",
+    "You commented on %1$s" : "Usted comentó en %1$s",
+    "You commented on {file}" : "Hiciste un comentario de {file}",
+    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
+    "{author} commented on {file}" : "{author} comentó en {file}",
+    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
     "Edit comment" : "Editar comentario",
     "Delete comment" : "Borrar comentario",
     "New comment …" : "Comentario nuevo ...",
     "Post" : "Publicar",
     "Cancel" : "Cancelar",
     "[Deleted user]" : "[Usuario borrado]",
-    "Comments" : "Comentarios",
     "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
     "More comments …" : "Más comentarios ...",
     "Save" : "Guardar",
@@ -15,20 +25,7 @@
     "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
     "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
     "Comment" : "Comentario",
-    "You commented" : "Comentaste",
-    "%1$s commented" : "%1$s comentó",
-    "{author} commented" : "{author} comentó",
-    "You commented on %1$s" : "Usted comentó en %1$s",
-    "You commented on {file}" : "Hiciste un comentario de {file}",
-    "%1$s commented on %2$s" : "%1$s comentó en %2$s",
-    "{author} commented on {file}" : "{author} comentó en {file}",
-    "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/es_UY.js

@@ -1,21 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "Editar comentario",
-    "Delete comment" : "Borrar comentario",
-    "New comment …" : "Comentario nuevo ...",
-    "Post" : "Publicar",
-    "Cancel" : "Cancelar",
-    "[Deleted user]" : "[Usuario borrado]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
-    "More comments …" : "Más comentarios ...",
-    "Save" : "Guardar",
-    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
-    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
-    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
-    "Comment" : "Comentario",
     "You commented" : "Comentaste",
     "%1$s commented" : "%1$s comentó",
     "{author} commented" : "{author} comentó",
@@ -24,12 +10,23 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{author} comentó en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "Edit comment" : "Editar comentario",
+    "Delete comment" : "Borrar comentario",
+    "New comment …" : "Comentario nuevo ...",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
+    "More comments …" : "Más comentarios ...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
+    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentario",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/es_UY.json

@@ -1,19 +1,5 @@
 { "translations": {
-    "Edit comment" : "Editar comentario",
-    "Delete comment" : "Borrar comentario",
-    "New comment …" : "Comentario nuevo ...",
-    "Post" : "Publicar",
-    "Cancel" : "Cancelar",
-    "[Deleted user]" : "[Usuario borrado]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
-    "More comments …" : "Más comentarios ...",
-    "Save" : "Guardar",
-    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
-    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
-    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
-    "Comment" : "Comentario",
     "You commented" : "Comentaste",
     "%1$s commented" : "%1$s comentó",
     "{author} commented" : "{author} comentó",
@@ -22,12 +8,23 @@
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{author} comentó en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
-    "Unknown user" : "Usuario desconocido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
+    "Edit comment" : "Editar comentario",
+    "Delete comment" : "Borrar comentario",
+    "New comment …" : "Comentario nuevo ...",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "[Deleted user]" : "[Usuario borrado]",
+    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
+    "More comments …" : "Más comentarios ...",
+    "Save" : "Guardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
+    "Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
+    "Comment" : "Comentario",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/et_EE.js

@@ -1,21 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "Muuda kommentaari",
-    "Delete comment" : "Kustuta kommentaar",
-    "New comment …" : "Uus kommentaar",
-    "Post" : "Postita",
-    "Cancel" : "Loobu",
-    "[Deleted user]" : "[Kustutatud kasutaja]",
     "Comments" : "Kommentaarid",
-    "No comments yet, start the conversation!" : "Kommentaare veel pole, alusta vestlust",
-    "More comments …" : "Veel kommentaare ...",
-    "Save" : "Salvesta",
-    "Allowed characters {count} of {max}" : "Lubatud märkide arv {count}/{max}",
-    "Error occurred while updating comment with id {id}" : "Kommentaari {id} uuendamisel tekkis tõrge",
-    "Error occurred while posting comment" : "Viga kommentaari postitamisel",
-    "_%n unread comment_::_%n unread comments_" : ["%n lugemata kommentaar","%n lugemata kommentaari"],
-    "Comment" : "Kommentaar",
     "You commented" : "Sa kommenteerisid",
     "%1$s commented" : "%1$s kommenteeris",
     "{author} commented" : "{author} kommenteeris",
@@ -24,12 +10,23 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s kommenteeris %2$s",
     "{author} commented on {file}" : "{author} kommenteeris faili {file}",
     "<strong>Comments</strong> for files" : "<strong>Kommentaarid</strong> failidele",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Sind mainiti \"%s\", kommentaaris kasutataja poolt, mis on praeguseks kustutatud",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Sind mainiti \"{file}\", kommentaaris kasutataja poolt, mis on praeguseks kustutatud",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mainis sind \"%2$s\" kommentaaris",
     "{user} mentioned you in a comment on “{file}”" : "{user} mainis sind faili “{file}” kommentaaris",
-    "Unknown user" : "Tundmatu kasutaja",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Kustutatud kasutaja mainis sind \"%s\" kommentaaris",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Kustutatud kasutaja mainis sind faili \"{file}\" kommentaaris"
+    "Edit comment" : "Muuda kommentaari",
+    "Delete comment" : "Kustuta kommentaar",
+    "New comment …" : "Uus kommentaar",
+    "Post" : "Postita",
+    "Cancel" : "Loobu",
+    "[Deleted user]" : "[Kustutatud kasutaja]",
+    "No comments yet, start the conversation!" : "Kommentaare veel pole, alusta vestlust",
+    "More comments …" : "Veel kommentaare ...",
+    "Save" : "Salvesta",
+    "Allowed characters {count} of {max}" : "Lubatud märkide arv {count}/{max}",
+    "Error occurred while updating comment with id {id}" : "Kommentaari {id} uuendamisel tekkis tõrge",
+    "Error occurred while posting comment" : "Viga kommentaari postitamisel",
+    "_%n unread comment_::_%n unread comments_" : ["%n lugemata kommentaar","%n lugemata kommentaari"],
+    "Comment" : "Kommentaar",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Sind mainiti \"%s\", kommentaaris kasutataja poolt, mis on praeguseks kustutatud",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mainis sind \"%2$s\" kommentaaris"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/et_EE.json

@@ -1,19 +1,5 @@
 { "translations": {
-    "Edit comment" : "Muuda kommentaari",
-    "Delete comment" : "Kustuta kommentaar",
-    "New comment …" : "Uus kommentaar",
-    "Post" : "Postita",
-    "Cancel" : "Loobu",
-    "[Deleted user]" : "[Kustutatud kasutaja]",
     "Comments" : "Kommentaarid",
-    "No comments yet, start the conversation!" : "Kommentaare veel pole, alusta vestlust",
-    "More comments …" : "Veel kommentaare ...",
-    "Save" : "Salvesta",
-    "Allowed characters {count} of {max}" : "Lubatud märkide arv {count}/{max}",
-    "Error occurred while updating comment with id {id}" : "Kommentaari {id} uuendamisel tekkis tõrge",
-    "Error occurred while posting comment" : "Viga kommentaari postitamisel",
-    "_%n unread comment_::_%n unread comments_" : ["%n lugemata kommentaar","%n lugemata kommentaari"],
-    "Comment" : "Kommentaar",
     "You commented" : "Sa kommenteerisid",
     "%1$s commented" : "%1$s kommenteeris",
     "{author} commented" : "{author} kommenteeris",
@@ -22,12 +8,23 @@
     "%1$s commented on %2$s" : "%1$s kommenteeris %2$s",
     "{author} commented on {file}" : "{author} kommenteeris faili {file}",
     "<strong>Comments</strong> for files" : "<strong>Kommentaarid</strong> failidele",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Sind mainiti \"%s\", kommentaaris kasutataja poolt, mis on praeguseks kustutatud",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Sind mainiti \"{file}\", kommentaaris kasutataja poolt, mis on praeguseks kustutatud",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mainis sind \"%2$s\" kommentaaris",
     "{user} mentioned you in a comment on “{file}”" : "{user} mainis sind faili “{file}” kommentaaris",
-    "Unknown user" : "Tundmatu kasutaja",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Kustutatud kasutaja mainis sind \"%s\" kommentaaris",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Kustutatud kasutaja mainis sind faili \"{file}\" kommentaaris"
+    "Edit comment" : "Muuda kommentaari",
+    "Delete comment" : "Kustuta kommentaar",
+    "New comment …" : "Uus kommentaar",
+    "Post" : "Postita",
+    "Cancel" : "Loobu",
+    "[Deleted user]" : "[Kustutatud kasutaja]",
+    "No comments yet, start the conversation!" : "Kommentaare veel pole, alusta vestlust",
+    "More comments …" : "Veel kommentaare ...",
+    "Save" : "Salvesta",
+    "Allowed characters {count} of {max}" : "Lubatud märkide arv {count}/{max}",
+    "Error occurred while updating comment with id {id}" : "Kommentaari {id} uuendamisel tekkis tõrge",
+    "Error occurred while posting comment" : "Viga kommentaari postitamisel",
+    "_%n unread comment_::_%n unread comments_" : ["%n lugemata kommentaar","%n lugemata kommentaari"],
+    "Comment" : "Kommentaar",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Sind mainiti \"%s\", kommentaaris kasutataja poolt, mis on praeguseks kustutatud",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mainis sind \"%2$s\" kommentaaris"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/eu.js

@@ -1,21 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "Iruzkina editatu",
-    "Delete comment" : "Ezabatu iruzkina",
-    "New comment …" : "Iruzkin berria...",
-    "Post" : "Bidali",
-    "Cancel" : "Utzi",
-    "[Deleted user]" : "[Deleted user]",
     "Comments" : "Iruzkinak",
-    "No comments yet, start the conversation!" : "Oraindik ez dago iruzkinik, izan zaitez lehena zerbait esanez!",
-    "More comments …" : "Iruzkin gehiago...",
-    "Save" : "Gorde",
-    "Allowed characters {count} of {max}" : "Onartutako karaktereak {max}-tik {count}",
-    "Error occurred while updating comment with id {id}" : "Akats bat gertatu da {id} id duen iruzkina aldatzerakoan",
-    "Error occurred while posting comment" : "Akats bat gertatu da iruzkina bidaltzerakoan",
-    "_%n unread comment_::_%n unread comments_" : ["iruzkin %n irakurri gabe","%n iruzkin irakurri gabe"],
-    "Comment" : "Iruzkina",
     "You commented" : "Iruzkindu duzu",
     "%1$s commented" : "%1$s iruzkin du",
     "{author} commented" : "{author}-(e)k iruzkin du",
@@ -24,10 +10,22 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s %2$s-en iruzkin du",
     "{author} commented on {file}" : "{author}-(e)k {file}-en iruzkin du",
     "<strong>Comments</strong> for files" : "Fitxategientzako <strong>iruzkinak",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s-(e)k aipatu zaitu iruzkinean “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user}-(e)k aipatu zaitu iruzkinean “{file}”",
-    "Unknown user" : "Erabiltzaile ezezaguna",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "(Orain) ezabatutako erabiltzaile batek aipatu zaitu iruzkinean \"%s\"",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "(Orain) ezabatutako erabiltzaile batek aipatu zaitu iruzkinean “{file}”"
+    "Edit comment" : "Iruzkina editatu",
+    "Delete comment" : "Ezabatu iruzkina",
+    "New comment …" : "Iruzkin berria...",
+    "Post" : "Bidali",
+    "Cancel" : "Utzi",
+    "[Deleted user]" : "[Deleted user]",
+    "No comments yet, start the conversation!" : "Oraindik ez dago iruzkinik, izan zaitez lehena zerbait esanez!",
+    "More comments …" : "Iruzkin gehiago...",
+    "Save" : "Gorde",
+    "Allowed characters {count} of {max}" : "Onartutako karaktereak {max}-tik {count}",
+    "Error occurred while retrieving comment with ID {id}" : "Errorea gertatu da {id} ID-a duen iruzkina berreskuratzerakoan",
+    "Error occurred while updating comment with id {id}" : "Akats bat gertatu da {id} id duen iruzkina aldatzerakoan",
+    "Error occurred while posting comment" : "Akats bat gertatu da iruzkina bidaltzerakoan",
+    "_%n unread comment_::_%n unread comments_" : ["iruzkin %n irakurri gabe","%n iruzkin irakurri gabe"],
+    "Comment" : "Iruzkina",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s-(e)k aipatu zaitu iruzkinean “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/eu.json

@@ -1,19 +1,5 @@
 { "translations": {
-    "Edit comment" : "Iruzkina editatu",
-    "Delete comment" : "Ezabatu iruzkina",
-    "New comment …" : "Iruzkin berria...",
-    "Post" : "Bidali",
-    "Cancel" : "Utzi",
-    "[Deleted user]" : "[Deleted user]",
     "Comments" : "Iruzkinak",
-    "No comments yet, start the conversation!" : "Oraindik ez dago iruzkinik, izan zaitez lehena zerbait esanez!",
-    "More comments …" : "Iruzkin gehiago...",
-    "Save" : "Gorde",
-    "Allowed characters {count} of {max}" : "Onartutako karaktereak {max}-tik {count}",
-    "Error occurred while updating comment with id {id}" : "Akats bat gertatu da {id} id duen iruzkina aldatzerakoan",
-    "Error occurred while posting comment" : "Akats bat gertatu da iruzkina bidaltzerakoan",
-    "_%n unread comment_::_%n unread comments_" : ["iruzkin %n irakurri gabe","%n iruzkin irakurri gabe"],
-    "Comment" : "Iruzkina",
     "You commented" : "Iruzkindu duzu",
     "%1$s commented" : "%1$s iruzkin du",
     "{author} commented" : "{author}-(e)k iruzkin du",
@@ -22,10 +8,22 @@
     "%1$s commented on %2$s" : "%1$s %2$s-en iruzkin du",
     "{author} commented on {file}" : "{author}-(e)k {file}-en iruzkin du",
     "<strong>Comments</strong> for files" : "Fitxategientzako <strong>iruzkinak",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s-(e)k aipatu zaitu iruzkinean “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user}-(e)k aipatu zaitu iruzkinean “{file}”",
-    "Unknown user" : "Erabiltzaile ezezaguna",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "(Orain) ezabatutako erabiltzaile batek aipatu zaitu iruzkinean \"%s\"",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "(Orain) ezabatutako erabiltzaile batek aipatu zaitu iruzkinean “{file}”"
+    "Edit comment" : "Iruzkina editatu",
+    "Delete comment" : "Ezabatu iruzkina",
+    "New comment …" : "Iruzkin berria...",
+    "Post" : "Bidali",
+    "Cancel" : "Utzi",
+    "[Deleted user]" : "[Deleted user]",
+    "No comments yet, start the conversation!" : "Oraindik ez dago iruzkinik, izan zaitez lehena zerbait esanez!",
+    "More comments …" : "Iruzkin gehiago...",
+    "Save" : "Gorde",
+    "Allowed characters {count} of {max}" : "Onartutako karaktereak {max}-tik {count}",
+    "Error occurred while retrieving comment with ID {id}" : "Errorea gertatu da {id} ID-a duen iruzkina berreskuratzerakoan",
+    "Error occurred while updating comment with id {id}" : "Akats bat gertatu da {id} id duen iruzkina aldatzerakoan",
+    "Error occurred while posting comment" : "Akats bat gertatu da iruzkina bidaltzerakoan",
+    "_%n unread comment_::_%n unread comments_" : ["iruzkin %n irakurri gabe","%n iruzkin irakurri gabe"],
+    "Comment" : "Iruzkina",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s-(e)k aipatu zaitu iruzkinean “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/fi.js

@@ -1,22 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "Muokkaa kommenttia",
-    "Delete comment" : "Poista kommentti",
-    "New comment …" : "Uusi kommentti…",
-    "Post" : "Lähetä",
-    "Cancel" : "Peruuta",
-    "[Deleted user]" : "[Poistettu käyttäjä]",
     "Comments" : "Kommentit",
-    "No comments yet, start the conversation!" : "Ei kommentteja vielä. Aloita keskustelu!",
-    "More comments …" : "Lisää kommentteja…",
-    "Save" : "Tallenna",
-    "Allowed characters {count} of {max}" : "Sallittujen merkkien määrä {count}/{max}",
-    "Error occurred while retrieving comment with ID {id}" : "Virhe haettaessa kommenttia tunnisteella {id}",
-    "Error occurred while updating comment with id {id}" : "Virhe päivittäessä kommenttia tunnisteella {id}",
-    "Error occurred while posting comment" : "Virhe kommenttia lähettäessä",
-    "_%n unread comment_::_%n unread comments_" : ["%n lukematon kommentti","%n lukematonta kommenttia"],
-    "Comment" : "Kommentti",
     "You commented" : "Kommentoit",
     "%1$s commented" : "%1$s kommentoi",
     "{author} commented" : "{author} kommentoi",
@@ -26,10 +11,22 @@ OC.L10N.register(
     "{author} commented on {file}" : "{author} kommentoi tiedostoa {file}",
     "<strong>Comments</strong> for files" : "Tiedostojen <strong>kommentit</strong>",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Sinut mainittiin tiedoston “{file}” kommentissa käyttäjän toimesta, joka on sittemmin poistettu",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mainitsi sinut kommentissa “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} mainitsi sinut tiedoston \"{file}\" kommentissa",
-    "Unknown user" : "Tuntematon käyttäjä",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Poistettu käyttäjä mainitsi sinut kommentissa \"%s\"",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Poistettu käyttäjä mainitsi sinut tiedoston \"{file}\" kommentissa"
+    "Edit comment" : "Muokkaa kommenttia",
+    "Delete comment" : "Poista kommentti",
+    "New comment …" : "Uusi kommentti…",
+    "Post" : "Lähetä",
+    "Cancel" : "Peruuta",
+    "[Deleted user]" : "[Poistettu käyttäjä]",
+    "No comments yet, start the conversation!" : "Ei kommentteja vielä. Aloita keskustelu!",
+    "More comments …" : "Lisää kommentteja…",
+    "Save" : "Tallenna",
+    "Allowed characters {count} of {max}" : "Sallittujen merkkien määrä {count}/{max}",
+    "Error occurred while retrieving comment with ID {id}" : "Virhe haettaessa kommenttia tunnisteella {id}",
+    "Error occurred while updating comment with id {id}" : "Virhe päivittäessä kommenttia tunnisteella {id}",
+    "Error occurred while posting comment" : "Virhe kommenttia lähettäessä",
+    "_%n unread comment_::_%n unread comments_" : ["%n lukematon kommentti","%n lukematonta kommenttia"],
+    "Comment" : "Kommentti",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mainitsi sinut kommentissa “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/fi.json

@@ -1,20 +1,5 @@
 { "translations": {
-    "Edit comment" : "Muokkaa kommenttia",
-    "Delete comment" : "Poista kommentti",
-    "New comment …" : "Uusi kommentti…",
-    "Post" : "Lähetä",
-    "Cancel" : "Peruuta",
-    "[Deleted user]" : "[Poistettu käyttäjä]",
     "Comments" : "Kommentit",
-    "No comments yet, start the conversation!" : "Ei kommentteja vielä. Aloita keskustelu!",
-    "More comments …" : "Lisää kommentteja…",
-    "Save" : "Tallenna",
-    "Allowed characters {count} of {max}" : "Sallittujen merkkien määrä {count}/{max}",
-    "Error occurred while retrieving comment with ID {id}" : "Virhe haettaessa kommenttia tunnisteella {id}",
-    "Error occurred while updating comment with id {id}" : "Virhe päivittäessä kommenttia tunnisteella {id}",
-    "Error occurred while posting comment" : "Virhe kommenttia lähettäessä",
-    "_%n unread comment_::_%n unread comments_" : ["%n lukematon kommentti","%n lukematonta kommenttia"],
-    "Comment" : "Kommentti",
     "You commented" : "Kommentoit",
     "%1$s commented" : "%1$s kommentoi",
     "{author} commented" : "{author} kommentoi",
@@ -24,10 +9,22 @@
     "{author} commented on {file}" : "{author} kommentoi tiedostoa {file}",
     "<strong>Comments</strong> for files" : "Tiedostojen <strong>kommentit</strong>",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Sinut mainittiin tiedoston “{file}” kommentissa käyttäjän toimesta, joka on sittemmin poistettu",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mainitsi sinut kommentissa “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} mainitsi sinut tiedoston \"{file}\" kommentissa",
-    "Unknown user" : "Tuntematon käyttäjä",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Poistettu käyttäjä mainitsi sinut kommentissa \"%s\"",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Poistettu käyttäjä mainitsi sinut tiedoston \"{file}\" kommentissa"
+    "Edit comment" : "Muokkaa kommenttia",
+    "Delete comment" : "Poista kommentti",
+    "New comment …" : "Uusi kommentti…",
+    "Post" : "Lähetä",
+    "Cancel" : "Peruuta",
+    "[Deleted user]" : "[Poistettu käyttäjä]",
+    "No comments yet, start the conversation!" : "Ei kommentteja vielä. Aloita keskustelu!",
+    "More comments …" : "Lisää kommentteja…",
+    "Save" : "Tallenna",
+    "Allowed characters {count} of {max}" : "Sallittujen merkkien määrä {count}/{max}",
+    "Error occurred while retrieving comment with ID {id}" : "Virhe haettaessa kommenttia tunnisteella {id}",
+    "Error occurred while updating comment with id {id}" : "Virhe päivittäessä kommenttia tunnisteella {id}",
+    "Error occurred while posting comment" : "Virhe kommenttia lähettäessä",
+    "_%n unread comment_::_%n unread comments_" : ["%n lukematon kommentti","%n lukematonta kommenttia"],
+    "Comment" : "Kommentti",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mainitsi sinut kommentissa “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/fr.js

@@ -1,13 +1,24 @@
 OC.L10N.register(
     "comments",
     {
+    "Comments" : "Commentaires",
+    "You commented" : "Vous avez commenté",
+    "%1$s commented" : "%1$s a commenté",
+    "{author} commented" : "{author} a commenté",
+    "You commented on %1$s" : "Vous avez commenté %1$s",
+    "You commented on {file}" : "Vous avez commenté {file}",
+    "%1$s commented on %2$s" : "%1$s a commenté %2$s",
+    "{author} commented on {file}" : "{author} a commenté sur {file}",
+    "<strong>Comments</strong> for files" : "<strong>Commentaires</strong> sur les fichiers",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Vous avez été mentionné sur \"{file}\", dans un commentaire par un utilisateur qui a été supprimé depuis lors.",
+    "{user} mentioned you in a comment on “{file}”" : "{user} vous a mentionné⋅e dans un commentaire sur “{file}”",
+    "Files app plugin to add comments to files" : "Plugin Fichiers app pour ajouter des commentaires aux fichiers",
     "Edit comment" : "Modifier le commentaire",
     "Delete comment" : "Supprimer le commentaire",
     "New comment …" : "Nouveau commentaire...",
     "Post" : "Poster",
     "Cancel" : "Annuler",
     "[Deleted user]" : "[Utilisateur supprimé]",
-    "Comments" : "Commentaires",
     "No comments yet, start the conversation!" : "Il n'y a aucun commentaire, démarrez la conversation !",
     "More comments …" : "Plus de commentaires ...",
     "Save" : "Enregistrer",
@@ -17,21 +28,7 @@ OC.L10N.register(
     "Error occurred while posting comment" : "Une erreur est survenue lors de l'envoi du commentaire",
     "_%n unread comment_::_%n unread comments_" : ["%n commentaire non lu","%n commentaires non lus"],
     "Comment" : "Commenter",
-    "You commented" : "Vous avez commenté",
-    "%1$s commented" : "%1$s a commenté",
-    "{author} commented" : "{author} a commenté",
-    "You commented on %1$s" : "Vous avez commenté %1$s",
-    "You commented on {file}" : "Vous avez commenté {file}",
-    "%1$s commented on %2$s" : "%1$s a commenté %2$s",
-    "{author} commented on {file}" : "{author} a commenté sur {file}",
-    "<strong>Comments</strong> for files" : "<strong>Commentaires</strong> sur les fichiers",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Vous avez été mentionné sur \"%s\", dans un commentaire par un utilisateur qui a été supprimé depuis lors.",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Vous avez été mentionné sur \"{file}\", dans un commentaire par un utilisateur qui a été supprimé depuis lors.",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s vous a mentionné⋅e dans un commentaire sur “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} vous a mentionné⋅e dans un commentaire sur “{file}”",
-    "Files app plugin to add comments to files" : "Plugin Fichiers app pour ajouter des commentaires aux fichiers",
-    "Unknown user" : "Utilisateur·trice inconnu·e",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un·e utilisateur·trice (maintenant supprimé·e) vous a mentionné·e dans un commentaire sur “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un·e utilisateur·trice (maintenant supprimé·e) vous a mentionné·e dans un commentaire sur “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s vous a mentionné⋅e dans un commentaire sur “%2$s”"
 },
 "nplurals=2; plural=(n > 1);");

apps/comments/l10n/fr.json

@@ -1,11 +1,22 @@
 { "translations": {
+    "Comments" : "Commentaires",
+    "You commented" : "Vous avez commenté",
+    "%1$s commented" : "%1$s a commenté",
+    "{author} commented" : "{author} a commenté",
+    "You commented on %1$s" : "Vous avez commenté %1$s",
+    "You commented on {file}" : "Vous avez commenté {file}",
+    "%1$s commented on %2$s" : "%1$s a commenté %2$s",
+    "{author} commented on {file}" : "{author} a commenté sur {file}",
+    "<strong>Comments</strong> for files" : "<strong>Commentaires</strong> sur les fichiers",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Vous avez été mentionné sur \"{file}\", dans un commentaire par un utilisateur qui a été supprimé depuis lors.",
+    "{user} mentioned you in a comment on “{file}”" : "{user} vous a mentionné⋅e dans un commentaire sur “{file}”",
+    "Files app plugin to add comments to files" : "Plugin Fichiers app pour ajouter des commentaires aux fichiers",
     "Edit comment" : "Modifier le commentaire",
     "Delete comment" : "Supprimer le commentaire",
     "New comment …" : "Nouveau commentaire...",
     "Post" : "Poster",
     "Cancel" : "Annuler",
     "[Deleted user]" : "[Utilisateur supprimé]",
-    "Comments" : "Commentaires",
     "No comments yet, start the conversation!" : "Il n'y a aucun commentaire, démarrez la conversation !",
     "More comments …" : "Plus de commentaires ...",
     "Save" : "Enregistrer",
@@ -15,21 +26,7 @@
     "Error occurred while posting comment" : "Une erreur est survenue lors de l'envoi du commentaire",
     "_%n unread comment_::_%n unread comments_" : ["%n commentaire non lu","%n commentaires non lus"],
     "Comment" : "Commenter",
-    "You commented" : "Vous avez commenté",
-    "%1$s commented" : "%1$s a commenté",
-    "{author} commented" : "{author} a commenté",
-    "You commented on %1$s" : "Vous avez commenté %1$s",
-    "You commented on {file}" : "Vous avez commenté {file}",
-    "%1$s commented on %2$s" : "%1$s a commenté %2$s",
-    "{author} commented on {file}" : "{author} a commenté sur {file}",
-    "<strong>Comments</strong> for files" : "<strong>Commentaires</strong> sur les fichiers",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Vous avez été mentionné sur \"%s\", dans un commentaire par un utilisateur qui a été supprimé depuis lors.",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Vous avez été mentionné sur \"{file}\", dans un commentaire par un utilisateur qui a été supprimé depuis lors.",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s vous a mentionné⋅e dans un commentaire sur “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} vous a mentionné⋅e dans un commentaire sur “{file}”",
-    "Files app plugin to add comments to files" : "Plugin Fichiers app pour ajouter des commentaires aux fichiers",
-    "Unknown user" : "Utilisateur·trice inconnu·e",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un·e utilisateur·trice (maintenant supprimé·e) vous a mentionné·e dans un commentaire sur “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un·e utilisateur·trice (maintenant supprimé·e) vous a mentionné·e dans un commentaire sur “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s vous a mentionné⋅e dans un commentaire sur “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }

apps/comments/l10n/gl.js

@@ -1,21 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "Editar comentario",
-    "Delete comment" : "Eliminar comentario",
-    "New comment …" : "Comentario novo …",
-    "Post" : "Publicar",
-    "Cancel" : "Cancelar",
-    "[Deleted user]" : "[Usuario eliminado]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "Aínda non hai comentarios, comeza a conversa!",
-    "More comments …" : "Máis comentarios …",
-    "Save" : "Gardar",
-    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
-    "Error occurred while updating comment with id {id}" : "Produciuse un erro ao actualizar o comentario co ID {id}",
-    "Error occurred while posting comment" : "Produciuse un erro ao publicar o comentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentario sen ler","%n comentarios sen ler"],
-    "Comment" : "Comentario",
     "You commented" : "Vostede comentou",
     "%1$s commented" : "%1$s comentados",
     "{author} commented" : "{author} comentou",
@@ -24,10 +10,25 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s comentados en %2$s",
     "{author} commented on {file}" : "{author} comentou en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> para ficheiros",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mencionouno a vostede nun comentario en «%2$s»",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Mencionárono en «{file}», nun comentario dun usuario que foi eliminado",
     "{user} mentioned you in a comment on “{file}”" : "{user} mencionouno a vostede nun comentario en «{file}»",
-    "Unknown user" : "Usuario descoñecido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (agora) eliminado, mencionouno a vostede nun comentario en «%s»",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (agora) eliminado, mencionouno a vostede nun comentario en «{file}»"
+    "Files app plugin to add comments to files" : "Engadido do aplicativo de ficheiros para engadir comentarios aos ficheirros",
+    "Edit comment" : "Editar comentario",
+    "Delete comment" : "Eliminar comentario",
+    "New comment …" : "Comentario novo…",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "[Deleted user]" : "[Usuario eliminado]",
+    "No comments yet, start the conversation!" : "Aínda non hai comentarios, comeza a conversa!",
+    "More comments …" : "Máis comentarios…",
+    "Save" : "Gardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while retrieving comment with ID {id}" : "Produciuse un erro ao recuperar o comentario co ID {id}",
+    "Error occurred while updating comment with id {id}" : "Produciuse un erro ao actualizar o comentario co ID {id}",
+    "Error occurred while posting comment" : "Produciuse un erro ao publicar o comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentario sen ler","%n comentarios sen ler"],
+    "Comment" : "Comentario",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Mencionárono en «%s», nun comentario dun usuario que foi eliminado",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mencionouno a vostede nun comentario en «%2$s»"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/gl.json

@@ -1,19 +1,5 @@
 { "translations": {
-    "Edit comment" : "Editar comentario",
-    "Delete comment" : "Eliminar comentario",
-    "New comment …" : "Comentario novo …",
-    "Post" : "Publicar",
-    "Cancel" : "Cancelar",
-    "[Deleted user]" : "[Usuario eliminado]",
     "Comments" : "Comentarios",
-    "No comments yet, start the conversation!" : "Aínda non hai comentarios, comeza a conversa!",
-    "More comments …" : "Máis comentarios …",
-    "Save" : "Gardar",
-    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
-    "Error occurred while updating comment with id {id}" : "Produciuse un erro ao actualizar o comentario co ID {id}",
-    "Error occurred while posting comment" : "Produciuse un erro ao publicar o comentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n comentario sen ler","%n comentarios sen ler"],
-    "Comment" : "Comentario",
     "You commented" : "Vostede comentou",
     "%1$s commented" : "%1$s comentados",
     "{author} commented" : "{author} comentou",
@@ -22,10 +8,25 @@
     "%1$s commented on %2$s" : "%1$s comentados en %2$s",
     "{author} commented on {file}" : "{author} comentou en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> para ficheiros",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mencionouno a vostede nun comentario en «%2$s»",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Mencionárono en «{file}», nun comentario dun usuario que foi eliminado",
     "{user} mentioned you in a comment on “{file}”" : "{user} mencionouno a vostede nun comentario en «{file}»",
-    "Unknown user" : "Usuario descoñecido",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (agora) eliminado, mencionouno a vostede nun comentario en «%s»",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (agora) eliminado, mencionouno a vostede nun comentario en «{file}»"
+    "Files app plugin to add comments to files" : "Engadido do aplicativo de ficheiros para engadir comentarios aos ficheirros",
+    "Edit comment" : "Editar comentario",
+    "Delete comment" : "Eliminar comentario",
+    "New comment …" : "Comentario novo…",
+    "Post" : "Publicar",
+    "Cancel" : "Cancelar",
+    "[Deleted user]" : "[Usuario eliminado]",
+    "No comments yet, start the conversation!" : "Aínda non hai comentarios, comeza a conversa!",
+    "More comments …" : "Máis comentarios…",
+    "Save" : "Gardar",
+    "Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
+    "Error occurred while retrieving comment with ID {id}" : "Produciuse un erro ao recuperar o comentario co ID {id}",
+    "Error occurred while updating comment with id {id}" : "Produciuse un erro ao actualizar o comentario co ID {id}",
+    "Error occurred while posting comment" : "Produciuse un erro ao publicar o comentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n comentario sen ler","%n comentarios sen ler"],
+    "Comment" : "Comentario",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Mencionárono en «%s», nun comentario dun usuario que foi eliminado",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mencionouno a vostede nun comentario en «%2$s»"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/he.js

@@ -1,13 +1,24 @@
 OC.L10N.register(
     "comments",
     {
+    "Comments" : "תגובות",
+    "You commented" : "הערות שלך",
+    "%1$s commented" : "התקבלו תגובות %1$s",
+    "{author} commented" : "התקבלה תגובה מאת {author}",
+    "You commented on %1$s" : "הגבת על %1$s",
+    "You commented on {file}" : "הגבת על {file}",
+    "%1$s commented on %2$s" : "התקבלו תגובות %1$s ב- %2$s ",
+    "{author} commented on {file}" : "נוספה תגובה על {file} מאת {author}",
+    "<strong>Comments</strong> for files" : "<strong>תגובות</strong> על קבצים",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "אוזכרת ב־„{file}”, בתגובה של משתמש שנמחק בינתיים.",
+    "{user} mentioned you in a comment on “{file}”" : "אוזכרת על ידי „{user}” בתגובה על „{file}”",
+    "Files app plugin to add comments to files" : "תוסף ליישומון הקבצים כדי להוסיף הערות על קבצים",
     "Edit comment" : "עריכת תגובה",
     "Delete comment" : "מחיקת תגובה",
     "New comment …" : "תגובה חדשה",
     "Post" : "פרסום",
     "Cancel" : "ביטול",
     "[Deleted user]" : "[משתמשים מוסרים]",
-    "Comments" : "תגובות",
     "No comments yet, start the conversation!" : "אין תגובות עדיין, בואו נתחיל לקשקש!",
     "More comments …" : "תגובות נוספות…",
     "Save" : "שמירה",
@@ -17,20 +28,7 @@ OC.L10N.register(
     "Error occurred while posting comment" : "אירעה שגיאה בזמן פרסום תגובה",
     "_%n unread comment_::_%n unread comments_" : ["תגובה אחת שלא נקראה","%n תגובות שלא נקראו","%n תגובות שלא נקראו","%n תגובות שלא נקראו"],
     "Comment" : "תגובה",
-    "You commented" : "הערות שלך",
-    "%1$s commented" : "התקבלו תגובות %1$s",
-    "{author} commented" : "התקבלה תגובה מאת {author}",
-    "You commented on %1$s" : "הגבת על %1$s",
-    "You commented on {file}" : "הגבת על {file}",
-    "%1$s commented on %2$s" : "התקבלו תגובות %1$s ב- %2$s ",
-    "{author} commented on {file}" : "נוספה תגובה על {file} מאת {author}",
-    "<strong>Comments</strong> for files" : "<strong>תגובות</strong> על קבצים",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "אוזכרת ב־„%s”, בתגובה על ידי משתמש שנמחק בינתיים.",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "אוזכרת ב־„{file}”, בתגובה של משתמש שנמחק בינתיים.",
-    "%1$s mentioned you in a comment on “%2$s”" : "אוזכרת על ידי %1$s בתגובה על „%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "אוזכרת על ידי „{user}” בתגובה על „{file}”",
-    "Unknown user" : "משתמש לא ידוע",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "אוזכרת על ידי משתמש שנמחק (נכון לעכשיו) בתגובה על „%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "אוזכרת על ידי משתמש שנמחק (נכון לעכשיו) בתגובה על „{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "אוזכרת על ידי %1$s בתגובה על „%2$s”"
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;");

apps/comments/l10n/he.json

@@ -1,11 +1,22 @@
 { "translations": {
+    "Comments" : "תגובות",
+    "You commented" : "הערות שלך",
+    "%1$s commented" : "התקבלו תגובות %1$s",
+    "{author} commented" : "התקבלה תגובה מאת {author}",
+    "You commented on %1$s" : "הגבת על %1$s",
+    "You commented on {file}" : "הגבת על {file}",
+    "%1$s commented on %2$s" : "התקבלו תגובות %1$s ב- %2$s ",
+    "{author} commented on {file}" : "נוספה תגובה על {file} מאת {author}",
+    "<strong>Comments</strong> for files" : "<strong>תגובות</strong> על קבצים",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "אוזכרת ב־„{file}”, בתגובה של משתמש שנמחק בינתיים.",
+    "{user} mentioned you in a comment on “{file}”" : "אוזכרת על ידי „{user}” בתגובה על „{file}”",
+    "Files app plugin to add comments to files" : "תוסף ליישומון הקבצים כדי להוסיף הערות על קבצים",
     "Edit comment" : "עריכת תגובה",
     "Delete comment" : "מחיקת תגובה",
     "New comment …" : "תגובה חדשה",
     "Post" : "פרסום",
     "Cancel" : "ביטול",
     "[Deleted user]" : "[משתמשים מוסרים]",
-    "Comments" : "תגובות",
     "No comments yet, start the conversation!" : "אין תגובות עדיין, בואו נתחיל לקשקש!",
     "More comments …" : "תגובות נוספות…",
     "Save" : "שמירה",
@@ -15,20 +26,7 @@
     "Error occurred while posting comment" : "אירעה שגיאה בזמן פרסום תגובה",
     "_%n unread comment_::_%n unread comments_" : ["תגובה אחת שלא נקראה","%n תגובות שלא נקראו","%n תגובות שלא נקראו","%n תגובות שלא נקראו"],
     "Comment" : "תגובה",
-    "You commented" : "הערות שלך",
-    "%1$s commented" : "התקבלו תגובות %1$s",
-    "{author} commented" : "התקבלה תגובה מאת {author}",
-    "You commented on %1$s" : "הגבת על %1$s",
-    "You commented on {file}" : "הגבת על {file}",
-    "%1$s commented on %2$s" : "התקבלו תגובות %1$s ב- %2$s ",
-    "{author} commented on {file}" : "נוספה תגובה על {file} מאת {author}",
-    "<strong>Comments</strong> for files" : "<strong>תגובות</strong> על קבצים",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "אוזכרת ב־„%s”, בתגובה על ידי משתמש שנמחק בינתיים.",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "אוזכרת ב־„{file}”, בתגובה של משתמש שנמחק בינתיים.",
-    "%1$s mentioned you in a comment on “%2$s”" : "אוזכרת על ידי %1$s בתגובה על „%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "אוזכרת על ידי „{user}” בתגובה על „{file}”",
-    "Unknown user" : "משתמש לא ידוע",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "אוזכרת על ידי משתמש שנמחק (נכון לעכשיו) בתגובה על „%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "אוזכרת על ידי משתמש שנמחק (נכון לעכשיו) בתגובה על „{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "אוזכרת על ידי %1$s בתגובה על „%2$s”"
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;"
 }

apps/comments/l10n/hu.js

@@ -1,22 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "Hozzászólás szerkesztése",
-    "Delete comment" : "Hozzászólás törlése",
-    "New comment …" : "Új hozzászólás...",
-    "Post" : "Küldés",
-    "Cancel" : "Mégsem",
-    "[Deleted user]" : "[Törölt felhasználó]",
     "Comments" : "Hozzászólások",
-    "No comments yet, start the conversation!" : "Még nincsenek hozzászólások, kezdd el a beszélgetést!",
-    "More comments …" : "Több hozzászólás...",
-    "Save" : "Mentés",
-    "Allowed characters {count} of {max}" : "Engedélyezett karakterek: {count} / {max}",
-    "Error occurred while retrieving comment with ID {id}" : "Hiba a {id} számú komment betöltésekor",
-    "Error occurred while updating comment with id {id}" : "Hiba a következő azonosítójú hozzászólás frissítése közben: {id}",
-    "Error occurred while posting comment" : "Hiba történt a hozzászólás küldése közben",
-    "_%n unread comment_::_%n unread comments_" : ["%n olvasatlan hozzászólás","%n olvasatlan hozzászólás"],
-    "Comment" : "Hozzászólás",
     "You commented" : "Hozzászóltál",
     "%1$s commented" : "%1$s hozzászólt",
     "{author} commented" : "{author} hozzászólt",
@@ -25,12 +10,25 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s hozzászólt ehhez: %2$s",
     "{author} commented on {file}" : "{author} hozzászólt ehhez: {file}",
     "<strong>Comments</strong> for files" : "<strong>Hozzászólások</strong> fájlokhoz",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Megemlítettek ezen: “%s”, egy már törölt felhasználó hozzászólásában",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Megemlítettek ezen: “{file}”, egy már törölt felhasználó hozzászólásában",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s megemlített egy hozzászólásban itt: “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} megemlített egy hozzászólásban itt: “{file}”",
-    "Unknown user" : "Ismeretlen felhasználó",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Egy (most) törölt felhasználó megemlített egy hozzászólásban itt: “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Egy (most) törölt felhasználó megemlített egy hozzászólásban itt: “{file}”"
+    "Files app plugin to add comments to files" : "Beépülő Fájl applikáció amivel megjegyzések adhatók fájlokhoz ",
+    "Edit comment" : "Hozzászólás szerkesztése",
+    "Delete comment" : "Hozzászólás törlése",
+    "New comment …" : "Új hozzászólás...",
+    "Post" : "Küldés",
+    "Cancel" : "Mégsem",
+    "[Deleted user]" : "[Törölt felhasználó]",
+    "No comments yet, start the conversation!" : "Még nincsenek hozzászólások, kezdd el a beszélgetést!",
+    "More comments …" : "Több hozzászólás...",
+    "Save" : "Mentés",
+    "Allowed characters {count} of {max}" : "Engedélyezett karakterek: {count} / {max}",
+    "Error occurred while retrieving comment with ID {id}" : "Hiba a {id} számú hozzászólás betöltésekor",
+    "Error occurred while updating comment with id {id}" : "Hiba a következő azonosítójú hozzászólás frissítése közben: {id}",
+    "Error occurred while posting comment" : "Hiba történt a hozzászólás küldése közben",
+    "_%n unread comment_::_%n unread comments_" : ["%n olvasatlan hozzászólás","%n olvasatlan hozzászólás"],
+    "Comment" : "Hozzászólás",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Megemlítettek ezen: “%s”, egy már törölt felhasználó hozzászólásában",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s megemlített egy hozzászólásban itt: “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/hu.json

@@ -1,20 +1,5 @@
 { "translations": {
-    "Edit comment" : "Hozzászólás szerkesztése",
-    "Delete comment" : "Hozzászólás törlése",
-    "New comment …" : "Új hozzászólás...",
-    "Post" : "Küldés",
-    "Cancel" : "Mégsem",
-    "[Deleted user]" : "[Törölt felhasználó]",
     "Comments" : "Hozzászólások",
-    "No comments yet, start the conversation!" : "Még nincsenek hozzászólások, kezdd el a beszélgetést!",
-    "More comments …" : "Több hozzászólás...",
-    "Save" : "Mentés",
-    "Allowed characters {count} of {max}" : "Engedélyezett karakterek: {count} / {max}",
-    "Error occurred while retrieving comment with ID {id}" : "Hiba a {id} számú komment betöltésekor",
-    "Error occurred while updating comment with id {id}" : "Hiba a következő azonosítójú hozzászólás frissítése közben: {id}",
-    "Error occurred while posting comment" : "Hiba történt a hozzászólás küldése közben",
-    "_%n unread comment_::_%n unread comments_" : ["%n olvasatlan hozzászólás","%n olvasatlan hozzászólás"],
-    "Comment" : "Hozzászólás",
     "You commented" : "Hozzászóltál",
     "%1$s commented" : "%1$s hozzászólt",
     "{author} commented" : "{author} hozzászólt",
@@ -23,12 +8,25 @@
     "%1$s commented on %2$s" : "%1$s hozzászólt ehhez: %2$s",
     "{author} commented on {file}" : "{author} hozzászólt ehhez: {file}",
     "<strong>Comments</strong> for files" : "<strong>Hozzászólások</strong> fájlokhoz",
-    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Megemlítettek ezen: “%s”, egy már törölt felhasználó hozzászólásában",
     "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Megemlítettek ezen: “{file}”, egy már törölt felhasználó hozzászólásában",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s megemlített egy hozzászólásban itt: “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} megemlített egy hozzászólásban itt: “{file}”",
-    "Unknown user" : "Ismeretlen felhasználó",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Egy (most) törölt felhasználó megemlített egy hozzászólásban itt: “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Egy (most) törölt felhasználó megemlített egy hozzászólásban itt: “{file}”"
+    "Files app plugin to add comments to files" : "Beépülő Fájl applikáció amivel megjegyzések adhatók fájlokhoz ",
+    "Edit comment" : "Hozzászólás szerkesztése",
+    "Delete comment" : "Hozzászólás törlése",
+    "New comment …" : "Új hozzászólás...",
+    "Post" : "Küldés",
+    "Cancel" : "Mégsem",
+    "[Deleted user]" : "[Törölt felhasználó]",
+    "No comments yet, start the conversation!" : "Még nincsenek hozzászólások, kezdd el a beszélgetést!",
+    "More comments …" : "Több hozzászólás...",
+    "Save" : "Mentés",
+    "Allowed characters {count} of {max}" : "Engedélyezett karakterek: {count} / {max}",
+    "Error occurred while retrieving comment with ID {id}" : "Hiba a {id} számú hozzászólás betöltésekor",
+    "Error occurred while updating comment with id {id}" : "Hiba a következő azonosítójú hozzászólás frissítése közben: {id}",
+    "Error occurred while posting comment" : "Hiba történt a hozzászólás küldése közben",
+    "_%n unread comment_::_%n unread comments_" : ["%n olvasatlan hozzászólás","%n olvasatlan hozzászólás"],
+    "Comment" : "Hozzászólás",
+    "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Megemlítettek ezen: “%s”, egy már törölt felhasználó hozzászólásában",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s megemlített egy hozzászólásban itt: “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/ia.js

@@ -1,21 +1,7 @@
 OC.L10N.register(
     "comments",
     {
-    "Edit comment" : "Modificar commentario",
-    "Delete comment" : "Deler commentario",
-    "New comment …" : "Nove commentario ...",
-    "Post" : "Publicar",
-    "Cancel" : "Cancellar",
-    "[Deleted user]" : "[Usator delite]",
     "Comments" : "Commentarios",
-    "No comments yet, start the conversation!" : "Il ha nulle commentarios ancora, initia le conversation!",
-    "More comments …" : "Plus commentarios ...",
-    "Save" : "Salveguardar",
-    "Allowed characters {count} of {max}" : "{count} characteres permittite de {max}",
-    "Error occurred while updating comment with id {id}" : "Un error occurreva durante le actualisation del commentario identificate per {id}",
-    "Error occurred while posting comment" : "Un error occurreva durante le publication del commentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n commentario non legite","%n commentarios non legite"],
-    "Comment" : "Commentario",
     "You commented" : "Tu commentava",
     "%1$s commented" : "%1$s commentava",
     "{author} commented" : "{author} commentava",
@@ -24,10 +10,21 @@ OC.L10N.register(
     "%1$s commented on %2$s" : "%1$s commentava in %2$s",
     "{author} commented on {file}" : "{author} commentava in {file}",
     "<strong>Comments</strong> for files" : "<strong>Commentarios</strong> pro files",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mentionava tu in un commentario in “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} mentionava tu in un commentario in “{file}”",
-    "Unknown user" : "Usator incognite",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un (ora) delite usator mentionava tu in un commentario in “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un (ora) delite usator mentionava tu in un commentario in “{file}”"
+    "Edit comment" : "Modificar commentario",
+    "Delete comment" : "Deler commentario",
+    "New comment …" : "Nove commentario ...",
+    "Post" : "Publicar",
+    "Cancel" : "Cancellar",
+    "[Deleted user]" : "[Usator delite]",
+    "No comments yet, start the conversation!" : "Il ha nulle commentarios ancora, initia le conversation!",
+    "More comments …" : "Plus commentarios ...",
+    "Save" : "Salveguardar",
+    "Allowed characters {count} of {max}" : "{count} characteres permittite de {max}",
+    "Error occurred while updating comment with id {id}" : "Un error occurreva durante le actualisation del commentario identificate per {id}",
+    "Error occurred while posting comment" : "Un error occurreva durante le publication del commentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n commentario non legite","%n commentarios non legite"],
+    "Comment" : "Commentario",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mentionava tu in un commentario in “%2$s”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/ia.json

@@ -1,19 +1,5 @@
 { "translations": {
-    "Edit comment" : "Modificar commentario",
-    "Delete comment" : "Deler commentario",
-    "New comment …" : "Nove commentario ...",
-    "Post" : "Publicar",
-    "Cancel" : "Cancellar",
-    "[Deleted user]" : "[Usator delite]",
     "Comments" : "Commentarios",
-    "No comments yet, start the conversation!" : "Il ha nulle commentarios ancora, initia le conversation!",
-    "More comments …" : "Plus commentarios ...",
-    "Save" : "Salveguardar",
-    "Allowed characters {count} of {max}" : "{count} characteres permittite de {max}",
-    "Error occurred while updating comment with id {id}" : "Un error occurreva durante le actualisation del commentario identificate per {id}",
-    "Error occurred while posting comment" : "Un error occurreva durante le publication del commentario",
-    "_%n unread comment_::_%n unread comments_" : ["%n commentario non legite","%n commentarios non legite"],
-    "Comment" : "Commentario",
     "You commented" : "Tu commentava",
     "%1$s commented" : "%1$s commentava",
     "{author} commented" : "{author} commentava",
@@ -22,10 +8,21 @@
     "%1$s commented on %2$s" : "%1$s commentava in %2$s",
     "{author} commented on {file}" : "{author} commentava in {file}",
     "<strong>Comments</strong> for files" : "<strong>Commentarios</strong> pro files",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mentionava tu in un commentario in “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} mentionava tu in un commentario in “{file}”",
-    "Unknown user" : "Usator incognite",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un (ora) delite usator mentionava tu in un commentario in “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un (ora) delite usator mentionava tu in un commentario in “{file}”"
+    "Edit comment" : "Modificar commentario",
+    "Delete comment" : "Deler commentario",
+    "New comment …" : "Nove commentario ...",
+    "Post" : "Publicar",
+    "Cancel" : "Cancellar",
+    "[Deleted user]" : "[Usator delite]",
+    "No comments yet, start the conversation!" : "Il ha nulle commentarios ancora, initia le conversation!",
+    "More comments …" : "Plus commentarios ...",
+    "Save" : "Salveguardar",
+    "Allowed characters {count} of {max}" : "{count} characteres permittite de {max}",
+    "Error occurred while updating comment with id {id}" : "Un error occurreva durante le actualisation del commentario identificate per {id}",
+    "Error occurred while posting comment" : "Un error occurreva durante le publication del commentario",
+    "_%n unread comment_::_%n unread comments_" : ["%n commentario non legite","%n commentarios non legite"],
+    "Comment" : "Commentario",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s mentionava tu in un commentario in “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/id.js

@@ -1,25 +1,21 @@
 OC.L10N.register(
     "comments",
     {
+    "Comments" : "Komentar",
+    "You commented" : "Anda berkomentar",
+    "%1$s commented" : "%1$s dikomentari",
+    "{author} commented" : "{Pengarang} berkomentar",
+    "%1$s commented on %2$s" : "%1$s dikomentari pada %2$s",
+    "Edit comment" : "Sunting komentar",
     "Delete comment" : "Hapus komentar",
     "Post" : "Posting",
     "Cancel" : "Batal",
-    "Edit comment" : "Sunting komentar",
     "[Deleted user]" : "[Hapus pengguna]",
-    "Comments" : "Komentar",
+    "No comments yet, start the conversation!" : "Belum ada yang berkomentar, mulailah perbincangan!",
     "Save" : "Simpan",
     "Allowed characters {count} of {max}" : "Karakter yang diizinkan {count} dari {max}",
-    "Error occurred while retrieving comment with id {id}" : "Terjadi kesalahan saat mendapatkan komentar dengan id {id}",
     "Error occurred while updating comment with id {id}" : "Terjadi kesalahan saat memperbarui komentar dengan id {id}",
     "Error occurred while posting comment" : "Terjadi kesalahan saat memosting komentar",
-    "Comment" : "Komentar",
-    "You commented" : "Anda berkomentar",
-    "%1$s commented" : "%1$s dikomentari",
-    "You commented on %2$s" : "Anda berkomentar di %2$s",
-    "%1$s commented on %2$s" : "%1$s dikomentari pada %2$s",
-    "Type in a new comment..." : "Ketik di komentar baru...",
-    "No other comments available" : "Tidak ada komentar lainnya",
-    "More comments..." : "Komentar lainya...",
-    "{count} unread comments" : "{count} komentar belum dibaca"
+    "Comment" : "Komentar"
 },
 "nplurals=1; plural=0;");

apps/comments/l10n/id.json

@@ -1,23 +1,19 @@
 { "translations": {
+    "Comments" : "Komentar",
+    "You commented" : "Anda berkomentar",
+    "%1$s commented" : "%1$s dikomentari",
+    "{author} commented" : "{Pengarang} berkomentar",
+    "%1$s commented on %2$s" : "%1$s dikomentari pada %2$s",
+    "Edit comment" : "Sunting komentar",
     "Delete comment" : "Hapus komentar",
     "Post" : "Posting",
     "Cancel" : "Batal",
-    "Edit comment" : "Sunting komentar",
     "[Deleted user]" : "[Hapus pengguna]",
-    "Comments" : "Komentar",
+    "No comments yet, start the conversation!" : "Belum ada yang berkomentar, mulailah perbincangan!",
     "Save" : "Simpan",
     "Allowed characters {count} of {max}" : "Karakter yang diizinkan {count} dari {max}",
-    "Error occurred while retrieving comment with id {id}" : "Terjadi kesalahan saat mendapatkan komentar dengan id {id}",
     "Error occurred while updating comment with id {id}" : "Terjadi kesalahan saat memperbarui komentar dengan id {id}",
     "Error occurred while posting comment" : "Terjadi kesalahan saat memosting komentar",
-    "Comment" : "Komentar",
-    "You commented" : "Anda berkomentar",
-    "%1$s commented" : "%1$s dikomentari",
-    "You commented on %2$s" : "Anda berkomentar di %2$s",
-    "%1$s commented on %2$s" : "%1$s dikomentari pada %2$s",
-    "Type in a new comment..." : "Ketik di komentar baru...",
-    "No other comments available" : "Tidak ada komentar lainnya",
-    "More comments..." : "Komentar lainya...",
-    "{count} unread comments" : "{count} komentar belum dibaca"
+    "Comment" : "Komentar"
 },"pluralForm" :"nplurals=1; plural=0;"
 }

apps/comments/l10n/is.js

@@ -1,13 +1,24 @@
 OC.L10N.register(
     "comments",
     {
+    "Comments" : "Athugasemdir",
+    "You commented" : "Þú settir inn athugasemd",
+    "%1$s commented" : "%1$s setti inn athugasemd",
+    "{author} commented" : "{author} setti inn athugasemd",
+    "You commented on %1$s" : "Þú settir inn athugasemd við %1$s",
+    "You commented on {file}" : "Þú settir inn athugasemd við {file}",
+    "%1$s commented on %2$s" : "%1$s setti inn athugasemd um %2$s",
+    "{author} commented on {file}" : "{author} setti inn athugasemd við {file}",
+    "<strong>Comments</strong> for files" : "<strong>Athugasemdir</strong> við skrár",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Minnst var á þig í “{file}”, í athugasemd frá notanda sem síðan þá hefur verið eytt",
+    "{user} mentioned you in a comment on “{file}”" : "{user} minntist á þig í athugasemd við “{file}”",
+    "Files app plugin to add comments to files" : "Viðbót við skráaforrit til að bæta athugasemdum við skrár",
     "Edit comment" : "Breyta athugasemd",
     "Delete comment" : "Eyða athugasemd",
     "New comment …" : "Ný athugasemd ...",
     "Post" : "Senda",
     "Cancel" : "Hætta við",
     "[Deleted user]" : "[Eyddur notandi]",
-    "Comments" : "Athugasemdir",
     "No comments yet, start the conversation!" : "Engar athugasemdir ennþá, byrjaðu umræðuna!",
     "More comments …" : "Fleiri athugasemdir ...",
     "Save" : "Vista",
@@ -17,20 +28,7 @@ OC.L10N.register(
     "Error occurred while posting comment" : "Villa kom upp við að senda inn athugasemd",
     "_%n unread comment_::_%n unread comments_" : ["%n ólesin athugasemd","%n ólesnar athugasemdir"],
     "Comment" : "Athugasemd",
-    "You commented" : "Þú settir inn athugasemd",
-    "%1$s commented" : "%1$s setti inn athugasemd",
-    "{author} commented" : "{author} setti inn athugasemd",
-    "You commented on %1$s" : "Þú settir inn athugasemd við %1$s",
-    "You commented on {file}" : "Þú settir inn athugasemd við {file}",
-    "%1$s commented on %2$s" : "%1$s setti inn athugasemd um %2$s",
-    "{author} commented on {file}" : "{author} setti inn athugasemd við {file}",
-    "<strong>Comments</strong> for files" : "<strong>Athugasemdir</strong> við skrár",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Minnst var á þig í “%s”, í athugasemd frá notanda sem síðan þá hefur verið eytt",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Minnst var á þig í “{file}”, í athugasemd frá notanda sem síðan þá hefur verið eytt",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s minntist á þig í athugasemd við “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} minntist á þig í athugasemd við “{file}”",
-    "Unknown user" : "Óþekktur notandi",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Notandi (sem nú er búið að eyða) minntist á þig í athugasemd við “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Notandi (sem nú er búið að eyða) minntist á þig í athugasemd við “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s minntist á þig í athugasemd við “%2$s”"
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");

apps/comments/l10n/is.json

@@ -1,11 +1,22 @@
 { "translations": {
+    "Comments" : "Athugasemdir",
+    "You commented" : "Þú settir inn athugasemd",
+    "%1$s commented" : "%1$s setti inn athugasemd",
+    "{author} commented" : "{author} setti inn athugasemd",
+    "You commented on %1$s" : "Þú settir inn athugasemd við %1$s",
+    "You commented on {file}" : "Þú settir inn athugasemd við {file}",
+    "%1$s commented on %2$s" : "%1$s setti inn athugasemd um %2$s",
+    "{author} commented on {file}" : "{author} setti inn athugasemd við {file}",
+    "<strong>Comments</strong> for files" : "<strong>Athugasemdir</strong> við skrár",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Minnst var á þig í “{file}”, í athugasemd frá notanda sem síðan þá hefur verið eytt",
+    "{user} mentioned you in a comment on “{file}”" : "{user} minntist á þig í athugasemd við “{file}”",
+    "Files app plugin to add comments to files" : "Viðbót við skráaforrit til að bæta athugasemdum við skrár",
     "Edit comment" : "Breyta athugasemd",
     "Delete comment" : "Eyða athugasemd",
     "New comment …" : "Ný athugasemd ...",
     "Post" : "Senda",
     "Cancel" : "Hætta við",
     "[Deleted user]" : "[Eyddur notandi]",
-    "Comments" : "Athugasemdir",
     "No comments yet, start the conversation!" : "Engar athugasemdir ennþá, byrjaðu umræðuna!",
     "More comments …" : "Fleiri athugasemdir ...",
     "Save" : "Vista",
@@ -15,20 +26,7 @@
     "Error occurred while posting comment" : "Villa kom upp við að senda inn athugasemd",
     "_%n unread comment_::_%n unread comments_" : ["%n ólesin athugasemd","%n ólesnar athugasemdir"],
     "Comment" : "Athugasemd",
-    "You commented" : "Þú settir inn athugasemd",
-    "%1$s commented" : "%1$s setti inn athugasemd",
-    "{author} commented" : "{author} setti inn athugasemd",
-    "You commented on %1$s" : "Þú settir inn athugasemd við %1$s",
-    "You commented on {file}" : "Þú settir inn athugasemd við {file}",
-    "%1$s commented on %2$s" : "%1$s setti inn athugasemd um %2$s",
-    "{author} commented on {file}" : "{author} setti inn athugasemd við {file}",
-    "<strong>Comments</strong> for files" : "<strong>Athugasemdir</strong> við skrár",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Minnst var á þig í “%s”, í athugasemd frá notanda sem síðan þá hefur verið eytt",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Minnst var á þig í “{file}”, í athugasemd frá notanda sem síðan þá hefur verið eytt",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s minntist á þig í athugasemd við “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} minntist á þig í athugasemd við “{file}”",
-    "Unknown user" : "Óþekktur notandi",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Notandi (sem nú er búið að eyða) minntist á þig í athugasemd við “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Notandi (sem nú er búið að eyða) minntist á þig í athugasemd við “{file}”"
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s minntist á þig í athugasemd við “%2$s”"
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }

apps/comments/l10n/it.js

@@ -1,13 +1,24 @@
 OC.L10N.register(
     "comments",
     {
+    "Comments" : "Commenti",
+    "You commented" : "Hai commentato",
+    "%1$s commented" : "%1$s ha commentato",
+    "{author} commented" : "{author} ha commentato",
+    "You commented on %1$s" : "Hai commentato su %1$s",
+    "You commented on {file}" : "Hai commentato su {file}",
+    "%1$s commented on %2$s" : "%1$s ha commentato %2$s",
+    "{author} commented on {file}" : "{author} ha commentato su {file}",
+    "<strong>Comments</strong> for files" : "<strong>Commenti</strong> sui file",
+    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Sei stato menzionato su \"{file}\", in un commento di un utente che è stato eliminato",
+    "{user} mentioned you in a comment on “{file}”" : "{user} ti ha menzionato in un commento su \"{file}\".",
+    "Files app plugin to add comments to files" : "Estensione dell'applicazione File per aggiungere commenti ai file",
     "Edit comment" : "Modifica commento",
     "Delete comment" : "Elimina commento",
     "New comment …" : "Nuovo commento...",
     "Post" : "Commento",
     "Cancel" : "Annulla",
     "[Deleted user]" : "[Utente eliminato]",
-    "Comments" : "Commenti",
     "No comments yet, start the conversation!" : "Ancora nessun commento, inizia la conversazione!",
     "More comments …" : "Altri commenti...",
     "Save" : "Salva",
@@ -17,21 +28,7 @@ OC.L10N.register(
     "Error occurred while posting comment" : "Si è verificato un errore durante la pubblicazione del commento.",
     "_%n unread comment_::_%n unread comments_" : ["%n commento non letto","%n commenti non letti"],
     "Comment" : "Commento",
-    "You commented" : "Hai commentato",
-    "%1$s commented" : "%1$s ha commentato",
-    "{author} commented" : "{author} ha commentato",
-    "You commented on %1$s" : "Hai commentato su %1$s",
-    "You commented on {file}" : "Hai commentato su {file}",
-    "%1$s commented on %2$s" : "%1$s ha commentato %2$s",
-    "{author} commented on {file}" : "{author} ha commentato su {file}",
-    "<strong>Comments</strong> for files" : "<strong>Commenti</strong> sui file",
     "You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Sei stato menzionato su \"%s\", in un commento di un utente che è stato eliminato",
-    "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Sei stato menzionato su \"{file}\", in un commento di un utente che è stato eliminato",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s ti ha menzionato in un commento su \"%2$s\"",
-    "{user} mentioned you in a comment on “{file}”" : "{user} ti ha menzionato in un commento su \"{file}\".",
-    "Files app plugin to add comments to files" : "Estensione dell'applicazione File per aggiungere commenti ai file",
-    "Unknown user" : "Utente sconosciuto",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un utente eliminato (ora) ti ha menzionato in un commento su \"%s\".",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un utente eliminato (ora) ti ha menzionato in un commento su \"{file}\"."
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s ti ha menzionato in un commento su \"%2$s\""
 },
 "nplurals=2; plural=(n != 1);");