Merge branch 'master' into enh/file_versions/fix_behaviourenh/file_versions/fix_behaviour

Signed-off-by: Raul <raul@nextcloud.com>

# Conflicts:
#	lib/Backgroundjobs/Cleanup.php
#	lib/Db/WopiMapper.php

1 files changed, 7 insertions, 1 deletions

diff --git a/l10n/ast.js b/l10n/ast.js
index c851b849..6a74ae56 100644
--- a/l10n/ast.js
+++ b/l10n/ast.js
@@ -8,15 +8,18 @@ OC.L10N.register(
     "New Document.docx" : "Documentu.docx nuevu",
     "New Spreadsheet.xlsx" : "Fueya_de_cálculu.xlsx nueva",
     "New Presentation.pptx" : "Presentación.pptx nueva",
+    "File already exists" : "Yá esiste'l ficheru",
     "Saved" : "Guardóse",
     "Saved with error: Collabora Online should use the same protocol as the server installation." : "Guardóse con fallos: Collabora Online debería usar el mesmu protocolu que'l de la instalación del sirvidor.",
     "File is too big" : "El ficheru ye pergrande",
     "Invalid file provided" : "Apurrióse un ficheru non válidu",
+    "Office" : "Oficina",
     "Advanced settings" : "Axustes avanzaos",
     "Select groups" : "Esbillar grupos",
     "Description" : "Descripción",
     "No results" : "Ensin resultaos",
     "Cancel" : "Encaboxar",
+    "Close" : "Zarrar",
     "Error" : "Fallu",
     "Nickname" : "Nomatu",
     "Save" : "Guardar",
@@ -28,6 +31,9 @@ OC.L10N.register(
     "Guest" : "Convidáu/ada",
     "Failed to revert the document to older version" : "Fallu al revertir el documentu a la versión más vieya",
     "Could not create file" : "Nun pudo crease'l ficheru",
-    "Create" : "Crear"
+    "Create" : "Crear",
+    "New Document" : "Documentu nuevu",
+    "New Spreadsheet" : "Fueya nueva de cálculu",
+    "New Presentation" : "Presentación nueva"
 },
 "nplurals=2; plural=(n != 1);");