aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/l10n/sl.js2
-rw-r--r--lib/l10n/sl.json2
-rw-r--r--lib/private/Encryption/EncryptionWrapper.php2
3 files changed, 5 insertions, 1 deletions
diff --git a/lib/l10n/sl.js b/lib/l10n/sl.js
index 31644c76fd9..6519cbbc75e 100644
--- a/lib/l10n/sl.js
+++ b/lib/l10n/sl.js
@@ -103,6 +103,8 @@ OC.L10N.register(
"Sharing backend %s must implement the interface OCP\\Share_Backend" : "Souporaba ozadnjega programa %s mora vsebovati tudi vmesnik OCP\\Share_Backend",
"Sharing backend %s not found" : "Ozadnjega programa %s za souporabo ni mogoče najti",
"Sharing backend for %s not found" : "Ozadnjega programa za souporabo za %s ni mogoče najti",
+ "%1$s shared »%2$s« with you and wants to add:" : "%1$s vam omogoča souporabo »%2$s« in želi dodati:",
+ "%1$s shared »%2$s« with you and wants to add" : "%1$s vam omogoča souporabo »%2$s« in želi dodati",
"»%s« added a note to a file shared with you" : "»%s« doda opombo k datoteki v souporabi",
"Open »%s«" : "Odpri »%s«",
"%1$s via %2$s" : "%1$s prek %2$s",
diff --git a/lib/l10n/sl.json b/lib/l10n/sl.json
index 2587bd9d2f5..04524842736 100644
--- a/lib/l10n/sl.json
+++ b/lib/l10n/sl.json
@@ -101,6 +101,8 @@
"Sharing backend %s must implement the interface OCP\\Share_Backend" : "Souporaba ozadnjega programa %s mora vsebovati tudi vmesnik OCP\\Share_Backend",
"Sharing backend %s not found" : "Ozadnjega programa %s za souporabo ni mogoče najti",
"Sharing backend for %s not found" : "Ozadnjega programa za souporabo za %s ni mogoče najti",
+ "%1$s shared »%2$s« with you and wants to add:" : "%1$s vam omogoča souporabo »%2$s« in želi dodati:",
+ "%1$s shared »%2$s« with you and wants to add" : "%1$s vam omogoča souporabo »%2$s« in želi dodati",
"»%s« added a note to a file shared with you" : "»%s« doda opombo k datoteki v souporabi",
"Open »%s«" : "Odpri »%s«",
"%1$s via %2$s" : "%1$s prek %2$s",
diff --git a/lib/private/Encryption/EncryptionWrapper.php b/lib/private/Encryption/EncryptionWrapper.php
index edbdc692b45..0ae9c2c9357 100644
--- a/lib/private/Encryption/EncryptionWrapper.php
+++ b/lib/private/Encryption/EncryptionWrapper.php
@@ -81,7 +81,7 @@ class EncryptionWrapper {
'mount' => $mount
];
- if (!$storage->instanceOfStorage(Storage\IDisableEncryptionStorage::class)) {
+ if (!$storage->instanceOfStorage(Storage\IDisableEncryptionStorage::class) && $mountPoint !== '/') {
$user = \OC::$server->getUserSession()->getUser();
$mountManager = Filesystem::getMountManager();
$uid = $user ? $user->getUID() : null;