Merge remote-tracking branch 'nextcloud/master' into bugfix-create-database-user

7 files changed, 11 insertions, 3 deletions

diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js
index 921f3bf71ea..7f8207503c5 100644
--- a/lib/l10n/nl.js
+++ b/lib/l10n/nl.js
@@ -7,6 +7,7 @@ OC.L10N.register(
     "Or, if you prefer to keep config.php file read only, set the option \"config_is_read_only\" to true in it." : "Of, als je liever config.php alleen-lezen wilt houden, stel de optie \"config_is_read_only\" in op true.",
     "This can usually be fixed by giving the webserver write access to the config directory. See %s" : "Dit kan opgelost worden door de config map op de webserver schrijf rechten te geven. See %s",
     "Or, if you prefer to keep config.php file read only, set the option \"config_is_read_only\" to true in it. See %s" : "Of, als je liever config.php Alleen-lezen houdt, stel de optie  \"config_is_read_only\" in op true. Zie %s",
+    "The files of the app %1$s were not replaced correctly. Make sure it is a version compatible with the server." : "De bestanden van app %1$szijn niet correct vervangen. Zorg ervoor dat de versie compatible is met de server.",
     "Sample configuration detected" : "Voorbeeld configuratie gevonden",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Er is gedetecteerd dat de voorbeeld configuratie is gekopieerd. Dit kan je installatie beschadigen en wordt dan ook niet ondersteund. Lees de documentatie voordat je wijzigingen aan config.php doorvoert",
     "%1$s and %2$s" : "%1$s en %2$s",
diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json
index 6d129e90563..bfc291f57c8 100644
--- a/lib/l10n/nl.json
+++ b/lib/l10n/nl.json
@@ -5,6 +5,7 @@
     "Or, if you prefer to keep config.php file read only, set the option \"config_is_read_only\" to true in it." : "Of, als je liever config.php alleen-lezen wilt houden, stel de optie \"config_is_read_only\" in op true.",
     "This can usually be fixed by giving the webserver write access to the config directory. See %s" : "Dit kan opgelost worden door de config map op de webserver schrijf rechten te geven. See %s",
     "Or, if you prefer to keep config.php file read only, set the option \"config_is_read_only\" to true in it. See %s" : "Of, als je liever config.php Alleen-lezen houdt, stel de optie  \"config_is_read_only\" in op true. Zie %s",
+    "The files of the app %1$s were not replaced correctly. Make sure it is a version compatible with the server." : "De bestanden van app %1$szijn niet correct vervangen. Zorg ervoor dat de versie compatible is met de server.",
     "Sample configuration detected" : "Voorbeeld configuratie gevonden",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Er is gedetecteerd dat de voorbeeld configuratie is gekopieerd. Dit kan je installatie beschadigen en wordt dan ook niet ondersteund. Lees de documentatie voordat je wijzigingen aan config.php doorvoert",
     "%1$s and %2$s" : "%1$s en %2$s",
diff --git a/lib/l10n/ro.js b/lib/l10n/ro.js
index 7bbc88ade6f..e7095f8b67c 100644
--- a/lib/l10n/ro.js
+++ b/lib/l10n/ro.js
@@ -23,8 +23,10 @@ OC.L10N.register(
     "tomorrow" : "mâine",
     "yesterday" : "ieri",
     "_%n day ago_::_%n days ago_" : ["Acum o zi","Acum %n zile","Acum %n zile"],
+    "next month" : "luna viitoare",
     "last month" : "ultima lună",
     "_%n month ago_::_%n months ago_" : ["%n lună în urmă","%n luni în urmă","%n luni în urmă"],
+    "next year" : "anul viitor",
     "last year" : "ultimul an",
     "_%n year ago_::_%n years ago_" : ["%n an în urmă","%n ani în urmâ","%n ani în urmâ"],
     "in a few seconds" : "în câteva secunde",
diff --git a/lib/l10n/ro.json b/lib/l10n/ro.json
index fb64e0e9b04..5928d7af24d 100644
--- a/lib/l10n/ro.json
+++ b/lib/l10n/ro.json
@@ -21,8 +21,10 @@
     "tomorrow" : "mâine",
     "yesterday" : "ieri",
     "_%n day ago_::_%n days ago_" : ["Acum o zi","Acum %n zile","Acum %n zile"],
+    "next month" : "luna viitoare",
     "last month" : "ultima lună",
     "_%n month ago_::_%n months ago_" : ["%n lună în urmă","%n luni în urmă","%n luni în urmă"],
+    "next year" : "anul viitor",
     "last year" : "ultimul an",
     "_%n year ago_::_%n years ago_" : ["%n an în urmă","%n ani în urmâ","%n ani în urmâ"],
     "in a few seconds" : "în câteva secunde",
diff --git a/lib/l10n/sl.js b/lib/l10n/sl.js
index 3a0caf1a2ee..568e41f2d03 100644
--- a/lib/l10n/sl.js
+++ b/lib/l10n/sl.js
@@ -79,7 +79,7 @@ OC.L10N.register(
     "The username is already being used" : "Vpisano uporabniško ime je že v uporabi",
     "User disabled" : "Uporabnik je onemogočen",
     "Login canceled by app" : "Program onemogoča prijavo",
-    "a safe home for all your data" : "Varno okolje za vse vaše podatke!",
+    "a safe home for all your data" : "Varno okolje za vaše podatke!",
     "File is currently busy, please try again later" : "Datoteka je trenutno v uporabi. Poskusite znova kasneje.",
     "Can't read file" : "Datoteke ni mogoče prebrati.",
     "Application is not enabled" : "Program ni omogočen",
diff --git a/lib/l10n/sl.json b/lib/l10n/sl.json
index 27d1c4e265f..3708b3d7f0e 100644
--- a/lib/l10n/sl.json
+++ b/lib/l10n/sl.json
@@ -77,7 +77,7 @@
     "The username is already being used" : "Vpisano uporabniško ime je že v uporabi",
     "User disabled" : "Uporabnik je onemogočen",
     "Login canceled by app" : "Program onemogoča prijavo",
-    "a safe home for all your data" : "Varno okolje za vse vaše podatke!",
+    "a safe home for all your data" : "Varno okolje za vaše podatke!",
     "File is currently busy, please try again later" : "Datoteka je trenutno v uporabi. Poskusite znova kasneje.",
     "Can't read file" : "Datoteke ni mogoče prebrati.",
     "Application is not enabled" : "Program ni omogočen",
diff --git a/lib/private/Files/Node/Folder.php b/lib/private/Files/Node/Folder.php
index a9b443ce52e..ebf67e47a21 100644
--- a/lib/private/Files/Node/Folder.php
+++ b/lib/private/Files/Node/Folder.php
@@ -158,7 +158,9 @@ class Folder extends Node implements \OCP\Files\Folder {
 			$nonExisting = new NonExistingFolder($this->root, $this->view, $fullPath);
 			$this->root->emit('\OC\Files', 'preWrite', array($nonExisting));
 			$this->root->emit('\OC\Files', 'preCreate', array($nonExisting));
-			$this->view->mkdir($fullPath);
+			if(!$this->view->mkdir($fullPath)) {
+				throw new NotPermittedException('Could not create folder');
+			}
 			$node = new Folder($this->root, $this->view, $fullPath);
 			$this->root->emit('\OC\Files', 'postWrite', array($node));
 			$this->root->emit('\OC\Files', 'postCreate', array($node));