Bump version

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

.drone.yml

@@ -247,6 +247,9 @@ pipeline:
     image: nextcloudci/integration-php7.0:integration-php7.0-3
     commands:
       - ./occ maintenance:install --admin-pass=admin
+      - ./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 testing
@@ -456,21 +459,21 @@ pipeline:
   acceptance-access-levels:
       image: nextcloudci/php7.0:php7.0-7
       commands:
-        - tests/acceptance/run-local.sh --timeout-multiplier 10 allow-git-repository-modifications features/access-levels.feature
+        - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-access-levels --selenium-server selenium:4444 allow-git-repository-modifications features/access-levels.feature
       when:
         matrix:
           TESTS-ACCEPTANCE: access-levels
   acceptance-app-files:
       image: nextcloudci/php7.0:php7.0-7
       commands:
-        - tests/acceptance/run-local.sh --timeout-multiplier 10 allow-git-repository-modifications features/app-files.feature
+        - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files --selenium-server selenium:4444 allow-git-repository-modifications features/app-files.feature
       when:
         matrix:
           TESTS-ACCEPTANCE: app-files
   acceptance-login:
       image: nextcloudci/php7.0:php7.0-7
       commands:
-        - tests/acceptance/run-local.sh --timeout-multiplier 10 allow-git-repository-modifications features/login.feature
+        - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-login --selenium-server selenium:4444 allow-git-repository-modifications features/login.feature
       when:
         matrix:
           TESTS-ACCEPTANCE: login
@@ -577,13 +580,13 @@ matrix:
     - TESTS: caldavtester-new-endpoint
     - TESTS: carddavtester-new-endpoint
     - TESTS: carddavtester-old-endpoint
-    - TESTS: object-store
-      OBJECT_STORE: s3
+#    - TESTS: object-store
+#      OBJECT_STORE: s3
     - TESTS: sqlite-php7.0-samba-native
     - TESTS: sqlite-php7.0-samba-non-native
     - TEST: memcache-memcached
-    - TEST: memcache-redis-cluster
-      ENABLE_REDIS_CLUSTER: true
+#    - TEST: memcache-redis-cluster
+#      ENABLE_REDIS_CLUSTER: true
     - TESTS: sqlite-php7.0-webdav-apache
       ENABLE_REDIS: true
     - DB: NODB
@@ -629,7 +632,7 @@ services:
     image: postgres
     environment:
       - POSTGRES_USER=oc_autotest
-      - POSTGRES_PASSWORD=oc_autotest
+      - POSTGRES_PASSWORD=owncloud
     when:
       matrix:
         DB: postgres

apps/admin_audit/lib/actions/files.php

@@ -65,6 +65,10 @@ class Files extends Action {
 	 * @param array $params
 	 */
 	public function create(array $params) {
+		if ($params['path'] === '/' || $params['path'] === '' || $params['path'] === null) {
+			return;
+		}
+
 		$this->log(
 			'File created: "%s"',
 			$params,
@@ -96,6 +100,10 @@ class Files extends Action {
 	 * @param array $params
 	 */
 	public function write(array $params) {
+		if ($params['path'] === '/' || $params['path'] === '' || $params['path'] === null) {
+			return;
+		}
+
 		$this->log(
 			'File written to: "%s"',
 			$params,

apps/comments/img/comments-dark.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32" viewBox="0 0 32 32"><path fill="#000" d="M16 3C7.163 3 0 7.925 0 14s7.163 11 16 11c.5 0 .98-.032 1.47-.063L26 32v-9.406c3.658-2.017 6-5.12 6-8.595 0-6.076-7.164-11-16-11z"/></svg>

apps/comments/l10n/af.js

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

apps/comments/l10n/af.json

@@ -0,0 +1,32 @@
+{ "translations": {
+    "Comments" : "Kommentare",
+    "Unknown user" : "Onbekende gebruiker",
+    "New comment …" : "Nuwe kommentaar…",
+    "Delete comment" : "Skrap kommentaar",
+    "Post" : "Plaas",
+    "Cancel" : "Kanselleer",
+    "Edit comment" : "Wysig kommentaar",
+    "[Deleted user]" : "[Geskrapte gebruiker]",
+    "No comments yet, start the conversation!" : "Nog geen kommentaar, begin die gesprek!",
+    "More comments …" : "Nog kommentare …",
+    "Save" : "Bewaar",
+    "Allowed characters {count} of {max}" : "Toegelate karakters {telling} van {maks}",
+    "Error occurred while retrieving comment with id {id}" : "’n Fout het voorgekom toe kommentaar met id {id} opgehaal is",
+    "Error occurred while updating comment with id {id}" : "’n Fout het voorgekom toe kommentaar met id {id} bygewerk is",
+    "Error occurred while posting comment" : "’n Fout het voorgekom toe kommentaar geplaas is",
+    "_%n unread comment_::_%n unread comments_" : ["%n ongeleesde kommentaar","%n ongeleeste kommentare"],
+    "Comment" : "Kommentaar",
+    "You commented" : "U het kommentaar gelewer",
+    "%1$s commented" : "%1$s het kommentaar gelewer",
+    "{author} commented" : "{outeur} het kommentaar gelewer",
+    "You commented on %1$s" : "U het op %1$s kommentaar gelewer",
+    "You commented on {file}" : "U het op {lêer} kommentaar gelewer",
+    "%1$s commented on %2$s" : "%1$s het op %2$s kommentaar gelewer",
+    "{author} commented on {file}" : "{outeur} het op {lêer} kommentaar gelewer",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> vir lêers",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "’n (Nou) geskrapte gebruiker het u in ’n kommentaar op “%s” genoem",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "’n (Nou) geskrapte gebruiker het u in ’n kommentaar op “{lêer}” genoem",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s het u in ’n kommentaar op “%2$s” genoem",
+    "{user} mentioned you in a comment on “{file}”" : "{gebruiker} het u in ’n kommentaar oor “{lêer}” genoem"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/comments/l10n/de.js

@@ -3,14 +3,14 @@ OC.L10N.register(
     {
     "Comments" : "Kommentare",
     "Unknown user" : "Unbekannter Benutzer",
-    "New comment …" : "Neuer Kommentar ...",
+    "New comment …" : "Neuer Kommentar …",
     "Delete comment" : "Kommentar löschen",
     "Post" : "Speichern",
     "Cancel" : "Abbrechen",
     "Edit comment" : "Kommentar bearbeiten",
     "[Deleted user]" : "[Gelöschter Benutzer]",
     "No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginne die Diskussion!",
-    "More comments …" : "Weitere Kommentare ...",
+    "More comments …" : "Weitere Kommentare…",
     "Save" : "Speichern",
     "Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}",
     "Error occurred while retrieving comment with id {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
@@ -19,16 +19,16 @@ OC.L10N.register(
     "_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
     "Comment" : "Kommentar",
     "You commented" : "Von Dir kommentiert",
-    "%1$s commented" : "%1$s kommentiert",
-    "{author} commented" : "{author} kommentiert",
+    "%1$s commented" : "%1$s kommentierte",
+    "{author} commented" : "{author} kommentierte",
     "You commented on %1$s" : "Du hast %1$s kommentiert",
     "You commented on {file}" : "Du hast {file} kommentiert",
     "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
     "{author} commented on {file}" : "{author} hat {file} kommentiert",
     "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Nutzer erwähnt dich in einem Kommentar zu \"%s\"",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Nutzer erwähnt dich in einem Kommentar zu “{file}”",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s erwähnt Dich in einem Kommentar zu “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} erwähnt Dich in einem Kommentar zu “{file}”"
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Benutzer hat Dich in einem Kommentar zu \"%s\" erwähnt",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Benutzer hat Dich in einem Kommentar zu “{file}” erwähnt",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Dich in einem Kommentar zu “%2$s” erwähnt ",
+    "{user} mentioned you in a comment on “{file}”" : "{user} hat Dich in einem Kommentar zu “{file}” erwähnt "
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/de.json

@@ -1,14 +1,14 @@
 { "translations": {
     "Comments" : "Kommentare",
     "Unknown user" : "Unbekannter Benutzer",
-    "New comment …" : "Neuer Kommentar ...",
+    "New comment …" : "Neuer Kommentar …",
     "Delete comment" : "Kommentar löschen",
     "Post" : "Speichern",
     "Cancel" : "Abbrechen",
     "Edit comment" : "Kommentar bearbeiten",
     "[Deleted user]" : "[Gelöschter Benutzer]",
     "No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginne die Diskussion!",
-    "More comments …" : "Weitere Kommentare ...",
+    "More comments …" : "Weitere Kommentare…",
     "Save" : "Speichern",
     "Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}",
     "Error occurred while retrieving comment with id {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
@@ -17,16 +17,16 @@
     "_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
     "Comment" : "Kommentar",
     "You commented" : "Von Dir kommentiert",
-    "%1$s commented" : "%1$s kommentiert",
-    "{author} commented" : "{author} kommentiert",
+    "%1$s commented" : "%1$s kommentierte",
+    "{author} commented" : "{author} kommentierte",
     "You commented on %1$s" : "Du hast %1$s kommentiert",
     "You commented on {file}" : "Du hast {file} kommentiert",
     "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
     "{author} commented on {file}" : "{author} hat {file} kommentiert",
     "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Nutzer erwähnt dich in einem Kommentar zu \"%s\"",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Nutzer erwähnt dich in einem Kommentar zu “{file}”",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s erwähnt Dich in einem Kommentar zu “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} erwähnt Dich in einem Kommentar zu “{file}”"
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Benutzer hat Dich in einem Kommentar zu \"%s\" erwähnt",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Benutzer hat Dich in einem Kommentar zu “{file}” erwähnt",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Dich in einem Kommentar zu “%2$s” erwähnt ",
+    "{user} mentioned you in a comment on “{file}”" : "{user} hat Dich in einem Kommentar zu “{file}” erwähnt "
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/de_DE.js

@@ -3,14 +3,14 @@ OC.L10N.register(
     {
     "Comments" : "Kommentare",
     "Unknown user" : "Unbekannter Benutzer",
-    "New comment …" : "Neuer Kommentar ...",
+    "New comment …" : "Neuer Kommentar …",
     "Delete comment" : "Kommentar löschen",
     "Post" : "Speichern",
     "Cancel" : "Abbrechen",
     "Edit comment" : "Kommentar bearbeiten",
     "[Deleted user]" : "[gelöschter Benutzer]",
     "No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginnen Sie die Diskussion!",
-    "More comments …" : "Weitere Kommentare ...",
+    "More comments …" : "Weitere Kommentare …",
     "Save" : "Speichern",
     "Allowed characters {count} of {max}" : "{count} von {max} Zeichen benutzt",
     "Error occurred while retrieving comment with id {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",

apps/comments/l10n/de_DE.json

@@ -1,14 +1,14 @@
 { "translations": {
     "Comments" : "Kommentare",
     "Unknown user" : "Unbekannter Benutzer",
-    "New comment …" : "Neuer Kommentar ...",
+    "New comment …" : "Neuer Kommentar …",
     "Delete comment" : "Kommentar löschen",
     "Post" : "Speichern",
     "Cancel" : "Abbrechen",
     "Edit comment" : "Kommentar bearbeiten",
     "[Deleted user]" : "[gelöschter Benutzer]",
     "No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginnen Sie die Diskussion!",
-    "More comments …" : "Weitere Kommentare ...",
+    "More comments …" : "Weitere Kommentare …",
     "Save" : "Speichern",
     "Allowed characters {count} of {max}" : "{count} von {max} Zeichen benutzt",
     "Error occurred while retrieving comment with id {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",

apps/comments/l10n/el.js

@@ -8,7 +8,7 @@ OC.L10N.register(
     "Post" : "Δημοσίευση",
     "Cancel" : "Ακύρωση",
     "Edit comment" : "Επεξεργασία σχολίου",
-    "[Deleted user]" : "[Διαγραφή χρήστη]",
+    "[Deleted user]" : "[Διαγραμμένος χρήστης]",
     "No comments yet, start the conversation!" : "Δεν υπάρχουν σχόλια, ξεκινήστε την συζήτηση!",
     "More comments …" : "Περισσότερα σχόλια ...",
     "Save" : "Αποθήκευση",

apps/comments/l10n/el.json

@@ -6,7 +6,7 @@
     "Post" : "Δημοσίευση",
     "Cancel" : "Ακύρωση",
     "Edit comment" : "Επεξεργασία σχολίου",
-    "[Deleted user]" : "[Διαγραφή χρήστη]",
+    "[Deleted user]" : "[Διαγραμμένος χρήστης]",
     "No comments yet, start the conversation!" : "Δεν υπάρχουν σχόλια, ξεκινήστε την συζήτηση!",
     "More comments …" : "Περισσότερα σχόλια ...",
     "Save" : "Αποθήκευση",

apps/comments/l10n/es_AR.js

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

apps/comments/l10n/es_AR.json

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

apps/comments/l10n/es_MX.js

@@ -3,13 +3,13 @@ OC.L10N.register(
     {
     "Comments" : "Comentarios",
     "Unknown user" : "Usuario desconocido",
-    "New comment …" : "Nuevo comentario ...",
+    "New comment …" : "Comentario nuevo ...",
     "Delete comment" : "Borrar comentario",
     "Post" : "Publicar",
     "Cancel" : "Cancelar",
     "Edit comment" : "Editar comentario",
     "[Deleted user]" : "[Usuario borrado]",
-    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicie la conversación!",
+    "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}",
@@ -18,17 +18,17 @@ 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" : "Usted comentó",
+    "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}" : "Usted comentó en {file}",
+    "You commented on {file}" : "Hiciste un comentario de {file}",
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{author} comentó en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado lo mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado lo mencionó en un commentario en “{file}”",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s lo mencionó en un comentario en “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} lo menciono en un comentario en “{file}”"
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/es_MX.json

@@ -1,13 +1,13 @@
 { "translations": {
     "Comments" : "Comentarios",
     "Unknown user" : "Usuario desconocido",
-    "New comment …" : "Nuevo comentario ...",
+    "New comment …" : "Comentario nuevo ...",
     "Delete comment" : "Borrar comentario",
     "Post" : "Publicar",
     "Cancel" : "Cancelar",
     "Edit comment" : "Editar comentario",
     "[Deleted user]" : "[Usuario borrado]",
-    "No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicie la conversación!",
+    "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}",
@@ -16,17 +16,17 @@
     "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" : "Usted comentó",
+    "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}" : "Usted comentó en {file}",
+    "You commented on {file}" : "Hiciste un comentario de {file}",
     "%1$s commented on %2$s" : "%1$s comentó en %2$s",
     "{author} commented on {file}" : "{author} comentó en {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado lo mencionó en un commentario en “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado lo mencionó en un commentario en “{file}”",
-    "%1$s mentioned you in a comment on “%2$s”" : "%1$s lo mencionó en un comentario en “%2$s”",
-    "{user} mentioned you in a comment on “{file}”" : "{user} lo menciono en un comentario en “{file}”"
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
+    "{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/gl.js

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

apps/comments/l10n/gl.json

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

apps/comments/l10n/lt_LT.js

@@ -1,8 +1,34 @@
 OC.L10N.register(
     "comments",
     {
-    "Cancel" : "Atšaukti",
-    "Save" : "Išsaugoti",
-    "Comment" : "Komentaras"
+    "Comments" : "Komentarai",
+    "Unknown user" : "Nežinomas naudotojas",
+    "New comment …" : "Naujas komentaras …",
+    "Delete comment" : "Ištrinti komentarą",
+    "Post" : "Įrašas",
+    "Cancel" : "Atsisakyti",
+    "Edit comment" : "Redaguoti komentarą",
+    "[Deleted user]" : "[Ištrintas naudotojas]",
+    "No comments yet, start the conversation!" : "Kol kas komentarų nėra, pradėkite pokalbį!",
+    "More comments …" : "Daugiau komentarų …",
+    "Save" : "Įrašyti",
+    "Allowed characters {count} of {max}" : "Leidžiama simbolių {count} iš {max}",
+    "Error occurred while retrieving comment with id {id}" : "Klaida bandant parodyti komentarą pagal identifikavimo numerį {id}",
+    "Error occurred while updating comment with id {id}" : "Klaida bandant pataisyti komentarą pagal identifikavimo numerį {id}",
+    "Error occurred while posting comment" : "Skelbiant komentarą, įvyko klaida",
+    "_%n unread comment_::_%n unread comments_" : ["%n neskaitytas komentaras","%n neskaityti komentarai","%n neskaitytų komentarų"],
+    "Comment" : "Komentaras",
+    "You commented" : "Jūs pakomentavote",
+    "%1$s commented" : "%1$s pakomentavo",
+    "{author} commented" : "{author} pakomentavo",
+    "You commented on %1$s" : "Pakomentavote %1$s",
+    "You commented on {file}" : "Pakomentavote {file}",
+    "%1$s commented on %2$s" : "%1$s pakomentavo %2$s",
+    "{author} commented on {file}" : "{author} pakomentavo {file}",
+    "<strong>Comments</strong> for files" : "<strong>Failų komentarai</strong>",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Ištrintas vartotojas paminėjo jus komentare \"%s\"",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ištrintas vartotojas paminėjo jus komentare \"{file}\"",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s paminėjo jus komentare \"%2$s\"",
+    "{user} mentioned you in a comment on “{file}”" : "{user} paminėjo jus komentare “{file}”"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);");

apps/comments/l10n/lt_LT.json

@@ -1,6 +1,32 @@
 { "translations": {
-    "Cancel" : "Atšaukti",
-    "Save" : "Išsaugoti",
-    "Comment" : "Komentaras"
+    "Comments" : "Komentarai",
+    "Unknown user" : "Nežinomas naudotojas",
+    "New comment …" : "Naujas komentaras …",
+    "Delete comment" : "Ištrinti komentarą",
+    "Post" : "Įrašas",
+    "Cancel" : "Atsisakyti",
+    "Edit comment" : "Redaguoti komentarą",
+    "[Deleted user]" : "[Ištrintas naudotojas]",
+    "No comments yet, start the conversation!" : "Kol kas komentarų nėra, pradėkite pokalbį!",
+    "More comments …" : "Daugiau komentarų …",
+    "Save" : "Įrašyti",
+    "Allowed characters {count} of {max}" : "Leidžiama simbolių {count} iš {max}",
+    "Error occurred while retrieving comment with id {id}" : "Klaida bandant parodyti komentarą pagal identifikavimo numerį {id}",
+    "Error occurred while updating comment with id {id}" : "Klaida bandant pataisyti komentarą pagal identifikavimo numerį {id}",
+    "Error occurred while posting comment" : "Skelbiant komentarą, įvyko klaida",
+    "_%n unread comment_::_%n unread comments_" : ["%n neskaitytas komentaras","%n neskaityti komentarai","%n neskaitytų komentarų"],
+    "Comment" : "Komentaras",
+    "You commented" : "Jūs pakomentavote",
+    "%1$s commented" : "%1$s pakomentavo",
+    "{author} commented" : "{author} pakomentavo",
+    "You commented on %1$s" : "Pakomentavote %1$s",
+    "You commented on {file}" : "Pakomentavote {file}",
+    "%1$s commented on %2$s" : "%1$s pakomentavo %2$s",
+    "{author} commented on {file}" : "{author} pakomentavo {file}",
+    "<strong>Comments</strong> for files" : "<strong>Failų komentarai</strong>",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Ištrintas vartotojas paminėjo jus komentare \"%s\"",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Ištrintas vartotojas paminėjo jus komentare \"{file}\"",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s paminėjo jus komentare \"%2$s\"",
+    "{user} mentioned you in a comment on “{file}”" : "{user} paminėjo jus komentare “{file}”"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }

apps/comments/l10n/mn.js

@@ -1,6 +1,32 @@
 OC.L10N.register(
     "comments",
     {
-    "Save" : "Хадгалах"
+    "Comments" : "Сэтгэгдэл",
+    "Unknown user" : "  хэрэглэгч",
+    "New comment …" : "Шинэ сэтгэгдэл",
+    "Delete comment" : "Сэтгэгдэл устгах",
+    "Post" : "Нийтлэл",
+    "Cancel" : "Цуцлах",
+    "Edit comment" : "Сэтгэгдэл засах",
+    "[Deleted user]" : "[Хэрэглэгч устгагдсан]",
+    "No comments yet, start the conversation!" : "Сэтгэгдэл байхгүй байна",
+    "More comments …" : "Дараагийн сэтгэгдэлүүд",
+    "Save" : "Хадгалах",
+    "Allowed characters {count} of {max}" : "{max} боломжойгоос {count} тэмдэгт орсон байна",
+    "Error occurred while retrieving comment with id {id}" : "{id} дугаартай сэтгэгдлийг авахад алдаа гарлаа",
+    "Error occurred while updating comment with id {id}" : "{id} дугаартай сэтгэгдлийг шинэчилэхэд алдаа гарлаа",
+    "Error occurred while posting comment" : "Сэтгэгдлийг хадгалахад алдаа гарлаа",
+    "Comment" : "Сэтгэгдэл",
+    "You commented" : "Та сэтгэгдэл бичсэн байна",
+    "%1$s commented" : "%1$s сэтгэгдэл бичсэн",
+    "{author} commented" : "{author} сэтгэгдэл бичсэн",
+    "You commented on %1$s" : "Та %1$s нийтлэл дээр сэтгэгдэл бичсэн байна",
+    "You commented on {file}" : "Та {file} сэтгэгдэл бичсэн байна",
+    "%1$s commented on %2$s" : "%1$s нь %2$s-д сэтгэгдэл бичсэн",
+    "{author} commented on {file}" : "{author} нь {file}-д сэтгэгдэл бичсэн",
+    "<strong>Comments</strong> for files" : "Файлууд дахь<strong>Сэтгэгдэлүүд</strong>",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s нь таныг “%2$s”-ы сэтгэгдэлд дурдсан",
+    "{user} mentioned you in a comment on “{file}”" : "{user} нь таныг “{file}”-ын сэтгэгдэлд дурдсан"
 },
 "nplurals=2; plural=(n != 1);");

apps/comments/l10n/mn.json

@@ -1,4 +1,30 @@
 { "translations": {
-    "Save" : "Хадгалах"
+    "Comments" : "Сэтгэгдэл",
+    "Unknown user" : "  хэрэглэгч",
+    "New comment …" : "Шинэ сэтгэгдэл",
+    "Delete comment" : "Сэтгэгдэл устгах",
+    "Post" : "Нийтлэл",
+    "Cancel" : "Цуцлах",
+    "Edit comment" : "Сэтгэгдэл засах",
+    "[Deleted user]" : "[Хэрэглэгч устгагдсан]",
+    "No comments yet, start the conversation!" : "Сэтгэгдэл байхгүй байна",
+    "More comments …" : "Дараагийн сэтгэгдэлүүд",
+    "Save" : "Хадгалах",
+    "Allowed characters {count} of {max}" : "{max} боломжойгоос {count} тэмдэгт орсон байна",
+    "Error occurred while retrieving comment with id {id}" : "{id} дугаартай сэтгэгдлийг авахад алдаа гарлаа",
+    "Error occurred while updating comment with id {id}" : "{id} дугаартай сэтгэгдлийг шинэчилэхэд алдаа гарлаа",
+    "Error occurred while posting comment" : "Сэтгэгдлийг хадгалахад алдаа гарлаа",
+    "Comment" : "Сэтгэгдэл",
+    "You commented" : "Та сэтгэгдэл бичсэн байна",
+    "%1$s commented" : "%1$s сэтгэгдэл бичсэн",
+    "{author} commented" : "{author} сэтгэгдэл бичсэн",
+    "You commented on %1$s" : "Та %1$s нийтлэл дээр сэтгэгдэл бичсэн байна",
+    "You commented on {file}" : "Та {file} сэтгэгдэл бичсэн байна",
+    "%1$s commented on %2$s" : "%1$s нь %2$s-д сэтгэгдэл бичсэн",
+    "{author} commented on {file}" : "{author} нь {file}-д сэтгэгдэл бичсэн",
+    "<strong>Comments</strong> for files" : "Файлууд дахь<strong>Сэтгэгдэлүүд</strong>",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s нь таныг “%2$s”-ы сэтгэгдэлд дурдсан",
+    "{user} mentioned you in a comment on “{file}”" : "{user} нь таныг “{file}”-ын сэтгэгдэлд дурдсан"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/comments/l10n/pl.js

@@ -31,4 +31,4 @@ OC.L10N.register(
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s wspomniał/-a o Tobie w komentarzu “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} wspomniał/-a o Tobie w komentarzu “{file}”"
 },
-"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);");
+"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);");

apps/comments/l10n/pl.json

@@ -28,5 +28,5 @@
     "A (now) deleted user mentioned you in a comment on “{file}”" : "Pewien (obecnie) usunięty użytkownik wspomniał o Tobie w komentarzu “{file}”",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s wspomniał/-a o Tobie w komentarzu “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} wspomniał/-a o Tobie w komentarzu “{file}”"
-},"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"
+},"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"
 }

apps/comments/l10n/pt_BR.js

@@ -15,19 +15,19 @@ OC.L10N.register(
     "Allowed characters {count} of {max}" : "{count} de {max} caracteres permitidos",
     "Error occurred while retrieving comment with id {id}" : "Ocorreu um erro durante a recuperação do comentário com id {id}",
     "Error occurred while updating comment with id {id}" : "Ocorreu um erro durante a atualização do comentário com id {id}",
-    "Error occurred while posting comment" : "Ocorreu um erro durante a postagem do comentário",
+    "Error occurred while posting comment" : "Ocorreu um erro ao postar o  comentário",
     "_%n unread comment_::_%n unread comments_" : ["%n comentários não lidos","%n comentários não lidos"],
     "Comment" : "Comentar",
     "You commented" : "Você comentou",
-    "%1$s commented" : "%1$s comentaram",
+    "%1$s commented" : "%1$s comentou",
     "{author} commented" : "{author} comentou",
     "You commented on %1$s" : "Você comentou em %1$s",
     "You commented on {file}" : "Você comentou sobre {file}",
     "%1$s commented on %2$s" : "%1$s comentaram em %2$s",
     "{author} commented on {file}" : "{author} comentou em {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentários</strong> para arquivos",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Um usuário excluído agora mencionou você em um comentário sobre “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Um usuário recém excluído mencionou você em um comentário sobre “{file}”",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Um usuário excluído (agora) mencionou você em um comentário sobre “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Um usuário (now)  recém excluído mencionou você em um comentário sobre “{file}”",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s mencionou você em um comentário sobre “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} mencionou você em um comentário sobre “{file}”"
 },

apps/comments/l10n/pt_BR.json

@@ -13,19 +13,19 @@
     "Allowed characters {count} of {max}" : "{count} de {max} caracteres permitidos",
     "Error occurred while retrieving comment with id {id}" : "Ocorreu um erro durante a recuperação do comentário com id {id}",
     "Error occurred while updating comment with id {id}" : "Ocorreu um erro durante a atualização do comentário com id {id}",
-    "Error occurred while posting comment" : "Ocorreu um erro durante a postagem do comentário",
+    "Error occurred while posting comment" : "Ocorreu um erro ao postar o  comentário",
     "_%n unread comment_::_%n unread comments_" : ["%n comentários não lidos","%n comentários não lidos"],
     "Comment" : "Comentar",
     "You commented" : "Você comentou",
-    "%1$s commented" : "%1$s comentaram",
+    "%1$s commented" : "%1$s comentou",
     "{author} commented" : "{author} comentou",
     "You commented on %1$s" : "Você comentou em %1$s",
     "You commented on {file}" : "Você comentou sobre {file}",
     "%1$s commented on %2$s" : "%1$s comentaram em %2$s",
     "{author} commented on {file}" : "{author} comentou em {file}",
     "<strong>Comments</strong> for files" : "<strong>Comentários</strong> para arquivos",
-    "A (now) deleted user mentioned you in a comment on “%s”" : "Um usuário excluído agora mencionou você em um comentário sobre “%s”",
-    "A (now) deleted user mentioned you in a comment on “{file}”" : "Um usuário recém excluído mencionou você em um comentário sobre “{file}”",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Um usuário excluído (agora) mencionou você em um comentário sobre “%s”",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Um usuário (now)  recém excluído mencionou você em um comentário sobre “{file}”",
     "%1$s mentioned you in a comment on “%2$s”" : "%1$s mencionou você em um comentário sobre “%2$s”",
     "{user} mentioned you in a comment on “{file}”" : "{user} mencionou você em um comentário sobre “{file}”"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"

apps/comments/l10n/sk.js

@@ -25,6 +25,10 @@ OC.L10N.register(
     "You commented on {file}" : "Komentovali ste {file}",
     "%1$s commented on %2$s" : "%1$s komentoval %2$s",
     "{author} commented on {file}" : "{author} komentoval {file}",
-    "<strong>Comments</strong> for files" : "<strong>Komentáre</strong> pre súbory"
+    "<strong>Comments</strong> for files" : "<strong>Komentáre</strong> pre súbory",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Teraz už odstránený používateľ vás spomenul v komentári k \"%s\"",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Teraz už odstránený používateľ vás spomenul v komentári k \"{file}\"",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s vás spomenul v komentári k \"%2$s\"",
+    "{user} mentioned you in a comment on “{file}”" : "{user} vás spomenul v komentári k “{file}”"
 },
 "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");

apps/comments/l10n/sk.json

@@ -23,6 +23,10 @@
     "You commented on {file}" : "Komentovali ste {file}",
     "%1$s commented on %2$s" : "%1$s komentoval %2$s",
     "{author} commented on {file}" : "{author} komentoval {file}",
-    "<strong>Comments</strong> for files" : "<strong>Komentáre</strong> pre súbory"
+    "<strong>Comments</strong> for files" : "<strong>Komentáre</strong> pre súbory",
+    "A (now) deleted user mentioned you in a comment on “%s”" : "Teraz už odstránený používateľ vás spomenul v komentári k \"%s\"",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "Teraz už odstránený používateľ vás spomenul v komentári k \"{file}\"",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s vás spomenul v komentári k \"%2$s\"",
+    "{user} mentioned you in a comment on “{file}”" : "{user} vás spomenul v komentári k “{file}”"
 },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
 }

apps/comments/l10n/tr.js

@@ -13,9 +13,9 @@ OC.L10N.register(
     "More comments …" : "Diğer yorumlar ...",
     "Save" : "Kaydet",
     "Allowed characters {count} of {max}" : "Yazılabilecek karakter sayısı {count}/{max}",
-    "Error occurred while retrieving comment with id {id}" : "{id} kodlu yorum alınırken bir sorun çıktı",
-    "Error occurred while updating comment with id {id}" : "{id} kodlu yorum güncellenirken bir sorun çıktı",
-    "Error occurred while posting comment" : "Yorum gönderilirken bir sorun çıktı",
+    "Error occurred while retrieving comment with id {id}" : "{id} kodlu yorum alınırken sorun çıktı",
+    "Error occurred while updating comment with id {id}" : "{id} kodlu yorum güncellenirken sorun çıktı",
+    "Error occurred while posting comment" : "Yorum gönderilirken sorun çıktı",
     "_%n unread comment_::_%n unread comments_" : ["%n okunmamış yorum","%n okunmamış yorum"],
     "Comment" : "Yorum",
     "You commented" : "Yorum yaptınız",

apps/comments/l10n/tr.json

@@ -11,9 +11,9 @@
     "More comments …" : "Diğer yorumlar ...",
     "Save" : "Kaydet",
     "Allowed characters {count} of {max}" : "Yazılabilecek karakter sayısı {count}/{max}",
-    "Error occurred while retrieving comment with id {id}" : "{id} kodlu yorum alınırken bir sorun çıktı",
-    "Error occurred while updating comment with id {id}" : "{id} kodlu yorum güncellenirken bir sorun çıktı",
-    "Error occurred while posting comment" : "Yorum gönderilirken bir sorun çıktı",
+    "Error occurred while retrieving comment with id {id}" : "{id} kodlu yorum alınırken sorun çıktı",
+    "Error occurred while updating comment with id {id}" : "{id} kodlu yorum güncellenirken sorun çıktı",
+    "Error occurred while posting comment" : "Yorum gönderilirken sorun çıktı",
     "_%n unread comment_::_%n unread comments_" : ["%n okunmamış yorum","%n okunmamış yorum"],
     "Comment" : "Yorum",
     "You commented" : "Yorum yaptınız",

apps/comments/l10n/zh_TW.js

@@ -2,6 +2,7 @@ OC.L10N.register(
     "comments",
     {
     "Comments" : "留言",
+    "Unknown user" : "未知的使用者",
     "New comment …" : "新留言…",
     "Delete comment" : "刪除留言",
     "Post" : "送出",
@@ -17,14 +18,17 @@ OC.L10N.register(
     "Error occurred while posting comment" : "張貼留言出錯",
     "_%n unread comment_::_%n unread comments_" : ["%n 未讀留言"],
     "Comment" : "留言",
-    "You commented" : "您已留言",
+    "You commented" : "你已留言",
     "%1$s commented" : "%1$s 留言",
+    "{author} commented" : "{author} 已留言",
+    "You commented on %1$s" : "你對 %1$s 留言",
+    "You commented on {file}" : "你對 {file} 留言",
     "%1$s commented on %2$s" : "%1$s 在 %2$s 留言",
+    "{author} commented on {file}" : "{author} 對 {file} 留言",
     "<strong>Comments</strong> for files" : "檔案的<strong>留言</strong>",
-    "Type in a new comment..." : "輸入新留言…",
-    "No other comments available" : "沒有其他留言",
-    "More comments..." : "其他留言…",
-    "{count} unread comments" : "{count} 則未讀留言",
-    "You commented on %2$s" : "您對 %2$s 留言"
+    "A (now) deleted user mentioned you in a comment on “%s”" : "用戶(被刪除)在 “%s” 留言中提到你",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "用戶(被刪除)在 “{file}” 留言中提到你",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s 在 “%2$s” 的留言中提到你",
+    "{user} mentioned you in a comment on “{file}”" : "{user} 在 “{file}” 的留言中提到你"
 },
 "nplurals=1; plural=0;");

apps/comments/l10n/zh_TW.json

@@ -1,5 +1,6 @@
 { "translations": {
     "Comments" : "留言",
+    "Unknown user" : "未知的使用者",
     "New comment …" : "新留言…",
     "Delete comment" : "刪除留言",
     "Post" : "送出",
@@ -15,14 +16,17 @@
     "Error occurred while posting comment" : "張貼留言出錯",
     "_%n unread comment_::_%n unread comments_" : ["%n 未讀留言"],
     "Comment" : "留言",
-    "You commented" : "您已留言",
+    "You commented" : "你已留言",
     "%1$s commented" : "%1$s 留言",
+    "{author} commented" : "{author} 已留言",
+    "You commented on %1$s" : "你對 %1$s 留言",
+    "You commented on {file}" : "你對 {file} 留言",
     "%1$s commented on %2$s" : "%1$s 在 %2$s 留言",
+    "{author} commented on {file}" : "{author} 對 {file} 留言",
     "<strong>Comments</strong> for files" : "檔案的<strong>留言</strong>",
-    "Type in a new comment..." : "輸入新留言…",
-    "No other comments available" : "沒有其他留言",
-    "More comments..." : "其他留言…",
-    "{count} unread comments" : "{count} 則未讀留言",
-    "You commented on %2$s" : "您對 %2$s 留言"
+    "A (now) deleted user mentioned you in a comment on “%s”" : "用戶(被刪除)在 “%s” 留言中提到你",
+    "A (now) deleted user mentioned you in a comment on “{file}”" : "用戶(被刪除)在 “{file}” 留言中提到你",
+    "%1$s mentioned you in a comment on “%2$s”" : "%1$s 在 “%2$s” 的留言中提到你",
+    "{user} mentioned you in a comment on “{file}”" : "{user} 在 “{file}” 的留言中提到你"
 },"pluralForm" :"nplurals=1; plural=0;"
 }

apps/comments/lib/Activity/Provider.php

@@ -87,7 +87,11 @@ class Provider implements IProvider {
 
 		if ($event->getSubject() === 'add_comment_subject') {
 			$this->parseMessage($event);
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')));
+			if ($this->activityManager->getRequirePNG()) {
+				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.png')));
+			} else {
+				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/comment.svg')));
+			}
 
 			if ($this->activityManager->isFormattingFilteredObject()) {
 				try {

apps/dav/appinfo/v1/publicwebdav.php

@@ -79,10 +79,12 @@ $server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, funct
 	\OC\Files\Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
 		return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => $share->getPermissions() | \OCP\Constants::PERMISSION_SHARE));
 	});
+
 	\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
 
+	OC_Util::tearDownFS();
 	OC_Util::setupFS($owner);
-	$ownerView = \OC\Files\Filesystem::getView();
+	$ownerView = new \OC\Files\View('/'. $owner . '/files');
 	$path = $ownerView->getPath($fileId);
 	$fileInfo = $ownerView->getFileInfo($path);
 	$linkCheckPlugin->setFileInfo($fileInfo);

apps/dav/l10n/da.js

@@ -0,0 +1,50 @@
+OC.L10N.register(
+    "dav",
+    {
+    "Calendar" : "Kalender",
+    "Todos" : "Opgaver",
+    "{actor} created calendar {calendar}" : "{actor} oprettede kalenderen {calendar}",
+    "You created calendar {calendar}" : "Du oprettede kalenderen {calendar}",
+    "{actor} deleted calendar {calendar}" : "{actor} sletede kalenderen {calendar}",
+    "You deleted calendar {calendar}" : "Du slettede kalenderen {calendar}",
+    "{actor} updated calendar {calendar}" : "{actor} opdaterede kalenderen {calendar}",
+    "You updated calendar {calendar}" : "Du opdaterede kalenderen {calendar}",
+    "{actor} shared calendar {calendar} with you" : "{actor} delte kalenderen {calendar} med dig",
+    "You shared calendar {calendar} with {user}" : "Du delte kalenderen {calendar} med {user}",
+    "{actor} shared calendar {calendar} with {user}" : "{actor} delte kalenderen {calendar} med {user}",
+    "{actor} unshared calendar {calendar} from you" : "{actor} fjernede delingen af  {calendar} fra dig",
+    "You unshared calendar {calendar} from {user}" : "Du fjernede delingen af {calendar} fra {user}",
+    "{actor} unshared calendar {calendar} from {user}" : "{actor} fjernede delingen af {calendar} fra {user}",
+    "{actor} unshared calendar {calendar} from themselves" : "{actor} fjernede delingen af {calendar} fra sig selv",
+    "You shared calendar {calendar} with group {group}" : "Du delte kalenderen {calendar} med gruppen {group}",
+    "{actor} shared calendar {calendar} with group {group}" : "{actor} delte kalenderen {calendar} med gruppen {group}",
+    "You unshared calendar {calendar} from group {group}" : "Du fjernede delingen af  {calendar} fra gruppen {group}",
+    "{actor} unshared calendar {calendar} from group {group}" : "{actor} fjernede deling af kalenderen {calendar} fra gruppen {group}",
+    "{actor} created event {event} in calendar {calendar}" : "{actor} oprettede begivenheden {event} i kalenderen {calendar}",
+    "You created event {event} in calendar {calendar}" : "Du oprettede begivenheden {event} i kalenderen {calendar}",
+    "{actor} deleted event {event} from calendar {calendar}" : "{actor} slettede begivenheden {event} fra kalenderen {calendar}",
+    "You deleted event {event} from calendar {calendar}" : "Du slettede begivenheden {event} fra kalenderen {calendar}",
+    "{actor} updated event {event} in calendar {calendar}" : "{actor} opdaterede begivenheden {event} i kalenderen {calendar}",
+    "You updated event {event} in calendar {calendar}" : "Du opdaterede begivenheden {event} i kalenderen {calendar}",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} oprettede en opgave {todo} i listen {calendar}",
+    "You created todo {todo} in list {calendar}" : "Du oprettede opgaven {todo} i listen {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} slettede opgaven {todo} fra listen {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Du slettede opgaven {todo} fra listen {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} opdaterede opgaven {todo} i listen {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Du opdaterede opgaven {todo} i listen {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} løste opgaven {todo} i listen {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Du løste opgaven {todo} i listen {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} genåbnede opgaven {todo} i listen {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Du genåbnede opgaven {todo} i listen {calendar}",
+    "A <strong>calendar</strong> was modified" : "En <strong>kalender</strong> er blevet ændret",
+    "A calendar <strong>event</strong> was modified" : "En kalender <strong>begivenhed</strong> er blevet ændret",
+    "A calendar <strong>todo</strong> was modified" : "En kalender  <strong>opgave</strong> blev ændret",
+    "Contact birthdays" : "Kontakt fødselsdag",
+    "Personal" : "Personligt",
+    "Contacts" : "Kontakter",
+    "WebDAV" : "WebDAV",
+    "Technical details" : "Tekniske detaljer",
+    "Remote Address: %s" : "Fjernadresse: %s",
+    "Request ID: %s" : "Forespørgsels-ID: %s"
+},
+"nplurals=2; plural=(n != 1);");

apps/dav/l10n/da.json

@@ -0,0 +1,48 @@
+{ "translations": {
+    "Calendar" : "Kalender",
+    "Todos" : "Opgaver",
+    "{actor} created calendar {calendar}" : "{actor} oprettede kalenderen {calendar}",
+    "You created calendar {calendar}" : "Du oprettede kalenderen {calendar}",
+    "{actor} deleted calendar {calendar}" : "{actor} sletede kalenderen {calendar}",
+    "You deleted calendar {calendar}" : "Du slettede kalenderen {calendar}",
+    "{actor} updated calendar {calendar}" : "{actor} opdaterede kalenderen {calendar}",
+    "You updated calendar {calendar}" : "Du opdaterede kalenderen {calendar}",
+    "{actor} shared calendar {calendar} with you" : "{actor} delte kalenderen {calendar} med dig",
+    "You shared calendar {calendar} with {user}" : "Du delte kalenderen {calendar} med {user}",
+    "{actor} shared calendar {calendar} with {user}" : "{actor} delte kalenderen {calendar} med {user}",
+    "{actor} unshared calendar {calendar} from you" : "{actor} fjernede delingen af  {calendar} fra dig",
+    "You unshared calendar {calendar} from {user}" : "Du fjernede delingen af {calendar} fra {user}",
+    "{actor} unshared calendar {calendar} from {user}" : "{actor} fjernede delingen af {calendar} fra {user}",
+    "{actor} unshared calendar {calendar} from themselves" : "{actor} fjernede delingen af {calendar} fra sig selv",
+    "You shared calendar {calendar} with group {group}" : "Du delte kalenderen {calendar} med gruppen {group}",
+    "{actor} shared calendar {calendar} with group {group}" : "{actor} delte kalenderen {calendar} med gruppen {group}",
+    "You unshared calendar {calendar} from group {group}" : "Du fjernede delingen af  {calendar} fra gruppen {group}",
+    "{actor} unshared calendar {calendar} from group {group}" : "{actor} fjernede deling af kalenderen {calendar} fra gruppen {group}",
+    "{actor} created event {event} in calendar {calendar}" : "{actor} oprettede begivenheden {event} i kalenderen {calendar}",
+    "You created event {event} in calendar {calendar}" : "Du oprettede begivenheden {event} i kalenderen {calendar}",
+    "{actor} deleted event {event} from calendar {calendar}" : "{actor} slettede begivenheden {event} fra kalenderen {calendar}",
+    "You deleted event {event} from calendar {calendar}" : "Du slettede begivenheden {event} fra kalenderen {calendar}",
+    "{actor} updated event {event} in calendar {calendar}" : "{actor} opdaterede begivenheden {event} i kalenderen {calendar}",
+    "You updated event {event} in calendar {calendar}" : "Du opdaterede begivenheden {event} i kalenderen {calendar}",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} oprettede en opgave {todo} i listen {calendar}",
+    "You created todo {todo} in list {calendar}" : "Du oprettede opgaven {todo} i listen {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} slettede opgaven {todo} fra listen {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Du slettede opgaven {todo} fra listen {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} opdaterede opgaven {todo} i listen {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Du opdaterede opgaven {todo} i listen {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} løste opgaven {todo} i listen {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Du løste opgaven {todo} i listen {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} genåbnede opgaven {todo} i listen {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Du genåbnede opgaven {todo} i listen {calendar}",
+    "A <strong>calendar</strong> was modified" : "En <strong>kalender</strong> er blevet ændret",
+    "A calendar <strong>event</strong> was modified" : "En kalender <strong>begivenhed</strong> er blevet ændret",
+    "A calendar <strong>todo</strong> was modified" : "En kalender  <strong>opgave</strong> blev ændret",
+    "Contact birthdays" : "Kontakt fødselsdag",
+    "Personal" : "Personligt",
+    "Contacts" : "Kontakter",
+    "WebDAV" : "WebDAV",
+    "Technical details" : "Tekniske detaljer",
+    "Remote Address: %s" : "Fjernadresse: %s",
+    "Request ID: %s" : "Forespørgsels-ID: %s"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/dav/l10n/de.js

@@ -9,10 +9,10 @@ OC.L10N.register(
     "You deleted calendar {calendar}" : "Du hast den Kalender {calendar} gelöscht",
     "{actor} updated calendar {calendar}" : "{actor} hat den Kalender {calendar} aktualisiert",
     "You updated calendar {calendar}" : "Du hast den Kalender {calendar} aktualisiert",
-    "{actor} shared calendar {calendar} with you" : "{actor} hat den Kalender {calendar} mit dir geteilt",
+    "{actor} shared calendar {calendar} with you" : "{actor} hat den Kalender {calendar} mit Dir geteilt",
     "You shared calendar {calendar} with {user}" : "Du hast den Kalender {calendar} mit {user} geteilt",
     "{actor} shared calendar {calendar} with {user}" : "{actor} hat den Kalender {calendar} mit {user} geteilt",
-    "{actor} unshared calendar {calendar} from you" : "{actor} teilt den Kalender {calendar} nicht mehr mit dir",
+    "{actor} unshared calendar {calendar} from you" : "{actor} teilt den Kalender {calendar} nicht mehr mit Dir",
     "You unshared calendar {calendar} from {user}" : "Du teilst den Kalender {calendar} nicht mehr mit {user}",
     "{actor} unshared calendar {calendar} from {user}" : "{actor} teilt den Kalender {calendar} nicht mehr mit {user}",
     "{actor} unshared calendar {calendar} from themselves" : "{actor} teilt den Kalender {calendar} nicht mehr mit sich selbst",
@@ -34,17 +34,17 @@ OC.L10N.register(
     "You updated todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} aktualisiert",
     "{actor} solved todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} erledigt",
     "You solved todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} erledigt",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} wieder geöffnet",
-    "You reopened todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} wieder geöffnet",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} wiedereröffnet",
+    "You reopened todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} wiedereröffnet",
     "A <strong>calendar</strong> was modified" : "Ein <strong>Kalender</strong> wurde bearbeitet",
-    "A calendar <strong>event</strong> was modified" : "Ein <strong>Ereignis</strong> wurde bearbeitet",
-    "A calendar <strong>todo</strong> was modified" : "Eine <strong>Aufgabe</strong> wurde bearbeitet",
+    "A calendar <strong>event</strong> was modified" : "Ein Kalender-<strong>Ereignis</strong> wurde bearbeitet",
+    "A calendar <strong>todo</strong> was modified" : "Eine Kalender-<strong>Aufgabe</strong> wurde bearbeitet",
     "Contact birthdays" : "Geburtstage von Kontakten",
     "Personal" : "Persönlich",
     "Contacts" : "Kontakte",
     "WebDAV" : "WebDAV",
     "Technical details" : "Technische Details",
-    "Remote Address: %s" : "Remote-Adresse: %s",
-    "Request ID: %s" : "Anfrage-ID: %s"
+    "Remote Address: %s" : "Entfernte Adresse: %s",
+    "Request ID: %s" : "Anfragekennung: %s"
 },
 "nplurals=2; plural=(n != 1);");

apps/dav/l10n/de.json

@@ -7,10 +7,10 @@
     "You deleted calendar {calendar}" : "Du hast den Kalender {calendar} gelöscht",
     "{actor} updated calendar {calendar}" : "{actor} hat den Kalender {calendar} aktualisiert",
     "You updated calendar {calendar}" : "Du hast den Kalender {calendar} aktualisiert",
-    "{actor} shared calendar {calendar} with you" : "{actor} hat den Kalender {calendar} mit dir geteilt",
+    "{actor} shared calendar {calendar} with you" : "{actor} hat den Kalender {calendar} mit Dir geteilt",
     "You shared calendar {calendar} with {user}" : "Du hast den Kalender {calendar} mit {user} geteilt",
     "{actor} shared calendar {calendar} with {user}" : "{actor} hat den Kalender {calendar} mit {user} geteilt",
-    "{actor} unshared calendar {calendar} from you" : "{actor} teilt den Kalender {calendar} nicht mehr mit dir",
+    "{actor} unshared calendar {calendar} from you" : "{actor} teilt den Kalender {calendar} nicht mehr mit Dir",
     "You unshared calendar {calendar} from {user}" : "Du teilst den Kalender {calendar} nicht mehr mit {user}",
     "{actor} unshared calendar {calendar} from {user}" : "{actor} teilt den Kalender {calendar} nicht mehr mit {user}",
     "{actor} unshared calendar {calendar} from themselves" : "{actor} teilt den Kalender {calendar} nicht mehr mit sich selbst",
@@ -32,17 +32,17 @@
     "You updated todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} aktualisiert",
     "{actor} solved todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} erledigt",
     "You solved todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} erledigt",
-    "{actor} reopened todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} wieder geöffnet",
-    "You reopened todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} wieder geöffnet",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} hat die Aufgabe {todo} in der Liste {calendar} wiedereröffnet",
+    "You reopened todo {todo} in list {calendar}" : "Du hast die Aufgabe {todo} in der Liste {calendar} wiedereröffnet",
     "A <strong>calendar</strong> was modified" : "Ein <strong>Kalender</strong> wurde bearbeitet",
-    "A calendar <strong>event</strong> was modified" : "Ein <strong>Ereignis</strong> wurde bearbeitet",
-    "A calendar <strong>todo</strong> was modified" : "Eine <strong>Aufgabe</strong> wurde bearbeitet",
+    "A calendar <strong>event</strong> was modified" : "Ein Kalender-<strong>Ereignis</strong> wurde bearbeitet",
+    "A calendar <strong>todo</strong> was modified" : "Eine Kalender-<strong>Aufgabe</strong> wurde bearbeitet",
     "Contact birthdays" : "Geburtstage von Kontakten",
     "Personal" : "Persönlich",
     "Contacts" : "Kontakte",
     "WebDAV" : "WebDAV",
     "Technical details" : "Technische Details",
-    "Remote Address: %s" : "Remote-Adresse: %s",
-    "Request ID: %s" : "Anfrage-ID: %s"
+    "Remote Address: %s" : "Entfernte Adresse: %s",
+    "Request ID: %s" : "Anfragekennung: %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/dav/l10n/de_DE.js

@@ -16,7 +16,7 @@ OC.L10N.register(
     "You unshared calendar {calendar} from {user}" : "Sie teilen den Kalender {calendar} nicht mehr mit {user}",
     "{actor} unshared calendar {calendar} from {user}" : "{actor} teilt den Kalender {calendar} nicht mehr mit {user}",
     "{actor} unshared calendar {calendar} from themselves" : "{actor} teilt den Kalender {calendar} nicht mehr mit sich selbst",
-    "You shared calendar {calendar} with group {group}" : "Sie teilen den Kalender {calendar} mit der Gruppe {group}",
+    "You shared calendar {calendar} with group {group}" : "Sie haben den Kalender {calendar} mit der Gruppe {group} geteilt",
     "{actor} shared calendar {calendar} with group {group}" : "{actor} teilt den Kalender {calendar} mit der Gruppe {group}",
     "You unshared calendar {calendar} from group {group}" : "Sie teilen den Kalender {calendar} nicht mehr mit der Gruppe {group}",
     "{actor} unshared calendar {calendar} from group {group}" : "{actor} teilt den Kalender {calendar} nicht mehr mit der Gruppe {group}",

apps/dav/l10n/de_DE.json

@@ -14,7 +14,7 @@
     "You unshared calendar {calendar} from {user}" : "Sie teilen den Kalender {calendar} nicht mehr mit {user}",
     "{actor} unshared calendar {calendar} from {user}" : "{actor} teilt den Kalender {calendar} nicht mehr mit {user}",
     "{actor} unshared calendar {calendar} from themselves" : "{actor} teilt den Kalender {calendar} nicht mehr mit sich selbst",
-    "You shared calendar {calendar} with group {group}" : "Sie teilen den Kalender {calendar} mit der Gruppe {group}",
+    "You shared calendar {calendar} with group {group}" : "Sie haben den Kalender {calendar} mit der Gruppe {group} geteilt",
     "{actor} shared calendar {calendar} with group {group}" : "{actor} teilt den Kalender {calendar} mit der Gruppe {group}",
     "You unshared calendar {calendar} from group {group}" : "Sie teilen den Kalender {calendar} nicht mehr mit der Gruppe {group}",
     "{actor} unshared calendar {calendar} from group {group}" : "{actor} teilt den Kalender {calendar} nicht mehr mit der Gruppe {group}",

apps/dav/l10n/el.js

@@ -1,11 +1,50 @@
 OC.L10N.register(
     "dav",
     {
+    "Calendar" : "Ημερολόγιο",
+    "Todos" : "Εργασίες προς εκτέλεση",
+    "{actor} created calendar {calendar}" : "{actor} δημιουργήθηκε το ημερολόγιο {calendar}",
+    "You created calendar {calendar}" : "Δημιουργήσατε ημερολόγιο {ημερολόγιο}",
+    "{actor} deleted calendar {calendar}" : "{actor} διέγραψε το ημερολόγιο {calendar}",
+    "You deleted calendar {calendar}" : "Διαγράψατε το ημερολόγιο {calendar}",
+    "{actor} updated calendar {calendar}" : "{actor} ενημέρωσε το ημερολόγιο {calendar}",
+    "You updated calendar {calendar}" : "Έχετε ενημερώσει το ημερολόγιο {calendar}",
+    "{actor} shared calendar {calendar} with you" : "{actor} διαμοιράστηκε το ημερολόγιο {calendar} με εσάς",
+    "You shared calendar {calendar} with {user}" : "Διαμοιραστήκατε το ημερολογίου {calendar} με {user}",
+    "{actor} shared calendar {calendar} with {user}" : "{actor} διαμοίρασε το ημερολόγιο {calendar} με {user}",
+    "{actor} unshared calendar {calendar} from you" : "Ο {actor} σταμάτησε τον διαμοιρασμό του ημερολογίου  {calendar} από εσάς",
+    "You unshared calendar {calendar} from {user}" : "Σταματήσατε τον διαμοιρασμό ημερολογίου  {calendar} από {user}",
+    "{actor} unshared calendar {calendar} from {user}" : "Ο {actor} σταμάτησε τον διαμοιρασμό του ημερολογίου  {calendar} από τον χρήστη {user}",
+    "{actor} unshared calendar {calendar} from themselves" : "{actor} σταμάτησε το διαμοιρασμένο ημερολόγιο {calendar} από τον εαυτό τους",
+    "You shared calendar {calendar} with group {group}" : "Διαμοιραστείκατε ένα ημερολόγιο {calendar} με την ομάδα {group}",
+    "{actor} shared calendar {calendar} with group {group}" : "Ο {actor} διαμοιράστηκε το ημερολόγιο {calendar} με την ομάδα {group}",
+    "You unshared calendar {calendar} from group {group}" : "Σταματήσατε τον διαμοιρασμό του ημερολογίου {calendar} από την ομάδα {group}",
+    "{actor} unshared calendar {calendar} from group {group}" : "{actor} σταμάτησε το διαμοιρασμένο ημερολόγιο {calendar} από την ομάδα {group}",
+    "{actor} created event {event} in calendar {calendar}" : "Ο {actor} δημιούργησε το γεγονός {event} στο ημερολόγιο {calendar}",
+    "You created event {event} in calendar {calendar}" : "Δημιουργήσατε το γεγονός {event} στο ημερολόγιο {calendar}",
+    "{actor} deleted event {event} from calendar {calendar}" : "Ο {actor} διέγραψε το γεγονός {event} από το ημερολόγιο {calendar}",
+    "You deleted event {event} from calendar {calendar}" : "Διαγράψατε το συμβάν {event} από το ημερολόγιο {calendar}",
+    "{actor} updated event {event} in calendar {calendar}" : "Ο {actor} ενημέρωσε το γεγονός {event} στο ημερολόγιο {calendar}",
+    "You updated event {event} in calendar {calendar}" : "Ενημερώσατε το συμβάν {event} στο ημερολόγιο {calendar}",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} δημιούργησε την εκκρεμότητα {todo} στη λίστα {ημερολόγιο}",
+    "You created todo {todo} in list {calendar}" : "Δημιουργήσατε την εκκρεμότητα {todo} στη λίστα {ημερολόγιο}",
+    "{actor} deleted todo {todo} from list {calendar}" : "Ο {actor} διέγραψε την εκκρεμότητα  {todo} από τη  λίστα {ημερολόγιο}",
+    "You deleted todo {todo} from list {calendar}" : "Διέγραψες την εκκρεμότητα {todo} από τη λίστα {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} ενημέρωσε την εκκρεμότητα {todo} στη λίστα {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Ενημέρωσες την εκκρεμότητα {todo} στη λίστα {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} επίλυσε την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Επίλυσες την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} άνοιξε ξανά την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Άνοιξες ξανά την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "A <strong>calendar</strong> was modified" : "Τροποποιήθηκε ένα <strong>ημερολόγιο</strong> ",
+    "A calendar <strong>event</strong> was modified" : "Τροποποιήθηκε ένα <strong>γεγονός</strong> του ημερολογίου",
+    "A calendar <strong>todo</strong> was modified" : "Ενός ημερολογίου η <strong>εκκρεμότητα</strong> τροποποιήθηκε",
     "Contact birthdays" : "Γενέθλια επαφών",
     "Personal" : "Προσωπικά",
     "Contacts" : "Επαφές",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Τεχνικές λεπτομέρειες",
     "Remote Address: %s" : "Απομακρυσμένη Διεύθυνση: %s",
-    "Request ID: %s" : "Αίτημα ID: %s"
+    "Request ID: %s" : "ID Αιτήματος: %s"
 },
 "nplurals=2; plural=(n != 1);");

apps/dav/l10n/el.json

@@ -1,9 +1,48 @@
 { "translations": {
+    "Calendar" : "Ημερολόγιο",
+    "Todos" : "Εργασίες προς εκτέλεση",
+    "{actor} created calendar {calendar}" : "{actor} δημιουργήθηκε το ημερολόγιο {calendar}",
+    "You created calendar {calendar}" : "Δημιουργήσατε ημερολόγιο {ημερολόγιο}",
+    "{actor} deleted calendar {calendar}" : "{actor} διέγραψε το ημερολόγιο {calendar}",
+    "You deleted calendar {calendar}" : "Διαγράψατε το ημερολόγιο {calendar}",
+    "{actor} updated calendar {calendar}" : "{actor} ενημέρωσε το ημερολόγιο {calendar}",
+    "You updated calendar {calendar}" : "Έχετε ενημερώσει το ημερολόγιο {calendar}",
+    "{actor} shared calendar {calendar} with you" : "{actor} διαμοιράστηκε το ημερολόγιο {calendar} με εσάς",
+    "You shared calendar {calendar} with {user}" : "Διαμοιραστήκατε το ημερολογίου {calendar} με {user}",
+    "{actor} shared calendar {calendar} with {user}" : "{actor} διαμοίρασε το ημερολόγιο {calendar} με {user}",
+    "{actor} unshared calendar {calendar} from you" : "Ο {actor} σταμάτησε τον διαμοιρασμό του ημερολογίου  {calendar} από εσάς",
+    "You unshared calendar {calendar} from {user}" : "Σταματήσατε τον διαμοιρασμό ημερολογίου  {calendar} από {user}",
+    "{actor} unshared calendar {calendar} from {user}" : "Ο {actor} σταμάτησε τον διαμοιρασμό του ημερολογίου  {calendar} από τον χρήστη {user}",
+    "{actor} unshared calendar {calendar} from themselves" : "{actor} σταμάτησε το διαμοιρασμένο ημερολόγιο {calendar} από τον εαυτό τους",
+    "You shared calendar {calendar} with group {group}" : "Διαμοιραστείκατε ένα ημερολόγιο {calendar} με την ομάδα {group}",
+    "{actor} shared calendar {calendar} with group {group}" : "Ο {actor} διαμοιράστηκε το ημερολόγιο {calendar} με την ομάδα {group}",
+    "You unshared calendar {calendar} from group {group}" : "Σταματήσατε τον διαμοιρασμό του ημερολογίου {calendar} από την ομάδα {group}",
+    "{actor} unshared calendar {calendar} from group {group}" : "{actor} σταμάτησε το διαμοιρασμένο ημερολόγιο {calendar} από την ομάδα {group}",
+    "{actor} created event {event} in calendar {calendar}" : "Ο {actor} δημιούργησε το γεγονός {event} στο ημερολόγιο {calendar}",
+    "You created event {event} in calendar {calendar}" : "Δημιουργήσατε το γεγονός {event} στο ημερολόγιο {calendar}",
+    "{actor} deleted event {event} from calendar {calendar}" : "Ο {actor} διέγραψε το γεγονός {event} από το ημερολόγιο {calendar}",
+    "You deleted event {event} from calendar {calendar}" : "Διαγράψατε το συμβάν {event} από το ημερολόγιο {calendar}",
+    "{actor} updated event {event} in calendar {calendar}" : "Ο {actor} ενημέρωσε το γεγονός {event} στο ημερολόγιο {calendar}",
+    "You updated event {event} in calendar {calendar}" : "Ενημερώσατε το συμβάν {event} στο ημερολόγιο {calendar}",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} δημιούργησε την εκκρεμότητα {todo} στη λίστα {ημερολόγιο}",
+    "You created todo {todo} in list {calendar}" : "Δημιουργήσατε την εκκρεμότητα {todo} στη λίστα {ημερολόγιο}",
+    "{actor} deleted todo {todo} from list {calendar}" : "Ο {actor} διέγραψε την εκκρεμότητα  {todo} από τη  λίστα {ημερολόγιο}",
+    "You deleted todo {todo} from list {calendar}" : "Διέγραψες την εκκρεμότητα {todo} από τη λίστα {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} ενημέρωσε την εκκρεμότητα {todo} στη λίστα {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Ενημέρωσες την εκκρεμότητα {todo} στη λίστα {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} επίλυσε την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Επίλυσες την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} άνοιξε ξανά την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Άνοιξες ξανά την εκκρεμότητα {todo} στην λίστα {calendar}",
+    "A <strong>calendar</strong> was modified" : "Τροποποιήθηκε ένα <strong>ημερολόγιο</strong> ",
+    "A calendar <strong>event</strong> was modified" : "Τροποποιήθηκε ένα <strong>γεγονός</strong> του ημερολογίου",
+    "A calendar <strong>todo</strong> was modified" : "Ενός ημερολογίου η <strong>εκκρεμότητα</strong> τροποποιήθηκε",
     "Contact birthdays" : "Γενέθλια επαφών",
     "Personal" : "Προσωπικά",
     "Contacts" : "Επαφές",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Τεχνικές λεπτομέρειες",
     "Remote Address: %s" : "Απομακρυσμένη Διεύθυνση: %s",
-    "Request ID: %s" : "Αίτημα ID: %s"
+    "Request ID: %s" : "ID Αιτήματος: %s"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/dav/l10n/en_GB.js

@@ -0,0 +1,50 @@
+OC.L10N.register(
+    "dav",
+    {
+    "Calendar" : "Calendar",
+    "Todos" : "Todos",
+    "{actor} created calendar {calendar}" : "{actor} created calendar {calendar}",
+    "You created calendar {calendar}" : "You created calendar {calendar}",
+    "{actor} deleted calendar {calendar}" : "{actor} deleted calendar {calendar}",
+    "You deleted calendar {calendar}" : "You deleted calendar {calendar}",
+    "{actor} updated calendar {calendar}" : "{actor} updated calendar {calendar}",
+    "You updated calendar {calendar}" : "You updated calendar {calendar}",
+    "{actor} shared calendar {calendar} with you" : "{actor} shared calendar {calendar} with you",
+    "You shared calendar {calendar} with {user}" : "You shared calendar {calendar} with {user}",
+    "{actor} shared calendar {calendar} with {user}" : "{actor} shared calendar {calendar} with {user}",
+    "{actor} unshared calendar {calendar} from you" : "{actor} unshared calendar {calendar} from you",
+    "You unshared calendar {calendar} from {user}" : "You unshared calendar {calendar} from {user}",
+    "{actor} unshared calendar {calendar} from {user}" : "{actor} unshared calendar {calendar} from {user}",
+    "{actor} unshared calendar {calendar} from themselves" : "{actor} unshared calendar {calendar} from themselves",
+    "You shared calendar {calendar} with group {group}" : "You shared calendar {calendar} with group {group}",
+    "{actor} shared calendar {calendar} with group {group}" : "{actor} shared calendar {calendar} with group {group}",
+    "You unshared calendar {calendar} from group {group}" : "You unshared calendar {calendar} from group {group}",
+    "{actor} unshared calendar {calendar} from group {group}" : "{actor} unshared calendar {calendar} from group {group}",
+    "{actor} created event {event} in calendar {calendar}" : "{actor} created event {event} in calendar {calendar}",
+    "You created event {event} in calendar {calendar}" : "You created event {event} in calendar {calendar}",
+    "{actor} deleted event {event} from calendar {calendar}" : "{actor} deleted event {event} from calendar {calendar}",
+    "You deleted event {event} from calendar {calendar}" : "You deleted event {event} from calendar {calendar}",
+    "{actor} updated event {event} in calendar {calendar}" : "{actor} updated event {event} in calendar {calendar}",
+    "You updated event {event} in calendar {calendar}" : "You updated event {event} in calendar {calendar}",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} created todo {todo} in list {calendar}",
+    "You created todo {todo} in list {calendar}" : "You created todo {todo} in list {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} deleted todo {todo} from list {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "You deleted todo {todo} from list {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} updated todo {todo} in list {calendar}",
+    "You updated todo {todo} in list {calendar}" : "You updated todo {todo} in list {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} solved todo {todo} in list {calendar}",
+    "You solved todo {todo} in list {calendar}" : "You solved todo {todo} in list {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} reopened todo {todo} in list {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "You reopened todo {todo} in list {calendar}",
+    "A <strong>calendar</strong> was modified" : "A <strong>calendar</strong> was modified",
+    "A calendar <strong>event</strong> was modified" : "A calendar <strong>event</strong> was modified",
+    "A calendar <strong>todo</strong> was modified" : "A calendar <strong>todo</strong> was modified",
+    "Contact birthdays" : "Contact birthdays",
+    "Personal" : "Personal",
+    "Contacts" : "Contacts",
+    "WebDAV" : "WebDAV",
+    "Technical details" : "Technical details",
+    "Remote Address: %s" : "Remote Address: %s",
+    "Request ID: %s" : "Request ID: %s"
+},
+"nplurals=2; plural=(n != 1);");

apps/dav/l10n/en_GB.json

@@ -0,0 +1,48 @@
+{ "translations": {
+    "Calendar" : "Calendar",
+    "Todos" : "Todos",
+    "{actor} created calendar {calendar}" : "{actor} created calendar {calendar}",
+    "You created calendar {calendar}" : "You created calendar {calendar}",
+    "{actor} deleted calendar {calendar}" : "{actor} deleted calendar {calendar}",
+    "You deleted calendar {calendar}" : "You deleted calendar {calendar}",
+    "{actor} updated calendar {calendar}" : "{actor} updated calendar {calendar}",
+    "You updated calendar {calendar}" : "You updated calendar {calendar}",
+    "{actor} shared calendar {calendar} with you" : "{actor} shared calendar {calendar} with you",
+    "You shared calendar {calendar} with {user}" : "You shared calendar {calendar} with {user}",
+    "{actor} shared calendar {calendar} with {user}" : "{actor} shared calendar {calendar} with {user}",
+    "{actor} unshared calendar {calendar} from you" : "{actor} unshared calendar {calendar} from you",
+    "You unshared calendar {calendar} from {user}" : "You unshared calendar {calendar} from {user}",
+    "{actor} unshared calendar {calendar} from {user}" : "{actor} unshared calendar {calendar} from {user}",
+    "{actor} unshared calendar {calendar} from themselves" : "{actor} unshared calendar {calendar} from themselves",
+    "You shared calendar {calendar} with group {group}" : "You shared calendar {calendar} with group {group}",
+    "{actor} shared calendar {calendar} with group {group}" : "{actor} shared calendar {calendar} with group {group}",
+    "You unshared calendar {calendar} from group {group}" : "You unshared calendar {calendar} from group {group}",
+    "{actor} unshared calendar {calendar} from group {group}" : "{actor} unshared calendar {calendar} from group {group}",
+    "{actor} created event {event} in calendar {calendar}" : "{actor} created event {event} in calendar {calendar}",
+    "You created event {event} in calendar {calendar}" : "You created event {event} in calendar {calendar}",
+    "{actor} deleted event {event} from calendar {calendar}" : "{actor} deleted event {event} from calendar {calendar}",
+    "You deleted event {event} from calendar {calendar}" : "You deleted event {event} from calendar {calendar}",
+    "{actor} updated event {event} in calendar {calendar}" : "{actor} updated event {event} in calendar {calendar}",
+    "You updated event {event} in calendar {calendar}" : "You updated event {event} in calendar {calendar}",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} created todo {todo} in list {calendar}",
+    "You created todo {todo} in list {calendar}" : "You created todo {todo} in list {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} deleted todo {todo} from list {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "You deleted todo {todo} from list {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} updated todo {todo} in list {calendar}",
+    "You updated todo {todo} in list {calendar}" : "You updated todo {todo} in list {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} solved todo {todo} in list {calendar}",
+    "You solved todo {todo} in list {calendar}" : "You solved todo {todo} in list {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} reopened todo {todo} in list {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "You reopened todo {todo} in list {calendar}",
+    "A <strong>calendar</strong> was modified" : "A <strong>calendar</strong> was modified",
+    "A calendar <strong>event</strong> was modified" : "A calendar <strong>event</strong> was modified",
+    "A calendar <strong>todo</strong> was modified" : "A calendar <strong>todo</strong> was modified",
+    "Contact birthdays" : "Contact birthdays",
+    "Personal" : "Personal",
+    "Contacts" : "Contacts",
+    "WebDAV" : "WebDAV",
+    "Technical details" : "Technical details",
+    "Remote Address: %s" : "Remote Address: %s",
+    "Request ID: %s" : "Request ID: %s"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/dav/l10n/es.js

@@ -42,6 +42,7 @@ OC.L10N.register(
     "Contact birthdays" : "Cumpleaños del contacto",
     "Personal" : "Personal",
     "Contacts" : "Contactos",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Detalles técnicos",
     "Remote Address: %s" : "Dirección remota: %s",
     "Request ID: %s" : "ID de la solicitud: %s"

apps/dav/l10n/es.json

@@ -40,6 +40,7 @@
     "Contact birthdays" : "Cumpleaños del contacto",
     "Personal" : "Personal",
     "Contacts" : "Contactos",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Detalles técnicos",
     "Remote Address: %s" : "Dirección remota: %s",
     "Request ID: %s" : "ID de la solicitud: %s"

apps/dav/l10n/es_AR.js

@@ -0,0 +1,50 @@
+OC.L10N.register(
+    "dav",
+    {
+    "Calendar" : "Calendario",
+    "Todos" : "Pendientes",
+    "{actor} created calendar {calendar}" : "{actor} creó el calendario {calendar}",
+    "You created calendar {calendar}" : "Usted creó el calendario {calendar}",
+    "{actor} deleted calendar {calendar}" : "{actor} borró el calendario {calendar}",
+    "You deleted calendar {calendar}" : "Usted borró el calendario {calendar}",
+    "{actor} updated calendar {calendar}" : "{actor} actualizó el calendario {calendar}",
+    "You updated calendar {calendar}" : "Usted actualizó el calendario {calendar}",
+    "{actor} shared calendar {calendar} with you" : "{actor} ha compartido el calendario {calendar} con usted",
+    "You shared calendar {calendar} with {user}" : "Usted ha compartido el calendario {calendar} con {user}",
+    "{actor} shared calendar {calendar} with {user}" : "{actor} compartió el calendario {calendar} con {user}",
+    "{actor} unshared calendar {calendar} from you" : "{actor} ha dejado de compartir el calendario {calendar} con usted",
+    "You unshared calendar {calendar} from {user}" : "Usted ha dejado de compartir el calendario {calendar} con {user}",
+    "{actor} unshared calendar {calendar} from {user}" : "{actor} dejó de compartir el calendario {calendar} con {user}",
+    "{actor} unshared calendar {calendar} from themselves" : "{actor} dejó de compartir {el calendario calendar} con él mismo",
+    "You shared calendar {calendar} with group {group}" : "Usted ha compartido el calendario {calendar} con el grupo {group}",
+    "{actor} shared calendar {calendar} with group {group}" : "{actor} compartió el calendario {calendar} con el grupo {group}",
+    "You unshared calendar {calendar} from group {group}" : "Usted ha dejado de compartir el calendario {calendar} con el grupo {group}",
+    "{actor} unshared calendar {calendar} from group {group}" : "{actor} dejó de compartir el calendrio {calendar} con el grupo {group}",
+    "{actor} created event {event} in calendar {calendar}" : "{actor} creó el evento {event} en el calendario {calendar}",
+    "You created event {event} in calendar {calendar}" : "Usted creó el evento {event} en el calendario {calendar}",
+    "{actor} deleted event {event} from calendar {calendar}" : "{actor} borró el eventó {event} del calendario {calendar}",
+    "You deleted event {event} from calendar {calendar}" : "Usted borró el evento {event} del calendario {calendar}",
+    "{actor} updated event {event} in calendar {calendar}" : "{actor} actualizó el evento {event} en el calendario {calendar}",
+    "You updated event {event} in calendar {calendar}" : "Usted actualizó el evento {event} en el calendario {calendar}",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} creó el pendiente {todo} en la lista {calendar}",
+    "You created todo {todo} in list {calendar}" : "Usted creo el pendiente {todo} en la lista {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} borró el pendiente {todo} de la lista {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Usted borró el pendiente {todo} de la lista {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} actualizó el pendiente {todo} de la lista {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Usted actualizó el pendiente {todo} de la lista {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} resolvió el pendiente {todo} de la lista {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Usted resolvió el pendiente {todo} de la lista {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} reabrió el pendiente {todo} de la lista{calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Usted reabrió el pendiente {todo} de la lista {calendar}",
+    "A <strong>calendar</strong> was modified" : "Un <strong>calendario</strong> fue modificado",
+    "A calendar <strong>event</strong> was modified" : "Un <strong>evento</strong> de un calendario fue modificado",
+    "A calendar <strong>todo</strong> was modified" : "Un <strong>pendiente</strong> de un calendario fue modificado",
+    "Contact birthdays" : "Cumpleaños del contacto",
+    "Personal" : "Personal",
+    "Contacts" : "Contactos",
+    "WebDAV" : "WebDAV",
+    "Technical details" : "Detalles técnicos",
+    "Remote Address: %s" : "Dirección remota: %s",
+    "Request ID: %s" : "ID de solicitud: %s"
+},
+"nplurals=2; plural=(n != 1);");

apps/dav/l10n/es_AR.json

@@ -0,0 +1,48 @@
+{ "translations": {
+    "Calendar" : "Calendario",
+    "Todos" : "Pendientes",
+    "{actor} created calendar {calendar}" : "{actor} creó el calendario {calendar}",
+    "You created calendar {calendar}" : "Usted creó el calendario {calendar}",
+    "{actor} deleted calendar {calendar}" : "{actor} borró el calendario {calendar}",
+    "You deleted calendar {calendar}" : "Usted borró el calendario {calendar}",
+    "{actor} updated calendar {calendar}" : "{actor} actualizó el calendario {calendar}",
+    "You updated calendar {calendar}" : "Usted actualizó el calendario {calendar}",
+    "{actor} shared calendar {calendar} with you" : "{actor} ha compartido el calendario {calendar} con usted",
+    "You shared calendar {calendar} with {user}" : "Usted ha compartido el calendario {calendar} con {user}",
+    "{actor} shared calendar {calendar} with {user}" : "{actor} compartió el calendario {calendar} con {user}",
+    "{actor} unshared calendar {calendar} from you" : "{actor} ha dejado de compartir el calendario {calendar} con usted",
+    "You unshared calendar {calendar} from {user}" : "Usted ha dejado de compartir el calendario {calendar} con {user}",
+    "{actor} unshared calendar {calendar} from {user}" : "{actor} dejó de compartir el calendario {calendar} con {user}",
+    "{actor} unshared calendar {calendar} from themselves" : "{actor} dejó de compartir {el calendario calendar} con él mismo",
+    "You shared calendar {calendar} with group {group}" : "Usted ha compartido el calendario {calendar} con el grupo {group}",
+    "{actor} shared calendar {calendar} with group {group}" : "{actor} compartió el calendario {calendar} con el grupo {group}",
+    "You unshared calendar {calendar} from group {group}" : "Usted ha dejado de compartir el calendario {calendar} con el grupo {group}",
+    "{actor} unshared calendar {calendar} from group {group}" : "{actor} dejó de compartir el calendrio {calendar} con el grupo {group}",
+    "{actor} created event {event} in calendar {calendar}" : "{actor} creó el evento {event} en el calendario {calendar}",
+    "You created event {event} in calendar {calendar}" : "Usted creó el evento {event} en el calendario {calendar}",
+    "{actor} deleted event {event} from calendar {calendar}" : "{actor} borró el eventó {event} del calendario {calendar}",
+    "You deleted event {event} from calendar {calendar}" : "Usted borró el evento {event} del calendario {calendar}",
+    "{actor} updated event {event} in calendar {calendar}" : "{actor} actualizó el evento {event} en el calendario {calendar}",
+    "You updated event {event} in calendar {calendar}" : "Usted actualizó el evento {event} en el calendario {calendar}",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} creó el pendiente {todo} en la lista {calendar}",
+    "You created todo {todo} in list {calendar}" : "Usted creo el pendiente {todo} en la lista {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} borró el pendiente {todo} de la lista {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Usted borró el pendiente {todo} de la lista {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} actualizó el pendiente {todo} de la lista {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Usted actualizó el pendiente {todo} de la lista {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} resolvió el pendiente {todo} de la lista {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Usted resolvió el pendiente {todo} de la lista {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} reabrió el pendiente {todo} de la lista{calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Usted reabrió el pendiente {todo} de la lista {calendar}",
+    "A <strong>calendar</strong> was modified" : "Un <strong>calendario</strong> fue modificado",
+    "A calendar <strong>event</strong> was modified" : "Un <strong>evento</strong> de un calendario fue modificado",
+    "A calendar <strong>todo</strong> was modified" : "Un <strong>pendiente</strong> de un calendario fue modificado",
+    "Contact birthdays" : "Cumpleaños del contacto",
+    "Personal" : "Personal",
+    "Contacts" : "Contactos",
+    "WebDAV" : "WebDAV",
+    "Technical details" : "Detalles técnicos",
+    "Remote Address: %s" : "Dirección remota: %s",
+    "Request ID: %s" : "ID de solicitud: %s"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/dav/l10n/es_MX.js

@@ -4,38 +4,38 @@ OC.L10N.register(
     "Calendar" : "Calendario",
     "Todos" : "Pendientes",
     "{actor} created calendar {calendar}" : "{actor} creó el calendario {calendar}",
-    "You created calendar {calendar}" : "Usted creó el calendario {calendar}",
+    "You created calendar {calendar}" : "Creaste el calendario {calendar}",
     "{actor} deleted calendar {calendar}" : "{actor} borró el calendario {calendar}",
-    "You deleted calendar {calendar}" : "Usted borró el calendario {calendar}",
+    "You deleted calendar {calendar}" : "Borraste el calendario {calendar}",
     "{actor} updated calendar {calendar}" : "{actor} actualizó el calendario {calendar}",
-    "You updated calendar {calendar}" : "Usted actualizó el calendario {calendar}",
-    "{actor} shared calendar {calendar} with you" : "{actor} ha compartido el calendario {calendar} con usted",
-    "You shared calendar {calendar} with {user}" : "Usted ha compartido el calendario {calendar} con {user}",
+    "You updated calendar {calendar}" : "Actualizaste el calendario {calendar}",
+    "{actor} shared calendar {calendar} with you" : "{actor} ha compartido el calendario {calendar} contigo",
+    "You shared calendar {calendar} with {user}" : "Compartiste el calendario {calendar} con {user}",
     "{actor} shared calendar {calendar} with {user}" : "{actor} compartió el calendario {calendar} con {user}",
-    "{actor} unshared calendar {calendar} from you" : "{actor} ha dejado de compartir el calendario {calendar} con usted",
-    "You unshared calendar {calendar} from {user}" : "Usted ha dejado de compartir el calendario {calendar} con {user}",
+    "{actor} unshared calendar {calendar} from you" : "{actor} ha dejado de compartir el calendario {calendar} contigo",
+    "You unshared calendar {calendar} from {user}" : "Has dejado de compartir el calendario {calendar} con {user}",
     "{actor} unshared calendar {calendar} from {user}" : "{actor} dejó de compartir el calendario {calendar} con {user}",
     "{actor} unshared calendar {calendar} from themselves" : "{actor} dejó de compartir {el calendario calendar} con él mismo",
-    "You shared calendar {calendar} with group {group}" : "Usted ha compartido el calendario {calendar} con el grupo {group}",
+    "You shared calendar {calendar} with group {group}" : "Compartiste el calendario {calendar} con el grupo {group}",
     "{actor} shared calendar {calendar} with group {group}" : "{actor} compartió el calendario {calendar} con el grupo {group}",
-    "You unshared calendar {calendar} from group {group}" : "Usted ha dejado de compartir el calendario {calendar} con el grupo {group}",
+    "You unshared calendar {calendar} from group {group}" : "Dejaste de compartir el calendario {calendar} con el grupo {group}",
     "{actor} unshared calendar {calendar} from group {group}" : "{actor} dejó de compartir el calendrio {calendar} con el grupo {group}",
     "{actor} created event {event} in calendar {calendar}" : "{actor} creó el evento {event} en el calendario {calendar}",
-    "You created event {event} in calendar {calendar}" : "Usted creó el evento {event} en el calendario {calendar}",
+    "You created event {event} in calendar {calendar}" : "Creaste el evento {event} en el calendario {calendar}",
     "{actor} deleted event {event} from calendar {calendar}" : "{actor} borró el eventó {event} del calendario {calendar}",
-    "You deleted event {event} from calendar {calendar}" : "Usted borró el evento {event} del calendario {calendar}",
+    "You deleted event {event} from calendar {calendar}" : "Borraste el evento {event} del calendario {calendar}",
     "{actor} updated event {event} in calendar {calendar}" : "{actor} actualizó el evento {event} en el calendario {calendar}",
-    "You updated event {event} in calendar {calendar}" : "Usted actualizó el evento {event} en el calendario {calendar}",
+    "You updated event {event} in calendar {calendar}" : "Actualizaste el evento {event} en el calendario {calendar}",
     "{actor} created todo {todo} in list {calendar}" : "{actor} creó el pendiente {todo} en la lista {calendar}",
-    "You created todo {todo} in list {calendar}" : "Usted creo el pendiente {todo} en la lista {calendar}",
+    "You created todo {todo} in list {calendar}" : "Creaste el pendiente {todo} en la lista {calendar}",
     "{actor} deleted todo {todo} from list {calendar}" : "{actor} borró el pendiente {todo} de la lista {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Usted borró el pendiente {todo} de la lista {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Borraste el pendiente {todo} de la lista {calendar}",
     "{actor} updated todo {todo} in list {calendar}" : "{actor} actualizó el pendiente {todo} de la lista {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Usted actualizó el pendiente {todo} de la lista {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Actualizaste el pendiente {todo} de la lista {calendar}",
     "{actor} solved todo {todo} in list {calendar}" : "{actor} resolvió el pendiente {todo} de la lista {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Usted resolvió el pendiente {todo} de la lista {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Resolviste el pendiente {todo} de la lista {calendar}",
     "{actor} reopened todo {todo} in list {calendar}" : "{actor} reabrió el pendiente {todo} de la lista{calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Usted reabrió el pendiente {todo} de la lista {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Reabriste el pendiente {todo} de la lista {calendar}",
     "A <strong>calendar</strong> was modified" : "Un <strong>calendario</strong> fue modificado",
     "A calendar <strong>event</strong> was modified" : "Un <strong>evento</strong> de un calendario fue modificado",
     "A calendar <strong>todo</strong> was modified" : "Un <strong>pendiente</strong> de un calendario fue modificado",

apps/dav/l10n/es_MX.json

@@ -2,38 +2,38 @@
     "Calendar" : "Calendario",
     "Todos" : "Pendientes",
     "{actor} created calendar {calendar}" : "{actor} creó el calendario {calendar}",
-    "You created calendar {calendar}" : "Usted creó el calendario {calendar}",
+    "You created calendar {calendar}" : "Creaste el calendario {calendar}",
     "{actor} deleted calendar {calendar}" : "{actor} borró el calendario {calendar}",
-    "You deleted calendar {calendar}" : "Usted borró el calendario {calendar}",
+    "You deleted calendar {calendar}" : "Borraste el calendario {calendar}",
     "{actor} updated calendar {calendar}" : "{actor} actualizó el calendario {calendar}",
-    "You updated calendar {calendar}" : "Usted actualizó el calendario {calendar}",
-    "{actor} shared calendar {calendar} with you" : "{actor} ha compartido el calendario {calendar} con usted",
-    "You shared calendar {calendar} with {user}" : "Usted ha compartido el calendario {calendar} con {user}",
+    "You updated calendar {calendar}" : "Actualizaste el calendario {calendar}",
+    "{actor} shared calendar {calendar} with you" : "{actor} ha compartido el calendario {calendar} contigo",
+    "You shared calendar {calendar} with {user}" : "Compartiste el calendario {calendar} con {user}",
     "{actor} shared calendar {calendar} with {user}" : "{actor} compartió el calendario {calendar} con {user}",
-    "{actor} unshared calendar {calendar} from you" : "{actor} ha dejado de compartir el calendario {calendar} con usted",
-    "You unshared calendar {calendar} from {user}" : "Usted ha dejado de compartir el calendario {calendar} con {user}",
+    "{actor} unshared calendar {calendar} from you" : "{actor} ha dejado de compartir el calendario {calendar} contigo",
+    "You unshared calendar {calendar} from {user}" : "Has dejado de compartir el calendario {calendar} con {user}",
     "{actor} unshared calendar {calendar} from {user}" : "{actor} dejó de compartir el calendario {calendar} con {user}",
     "{actor} unshared calendar {calendar} from themselves" : "{actor} dejó de compartir {el calendario calendar} con él mismo",
-    "You shared calendar {calendar} with group {group}" : "Usted ha compartido el calendario {calendar} con el grupo {group}",
+    "You shared calendar {calendar} with group {group}" : "Compartiste el calendario {calendar} con el grupo {group}",
     "{actor} shared calendar {calendar} with group {group}" : "{actor} compartió el calendario {calendar} con el grupo {group}",
-    "You unshared calendar {calendar} from group {group}" : "Usted ha dejado de compartir el calendario {calendar} con el grupo {group}",
+    "You unshared calendar {calendar} from group {group}" : "Dejaste de compartir el calendario {calendar} con el grupo {group}",
     "{actor} unshared calendar {calendar} from group {group}" : "{actor} dejó de compartir el calendrio {calendar} con el grupo {group}",
     "{actor} created event {event} in calendar {calendar}" : "{actor} creó el evento {event} en el calendario {calendar}",
-    "You created event {event} in calendar {calendar}" : "Usted creó el evento {event} en el calendario {calendar}",
+    "You created event {event} in calendar {calendar}" : "Creaste el evento {event} en el calendario {calendar}",
     "{actor} deleted event {event} from calendar {calendar}" : "{actor} borró el eventó {event} del calendario {calendar}",
-    "You deleted event {event} from calendar {calendar}" : "Usted borró el evento {event} del calendario {calendar}",
+    "You deleted event {event} from calendar {calendar}" : "Borraste el evento {event} del calendario {calendar}",
     "{actor} updated event {event} in calendar {calendar}" : "{actor} actualizó el evento {event} en el calendario {calendar}",
-    "You updated event {event} in calendar {calendar}" : "Usted actualizó el evento {event} en el calendario {calendar}",
+    "You updated event {event} in calendar {calendar}" : "Actualizaste el evento {event} en el calendario {calendar}",
     "{actor} created todo {todo} in list {calendar}" : "{actor} creó el pendiente {todo} en la lista {calendar}",
-    "You created todo {todo} in list {calendar}" : "Usted creo el pendiente {todo} en la lista {calendar}",
+    "You created todo {todo} in list {calendar}" : "Creaste el pendiente {todo} en la lista {calendar}",
     "{actor} deleted todo {todo} from list {calendar}" : "{actor} borró el pendiente {todo} de la lista {calendar}",
-    "You deleted todo {todo} from list {calendar}" : "Usted borró el pendiente {todo} de la lista {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Borraste el pendiente {todo} de la lista {calendar}",
     "{actor} updated todo {todo} in list {calendar}" : "{actor} actualizó el pendiente {todo} de la lista {calendar}",
-    "You updated todo {todo} in list {calendar}" : "Usted actualizó el pendiente {todo} de la lista {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Actualizaste el pendiente {todo} de la lista {calendar}",
     "{actor} solved todo {todo} in list {calendar}" : "{actor} resolvió el pendiente {todo} de la lista {calendar}",
-    "You solved todo {todo} in list {calendar}" : "Usted resolvió el pendiente {todo} de la lista {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Resolviste el pendiente {todo} de la lista {calendar}",
     "{actor} reopened todo {todo} in list {calendar}" : "{actor} reabrió el pendiente {todo} de la lista{calendar}",
-    "You reopened todo {todo} in list {calendar}" : "Usted reabrió el pendiente {todo} de la lista {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Reabriste el pendiente {todo} de la lista {calendar}",
     "A <strong>calendar</strong> was modified" : "Un <strong>calendario</strong> fue modificado",
     "A calendar <strong>event</strong> was modified" : "Un <strong>evento</strong> de un calendario fue modificado",
     "A calendar <strong>todo</strong> was modified" : "Un <strong>pendiente</strong> de un calendario fue modificado",

apps/dav/l10n/fi.js

@@ -42,6 +42,7 @@ OC.L10N.register(
     "Contact birthdays" : "Yhteystietojen syntymäpäivät",
     "Personal" : "Henkilökohtainen",
     "Contacts" : "Yhteystiedot",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Tekniset yksityiskohdat",
     "Remote Address: %s" : "Etäosoite: %s",
     "Request ID: %s" : "Pyynnön tunniste: %s"

apps/dav/l10n/fi.json

@@ -40,6 +40,7 @@
     "Contact birthdays" : "Yhteystietojen syntymäpäivät",
     "Personal" : "Henkilökohtainen",
     "Contacts" : "Yhteystiedot",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Tekniset yksityiskohdat",
     "Remote Address: %s" : "Etäosoite: %s",
     "Request ID: %s" : "Pyynnön tunniste: %s"

apps/dav/l10n/gl.js

@@ -0,0 +1,50 @@
+OC.L10N.register(
+    "dav",
+    {
+    "Calendar" : "Calendario",
+    "Todos" : "Asuntos pendentes",
+    "{actor} created calendar {calendar}" : "{actor} creou o calendario {calendar}",
+    "You created calendar {calendar}" : "Vostede creou o calendario {calendar}",
+    "{actor} deleted calendar {calendar}" : "{actor} eliminou o calendario {calendar}",
+    "You deleted calendar {calendar}" : "Vostede eliminou o calendario {calendar}",
+    "{actor} updated calendar {calendar}" : "{actor} actualizou o calendario {calendar}",
+    "You updated calendar {calendar}" : "Vostede actualizou o calendario {calendar}",
+    "{actor} shared calendar {calendar} with you" : "{actor} compartiu o calendario {calendar} con vostede",
+    "You shared calendar {calendar} with {user}" : "Vostede compartiu o calendario {calendar} con {user}",
+    "{actor} shared calendar {calendar} with {user}" : "{actor} compartiu o calendario {calendar} con {user}",
+    "{actor} unshared calendar {calendar} from you" : "{actor} deixou de compartir o calendario {calendar} de vostede",
+    "You unshared calendar {calendar} from {user}" : "Vostede deixou de compartir o calendario {calendar} de {user}",
+    "{actor} unshared calendar {calendar} from {user}" : "{actor} deixou de compartir o calendario {calendar} de {user}",
+    "{actor} unshared calendar {calendar} from themselves" : "{actor} deixou de compartir o seu propio calendario {calendar}",
+    "You shared calendar {calendar} with group {group}" : "Vostede compartiu o calendario {calendar} co grupo {group}",
+    "{actor} shared calendar {calendar} with group {group}" : "{actor} compartiu o calendario {calendar} co grupo {group}",
+    "You unshared calendar {calendar} from group {group}" : "Vostede deixou de compartir o calendario {calendar} do grupo {group}",
+    "{actor} unshared calendar {calendar} from group {group}" : "{actor} deixou de compartir o calendario {calendar} do grupo {group}",
+    "{actor} created event {event} in calendar {calendar}" : "{actor} creou o evento {event} no calendario {calendar}",
+    "You created event {event} in calendar {calendar}" : "Vostede creou o evento {event} no calendario {calendar}",
+    "{actor} deleted event {event} from calendar {calendar}" : "{actor} eliminou o evento {event} do calendario {calendar}",
+    "You deleted event {event} from calendar {calendar}" : "Vostede eliminou o evento {event} do calendario {calendar}",
+    "{actor} updated event {event} in calendar {calendar}" : "{actor} actualizou o evento {event} no calendario {calendar}",
+    "You updated event {event} in calendar {calendar}" : "Vostede actualizou o evento {event} no calendario {calendar}",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} creou os asuntos pendentes {todo} na lista {calendar}",
+    "You created todo {todo} in list {calendar}" : "Vostede creou os asuntos pendentes {todo} na lista {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} eliminou os asuntos pendentes {todo} da lista {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Vostede eliminou os asuntos pendentes {todo} da lista {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} actualizou os asuntos pendentes {todo} na lista {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Vostede actualizou os asuntos pendentes {todo} na lista {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} resolveu os asuntos pendentes {todo} na lista {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Vostede resolveu os asuntos pendentes {todo} na lista {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} volveu abrir os asuntos pendentes {todo} na lista {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Vostede volveu abrir os asuntos pendentes {todo} na lista {calendar}",
+    "A <strong>calendar</strong> was modified" : "Foi modificado un <strong>calendario</strong>",
+    "A calendar <strong>event</strong> was modified" : "Foi modificado un <strong>evento</strong> do calendario",
+    "A calendar <strong>todo</strong> was modified" : "Foi modificado un <strong>asunto pendente</strong> do calendario",
+    "Contact birthdays" : "Aniversario do contacto",
+    "Personal" : "Persoal",
+    "Contacts" : "Contactos",
+    "WebDAV" : "WebDAV",
+    "Technical details" : "Detalles técnicos",
+    "Remote Address: %s" : "Enderezo remoto: %s",
+    "Request ID: %s" : "ID da solicitude: %s"
+},
+"nplurals=2; plural=(n != 1);");

apps/dav/l10n/gl.json

@@ -0,0 +1,48 @@
+{ "translations": {
+    "Calendar" : "Calendario",
+    "Todos" : "Asuntos pendentes",
+    "{actor} created calendar {calendar}" : "{actor} creou o calendario {calendar}",
+    "You created calendar {calendar}" : "Vostede creou o calendario {calendar}",
+    "{actor} deleted calendar {calendar}" : "{actor} eliminou o calendario {calendar}",
+    "You deleted calendar {calendar}" : "Vostede eliminou o calendario {calendar}",
+    "{actor} updated calendar {calendar}" : "{actor} actualizou o calendario {calendar}",
+    "You updated calendar {calendar}" : "Vostede actualizou o calendario {calendar}",
+    "{actor} shared calendar {calendar} with you" : "{actor} compartiu o calendario {calendar} con vostede",
+    "You shared calendar {calendar} with {user}" : "Vostede compartiu o calendario {calendar} con {user}",
+    "{actor} shared calendar {calendar} with {user}" : "{actor} compartiu o calendario {calendar} con {user}",
+    "{actor} unshared calendar {calendar} from you" : "{actor} deixou de compartir o calendario {calendar} de vostede",
+    "You unshared calendar {calendar} from {user}" : "Vostede deixou de compartir o calendario {calendar} de {user}",
+    "{actor} unshared calendar {calendar} from {user}" : "{actor} deixou de compartir o calendario {calendar} de {user}",
+    "{actor} unshared calendar {calendar} from themselves" : "{actor} deixou de compartir o seu propio calendario {calendar}",
+    "You shared calendar {calendar} with group {group}" : "Vostede compartiu o calendario {calendar} co grupo {group}",
+    "{actor} shared calendar {calendar} with group {group}" : "{actor} compartiu o calendario {calendar} co grupo {group}",
+    "You unshared calendar {calendar} from group {group}" : "Vostede deixou de compartir o calendario {calendar} do grupo {group}",
+    "{actor} unshared calendar {calendar} from group {group}" : "{actor} deixou de compartir o calendario {calendar} do grupo {group}",
+    "{actor} created event {event} in calendar {calendar}" : "{actor} creou o evento {event} no calendario {calendar}",
+    "You created event {event} in calendar {calendar}" : "Vostede creou o evento {event} no calendario {calendar}",
+    "{actor} deleted event {event} from calendar {calendar}" : "{actor} eliminou o evento {event} do calendario {calendar}",
+    "You deleted event {event} from calendar {calendar}" : "Vostede eliminou o evento {event} do calendario {calendar}",
+    "{actor} updated event {event} in calendar {calendar}" : "{actor} actualizou o evento {event} no calendario {calendar}",
+    "You updated event {event} in calendar {calendar}" : "Vostede actualizou o evento {event} no calendario {calendar}",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} creou os asuntos pendentes {todo} na lista {calendar}",
+    "You created todo {todo} in list {calendar}" : "Vostede creou os asuntos pendentes {todo} na lista {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} eliminou os asuntos pendentes {todo} da lista {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "Vostede eliminou os asuntos pendentes {todo} da lista {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} actualizou os asuntos pendentes {todo} na lista {calendar}",
+    "You updated todo {todo} in list {calendar}" : "Vostede actualizou os asuntos pendentes {todo} na lista {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} resolveu os asuntos pendentes {todo} na lista {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Vostede resolveu os asuntos pendentes {todo} na lista {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} volveu abrir os asuntos pendentes {todo} na lista {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Vostede volveu abrir os asuntos pendentes {todo} na lista {calendar}",
+    "A <strong>calendar</strong> was modified" : "Foi modificado un <strong>calendario</strong>",
+    "A calendar <strong>event</strong> was modified" : "Foi modificado un <strong>evento</strong> do calendario",
+    "A calendar <strong>todo</strong> was modified" : "Foi modificado un <strong>asunto pendente</strong> do calendario",
+    "Contact birthdays" : "Aniversario do contacto",
+    "Personal" : "Persoal",
+    "Contacts" : "Contactos",
+    "WebDAV" : "WebDAV",
+    "Technical details" : "Detalles técnicos",
+    "Remote Address: %s" : "Enderezo remoto: %s",
+    "Request ID: %s" : "ID da solicitude: %s"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/dav/l10n/hu.js

@@ -42,6 +42,7 @@ OC.L10N.register(
     "Contact birthdays" : "Születésnapok",
     "Personal" : "Személyes",
     "Contacts" : "Névjegyek",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Technikai adatok",
     "Remote Address: %s" : "Távoli cím: %s",
     "Request ID: %s" : "Kérelem azonosító: %s"

apps/dav/l10n/hu.json

@@ -40,6 +40,7 @@
     "Contact birthdays" : "Születésnapok",
     "Personal" : "Személyes",
     "Contacts" : "Névjegyek",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Technikai adatok",
     "Remote Address: %s" : "Távoli cím: %s",
     "Request ID: %s" : "Kérelem azonosító: %s"

apps/dav/l10n/it.js

@@ -42,6 +42,7 @@ OC.L10N.register(
     "Contact birthdays" : "Date di nascita dei contatti",
     "Personal" : "Personale",
     "Contacts" : "Contatti",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Dettagli tecnici",
     "Remote Address: %s" : "Indirizzo remoto: %s",
     "Request ID: %s" : "ID richiesta: %s"

apps/dav/l10n/it.json

@@ -40,6 +40,7 @@
     "Contact birthdays" : "Date di nascita dei contatti",
     "Personal" : "Personale",
     "Contacts" : "Contatti",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Dettagli tecnici",
     "Remote Address: %s" : "Indirizzo remoto: %s",
     "Request ID: %s" : "ID richiesta: %s"

apps/dav/l10n/nb.js

@@ -42,6 +42,7 @@ OC.L10N.register(
     "Contact birthdays" : "Kontakters fødelsdag",
     "Personal" : "Personlig",
     "Contacts" : "Kontakter",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Tekniske detaljer",
     "Remote Address: %s" : "Ekstern adresse: %s",
     "Request ID: %s" : "Forespørsel ID: %s"

apps/dav/l10n/nb.json

@@ -40,6 +40,7 @@
     "Contact birthdays" : "Kontakters fødelsdag",
     "Personal" : "Personlig",
     "Contacts" : "Kontakter",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Tekniske detaljer",
     "Remote Address: %s" : "Ekstern adresse: %s",
     "Request ID: %s" : "Forespørsel ID: %s"

apps/dav/l10n/pl.js

@@ -47,4 +47,4 @@ OC.L10N.register(
     "Remote Address: %s" : "Adres zdalny: %s",
     "Request ID: %s" : "ID żądania: %s"
 },
-"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);");
+"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);");

apps/dav/l10n/pl.json

@@ -44,5 +44,5 @@
     "Technical details" : "Szczegóły techniczne",
     "Remote Address: %s" : "Adres zdalny: %s",
     "Request ID: %s" : "ID żądania: %s"
-},"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"
+},"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"
 }

apps/dav/l10n/sq.js

@@ -3,7 +3,7 @@ OC.L10N.register(
     {
     "Calendar" : "Kalendar",
     "Todos" : "Për tu bërë",
-    "{actor} created calendar {calendar}" : "{actor} krijoj kalendarin {calendar}",
+    "{actor} created calendar {calendar}" : "{aktori} krijoi kalendarin {kalendarin}",
     "You created calendar {calendar}" : "Ju krijuat kalendarin {calendar}",
     "{actor} deleted calendar {calendar}" : "{actor} fshiu kalendarin {calendar}",
     "You deleted calendar {calendar}" : "Ju fshit kalendarin {calendar}",
@@ -31,11 +31,18 @@ OC.L10N.register(
     "{actor} deleted todo {todo} from list {calendar}" : "{actor} u fshi todo{ todo} nga lista{calendar}",
     "You deleted todo {todo} from list {calendar}" : "Ju fshit todo{todo} nga lista {calendar}",
     "{actor} updated todo {todo} in list {calendar}" : "{actor} u përditësua todo{todo} në listën{calendar}",
+    "You updated todo {todo} in list {calendar}" : "Ju përditësuat përtëbërë {todo} në listën{calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} zgjidhi përtëbërë {todo} në listën {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Ju zgjidhët përtëbërë {todo} në listën {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} rihapi përtëbërë {todo} në listën {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Ju rihapët përtëbërë {todo} në listën {calendar}",
     "A <strong>calendar</strong> was modified" : "Një <strong>kalendar</strong> u modifikua",
     "A calendar <strong>event</strong> was modified" : "Një <strong>event</strong> në kalendar u modifikua",
     "A calendar <strong>todo</strong> was modified" : "Një kalendar <strong>todo<strong> u modifikua",
+    "Contact birthdays" : "Ditëlindjet e kontakteve",
     "Personal" : "Personale",
     "Contacts" : "Kontaktet",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Detaje teknike",
     "Remote Address: %s" : "Adresa remote: %s",
     "Request ID: %s" : "ID e kërkesës: %s"

apps/dav/l10n/sq.json

@@ -1,7 +1,7 @@
 { "translations": {
     "Calendar" : "Kalendar",
     "Todos" : "Për tu bërë",
-    "{actor} created calendar {calendar}" : "{actor} krijoj kalendarin {calendar}",
+    "{actor} created calendar {calendar}" : "{aktori} krijoi kalendarin {kalendarin}",
     "You created calendar {calendar}" : "Ju krijuat kalendarin {calendar}",
     "{actor} deleted calendar {calendar}" : "{actor} fshiu kalendarin {calendar}",
     "You deleted calendar {calendar}" : "Ju fshit kalendarin {calendar}",
@@ -29,11 +29,18 @@
     "{actor} deleted todo {todo} from list {calendar}" : "{actor} u fshi todo{ todo} nga lista{calendar}",
     "You deleted todo {todo} from list {calendar}" : "Ju fshit todo{todo} nga lista {calendar}",
     "{actor} updated todo {todo} in list {calendar}" : "{actor} u përditësua todo{todo} në listën{calendar}",
+    "You updated todo {todo} in list {calendar}" : "Ju përditësuat përtëbërë {todo} në listën{calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} zgjidhi përtëbërë {todo} në listën {calendar}",
+    "You solved todo {todo} in list {calendar}" : "Ju zgjidhët përtëbërë {todo} në listën {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} rihapi përtëbërë {todo} në listën {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "Ju rihapët përtëbërë {todo} në listën {calendar}",
     "A <strong>calendar</strong> was modified" : "Një <strong>kalendar</strong> u modifikua",
     "A calendar <strong>event</strong> was modified" : "Një <strong>event</strong> në kalendar u modifikua",
     "A calendar <strong>todo</strong> was modified" : "Një kalendar <strong>todo<strong> u modifikua",
+    "Contact birthdays" : "Ditëlindjet e kontakteve",
     "Personal" : "Personale",
     "Contacts" : "Kontaktet",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Detaje teknike",
     "Remote Address: %s" : "Adresa remote: %s",
     "Request ID: %s" : "ID e kërkesës: %s"

apps/dav/l10n/sv.js

@@ -42,6 +42,7 @@ OC.L10N.register(
     "Contact birthdays" : "Födelsedagar",
     "Personal" : "Privat",
     "Contacts" : "Kontakter",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Tekniska detaljer",
     "Remote Address: %s" : "Extern adress: %s",
     "Request ID: %s" : "Begär ID: %s"

apps/dav/l10n/sv.json

@@ -40,6 +40,7 @@
     "Contact birthdays" : "Födelsedagar",
     "Personal" : "Privat",
     "Contacts" : "Kontakter",
+    "WebDAV" : "WebDAV",
     "Technical details" : "Tekniska detaljer",
     "Remote Address: %s" : "Extern adress: %s",
     "Request ID: %s" : "Begär ID: %s"

apps/dav/l10n/tr.js

@@ -6,7 +6,7 @@ OC.L10N.register(
     "{actor} created calendar {calendar}" : "{actor}, {calendar} takvimini ekledi",
     "You created calendar {calendar}" : "{calendar} takvimini eklediniz",
     "{actor} deleted calendar {calendar}" : "{actor}, {calendar} takvimini sildi",
-    "You deleted calendar {calendar}" : "{calendar} takvimi sildiniz",
+    "You deleted calendar {calendar}" : "{calendar} takvimini sildiniz",
     "{actor} updated calendar {calendar}" : "{actor}, {calendar} takvimini güncelledi",
     "You updated calendar {calendar}" : "{calendar} takvimini güncellediniz",
     "{actor} shared calendar {calendar} with you" : "{actor}, {calendar} takvimini sizinle paylaştı",

apps/dav/l10n/tr.json

@@ -4,7 +4,7 @@
     "{actor} created calendar {calendar}" : "{actor}, {calendar} takvimini ekledi",
     "You created calendar {calendar}" : "{calendar} takvimini eklediniz",
     "{actor} deleted calendar {calendar}" : "{actor}, {calendar} takvimini sildi",
-    "You deleted calendar {calendar}" : "{calendar} takvimi sildiniz",
+    "You deleted calendar {calendar}" : "{calendar} takvimini sildiniz",
     "{actor} updated calendar {calendar}" : "{actor}, {calendar} takvimini güncelledi",
     "You updated calendar {calendar}" : "{calendar} takvimini güncellediniz",
     "{actor} shared calendar {calendar} with you" : "{actor}, {calendar} takvimini sizinle paylaştı",

apps/dav/l10n/zh_CN.js

@@ -9,7 +9,7 @@ OC.L10N.register(
     "You deleted calendar {calendar}" : "您删除的日历 {calendar}",
     "{actor} updated calendar {calendar}" : "{actor} 更新了日历 {calendar}",
     "You updated calendar {calendar}" : "您更新了日历 {calendar}",
-    "{actor} shared calendar {calendar} with you" : "{actor} 分享给您的日历 {calendar}",
+    "{actor} shared calendar {calendar} with you" : "{actor} 收到的日历分享 {calendar}",
     "You shared calendar {calendar} with {user}" : "您与 {user} 分享了日历 {calendar}",
     "{actor} shared calendar {calendar} with {user}" : "{actor} 与 {user} 分享了日历 {calendar}",
     "{actor} unshared calendar {calendar} from you" : "{actor} 取消分享 {calendar} 给您",

apps/dav/l10n/zh_CN.json

@@ -7,7 +7,7 @@
     "You deleted calendar {calendar}" : "您删除的日历 {calendar}",
     "{actor} updated calendar {calendar}" : "{actor} 更新了日历 {calendar}",
     "You updated calendar {calendar}" : "您更新了日历 {calendar}",
-    "{actor} shared calendar {calendar} with you" : "{actor} 分享给您的日历 {calendar}",
+    "{actor} shared calendar {calendar} with you" : "{actor} 收到的日历分享 {calendar}",
     "You shared calendar {calendar} with {user}" : "您与 {user} 分享了日历 {calendar}",
     "{actor} shared calendar {calendar} with {user}" : "{actor} 与 {user} 分享了日历 {calendar}",
     "{actor} unshared calendar {calendar} from you" : "{actor} 取消分享 {calendar} 给您",

apps/dav/lib/CalDAV/Activity/Provider/Calendar.php

@@ -84,7 +84,11 @@ class Calendar extends Base {
 
 		$this->l = $this->languageFactory->get('dav', $language);
 
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
+		if ($this->activityManager->getRequirePNG()) {
+			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
+		} else {
+			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
+		}
 
 		if ($event->getSubject() === self::SUBJECT_ADD) {
 			$subject = $this->l->t('{actor} created calendar {calendar}');

apps/dav/lib/CalDAV/Activity/Provider/Event.php

@@ -80,7 +80,11 @@ class Event extends Base {
 
 		$this->l = $this->languageFactory->get('dav', $language);
 
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
+		if ($this->activityManager->getRequirePNG()) {
+			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
+		} else {
+			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
+		}
 
 		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
 			$subject = $this->l->t('{actor} created event {event} in calendar {calendar}');

apps/dav/lib/CalDAV/Activity/Provider/Todo.php

@@ -40,7 +40,11 @@ class Todo extends Event {
 
 		$this->l = $this->languageFactory->get('dav', $language);
 
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg')));
+		if ($this->activityManager->getRequirePNG()) {
+			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.png')));
+		} else {
+			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg')));
+		}
 
 		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo') {
 			$subject = $this->l->t('{actor} created todo {todo} in list {calendar}');

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -276,6 +276,9 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 
 		// query for shared calendars
 		$principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
+		$principals = array_map(function($principal) {
+			return urldecode($principal);
+		}, $principals);
 		$principals[]= $principalUri;
 
 		$fields = array_values($this->propertyMap);
@@ -2009,7 +2012,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 				if (in_array($property->name, self::$indexProperties)) {
 					$value = $property->getValue();
 					// is this a shitty db?
-					if ($this->db->supports4ByteText()) {
+					if (!$this->db->supports4ByteText()) {
 						$value = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $value);
 					}
 					$value = substr($value, 0, 254);

apps/dav/lib/CalDAV/Calendar.php

@@ -122,7 +122,14 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
 				'principal' => $this->getOwner(),
 				'protected' => true,
 			];
+		} else {
+			$acl[] = [
+				'privilege' => '{DAV:}write-properties',
+				'principal' => $this->getOwner(),
+				'protected' => true,
+			];
 		}
+
 		if ($this->getOwner() !== parent::getOwner()) {
 			$acl[] =  [
 					'privilege' => '{DAV:}read',
@@ -135,6 +142,12 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
 					'principal' => parent::getOwner(),
 					'protected' => true,
 				];
+			} else {
+				$acl[] = [
+					'privilege' => '{DAV:}write-properties',
+					'principal' => parent::getOwner(),
+					'protected' => true,
+				];
 			}
 		}
 		if ($this->isPublic()) {

apps/dav/lib/CardDAV/CardDavBackend.php

@@ -162,6 +162,9 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 
 		// query for shared calendars
 		$principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
+		$principals = array_map(function($principal) {
+			return urldecode($principal);
+		}, $principals);
 		$principals[]= $principalUri;
 
 		$query = $this->db->getQueryBuilder();

apps/dav/lib/Connector/Sabre/BearerAuth.php

@@ -25,6 +25,8 @@ use OCP\IRequest;
 use OCP\ISession;
 use OCP\IUserSession;
 use Sabre\DAV\Auth\Backend\AbstractBearer;
+use Sabre\HTTP\RequestInterface;
+use Sabre\HTTP\ResponseInterface;
 
 class BearerAuth extends AbstractBearer {
 	/** @var IUserSession */
@@ -77,4 +79,16 @@ class BearerAuth extends AbstractBearer {
 
 		return false;
 	}
+
+	/**
+	 * \Sabre\DAV\Auth\Backend\AbstractBearer::challenge sets an WWW-Authenticate
+	 * header which some DAV clients can't handle. Thus we override this function
+	 * and make it simply return a 401.
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 */
+	public function challenge(RequestInterface $request, ResponseInterface $response) {
+		$response->setStatus(401);
+	}
 }

apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php

@@ -94,26 +94,9 @@ class ExceptionLoggerPlugin extends \Sabre\DAV\ServerPlugin {
 			$level = \OCP\Util::DEBUG;
 		}
 
-		$message = $ex->getMessage();
-		if ($ex instanceof Exception) {
-			if (empty($message)) {
-				$response = new Response($ex->getHTTPCode());
-				$message = $response->getStatusText();
-			}
-			$message = "HTTP/1.1 {$ex->getHTTPCode()} $message";
-		}
-
-		$user = \OC_User::getUser();
-
-		$exception = [
-			'Message' => $message,
-			'Exception' => $exceptionClass,
-			'Code' => $ex->getCode(),
-			'Trace' => $ex->getTraceAsString(),
-			'File' => $ex->getFile(),
-			'Line' => $ex->getLine(),
-			'User' => $user,
-		];
-		$this->logger->log($level, 'Exception: ' . json_encode($exception), ['app' => $this->appName]);
+		$this->logger->logException($ex, [
+			'app' => $this->appName,
+			'level' => $level,
+		]);
 	}
 }

apps/dav/lib/Connector/Sabre/File.php

@@ -184,7 +184,7 @@ class File extends Node implements IFile {
 						$fileExists = $storage->file_exists($internalPath);
 					}
 					if (!$run || $renameOkay === false || $fileExists === false) {
-						\OCP\Util::writeLog('webdav', 'renaming part file to final file failed', \OCP\Util::ERROR);
+						\OCP\Util::writeLog('webdav', 'renaming part file to final file failed ($run: ' . ( $run ? 'true' : 'false' ) . ', $renameOkay: '  . ( $renameOkay ? 'true' : 'false' ) . ', $fileExists: ' . ( $fileExists ? 'true' : 'false' ) . ')', \OCP\Util::ERROR);
 						throw new Exception('Could not rename part file to final file');
 					}
 				} catch (ForbiddenException $ex) {

apps/dav/lib/Connector/Sabre/FilesPlugin.php

@@ -288,10 +288,16 @@ class FilesPlugin extends ServerPlugin {
 		$httpRequest = $this->server->httpRequest;
 
 		if ($node instanceof \OCA\DAV\Connector\Sabre\Node) {
+			/**
+			 * This was disabled, because it made dir listing throw an exception,
+			 * so users were unable to navigate into folders where one subitem
+			 * is blocked by the files_accesscontrol app, see:
+			 * https://github.com/nextcloud/files_accesscontrol/issues/65
 			if (!$node->getFileInfo()->isReadable()) {
 				// avoid detecting files through this means
 				throw new NotFound();
 			}
+			 */
 
 			$propFind->handle(self::FILEID_PROPERTYNAME, function() use ($node) {
 				return $node->getFileId();

apps/dav/tests/unit/Avatars/AvatarHomeTest.php

@@ -40,6 +40,7 @@ class AvatarHomeTest extends TestCase {
 	private $avatarManager;
 
 	public function setUp() {
+		parent::setUp();
 		$this->avatarManager = $this->createMock(IAvatarManager::class);
 		$this->home = new AvatarHome(['uri' => 'principals/users/admin'], $this->avatarManager);
 	}

apps/dav/tests/unit/CalDAV/AbstractCalDavBackendTest.php

@@ -91,6 +91,9 @@ abstract class AbstractCalDavBackendTest extends TestCase {
 		if (is_null($this->backend)) {
 			return;
 		}
+		$this->principal->expects($this->any())->method('getGroupMembership')
+			->withAnyParameters()
+			->willReturn([self::UNIT_TEST_GROUP, self::UNIT_TEST_GROUP2]);
 		$calendars = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
 		foreach ($calendars as $calendar) {
 			$this->dispatcher->expects($this->at(0))

apps/dav/tests/unit/CalDAV/CalDavBackendTest.php

@@ -539,7 +539,7 @@ CREATED;VALUE=DATE-TIME:20130910T125139Z
 UID:47d15e3ec8
 LAST-MODIFIED;VALUE=DATE-TIME:20130910T125139Z
 DTSTAMP;VALUE=DATE-TIME:20130910T125139Z
-SUMMARY:123 Event
+SUMMARY:123 Event 🙈
 DTSTART;VALUE=DATE-TIME:20130912T130000Z
 DTEND;VALUE=DATE-TIME:20130912T140000Z
 ATTENDEE;CN=test:mailto:foo@bar.com

apps/dav/tests/unit/CalDAV/CalendarTest.php

@@ -191,6 +191,10 @@ class CalendarTest extends TestCase {
 				'privilege' => '{DAV:}read',
 				'principal' => $hasOwnerSet ? 'user1' : 'user2',
 				'protected' => true
+			], [
+				'privilege' => '{DAV:}write-properties',
+				'principal' => $hasOwnerSet ? 'user1' : 'user2',
+				'protected' => true
 			]];
 		}
 		if ($hasOwnerSet) {
@@ -205,6 +209,12 @@ class CalendarTest extends TestCase {
 					'principal' => 'user2',
 					'protected' => true
 				];
+			} else {
+				$expectedAcl[] = [
+					'privilege' => '{DAV:}write-properties',
+					'principal' => 'user2',
+					'protected' => true
+				];
 			}
 		}
 		$this->assertEquals($expectedAcl, $acl);

apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php

@@ -46,6 +46,10 @@ class PublicCalendarRootTest extends TestCase {
 		$this->random = \OC::$server->getSecureRandom();
 		$dispatcher = $this->createMock(EventDispatcherInterface::class);
 
+		$this->principal->expects($this->any())->method('getGroupMembership')
+			->withAnyParameters()
+			->willReturn([]);
+
 		$this->backend = new CalDavBackend(
 			$db,
 			$this->principal,
@@ -66,6 +70,9 @@ class PublicCalendarRootTest extends TestCase {
 		if (is_null($this->backend)) {
 			return;
 		}
+		$this->principal->expects($this->any())->method('getGroupMembership')
+			->withAnyParameters()
+			->willReturn([]);
 		$books = $this->backend->getCalendarsForUser(self::UNIT_TEST_USER);
 		foreach ($books as $book) {
 			$this->backend->deleteCalendar($book['id']);

apps/dav/tests/unit/CardDAV/CardDavBackendTest.php

@@ -113,6 +113,10 @@ class CardDavBackendTest extends TestCase {
 		if (is_null($this->backend)) {
 			return;
 		}
+
+		$this->principal->method('getGroupMembership')
+			->withAnyParameters()
+			->willReturn([self::UNIT_TEST_GROUP]);
 		$books = $this->backend->getAddressBooksForUser(self::UNIT_TEST_USER);
 		foreach ($books as $book) {
 			$this->backend->deleteAddressBook($book['id']);

apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php

@@ -21,9 +21,6 @@
 
 namespace OCA\DAV\Tests\unit\Connector\Sabre;
 
-use OC\Authentication\TwoFactorAuth\Manager;
-use OC\Security\Bruteforce\Throttler;
-use OC\User\Session;
 use OCA\DAV\Connector\Sabre\BearerAuth;
 use OCP\IRequest;
 use OCP\ISession;
@@ -85,4 +82,13 @@ class BearerAuthTest extends TestCase {
 
 		$this->assertSame('principals/users/admin', $this->bearerAuth->validateBearerToken('Token'));
 	}
+
+	public function testChallenge() {
+		/** @var \PHPUnit_Framework_MockObject_MockObject|RequestInterface $request */
+		$request = $this->createMock(RequestInterface::class);
+		/** @var \PHPUnit_Framework_MockObject_MockObject|ResponseInterface $response */
+		$response = $this->createMock(ResponseInterface::class);
+		$result = $this->bearerAuth->challenge($request, $response);
+		$this->assertEmpty($result);
+	}
 }

apps/dav/tests/unit/Connector/Sabre/ExceptionLoggerPluginTest.php

@@ -71,13 +71,13 @@ class ExceptionLoggerPluginTest extends TestCase {
 		$this->plugin->logException($exception);
 
 		$this->assertEquals($expectedLogLevel, $this->logger->level);
-		$this->assertStringStartsWith('Exception: {"Message":"' . $expectedMessage, $this->logger->message);
+		$this->assertStringStartsWith('Exception: {"Exception":' . json_encode(get_class($exception)) . ',"Message":"' . $expectedMessage . '",', $this->logger->message);
 	}
 
 	public function providesExceptions() {
 		return [
-			[0, 'HTTP\/1.1 404 Not Found', new NotFound()],
-			[4, 'HTTP\/1.1 400 This path leads to nowhere', new InvalidPath('This path leads to nowhere')]
+			[0, '', new NotFound()],
+			[4, 'This path leads to nowhere', new InvalidPath('This path leads to nowhere')]
 		];
 	}
 

apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php

@@ -341,11 +341,12 @@ class FilesPluginTest extends TestCase {
 		$this->assertEquals('my_fingerprint', $propFind->get(self::DATA_FINGERPRINT_PROPERTYNAME));
 	}
 
-	/**
-	 * @expectedException \Sabre\DAV\Exception\NotFound
-	 */
 	public function testGetPropertiesWhenNoPermission() {
-		/** @var \OCA\DAV\Connector\Sabre\Directory | \PHPUnit_Framework_MockObject_MockObject $node */
+		// No read permissions can be caused by files access control.
+		// But we still want to load the directory list, so this is okay for us.
+		// $this->expectException(\Sabre\DAV\Exception\NotFound::class);
+
+		/** @var \OCA\DAV\Connector\Sabre\Directory|\PHPUnit_Framework_MockObject_MockObject $node */
 		$node = $this->getMockBuilder('\OCA\DAV\Connector\Sabre\Directory')
 			->disableOriginalConstructor()
 			->getMock();

apps/encryption/l10n/cs.js

@@ -24,6 +24,7 @@ OC.L10N.register(
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Musíte přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou. Spusťte příkaz 'occ encryption:migrate' nebo kontaktujte svého administrátora.",
     "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný soukromý klíč pro šifrovací aplikaci. Aktualizujte prosím heslo svého soukromého klíče v osobním nastavení, abyste znovu získali přístup ke svým zašifrovaným souborům.",
     "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste.",
+    "Please enable server side encryption in the admin settings in order to use the encryption module." : "Chcete-li používat šifrovací modul, povolte prosím šifrování na straně serveru v nastavení administrátora.",
     "Encryption app is enabled and ready" : "Aplikace šifrování je již povolena a připravena",
     "Bad Signature" : "Špatný podpis",
     "Missing Signature" : "Chybějící podpis",

apps/encryption/l10n/cs.json

@@ -22,6 +22,7 @@
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Musíte přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou. Spusťte příkaz 'occ encryption:migrate' nebo kontaktujte svého administrátora.",
     "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný soukromý klíč pro šifrovací aplikaci. Aktualizujte prosím heslo svého soukromého klíče v osobním nastavení, abyste znovu získali přístup ke svým zašifrovaným souborům.",
     "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste.",
+    "Please enable server side encryption in the admin settings in order to use the encryption module." : "Chcete-li používat šifrovací modul, povolte prosím šifrování na straně serveru v nastavení administrátora.",
     "Encryption app is enabled and ready" : "Aplikace šifrování je již povolena a připravena",
     "Bad Signature" : "Špatný podpis",
     "Missing Signature" : "Chybějící podpis",

apps/encryption/l10n/da.js

@@ -24,6 +24,7 @@ OC.L10N.register(
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Du skal overflytte dine krypteringsnøgler fra den gamle kryptering (ownCloud <= 8.0) til den nye af slagsen. Kør venligst \"occ encryption:migrate\" eller kontakt din administrator.",
     "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøgle til Krypteringsprogrammet. Venligst opdater din kode til privat nøgle i dine personlige indstillinger for at gendanne adgang til dine krypterede filer.",
     "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Krypteringsprogrammet er aktiveret, men dine nøgler er ikke indlæst. Log venligst ud og ind igen.",
+    "Please enable server side encryption in the admin settings in order to use the encryption module." : "Venligst aktiver Server kryptering under administrationen hvis du vil anvende krypterings modulet.",
     "Encryption app is enabled and ready" : "Krypteringsprogrammet er aktiveret og klar",
     "Bad Signature" : "Ugyldig signatur",
     "Missing Signature" : "Signatur mangler",
@@ -31,10 +32,10 @@ OC.L10N.register(
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig på ny.",
     "Default encryption module" : "Standard krypterings modul",
-    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hejsa,\n\nadministrator aktiveret kryptering på serverdelen. '%s'.\n\nVenligst log på web brugerfladen, gå til sektionen \"grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.\n\n",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hej,\n\nAdministrator aktiveret kryptering på serverdelen. '%s'.\n\nVenligst log på web brugerfladen, gå til sektionen \"grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.\n\n",
     "The share will expire on %s." : "Delingen vil udløbe om %s.",
     "Cheers!" : "Hej!",
-    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hejsa,<br><br>administrator aktiveret kryptering på serverdelen. Dine file er blevet krypteret med kodeordet <strong>%s</strong>.<br><br>Venligst log på web brugerfladen, gå til sektionen \"grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.<br><br>",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hej,<br><br>administrator aktiveret kryptering på serverdelen. Dine file er blevet krypteret med kodeordet <strong>%s</strong>.<br><br>Venligst log på web brugerfladen, gå til sektionen \"grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.<br><br>",
     "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret men dine nøgler er ikke indlæst, log venligst ud og ind igen",
     "Encrypt the home storage" : "Krypter hjemmelageret",
     "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ved at slå denne valgmulighed til krypteres alle filer i hovedlageret, ellers vil kun filer på eksternt lager blive krypteret",

apps/encryption/l10n/da.json

@@ -22,6 +22,7 @@
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Du skal overflytte dine krypteringsnøgler fra den gamle kryptering (ownCloud <= 8.0) til den nye af slagsen. Kør venligst \"occ encryption:migrate\" eller kontakt din administrator.",
     "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøgle til Krypteringsprogrammet. Venligst opdater din kode til privat nøgle i dine personlige indstillinger for at gendanne adgang til dine krypterede filer.",
     "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Krypteringsprogrammet er aktiveret, men dine nøgler er ikke indlæst. Log venligst ud og ind igen.",
+    "Please enable server side encryption in the admin settings in order to use the encryption module." : "Venligst aktiver Server kryptering under administrationen hvis du vil anvende krypterings modulet.",
     "Encryption app is enabled and ready" : "Krypteringsprogrammet er aktiveret og klar",
     "Bad Signature" : "Ugyldig signatur",
     "Missing Signature" : "Signatur mangler",
@@ -29,10 +30,10 @@
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig på ny.",
     "Default encryption module" : "Standard krypterings modul",
-    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hejsa,\n\nadministrator aktiveret kryptering på serverdelen. '%s'.\n\nVenligst log på web brugerfladen, gå til sektionen \"grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.\n\n",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hej,\n\nAdministrator aktiveret kryptering på serverdelen. '%s'.\n\nVenligst log på web brugerfladen, gå til sektionen \"grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.\n\n",
     "The share will expire on %s." : "Delingen vil udløbe om %s.",
     "Cheers!" : "Hej!",
-    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hejsa,<br><br>administrator aktiveret kryptering på serverdelen. Dine file er blevet krypteret med kodeordet <strong>%s</strong>.<br><br>Venligst log på web brugerfladen, gå til sektionen \"grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.<br><br>",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hej,<br><br>administrator aktiveret kryptering på serverdelen. Dine file er blevet krypteret med kodeordet <strong>%s</strong>.<br><br>Venligst log på web brugerfladen, gå til sektionen \"grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.<br><br>",
     "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret men dine nøgler er ikke indlæst, log venligst ud og ind igen",
     "Encrypt the home storage" : "Krypter hjemmelageret",
     "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ved at slå denne valgmulighed til krypteres alle filer i hovedlageret, ellers vil kun filer på eksternt lager blive krypteret",

apps/encryption/l10n/de.js

@@ -5,58 +5,59 @@ OC.L10N.register(
     "Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
     "Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
     "Recovery key successfully enabled" : "Wiederherstellungsschlüssel wurde erfolgreich aktiviert",
-    "Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
+    "Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfe das Passwort für den Wiederherstellungsschlüssel!",
     "Recovery key successfully disabled" : "Wiederherstellungsschlüssel deaktiviert.",
-    "Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
+    "Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfe das Passwort für den Wiederherstellungsschlüssel!",
     "Missing parameters" : "Fehlende Parameter",
-    "Please provide the old recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
+    "Please provide the old recovery password" : "Bitte das alte Wiederherstellungspasswort eingeben",
     "Please provide a new recovery password" : "Bitte ein neues Wiederherstellungspasswort eingeben",
     "Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
-    "Password successfully changed." : "Dein Passwort wurde geändert.",
+    "Password successfully changed." : "Das Passwort wurde geändert.",
     "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
     "Recovery Key disabled" : "Wiederherstellungsschlüssel deaktiviert",
     "Recovery Key enabled" : "Wiederherstellungsschlüssel aktiviert",
     "Could not enable the recovery key, please try again or contact your administrator" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden, bitte versuche es noch einmal oder kontaktiere Deinen Administrator",
     "Could not update the private key password." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden.",
-    "The old password was not correct, please try again." : "Das alte Passwort war nicht korrekt, bitte versuche es noch einmal.",
+    "The old password was not correct, please try again." : "Das alte Passwort war falsch, bitte versuche es erneut.",
     "The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuche es noch einmal.",
-    "Private key password successfully updated." : "Passwort des privaten Schlüssels erfolgreich aktualisiert",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Verschlüsselungsschlüssel müssen von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migriert werden. Bitte 'occ encryption:migrate' ausführen oder Ihren Administrator kontaktieren.",
+    "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde aktualisiert.",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Verschlüsselungsschlüssel müssen von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migriert werden. Bitte 'occ encryption:migrate' ausführen oder Deinen Administrator kontaktieren.",
     "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Falscher privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisiere Deinen privaten Schlüssel in Deinen persönlichen Einstellungen um wieder Zugriff auf die verschlüsselten Dateien zu erhalten.",
     "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Verschlüsselung-App ist aktiviert, aber Deine Schlüssel sind nicht initialisiert. Bitte melde Dich ab und wieder an.",
+    "Please enable server side encryption in the admin settings in order to use the encryption module." : "Bitte aktiviere server-seitige Verschlüsselung in den Administrator-Einstellungen um das Verschlüsselungsmodul nutzen zu können",
     "Encryption app is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
     "Bad Signature" : "Ungültige Signatur",
     "Missing Signature" : "Fehlende Signatur",
     "one-time password for server-side-encryption" : "Einmal-Passwort für serverseitige Verschlüsselung",
-    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine freigegebene Datei. Bitte den Eigentümer der Datei kontaktieren, um die Datei erneut freizugeben.",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit Dir zu teilen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit Dir zu teilen.",
-    "Default encryption module" : "Standard Verschlüsselungsmodul",
-    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hey,\n\nder Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Kennwort '%s' verschlüsselt.\n\nBitte über die Web-Oberfläche anmelden und die persönlichen Einstellungen aufrufen. Dort findet sich die Option 'Basisverschlüsselungsmodul' und  das Verschlüsselungspasswort kann aktualisiert werden, indem das Passwort in das Feld 'altes Login Passwort' und in das 'aktuelles Login - Passwort'-Feld eingegeben wird.\n\n",
+    "Default encryption module" : "Standard-Verschlüsselungsmodul",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hey,\n\nder Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort '%s' verschlüsselt.\n\nBitte über die Web-Oberfläche anmelden und die persönlichen Einstellungen aufrufen. Dort findet sich die Option 'Basisverschlüsselungsmodul' und  das Verschlüsselungspasswort kann aktualisiert werden, indem das Passwort in das Feld 'altes Anmelde-Passwort' und in das 'aktuelles Anmelde-Passwort'-Feld eingegeben wird.\n\n",
     "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
     "Cheers!" : "Noch einen schönen Tag!",
-    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hallo,<br><br>der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Kennwort <strong>%s</strong> verschlüsselt.<br><br>Bitte melde dich im Web-Interface an, gehe in deine persönlichen Einstellungen. Dort findest du die Option 'Basisverschlüsselungsmodul' und aktualisiere dort dein Verschlüsselungspasswort indem du das Passwort in das 'alte Log - in Passwort' und in das 'aktuellen Login - Passwort' Feld eingibst.<br><br>",
-    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber die Schlüssel sind noch nicht initialisiert. Bitte logge Dich aus und wieder ein.",
-    "Encrypt the home storage" : "Verschlüssle den Speicher",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hallo,<br><br>der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort <strong>%s</strong> verschlüsselt.<br><br>Bitte melde dich im Web-Interface an, gehe in deine persönlichen Einstellungen. Dort findest du die Option 'Basisverschlüsselungsmodul' und aktualisiere dort dein Verschlüsselungspasswort indem du das Passwort in das 'alte Anmelde-Passwort' und in das 'aktuellen Anmelde-Passwort' Feld eingibst.<br><br>",
+    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber die Schlüssel sind noch nicht initialisiert. Bitte melde Dich ab und wieder an",
+    "Encrypt the home storage" : "Benutzerverzeichnis verschlüsseln",
     "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Die Aktivierung dieser Option verschlüsselt alle Dateien die auf dem Hauptspeicher gespeichert sind, ansonsten werden nur Dateien auf dem externen Speicher verschlüsselt",
     "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
     "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
-    "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein oder ihr Passwort vergessen hat.",
-    "Recovery key password" : "Wiederherstellungsschlüssel-Passwort",
+    "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein Passwort vergessen hat.",
+    "Recovery key password" : "Passwort für den Wiederherstellungsschlüsse",
     "Repeat recovery key password" : "Passwort für den Wiederherstellungsschlüssel wiederholen",
-    "Change recovery key password:" : "Wiederherstellungsschlüssel-Passwort ändern:",
+    "Change recovery key password:" : "Passwort für den Wiederherstellungsschlüssel ändern:",
     "Old recovery key password" : "Altes Passwort für den Wiederherstellungsschlüssel",
     "New recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel",
     "Repeat new recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel wiederholen",
     "Change Password" : "Passwort ändern",
     "Basic encryption module" : "Basisverschlüsselungsmodul",
-    "Your private key password no longer matches your log-in password." : "Dein Passwort für Deinen privaten Schlüssel stimmt nicht mehr mit Deinem Loginpasswort überein.",
-    "Set your old private key password to your current log-in password:" : "Dein altes Passwort für Deinen privaten Schlüssel auf Dein aktuelles Anmeldepasswort einstellen:",
-    " If you don't remember your old password you can ask your administrator to recover your files." : "Wenn Du Dein altes Passwort vergessen hast, könntest Du Deinen Administrator bitten, Deine Daten wiederherzustellen.",
-    "Old log-in password" : "Altes Login Passwort",
+    "Your private key password no longer matches your log-in password." : "Das Passwort für Deinen privaten Schlüssel stimmt nicht mehr mit Deinem Anmelde-Passwort überein.",
+    "Set your old private key password to your current log-in password:" : "Dein altes Passwort für den privaten Schlüssel auf Dein aktuelles Anmeldepasswort setzen:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Du Dich nicht an Dein altes Passwort erinnern kannst, frage Deinen Administrator, um Deine Dateien wiederherzustellen.",
+    "Old log-in password" : "Altes Anmelde-Passwort",
     "Current log-in password" : "Aktuelles Passwort",
-    "Update Private Key Password" : "Passwort für den privaten Schlüssel aktualisieren",
-    "Enable password recovery:" : "Passwortwiederherstellung aktivieren:",
-    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Wenn Du diese Option aktivierst, kannst Du Deine verschlüsselten Dateien wiederherstellen, falls Du Dein Passwort vergisst",
+    "Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
+    "Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option hast Du die Möglichkeit, wieder auf Deine verschlüsselten Dateien zugreifen zu können, wenn Du Dein Passwort verloren hast.",
     "Enabled" : "Aktiviert",
     "Disabled" : "Deaktiviert",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselungs-App ist aktiviert, aber deine Schlüssel sind nicht initialisiert. Bitte erneut ab- und wieder anmelden."

apps/encryption/l10n/de.json

@@ -3,58 +3,59 @@
     "Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
     "Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
     "Recovery key successfully enabled" : "Wiederherstellungsschlüssel wurde erfolgreich aktiviert",
-    "Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
+    "Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfe das Passwort für den Wiederherstellungsschlüssel!",
     "Recovery key successfully disabled" : "Wiederherstellungsschlüssel deaktiviert.",
-    "Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
+    "Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfe das Passwort für den Wiederherstellungsschlüssel!",
     "Missing parameters" : "Fehlende Parameter",
-    "Please provide the old recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
+    "Please provide the old recovery password" : "Bitte das alte Wiederherstellungspasswort eingeben",
     "Please provide a new recovery password" : "Bitte ein neues Wiederherstellungspasswort eingeben",
     "Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
-    "Password successfully changed." : "Dein Passwort wurde geändert.",
+    "Password successfully changed." : "Das Passwort wurde geändert.",
     "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
     "Recovery Key disabled" : "Wiederherstellungsschlüssel deaktiviert",
     "Recovery Key enabled" : "Wiederherstellungsschlüssel aktiviert",
     "Could not enable the recovery key, please try again or contact your administrator" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden, bitte versuche es noch einmal oder kontaktiere Deinen Administrator",
     "Could not update the private key password." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden.",
-    "The old password was not correct, please try again." : "Das alte Passwort war nicht korrekt, bitte versuche es noch einmal.",
+    "The old password was not correct, please try again." : "Das alte Passwort war falsch, bitte versuche es erneut.",
     "The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuche es noch einmal.",
-    "Private key password successfully updated." : "Passwort des privaten Schlüssels erfolgreich aktualisiert",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Verschlüsselungsschlüssel müssen von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migriert werden. Bitte 'occ encryption:migrate' ausführen oder Ihren Administrator kontaktieren.",
+    "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde aktualisiert.",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Verschlüsselungsschlüssel müssen von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migriert werden. Bitte 'occ encryption:migrate' ausführen oder Deinen Administrator kontaktieren.",
     "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Falscher privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisiere Deinen privaten Schlüssel in Deinen persönlichen Einstellungen um wieder Zugriff auf die verschlüsselten Dateien zu erhalten.",
     "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Verschlüsselung-App ist aktiviert, aber Deine Schlüssel sind nicht initialisiert. Bitte melde Dich ab und wieder an.",
+    "Please enable server side encryption in the admin settings in order to use the encryption module." : "Bitte aktiviere server-seitige Verschlüsselung in den Administrator-Einstellungen um das Verschlüsselungsmodul nutzen zu können",
     "Encryption app is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
     "Bad Signature" : "Ungültige Signatur",
     "Missing Signature" : "Fehlende Signatur",
     "one-time password for server-side-encryption" : "Einmal-Passwort für serverseitige Verschlüsselung",
-    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine freigegebene Datei. Bitte den Eigentümer der Datei kontaktieren, um die Datei erneut freizugeben.",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit Dir zu teilen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit Dir zu teilen.",
-    "Default encryption module" : "Standard Verschlüsselungsmodul",
-    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hey,\n\nder Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Kennwort '%s' verschlüsselt.\n\nBitte über die Web-Oberfläche anmelden und die persönlichen Einstellungen aufrufen. Dort findet sich die Option 'Basisverschlüsselungsmodul' und  das Verschlüsselungspasswort kann aktualisiert werden, indem das Passwort in das Feld 'altes Login Passwort' und in das 'aktuelles Login - Passwort'-Feld eingegeben wird.\n\n",
+    "Default encryption module" : "Standard-Verschlüsselungsmodul",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hey,\n\nder Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort '%s' verschlüsselt.\n\nBitte über die Web-Oberfläche anmelden und die persönlichen Einstellungen aufrufen. Dort findet sich die Option 'Basisverschlüsselungsmodul' und  das Verschlüsselungspasswort kann aktualisiert werden, indem das Passwort in das Feld 'altes Anmelde-Passwort' und in das 'aktuelles Anmelde-Passwort'-Feld eingegeben wird.\n\n",
     "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
     "Cheers!" : "Noch einen schönen Tag!",
-    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hallo,<br><br>der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Kennwort <strong>%s</strong> verschlüsselt.<br><br>Bitte melde dich im Web-Interface an, gehe in deine persönlichen Einstellungen. Dort findest du die Option 'Basisverschlüsselungsmodul' und aktualisiere dort dein Verschlüsselungspasswort indem du das Passwort in das 'alte Log - in Passwort' und in das 'aktuellen Login - Passwort' Feld eingibst.<br><br>",
-    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber die Schlüssel sind noch nicht initialisiert. Bitte logge Dich aus und wieder ein.",
-    "Encrypt the home storage" : "Verschlüssle den Speicher",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hallo,<br><br>der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort <strong>%s</strong> verschlüsselt.<br><br>Bitte melde dich im Web-Interface an, gehe in deine persönlichen Einstellungen. Dort findest du die Option 'Basisverschlüsselungsmodul' und aktualisiere dort dein Verschlüsselungspasswort indem du das Passwort in das 'alte Anmelde-Passwort' und in das 'aktuellen Anmelde-Passwort' Feld eingibst.<br><br>",
+    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber die Schlüssel sind noch nicht initialisiert. Bitte melde Dich ab und wieder an",
+    "Encrypt the home storage" : "Benutzerverzeichnis verschlüsseln",
     "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Die Aktivierung dieser Option verschlüsselt alle Dateien die auf dem Hauptspeicher gespeichert sind, ansonsten werden nur Dateien auf dem externen Speicher verschlüsselt",
     "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
     "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
-    "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein oder ihr Passwort vergessen hat.",
-    "Recovery key password" : "Wiederherstellungsschlüssel-Passwort",
+    "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein Passwort vergessen hat.",
+    "Recovery key password" : "Passwort für den Wiederherstellungsschlüsse",
     "Repeat recovery key password" : "Passwort für den Wiederherstellungsschlüssel wiederholen",
-    "Change recovery key password:" : "Wiederherstellungsschlüssel-Passwort ändern:",
+    "Change recovery key password:" : "Passwort für den Wiederherstellungsschlüssel ändern:",
     "Old recovery key password" : "Altes Passwort für den Wiederherstellungsschlüssel",
     "New recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel",
     "Repeat new recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel wiederholen",
     "Change Password" : "Passwort ändern",
     "Basic encryption module" : "Basisverschlüsselungsmodul",
-    "Your private key password no longer matches your log-in password." : "Dein Passwort für Deinen privaten Schlüssel stimmt nicht mehr mit Deinem Loginpasswort überein.",
-    "Set your old private key password to your current log-in password:" : "Dein altes Passwort für Deinen privaten Schlüssel auf Dein aktuelles Anmeldepasswort einstellen:",
-    " If you don't remember your old password you can ask your administrator to recover your files." : "Wenn Du Dein altes Passwort vergessen hast, könntest Du Deinen Administrator bitten, Deine Daten wiederherzustellen.",
-    "Old log-in password" : "Altes Login Passwort",
+    "Your private key password no longer matches your log-in password." : "Das Passwort für Deinen privaten Schlüssel stimmt nicht mehr mit Deinem Anmelde-Passwort überein.",
+    "Set your old private key password to your current log-in password:" : "Dein altes Passwort für den privaten Schlüssel auf Dein aktuelles Anmeldepasswort setzen:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Du Dich nicht an Dein altes Passwort erinnern kannst, frage Deinen Administrator, um Deine Dateien wiederherzustellen.",
+    "Old log-in password" : "Altes Anmelde-Passwort",
     "Current log-in password" : "Aktuelles Passwort",
-    "Update Private Key Password" : "Passwort für den privaten Schlüssel aktualisieren",
-    "Enable password recovery:" : "Passwortwiederherstellung aktivieren:",
-    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Wenn Du diese Option aktivierst, kannst Du Deine verschlüsselten Dateien wiederherstellen, falls Du Dein Passwort vergisst",
+    "Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
+    "Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option hast Du die Möglichkeit, wieder auf Deine verschlüsselten Dateien zugreifen zu können, wenn Du Dein Passwort verloren hast.",
     "Enabled" : "Aktiviert",
     "Disabled" : "Deaktiviert",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselungs-App ist aktiviert, aber deine Schlüssel sind nicht initialisiert. Bitte erneut ab- und wieder anmelden."

apps/encryption/l10n/de_DE.js

@@ -12,53 +12,54 @@ OC.L10N.register(
     "Please provide the old recovery password" : "Bitte das alte Wiederherstellungspasswort eingeben",
     "Please provide a new recovery password" : "Bitte ein neues Wiederherstellungspasswort eingeben",
     "Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
-    "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.",
-    "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
+    "Password successfully changed." : "Das Passwort wurde geändert.",
+    "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
     "Recovery Key disabled" : "Wiederherstellungsschlüssel deaktiviert",
     "Recovery Key enabled" : "Wiederherstellungsschlüssel aktiviert",
     "Could not enable the recovery key, please try again or contact your administrator" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden, bitte versuchen Sie es noch einmal oder kontaktieren Sie Ihren Administrator",
     "Could not update the private key password." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden.",
-    "The old password was not correct, please try again." : "Das alte Passwort war falsch, bitte versuchen Sie es  erneut.",
+    "The old password was not correct, please try again." : "Das alte Passwort war falsch, bitte versuchen Sie es erneut.",
     "The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuchen Sie es noch einmal.",
-    "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
+    "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde aktualisiert.",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Sie müssen Ihre Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migrieren. Bitte führen Sie 'occ encryption:migrate' aus oder kontaktieren Sie Ihren Administrator.",
     "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Falscher privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisieren Sie Ihren privaten Schlüssel in Ihren persönlichen Einstellungen um wieder Zugriff auf die verschlüsselten Dateien zu erhalten.",
     "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte melden Sie sich ab und wieder an.",
+    "Please enable server side encryption in the admin settings in order to use the encryption module." : "Bitte aktiviere server-seitige Verschlüsselung in den Administrator-Einstellungen um das Verschlüsselungsmodul nutzen zu können",
     "Encryption app is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
     "Bad Signature" : "Falsche Signatur",
     "Missing Signature" : "Fehlende Signatur",
-    "one-time password for server-side-encryption" : "Einmalpasswort für Serverseitige Verschlüsselung",
+    "one-time password for server-side-encryption" : "Einmal-Passwort für serverseitige Verschlüsselung",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.",
-    "Default encryption module" : "Standard Verschlüsselungsmodul",
-    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hey,\n\nder Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Kennwort '%s' verschlüsselt.\n\nBitte melden Sie sich im Web-Interface an, gehen Sie in ihre persönlichen Einstellungen. Dort finden Sie die Option 'Basisverschlüsselungsmodul' und aktualisieren Sie dort ihr Verschlüsselungspasswort indem Sie das Passwort in das 'alte Log - in Passwort' und in das 'aktuellen Login - Passwort' Feld eingeben.\n\n",
+    "Default encryption module" : "Standard-Verschlüsselungsmodul",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hey,\n\nder Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort '%s' verschlüsselt.\n\nBitte melden Sie sich im Web-Oberfläche an, gehen Sie in ihre persönlichen Einstellungen. Dort finden Sie die Option 'Basisverschlüsselungsmodul' und aktualisieren Sie dort ihr Verschlüsselungspasswort indem Sie das Passwort in das 'altes Anmelde-Passwort' und in das 'aktuelles Anmelde-Passwort' Feld eingeben.\n\n",
     "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
     "Cheers!" : "Noch einen schönen Tag!",
-    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hollo,<br><br>der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Kennwort <strong>%s</strong> verschlüsselt.<br><br>Bitte melden Sie sich im Web-Interface an und gehen Sie in ihre persönlichen Einstellungen. Dort finden Sie die Option 'Basisverschlüsselungsmodul' und aktualisieren Sie dort Ihr Verschlüsselungspasswort indem Sie das Passwort in das 'alte Login-Passwort-' und in das 'aktuelles Login-Passwort' Feld eingeben.<br><br>",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hollo,<br><br>der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort <strong>%s</strong> verschlüsselt.<br><br>Bitte melden Sie sich im Web-Interface an und gehen Sie in ihre persönlichen Einstellungen. Dort finden Sie die Option 'Basisverschlüsselungsmodul' und aktualisieren Sie dort Ihr Verschlüsselungspasswort indem Sie das Passwort in das 'altes Anmelde-Passwort-' und in das 'aktuelles Anmelde-Passwort' Feld eingeben.<br><br>",
     "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber die Schlüssel sind noch nicht initialisiert. Bitte melden Sie sich ab und wieder an",
-    "Encrypt the home storage" : "Benutzerverzeichnis verschlüsslen",
+    "Encrypt the home storage" : "Benutzerverzeichnis verschlüsseln",
     "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Die Aktivierung dieser Option verschlüsselt alle Dateien die auf dem Hauptspeicher gespeichert sind, ansonsten werden nur Dateien auf dem externen Speicher verschlüsselt",
     "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
     "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein Passwort vergessen hat.",
-    "Recovery key password" : "Wiederherstellungschlüsselpasswort",
+    "Recovery key password" : "Passwort für den Wiederherstellungsschlüsse",
     "Repeat recovery key password" : "Passwort für den Wiederherstellungsschlüssel wiederholen",
-    "Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern",
+    "Change recovery key password:" : "Passwort für den Wiederherstellungsschlüssel ändern",
     "Old recovery key password" : "Altes Passwort für den Wiederherstellungsschlüssel",
     "New recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel",
     "Repeat new recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel wiederholen",
     "Change Password" : "Passwort ändern",
     "Basic encryption module" : "Basisverschlüsselungsmodul",
-    "Your private key password no longer matches your log-in password." : "Das Privatschlüsselpasswort stimmt nicht länger mit dem Anmeldepasswort überein.",
-    "Set your old private key password to your current log-in password:" : "Ihr altes Privatschlüsselpasswort auf Ihr aktuelles Anmeldepasswort stellen:",
+    "Your private key password no longer matches your log-in password." : "Das Passwort für Ihren privaten Schlüssel stimmt nicht mehr mit Ihrem Anmelde-Passwort überein.",
+    "Set your old private key password to your current log-in password:" : "Ihr altes Passwort für den privaten Schlüssel auf Ihr aktuelles Anmeldepasswort setzen:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
-    "Old log-in password" : "Altes Anmeldepasswort",
+    "Old log-in password" : "Altes Anmelde-Passwort",
     "Current log-in password" : "Aktuelles Anmeldepasswort",
     "Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
     "Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
     "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.",
     "Enabled" : "Aktiviert",
     "Disabled" : "Deaktiviert",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden."
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte erneut ab- und wieder anmelden."
 },
 "nplurals=2; plural=(n != 1);");

apps/encryption/l10n/de_DE.json

@@ -10,53 +10,54 @@
     "Please provide the old recovery password" : "Bitte das alte Wiederherstellungspasswort eingeben",
     "Please provide a new recovery password" : "Bitte ein neues Wiederherstellungspasswort eingeben",
     "Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
-    "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.",
-    "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
+    "Password successfully changed." : "Das Passwort wurde geändert.",
+    "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
     "Recovery Key disabled" : "Wiederherstellungsschlüssel deaktiviert",
     "Recovery Key enabled" : "Wiederherstellungsschlüssel aktiviert",
     "Could not enable the recovery key, please try again or contact your administrator" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden, bitte versuchen Sie es noch einmal oder kontaktieren Sie Ihren Administrator",
     "Could not update the private key password." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden.",
-    "The old password was not correct, please try again." : "Das alte Passwort war falsch, bitte versuchen Sie es  erneut.",
+    "The old password was not correct, please try again." : "Das alte Passwort war falsch, bitte versuchen Sie es erneut.",
     "The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuchen Sie es noch einmal.",
-    "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
+    "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde aktualisiert.",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Sie müssen Ihre Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migrieren. Bitte führen Sie 'occ encryption:migrate' aus oder kontaktieren Sie Ihren Administrator.",
     "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Falscher privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisieren Sie Ihren privaten Schlüssel in Ihren persönlichen Einstellungen um wieder Zugriff auf die verschlüsselten Dateien zu erhalten.",
     "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte melden Sie sich ab und wieder an.",
+    "Please enable server side encryption in the admin settings in order to use the encryption module." : "Bitte aktiviere server-seitige Verschlüsselung in den Administrator-Einstellungen um das Verschlüsselungsmodul nutzen zu können",
     "Encryption app is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
     "Bad Signature" : "Falsche Signatur",
     "Missing Signature" : "Fehlende Signatur",
-    "one-time password for server-side-encryption" : "Einmalpasswort für Serverseitige Verschlüsselung",
+    "one-time password for server-side-encryption" : "Einmal-Passwort für serverseitige Verschlüsselung",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.",
-    "Default encryption module" : "Standard Verschlüsselungsmodul",
-    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hey,\n\nder Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Kennwort '%s' verschlüsselt.\n\nBitte melden Sie sich im Web-Interface an, gehen Sie in ihre persönlichen Einstellungen. Dort finden Sie die Option 'Basisverschlüsselungsmodul' und aktualisieren Sie dort ihr Verschlüsselungspasswort indem Sie das Passwort in das 'alte Log - in Passwort' und in das 'aktuellen Login - Passwort' Feld eingeben.\n\n",
+    "Default encryption module" : "Standard-Verschlüsselungsmodul",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hey,\n\nder Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort '%s' verschlüsselt.\n\nBitte melden Sie sich im Web-Oberfläche an, gehen Sie in ihre persönlichen Einstellungen. Dort finden Sie die Option 'Basisverschlüsselungsmodul' und aktualisieren Sie dort ihr Verschlüsselungspasswort indem Sie das Passwort in das 'altes Anmelde-Passwort' und in das 'aktuelles Anmelde-Passwort' Feld eingeben.\n\n",
     "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
     "Cheers!" : "Noch einen schönen Tag!",
-    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hollo,<br><br>der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Kennwort <strong>%s</strong> verschlüsselt.<br><br>Bitte melden Sie sich im Web-Interface an und gehen Sie in ihre persönlichen Einstellungen. Dort finden Sie die Option 'Basisverschlüsselungsmodul' und aktualisieren Sie dort Ihr Verschlüsselungspasswort indem Sie das Passwort in das 'alte Login-Passwort-' und in das 'aktuelles Login-Passwort' Feld eingeben.<br><br>",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hollo,<br><br>der Administrator hat die servereitige Verschlüsselung aktiviert. Die Dateien wurden mit dem Passwort <strong>%s</strong> verschlüsselt.<br><br>Bitte melden Sie sich im Web-Interface an und gehen Sie in ihre persönlichen Einstellungen. Dort finden Sie die Option 'Basisverschlüsselungsmodul' und aktualisieren Sie dort Ihr Verschlüsselungspasswort indem Sie das Passwort in das 'altes Anmelde-Passwort-' und in das 'aktuelles Anmelde-Passwort' Feld eingeben.<br><br>",
     "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber die Schlüssel sind noch nicht initialisiert. Bitte melden Sie sich ab und wieder an",
-    "Encrypt the home storage" : "Benutzerverzeichnis verschlüsslen",
+    "Encrypt the home storage" : "Benutzerverzeichnis verschlüsseln",
     "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Die Aktivierung dieser Option verschlüsselt alle Dateien die auf dem Hauptspeicher gespeichert sind, ansonsten werden nur Dateien auf dem externen Speicher verschlüsselt",
     "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
     "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein Passwort vergessen hat.",
-    "Recovery key password" : "Wiederherstellungschlüsselpasswort",
+    "Recovery key password" : "Passwort für den Wiederherstellungsschlüsse",
     "Repeat recovery key password" : "Passwort für den Wiederherstellungsschlüssel wiederholen",
-    "Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern",
+    "Change recovery key password:" : "Passwort für den Wiederherstellungsschlüssel ändern",
     "Old recovery key password" : "Altes Passwort für den Wiederherstellungsschlüssel",
     "New recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel",
     "Repeat new recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel wiederholen",
     "Change Password" : "Passwort ändern",
     "Basic encryption module" : "Basisverschlüsselungsmodul",
-    "Your private key password no longer matches your log-in password." : "Das Privatschlüsselpasswort stimmt nicht länger mit dem Anmeldepasswort überein.",
-    "Set your old private key password to your current log-in password:" : "Ihr altes Privatschlüsselpasswort auf Ihr aktuelles Anmeldepasswort stellen:",
+    "Your private key password no longer matches your log-in password." : "Das Passwort für Ihren privaten Schlüssel stimmt nicht mehr mit Ihrem Anmelde-Passwort überein.",
+    "Set your old private key password to your current log-in password:" : "Ihr altes Passwort für den privaten Schlüssel auf Ihr aktuelles Anmeldepasswort setzen:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
-    "Old log-in password" : "Altes Anmeldepasswort",
+    "Old log-in password" : "Altes Anmelde-Passwort",
     "Current log-in password" : "Aktuelles Anmeldepasswort",
     "Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
     "Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
     "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.",
     "Enabled" : "Aktiviert",
     "Disabled" : "Deaktiviert",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden."
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte erneut ab- und wieder anmelden."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

apps/encryption/l10n/el.js

@@ -3,7 +3,7 @@ OC.L10N.register(
     {
     "Missing recovery key password" : "Λείπει το κλειδί επαναφοράς κωδικού",
     "Please repeat the recovery key password" : "Παρακαλώ επαναλάβετε το κλειδί επαναφοράς κωδικού",
-    "Repeated recovery key password does not match the provided recovery key password" : "Η επανάληψη του κλειδιού επαναφοράς κωδικού δεν ταιριάζει με το δοσμένο κλειδί επαναφοράς κωδικού",
+    "Repeated recovery key password does not match the provided recovery key password" : "Ο επαναλαμβανόμενος κωδικός πρόσβασης ανάκτησης δεν ταιριάζει με τον παρεχόμενο κωδικό πρόσβασης κλειδιού ανάκτησης",
     "Recovery key successfully enabled" : "Επιτυχής ενεργοποίηση κλειδιού ανάκτησης",
     "Could not enable recovery key. Please check your recovery key password!" : "Αποτυχία ενεργοποίησης κλειδιού ανάκτησης. Παρακαλώ ελέγξτε τον κωδικό του κλειδιού ανάκτησής σας!",
     "Recovery key successfully disabled" : "Επιτυχής απενεργοποίηση κλειδιού ανάκτησης",
@@ -23,6 +23,8 @@ OC.L10N.register(
     "Private key password successfully updated." : "Το Προσωπικό κλειδί πρόσβασης ενημερώθηκε επιτυχώς",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Πρέπει να μεταφέρετε τα κλειδιά κρυπτογράφησής σας από την παλιά κρυπτογράφηση (ownCloud <= 8.0) στην καινούρια. Παρακαλούμε εκτελέστε την εντολή 'occ encryption:migrate' ή επικοινωνήστε με το διαχειριστή σας.",
     "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Άκυρο προσωπικό κλειδί για την εφαρμογή κρυπτογράφησης. Παρακαλώ ενημερώστε τον κωδικό του προσωπικού κλειδιού σας στις προσωπικές ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
+    "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν αρχικοποιηθεί. Πραγματοποιήστε έξοδο και είσοδο στην εφαρμογή εκ νέου.",
+    "Please enable server side encryption in the admin settings in order to use the encryption module." : "Παρακαλούμε ενεργοποιήστε την κρυπτογράφηση στον διακομιστή, στις ρυθμίσεις διαχειριστή για να χρησιμοποιήσετε την κρυπτογράφηση",
     "Encryption app is enabled and ready" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη και έτοιμη",
     "Bad Signature" : "Κακή υπογραφή",
     "Missing Signature" : "Ελλιπής υπογραφή",

apps/encryption/l10n/el.json

@@ -1,7 +1,7 @@
 { "translations": {
     "Missing recovery key password" : "Λείπει το κλειδί επαναφοράς κωδικού",
     "Please repeat the recovery key password" : "Παρακαλώ επαναλάβετε το κλειδί επαναφοράς κωδικού",
-    "Repeated recovery key password does not match the provided recovery key password" : "Η επανάληψη του κλειδιού επαναφοράς κωδικού δεν ταιριάζει με το δοσμένο κλειδί επαναφοράς κωδικού",
+    "Repeated recovery key password does not match the provided recovery key password" : "Ο επαναλαμβανόμενος κωδικός πρόσβασης ανάκτησης δεν ταιριάζει με τον παρεχόμενο κωδικό πρόσβασης κλειδιού ανάκτησης",
     "Recovery key successfully enabled" : "Επιτυχής ενεργοποίηση κλειδιού ανάκτησης",
     "Could not enable recovery key. Please check your recovery key password!" : "Αποτυχία ενεργοποίησης κλειδιού ανάκτησης. Παρακαλώ ελέγξτε τον κωδικό του κλειδιού ανάκτησής σας!",
     "Recovery key successfully disabled" : "Επιτυχής απενεργοποίηση κλειδιού ανάκτησης",
@@ -21,6 +21,8 @@
     "Private key password successfully updated." : "Το Προσωπικό κλειδί πρόσβασης ενημερώθηκε επιτυχώς",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Πρέπει να μεταφέρετε τα κλειδιά κρυπτογράφησής σας από την παλιά κρυπτογράφηση (ownCloud <= 8.0) στην καινούρια. Παρακαλούμε εκτελέστε την εντολή 'occ encryption:migrate' ή επικοινωνήστε με το διαχειριστή σας.",
     "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Άκυρο προσωπικό κλειδί για την εφαρμογή κρυπτογράφησης. Παρακαλώ ενημερώστε τον κωδικό του προσωπικού κλειδιού σας στις προσωπικές ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
+    "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν αρχικοποιηθεί. Πραγματοποιήστε έξοδο και είσοδο στην εφαρμογή εκ νέου.",
+    "Please enable server side encryption in the admin settings in order to use the encryption module." : "Παρακαλούμε ενεργοποιήστε την κρυπτογράφηση στον διακομιστή, στις ρυθμίσεις διαχειριστή για να χρησιμοποιήσετε την κρυπτογράφηση",
     "Encryption app is enabled and ready" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη και έτοιμη",
     "Bad Signature" : "Κακή υπογραφή",
     "Missing Signature" : "Ελλιπής υπογραφή",

apps/encryption/l10n/en_GB.js

@@ -22,15 +22,21 @@ OC.L10N.register(
     "The current log-in password was not correct, please try again." : "The current log-in password was not correct, please try again.",
     "Private key password successfully updated." : "Private key password updated successfully.",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator",
+    "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files.",
+    "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.",
+    "Please enable server side encryption in the admin settings in order to use the encryption module." : "Please enable server side encryption in the admin settings in order to use the encryption module.",
+    "Encryption app is enabled and ready" : "Encryption app is enabled and ready",
     "Bad Signature" : "Bad Signature",
     "Missing Signature" : "Missing Signature",
     "one-time password for server-side-encryption" : "one-time password for server-side-encryption",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Cannot decrypt this file, which is probably a shared file. Please ask the file owner to reshare the file with you.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you.",
+    "Default encryption module" : "Default encryption module",
     "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n",
     "The share will expire on %s." : "The share will expire on %s.",
     "Cheers!" : "Cheers!",
     "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>",
+    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption app is enabled but your keys are not initialised, please log-out and log-in again",
     "Encrypt the home storage" : "Encrypt the home storage",
     "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted",
     "Enable recovery key" : "Enable recovery key",
@@ -43,6 +49,7 @@ OC.L10N.register(
     "New recovery key password" : "New recovery key password",
     "Repeat new recovery key password" : "Repeat new recovery key password",
     "Change Password" : "Change Password",
+    "Basic encryption module" : "Basic encryption module",
     "Your private key password no longer matches your log-in password." : "Your private key password no longer matches your log-in password.",
     "Set your old private key password to your current log-in password:" : "Set your old private key password to your current log-in password:",
     " If you don't remember your old password you can ask your administrator to recover your files." : " If you don't remember your old password you can ask your administrator to recover your files.",