Merge branch 'master' into enh/dad

l10n/af.js

@@ -24,6 +24,7 @@ OC.L10N.register(
     "Comments" : "Kommentare",
     "Modified" : "Gewysig",
     "Created" : "Geskep",
+    "File already exists" : "Lêer bestaan reeds",
     "Save" : "Stoor",
     "Reply" : "Antwoord",
     "Update" : "Werk by",

l10n/af.json

@@ -22,6 +22,7 @@
     "Comments" : "Kommentare",
     "Modified" : "Gewysig",
     "Created" : "Geskep",
+    "File already exists" : "Lêer bestaan reeds",
     "Save" : "Stoor",
     "Reply" : "Antwoord",
     "Update" : "Werk by",

l10n/ast.js

@@ -30,6 +30,7 @@ OC.L10N.register(
     "Comments" : "Comentarios",
     "Modified" : "Modificóse'l",
     "Created" : "Creóse",
+    "File already exists" : "Yá esiste'l ficheru",
     "Save" : "Guardar",
     "Reply" : "Rempuesta",
     "Update" : "Anovar",

l10n/ast.json

@@ -28,6 +28,7 @@
     "Comments" : "Comentarios",
     "Modified" : "Modificóse'l",
     "Created" : "Creóse",
+    "File already exists" : "Yá esiste'l ficheru",
     "Save" : "Guardar",
     "Reply" : "Rempuesta",
     "Update" : "Anovar",

l10n/bg.js

@@ -32,6 +32,8 @@ OC.L10N.register(
     "Modified" : "Промяна",
     "Created" : "Създаден",
     "Upload attachment" : "Качване",
+    "File already exists" : "Файлът вече съществува",
+    "Do you want to overwrite it?" : "Искате ли да го презапишете?",
     "Save" : "Запазване",
     "Reply" : "Отговори",
     "Update" : "Обновяване",

l10n/bg.json

@@ -30,6 +30,8 @@
     "Modified" : "Промяна",
     "Created" : "Създаден",
     "Upload attachment" : "Качване",
+    "File already exists" : "Файлът вече съществува",
+    "Do you want to overwrite it?" : "Искате ли да го презапишете?",
     "Save" : "Запазване",
     "Reply" : "Отговори",
     "Update" : "Обновяване",

l10n/de_DE.js

@@ -159,6 +159,9 @@ OC.L10N.register(
     "Modified" : "Geändert",
     "Created" : "Erstellt",
     "Upload attachment" : "Anhang hochladen",
+    "File already exists" : "Datei bereits vorhanden",
+    "Do you want to overwrite it?" : "Soll überschrieben werden?",
+    "Maximum file size of {size} exceeded" : "Maximale Dateigröße von {size} überschritten",
     "No comments yet. Begin the discussion!" : "Bislang keine Kommentare. Beginnen Sie die Diskussion!",
     "Save" : "Speichern",
     "The comment cannot be empty." : "Der Kommentar darf nicht leer sein.",

l10n/de_DE.json

@@ -157,6 +157,9 @@
     "Modified" : "Geändert",
     "Created" : "Erstellt",
     "Upload attachment" : "Anhang hochladen",
+    "File already exists" : "Datei bereits vorhanden",
+    "Do you want to overwrite it?" : "Soll überschrieben werden?",
+    "Maximum file size of {size} exceeded" : "Maximale Dateigröße von {size} überschritten",
     "No comments yet. Begin the discussion!" : "Bislang keine Kommentare. Beginnen Sie die Diskussion!",
     "Save" : "Speichern",
     "The comment cannot be empty." : "Der Kommentar darf nicht leer sein.",

l10n/el.js

@@ -159,6 +159,9 @@ OC.L10N.register(
     "Modified" : "Τροποποιήθηκε",
     "Created" : "Δημιουργήθηκε",
     "Upload attachment" : "Μεταφόρτωση συνημμένων",
+    "File already exists" : "Το αρχείο υπάρχει ήδη",
+    "Do you want to overwrite it?" : "Επιθυμείτε να γίνει αντικατάσταση του?",
+    "Maximum file size of {size} exceeded" : "Υπέρβαση επιτρεπόμενου μεγέθους αρχείου {size}",
     "No comments yet. Begin the discussion!" : "Χωρίς σχόλια ακόμη. Ξεκινήστε την συζήτηση!",
     "Save" : "Αποθήκευση",
     "The comment cannot be empty." : "Το σχόλιο δεν μπορεί να είναι κενό.",

l10n/el.json

@@ -157,6 +157,9 @@
     "Modified" : "Τροποποιήθηκε",
     "Created" : "Δημιουργήθηκε",
     "Upload attachment" : "Μεταφόρτωση συνημμένων",
+    "File already exists" : "Το αρχείο υπάρχει ήδη",
+    "Do you want to overwrite it?" : "Επιθυμείτε να γίνει αντικατάσταση του?",
+    "Maximum file size of {size} exceeded" : "Υπέρβαση επιτρεπόμενου μεγέθους αρχείου {size}",
     "No comments yet. Begin the discussion!" : "Χωρίς σχόλια ακόμη. Ξεκινήστε την συζήτηση!",
     "Save" : "Αποθήκευση",
     "The comment cannot be empty." : "Το σχόλιο δεν μπορεί να είναι κενό.",

l10n/en_GB.js

@@ -44,6 +44,8 @@ OC.L10N.register(
     "Modified" : "Modified",
     "Created" : "Created",
     "Upload attachment" : "Upload attachment",
+    "File already exists" : "File already exists",
+    "Do you want to overwrite it?" : "Do you want to overwrite it?",
     "Save" : "Save",
     "Reply" : "Reply",
     "Update" : "Update",

l10n/en_GB.json

@@ -42,6 +42,8 @@
     "Modified" : "Modified",
     "Created" : "Created",
     "Upload attachment" : "Upload attachment",
+    "File already exists" : "File already exists",
+    "Do you want to overwrite it?" : "Do you want to overwrite it?",
     "Save" : "Save",
     "Reply" : "Reply",
     "Update" : "Update",

l10n/eo.js

@@ -129,6 +129,8 @@ OC.L10N.register(
     "Modified" : "Modifita",
     "Created" : "Kreita",
     "Upload attachment" : "Alŝuti dosieran aldonaĵon",
+    "File already exists" : "La dosiero jam ekzistas",
+    "Maximum file size of {size} exceeded" : "Maksimuma dosiergrando {size} transpasita",
     "Save" : "Konservi",
     "Reply" : "Respondi",
     "Update" : "Ĝisdatigi",

l10n/eo.json

@@ -127,6 +127,8 @@
     "Modified" : "Modifita",
     "Created" : "Kreita",
     "Upload attachment" : "Alŝuti dosieran aldonaĵon",
+    "File already exists" : "La dosiero jam ekzistas",
+    "Maximum file size of {size} exceeded" : "Maksimuma dosiergrando {size} transpasita",
     "Save" : "Konservi",
     "Reply" : "Respondi",
     "Update" : "Ĝisdatigi",

l10n/es_419.js

@@ -39,6 +39,8 @@ OC.L10N.register(
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_419.json

@@ -37,6 +37,8 @@
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_CL.js

@@ -42,6 +42,8 @@ OC.L10N.register(
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_CL.json

@@ -40,6 +40,8 @@
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_CO.js

@@ -42,6 +42,8 @@ OC.L10N.register(
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_CO.json

@@ -40,6 +40,8 @@
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_CR.js

@@ -42,6 +42,8 @@ OC.L10N.register(
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_CR.json

@@ -40,6 +40,8 @@
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_DO.js

@@ -42,6 +42,8 @@ OC.L10N.register(
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_DO.json

@@ -40,6 +40,8 @@
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_EC.js

@@ -42,6 +42,8 @@ OC.L10N.register(
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_EC.json

@@ -40,6 +40,8 @@
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_GT.js

@@ -42,6 +42,8 @@ OC.L10N.register(
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_GT.json

@@ -40,6 +40,8 @@
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_HN.js

@@ -38,6 +38,8 @@ OC.L10N.register(
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_HN.json

@@ -36,6 +36,8 @@
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_MX.js

@@ -44,6 +44,8 @@ OC.L10N.register(
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_MX.json

@@ -42,6 +42,8 @@
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_NI.js

@@ -38,6 +38,8 @@ OC.L10N.register(
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_NI.json

@@ -36,6 +36,8 @@
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_PA.js

@@ -38,6 +38,8 @@ OC.L10N.register(
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_PA.json

@@ -36,6 +36,8 @@
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_PE.js

@@ -38,6 +38,8 @@ OC.L10N.register(
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_PE.json

@@ -36,6 +36,8 @@
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_PR.js

@@ -38,6 +38,8 @@ OC.L10N.register(
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_PR.json

@@ -36,6 +36,8 @@
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_SV.js

@@ -42,6 +42,8 @@ OC.L10N.register(
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_SV.json

@@ -40,6 +40,8 @@
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_UY.js

@@ -38,6 +38,8 @@ OC.L10N.register(
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/es_UY.json

@@ -36,6 +36,8 @@
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Cargar adjunto",
+    "File already exists" : "El archivo ya existe",
+    "Do you want to overwrite it?" : "¿Deseas sobre escribirlo?",
     "Save" : "Guardar",
     "Reply" : "Responder",
     "Update" : "Actualizar",

l10n/fi.js

@@ -126,6 +126,9 @@ OC.L10N.register(
     "Modified" : "Muokattu",
     "Created" : "Luotu",
     "Upload attachment" : "Lähetä liite",
+    "File already exists" : "Tiedosto on jo olemassa",
+    "Do you want to overwrite it?" : "Haluatko ylikirjoittaa sen?",
+    "Maximum file size of {size} exceeded" : "Tiedoston enimmäiskoko {size} ylitetty",
     "Save" : "Tallenna",
     "Reply" : "Vastaa",
     "Update" : "Päivitä",

l10n/fi.json

@@ -124,6 +124,9 @@
     "Modified" : "Muokattu",
     "Created" : "Luotu",
     "Upload attachment" : "Lähetä liite",
+    "File already exists" : "Tiedosto on jo olemassa",
+    "Do you want to overwrite it?" : "Haluatko ylikirjoittaa sen?",
+    "Maximum file size of {size} exceeded" : "Tiedoston enimmäiskoko {size} ylitetty",
     "Save" : "Tallenna",
     "Reply" : "Vastaa",
     "Update" : "Päivitä",

l10n/fr.js

@@ -159,6 +159,9 @@ OC.L10N.register(
     "Modified" : "Modifié",
     "Created" : "Créé",
     "Upload attachment" : "Envoyer une pièce jointe",
+    "File already exists" : "Le fichier existe déjà",
+    "Do you want to overwrite it?" : "Souhaitez-vous l'écraser ?",
+    "Maximum file size of {size} exceeded" : "Taille de fichier maximale de {size} dépassée",
     "No comments yet. Begin the discussion!" : "Aucun commentaire pour l'instant, démarrez la discussion !",
     "Save" : "Enregistrer",
     "The comment cannot be empty." : "Un commentaire ne peut pas être vide.",

l10n/fr.json

@@ -157,6 +157,9 @@
     "Modified" : "Modifié",
     "Created" : "Créé",
     "Upload attachment" : "Envoyer une pièce jointe",
+    "File already exists" : "Le fichier existe déjà",
+    "Do you want to overwrite it?" : "Souhaitez-vous l'écraser ?",
+    "Maximum file size of {size} exceeded" : "Taille de fichier maximale de {size} dépassée",
     "No comments yet. Begin the discussion!" : "Aucun commentaire pour l'instant, démarrez la discussion !",
     "Save" : "Enregistrer",
     "The comment cannot be empty." : "Un commentaire ne peut pas être vide.",

l10n/gl.js

@@ -159,6 +159,9 @@ OC.L10N.register(
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Enviar anexos",
+    "File already exists" : "O ficheiro xa existe",
+    "Do you want to overwrite it?" : "Quere sobrescribilo?",
+    "Maximum file size of {size} exceeded" : "Excedeuse o tamaño máximo de ficheiro de {size}",
     "No comments yet. Begin the discussion!" : "Aínda non hai comentarios. Comece o debate!",
     "Save" : "Gardar",
     "The comment cannot be empty." : "O comentario non pode estar baleiro",

l10n/gl.json

@@ -157,6 +157,9 @@
     "Modified" : "Modificado",
     "Created" : "Creado",
     "Upload attachment" : "Enviar anexos",
+    "File already exists" : "O ficheiro xa existe",
+    "Do you want to overwrite it?" : "Quere sobrescribilo?",
+    "Maximum file size of {size} exceeded" : "Excedeuse o tamaño máximo de ficheiro de {size}",
     "No comments yet. Begin the discussion!" : "Aínda non hai comentarios. Comece o debate!",
     "Save" : "Gardar",
     "The comment cannot be empty." : "O comentario non pode estar baleiro",

l10n/hr.js

@@ -159,6 +159,9 @@ OC.L10N.register(
     "Modified" : "Promijenjeno",
     "Created" : "Stvoreno",
     "Upload attachment" : "Otpremi privitak",
+    "File already exists" : "Datoteka već postoji",
+    "Do you want to overwrite it?" : "Želite li prepisati?",
+    "Maximum file size of {size} exceeded" : "Prekoračena je maksimalna veličina datoteke od {size}",
     "No comments yet. Begin the discussion!" : "Nema komentara. Započnite raspravu!",
     "Save" : "Spremi",
     "The comment cannot be empty." : "Komentar ne može biti prazan.",

l10n/hr.json

@@ -157,6 +157,9 @@
     "Modified" : "Promijenjeno",
     "Created" : "Stvoreno",
     "Upload attachment" : "Otpremi privitak",
+    "File already exists" : "Datoteka već postoji",
+    "Do you want to overwrite it?" : "Želite li prepisati?",
+    "Maximum file size of {size} exceeded" : "Prekoračena je maksimalna veličina datoteke od {size}",
     "No comments yet. Begin the discussion!" : "Nema komentara. Započnite raspravu!",
     "Save" : "Spremi",
     "The comment cannot be empty." : "Komentar ne može biti prazan.",

l10n/hu.js

@@ -128,6 +128,9 @@ OC.L10N.register(
     "Modified" : "Módosítva",
     "Created" : "Létrehozva",
     "Upload attachment" : "Melléklet feltöltése",
+    "File already exists" : "A fájl már létezik",
+    "Do you want to overwrite it?" : "Felülírod?",
+    "Maximum file size of {size} exceeded" : "A legnagyobb fájlméret ({size}) túllépve",
     "Save" : "Mentés",
     "Reply" : "Válasz",
     "Update" : "Frissítés",

l10n/hu.json

@@ -126,6 +126,9 @@
     "Modified" : "Módosítva",
     "Created" : "Létrehozva",
     "Upload attachment" : "Melléklet feltöltése",
+    "File already exists" : "A fájl már létezik",
+    "Do you want to overwrite it?" : "Felülírod?",
+    "Maximum file size of {size} exceeded" : "A legnagyobb fájlméret ({size}) túllépve",
     "Save" : "Mentés",
     "Reply" : "Válasz",
     "Update" : "Frissítés",

l10n/is.js

@@ -159,6 +159,9 @@ OC.L10N.register(
     "Modified" : "Breytt",
     "Created" : "Búið til þann",
     "Upload attachment" : "Senda inn viðhengi",
+    "File already exists" : "Skrá er þegar til",
+    "Do you want to overwrite it?" : "Viltu skrifa yfir það?",
+    "Maximum file size of {size} exceeded" : "Fór yfir hámarks skráarstærð {size}",
     "No comments yet. Begin the discussion!" : "Engar athugasemdir ennþá. Byrjaðu umræðuna!",
     "Save" : "Vista",
     "The comment cannot be empty." : "Athugasemdin má ekki vera tóm.",

l10n/is.json

@@ -157,6 +157,9 @@
     "Modified" : "Breytt",
     "Created" : "Búið til þann",
     "Upload attachment" : "Senda inn viðhengi",
+    "File already exists" : "Skrá er þegar til",
+    "Do you want to overwrite it?" : "Viltu skrifa yfir það?",
+    "Maximum file size of {size} exceeded" : "Fór yfir hámarks skráarstærð {size}",
     "No comments yet. Begin the discussion!" : "Engar athugasemdir ennþá. Byrjaðu umræðuna!",
     "Save" : "Vista",
     "The comment cannot be empty." : "Athugasemdin má ekki vera tóm.",

l10n/it.js

@@ -163,6 +163,7 @@ OC.L10N.register(
     "Save" : "Salva",
     "The comment cannot be empty." : "Il commento non può essere vuoto.",
     "The comment cannot be longer than 1000 characters." : "Il commento non può essere più lungo di 1000 caratteri.",
+    "In reply to" : "In risposta a",
     "Reply" : "Rispondi",
     "Update" : "Aggiorna",
     "seconds ago" : "secondi fa",

l10n/it.json

@@ -161,6 +161,7 @@
     "Save" : "Salva",
     "The comment cannot be empty." : "Il commento non può essere vuoto.",
     "The comment cannot be longer than 1000 characters." : "Il commento non può essere più lungo di 1000 caratteri.",
+    "In reply to" : "In risposta a",
     "Reply" : "Rispondi",
     "Update" : "Aggiorna",
     "seconds ago" : "secondi fa",

l10n/lv.js

@@ -28,6 +28,8 @@ OC.L10N.register(
     "Comments" : "Komentāri",
     "Modified" : "Mainīts",
     "Created" : "Izveidots",
+    "File already exists" : "Datne jau pastāv",
+    "Do you want to overwrite it?" : "Vai tu gribi pārrakstīt to?",
     "Save" : "Saglabāt",
     "Reply" : "Atbildēt",
     "Update" : "Atjaunināt",

l10n/lv.json

@@ -26,6 +26,8 @@
     "Comments" : "Komentāri",
     "Modified" : "Mainīts",
     "Created" : "Izveidots",
+    "File already exists" : "Datne jau pastāv",
+    "Do you want to overwrite it?" : "Vai tu gribi pārrakstīt to?",
     "Save" : "Saglabāt",
     "Reply" : "Atbildēt",
     "Update" : "Atjaunināt",

l10n/nl.js

@@ -159,6 +159,9 @@ OC.L10N.register(
     "Modified" : "Aangepast",
     "Created" : "Gemaakt",
     "Upload attachment" : "Uploaden bijlage",
+    "File already exists" : "Bestand bestaat al",
+    "Do you want to overwrite it?" : "Wil je het overschrijven?",
+    "Maximum file size of {size} exceeded" : "Maximale bestandsomvang van {size} overschreden",
     "No comments yet. Begin the discussion!" : "Nog geen reacties. Begin de discussie!",
     "Save" : "Opslaan",
     "The comment cannot be empty." : "De reactie kan niet leeg zijn.",

l10n/nl.json

@@ -157,6 +157,9 @@
     "Modified" : "Aangepast",
     "Created" : "Gemaakt",
     "Upload attachment" : "Uploaden bijlage",
+    "File already exists" : "Bestand bestaat al",
+    "Do you want to overwrite it?" : "Wil je het overschrijven?",
+    "Maximum file size of {size} exceeded" : "Maximale bestandsomvang van {size} overschreden",
     "No comments yet. Begin the discussion!" : "Nog geen reacties. Begin de discussie!",
     "Save" : "Opslaan",
     "The comment cannot be empty." : "De reactie kan niet leeg zijn.",

l10n/pt_BR.js

@@ -159,6 +159,9 @@ OC.L10N.register(
     "Modified" : "Modificado",
     "Created" : "Criado",
     "Upload attachment" : "Enviar anexo",
+    "File already exists" : "Arquivo já existe",
+    "Do you want to overwrite it?" : "Quer sobrescrever?",
+    "Maximum file size of {size} exceeded" : "Excedeu o tamanho máximo de arquivo de {size}",
     "No comments yet. Begin the discussion!" : "Nenhum comentário ainda. Inicie a conversa!",
     "Save" : "Salvar",
     "The comment cannot be empty." : "O comentário não pode zer vazio.",

l10n/pt_BR.json

@@ -157,6 +157,9 @@
     "Modified" : "Modificado",
     "Created" : "Criado",
     "Upload attachment" : "Enviar anexo",
+    "File already exists" : "Arquivo já existe",
+    "Do you want to overwrite it?" : "Quer sobrescrever?",
+    "Maximum file size of {size} exceeded" : "Excedeu o tamanho máximo de arquivo de {size}",
     "No comments yet. Begin the discussion!" : "Nenhum comentário ainda. Inicie a conversa!",
     "Save" : "Salvar",
     "The comment cannot be empty." : "O comentário não pode zer vazio.",

l10n/ru.js

@@ -159,6 +159,9 @@ OC.L10N.register(
     "Modified" : "Изменён",
     "Created" : "Создана",
     "Upload attachment" : "Загрузить вложение",
+    "File already exists" : "Файл уже существует",
+    "Do you want to overwrite it?" : "Перезаписать?",
+    "Maximum file size of {size} exceeded" : "Превышен максимально разрешённый размер файла в  {size}",
     "No comments yet. Begin the discussion!" : "Комментарии отсутствуют, начните обсуждение!",
     "Save" : "Сохранить",
     "The comment cannot be empty." : "Комментарий не может быть пустым.",

l10n/ru.json

@@ -157,6 +157,9 @@
     "Modified" : "Изменён",
     "Created" : "Создана",
     "Upload attachment" : "Загрузить вложение",
+    "File already exists" : "Файл уже существует",
+    "Do you want to overwrite it?" : "Перезаписать?",
+    "Maximum file size of {size} exceeded" : "Превышен максимально разрешённый размер файла в  {size}",
     "No comments yet. Begin the discussion!" : "Комментарии отсутствуют, начните обсуждение!",
     "Save" : "Сохранить",
     "The comment cannot be empty." : "Комментарий не может быть пустым.",

l10n/sl.js

@@ -150,6 +150,8 @@ OC.L10N.register(
     "Modified" : "Spremenjeno",
     "Created" : "Ustvarjeno",
     "Upload attachment" : "Pošlji prilogo",
+    "File already exists" : "Datoteka s tem imenom že obstaja.",
+    "Maximum file size of {size} exceeded" : "Omejitev velikosti datoteke {size} je prekoračena.",
     "Save" : "Shrani",
     "The comment cannot be empty." : "Polje opombe ne sme biti prazno.",
     "The comment cannot be longer than 1000 characters." : "Opomba ne sme biti daljša od 1000 znakov.",

l10n/sl.json

@@ -148,6 +148,8 @@
     "Modified" : "Spremenjeno",
     "Created" : "Ustvarjeno",
     "Upload attachment" : "Pošlji prilogo",
+    "File already exists" : "Datoteka s tem imenom že obstaja.",
+    "Maximum file size of {size} exceeded" : "Omejitev velikosti datoteke {size} je prekoračena.",
     "Save" : "Shrani",
     "The comment cannot be empty." : "Polje opombe ne sme biti prazno.",
     "The comment cannot be longer than 1000 characters." : "Opomba ne sme biti daljša od 1000 znakov.",

l10n/sr.js

@@ -159,6 +159,9 @@ OC.L10N.register(
     "Modified" : "Измењен",
     "Created" : "Направљен",
     "Upload attachment" : "Отпреми прилог",
+    "File already exists" : "Фајл већ постоји",
+    "Do you want to overwrite it?" : "Да ли желите да га препишете?",
+    "Maximum file size of {size} exceeded" : "Премашена максимална величина фајла од {size}",
     "No comments yet. Begin the discussion!" : "Нема још коментара. Започните дискусију!",
     "Save" : "Сачувај",
     "The comment cannot be empty." : "Коментар не може да буде празан.",

l10n/sr.json

@@ -157,6 +157,9 @@
     "Modified" : "Измењен",
     "Created" : "Направљен",
     "Upload attachment" : "Отпреми прилог",
+    "File already exists" : "Фајл већ постоји",
+    "Do you want to overwrite it?" : "Да ли желите да га препишете?",
+    "Maximum file size of {size} exceeded" : "Премашена максимална величина фајла од {size}",
     "No comments yet. Begin the discussion!" : "Нема још коментара. Започните дискусију!",
     "Save" : "Сачувај",
     "The comment cannot be empty." : "Коментар не може да буде празан.",

l10n/sv.js

@@ -158,6 +158,9 @@ OC.L10N.register(
     "Modified" : "Ändrad",
     "Created" : "Skapat",
     "Upload attachment" : "Ladda upp bilaga",
+    "File already exists" : "Filen finns redan",
+    "Do you want to overwrite it?" : "Vill du skriva över det?",
+    "Maximum file size of {size} exceeded" : "Maximal filstorlek på {size} överskriden",
     "No comments yet. Begin the discussion!" : "Inga kommentarer än. Börja diskussionen!",
     "Save" : "Spara",
     "The comment cannot be empty." : "Kommentaren kan inte vara tom.",

l10n/sv.json

@@ -156,6 +156,9 @@
     "Modified" : "Ändrad",
     "Created" : "Skapat",
     "Upload attachment" : "Ladda upp bilaga",
+    "File already exists" : "Filen finns redan",
+    "Do you want to overwrite it?" : "Vill du skriva över det?",
+    "Maximum file size of {size} exceeded" : "Maximal filstorlek på {size} överskriden",
     "No comments yet. Begin the discussion!" : "Inga kommentarer än. Börja diskussionen!",
     "Save" : "Spara",
     "The comment cannot be empty." : "Kommentaren kan inte vara tom.",

l10n/uk.js

@@ -34,6 +34,7 @@ OC.L10N.register(
     "Attachments" : "Вкладення",
     "Comments" : "Коментарі",
     "Modified" : "Змінено",
+    "File already exists" : "Файл вже існує",
     "Save" : "Зберегти",
     "Reply" : "Відповісти",
     "Update" : "Оновлення",

l10n/uk.json

@@ -32,6 +32,7 @@
     "Attachments" : "Вкладення",
     "Comments" : "Коментарі",
     "Modified" : "Змінено",
+    "File already exists" : "Файл вже існує",
     "Save" : "Зберегти",
     "Reply" : "Відповісти",
     "Update" : "Оновлення",

l10n/vi.js

@@ -69,6 +69,7 @@ OC.L10N.register(
     "Modified" : "Thay đổi",
     "Created" : "Đã tạo",
     "Upload attachment" : "Tải lên một đính kèm",
+    "Maximum file size of {size} exceeded" : "Đã vượt quá kích thước {size} tối đa tập tin",
     "Save" : "Lưu",
     "Reply" : "Trả l",
     "Update" : "Cập nhật",

l10n/vi.json

@@ -67,6 +67,7 @@
     "Modified" : "Thay đổi",
     "Created" : "Đã tạo",
     "Upload attachment" : "Tải lên một đính kèm",
+    "Maximum file size of {size} exceeded" : "Đã vượt quá kích thước {size} tối đa tập tin",
     "Save" : "Lưu",
     "Reply" : "Trả l",
     "Update" : "Cập nhật",

l10n/zh_CN.js

@@ -159,6 +159,9 @@ OC.L10N.register(
     "Modified" : "已修改",
     "Created" : "已创建",
     "Upload attachment" : "上传附件",
+    "File already exists" : "文件已存在",
+    "Do you want to overwrite it?" : "您确定要覆盖吗？",
+    "Maximum file size of {size} exceeded" : "文件大小 {size} 超出最大限制",
     "No comments yet. Begin the discussion!" : "还没有评论。 开始讨论吧！",
     "Save" : "保存",
     "The comment cannot be empty." : "注释不能为空。",

l10n/zh_CN.json

@@ -157,6 +157,9 @@
     "Modified" : "已修改",
     "Created" : "已创建",
     "Upload attachment" : "上传附件",
+    "File already exists" : "文件已存在",
+    "Do you want to overwrite it?" : "您确定要覆盖吗？",
+    "Maximum file size of {size} exceeded" : "文件大小 {size} 超出最大限制",
     "No comments yet. Begin the discussion!" : "还没有评论。 开始讨论吧！",
     "Save" : "保存",
     "The comment cannot be empty." : "注释不能为空。",

l10n/zh_TW.js

@@ -45,6 +45,8 @@ OC.L10N.register(
     "Modified" : "已修改",
     "Created" : "已新增",
     "Upload attachment" : "上傳附件",
+    "File already exists" : "檔案已存在",
+    "Maximum file size of {size} exceeded" : "達到最大的檔案大小 {size} ",
     "Save" : "儲存",
     "Reply" : "回覆",
     "Update" : "更新",

l10n/zh_TW.json

@@ -43,6 +43,8 @@
     "Modified" : "已修改",
     "Created" : "已新增",
     "Upload attachment" : "上傳附件",
+    "File already exists" : "檔案已存在",
+    "Maximum file size of {size} exceeded" : "達到最大的檔案大小 {size} ",
     "Save" : "儲存",
     "Reply" : "回覆",
     "Update" : "更新",

lib/Controller/PageController.php

@@ -23,7 +23,9 @@
 
 namespace OCA\Deck\Controller;
 
+use OCA\Deck\AppInfo\Application;
 use OCA\Deck\Service\PermissionService;
+use OCP\IInitialStateService;
 use OCP\IRequest;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Controller;
@@ -34,11 +36,13 @@ class PageController extends Controller {
 	private $permissionService;
 	private $userId;
 	private $l10n;
+	private $initialState;
 
 	public function __construct(
 		$AppName,
 		IRequest $request,
 		PermissionService $permissionService,
+		IInitialStateService $initialStateService,
 		IL10N $l10n,
 		$userId
 		) {
@@ -46,6 +50,7 @@ class PageController extends Controller {
 
 		$this->userId = $userId;
 		$this->permissionService = $permissionService;
+		$this->initialState = $initialStateService;
 		$this->l10n = $l10n;
 	}
 
@@ -57,13 +62,10 @@ class PageController extends Controller {
 	 * @NoCSRFRequired
 	 */
 	public function index() {
-		$params = [
-			'user' => $this->userId,
-			'maxUploadSize' => (int)\OCP\Util::uploadLimit(),
-			'canCreate' => $this->permissionService->canCreate()
-		];
+		$this->initialState->provideInitialState(Application::APP_ID, 'maxUploadSize', (int)\OCP\Util::uploadLimit());
+		$this->initialState->provideInitialState(Application::APP_ID, 'canCreate', $this->permissionService->canCreate());
 
-		return new TemplateResponse('deck', 'main', $params);
+		return new TemplateResponse('deck', 'main');
 	}
 
 }

package-lock.json

@@ -3500,6 +3500,21 @@
 				}
 			}
 		},
+		"@nextcloud/initial-state": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/initial-state/-/initial-state-1.1.0.tgz",
+			"integrity": "sha512-c8VNSv7CbcPdaMNQO3ERJUMhsGyCvAgSBlvBHhugYHxGqlySjE+J+SqkpXmqB+eQ/DujDTahBX1IwoF3zjPtOw==",
+			"requires": {
+				"core-js": "3.6.1"
+			},
+			"dependencies": {
+				"core-js": {
+					"version": "3.6.1",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.1.tgz",
+					"integrity": "sha512-186WjSik2iTGfDjfdCZAxv2ormxtKgemjC3SI6PL31qOA0j5LhTDVjHChccoc7brwLvpvLPiMyRlcO88C4l1QQ=="
+				}
+			}
+		},
 		"@nextcloud/l10n": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-1.1.0.tgz",

package.json

@@ -31,9 +31,10 @@
 		"@juliushaertl/vue-richtext": "^0.3.0",
 		"@nextcloud/auth": "^1.2.1",
 		"@nextcloud/axios": "^1.3.1",
-		"@nextcloud/l10n": "^1.1.0",
 		"@nextcloud/dialogs": "^1.2.1",
 		"@nextcloud/files": "^1.0.0",
+		"@nextcloud/initial-state": "^1.1.0",
+		"@nextcloud/l10n": "^1.1.0",
 		"@nextcloud/moment": "^1.1.0",
 		"@nextcloud/router": "^1.0.0",
 		"@nextcloud/vue": "^1.4.0",

src/components/card/CardSidebarTabAttachments.vue

@@ -106,6 +106,9 @@ import { showError } from '@nextcloud/dialogs'
 import { formatFileSize } from '@nextcloud/files'
 import relativeDate from '../../mixins/relativeDate'
 import { mapState } from 'vuex'
+import { loadState } from '@nextcloud/initial-state'
+const maxUploadSizeState = loadState('deck', 'maxUploadSize')
+
 
 export default {
 	name: 'CardSidebarTabAttachments',
@@ -127,6 +130,7 @@ export default {
 			file: '',
 			overwriteAttachment: null,
 			isDraggingOver: false,
+			maxUploadSize: maxUploadSizeState,
 		}
 	},
 	computed: {
@@ -188,11 +192,19 @@ export default {
 			this.$refs.localAttachments.click()
 		},
 		async onLocalAttachmentSelected(file) {
+			if (this.maxUploadSize > 0 && file.size > this.maxUploadSize) {
+				showError(
+					t('deck', `Failed to upload {name}`, { name: file.name }) + ' - '
+						+ t('deck', 'Maximum file size of {size} exceeded', { size: formatFileSize(this.maxUploadSize) })
+				)
+				event.target.value = ''
+				return
+			}
+
 			const bodyFormData = new FormData()
 			bodyFormData.append('cardId', this.card.id)
 			bodyFormData.append('type', 'deck_file')
 			bodyFormData.append('file', file)
-			this.file = file
 			try {
 				await this.$store.dispatch('createAttachment', { cardId: this.card.id, formData: bodyFormData })
 			} catch (err) {

src/components/navigation/AppNavigation.vue

@@ -39,7 +39,7 @@
 				:text="t('deck', 'Shared boards')"
 				:boards="sharedBoards"
 				icon="icon-shared" />
-			<AppNavigationAddBoard />
+			<AppNavigationAddBoard v-if="canCreate" />
 		</ul>
 		<div v-if="isAdmin"
 			id="app-settings"
@@ -73,6 +73,9 @@ import { Multiselect } from '@nextcloud/vue'
 
 import AppNavigationAddBoard from './AppNavigationAddBoard'
 import AppNavigationBoardCategory from './AppNavigationBoardCategory'
+import { loadState } from '@nextcloud/initial-state'
+
+const canCreateState = loadState('deck', 'canCreate')
 
 export default {
 	name: 'AppNavigation',
@@ -96,6 +99,7 @@ export default {
 			groups: [],
 			groupLimit: [],
 			groupLimitDisabled: true,
+			canCreate: canCreateState,
 		}
 	},
 	computed: {

tests/unit/controller/PageControllerTest.php

@@ -25,6 +25,7 @@
 namespace OCA\Deck\Controller;
 
 use OCA\Deck\Service\PermissionService;
+use OCP\IInitialStateService;
 use OCP\IL10N;
 use OCP\IRequest;
 use PHPUnit_Framework_TestCase;
@@ -38,8 +39,8 @@ class PageControllerTest extends \Test\TestCase {
 	private $request;
 	private $l10n;
 	private $userId = 'john';
-	private $defaultBoardService;
 	private $permissionService;
+	private $initialState;
 	private $config;
 
 	public function setUp(): void {
@@ -47,9 +48,10 @@ class PageControllerTest extends \Test\TestCase {
 		$this->request = $this->createMock(IRequest::class);
 		$this->permissionService = $this->createMock(PermissionService::class);
 		$this->config = $this->createMock(IConfig::class);
+		$this->initialState = $this->createMock(IInitialStateService::class);
 
 		$this->controller = new PageController(
-			'deck', $this->request, $this->permissionService, $this->l10n, $this->userId
+			'deck', $this->request, $this->permissionService, $this->initialState, $this->l10n, $this->userId
 		);
 	}