Merge branch 'master' into fix-36340

281 files changed, 2686 insertions, 3213 deletions

diff --git a/lib/base.php b/lib/base.php
index b0334ecd729..25f978df836 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -279,8 +279,7 @@ class OC {
 			}
 			if (!$tooBig) {
 				// count users
-				$stats = Server::get(\OCP\IUserManager::class)->countUsers();
-				$totalUsers = array_sum($stats);
+				$totalUsers = Server::get(\OCP\IUserManager::class)->countUsersTotal(51);
 				$tooBig = ($totalUsers > 50);
 			}
 		}
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index fd5d9e62ba6..cbadc2deb15 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -191,7 +191,9 @@ return array(
     'OCP\\Cache\\CappedMemoryCache' => $baseDir . '/lib/public/Cache/CappedMemoryCache.php',
     'OCP\\Calendar\\BackendTemporarilyUnavailableException' => $baseDir . '/lib/public/Calendar/BackendTemporarilyUnavailableException.php',
     'OCP\\Calendar\\Exceptions\\CalendarException' => $baseDir . '/lib/public/Calendar/Exceptions/CalendarException.php',
+    'OCP\\Calendar\\IAvailabilityResult' => $baseDir . '/lib/public/Calendar/IAvailabilityResult.php',
     'OCP\\Calendar\\ICalendar' => $baseDir . '/lib/public/Calendar/ICalendar.php',
+    'OCP\\Calendar\\ICalendarEventBuilder' => $baseDir . '/lib/public/Calendar/ICalendarEventBuilder.php',
     'OCP\\Calendar\\ICalendarIsShared' => $baseDir . '/lib/public/Calendar/ICalendarIsShared.php',
     'OCP\\Calendar\\ICalendarIsWritable' => $baseDir . '/lib/public/Calendar/ICalendarIsWritable.php',
     'OCP\\Calendar\\ICalendarProvider' => $baseDir . '/lib/public/Calendar/ICalendarProvider.php',
@@ -375,6 +377,9 @@ return array(
     'OCP\\Files\\Config\\IRootMountProvider' => $baseDir . '/lib/public/Files/Config/IRootMountProvider.php',
     'OCP\\Files\\Config\\IUserMountCache' => $baseDir . '/lib/public/Files/Config/IUserMountCache.php',
     'OCP\\Files\\ConnectionLostException' => $baseDir . '/lib/public/Files/ConnectionLostException.php',
+    'OCP\\Files\\Conversion\\ConversionMimeProvider' => $baseDir . '/lib/public/Files/Conversion/ConversionMimeProvider.php',
+    'OCP\\Files\\Conversion\\IConversionManager' => $baseDir . '/lib/public/Files/Conversion/IConversionManager.php',
+    'OCP\\Files\\Conversion\\IConversionProvider' => $baseDir . '/lib/public/Files/Conversion/IConversionProvider.php',
     'OCP\\Files\\DavUtil' => $baseDir . '/lib/public/Files/DavUtil.php',
     'OCP\\Files\\EmptyFileNameException' => $baseDir . '/lib/public/Files/EmptyFileNameException.php',
     'OCP\\Files\\EntityTooLargeException' => $baseDir . '/lib/public/Files/EntityTooLargeException.php',
@@ -753,6 +758,7 @@ return array(
     'OCP\\Share\\Exceptions\\GenericShareException' => $baseDir . '/lib/public/Share/Exceptions/GenericShareException.php',
     'OCP\\Share\\Exceptions\\IllegalIDChangeException' => $baseDir . '/lib/public/Share/Exceptions/IllegalIDChangeException.php',
     'OCP\\Share\\Exceptions\\ShareNotFound' => $baseDir . '/lib/public/Share/Exceptions/ShareNotFound.php',
+    'OCP\\Share\\Exceptions\\ShareTokenException' => $baseDir . '/lib/public/Share/Exceptions/ShareTokenException.php',
     'OCP\\Share\\IAttributes' => $baseDir . '/lib/public/Share/IAttributes.php',
     'OCP\\Share\\IManager' => $baseDir . '/lib/public/Share/IManager.php',
     'OCP\\Share\\IProviderFactory' => $baseDir . '/lib/public/Share/IProviderFactory.php',
@@ -790,6 +796,7 @@ return array(
     'OCP\\SystemTag\\MapperEvent' => $baseDir . '/lib/public/SystemTag/MapperEvent.php',
     'OCP\\SystemTag\\SystemTagsEntityEvent' => $baseDir . '/lib/public/SystemTag/SystemTagsEntityEvent.php',
     'OCP\\SystemTag\\TagAlreadyExistsException' => $baseDir . '/lib/public/SystemTag/TagAlreadyExistsException.php',
+    'OCP\\SystemTag\\TagCreationForbiddenException' => $baseDir . '/lib/public/SystemTag/TagCreationForbiddenException.php',
     'OCP\\SystemTag\\TagNotFoundException' => $baseDir . '/lib/public/SystemTag/TagNotFoundException.php',
     'OCP\\Talk\\Exceptions\\NoBackendException' => $baseDir . '/lib/public/Talk/Exceptions/NoBackendException.php',
     'OCP\\Talk\\IBroker' => $baseDir . '/lib/public/Talk/IBroker.php',
@@ -886,6 +893,7 @@ return array(
     'OCP\\User\\Backend\\IGetDisplayNameBackend' => $baseDir . '/lib/public/User/Backend/IGetDisplayNameBackend.php',
     'OCP\\User\\Backend\\IGetHomeBackend' => $baseDir . '/lib/public/User/Backend/IGetHomeBackend.php',
     'OCP\\User\\Backend\\IGetRealUIDBackend' => $baseDir . '/lib/public/User/Backend/IGetRealUIDBackend.php',
+    'OCP\\User\\Backend\\ILimitAwareCountUsersBackend' => $baseDir . '/lib/public/User/Backend/ILimitAwareCountUsersBackend.php',
     'OCP\\User\\Backend\\IPasswordConfirmationBackend' => $baseDir . '/lib/public/User/Backend/IPasswordConfirmationBackend.php',
     'OCP\\User\\Backend\\IPasswordHashBackend' => $baseDir . '/lib/public/User/Backend/IPasswordHashBackend.php',
     'OCP\\User\\Backend\\IProvideAvatarBackend' => $baseDir . '/lib/public/User/Backend/IProvideAvatarBackend.php',
@@ -1116,6 +1124,8 @@ return array(
     'OC\\Broadcast\\Events\\BroadcastEvent' => $baseDir . '/lib/private/Broadcast/Events/BroadcastEvent.php',
     'OC\\Cache\\CappedMemoryCache' => $baseDir . '/lib/private/Cache/CappedMemoryCache.php',
     'OC\\Cache\\File' => $baseDir . '/lib/private/Cache/File.php',
+    'OC\\Calendar\\AvailabilityResult' => $baseDir . '/lib/private/Calendar/AvailabilityResult.php',
+    'OC\\Calendar\\CalendarEventBuilder' => $baseDir . '/lib/private/Calendar/CalendarEventBuilder.php',
     'OC\\Calendar\\CalendarQuery' => $baseDir . '/lib/private/Calendar/CalendarQuery.php',
     'OC\\Calendar\\Manager' => $baseDir . '/lib/private/Calendar/Manager.php',
     'OC\\Calendar\\Resource\\Manager' => $baseDir . '/lib/private/Calendar/Resource/Manager.php',
@@ -1153,6 +1163,7 @@ return array(
     'OC\\Comments\\Manager' => $baseDir . '/lib/private/Comments/Manager.php',
     'OC\\Comments\\ManagerFactory' => $baseDir . '/lib/private/Comments/ManagerFactory.php',
     'OC\\Config' => $baseDir . '/lib/private/Config.php',
+    'OC\\Config\\Lexicon\\CoreConfigLexicon' => $baseDir . '/lib/private/Config/Lexicon/CoreConfigLexicon.php',
     'OC\\Config\\UserConfig' => $baseDir . '/lib/private/Config/UserConfig.php',
     'OC\\Console\\Application' => $baseDir . '/lib/private/Console/Application.php',
     'OC\\Console\\TimestampFormatter' => $baseDir . '/lib/private/Console/TimestampFormatter.php',
@@ -1326,6 +1337,7 @@ return array(
     'OC\\Core\\Controller\\TextProcessingApiController' => $baseDir . '/core/Controller/TextProcessingApiController.php',
     'OC\\Core\\Controller\\TextToImageApiController' => $baseDir . '/core/Controller/TextToImageApiController.php',
     'OC\\Core\\Controller\\TranslationApiController' => $baseDir . '/core/Controller/TranslationApiController.php',
+    'OC\\Core\\Controller\\TwoFactorApiController' => $baseDir . '/core/Controller/TwoFactorApiController.php',
     'OC\\Core\\Controller\\TwoFactorChallengeController' => $baseDir . '/core/Controller/TwoFactorChallengeController.php',
     'OC\\Core\\Controller\\UnifiedSearchController' => $baseDir . '/core/Controller/UnifiedSearchController.php',
     'OC\\Core\\Controller\\UnsupportedBrowserController' => $baseDir . '/core/Controller/UnsupportedBrowserController.php',
@@ -1570,6 +1582,7 @@ return array(
     'OC\\Files\\Config\\MountProviderCollection' => $baseDir . '/lib/private/Files/Config/MountProviderCollection.php',
     'OC\\Files\\Config\\UserMountCache' => $baseDir . '/lib/private/Files/Config/UserMountCache.php',
     'OC\\Files\\Config\\UserMountCacheListener' => $baseDir . '/lib/private/Files/Config/UserMountCacheListener.php',
+    'OC\\Files\\Conversion\\ConversionManager' => $baseDir . '/lib/private/Files/Conversion/ConversionManager.php',
     'OC\\Files\\FileInfo' => $baseDir . '/lib/private/Files/FileInfo.php',
     'OC\\Files\\FilenameValidator' => $baseDir . '/lib/private/Files/FilenameValidator.php',
     'OC\\Files\\Filesystem' => $baseDir . '/lib/private/Files/Filesystem.php',
@@ -1930,6 +1943,7 @@ return array(
     'OC\\Security\\IdentityProof\\Manager' => $baseDir . '/lib/private/Security/IdentityProof/Manager.php',
     'OC\\Security\\IdentityProof\\Signer' => $baseDir . '/lib/private/Security/IdentityProof/Signer.php',
     'OC\\Security\\Ip\\Address' => $baseDir . '/lib/private/Security/Ip/Address.php',
+    'OC\\Security\\Ip\\BruteforceAllowList' => $baseDir . '/lib/private/Security/Ip/BruteforceAllowList.php',
     'OC\\Security\\Ip\\Factory' => $baseDir . '/lib/private/Security/Ip/Factory.php',
     'OC\\Security\\Ip\\Range' => $baseDir . '/lib/private/Security/Ip/Range.php',
     'OC\\Security\\Ip\\RemoteAddress' => $baseDir . '/lib/private/Security/Ip/RemoteAddress.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index d9af7846bd8..10086cabce0 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -240,7 +240,9 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OCP\\Cache\\CappedMemoryCache' => __DIR__ . '/../../..' . '/lib/public/Cache/CappedMemoryCache.php',
         'OCP\\Calendar\\BackendTemporarilyUnavailableException' => __DIR__ . '/../../..' . '/lib/public/Calendar/BackendTemporarilyUnavailableException.php',
         'OCP\\Calendar\\Exceptions\\CalendarException' => __DIR__ . '/../../..' . '/lib/public/Calendar/Exceptions/CalendarException.php',
+        'OCP\\Calendar\\IAvailabilityResult' => __DIR__ . '/../../..' . '/lib/public/Calendar/IAvailabilityResult.php',
         'OCP\\Calendar\\ICalendar' => __DIR__ . '/../../..' . '/lib/public/Calendar/ICalendar.php',
+        'OCP\\Calendar\\ICalendarEventBuilder' => __DIR__ . '/../../..' . '/lib/public/Calendar/ICalendarEventBuilder.php',
         'OCP\\Calendar\\ICalendarIsShared' => __DIR__ . '/../../..' . '/lib/public/Calendar/ICalendarIsShared.php',
         'OCP\\Calendar\\ICalendarIsWritable' => __DIR__ . '/../../..' . '/lib/public/Calendar/ICalendarIsWritable.php',
         'OCP\\Calendar\\ICalendarProvider' => __DIR__ . '/../../..' . '/lib/public/Calendar/ICalendarProvider.php',
@@ -424,6 +426,9 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OCP\\Files\\Config\\IRootMountProvider' => __DIR__ . '/../../..' . '/lib/public/Files/Config/IRootMountProvider.php',
         'OCP\\Files\\Config\\IUserMountCache' => __DIR__ . '/../../..' . '/lib/public/Files/Config/IUserMountCache.php',
         'OCP\\Files\\ConnectionLostException' => __DIR__ . '/../../..' . '/lib/public/Files/ConnectionLostException.php',
+        'OCP\\Files\\Conversion\\ConversionMimeProvider' => __DIR__ . '/../../..' . '/lib/public/Files/Conversion/ConversionMimeProvider.php',
+        'OCP\\Files\\Conversion\\IConversionManager' => __DIR__ . '/../../..' . '/lib/public/Files/Conversion/IConversionManager.php',
+        'OCP\\Files\\Conversion\\IConversionProvider' => __DIR__ . '/../../..' . '/lib/public/Files/Conversion/IConversionProvider.php',
         'OCP\\Files\\DavUtil' => __DIR__ . '/../../..' . '/lib/public/Files/DavUtil.php',
         'OCP\\Files\\EmptyFileNameException' => __DIR__ . '/../../..' . '/lib/public/Files/EmptyFileNameException.php',
         'OCP\\Files\\EntityTooLargeException' => __DIR__ . '/../../..' . '/lib/public/Files/EntityTooLargeException.php',
@@ -802,6 +807,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OCP\\Share\\Exceptions\\GenericShareException' => __DIR__ . '/../../..' . '/lib/public/Share/Exceptions/GenericShareException.php',
         'OCP\\Share\\Exceptions\\IllegalIDChangeException' => __DIR__ . '/../../..' . '/lib/public/Share/Exceptions/IllegalIDChangeException.php',
         'OCP\\Share\\Exceptions\\ShareNotFound' => __DIR__ . '/../../..' . '/lib/public/Share/Exceptions/ShareNotFound.php',
+        'OCP\\Share\\Exceptions\\ShareTokenException' => __DIR__ . '/../../..' . '/lib/public/Share/Exceptions/ShareTokenException.php',
         'OCP\\Share\\IAttributes' => __DIR__ . '/../../..' . '/lib/public/Share/IAttributes.php',
         'OCP\\Share\\IManager' => __DIR__ . '/../../..' . '/lib/public/Share/IManager.php',
         'OCP\\Share\\IProviderFactory' => __DIR__ . '/../../..' . '/lib/public/Share/IProviderFactory.php',
@@ -839,6 +845,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OCP\\SystemTag\\MapperEvent' => __DIR__ . '/../../..' . '/lib/public/SystemTag/MapperEvent.php',
         'OCP\\SystemTag\\SystemTagsEntityEvent' => __DIR__ . '/../../..' . '/lib/public/SystemTag/SystemTagsEntityEvent.php',
         'OCP\\SystemTag\\TagAlreadyExistsException' => __DIR__ . '/../../..' . '/lib/public/SystemTag/TagAlreadyExistsException.php',
+        'OCP\\SystemTag\\TagCreationForbiddenException' => __DIR__ . '/../../..' . '/lib/public/SystemTag/TagCreationForbiddenException.php',
         'OCP\\SystemTag\\TagNotFoundException' => __DIR__ . '/../../..' . '/lib/public/SystemTag/TagNotFoundException.php',
         'OCP\\Talk\\Exceptions\\NoBackendException' => __DIR__ . '/../../..' . '/lib/public/Talk/Exceptions/NoBackendException.php',
         'OCP\\Talk\\IBroker' => __DIR__ . '/../../..' . '/lib/public/Talk/IBroker.php',
@@ -935,6 +942,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OCP\\User\\Backend\\IGetDisplayNameBackend' => __DIR__ . '/../../..' . '/lib/public/User/Backend/IGetDisplayNameBackend.php',
         'OCP\\User\\Backend\\IGetHomeBackend' => __DIR__ . '/../../..' . '/lib/public/User/Backend/IGetHomeBackend.php',
         'OCP\\User\\Backend\\IGetRealUIDBackend' => __DIR__ . '/../../..' . '/lib/public/User/Backend/IGetRealUIDBackend.php',
+        'OCP\\User\\Backend\\ILimitAwareCountUsersBackend' => __DIR__ . '/../../..' . '/lib/public/User/Backend/ILimitAwareCountUsersBackend.php',
         'OCP\\User\\Backend\\IPasswordConfirmationBackend' => __DIR__ . '/../../..' . '/lib/public/User/Backend/IPasswordConfirmationBackend.php',
         'OCP\\User\\Backend\\IPasswordHashBackend' => __DIR__ . '/../../..' . '/lib/public/User/Backend/IPasswordHashBackend.php',
         'OCP\\User\\Backend\\IProvideAvatarBackend' => __DIR__ . '/../../..' . '/lib/public/User/Backend/IProvideAvatarBackend.php',
@@ -1165,6 +1173,8 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OC\\Broadcast\\Events\\BroadcastEvent' => __DIR__ . '/../../..' . '/lib/private/Broadcast/Events/BroadcastEvent.php',
         'OC\\Cache\\CappedMemoryCache' => __DIR__ . '/../../..' . '/lib/private/Cache/CappedMemoryCache.php',
         'OC\\Cache\\File' => __DIR__ . '/../../..' . '/lib/private/Cache/File.php',
+        'OC\\Calendar\\AvailabilityResult' => __DIR__ . '/../../..' . '/lib/private/Calendar/AvailabilityResult.php',
+        'OC\\Calendar\\CalendarEventBuilder' => __DIR__ . '/../../..' . '/lib/private/Calendar/CalendarEventBuilder.php',
         'OC\\Calendar\\CalendarQuery' => __DIR__ . '/../../..' . '/lib/private/Calendar/CalendarQuery.php',
         'OC\\Calendar\\Manager' => __DIR__ . '/../../..' . '/lib/private/Calendar/Manager.php',
         'OC\\Calendar\\Resource\\Manager' => __DIR__ . '/../../..' . '/lib/private/Calendar/Resource/Manager.php',
@@ -1202,6 +1212,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OC\\Comments\\Manager' => __DIR__ . '/../../..' . '/lib/private/Comments/Manager.php',
         'OC\\Comments\\ManagerFactory' => __DIR__ . '/../../..' . '/lib/private/Comments/ManagerFactory.php',
         'OC\\Config' => __DIR__ . '/../../..' . '/lib/private/Config.php',
+        'OC\\Config\\Lexicon\\CoreConfigLexicon' => __DIR__ . '/../../..' . '/lib/private/Config/Lexicon/CoreConfigLexicon.php',
         'OC\\Config\\UserConfig' => __DIR__ . '/../../..' . '/lib/private/Config/UserConfig.php',
         'OC\\Console\\Application' => __DIR__ . '/../../..' . '/lib/private/Console/Application.php',
         'OC\\Console\\TimestampFormatter' => __DIR__ . '/../../..' . '/lib/private/Console/TimestampFormatter.php',
@@ -1375,6 +1386,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OC\\Core\\Controller\\TextProcessingApiController' => __DIR__ . '/../../..' . '/core/Controller/TextProcessingApiController.php',
         'OC\\Core\\Controller\\TextToImageApiController' => __DIR__ . '/../../..' . '/core/Controller/TextToImageApiController.php',
         'OC\\Core\\Controller\\TranslationApiController' => __DIR__ . '/../../..' . '/core/Controller/TranslationApiController.php',
+        'OC\\Core\\Controller\\TwoFactorApiController' => __DIR__ . '/../../..' . '/core/Controller/TwoFactorApiController.php',
         'OC\\Core\\Controller\\TwoFactorChallengeController' => __DIR__ . '/../../..' . '/core/Controller/TwoFactorChallengeController.php',
         'OC\\Core\\Controller\\UnifiedSearchController' => __DIR__ . '/../../..' . '/core/Controller/UnifiedSearchController.php',
         'OC\\Core\\Controller\\UnsupportedBrowserController' => __DIR__ . '/../../..' . '/core/Controller/UnsupportedBrowserController.php',
@@ -1619,6 +1631,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OC\\Files\\Config\\MountProviderCollection' => __DIR__ . '/../../..' . '/lib/private/Files/Config/MountProviderCollection.php',
         'OC\\Files\\Config\\UserMountCache' => __DIR__ . '/../../..' . '/lib/private/Files/Config/UserMountCache.php',
         'OC\\Files\\Config\\UserMountCacheListener' => __DIR__ . '/../../..' . '/lib/private/Files/Config/UserMountCacheListener.php',
+        'OC\\Files\\Conversion\\ConversionManager' => __DIR__ . '/../../..' . '/lib/private/Files/Conversion/ConversionManager.php',
         'OC\\Files\\FileInfo' => __DIR__ . '/../../..' . '/lib/private/Files/FileInfo.php',
         'OC\\Files\\FilenameValidator' => __DIR__ . '/../../..' . '/lib/private/Files/FilenameValidator.php',
         'OC\\Files\\Filesystem' => __DIR__ . '/../../..' . '/lib/private/Files/Filesystem.php',
@@ -1979,6 +1992,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OC\\Security\\IdentityProof\\Manager' => __DIR__ . '/../../..' . '/lib/private/Security/IdentityProof/Manager.php',
         'OC\\Security\\IdentityProof\\Signer' => __DIR__ . '/../../..' . '/lib/private/Security/IdentityProof/Signer.php',
         'OC\\Security\\Ip\\Address' => __DIR__ . '/../../..' . '/lib/private/Security/Ip/Address.php',
+        'OC\\Security\\Ip\\BruteforceAllowList' => __DIR__ . '/../../..' . '/lib/private/Security/Ip/BruteforceAllowList.php',
         'OC\\Security\\Ip\\Factory' => __DIR__ . '/../../..' . '/lib/private/Security/Ip/Factory.php',
         'OC\\Security\\Ip\\Range' => __DIR__ . '/../../..' . '/lib/private/Security/Ip/Range.php',
         'OC\\Security\\Ip\\RemoteAddress' => __DIR__ . '/../../..' . '/lib/private/Security/Ip/RemoteAddress.php',
diff --git a/lib/l10n/af.js b/lib/l10n/af.js
index d31c44d855f..db8d58e5af7 100644
--- a/lib/l10n/af.js
+++ b/lib/l10n/af.js
@@ -28,9 +28,7 @@ OC.L10N.register(
     "Storage is temporarily not available" : "Berging is tydelik nie beskikbaar nie",
     "Text" : "Teks",
     "Summary" : "Opsomming",
-    "Help" : "Hulp",
     "Users" : "Gebruikers",
-    "Unknown user" : "Onbekende gebruiker",
     "Open »%s«" : "Open »%s«"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/af.json b/lib/l10n/af.json
index 5054233efc4..4fd5d48c869 100644
--- a/lib/l10n/af.json
+++ b/lib/l10n/af.json
@@ -26,9 +26,7 @@
     "Storage is temporarily not available" : "Berging is tydelik nie beskikbaar nie",
     "Text" : "Teks",
     "Summary" : "Opsomming",
-    "Help" : "Hulp",
     "Users" : "Gebruikers",
-    "Unknown user" : "Onbekende gebruiker",
     "Open »%s«" : "Open »%s«"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/an.js b/lib/l10n/an.js
index 0087af4c8a9..dc0f635ab2b 100644
--- a/lib/l10n/an.js
+++ b/lib/l10n/an.js
@@ -12,7 +12,6 @@ OC.L10N.register(
     "Apps" : "Aplicazions",
     "Settings" : "Configurazión",
     "Email" : "Correu electronico",
-    "Help" : "Aduya",
     "Users" : "Usuarios"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/an.json b/lib/l10n/an.json
index 3a26f9e5613..973a5f628ca 100644
--- a/lib/l10n/an.json
+++ b/lib/l10n/an.json
@@ -10,7 +10,6 @@
     "Apps" : "Aplicazions",
     "Settings" : "Configurazión",
     "Email" : "Correu electronico",
-    "Help" : "Aduya",
     "Users" : "Usuarios"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/ar.js b/lib/l10n/ar.js
index 95ee62c5110..702543eda09 100644
--- a/lib/l10n/ar.js
+++ b/lib/l10n/ar.js
@@ -59,6 +59,11 @@ OC.L10N.register(
     "Avatar image is not square" : "الصورة الرمزية ليست على شكل مربّع",
     "Files" : "الملفات",
     "View profile" : "عرض الملف الشخصي",
+    "same time" : "نفس التوقيت",
+    "_%nh_::_%nh_" : ["%n ساعة","%n ساعة","%n ساعة","%n ساعة","%n ساعة","%n ساعة"],
+    "_%nm_::_%nm_" : ["%nد","%nد","%nد","%nد","%nد","%nد"],
+    "%s ahead" : "%s مُتقَدِّم",
+    "%s behind" : "%s مُتأَخِّر",
     "Local time: %s" : "الوقت المحلّي: %s",
     "today" : "اليوم",
     "tomorrow" : "يوم غد",
@@ -81,6 +86,12 @@ OC.L10N.register(
     "seconds ago" : "منذ ثوانٍ",
     "Empty file" : "ملفٌ فارغٌ",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "الوحدة module ذات الرقم ID ـ : %s غير موجودة. رجاءً، فعّلها في إعدادات التطبيقات لديك، أو اتصل بمسؤول النظام.",
+    "No file conversion providers available" : "لا يوجد أي مُزوِّد لتحويل الملفات",
+    "File is too large to convert" : "الملف كبير جداً فلايمكن تحويله",
+    "Destination does not match conversion extension" : "المَقصِد لايتطابق مع امتداد التحويل",
+    "Could not convert file" : "لايمكن تحويل الملف",
+    "Destination does not exist" : "المَقصِد غير موجود",
+    "Destination is not creatable" : "المِقصِد لايمكن إنشاؤه",
     "Dot files are not allowed" : "الملفات النقطية (ملفات ذات أسماء تبدأ بنقطة) غير مسموح بها",
     "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" غير مسموح به أن يكون اسم ملف أو مجلد.",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" غير مسموح به أن يكون بادئة لاسم ملف أو مجلد.",
@@ -92,6 +103,13 @@ OC.L10N.register(
     "Invalid path" : "مسار غير صالح !",
     "Failed to create file from template" : "تعذّر إنشاء ملفٍ من قالبٍ",
     "Templates" : "القوالب",
+    "Storage %s cannot be moved" : "وحدة التخزين %s لايمكن نقلها",
+    "Moving a share (%s) into a shared folder is not allowed" : "نقل مشاركة (%s) في مجلد مشترك غير ممكن",
+    "Moving a storage (%s) into a shared folder is not allowed" : "نقل وحدة تخزين (%s) في مجلد مشترك غير ممكن",
+    "Moving a share (%s) into another share (%s) is not allowed" : "نقل مشاركة (%s) في مشاركة أخرى (%s) غير ممكن",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "نقل مشاركة (%s) لوحدة تخزين أخرى (%s) غير ممكن",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "نقل وحدة تخزين (%s) في مشاركة (%s) غير ممكن",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "نقل وحدة تخزين (%s) في وحدة تخزين أخرى (%s) غير ممكن",
     "Path contains invalid segments" : "يحتوي المسار على أجزاء غير صحيحة",
     "Filename is a reserved word" : "اسم الملف غير مقبوله لأنه كلمة محجوزة",
     "Filename contains at least one invalid character" : "اسم الملف به على الأقل حرفٌ غير صالح",
@@ -425,41 +443,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "يُلَخِّص النص بتقليل طوله دون فقدان المعنى.",
     "Extracts topics from a text and outputs them separated by commas." : "يستخلص المواضيع من النص و إخراجها مفصولة بفواصل.",
     "Education Edition" : "الإصدار التعليمي",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "المستخدم المسجل دخوله يجب أن يكون مدير admin، أو مدير فرعي sub admin، أو يحمل صلاحياتٍ خاصّةٍ للوصول إلى هذه الإعدادات.",
-    "Logged in user must be an admin or sub admin" : "المستخدم المسجل دخوله يجب أن يكون مدير admin، أو مدير فرعي sub",
-    "Logged in user must be an admin" : "المستخدم المسجل دخوله يجب أن يكون مدير admin.",
     "File name is a reserved word" : "اسم الملف كلمة محجوزة",
     "File name contains at least one invalid character" : "اسم الملف به ، على الأقل ، حرف غير صالح",
     "File name is too long" : "اسم الملف طويل جداً",
-    "Help" : "المساعدة",
     "Users" : "المستخدمين",
-    "Unknown user" : "المستخدم مجهول",
-    "Enter the database username and name for %s" : "أدخل اسم المستخدم و اسم قاعدة البيانات %s",
-    "Enter the database username for %s" : "أدخل اسم المستخدم لقاعدة البيانات لـ %s",
-    "MySQL username and/or password not valid" : "اسم المستخدم لقاعدة البيانات MySQL و/أو كلمة المرور غير صحيحة",
-    "Oracle username and/or password not valid" : "اسم المستخدم  و/أو  كلمة المرور لنظام Oracle غير صحيح",
-    "PostgreSQL username and/or password not valid" : "اسم المستخدم / أو كلمة المرور الخاصة بـPostgreSQL غير صحيحة",
-    "Set an admin username." : "اعداد اسم مستخدم المدير",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s شارك »%2$s« معك و يرغب في إضافة:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s شارك »%2$s« معك و يرغب في إضافة",
     "»%s« added a note to a file shared with you" : "»%s« أضاف ملاحظة لملفٍ سلفت مشاركته معك",
     "Open »%s«" : "فتح »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "المشاركة %sلم تتم لأن هذا العنصر سبقت مشاركته سلفاً مع المستخدم %s",
     "%1$s shared »%2$s« with you" : "%1$s شارك »%2$s« معك",
     "%1$s shared »%2$s« with you." : "%1$s شَارَكَ »%2$s« معك.",
     "Click the button below to open it." : "اضغط على الزر الذي تحته ليتم فتحه.",
-    "The username is already being used" : "اسم المستخدم قيد الاستخدام بالفعل",
-    "Could not create user" : "لا يمكن إنشاء المستخدم",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "الحروف التالية فقط مسموحٌ بها في اسم المستخدِم: \"a-z\"و \"A-Z\"و \"0-9\" و الفراغ و  \"_.@-'\"",
-    "A valid username must be provided" : "يجب ادخال اسم مستخدم صحيح",
-    "Username contains whitespace at the beginning or at the end" : "إنّ اسم المستخدم يحتوي على مسافة بيضاء سواءا في البداية أو النهاية",
-    "Username must not consist of dots only" : "اسم المستخدم يجب ألاّ يتكون من نقاطٍ dots فقط",
-    "Username is invalid because files already exist for this user" : "اسم المستخدم غير صحيحٍ لأن هنالك ملفات موجودة سلفاً لهذا المستخدم",
-    "User disabled" : "تم تعطيل المستخدم",
     "File is currently busy, please try again later" : "إنّ الملف مشغول الآمن، يرجى إعادة المحاولة لاحقًا",
     "Cannot download file" : "لا يمكن تنزيل الملف",
-    "Your data directory is readable by other users." : "دليل بياناتك data directory يُمكن قراءته من مستخدمين آخرين.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "الرجاء تغيير الصلاحيات إلى 0770 حتى لا يتمكن المستخدمون الآخرون من عرض محتويات المجلد.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "تأكد من وجود ملفٍ باسم \".ocdata\" في جذر دليل البيانات data directory."
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/lib/l10n/ar.json b/lib/l10n/ar.json
index e2c8ea9354e..be0a0bb9b7d 100644
--- a/lib/l10n/ar.json
+++ b/lib/l10n/ar.json
@@ -57,6 +57,11 @@
     "Avatar image is not square" : "الصورة الرمزية ليست على شكل مربّع",
     "Files" : "الملفات",
     "View profile" : "عرض الملف الشخصي",
+    "same time" : "نفس التوقيت",
+    "_%nh_::_%nh_" : ["%n ساعة","%n ساعة","%n ساعة","%n ساعة","%n ساعة","%n ساعة"],
+    "_%nm_::_%nm_" : ["%nد","%nد","%nد","%nد","%nد","%nد"],
+    "%s ahead" : "%s مُتقَدِّم",
+    "%s behind" : "%s مُتأَخِّر",
     "Local time: %s" : "الوقت المحلّي: %s",
     "today" : "اليوم",
     "tomorrow" : "يوم غد",
@@ -79,6 +84,12 @@
     "seconds ago" : "منذ ثوانٍ",
     "Empty file" : "ملفٌ فارغٌ",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "الوحدة module ذات الرقم ID ـ : %s غير موجودة. رجاءً، فعّلها في إعدادات التطبيقات لديك، أو اتصل بمسؤول النظام.",
+    "No file conversion providers available" : "لا يوجد أي مُزوِّد لتحويل الملفات",
+    "File is too large to convert" : "الملف كبير جداً فلايمكن تحويله",
+    "Destination does not match conversion extension" : "المَقصِد لايتطابق مع امتداد التحويل",
+    "Could not convert file" : "لايمكن تحويل الملف",
+    "Destination does not exist" : "المَقصِد غير موجود",
+    "Destination is not creatable" : "المِقصِد لايمكن إنشاؤه",
     "Dot files are not allowed" : "الملفات النقطية (ملفات ذات أسماء تبدأ بنقطة) غير مسموح بها",
     "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" غير مسموح به أن يكون اسم ملف أو مجلد.",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" غير مسموح به أن يكون بادئة لاسم ملف أو مجلد.",
@@ -90,6 +101,13 @@
     "Invalid path" : "مسار غير صالح !",
     "Failed to create file from template" : "تعذّر إنشاء ملفٍ من قالبٍ",
     "Templates" : "القوالب",
+    "Storage %s cannot be moved" : "وحدة التخزين %s لايمكن نقلها",
+    "Moving a share (%s) into a shared folder is not allowed" : "نقل مشاركة (%s) في مجلد مشترك غير ممكن",
+    "Moving a storage (%s) into a shared folder is not allowed" : "نقل وحدة تخزين (%s) في مجلد مشترك غير ممكن",
+    "Moving a share (%s) into another share (%s) is not allowed" : "نقل مشاركة (%s) في مشاركة أخرى (%s) غير ممكن",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "نقل مشاركة (%s) لوحدة تخزين أخرى (%s) غير ممكن",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "نقل وحدة تخزين (%s) في مشاركة (%s) غير ممكن",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "نقل وحدة تخزين (%s) في وحدة تخزين أخرى (%s) غير ممكن",
     "Path contains invalid segments" : "يحتوي المسار على أجزاء غير صحيحة",
     "Filename is a reserved word" : "اسم الملف غير مقبوله لأنه كلمة محجوزة",
     "Filename contains at least one invalid character" : "اسم الملف به على الأقل حرفٌ غير صالح",
@@ -423,41 +441,19 @@
     "Summarizes text by reducing its length without losing key information." : "يُلَخِّص النص بتقليل طوله دون فقدان المعنى.",
     "Extracts topics from a text and outputs them separated by commas." : "يستخلص المواضيع من النص و إخراجها مفصولة بفواصل.",
     "Education Edition" : "الإصدار التعليمي",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "المستخدم المسجل دخوله يجب أن يكون مدير admin، أو مدير فرعي sub admin، أو يحمل صلاحياتٍ خاصّةٍ للوصول إلى هذه الإعدادات.",
-    "Logged in user must be an admin or sub admin" : "المستخدم المسجل دخوله يجب أن يكون مدير admin، أو مدير فرعي sub",
-    "Logged in user must be an admin" : "المستخدم المسجل دخوله يجب أن يكون مدير admin.",
     "File name is a reserved word" : "اسم الملف كلمة محجوزة",
     "File name contains at least one invalid character" : "اسم الملف به ، على الأقل ، حرف غير صالح",
     "File name is too long" : "اسم الملف طويل جداً",
-    "Help" : "المساعدة",
     "Users" : "المستخدمين",
-    "Unknown user" : "المستخدم مجهول",
-    "Enter the database username and name for %s" : "أدخل اسم المستخدم و اسم قاعدة البيانات %s",
-    "Enter the database username for %s" : "أدخل اسم المستخدم لقاعدة البيانات لـ %s",
-    "MySQL username and/or password not valid" : "اسم المستخدم لقاعدة البيانات MySQL و/أو كلمة المرور غير صحيحة",
-    "Oracle username and/or password not valid" : "اسم المستخدم  و/أو  كلمة المرور لنظام Oracle غير صحيح",
-    "PostgreSQL username and/or password not valid" : "اسم المستخدم / أو كلمة المرور الخاصة بـPostgreSQL غير صحيحة",
-    "Set an admin username." : "اعداد اسم مستخدم المدير",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s شارك »%2$s« معك و يرغب في إضافة:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s شارك »%2$s« معك و يرغب في إضافة",
     "»%s« added a note to a file shared with you" : "»%s« أضاف ملاحظة لملفٍ سلفت مشاركته معك",
     "Open »%s«" : "فتح »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "المشاركة %sلم تتم لأن هذا العنصر سبقت مشاركته سلفاً مع المستخدم %s",
     "%1$s shared »%2$s« with you" : "%1$s شارك »%2$s« معك",
     "%1$s shared »%2$s« with you." : "%1$s شَارَكَ »%2$s« معك.",
     "Click the button below to open it." : "اضغط على الزر الذي تحته ليتم فتحه.",
-    "The username is already being used" : "اسم المستخدم قيد الاستخدام بالفعل",
-    "Could not create user" : "لا يمكن إنشاء المستخدم",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "الحروف التالية فقط مسموحٌ بها في اسم المستخدِم: \"a-z\"و \"A-Z\"و \"0-9\" و الفراغ و  \"_.@-'\"",
-    "A valid username must be provided" : "يجب ادخال اسم مستخدم صحيح",
-    "Username contains whitespace at the beginning or at the end" : "إنّ اسم المستخدم يحتوي على مسافة بيضاء سواءا في البداية أو النهاية",
-    "Username must not consist of dots only" : "اسم المستخدم يجب ألاّ يتكون من نقاطٍ dots فقط",
-    "Username is invalid because files already exist for this user" : "اسم المستخدم غير صحيحٍ لأن هنالك ملفات موجودة سلفاً لهذا المستخدم",
-    "User disabled" : "تم تعطيل المستخدم",
     "File is currently busy, please try again later" : "إنّ الملف مشغول الآمن، يرجى إعادة المحاولة لاحقًا",
     "Cannot download file" : "لا يمكن تنزيل الملف",
-    "Your data directory is readable by other users." : "دليل بياناتك data directory يُمكن قراءته من مستخدمين آخرين.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "الرجاء تغيير الصلاحيات إلى 0770 حتى لا يتمكن المستخدمون الآخرون من عرض محتويات المجلد.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "تأكد من وجود ملفٍ باسم \".ocdata\" في جذر دليل البيانات data directory."
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }
\ No newline at end of file
diff --git a/lib/l10n/ast.js b/lib/l10n/ast.js
index 13087f33729..a43d3e7637d 100644
--- a/lib/l10n/ast.js
+++ b/lib/l10n/ast.js
@@ -214,37 +214,17 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Resume'l testu amenorgando la so llongura ensin perder la información importante.",
     "Extracts topics from a text and outputs them separated by commas." : "Estrái temes d'un testu y devuélvelos separtaos per comes.",
     "Education Edition" : "Edición educativa",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "L'usuariu que tien la sesión aniciada ha ser d'alministración, un sodominiu o tener un permisu especial p'acceder a esta opción",
-    "Logged in user must be an admin or sub admin" : "L'usuariu que tien la sesión aniciada ha ser d'alministración o un sodominiu",
-    "Logged in user must be an admin" : "L'usuariu que tien la sesión aniciada ha ser d'alministración",
     "File name is a reserved word" : "El nome de ficheru ye una pallabra acutada",
     "File name contains at least one invalid character" : "El nome del ficheru contién polo menos un caráuter inváldu",
     "File name is too long" : "El nome del ficheru ye mui llongu",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Usuariu desconocíu",
-    "Enter the database username and name for %s" : "Introduz el nome d'usuariu y el nome de la base de datos pa: %s",
-    "Enter the database username for %s" : "Introduz el nome d'usuariu de la base de datos pa: %s",
-    "MySQL username and/or password not valid" : "El nome d'usuariu y/o la contraseña de MySQL son inválidos",
-    "Oracle username and/or password not valid" : "El nome d'usuariu y/o la contraseña d'Oracle son inválidos",
-    "PostgreSQL username and/or password not valid" : "El nome d'usuariu y/o la contraseña de PostgreSQL son inválidos",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s compartío «%2$s» contigo y quier amestar:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s compartío «%2$s» contigo y quier amestar",
     "»%s« added a note to a file shared with you" : "«%s» amestó una nota a un ficheru compartío contigo",
     "Open »%s«" : "Abrir «%s»",
-    "Sharing %s failed, because this item is already shared with user %s" : "La compartición de «%s» falló porque esti elementu yá ta compartíu col usuariu «%s»",
     "%1$s shared »%2$s« with you" : "%1$s compartió «%2$s» contigo",
     "%1$s shared »%2$s« with you." : "%1$s compartió «%2$s» contigo.",
     "Click the button below to open it." : "Calca nel botón p'abrilo.",
-    "The username is already being used" : "El nome d'usuariu yá ta n'usu",
-    "Could not create user" : "Nun se pudo crear l'usuariu",
-    "A valid username must be provided" : "Ha fornise un nome d'usuariu válidu",
-    "Username contains whitespace at the beginning or at the end" : "El nome d'usuariu contién un espaciu nel comienzu o al final",
-    "Username must not consist of dots only" : "El nome d'usuariu nun ha tar formáu namás por puntos",
-    "Username is invalid because files already exist for this user" : "El nome d'usuariu ye inválidu porque yá esisten los ficheros pa esti ficheru",
-    "User disabled" : "L'usuariu ta desactiváu",
-    "Your data directory is readable by other users." : "Los demás usuarios puen lleer el to direutoriu de datos.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Camuda los permisos a 0770 y, polo tanto, los demás usuarios nun puen llistar el direutoriu.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegúrate de que'l ficheru llamáu «.ocdata» ta nel raigañu del direutoriu de datos."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/ast.json b/lib/l10n/ast.json
index bd945f062b4..b89f16931e3 100644
--- a/lib/l10n/ast.json
+++ b/lib/l10n/ast.json
@@ -212,37 +212,17 @@
     "Summarizes text by reducing its length without losing key information." : "Resume'l testu amenorgando la so llongura ensin perder la información importante.",
     "Extracts topics from a text and outputs them separated by commas." : "Estrái temes d'un testu y devuélvelos separtaos per comes.",
     "Education Edition" : "Edición educativa",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "L'usuariu que tien la sesión aniciada ha ser d'alministración, un sodominiu o tener un permisu especial p'acceder a esta opción",
-    "Logged in user must be an admin or sub admin" : "L'usuariu que tien la sesión aniciada ha ser d'alministración o un sodominiu",
-    "Logged in user must be an admin" : "L'usuariu que tien la sesión aniciada ha ser d'alministración",
     "File name is a reserved word" : "El nome de ficheru ye una pallabra acutada",
     "File name contains at least one invalid character" : "El nome del ficheru contién polo menos un caráuter inváldu",
     "File name is too long" : "El nome del ficheru ye mui llongu",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Usuariu desconocíu",
-    "Enter the database username and name for %s" : "Introduz el nome d'usuariu y el nome de la base de datos pa: %s",
-    "Enter the database username for %s" : "Introduz el nome d'usuariu de la base de datos pa: %s",
-    "MySQL username and/or password not valid" : "El nome d'usuariu y/o la contraseña de MySQL son inválidos",
-    "Oracle username and/or password not valid" : "El nome d'usuariu y/o la contraseña d'Oracle son inválidos",
-    "PostgreSQL username and/or password not valid" : "El nome d'usuariu y/o la contraseña de PostgreSQL son inválidos",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s compartío «%2$s» contigo y quier amestar:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s compartío «%2$s» contigo y quier amestar",
     "»%s« added a note to a file shared with you" : "«%s» amestó una nota a un ficheru compartío contigo",
     "Open »%s«" : "Abrir «%s»",
-    "Sharing %s failed, because this item is already shared with user %s" : "La compartición de «%s» falló porque esti elementu yá ta compartíu col usuariu «%s»",
     "%1$s shared »%2$s« with you" : "%1$s compartió «%2$s» contigo",
     "%1$s shared »%2$s« with you." : "%1$s compartió «%2$s» contigo.",
     "Click the button below to open it." : "Calca nel botón p'abrilo.",
-    "The username is already being used" : "El nome d'usuariu yá ta n'usu",
-    "Could not create user" : "Nun se pudo crear l'usuariu",
-    "A valid username must be provided" : "Ha fornise un nome d'usuariu válidu",
-    "Username contains whitespace at the beginning or at the end" : "El nome d'usuariu contién un espaciu nel comienzu o al final",
-    "Username must not consist of dots only" : "El nome d'usuariu nun ha tar formáu namás por puntos",
-    "Username is invalid because files already exist for this user" : "El nome d'usuariu ye inválidu porque yá esisten los ficheros pa esti ficheru",
-    "User disabled" : "L'usuariu ta desactiváu",
-    "Your data directory is readable by other users." : "Los demás usuarios puen lleer el to direutoriu de datos.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Camuda los permisos a 0770 y, polo tanto, los demás usuarios nun puen llistar el direutoriu.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegúrate de que'l ficheru llamáu «.ocdata» ta nel raigañu del direutoriu de datos."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/az.js b/lib/l10n/az.js
index 35dda74c32a..3c5d659f0e5 100644
--- a/lib/l10n/az.js
+++ b/lib/l10n/az.js
@@ -66,11 +66,6 @@ OC.L10N.register(
     "Token expired. Please reload page." : "Token vaxtı bitib. Xahiş olunur səhifəni yenidən yükləyəsiniz.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu ola bilər ki, cache/accelerator such tərəfindən cağırılıb hansi ki, Zend OPcache və eAccelerator-da olduğu kimidir.",
     "Summary" : "Xülasə",
-    "Help" : "Kömək",
-    "Users" : "İstifadəçilər",
-    "Unknown user" : "Istifadəçi tanınmır ",
-    "Oracle username and/or password not valid" : "Oracle istifadəçi adı və/ya şifrəsi düzgün deyil",
-    "Set an admin username." : "İnzibatçı istifadəçi adını təyin et.",
-    "A valid username must be provided" : "Düzgün istifadəçi adı daxil edilməlidir"
+    "Users" : "İstifadəçilər"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/az.json b/lib/l10n/az.json
index e01e65b635d..f355835ace3 100644
--- a/lib/l10n/az.json
+++ b/lib/l10n/az.json
@@ -64,11 +64,6 @@
     "Token expired. Please reload page." : "Token vaxtı bitib. Xahiş olunur səhifəni yenidən yükləyəsiniz.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu ola bilər ki, cache/accelerator such tərəfindən cağırılıb hansi ki, Zend OPcache və eAccelerator-da olduğu kimidir.",
     "Summary" : "Xülasə",
-    "Help" : "Kömək",
-    "Users" : "İstifadəçilər",
-    "Unknown user" : "Istifadəçi tanınmır ",
-    "Oracle username and/or password not valid" : "Oracle istifadəçi adı və/ya şifrəsi düzgün deyil",
-    "Set an admin username." : "İnzibatçı istifadəçi adını təyin et.",
-    "A valid username must be provided" : "Düzgün istifadəçi adı daxil edilməlidir"
+    "Users" : "İstifadəçilər"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/be.js b/lib/l10n/be.js
index b2b419bd53e..c09f9f65f7e 100644
--- a/lib/l10n/be.js
+++ b/lib/l10n/be.js
@@ -30,7 +30,6 @@ OC.L10N.register(
     "September" : "Верасень",
     "October" : "Кастрычнік",
     "November" : "Лістапад",
-    "December" : "Снежань",
-    "Help" : "Help"
+    "December" : "Снежань"
 },
 "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
diff --git a/lib/l10n/be.json b/lib/l10n/be.json
index 4ef66a740bb..7693febd0b3 100644
--- a/lib/l10n/be.json
+++ b/lib/l10n/be.json
@@ -28,7 +28,6 @@
     "September" : "Верасень",
     "October" : "Кастрычнік",
     "November" : "Лістапад",
-    "December" : "Снежань",
-    "Help" : "Help"
+    "December" : "Снежань"
 },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
 }
\ No newline at end of file
diff --git a/lib/l10n/bg.js b/lib/l10n/bg.js
index 835c73ac92f..27a2239282a 100644
--- a/lib/l10n/bg.js
+++ b/lib/l10n/bg.js
@@ -52,6 +52,7 @@ OC.L10N.register(
     "Avatar image is not square" : "Изображението на аватара не е квадратно",
     "Files" : "Файлове",
     "View profile" : "Преглед на профил",
+    "_%nh_::_%nh_" : ["%nч","%nч"],
     "Local time: %s" : "Местно време: %s",
     "today" : "днес",
     "tomorrow" : "утре",
@@ -232,41 +233,19 @@ OC.L10N.register(
     "Target language" : "Целеви език",
     "Result" : "Резултат",
     "Education Edition" : "Образователно издание",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Влезлият потребител трябва да е администратор, подадминистратор или да е получил специално право за достъп до тази настройка",
-    "Logged in user must be an admin or sub admin" : "Влезлият потребител трябва да е администратор или подадминистратор ",
-    "Logged in user must be an admin" : "Влезлият потребител трябва да е администратор",
     "File name is a reserved word" : "Името на файла е запазена дума",
     "File name contains at least one invalid character" : "Името на файла съдържа поне един невалиден символ",
     "File name is too long" : "Името на файла е твърде дълго",
-    "Help" : "Помощ",
     "Users" : "Потребители",
-    "Unknown user" : "Непознат потребител",
-    "Enter the database username and name for %s" : "Въведете името на потребител на базата данни и име за %s",
-    "Enter the database username for %s" : "Въведете името на потребител на базата данни за %s",
-    "MySQL username and/or password not valid" : "Име на потребител и/или паролата на MySQL не са валидни",
-    "Oracle username and/or password not valid" : "Невалидно Oracle потребителско име и/или парола.",
-    "PostgreSQL username and/or password not valid" : "Невалидно PostgreSQL потребителско име и/или парола.",
-    "Set an admin username." : "Задайте потребителско име за администратор.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s сподели »%2$s« с вас и иска да добави:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s сподели »%2$s« с вас и иска да добави",
     "»%s« added a note to a file shared with you" : "»%s« добави бележка към файл, споделен с вас ",
     "Open »%s«" : "Отвори »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Неуспешно споделяне на %s, защото този елемент вече е споделен с потребителя %s",
     "%1$s shared »%2$s« with you" : "%1$s сподели »%2$s« с вас",
     "%1$s shared »%2$s« with you." : "%1$s сподели »%2$s« с вас.",
     "Click the button below to open it." : "Щракнете върху бутона по-долу, за да го отворите.",
-    "The username is already being used" : "Потребителското име е вече заето.",
-    "Could not create user" : "Неуспешно създаване на потребител",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Потребителските имена може да съдържат само следните знаци: \"a-z\", \"A-Z\", \"0-9\" и \"_.@-'\"",
-    "A valid username must be provided" : "Трябва да въведете валидно потребителско.",
-    "Username contains whitespace at the beginning or at the end" : "Потребителското име започва или завършва с интервал.",
-    "Username must not consist of dots only" : "Името на потребител не трябва да се състои само от точки",
-    "Username is invalid because files already exist for this user" : "Името на потребител е невалидно, тъй като файловете вече съществуват за този потребител",
-    "User disabled" : "Потребителят е деактивиран",
     "File is currently busy, please try again later" : "Файлът в момента е зает, моля, опитайте отново по-късно",
     "Cannot download file" : "Файлът не можа да бъде изтеглен",
-    "Your data directory is readable by other users." : "Вашата директория с данни може да се чете от други потребители.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Моля, променете правата за достъп на 0770, за да не може директорията да бъде видяна от други потребители.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Уверете се, че има файл, наречен \".ocdata\" в корена на директорията с данни."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/bg.json b/lib/l10n/bg.json
index 03ff519f24b..4b348205814 100644
--- a/lib/l10n/bg.json
+++ b/lib/l10n/bg.json
@@ -50,6 +50,7 @@
     "Avatar image is not square" : "Изображението на аватара не е квадратно",
     "Files" : "Файлове",
     "View profile" : "Преглед на профил",
+    "_%nh_::_%nh_" : ["%nч","%nч"],
     "Local time: %s" : "Местно време: %s",
     "today" : "днес",
     "tomorrow" : "утре",
@@ -230,41 +231,19 @@
     "Target language" : "Целеви език",
     "Result" : "Резултат",
     "Education Edition" : "Образователно издание",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Влезлият потребител трябва да е администратор, подадминистратор или да е получил специално право за достъп до тази настройка",
-    "Logged in user must be an admin or sub admin" : "Влезлият потребител трябва да е администратор или подадминистратор ",
-    "Logged in user must be an admin" : "Влезлият потребител трябва да е администратор",
     "File name is a reserved word" : "Името на файла е запазена дума",
     "File name contains at least one invalid character" : "Името на файла съдържа поне един невалиден символ",
     "File name is too long" : "Името на файла е твърде дълго",
-    "Help" : "Помощ",
     "Users" : "Потребители",
-    "Unknown user" : "Непознат потребител",
-    "Enter the database username and name for %s" : "Въведете името на потребител на базата данни и име за %s",
-    "Enter the database username for %s" : "Въведете името на потребител на базата данни за %s",
-    "MySQL username and/or password not valid" : "Име на потребител и/или паролата на MySQL не са валидни",
-    "Oracle username and/or password not valid" : "Невалидно Oracle потребителско име и/или парола.",
-    "PostgreSQL username and/or password not valid" : "Невалидно PostgreSQL потребителско име и/или парола.",
-    "Set an admin username." : "Задайте потребителско име за администратор.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s сподели »%2$s« с вас и иска да добави:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s сподели »%2$s« с вас и иска да добави",
     "»%s« added a note to a file shared with you" : "»%s« добави бележка към файл, споделен с вас ",
     "Open »%s«" : "Отвори »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Неуспешно споделяне на %s, защото този елемент вече е споделен с потребителя %s",
     "%1$s shared »%2$s« with you" : "%1$s сподели »%2$s« с вас",
     "%1$s shared »%2$s« with you." : "%1$s сподели »%2$s« с вас.",
     "Click the button below to open it." : "Щракнете върху бутона по-долу, за да го отворите.",
-    "The username is already being used" : "Потребителското име е вече заето.",
-    "Could not create user" : "Неуспешно създаване на потребител",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Потребителските имена може да съдържат само следните знаци: \"a-z\", \"A-Z\", \"0-9\" и \"_.@-'\"",
-    "A valid username must be provided" : "Трябва да въведете валидно потребителско.",
-    "Username contains whitespace at the beginning or at the end" : "Потребителското име започва или завършва с интервал.",
-    "Username must not consist of dots only" : "Името на потребител не трябва да се състои само от точки",
-    "Username is invalid because files already exist for this user" : "Името на потребител е невалидно, тъй като файловете вече съществуват за този потребител",
-    "User disabled" : "Потребителят е деактивиран",
     "File is currently busy, please try again later" : "Файлът в момента е зает, моля, опитайте отново по-късно",
     "Cannot download file" : "Файлът не можа да бъде изтеглен",
-    "Your data directory is readable by other users." : "Вашата директория с данни може да се чете от други потребители.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Моля, променете правата за достъп на 0770, за да не може директорията да бъде видяна от други потребители.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Уверете се, че има файл, наречен \".ocdata\" в корена на директорията с данни."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/bn_BD.js b/lib/l10n/bn_BD.js
index d8e0abc24b8..8eecb5228ea 100644
--- a/lib/l10n/bn_BD.js
+++ b/lib/l10n/bn_BD.js
@@ -63,8 +63,6 @@ OC.L10N.register(
     "Application is not enabled" : "অ্যাপ্লিকেসনটি সক্রিয় নয়",
     "Authentication error" : "অনুমোদন ঘটিত সমস্যা",
     "Token expired. Please reload page." : "টোকেন মেয়াদোত্তীর্ণ। দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
-    "Help" : "সহায়িকা",
-    "Users" : "ব্যবহারকারী",
-    "Unknown user" : "অপরিচিত ব্যবহারকারী"
+    "Users" : "ব্যবহারকারী"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/bn_BD.json b/lib/l10n/bn_BD.json
index 4ff445c1df1..5ef2ad8d485 100644
--- a/lib/l10n/bn_BD.json
+++ b/lib/l10n/bn_BD.json
@@ -61,8 +61,6 @@
     "Application is not enabled" : "অ্যাপ্লিকেসনটি সক্রিয় নয়",
     "Authentication error" : "অনুমোদন ঘটিত সমস্যা",
     "Token expired. Please reload page." : "টোকেন মেয়াদোত্তীর্ণ। দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
-    "Help" : "সহায়িকা",
-    "Users" : "ব্যবহারকারী",
-    "Unknown user" : "অপরিচিত ব্যবহারকারী"
+    "Users" : "ব্যবহারকারী"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/br.js b/lib/l10n/br.js
index 101317604e6..84353fd5a03 100644
--- a/lib/l10n/br.js
+++ b/lib/l10n/br.js
@@ -51,12 +51,7 @@ OC.L10N.register(
     "Translate" : "Treiñ",
     "File name contains at least one invalid character" : "Un arouez fall ez eus d'an neubeutañ en anv restr",
     "File name is too long" : "Anv ar restr a zo re hir",
-    "Help" : "Skoazell",
     "Users" : "Implijer",
-    "Unknown user" : "Implijer dianv",
-    "Set an admin username." : "Lakaat un anv-impljer merour.",
-    "Open »%s«" : "Digeriñ  »%s«",
-    "The username is already being used" : "An anv-implijet a zo dija implijet",
-    "User disabled" : "Implijer disaotreet"
+    "Open »%s«" : "Digeriñ  »%s«"
 },
 "nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);");
diff --git a/lib/l10n/br.json b/lib/l10n/br.json
index 16f414e164a..83156c9344a 100644
--- a/lib/l10n/br.json
+++ b/lib/l10n/br.json
@@ -49,12 +49,7 @@
     "Translate" : "Treiñ",
     "File name contains at least one invalid character" : "Un arouez fall ez eus d'an neubeutañ en anv restr",
     "File name is too long" : "Anv ar restr a zo re hir",
-    "Help" : "Skoazell",
     "Users" : "Implijer",
-    "Unknown user" : "Implijer dianv",
-    "Set an admin username." : "Lakaat un anv-impljer merour.",
-    "Open »%s«" : "Digeriñ  »%s«",
-    "The username is already being used" : "An anv-implijet a zo dija implijet",
-    "User disabled" : "Implijer disaotreet"
+    "Open »%s«" : "Digeriñ  »%s«"
 },"pluralForm" :"nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);"
 }
\ No newline at end of file
diff --git a/lib/l10n/bs.js b/lib/l10n/bs.js
index 4aaf400bdd3..53adc8a73e1 100644
--- a/lib/l10n/bs.js
+++ b/lib/l10n/bs.js
@@ -56,8 +56,6 @@ OC.L10N.register(
     "A valid password must be provided" : "Nužno je navesti valjanu lozinku",
     "Authentication error" : "Grešna autentifikacije",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemorisanja kao što je Zend OPcache ili eAccelerator.",
-    "Help" : "Pomoć",
-    "Users" : "Korisnici",
-    "A valid username must be provided" : "Nužno je navesti valjano korisničko ime"
+    "Users" : "Korisnici"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/lib/l10n/bs.json b/lib/l10n/bs.json
index 3352a6e0776..edca736f9b2 100644
--- a/lib/l10n/bs.json
+++ b/lib/l10n/bs.json
@@ -54,8 +54,6 @@
     "A valid password must be provided" : "Nužno je navesti valjanu lozinku",
     "Authentication error" : "Grešna autentifikacije",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemorisanja kao što je Zend OPcache ili eAccelerator.",
-    "Help" : "Pomoć",
-    "Users" : "Korisnici",
-    "A valid username must be provided" : "Nužno je navesti valjano korisničko ime"
+    "Users" : "Korisnici"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/lib/l10n/ca.js b/lib/l10n/ca.js
index 875458c03e1..6933c904549 100644
--- a/lib/l10n/ca.js
+++ b/lib/l10n/ca.js
@@ -265,41 +265,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Resumeix el text reduint-ne la longitud sense perdre la informació clau.",
     "Extracts topics from a text and outputs them separated by commas." : "Extreu els temes d'un text i els retorna separats per comes.",
     "Education Edition" : "Edició educativa",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "L'usuari que ha iniciat la sessió ha de ser administrador, subadministrador o tenir un dret especial per a accedir a aquest paràmetre",
-    "Logged in user must be an admin or sub admin" : "L'usuari que ha iniciat la sessió ha de ser administrador o subadministrador",
-    "Logged in user must be an admin" : "L'usuari que ha iniciat la sessió ha de ser administrador",
     "File name is a reserved word" : "El nom del fitxer és una paraula reservada",
     "File name contains at least one invalid character" : "El nom del fitxer conté almenys un caràcter no vàlid",
     "File name is too long" : "El nom del fitxer és massa llarg",
-    "Help" : "Ajuda",
     "Users" : "Usuaris",
-    "Unknown user" : "Usuari desconegut",
-    "Enter the database username and name for %s" : "Introduïu el nom d'usuari i el nom de la base de dades per a %s",
-    "Enter the database username for %s" : "Introduïu el nom d'usuari de la base de dades per a %s",
-    "MySQL username and/or password not valid" : "El nom d'usuari o la contrasenya del MySQL no són vàlids",
-    "Oracle username and/or password not valid" : "El nom d'usuari o la contrasenya d'Oracle no són vàlids",
-    "PostgreSQL username and/or password not valid" : "El nom d'usuari o la contrasenya del PostgreSQL no són vàlids",
-    "Set an admin username." : "Definiu un nom d'usuari per a l'administrador.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s ha compartit «%2$s» amb vós i vol afegir:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s ha compartit «%2$s» amb vós i vol afegir",
     "»%s« added a note to a file shared with you" : "%s ha afegit una nota a un fitxer compartit amb vós",
     "Open »%s«" : "Obre «%s»",
-    "Sharing %s failed, because this item is already shared with user %s" : "No s'ha pogut compartir %s perquè l'element ja està compartit amb l'usuari %s",
     "%1$s shared »%2$s« with you" : "%1$s ha compartit «%2$s» amb vós",
     "%1$s shared »%2$s« with you." : "%1$s ha compartit «%2$s» amb vós.",
     "Click the button below to open it." : "Feu clic en el botó següent per a obrir-ho.",
-    "The username is already being used" : "El nom d'usuari ja està en ús",
-    "Could not create user" : "No s'ha pogut crear l'usuari",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Només es permeten els caràcters següents en un nom d'usuari: «a-z», «A-Z», «0-9», espais i «_.@-'»",
-    "A valid username must be provided" : "Heu de proporcionar un nom d'usuari vàlid",
-    "Username contains whitespace at the beginning or at the end" : "El nom d'usuari conté espais en blanc al principi o al final",
-    "Username must not consist of dots only" : "El nom d'usuari no pot estar format només per punts",
-    "Username is invalid because files already exist for this user" : "El nom d'usuari no és vàlid perquè ja existeixen fitxers per a aquest usuari",
-    "User disabled" : "Usuari inhabilitat",
     "File is currently busy, please try again later" : "El fitxer està ocupat actualment; torneu-ho a provar més tard",
     "Cannot download file" : "No es pot baixar el fitxer",
-    "Your data directory is readable by other users." : "Els altres usuaris poden llegir la carpeta de dades.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Canvieu els permisos a 0770 perquè els altres usuaris no puguin veure el contingut de la carpeta.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Assegureu-vos que hi hagi un fitxer anomenat «.ocdata» en l'arrel de la carpeta de dades."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/ca.json b/lib/l10n/ca.json
index 3cfe4bfd813..ee495a82068 100644
--- a/lib/l10n/ca.json
+++ b/lib/l10n/ca.json
@@ -263,41 +263,19 @@
     "Summarizes text by reducing its length without losing key information." : "Resumeix el text reduint-ne la longitud sense perdre la informació clau.",
     "Extracts topics from a text and outputs them separated by commas." : "Extreu els temes d'un text i els retorna separats per comes.",
     "Education Edition" : "Edició educativa",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "L'usuari que ha iniciat la sessió ha de ser administrador, subadministrador o tenir un dret especial per a accedir a aquest paràmetre",
-    "Logged in user must be an admin or sub admin" : "L'usuari que ha iniciat la sessió ha de ser administrador o subadministrador",
-    "Logged in user must be an admin" : "L'usuari que ha iniciat la sessió ha de ser administrador",
     "File name is a reserved word" : "El nom del fitxer és una paraula reservada",
     "File name contains at least one invalid character" : "El nom del fitxer conté almenys un caràcter no vàlid",
     "File name is too long" : "El nom del fitxer és massa llarg",
-    "Help" : "Ajuda",
     "Users" : "Usuaris",
-    "Unknown user" : "Usuari desconegut",
-    "Enter the database username and name for %s" : "Introduïu el nom d'usuari i el nom de la base de dades per a %s",
-    "Enter the database username for %s" : "Introduïu el nom d'usuari de la base de dades per a %s",
-    "MySQL username and/or password not valid" : "El nom d'usuari o la contrasenya del MySQL no són vàlids",
-    "Oracle username and/or password not valid" : "El nom d'usuari o la contrasenya d'Oracle no són vàlids",
-    "PostgreSQL username and/or password not valid" : "El nom d'usuari o la contrasenya del PostgreSQL no són vàlids",
-    "Set an admin username." : "Definiu un nom d'usuari per a l'administrador.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s ha compartit «%2$s» amb vós i vol afegir:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s ha compartit «%2$s» amb vós i vol afegir",
     "»%s« added a note to a file shared with you" : "%s ha afegit una nota a un fitxer compartit amb vós",
     "Open »%s«" : "Obre «%s»",
-    "Sharing %s failed, because this item is already shared with user %s" : "No s'ha pogut compartir %s perquè l'element ja està compartit amb l'usuari %s",
     "%1$s shared »%2$s« with you" : "%1$s ha compartit «%2$s» amb vós",
     "%1$s shared »%2$s« with you." : "%1$s ha compartit «%2$s» amb vós.",
     "Click the button below to open it." : "Feu clic en el botó següent per a obrir-ho.",
-    "The username is already being used" : "El nom d'usuari ja està en ús",
-    "Could not create user" : "No s'ha pogut crear l'usuari",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Només es permeten els caràcters següents en un nom d'usuari: «a-z», «A-Z», «0-9», espais i «_.@-'»",
-    "A valid username must be provided" : "Heu de proporcionar un nom d'usuari vàlid",
-    "Username contains whitespace at the beginning or at the end" : "El nom d'usuari conté espais en blanc al principi o al final",
-    "Username must not consist of dots only" : "El nom d'usuari no pot estar format només per punts",
-    "Username is invalid because files already exist for this user" : "El nom d'usuari no és vàlid perquè ja existeixen fitxers per a aquest usuari",
-    "User disabled" : "Usuari inhabilitat",
     "File is currently busy, please try again later" : "El fitxer està ocupat actualment; torneu-ho a provar més tard",
     "Cannot download file" : "No es pot baixar el fitxer",
-    "Your data directory is readable by other users." : "Els altres usuaris poden llegir la carpeta de dades.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Canvieu els permisos a 0770 perquè els altres usuaris no puguin veure el contingut de la carpeta.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Assegureu-vos que hi hagi un fitxer anomenat «.ocdata» en l'arrel de la carpeta de dades."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/cs.js b/lib/l10n/cs.js
index 978ed14454e..d5491a637fb 100644
--- a/lib/l10n/cs.js
+++ b/lib/l10n/cs.js
@@ -59,6 +59,11 @@ OC.L10N.register(
     "Avatar image is not square" : "Profilový obrázek není čtvercový",
     "Files" : "Soubory",
     "View profile" : "Zobrazit profil ",
+    "same time" : "stejný čas",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh","%nh"],
+    "_%nm_::_%nm_" : ["%nm","%nm","%nm","%nm"],
+    "%s ahead" : "%s před",
+    "%s behind" : "%s za",
     "Local time: %s" : "Místní čas: %s",
     "today" : "dnes",
     "tomorrow" : "zítra",
@@ -81,6 +86,12 @@ OC.L10N.register(
     "seconds ago" : "před pár sekundami",
     "Empty file" : "Prázdný soubor",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modul s identifikátorem: %s neexistuje. Povolte ho v nastavení aplikací, nebo se obraťte na správce.",
+    "No file conversion providers available" : "Nejsou k dispozici žádní poskytovatelé převádění souborů",
+    "File is too large to convert" : "Soubor je příliš velký pro převod",
+    "Destination does not match conversion extension" : "Cíl neodpovídá příponě převodu",
+    "Could not convert file" : "Soubor není možné převést",
+    "Destination does not exist" : "Cíl neexistuje",
+    "Destination is not creatable" : "Cíl není možné vytvořit",
     "Dot files are not allowed" : "Názvy souborů, začínající na tečku nejsou dovolené",
     "\"%1$s\" is a forbidden file or folder name." : "„%1$s“ je zakázáno v názvu souboru nebo složky.",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "„%1$s“ je zakázaná předpona pro názvy souborů či složek.",
@@ -92,6 +103,13 @@ OC.L10N.register(
     "Invalid path" : "Neplatný popis umístění",
     "Failed to create file from template" : "Vytvoření souboru ze šablony se nezdařilo",
     "Templates" : "Šablony",
+    "Storage %s cannot be moved" : "Úložiště %s není možné přesunout",
+    "Moving a share (%s) into a shared folder is not allowed" : "Přesunutí sdílení (%s) do sdílené složky není povoleno",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Přesunutí úložiště (%s) do sdílené složky není povoleno",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Přesunutí sdílení (%s) do jiného sdílení (%s) není povoleno",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Přesunutí sdílení (%s) do jiného úložiště (%s) není povoleno",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Přesunutí úložiště (%s) do sdílení (%s) není povoleno",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Přesunutí úložiště (%s) do jiného úložiště (%s) není povoleno",
     "Path contains invalid segments" : "Popis umístění obsahuje neplatné úseky",
     "Filename is a reserved word" : "Název souboru je rezervované slovo",
     "Filename contains at least one invalid character" : "Název souboru obsahuje přinejmenším jeden neplatný znak",
@@ -425,41 +443,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Vytvoří stručný souhrn textu tím, že zkrátí jeho délku aniž by byly ztraceny klíčové informace",
     "Extracts topics from a text and outputs them separated by commas." : "Vyzíská témata z textu a vypíše je oddělované čárkami.",
     "Education Edition" : "Vydání pro vzdělávací instituce",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Aby mohl přistupovat k tomuto nastavení je třeba, aby přihlášený uživatel byl správce, dílčí správce nebo obdržel speciální oprávnění",
-    "Logged in user must be an admin or sub admin" : "Je třeba, aby přihlášený uživatel byl správcem či správcem pro dílčí oblast",
-    "Logged in user must be an admin" : "Je třeba, aby přihlášený uživatel byl správce",
     "File name is a reserved word" : "Název souboru je rezervované slovo",
     "File name contains at least one invalid character" : "Název souboru obsahuje přinejmenším jeden neplatný znak",
     "File name is too long" : "Název souboru je příliš dlouhý",
-    "Help" : "Nápověda",
     "Users" : "Uživatelé",
-    "Unknown user" : "Neznámý uživatel",
-    "Enter the database username and name for %s" : "Zadejte uživatelské jméno v databázi a název pro %s",
-    "Enter the database username for %s" : "Zadejte uživatelské jméno v databázi pro %s",
-    "MySQL username and/or password not valid" : "Neplatné uživatelské jméno a/nebo heslo do MySQL",
-    "Oracle username and/or password not valid" : "Neplatné uživatelské jméno a/nebo heslo do Oracle",
-    "PostgreSQL username and/or password not valid" : "Neplatné uživatelské jméno a/nebo heslo do PostgreSQL",
-    "Set an admin username." : "Nastavte uživatelské jméno správce.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s sdílí „%2$s“ a dodává:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s sdílí „%2$s“ a dodává",
     "»%s« added a note to a file shared with you" : "„%s“ dodává poznámku k nasdílenému souboru ",
     "Open »%s«" : "Otevřít „%s“",
-    "Sharing %s failed, because this item is already shared with user %s" : "Sdílení %s se nezdařilo, protože tato položka už je sdílena s uživatelem %s",
     "%1$s shared »%2$s« with you" : "%1$s vám sdílí „%2$s“",
     "%1$s shared »%2$s« with you." : "%1$s vám nasdílel(a) „%2$s“.",
     "Click the button below to open it." : "Pro otevření klikněte na tlačítko níže.",
-    "The username is already being used" : "Uživatelské jméno už je využíváno",
-    "Could not create user" : "Nepodařilo se vytvořit uživatele",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Pouze následující znaky jsou povoleny pro uživatelské jméno: „a-z“, „A-Z“, „0-9“, mezery  a „_.@-'“",
-    "A valid username must be provided" : "Je třeba zadat platné uživatelské jméno",
-    "Username contains whitespace at the beginning or at the end" : "Uživatelské jméno je chybné – na jeho začátku či konci se nachází prázdný znak (mezera, tabulátor, atp.)",
-    "Username must not consist of dots only" : "Uživatelské jméno se nemůže skládat pouze ze samých teček",
-    "Username is invalid because files already exist for this user" : "Uživatelské jméno není platné, protože protože pro tohoto uživatele už existují soubory",
-    "User disabled" : "Uživatel zakázán",
     "File is currently busy, please try again later" : "Soubor je nyní používán, zkuste to později",
     "Cannot download file" : "Soubor se nedaří stáhnout",
-    "Your data directory is readable by other users." : "Váš adresář data je čitelný ostatním uživatelům.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Změňte práva na 0770, aby obsah adresáře nemohl být vypisován ostatními uživateli.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Ověřte, že v kořeni datového adresáře je soubor s názvem „.ocdata“."
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");
diff --git a/lib/l10n/cs.json b/lib/l10n/cs.json
index 9177a16f667..b6725eb344e 100644
--- a/lib/l10n/cs.json
+++ b/lib/l10n/cs.json
@@ -57,6 +57,11 @@
     "Avatar image is not square" : "Profilový obrázek není čtvercový",
     "Files" : "Soubory",
     "View profile" : "Zobrazit profil ",
+    "same time" : "stejný čas",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh","%nh"],
+    "_%nm_::_%nm_" : ["%nm","%nm","%nm","%nm"],
+    "%s ahead" : "%s před",
+    "%s behind" : "%s za",
     "Local time: %s" : "Místní čas: %s",
     "today" : "dnes",
     "tomorrow" : "zítra",
@@ -79,6 +84,12 @@
     "seconds ago" : "před pár sekundami",
     "Empty file" : "Prázdný soubor",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modul s identifikátorem: %s neexistuje. Povolte ho v nastavení aplikací, nebo se obraťte na správce.",
+    "No file conversion providers available" : "Nejsou k dispozici žádní poskytovatelé převádění souborů",
+    "File is too large to convert" : "Soubor je příliš velký pro převod",
+    "Destination does not match conversion extension" : "Cíl neodpovídá příponě převodu",
+    "Could not convert file" : "Soubor není možné převést",
+    "Destination does not exist" : "Cíl neexistuje",
+    "Destination is not creatable" : "Cíl není možné vytvořit",
     "Dot files are not allowed" : "Názvy souborů, začínající na tečku nejsou dovolené",
     "\"%1$s\" is a forbidden file or folder name." : "„%1$s“ je zakázáno v názvu souboru nebo složky.",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "„%1$s“ je zakázaná předpona pro názvy souborů či složek.",
@@ -90,6 +101,13 @@
     "Invalid path" : "Neplatný popis umístění",
     "Failed to create file from template" : "Vytvoření souboru ze šablony se nezdařilo",
     "Templates" : "Šablony",
+    "Storage %s cannot be moved" : "Úložiště %s není možné přesunout",
+    "Moving a share (%s) into a shared folder is not allowed" : "Přesunutí sdílení (%s) do sdílené složky není povoleno",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Přesunutí úložiště (%s) do sdílené složky není povoleno",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Přesunutí sdílení (%s) do jiného sdílení (%s) není povoleno",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Přesunutí sdílení (%s) do jiného úložiště (%s) není povoleno",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Přesunutí úložiště (%s) do sdílení (%s) není povoleno",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Přesunutí úložiště (%s) do jiného úložiště (%s) není povoleno",
     "Path contains invalid segments" : "Popis umístění obsahuje neplatné úseky",
     "Filename is a reserved word" : "Název souboru je rezervované slovo",
     "Filename contains at least one invalid character" : "Název souboru obsahuje přinejmenším jeden neplatný znak",
@@ -423,41 +441,19 @@
     "Summarizes text by reducing its length without losing key information." : "Vytvoří stručný souhrn textu tím, že zkrátí jeho délku aniž by byly ztraceny klíčové informace",
     "Extracts topics from a text and outputs them separated by commas." : "Vyzíská témata z textu a vypíše je oddělované čárkami.",
     "Education Edition" : "Vydání pro vzdělávací instituce",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Aby mohl přistupovat k tomuto nastavení je třeba, aby přihlášený uživatel byl správce, dílčí správce nebo obdržel speciální oprávnění",
-    "Logged in user must be an admin or sub admin" : "Je třeba, aby přihlášený uživatel byl správcem či správcem pro dílčí oblast",
-    "Logged in user must be an admin" : "Je třeba, aby přihlášený uživatel byl správce",
     "File name is a reserved word" : "Název souboru je rezervované slovo",
     "File name contains at least one invalid character" : "Název souboru obsahuje přinejmenším jeden neplatný znak",
     "File name is too long" : "Název souboru je příliš dlouhý",
-    "Help" : "Nápověda",
     "Users" : "Uživatelé",
-    "Unknown user" : "Neznámý uživatel",
-    "Enter the database username and name for %s" : "Zadejte uživatelské jméno v databázi a název pro %s",
-    "Enter the database username for %s" : "Zadejte uživatelské jméno v databázi pro %s",
-    "MySQL username and/or password not valid" : "Neplatné uživatelské jméno a/nebo heslo do MySQL",
-    "Oracle username and/or password not valid" : "Neplatné uživatelské jméno a/nebo heslo do Oracle",
-    "PostgreSQL username and/or password not valid" : "Neplatné uživatelské jméno a/nebo heslo do PostgreSQL",
-    "Set an admin username." : "Nastavte uživatelské jméno správce.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s sdílí „%2$s“ a dodává:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s sdílí „%2$s“ a dodává",
     "»%s« added a note to a file shared with you" : "„%s“ dodává poznámku k nasdílenému souboru ",
     "Open »%s«" : "Otevřít „%s“",
-    "Sharing %s failed, because this item is already shared with user %s" : "Sdílení %s se nezdařilo, protože tato položka už je sdílena s uživatelem %s",
     "%1$s shared »%2$s« with you" : "%1$s vám sdílí „%2$s“",
     "%1$s shared »%2$s« with you." : "%1$s vám nasdílel(a) „%2$s“.",
     "Click the button below to open it." : "Pro otevření klikněte na tlačítko níže.",
-    "The username is already being used" : "Uživatelské jméno už je využíváno",
-    "Could not create user" : "Nepodařilo se vytvořit uživatele",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Pouze následující znaky jsou povoleny pro uživatelské jméno: „a-z“, „A-Z“, „0-9“, mezery  a „_.@-'“",
-    "A valid username must be provided" : "Je třeba zadat platné uživatelské jméno",
-    "Username contains whitespace at the beginning or at the end" : "Uživatelské jméno je chybné – na jeho začátku či konci se nachází prázdný znak (mezera, tabulátor, atp.)",
-    "Username must not consist of dots only" : "Uživatelské jméno se nemůže skládat pouze ze samých teček",
-    "Username is invalid because files already exist for this user" : "Uživatelské jméno není platné, protože protože pro tohoto uživatele už existují soubory",
-    "User disabled" : "Uživatel zakázán",
     "File is currently busy, please try again later" : "Soubor je nyní používán, zkuste to později",
     "Cannot download file" : "Soubor se nedaří stáhnout",
-    "Your data directory is readable by other users." : "Váš adresář data je čitelný ostatním uživatelům.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Změňte práva na 0770, aby obsah adresáře nemohl být vypisován ostatními uživateli.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Ověřte, že v kořeni datového adresáře je soubor s názvem „.ocdata“."
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
 }
\ No newline at end of file
diff --git a/lib/l10n/cy_GB.js b/lib/l10n/cy_GB.js
index c1b99e3160a..78d7e3818ae 100644
--- a/lib/l10n/cy_GB.js
+++ b/lib/l10n/cy_GB.js
@@ -61,11 +61,7 @@ OC.L10N.register(
     "Token expired. Please reload page." : "Tocyn wedi dod i ben. Ail-lwythwch y dudalen.",
     "Summary" : "Crynodeb",
     "Translate" : "Cyfieithu",
-    "Help" : "Cymorth",
     "Users" : "Defnyddwyr",
-    "Oracle username and/or password not valid" : "Enw a/neu gyfrinair Oracle annilys",
-    "PostgreSQL username and/or password not valid" : "Enw a/neu gyfrinair PostgreSQL annilys",
-    "Set an admin username." : "Creu enw defnyddiwr i'r gweinyddwr.",
     "Open »%s«" : "Agor »%s«",
     "Click the button below to open it." : "Cliciwch ar y botwm isod i'w agor."
 },
diff --git a/lib/l10n/cy_GB.json b/lib/l10n/cy_GB.json
index 959f55c29fa..81fc666cfb6 100644
--- a/lib/l10n/cy_GB.json
+++ b/lib/l10n/cy_GB.json
@@ -59,11 +59,7 @@
     "Token expired. Please reload page." : "Tocyn wedi dod i ben. Ail-lwythwch y dudalen.",
     "Summary" : "Crynodeb",
     "Translate" : "Cyfieithu",
-    "Help" : "Cymorth",
     "Users" : "Defnyddwyr",
-    "Oracle username and/or password not valid" : "Enw a/neu gyfrinair Oracle annilys",
-    "PostgreSQL username and/or password not valid" : "Enw a/neu gyfrinair PostgreSQL annilys",
-    "Set an admin username." : "Creu enw defnyddiwr i'r gweinyddwr.",
     "Open »%s«" : "Agor »%s«",
     "Click the button below to open it." : "Cliciwch ar y botwm isod i'w agor."
 },"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"
diff --git a/lib/l10n/da.js b/lib/l10n/da.js
index a8b50889d8d..5dfc61acfca 100644
--- a/lib/l10n/da.js
+++ b/lib/l10n/da.js
@@ -246,41 +246,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Opsummerer tekst ved at reducere dens længde uden at miste nøgleinformation.",
     "Extracts topics from a text and outputs them separated by commas." : "Uddrager emner fra en tekst og skriver dem adskilt af kommaer.",
     "Education Edition" : "Uddanelses Version",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Bruger skal være administrator, underadministrator eller have tildelt specielle rettigheder for at have adgang til denne indstilling",
-    "Logged in user must be an admin or sub admin" : "Bruger skal være administrator eller underadministrator",
-    "Logged in user must be an admin" : "Brugeren skal være administrator",
     "File name is a reserved word" : "Filnavnet er et reserveret ord",
     "File name contains at least one invalid character" : "Filnavnet indeholder mindst ét ugyldigt tegn",
     "File name is too long" : "Filnavnet er for langt",
-    "Help" : "Hjælp",
     "Users" : "Brugere",
-    "Unknown user" : "Ukendt bruger",
-    "Enter the database username and name for %s" : "Indtast navn til databasen og brugernavn for %s",
-    "Enter the database username for %s" : "Indtast brugernavn til databasen for %s",
-    "MySQL username and/or password not valid" : "MySQL brugernavn og/eller kodeord er ikke gyldigt",
-    "Oracle username and/or password not valid" : "Oracle brugernavn og/eller kodeord er ikke gyldigt.",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL brugernavn og/eller kodeord er ikke gyldigt.",
-    "Set an admin username." : "Angiv et admin brugernavn.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s delte »%2$s« med dig og vil gerne tilføje:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s delte »%2$s« med dig og vil gerne tilføje",
     "»%s« added a note to a file shared with you" : "»%s« tilføjede en note til en fil delt med dig",
     "Open »%s«" : "Åbn »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Deling af %s mislykkedes, fordi dette element allerede er delt med brugeren %s",
     "%1$s shared »%2$s« with you" : "%1$s delte »%2$s« med dig",
     "%1$s shared »%2$s« with you." : "%1$s delte »%2$s« med dig",
     "Click the button below to open it." : "Klik på knappen nedenunder for at åbne.",
-    "The username is already being used" : "Brugernavnet er allerede i brug",
-    "Could not create user" : "Kunne ikke oprette bruger",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Kun følgende tegn kan indgå i et brugernavn: \"a-z\", \"A-Z\", \"0-9\", mellemrum and \"_.@-'\"",
-    "A valid username must be provided" : "Et gyldigt brugernavn skal angives",
-    "Username contains whitespace at the beginning or at the end" : "Brugernavnet har et mellemrum i starten eller slutningen",
-    "Username must not consist of dots only" : "Brugernavnet må ikke bestå af rene prikker/punktummer",
-    "Username is invalid because files already exist for this user" : "Brugernavnet er ugyldigt, da der allerede eksisterer filer for denne bruger",
-    "User disabled" : "Bruger deaktiveret",
     "File is currently busy, please try again later" : "Filen er i øjeblikket optaget - forsøg igen senere",
     "Cannot download file" : "Kan ikke downloade filen",
-    "Your data directory is readable by other users." : "Datamappen kan læses af andre brugere.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Tilpas venligst rettigheder til 0770, så mappen ikke fremvises for andre brugere.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Du bedes sikre at filen \".ocdata\" befinder sig i roden af din datamappe."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/da.json b/lib/l10n/da.json
index 60dc933b8f0..843da2af575 100644
--- a/lib/l10n/da.json
+++ b/lib/l10n/da.json
@@ -244,41 +244,19 @@
     "Summarizes text by reducing its length without losing key information." : "Opsummerer tekst ved at reducere dens længde uden at miste nøgleinformation.",
     "Extracts topics from a text and outputs them separated by commas." : "Uddrager emner fra en tekst og skriver dem adskilt af kommaer.",
     "Education Edition" : "Uddanelses Version",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Bruger skal være administrator, underadministrator eller have tildelt specielle rettigheder for at have adgang til denne indstilling",
-    "Logged in user must be an admin or sub admin" : "Bruger skal være administrator eller underadministrator",
-    "Logged in user must be an admin" : "Brugeren skal være administrator",
     "File name is a reserved word" : "Filnavnet er et reserveret ord",
     "File name contains at least one invalid character" : "Filnavnet indeholder mindst ét ugyldigt tegn",
     "File name is too long" : "Filnavnet er for langt",
-    "Help" : "Hjælp",
     "Users" : "Brugere",
-    "Unknown user" : "Ukendt bruger",
-    "Enter the database username and name for %s" : "Indtast navn til databasen og brugernavn for %s",
-    "Enter the database username for %s" : "Indtast brugernavn til databasen for %s",
-    "MySQL username and/or password not valid" : "MySQL brugernavn og/eller kodeord er ikke gyldigt",
-    "Oracle username and/or password not valid" : "Oracle brugernavn og/eller kodeord er ikke gyldigt.",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL brugernavn og/eller kodeord er ikke gyldigt.",
-    "Set an admin username." : "Angiv et admin brugernavn.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s delte »%2$s« med dig og vil gerne tilføje:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s delte »%2$s« med dig og vil gerne tilføje",
     "»%s« added a note to a file shared with you" : "»%s« tilføjede en note til en fil delt med dig",
     "Open »%s«" : "Åbn »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Deling af %s mislykkedes, fordi dette element allerede er delt med brugeren %s",
     "%1$s shared »%2$s« with you" : "%1$s delte »%2$s« med dig",
     "%1$s shared »%2$s« with you." : "%1$s delte »%2$s« med dig",
     "Click the button below to open it." : "Klik på knappen nedenunder for at åbne.",
-    "The username is already being used" : "Brugernavnet er allerede i brug",
-    "Could not create user" : "Kunne ikke oprette bruger",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Kun følgende tegn kan indgå i et brugernavn: \"a-z\", \"A-Z\", \"0-9\", mellemrum and \"_.@-'\"",
-    "A valid username must be provided" : "Et gyldigt brugernavn skal angives",
-    "Username contains whitespace at the beginning or at the end" : "Brugernavnet har et mellemrum i starten eller slutningen",
-    "Username must not consist of dots only" : "Brugernavnet må ikke bestå af rene prikker/punktummer",
-    "Username is invalid because files already exist for this user" : "Brugernavnet er ugyldigt, da der allerede eksisterer filer for denne bruger",
-    "User disabled" : "Bruger deaktiveret",
     "File is currently busy, please try again later" : "Filen er i øjeblikket optaget - forsøg igen senere",
     "Cannot download file" : "Kan ikke downloade filen",
-    "Your data directory is readable by other users." : "Datamappen kan læses af andre brugere.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Tilpas venligst rettigheder til 0770, så mappen ikke fremvises for andre brugere.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Du bedes sikre at filen \".ocdata\" befinder sig i roden af din datamappe."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/de.js b/lib/l10n/de.js
index bff017f8b91..6a89d61bd71 100644
--- a/lib/l10n/de.js
+++ b/lib/l10n/de.js
@@ -59,6 +59,11 @@ OC.L10N.register(
     "Avatar image is not square" : "Benutzerbild ist nicht quadratisch",
     "Files" : "Dateien",
     "View profile" : "Profil ansehen",
+    "same time" : "Benötigt keine Übersetzung. Hier wird nur die formelle Übersetzung verwendet (de_DE).",
+    "_%nh_::_%nh_" : ["%nStunde","%nStunden"],
+    "_%nm_::_%nm_" : ["%nm","%nm"],
+    "%s ahead" : "%s voraus",
+    "%s behind" : "%s zurück",
     "Local time: %s" : "Ortszeit: %s",
     "today" : "Heute",
     "tomorrow" : "Morgen",
@@ -81,6 +86,12 @@ OC.L10N.register(
     "seconds ago" : "Gerade eben",
     "Empty file" : "Leere Datei",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Das Modul mit der ID: %s existiert nicht. Bitte die App in den App-Einstellungen aktivieren oder den Administrator kontaktieren.",
+    "No file conversion providers available" : "Benötigt keine Übersetzung. Hier wird nur die formelle Übersetzung verwendet (de_DE).",
+    "File is too large to convert" : "Benötigt keine Übersetzung. Hier wird nur die formelle Übersetzung verwendet (de_DE).",
+    "Destination does not match conversion extension" : "Benötigt keine Übersetzung. Hier wird nur die formelle Übersetzung verwendet (de_DE).",
+    "Could not convert file" : "Benötigt keine Übersetzung. Hier wird nur die formelle Übersetzung verwendet (de_DE).",
+    "Destination does not exist" : "Benötigt keine Übersetzung. Hier wird nur die formelle Übersetzung verwendet (de_DE).",
+    "Destination is not creatable" : "Benötigt keine Übersetzung. Hier wird nur die formelle Übersetzung verwendet (de_DE).",
     "Dot files are not allowed" : "Dateinamen mit einem Punkt am Anfang sind nicht erlaubt",
     "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" ist ein verbotener Datei- oder Ordnername.",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" ist ein verbotenes Präfix für Datei- oder Ordnernamen.",
@@ -92,6 +103,13 @@ OC.L10N.register(
     "Invalid path" : "Ungültiger Pfad",
     "Failed to create file from template" : "Fehler beim Erstellen der Datei aus Vorlage",
     "Templates" : "Vorlagen",
+    "Storage %s cannot be moved" : "Speicherplatz %s kann nicht verschoben werden",
+    "Moving a share (%s) into a shared folder is not allowed" : "Verschieben einer Freigabe (%s) in einen freigegebenen Ordner ist unzulässig",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Verschieben eines Speicherplatzes (%s) in einen freigegebenen Ordner ist unzulässig",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Verschieben einer Freigabe (%s) in eine andere Freigabe (%s) ist unzulässig.",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Verschieben einer Freigabe (%s) in einen anderen Speicherplatz (%s) ist nicht erlaubt",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Verschieben eines Speicherplatzes (%s) in eine Freigabe (%s) ist nicht erlaubt",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Verschieben eines Speicherplatzes (%s) in einen anderen Speicherplatz (%s) ist nicht erlaubt",
     "Path contains invalid segments" : "Pfad enthält ungültige Segmente",
     "Filename is a reserved word" : "Der Dateiname ist ein reserviertes Wort",
     "Filename contains at least one invalid character" : "Der Dateiname enthält mindestens ein unzulässiges Zeichen.",
@@ -383,7 +401,12 @@ OC.L10N.register(
     "Original text" : "Originaltext",
     "The original text to generate a headline for" : "Der Originaltext, für den eine Überschrift erstellt werden soll",
     "The generated headline" : "Die erstellte Überschrift",
+    "Proofread" : "Korrekturlesen",
+    "Proofreads a text and lists corrections" : "Liest einen Text Korrektur und listet Korrekturen auf",
     "Text" : "Text",
+    "The text to proofread" : "Der zu korrigierende Text",
+    "Corrections" : "Korrekturen",
+    "The corrections that should be made in your text" : "Die Korrekturen, die in deinem Text vorgenommen werden sollten",
     "Reformulate text" : "Text umformulieren",
     "Takes a text and reformulates it" : "Formuliert einen Text um",
     "Write a text that you want the assistant to reformulate" : "Text schreiben, den der Assistent umformulieren soll",
@@ -420,41 +443,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Fasst Text zusammen, indem die Länge reduziert wird, ohne dass wichtige Informationen verloren gehen.",
     "Extracts topics from a text and outputs them separated by commas." : "Extrahiert Themen aus einem Text und gibt sie durch Kommas getrennt aus.",
     "Education Edition" : "Bildungsausgabe",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Der angemeldete Benutzer muss ein Administrator, ein Teil-Administrator sein oder ein Sonderrecht haben, um auf diese Einstellung zuzugreifen. ",
-    "Logged in user must be an admin or sub admin" : "Der angemeldete Benutzer muss ein (Sub-)Administrator sein",
-    "Logged in user must be an admin" : "Der angemeldete Benutzer muss ein Administrator sein",
     "File name is a reserved word" : "Der Dateiname ist ein reserviertes Wort",
     "File name contains at least one invalid character" : "Der Dateiname enthält mindestens ein ungültiges Zeichen",
     "File name is too long" : "Dateiname ist zu lang",
-    "Help" : "Hilfe",
     "Users" : "Benutzer",
-    "Unknown user" : "Unbekannter Benutzer",
-    "Enter the database username and name for %s" : "Den Datenbankbenutzernamen und den Namen eingeben für %s",
-    "Enter the database username for %s" : "Den Datenbankbenutzernamen eingeben für %s",
-    "MySQL username and/or password not valid" : "MySQL-Benutzername und/oder Passwort ungültig",
-    "Oracle username and/or password not valid" : "Oracle-Benutzername und/oder -Passwort ungültig",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL-Benutzername und/oder -Passwort ungültig",
-    "Set an admin username." : "Einen Administrator-Benutzernamen setzen.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s hat »%2$s« mit dir geteilt und möchte folgendes hinzufügen:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$shat »%2$s« mit dir geteilt und möchte folgendes hinzufügen",
     "»%s« added a note to a file shared with you" : "»%s« hat eine Bemerkung zu einer mit dir geteilten Datei hinzugefügt",
     "Open »%s«" : "»%s« öffnen",
-    "Sharing %s failed, because this item is already shared with user %s" : "Freigabe von %s fehlgeschlagen, da dieses Element schon mit dem Benutzer %s geteilt wird",
     "%1$s shared »%2$s« with you" : "%1$s hat »%2$s« mit dir geteilt",
     "%1$s shared »%2$s« with you." : "%1$s hat »%2$s« mit dir geteilt.",
     "Click the button below to open it." : "Klicke zum Öffnen auf die untere Schaltfläche.",
-    "The username is already being used" : "Dieser Benutzername existiert bereits",
-    "Could not create user" : "Benutzer konnte nicht erstellt werden",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Folgende Zeichen sind im Benutzernamen erlaubt: „a-z“, „A-Z“, „0-9“, Leerzeichen und „_.@-'“",
-    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
-    "Username contains whitespace at the beginning or at the end" : "Der Benutzername enthält Leerzeichen am Anfang oder am Ende",
-    "Username must not consist of dots only" : "Der Benutzername darf nicht nur aus Punkten bestehen",
-    "Username is invalid because files already exist for this user" : "Der Benutzer ist ungültig, da bereits Dateien von diesem Benutzer existieren",
-    "User disabled" : "Benutzer deaktiviert",
     "File is currently busy, please try again later" : "Die Datei ist in Benutzung, bitte versuche es später noch einmal",
     "Cannot download file" : "Datei kann nicht heruntergeladen werden.",
-    "Your data directory is readable by other users." : "Dein Datenverzeichnis kann von anderen Benutzern gelesen werden",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Bitte ändere die Berechtigungen auf 0770, sodass das Verzeichnis nicht von anderen Benutzern angezeigt werden kann.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Stelle sicher, dass eine Datei \".ocdata\" im Wurzelverzeichnis des data-Verzeichnisses existiert."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/de.json b/lib/l10n/de.json
index 5944a13c83d..ed4d023029e 100644
--- a/lib/l10n/de.json
+++ b/lib/l10n/de.json
@@ -57,6 +57,11 @@
     "Avatar image is not square" : "Benutzerbild ist nicht quadratisch",
     "Files" : "Dateien",
     "View profile" : "Profil ansehen",
+    "same time" : "Benötigt keine Übersetzung. Hier wird nur die formelle Übersetzung verwendet (de_DE).",
+    "_%nh_::_%nh_" : ["%nStunde","%nStunden"],
+    "_%nm_::_%nm_" : ["%nm","%nm"],
+    "%s ahead" : "%s voraus",
+    "%s behind" : "%s zurück",
     "Local time: %s" : "Ortszeit: %s",
     "today" : "Heute",
     "tomorrow" : "Morgen",
@@ -79,6 +84,12 @@
     "seconds ago" : "Gerade eben",
     "Empty file" : "Leere Datei",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Das Modul mit der ID: %s existiert nicht. Bitte die App in den App-Einstellungen aktivieren oder den Administrator kontaktieren.",
+    "No file conversion providers available" : "Benötigt keine Übersetzung. Hier wird nur die formelle Übersetzung verwendet (de_DE).",
+    "File is too large to convert" : "Benötigt keine Übersetzung. Hier wird nur die formelle Übersetzung verwendet (de_DE).",
+    "Destination does not match conversion extension" : "Benötigt keine Übersetzung. Hier wird nur die formelle Übersetzung verwendet (de_DE).",
+    "Could not convert file" : "Benötigt keine Übersetzung. Hier wird nur die formelle Übersetzung verwendet (de_DE).",
+    "Destination does not exist" : "Benötigt keine Übersetzung. Hier wird nur die formelle Übersetzung verwendet (de_DE).",
+    "Destination is not creatable" : "Benötigt keine Übersetzung. Hier wird nur die formelle Übersetzung verwendet (de_DE).",
     "Dot files are not allowed" : "Dateinamen mit einem Punkt am Anfang sind nicht erlaubt",
     "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" ist ein verbotener Datei- oder Ordnername.",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" ist ein verbotenes Präfix für Datei- oder Ordnernamen.",
@@ -90,6 +101,13 @@
     "Invalid path" : "Ungültiger Pfad",
     "Failed to create file from template" : "Fehler beim Erstellen der Datei aus Vorlage",
     "Templates" : "Vorlagen",
+    "Storage %s cannot be moved" : "Speicherplatz %s kann nicht verschoben werden",
+    "Moving a share (%s) into a shared folder is not allowed" : "Verschieben einer Freigabe (%s) in einen freigegebenen Ordner ist unzulässig",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Verschieben eines Speicherplatzes (%s) in einen freigegebenen Ordner ist unzulässig",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Verschieben einer Freigabe (%s) in eine andere Freigabe (%s) ist unzulässig.",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Verschieben einer Freigabe (%s) in einen anderen Speicherplatz (%s) ist nicht erlaubt",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Verschieben eines Speicherplatzes (%s) in eine Freigabe (%s) ist nicht erlaubt",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Verschieben eines Speicherplatzes (%s) in einen anderen Speicherplatz (%s) ist nicht erlaubt",
     "Path contains invalid segments" : "Pfad enthält ungültige Segmente",
     "Filename is a reserved word" : "Der Dateiname ist ein reserviertes Wort",
     "Filename contains at least one invalid character" : "Der Dateiname enthält mindestens ein unzulässiges Zeichen.",
@@ -381,7 +399,12 @@
     "Original text" : "Originaltext",
     "The original text to generate a headline for" : "Der Originaltext, für den eine Überschrift erstellt werden soll",
     "The generated headline" : "Die erstellte Überschrift",
+    "Proofread" : "Korrekturlesen",
+    "Proofreads a text and lists corrections" : "Liest einen Text Korrektur und listet Korrekturen auf",
     "Text" : "Text",
+    "The text to proofread" : "Der zu korrigierende Text",
+    "Corrections" : "Korrekturen",
+    "The corrections that should be made in your text" : "Die Korrekturen, die in deinem Text vorgenommen werden sollten",
     "Reformulate text" : "Text umformulieren",
     "Takes a text and reformulates it" : "Formuliert einen Text um",
     "Write a text that you want the assistant to reformulate" : "Text schreiben, den der Assistent umformulieren soll",
@@ -418,41 +441,19 @@
     "Summarizes text by reducing its length without losing key information." : "Fasst Text zusammen, indem die Länge reduziert wird, ohne dass wichtige Informationen verloren gehen.",
     "Extracts topics from a text and outputs them separated by commas." : "Extrahiert Themen aus einem Text und gibt sie durch Kommas getrennt aus.",
     "Education Edition" : "Bildungsausgabe",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Der angemeldete Benutzer muss ein Administrator, ein Teil-Administrator sein oder ein Sonderrecht haben, um auf diese Einstellung zuzugreifen. ",
-    "Logged in user must be an admin or sub admin" : "Der angemeldete Benutzer muss ein (Sub-)Administrator sein",
-    "Logged in user must be an admin" : "Der angemeldete Benutzer muss ein Administrator sein",
     "File name is a reserved word" : "Der Dateiname ist ein reserviertes Wort",
     "File name contains at least one invalid character" : "Der Dateiname enthält mindestens ein ungültiges Zeichen",
     "File name is too long" : "Dateiname ist zu lang",
-    "Help" : "Hilfe",
     "Users" : "Benutzer",
-    "Unknown user" : "Unbekannter Benutzer",
-    "Enter the database username and name for %s" : "Den Datenbankbenutzernamen und den Namen eingeben für %s",
-    "Enter the database username for %s" : "Den Datenbankbenutzernamen eingeben für %s",
-    "MySQL username and/or password not valid" : "MySQL-Benutzername und/oder Passwort ungültig",
-    "Oracle username and/or password not valid" : "Oracle-Benutzername und/oder -Passwort ungültig",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL-Benutzername und/oder -Passwort ungültig",
-    "Set an admin username." : "Einen Administrator-Benutzernamen setzen.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s hat »%2$s« mit dir geteilt und möchte folgendes hinzufügen:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$shat »%2$s« mit dir geteilt und möchte folgendes hinzufügen",
     "»%s« added a note to a file shared with you" : "»%s« hat eine Bemerkung zu einer mit dir geteilten Datei hinzugefügt",
     "Open »%s«" : "»%s« öffnen",
-    "Sharing %s failed, because this item is already shared with user %s" : "Freigabe von %s fehlgeschlagen, da dieses Element schon mit dem Benutzer %s geteilt wird",
     "%1$s shared »%2$s« with you" : "%1$s hat »%2$s« mit dir geteilt",
     "%1$s shared »%2$s« with you." : "%1$s hat »%2$s« mit dir geteilt.",
     "Click the button below to open it." : "Klicke zum Öffnen auf die untere Schaltfläche.",
-    "The username is already being used" : "Dieser Benutzername existiert bereits",
-    "Could not create user" : "Benutzer konnte nicht erstellt werden",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Folgende Zeichen sind im Benutzernamen erlaubt: „a-z“, „A-Z“, „0-9“, Leerzeichen und „_.@-'“",
-    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
-    "Username contains whitespace at the beginning or at the end" : "Der Benutzername enthält Leerzeichen am Anfang oder am Ende",
-    "Username must not consist of dots only" : "Der Benutzername darf nicht nur aus Punkten bestehen",
-    "Username is invalid because files already exist for this user" : "Der Benutzer ist ungültig, da bereits Dateien von diesem Benutzer existieren",
-    "User disabled" : "Benutzer deaktiviert",
     "File is currently busy, please try again later" : "Die Datei ist in Benutzung, bitte versuche es später noch einmal",
     "Cannot download file" : "Datei kann nicht heruntergeladen werden.",
-    "Your data directory is readable by other users." : "Dein Datenverzeichnis kann von anderen Benutzern gelesen werden",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Bitte ändere die Berechtigungen auf 0770, sodass das Verzeichnis nicht von anderen Benutzern angezeigt werden kann.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Stelle sicher, dass eine Datei \".ocdata\" im Wurzelverzeichnis des data-Verzeichnisses existiert."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js
index 8601ed52713..fdc437adf68 100644
--- a/lib/l10n/de_DE.js
+++ b/lib/l10n/de_DE.js
@@ -59,6 +59,11 @@ OC.L10N.register(
     "Avatar image is not square" : "Avatar-Bild ist nicht quadratisch",
     "Files" : "Dateien",
     "View profile" : "Profil ansehen",
+    "same time" : "gleiche Zeit",
+    "_%nh_::_%nh_" : ["%n Stunde","%n Std"],
+    "_%nm_::_%nm_" : ["%nm","%nm"],
+    "%s ahead" : "%s voraus",
+    "%s behind" : "%s zurück",
     "Local time: %s" : "Ortszeit: %s",
     "today" : "Heute",
     "tomorrow" : "Morgen",
@@ -81,6 +86,12 @@ OC.L10N.register(
     "seconds ago" : "Gerade eben",
     "Empty file" : "Leere Datei",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Das Modul mit der ID:  %s existiert nicht. Bitte aktivieren Sie es in Ihren Einstellungen oder kontaktieren Sie Ihren Administrator.",
+    "No file conversion providers available" : "Keine Dateikonvertierungsanbieter verfügbar",
+    "File is too large to convert" : "Die Datei ist zu groß zum Konvertieren",
+    "Destination does not match conversion extension" : "Das Ziel stimmt nicht mit der Konvertierungs-Erweiterung überein",
+    "Could not convert file" : "Datei konnte nicht konvertiert werden",
+    "Destination does not exist" : "Ziel existiert nicht",
+    "Destination is not creatable" : "Ziel kann nicht erstellt werden",
     "Dot files are not allowed" : "Dateinamen mit einem Punkt am Anfang sind nicht erlaubt",
     "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" ist ein verbotener Datei- oder Ordnername.",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" ist ein verbotenes Präfix für Datei- oder Ordnernamen.",
@@ -92,6 +103,13 @@ OC.L10N.register(
     "Invalid path" : "Ungültiger Pfad",
     "Failed to create file from template" : "Fehler beim Erstellen der Datei aus Vorlage",
     "Templates" : "Vorlagen",
+    "Storage %s cannot be moved" : "Speicherplatz %s kann nicht verschoben werden",
+    "Moving a share (%s) into a shared folder is not allowed" : "Verschieben einer Freigabe (%s) in einen freigegebenen Ordner ist unzulässig",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Verschieben eines Speicherplatzes (%s) in einen freigegebenen Ordner ist unzulässig",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Verschieben einer Freigabe (%s) in eine andere Freigabe (%s) ist unzulässig.",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Verschieben einer Freigabe (%s) in einen anderen Speicherplatz (%s) ist nicht erlaubt",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Verschieben eines Speicherplatzes (%s) in eine Freigabe (%s) ist nicht erlaubt",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Verschieben eines Speicherplatzes (%s) in einen anderen Speicherplatz (%s) ist nicht erlaubt",
     "Path contains invalid segments" : "Pfad enthält ungültige Segmente",
     "Filename is a reserved word" : "Der Dateiname ist ein reserviertes Wort",
     "Filename contains at least one invalid character" : "Der Dateiname enthält mindestens ein unzulässiges Zeichen",
@@ -425,41 +443,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Fasst Text zusammen, indem die Länge reduziert wird, ohne dass wichtige Informationen verloren gehen.",
     "Extracts topics from a text and outputs them separated by commas." : "Extrahiert Themen aus einem Text und gibt sie durch Kommas getrennt aus.",
     "Education Edition" : "Bildungsausgabe",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Der angemeldete Benutzer muss ein Administrator, ein Teil-Administrator sein oder ein Sonderrecht haben, um auf diese Einstellung zuzugreifen. ",
-    "Logged in user must be an admin or sub admin" : "Der angemeldete Benutzer muss ein (Sub-)Administrator sein",
-    "Logged in user must be an admin" : "Der angemeldete Benutzer muss ein Administrator sein",
     "File name is a reserved word" : "Der Dateiname ist ein reserviertes Wort",
     "File name contains at least one invalid character" : "Der Dateiname enthält mindestens ein ungültiges Zeichen",
     "File name is too long" : "Dateiname ist zu lang",
-    "Help" : "Hilfe",
     "Users" : "Benutzer",
-    "Unknown user" : "Unbekannter Benutzer",
-    "Enter the database username and name for %s" : "Den Datenbankbenutzernamen und den Namen eingeben für %s",
-    "Enter the database username for %s" : "Den Datenbankbenutzernamen eingeben für %s",
-    "MySQL username and/or password not valid" : "MySQL-Benutzername und/oder Passwort ungültig",
-    "Oracle username and/or password not valid" : "Oracle-Benutzername und/oder -Passwort ungültig",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL-Benutzername und/oder -Passwort ungültig",
-    "Set an admin username." : "Einen Administrations-Benutzernamen setzen.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s hat »%2$s« mit Ihnen geteilt und möchte folgendes hinzufügen:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s hat »%2$s« mit Ihnen geteilt und möchte folgendes hinzufügen",
     "»%s« added a note to a file shared with you" : "»%s« hat eine Bemerkung zu einer mit Ihnen geteilten Datei hinzugefügt",
     "Open »%s«" : "»%s« öffnen",
-    "Sharing %s failed, because this item is already shared with user %s" : "Freigabe von %s fehlgeschlagen, da dieses Element schon mit dem Benutzer %s geteilt wird",
     "%1$s shared »%2$s« with you" : "%1$s hat »%2$s« mit Ihnen geteilt",
     "%1$s shared »%2$s« with you." : "%1$s hat »%2$s« mit Ihnen geteilt.",
     "Click the button below to open it." : "Klicken Sie zum Öffnen auf die untere Schaltfläche.",
-    "The username is already being used" : "Dieser Benutzername existiert bereits",
-    "Could not create user" : "Benutzer konnte nicht erstellt werden",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Folgende Zeichen sind im Benutzernamen erlaubt: „a-z“, „A-Z“, „0-9“, Leerzeichen und „_.@-'“",
-    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
-    "Username contains whitespace at the beginning or at the end" : "Der Benutzername enthält Leerzeichen am Anfang oder am Ende",
-    "Username must not consist of dots only" : "Der Benutzername darf nicht nur aus Punkten bestehen",
-    "Username is invalid because files already exist for this user" : "Der Benutzer ist ungültig, da bereits Dateien von diesem Benutzer existieren",
-    "User disabled" : "Benutzer deaktiviert",
     "File is currently busy, please try again later" : "Die Datei ist in Benutzung, bitte später erneut versuchen.",
     "Cannot download file" : "Datei kann nicht heruntergeladen werden",
-    "Your data directory is readable by other users." : "Ihr Datenverzeichnis kann von anderen Benutzern gelesen werden.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Bitte ändern Sie die Berechtigungen auf 0770, so dass das Verzeichnis nicht von anderen Benutzern angezeigt werden kann.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Stellen Sie sicher, dass eine Datei \".ocdata\" im Wurzelverzeichnis des Datenverzeichnisses existiert."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json
index eefe1f0c398..53dbf1abc88 100644
--- a/lib/l10n/de_DE.json
+++ b/lib/l10n/de_DE.json
@@ -57,6 +57,11 @@
     "Avatar image is not square" : "Avatar-Bild ist nicht quadratisch",
     "Files" : "Dateien",
     "View profile" : "Profil ansehen",
+    "same time" : "gleiche Zeit",
+    "_%nh_::_%nh_" : ["%n Stunde","%n Std"],
+    "_%nm_::_%nm_" : ["%nm","%nm"],
+    "%s ahead" : "%s voraus",
+    "%s behind" : "%s zurück",
     "Local time: %s" : "Ortszeit: %s",
     "today" : "Heute",
     "tomorrow" : "Morgen",
@@ -79,6 +84,12 @@
     "seconds ago" : "Gerade eben",
     "Empty file" : "Leere Datei",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Das Modul mit der ID:  %s existiert nicht. Bitte aktivieren Sie es in Ihren Einstellungen oder kontaktieren Sie Ihren Administrator.",
+    "No file conversion providers available" : "Keine Dateikonvertierungsanbieter verfügbar",
+    "File is too large to convert" : "Die Datei ist zu groß zum Konvertieren",
+    "Destination does not match conversion extension" : "Das Ziel stimmt nicht mit der Konvertierungs-Erweiterung überein",
+    "Could not convert file" : "Datei konnte nicht konvertiert werden",
+    "Destination does not exist" : "Ziel existiert nicht",
+    "Destination is not creatable" : "Ziel kann nicht erstellt werden",
     "Dot files are not allowed" : "Dateinamen mit einem Punkt am Anfang sind nicht erlaubt",
     "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" ist ein verbotener Datei- oder Ordnername.",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" ist ein verbotenes Präfix für Datei- oder Ordnernamen.",
@@ -90,6 +101,13 @@
     "Invalid path" : "Ungültiger Pfad",
     "Failed to create file from template" : "Fehler beim Erstellen der Datei aus Vorlage",
     "Templates" : "Vorlagen",
+    "Storage %s cannot be moved" : "Speicherplatz %s kann nicht verschoben werden",
+    "Moving a share (%s) into a shared folder is not allowed" : "Verschieben einer Freigabe (%s) in einen freigegebenen Ordner ist unzulässig",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Verschieben eines Speicherplatzes (%s) in einen freigegebenen Ordner ist unzulässig",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Verschieben einer Freigabe (%s) in eine andere Freigabe (%s) ist unzulässig.",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Verschieben einer Freigabe (%s) in einen anderen Speicherplatz (%s) ist nicht erlaubt",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Verschieben eines Speicherplatzes (%s) in eine Freigabe (%s) ist nicht erlaubt",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Verschieben eines Speicherplatzes (%s) in einen anderen Speicherplatz (%s) ist nicht erlaubt",
     "Path contains invalid segments" : "Pfad enthält ungültige Segmente",
     "Filename is a reserved word" : "Der Dateiname ist ein reserviertes Wort",
     "Filename contains at least one invalid character" : "Der Dateiname enthält mindestens ein unzulässiges Zeichen",
@@ -423,41 +441,19 @@
     "Summarizes text by reducing its length without losing key information." : "Fasst Text zusammen, indem die Länge reduziert wird, ohne dass wichtige Informationen verloren gehen.",
     "Extracts topics from a text and outputs them separated by commas." : "Extrahiert Themen aus einem Text und gibt sie durch Kommas getrennt aus.",
     "Education Edition" : "Bildungsausgabe",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Der angemeldete Benutzer muss ein Administrator, ein Teil-Administrator sein oder ein Sonderrecht haben, um auf diese Einstellung zuzugreifen. ",
-    "Logged in user must be an admin or sub admin" : "Der angemeldete Benutzer muss ein (Sub-)Administrator sein",
-    "Logged in user must be an admin" : "Der angemeldete Benutzer muss ein Administrator sein",
     "File name is a reserved word" : "Der Dateiname ist ein reserviertes Wort",
     "File name contains at least one invalid character" : "Der Dateiname enthält mindestens ein ungültiges Zeichen",
     "File name is too long" : "Dateiname ist zu lang",
-    "Help" : "Hilfe",
     "Users" : "Benutzer",
-    "Unknown user" : "Unbekannter Benutzer",
-    "Enter the database username and name for %s" : "Den Datenbankbenutzernamen und den Namen eingeben für %s",
-    "Enter the database username for %s" : "Den Datenbankbenutzernamen eingeben für %s",
-    "MySQL username and/or password not valid" : "MySQL-Benutzername und/oder Passwort ungültig",
-    "Oracle username and/or password not valid" : "Oracle-Benutzername und/oder -Passwort ungültig",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL-Benutzername und/oder -Passwort ungültig",
-    "Set an admin username." : "Einen Administrations-Benutzernamen setzen.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s hat »%2$s« mit Ihnen geteilt und möchte folgendes hinzufügen:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s hat »%2$s« mit Ihnen geteilt und möchte folgendes hinzufügen",
     "»%s« added a note to a file shared with you" : "»%s« hat eine Bemerkung zu einer mit Ihnen geteilten Datei hinzugefügt",
     "Open »%s«" : "»%s« öffnen",
-    "Sharing %s failed, because this item is already shared with user %s" : "Freigabe von %s fehlgeschlagen, da dieses Element schon mit dem Benutzer %s geteilt wird",
     "%1$s shared »%2$s« with you" : "%1$s hat »%2$s« mit Ihnen geteilt",
     "%1$s shared »%2$s« with you." : "%1$s hat »%2$s« mit Ihnen geteilt.",
     "Click the button below to open it." : "Klicken Sie zum Öffnen auf die untere Schaltfläche.",
-    "The username is already being used" : "Dieser Benutzername existiert bereits",
-    "Could not create user" : "Benutzer konnte nicht erstellt werden",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Folgende Zeichen sind im Benutzernamen erlaubt: „a-z“, „A-Z“, „0-9“, Leerzeichen und „_.@-'“",
-    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
-    "Username contains whitespace at the beginning or at the end" : "Der Benutzername enthält Leerzeichen am Anfang oder am Ende",
-    "Username must not consist of dots only" : "Der Benutzername darf nicht nur aus Punkten bestehen",
-    "Username is invalid because files already exist for this user" : "Der Benutzer ist ungültig, da bereits Dateien von diesem Benutzer existieren",
-    "User disabled" : "Benutzer deaktiviert",
     "File is currently busy, please try again later" : "Die Datei ist in Benutzung, bitte später erneut versuchen.",
     "Cannot download file" : "Datei kann nicht heruntergeladen werden",
-    "Your data directory is readable by other users." : "Ihr Datenverzeichnis kann von anderen Benutzern gelesen werden.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Bitte ändern Sie die Berechtigungen auf 0770, so dass das Verzeichnis nicht von anderen Benutzern angezeigt werden kann.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Stellen Sie sicher, dass eine Datei \".ocdata\" im Wurzelverzeichnis des Datenverzeichnisses existiert."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/el.js b/lib/l10n/el.js
index 789ba48a2e3..384624b9654 100644
--- a/lib/l10n/el.js
+++ b/lib/l10n/el.js
@@ -52,6 +52,7 @@ OC.L10N.register(
     "Avatar image is not square" : "Η εικόνα του άβαταρ δεν είναι τετράγωνη",
     "Files" : "Αρχεία",
     "View profile" : "Προβολή προφίλ",
+    "_%nh_::_%nh_" : ["%nω","%nω"],
     "Local time: %s" : "Τοπική ώρα: %s",
     "today" : "σήμερα",
     "tomorrow" : "αύριο",
@@ -224,38 +225,19 @@ OC.L10N.register(
     "Translate" : "Μετάφραση",
     "Result" : "Αποτέλεσμα",
     "Education Edition" : "Εκπαιδευτική Έκδοση",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Ο συνδεδεμένος χρήστης πρέπει να είναι διαχειριστής, υποδιαχειριστής ή να έχει ειδικό δικαίωμα πρόσβασης σε αυτήν τη ρύθμιση",
-    "Logged in user must be an admin or sub admin" : "Ο συνδεδεμένος χρήστης πρέπει να είναι admin ή subadmin",
-    "Logged in user must be an admin" : "Ο συνδεδεμένος χρήστης πρέπει να είναι διαχειριστής",
     "File name is a reserved word" : "Το όνομα αρχείου είναι λέξη που έχει δεσμευτεί",
     "File name contains at least one invalid character" : "Το όνομα αρχείου περιέχει έναν τουλάχιστον μη έγκυρο χαρακτήρα",
     "File name is too long" : "Το όνομα αρχείου είναι πολύ μεγάλο",
-    "Help" : "Βοήθεια",
     "Users" : "Χρήστες",
-    "Unknown user" : "Άγνωστος χρήστης",
-    "MySQL username and/or password not valid" : "Το όνομα χρήστη και/'η ο κωδικός πρόσβασης MySQL δεν είναι σωστά",
-    "Oracle username and/or password not valid" : "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle",
-    "PostgreSQL username and/or password not valid" : "Μη έγκυρος χρήστης και/ή συνθηματικό της PostgreSQL",
-    "Set an admin username." : "Εισάγετε όνομα χρήστη διαχειριστή.",
     "%1$s shared »%2$s« with you and wants to add:" : "Ο %1$s διαμοιράστηκε το »%2$s« με εσάς και θέλει να προσθέσει:",
     "%1$s shared »%2$s« with you and wants to add" : "Ο %1$s διαμοιράστηκε το »%2$s« με εσάς και θέλει να προσθέσει",
     "»%s« added a note to a file shared with you" : "Ο »%s« πρόσθεσε μια σημείωση στο κοινόχρηστο αρχείο",
     "Open »%s«" : "Άνοιγμα »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Η κοινή χρήση του %s απέτυχε, επειδή αυτό το στοιχείο είναι ήδη κοινόχρηστο με τον χρήστη %s",
     "%1$s shared »%2$s« with you" : "Ο/η %1$s διαμοιράστηκε το »%2$s« με εσάς.",
     "%1$s shared »%2$s« with you." : "Ο/η %1$s διαμοιράστηκε »%2$s« με εσάς.",
     "Click the button below to open it." : "Κάντε κλικ στο παρακάτω κουμπί για να το ανοίξετε.",
-    "The username is already being used" : "Το όνομα χρήστη είναι κατειλημμένο",
-    "Could not create user" : "Αδυναμία δημιουργίας χρήστη",
-    "A valid username must be provided" : "Πρέπει να δοθεί έγκυρο όνομα χρήστη",
-    "Username contains whitespace at the beginning or at the end" : "Το όνομα χρήστη περιέχει κενό διάστημα στην αρχή ή στο τέλος",
-    "Username must not consist of dots only" : "Το όνομα χρήστη δεν πρέπει να περιέχει μόνο τελείες",
-    "Username is invalid because files already exist for this user" : "Το όνομα χρήστη δεν είναι έγκυρο, επειδή υπάρχουν ήδη αρχεία για αυτόν τον χρήστη",
-    "User disabled" : "Ο χρήστης απενεργοποιήθηκε",
     "File is currently busy, please try again later" : "Το αρχείο χρησιμοποιείται αυτή τη στιγμή, παρακαλούμε προσπαθήστε αργότερα",
     "Cannot download file" : "Δεν είναι δυνατή η λήψη του αρχείου",
-    "Your data directory is readable by other users." : "Ο κατάλογος δεδομένων σας είναι αναγνώσιμος από άλλους χρήστες.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Παρακαλούμε αλλάξτε τις ρυθμίσεις σε 0770 έτσι ώστε ο κατάλογος να μην μπορεί να προβάλλεται από άλλους χρήστες.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Εξασφαλίστε ότι υπάρχει ένα αρχείο με όνομα \".ocdata\" στον βασικό κατάλογο του καταλόγου δεδομένων."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/el.json b/lib/l10n/el.json
index ac0de9d98ab..58d19faea21 100644
--- a/lib/l10n/el.json
+++ b/lib/l10n/el.json
@@ -50,6 +50,7 @@
     "Avatar image is not square" : "Η εικόνα του άβαταρ δεν είναι τετράγωνη",
     "Files" : "Αρχεία",
     "View profile" : "Προβολή προφίλ",
+    "_%nh_::_%nh_" : ["%nω","%nω"],
     "Local time: %s" : "Τοπική ώρα: %s",
     "today" : "σήμερα",
     "tomorrow" : "αύριο",
@@ -222,38 +223,19 @@
     "Translate" : "Μετάφραση",
     "Result" : "Αποτέλεσμα",
     "Education Edition" : "Εκπαιδευτική Έκδοση",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Ο συνδεδεμένος χρήστης πρέπει να είναι διαχειριστής, υποδιαχειριστής ή να έχει ειδικό δικαίωμα πρόσβασης σε αυτήν τη ρύθμιση",
-    "Logged in user must be an admin or sub admin" : "Ο συνδεδεμένος χρήστης πρέπει να είναι admin ή subadmin",
-    "Logged in user must be an admin" : "Ο συνδεδεμένος χρήστης πρέπει να είναι διαχειριστής",
     "File name is a reserved word" : "Το όνομα αρχείου είναι λέξη που έχει δεσμευτεί",
     "File name contains at least one invalid character" : "Το όνομα αρχείου περιέχει έναν τουλάχιστον μη έγκυρο χαρακτήρα",
     "File name is too long" : "Το όνομα αρχείου είναι πολύ μεγάλο",
-    "Help" : "Βοήθεια",
     "Users" : "Χρήστες",
-    "Unknown user" : "Άγνωστος χρήστης",
-    "MySQL username and/or password not valid" : "Το όνομα χρήστη και/'η ο κωδικός πρόσβασης MySQL δεν είναι σωστά",
-    "Oracle username and/or password not valid" : "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle",
-    "PostgreSQL username and/or password not valid" : "Μη έγκυρος χρήστης και/ή συνθηματικό της PostgreSQL",
-    "Set an admin username." : "Εισάγετε όνομα χρήστη διαχειριστή.",
     "%1$s shared »%2$s« with you and wants to add:" : "Ο %1$s διαμοιράστηκε το »%2$s« με εσάς και θέλει να προσθέσει:",
     "%1$s shared »%2$s« with you and wants to add" : "Ο %1$s διαμοιράστηκε το »%2$s« με εσάς και θέλει να προσθέσει",
     "»%s« added a note to a file shared with you" : "Ο »%s« πρόσθεσε μια σημείωση στο κοινόχρηστο αρχείο",
     "Open »%s«" : "Άνοιγμα »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Η κοινή χρήση του %s απέτυχε, επειδή αυτό το στοιχείο είναι ήδη κοινόχρηστο με τον χρήστη %s",
     "%1$s shared »%2$s« with you" : "Ο/η %1$s διαμοιράστηκε το »%2$s« με εσάς.",
     "%1$s shared »%2$s« with you." : "Ο/η %1$s διαμοιράστηκε »%2$s« με εσάς.",
     "Click the button below to open it." : "Κάντε κλικ στο παρακάτω κουμπί για να το ανοίξετε.",
-    "The username is already being used" : "Το όνομα χρήστη είναι κατειλημμένο",
-    "Could not create user" : "Αδυναμία δημιουργίας χρήστη",
-    "A valid username must be provided" : "Πρέπει να δοθεί έγκυρο όνομα χρήστη",
-    "Username contains whitespace at the beginning or at the end" : "Το όνομα χρήστη περιέχει κενό διάστημα στην αρχή ή στο τέλος",
-    "Username must not consist of dots only" : "Το όνομα χρήστη δεν πρέπει να περιέχει μόνο τελείες",
-    "Username is invalid because files already exist for this user" : "Το όνομα χρήστη δεν είναι έγκυρο, επειδή υπάρχουν ήδη αρχεία για αυτόν τον χρήστη",
-    "User disabled" : "Ο χρήστης απενεργοποιήθηκε",
     "File is currently busy, please try again later" : "Το αρχείο χρησιμοποιείται αυτή τη στιγμή, παρακαλούμε προσπαθήστε αργότερα",
     "Cannot download file" : "Δεν είναι δυνατή η λήψη του αρχείου",
-    "Your data directory is readable by other users." : "Ο κατάλογος δεδομένων σας είναι αναγνώσιμος από άλλους χρήστες.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Παρακαλούμε αλλάξτε τις ρυθμίσεις σε 0770 έτσι ώστε ο κατάλογος να μην μπορεί να προβάλλεται από άλλους χρήστες.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Εξασφαλίστε ότι υπάρχει ένα αρχείο με όνομα \".ocdata\" στον βασικό κατάλογο του καταλόγου δεδομένων."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/en_GB.js b/lib/l10n/en_GB.js
index a2fae6c5cdd..759be453fc5 100644
--- a/lib/l10n/en_GB.js
+++ b/lib/l10n/en_GB.js
@@ -59,6 +59,11 @@ OC.L10N.register(
     "Avatar image is not square" : "Avatar image is not square",
     "Files" : "Files",
     "View profile" : "View profile",
+    "same time" : "same time",
+    "_%nh_::_%nh_" : ["%nh","%nh"],
+    "_%nm_::_%nm_" : ["%nm","%nm"],
+    "%s ahead" : "%s ahead",
+    "%s behind" : "%s behind",
     "Local time: %s" : "Local time: %s",
     "today" : "today",
     "tomorrow" : "tomorrow",
@@ -81,6 +86,12 @@ OC.L10N.register(
     "seconds ago" : "seconds ago",
     "Empty file" : "Empty file",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator.",
+    "No file conversion providers available" : "No file conversion providers available",
+    "File is too large to convert" : "File is too large to convert",
+    "Destination does not match conversion extension" : "Destination does not match conversion extension",
+    "Could not convert file" : "Could not convert file",
+    "Destination does not exist" : "Destination does not exist",
+    "Destination is not creatable" : "Destination is not creatable",
     "Dot files are not allowed" : "Dot files are not allowed",
     "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" is a forbidden file or folder name.",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" is a forbidden prefix for file or folder names.",
@@ -92,6 +103,13 @@ OC.L10N.register(
     "Invalid path" : "Invalid path",
     "Failed to create file from template" : "Failed to create file from template",
     "Templates" : "Templates",
+    "Storage %s cannot be moved" : "Storage %s cannot be moved",
+    "Moving a share (%s) into a shared folder is not allowed" : "Moving a share (%s) into a shared folder is not allowed",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Moving a storage (%s) into a shared folder is not allowed",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Moving a share (%s) into another share (%s) is not allowed",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Moving a share (%s) into another storage (%s) is not allowed",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Moving a storage (%s) into a share (%s) is not allowed",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Moving a storage (%s) into another storage (%s) is not allowed",
     "Path contains invalid segments" : "Path contains invalid segments",
     "Filename is a reserved word" : "Filename is a reserved word",
     "Filename contains at least one invalid character" : "Filename contains at least one invalid character",
@@ -425,41 +443,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Summarizes text by reducing its length without losing key information.",
     "Extracts topics from a text and outputs them separated by commas." : "Extracts topics from a text and outputs them separated by commas.",
     "Education Edition" : "Education Edition",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Logged in user must be an admin, a sub-admin or has special right to access this setting",
-    "Logged in user must be an admin or sub admin" : "Logged in user must be an admin or sub admin",
-    "Logged in user must be an admin" : "Logged in user must be an admin",
     "File name is a reserved word" : "File name is a reserved word",
     "File name contains at least one invalid character" : "File name contains at least one invalid character",
     "File name is too long" : "File name is too long",
-    "Help" : "Help",
     "Users" : "Users",
-    "Unknown user" : "Unknown user",
-    "Enter the database username and name for %s" : "Enter the database username and name for %s",
-    "Enter the database username for %s" : "Enter the database username for %s",
-    "MySQL username and/or password not valid" : "MySQL username and/or password not valid",
-    "Oracle username and/or password not valid" : "Oracle username and/or password not valid",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL username and/or password not valid",
-    "Set an admin username." : "Set an admin username.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s shared »%2$s« with you and wants to add:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s shared »%2$s« with you and wants to add",
     "»%s« added a note to a file shared with you" : "»%s« added a note to a file shared with you",
     "Open »%s«" : "Open »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Sharing %s failed, because this item is already shared with user %s",
     "%1$s shared »%2$s« with you" : "%1$s shared »%2$s« with you",
     "%1$s shared »%2$s« with you." : "%1$s shared »%2$s« with you.",
     "Click the button below to open it." : "Click the button below to open it.",
-    "The username is already being used" : "The username is already being used",
-    "Could not create user" : "Could not create user",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"",
-    "A valid username must be provided" : "A valid username must be provided",
-    "Username contains whitespace at the beginning or at the end" : "Username contains whitespace at the beginning or at the end",
-    "Username must not consist of dots only" : "Username must not consist of dots only",
-    "Username is invalid because files already exist for this user" : "Username is invalid because files already exist for this user",
-    "User disabled" : "User disabled",
     "File is currently busy, please try again later" : "File is currently busy, please try again later",
     "Cannot download file" : "Cannot download file",
-    "Your data directory is readable by other users." : "Your data directory is readable by other users.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Please change the permissions to 0770 so that the directory cannot be listed by other users.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Ensure there is a file called \".ocdata\" in the root of the data directory."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/en_GB.json b/lib/l10n/en_GB.json
index 2c47988c44b..72c6db0af6e 100644
--- a/lib/l10n/en_GB.json
+++ b/lib/l10n/en_GB.json
@@ -57,6 +57,11 @@
     "Avatar image is not square" : "Avatar image is not square",
     "Files" : "Files",
     "View profile" : "View profile",
+    "same time" : "same time",
+    "_%nh_::_%nh_" : ["%nh","%nh"],
+    "_%nm_::_%nm_" : ["%nm","%nm"],
+    "%s ahead" : "%s ahead",
+    "%s behind" : "%s behind",
     "Local time: %s" : "Local time: %s",
     "today" : "today",
     "tomorrow" : "tomorrow",
@@ -79,6 +84,12 @@
     "seconds ago" : "seconds ago",
     "Empty file" : "Empty file",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator.",
+    "No file conversion providers available" : "No file conversion providers available",
+    "File is too large to convert" : "File is too large to convert",
+    "Destination does not match conversion extension" : "Destination does not match conversion extension",
+    "Could not convert file" : "Could not convert file",
+    "Destination does not exist" : "Destination does not exist",
+    "Destination is not creatable" : "Destination is not creatable",
     "Dot files are not allowed" : "Dot files are not allowed",
     "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" is a forbidden file or folder name.",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" is a forbidden prefix for file or folder names.",
@@ -90,6 +101,13 @@
     "Invalid path" : "Invalid path",
     "Failed to create file from template" : "Failed to create file from template",
     "Templates" : "Templates",
+    "Storage %s cannot be moved" : "Storage %s cannot be moved",
+    "Moving a share (%s) into a shared folder is not allowed" : "Moving a share (%s) into a shared folder is not allowed",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Moving a storage (%s) into a shared folder is not allowed",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Moving a share (%s) into another share (%s) is not allowed",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Moving a share (%s) into another storage (%s) is not allowed",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Moving a storage (%s) into a share (%s) is not allowed",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Moving a storage (%s) into another storage (%s) is not allowed",
     "Path contains invalid segments" : "Path contains invalid segments",
     "Filename is a reserved word" : "Filename is a reserved word",
     "Filename contains at least one invalid character" : "Filename contains at least one invalid character",
@@ -423,41 +441,19 @@
     "Summarizes text by reducing its length without losing key information." : "Summarizes text by reducing its length without losing key information.",
     "Extracts topics from a text and outputs them separated by commas." : "Extracts topics from a text and outputs them separated by commas.",
     "Education Edition" : "Education Edition",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Logged in user must be an admin, a sub-admin or has special right to access this setting",
-    "Logged in user must be an admin or sub admin" : "Logged in user must be an admin or sub admin",
-    "Logged in user must be an admin" : "Logged in user must be an admin",
     "File name is a reserved word" : "File name is a reserved word",
     "File name contains at least one invalid character" : "File name contains at least one invalid character",
     "File name is too long" : "File name is too long",
-    "Help" : "Help",
     "Users" : "Users",
-    "Unknown user" : "Unknown user",
-    "Enter the database username and name for %s" : "Enter the database username and name for %s",
-    "Enter the database username for %s" : "Enter the database username for %s",
-    "MySQL username and/or password not valid" : "MySQL username and/or password not valid",
-    "Oracle username and/or password not valid" : "Oracle username and/or password not valid",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL username and/or password not valid",
-    "Set an admin username." : "Set an admin username.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s shared »%2$s« with you and wants to add:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s shared »%2$s« with you and wants to add",
     "»%s« added a note to a file shared with you" : "»%s« added a note to a file shared with you",
     "Open »%s«" : "Open »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Sharing %s failed, because this item is already shared with user %s",
     "%1$s shared »%2$s« with you" : "%1$s shared »%2$s« with you",
     "%1$s shared »%2$s« with you." : "%1$s shared »%2$s« with you.",
     "Click the button below to open it." : "Click the button below to open it.",
-    "The username is already being used" : "The username is already being used",
-    "Could not create user" : "Could not create user",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"",
-    "A valid username must be provided" : "A valid username must be provided",
-    "Username contains whitespace at the beginning or at the end" : "Username contains whitespace at the beginning or at the end",
-    "Username must not consist of dots only" : "Username must not consist of dots only",
-    "Username is invalid because files already exist for this user" : "Username is invalid because files already exist for this user",
-    "User disabled" : "User disabled",
     "File is currently busy, please try again later" : "File is currently busy, please try again later",
     "Cannot download file" : "Cannot download file",
-    "Your data directory is readable by other users." : "Your data directory is readable by other users.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Please change the permissions to 0770 so that the directory cannot be listed by other users.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Ensure there is a file called \".ocdata\" in the root of the data directory."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/eo.js b/lib/l10n/eo.js
index f5f1180c241..12076b41432 100644
--- a/lib/l10n/eo.js
+++ b/lib/l10n/eo.js
@@ -182,35 +182,18 @@ OC.L10N.register(
     "Summary" : "Resumo",
     "Translate" : "Traduku",
     "Education Edition" : "Eldono por edukado",
-    "Logged in user must be an admin or sub admin" : "La ensalutanta uzanto estu administranto aŭ subadministranto",
-    "Logged in user must be an admin" : "La ensalutanta uzanto estu administranto",
     "File name is a reserved word" : "Dosiernomo estas rezervita vorto",
     "File name contains at least one invalid character" : "Dosiernomo enhavas almenaŭ unu nevalidan signon",
     "File name is too long" : "La dosiernomo estas tro longa",
-    "Help" : "Helpo",
     "Users" : "Uzantoj",
-    "Unknown user" : "Nekonata uzanto",
-    "MySQL username and/or password not valid" : "La uzantnomo kaj/aŭ pasvorto de MySQL ne estas valida",
-    "Oracle username and/or password not valid" : "La uzantnomo kaj/aŭ la pasvorto de Oracle ne estas valida",
-    "PostgreSQL username and/or password not valid" : "La uzantnomo aŭ la pasvorto de PostgreSQL ne validas",
-    "Set an admin username." : "Agordi uzantnomon de administranto.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s kunhavigis „%2$s“ kun vi kaj volas aldoni:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s kunhavigis „%2$s“ kun vi kaj volas aldoni",
     "»%s« added a note to a file shared with you" : "„%s“ aldonis noton al dosiero kunhavigita kun vi",
     "Open »%s«" : "Malfermi „%s“",
-    "Sharing %s failed, because this item is already shared with user %s" : "Kunhavigo de %s malsukcesis, ĉar la ero jam kunhaviĝis kun %s",
     "%1$s shared »%2$s« with you" : "%1$s kunhavigis „%2$s“ kun vi",
     "%1$s shared »%2$s« with you." : "%1$s kunhavigis „%2$s“ kun vi.",
     "Click the button below to open it." : "Alklaku la butonon ĉi-sube por malfermi ĝin.",
-    "The username is already being used" : "La uzantnomo jam estas uzata",
-    "Could not create user" : "Ne povis krei uzanton",
-    "A valid username must be provided" : "Valida uzantnomo devas esti provizita",
-    "Username contains whitespace at the beginning or at the end" : "Uzantnomo enhavas spaceton ĉe la komenco aŭ la fino",
-    "Username must not consist of dots only" : "Uzantnomo ne povas enhavi nur punktojn",
-    "Username is invalid because files already exist for this user" : "La uzantnomo ne estas valida pro dosieroj por la uzanto jam ekzistas",
-    "User disabled" : "Uzanto malebligita",
     "File is currently busy, please try again later" : "La dosiero estas nun okupita, bv. reprovi poste",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Bv. ŝanĝi la permesojn al 0770, tiel la dosierujo ne listigeblas de aliaj uzantoj.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Certigu, ke estas dosiero nomata „.ocdata“ en la radiko de la dosierujo de datumoj."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/eo.json b/lib/l10n/eo.json
index 1ff7a8b4359..e6ef17736c8 100644
--- a/lib/l10n/eo.json
+++ b/lib/l10n/eo.json
@@ -180,35 +180,18 @@
     "Summary" : "Resumo",
     "Translate" : "Traduku",
     "Education Edition" : "Eldono por edukado",
-    "Logged in user must be an admin or sub admin" : "La ensalutanta uzanto estu administranto aŭ subadministranto",
-    "Logged in user must be an admin" : "La ensalutanta uzanto estu administranto",
     "File name is a reserved word" : "Dosiernomo estas rezervita vorto",
     "File name contains at least one invalid character" : "Dosiernomo enhavas almenaŭ unu nevalidan signon",
     "File name is too long" : "La dosiernomo estas tro longa",
-    "Help" : "Helpo",
     "Users" : "Uzantoj",
-    "Unknown user" : "Nekonata uzanto",
-    "MySQL username and/or password not valid" : "La uzantnomo kaj/aŭ pasvorto de MySQL ne estas valida",
-    "Oracle username and/or password not valid" : "La uzantnomo kaj/aŭ la pasvorto de Oracle ne estas valida",
-    "PostgreSQL username and/or password not valid" : "La uzantnomo aŭ la pasvorto de PostgreSQL ne validas",
-    "Set an admin username." : "Agordi uzantnomon de administranto.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s kunhavigis „%2$s“ kun vi kaj volas aldoni:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s kunhavigis „%2$s“ kun vi kaj volas aldoni",
     "»%s« added a note to a file shared with you" : "„%s“ aldonis noton al dosiero kunhavigita kun vi",
     "Open »%s«" : "Malfermi „%s“",
-    "Sharing %s failed, because this item is already shared with user %s" : "Kunhavigo de %s malsukcesis, ĉar la ero jam kunhaviĝis kun %s",
     "%1$s shared »%2$s« with you" : "%1$s kunhavigis „%2$s“ kun vi",
     "%1$s shared »%2$s« with you." : "%1$s kunhavigis „%2$s“ kun vi.",
     "Click the button below to open it." : "Alklaku la butonon ĉi-sube por malfermi ĝin.",
-    "The username is already being used" : "La uzantnomo jam estas uzata",
-    "Could not create user" : "Ne povis krei uzanton",
-    "A valid username must be provided" : "Valida uzantnomo devas esti provizita",
-    "Username contains whitespace at the beginning or at the end" : "Uzantnomo enhavas spaceton ĉe la komenco aŭ la fino",
-    "Username must not consist of dots only" : "Uzantnomo ne povas enhavi nur punktojn",
-    "Username is invalid because files already exist for this user" : "La uzantnomo ne estas valida pro dosieroj por la uzanto jam ekzistas",
-    "User disabled" : "Uzanto malebligita",
     "File is currently busy, please try again later" : "La dosiero estas nun okupita, bv. reprovi poste",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Bv. ŝanĝi la permesojn al 0770, tiel la dosierujo ne listigeblas de aliaj uzantoj.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Certigu, ke estas dosiero nomata „.ocdata“ en la radiko de la dosierujo de datumoj."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/es.js b/lib/l10n/es.js
index 8c1ef8232ad..7773737b460 100644
--- a/lib/l10n/es.js
+++ b/lib/l10n/es.js
@@ -59,6 +59,11 @@ OC.L10N.register(
     "Avatar image is not square" : "La imagen de avatar no es cuadrada",
     "Files" : "Archivos",
     "View profile" : "Ver perfil",
+    "same time" : "al mismo tiempo",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh"],
+    "_%nm_::_%nm_" : ["%n m","%n m","%n m"],
+    "%s ahead" : "%s adelantado",
+    "%s behind" : "%s atrasado",
     "Local time: %s" : "Hora local: %s",
     "today" : "hoy",
     "tomorrow" : "mañana",
@@ -81,6 +86,12 @@ OC.L10N.register(
     "seconds ago" : "hace segundos",
     "Empty file" : "Archivo vacío",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID %s no existe. Por favor, actívalo en la configuración de apps o contacta con tu administrador.",
+    "No file conversion providers available" : "No hay proveedores de conversión de archivos disponibles",
+    "File is too large to convert" : "El archivo es demasiado grande para convertir",
+    "Destination does not match conversion extension" : "El destino no coincide con la extensión convertida",
+    "Could not convert file" : "No se ha podido convertir el archivo",
+    "Destination does not exist" : "El destino no existe",
+    "Destination is not creatable" : "El destino no se puede crear",
     "Dot files are not allowed" : "Los archivos Dot no están permitidos",
     "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" Es un nombre de archivo o carpeta no permitido.",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "%1$s es un prefijo prohibido para nombres de archivo o carpeta.",
@@ -92,6 +103,13 @@ OC.L10N.register(
     "Invalid path" : "Ruta no válida",
     "Failed to create file from template" : "Fallo al crear el archivo desde plantilla",
     "Templates" : "Plantillas",
+    "Storage %s cannot be moved" : "El almacenamiento %s no ha podido moverse",
+    "Moving a share (%s) into a shared folder is not allowed" : "No está permitido mover un recurso compartido (%s) a una carpeta compartida",
+    "Moving a storage (%s) into a shared folder is not allowed" : "No está permitido mover un almacenamiento (%s) a una carpeta compartida",
+    "Moving a share (%s) into another share (%s) is not allowed" : "No está permitido mover un recurso compartido (%s) a otro recurso compartido (%s)",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "No está permitido mover un recurso compartido (%s) a otro almacenamiento (%s)",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "No está permitido mover un almacenamiento (%s) a un recurso compartido (%s)",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "No está permitido mover un almacenamiento (%s) a otro almacenamiento (%s)",
     "Path contains invalid segments" : "La ruta contiene segmentos inválidos",
     "Filename is a reserved word" : "El nombre de archivo es una palabra reservada",
     "Filename contains at least one invalid character" : "El nombre de archivo contiene al menos un carácter inválido",
@@ -148,7 +166,12 @@ OC.L10N.register(
     "Sharing backend %s must implement the interface OCP\\Share_Backend" : "El motor compartido %s debe implementar la interfaz OCP\\Share_Backend",
     "Sharing backend %s not found" : "El motor compartido %s no se ha encontrado",
     "Sharing backend for %s not found" : "Motor compartido para %s no encontrado",
+    "%1$s shared %2$s with you" : "%1$s ha compartido %2$s contigo",
+    "Open %s" : "Abrir %s",
     "%1$s via %2$s" : "%1$s vía %2$s",
+    "%1$s shared %2$s with you and wants to add:" : "%1$s ha compartido %2$s contigo y quiere añadir:",
+    "%1$s shared %2$s with you and wants to add" : "%1$s ha compartido %2$s contigo y quiere añadir",
+    "%s added a note to a file shared with you" : "%s ha añadido una nota a un archivo compartido contigo",
     "Passwords are enforced for link and mail shares" : "Las contraseñas son obligatorias para los enlaces y correos compartidos.",
     "Share recipient is not a valid user" : "El recipiente del recurso compartido no es un usuario válido",
     "Share recipient is not a valid group" : "El recipiente del recurso compartido no es un grupo válido",
@@ -305,8 +328,19 @@ OC.L10N.register(
     "The audio to transcribe" : "El audio a transcribir",
     "Transcription" : "Transcripción",
     "The transcribed text" : "El texto transcrito",
+    "Chat with an agent" : "Chatea con un agente",
     "Chat message" : "Mensaje de chat",
+    "A chat message to send to the agent." : "Un mensaje de chat a escribir al agente",
     "Confirmation" : "Confirmación",
+    "Whether to confirm previously requested actions: 0 for denial and 1 for confirmation." : "Si se deben confirmar acciones solicitadas anteriormente: 0 para denegar y 1 para confirmar.",
+    "Conversation token" : "Token de conversación",
+    "A token representing the conversation." : "Un token que representa la conversación.",
+    "Generated response" : "Respuesta generada",
+    "The response from the chat model." : "La respuesta del modelo de chat.",
+    "The new conversation token" : "El nuevo token de conversación",
+    "Send this along with the next interaction." : "Envía esto junto a la siguiente interacción.",
+    "Requested actions by the agent" : "Acciones solicitadas por el agente",
+    "Actions that the agent would like to carry out in JSON format." : "Acciones que el agente quiere realizar en formato JSON.",
     "Context write" : "Escribir contexto",
     "Writes text in a given style based on the provided source material." : "Escribe el texto en un estilo dado basándose en el material fuente proporcionado.",
     "Writing style" : "Estilo de escritura",
@@ -333,6 +367,12 @@ OC.L10N.register(
     "Describe a task that you want the assistant to do or ask a question" : "Describa una tarea que quiere que el asistente realice, o, haga una pregunta",
     "Generated reply" : "Respuesta generada",
     "The generated text from the assistant" : "El texto generado por el asistente",
+    "Change Tone" : "Cambiar tono",
+    "Change the tone of a piece of text." : "Cambiar el tono de un texto.",
+    "Write a text that you want the assistant to rewrite in another tone." : "Escribe un texto que quieres que el asistente reescriba en otro tono",
+    "Desired tone" : "Tono deseado",
+    "In which tone should your text be rewritten?" : "¿En qué tono debe reescribirse tu texto?",
+    "The rewritten text in the desired tone, written by the assistant:" : "El texto reescrito en el tono deseado, escrito por el asistente:",
     "Chat" : "Chat",
     "Chat with the assistant" : "Chatear con el asistente",
     "System prompt" : "Prompt del sistema",
@@ -341,6 +381,15 @@ OC.L10N.register(
     "The history of chat messages before the current message, starting with a message by the user" : "El historial de mensajes del chat antes del mensaje actual, empezando con un mensaje del usuario",
     "Response message" : "Mensaje de respuesta",
     "The generated response as part of the conversation" : "La respuesta generada como parte de la conversación",
+    "Chat with tools" : "Chat con herramientas:",
+    "Chat with the language model with tool calling support." : "Cheatea con el modelo de lenguaje con capacidad para llamar a herramientas.",
+    "Tool message" : "Mensaje de herramienta",
+    "The result of tool calls in the last interaction" : "El resultado de llamada a herramientas de la última interacción",
+    "Available tools" : "Herramientas disponibles",
+    "The available tools in JSON format" : "Las herramientas disponibles en formato JSON",
+    "The response from the chat model" : "La respuesta del modelo de chat",
+    "Tool calls" : "Llamadas a herramientas",
+    "Tools call instructions from the model in JSON format" : "Instrucciones para llamadas a herramientas del modelo en formato JSON",
     "Formalize text" : "Formalizar texto",
     "Takes a text and makes it sound more formal" : "Toma un texto y lo hace sonar más formal",
     "Write a text that you want the assistant to formalize" : "Escriba un texto que quiere que el asistente formalice",
@@ -351,7 +400,12 @@ OC.L10N.register(
     "Original text" : "Texto original",
     "The original text to generate a headline for" : "El texto original para el cual generar un titular",
     "The generated headline" : "El titular generado",
+    "Proofread" : "Corregir",
+    "Proofreads a text and lists corrections" : "Corrige un texto y muestra sugerencias",
     "Text" : "Texto",
+    "The text to proofread" : "El texto a corregir",
+    "Corrections" : "Correcciones",
+    "The corrections that should be made in your text" : "Las correcciones que deberían aplicarse a tu texto",
     "Reformulate text" : "Reformular texto",
     "Takes a text and reformulates it" : "Toma un texto y lo reformula",
     "Write a text that you want the assistant to reformulate" : "Escriba un texto que quiere que el asistente reformule",
@@ -388,41 +442,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Resume el texto reduciendo su longitud sin perder información clave.",
     "Extracts topics from a text and outputs them separated by commas." : "Extrae los tópicos de un texto y genera una salida separada por comas. ",
     "Education Edition" : "Edición Educación",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "La sesión del usuario debe corresponder a un administrador, subadministrador, o debe tener derechos especiales para acceder a esta configuración.",
-    "Logged in user must be an admin or sub admin" : "El usuario activo debe ser un administrador o subadministrador",
-    "Logged in user must be an admin" : "El usuario registrado debe ser un administrador",
     "File name is a reserved word" : "El nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un carácter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Usuario desconocido",
-    "Enter the database username and name for %s" : "Introduzca el nombre de usuario y la contraseña para la base de datos %s",
-    "Enter the database username for %s" : "Introduzca el nombre de usuario para la base datos %s",
-    "MySQL username and/or password not valid" : "Usuario y/o contraseña de MySQL no válidos",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle no válidos",
-    "PostgreSQL username and/or password not valid" : "Usuario y/o contraseña de PostgreSQL no válidos",
-    "Set an admin username." : "Configurar un nombre de usuario del administrador",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s ha compartido «%2$s» contigo y quiere añadir:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s ha compartido «%2$s» contigo y quiere añadir",
     "»%s« added a note to a file shared with you" : "«%s» ha añadido una nota a un archivo compartido contigo",
     "Open »%s«" : "Abrir »%s« ",
-    "Sharing %s failed, because this item is already shared with user %s" : "No se pudo compartir %s, porque este elemento ya está compartido con el usuario %s",
     "%1$s shared »%2$s« with you" : "%1$s ha compartido «%2$s» contigo",
     "%1$s shared »%2$s« with you." : "%1$s ha compartido «%2$s» contigo.",
     "Click the button below to open it." : "Haz clic en el botón de abajo para abrirlo.",
-    "The username is already being used" : "El nombre de usuario ya está en uso",
-    "Could not create user" : "No se ha podido crear el usuario",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Solo los siguientes caracteres están permitidos en un nombre de usuario: \"a-z\", \"A-Z\", \"0-9\", espacios y \"_.@-'\"",
-    "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El nombre de usuario contiene espacios en blanco al principio o al final",
-    "Username must not consist of dots only" : "El nombre de usuario no debe consistir solo de puntos",
-    "Username is invalid because files already exist for this user" : "El nombre de usuario es incorrecto debido a a que los archivos ya existen para este usuario",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente ocupado, por favor inténtelo de nuevo más tarde",
     "Cannot download file" : "No se puede descargar el archivo",
-    "Your data directory is readable by other users." : "Su carpeta de datos puede ser leída por otros usuarios.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor, cambie los permisos a 0770 para que el directorio no se pueda ser listado por otros usuarios.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegúrate de que existe un archivo llamado \".ocdata\" en la raíz del directorio de datos."
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/es.json b/lib/l10n/es.json
index a165049b5d0..cfce70f4e39 100644
--- a/lib/l10n/es.json
+++ b/lib/l10n/es.json
@@ -57,6 +57,11 @@
     "Avatar image is not square" : "La imagen de avatar no es cuadrada",
     "Files" : "Archivos",
     "View profile" : "Ver perfil",
+    "same time" : "al mismo tiempo",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh"],
+    "_%nm_::_%nm_" : ["%n m","%n m","%n m"],
+    "%s ahead" : "%s adelantado",
+    "%s behind" : "%s atrasado",
     "Local time: %s" : "Hora local: %s",
     "today" : "hoy",
     "tomorrow" : "mañana",
@@ -79,6 +84,12 @@
     "seconds ago" : "hace segundos",
     "Empty file" : "Archivo vacío",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID %s no existe. Por favor, actívalo en la configuración de apps o contacta con tu administrador.",
+    "No file conversion providers available" : "No hay proveedores de conversión de archivos disponibles",
+    "File is too large to convert" : "El archivo es demasiado grande para convertir",
+    "Destination does not match conversion extension" : "El destino no coincide con la extensión convertida",
+    "Could not convert file" : "No se ha podido convertir el archivo",
+    "Destination does not exist" : "El destino no existe",
+    "Destination is not creatable" : "El destino no se puede crear",
     "Dot files are not allowed" : "Los archivos Dot no están permitidos",
     "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" Es un nombre de archivo o carpeta no permitido.",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "%1$s es un prefijo prohibido para nombres de archivo o carpeta.",
@@ -90,6 +101,13 @@
     "Invalid path" : "Ruta no válida",
     "Failed to create file from template" : "Fallo al crear el archivo desde plantilla",
     "Templates" : "Plantillas",
+    "Storage %s cannot be moved" : "El almacenamiento %s no ha podido moverse",
+    "Moving a share (%s) into a shared folder is not allowed" : "No está permitido mover un recurso compartido (%s) a una carpeta compartida",
+    "Moving a storage (%s) into a shared folder is not allowed" : "No está permitido mover un almacenamiento (%s) a una carpeta compartida",
+    "Moving a share (%s) into another share (%s) is not allowed" : "No está permitido mover un recurso compartido (%s) a otro recurso compartido (%s)",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "No está permitido mover un recurso compartido (%s) a otro almacenamiento (%s)",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "No está permitido mover un almacenamiento (%s) a un recurso compartido (%s)",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "No está permitido mover un almacenamiento (%s) a otro almacenamiento (%s)",
     "Path contains invalid segments" : "La ruta contiene segmentos inválidos",
     "Filename is a reserved word" : "El nombre de archivo es una palabra reservada",
     "Filename contains at least one invalid character" : "El nombre de archivo contiene al menos un carácter inválido",
@@ -146,7 +164,12 @@
     "Sharing backend %s must implement the interface OCP\\Share_Backend" : "El motor compartido %s debe implementar la interfaz OCP\\Share_Backend",
     "Sharing backend %s not found" : "El motor compartido %s no se ha encontrado",
     "Sharing backend for %s not found" : "Motor compartido para %s no encontrado",
+    "%1$s shared %2$s with you" : "%1$s ha compartido %2$s contigo",
+    "Open %s" : "Abrir %s",
     "%1$s via %2$s" : "%1$s vía %2$s",
+    "%1$s shared %2$s with you and wants to add:" : "%1$s ha compartido %2$s contigo y quiere añadir:",
+    "%1$s shared %2$s with you and wants to add" : "%1$s ha compartido %2$s contigo y quiere añadir",
+    "%s added a note to a file shared with you" : "%s ha añadido una nota a un archivo compartido contigo",
     "Passwords are enforced for link and mail shares" : "Las contraseñas son obligatorias para los enlaces y correos compartidos.",
     "Share recipient is not a valid user" : "El recipiente del recurso compartido no es un usuario válido",
     "Share recipient is not a valid group" : "El recipiente del recurso compartido no es un grupo válido",
@@ -303,8 +326,19 @@
     "The audio to transcribe" : "El audio a transcribir",
     "Transcription" : "Transcripción",
     "The transcribed text" : "El texto transcrito",
+    "Chat with an agent" : "Chatea con un agente",
     "Chat message" : "Mensaje de chat",
+    "A chat message to send to the agent." : "Un mensaje de chat a escribir al agente",
     "Confirmation" : "Confirmación",
+    "Whether to confirm previously requested actions: 0 for denial and 1 for confirmation." : "Si se deben confirmar acciones solicitadas anteriormente: 0 para denegar y 1 para confirmar.",
+    "Conversation token" : "Token de conversación",
+    "A token representing the conversation." : "Un token que representa la conversación.",
+    "Generated response" : "Respuesta generada",
+    "The response from the chat model." : "La respuesta del modelo de chat.",
+    "The new conversation token" : "El nuevo token de conversación",
+    "Send this along with the next interaction." : "Envía esto junto a la siguiente interacción.",
+    "Requested actions by the agent" : "Acciones solicitadas por el agente",
+    "Actions that the agent would like to carry out in JSON format." : "Acciones que el agente quiere realizar en formato JSON.",
     "Context write" : "Escribir contexto",
     "Writes text in a given style based on the provided source material." : "Escribe el texto en un estilo dado basándose en el material fuente proporcionado.",
     "Writing style" : "Estilo de escritura",
@@ -331,6 +365,12 @@
     "Describe a task that you want the assistant to do or ask a question" : "Describa una tarea que quiere que el asistente realice, o, haga una pregunta",
     "Generated reply" : "Respuesta generada",
     "The generated text from the assistant" : "El texto generado por el asistente",
+    "Change Tone" : "Cambiar tono",
+    "Change the tone of a piece of text." : "Cambiar el tono de un texto.",
+    "Write a text that you want the assistant to rewrite in another tone." : "Escribe un texto que quieres que el asistente reescriba en otro tono",
+    "Desired tone" : "Tono deseado",
+    "In which tone should your text be rewritten?" : "¿En qué tono debe reescribirse tu texto?",
+    "The rewritten text in the desired tone, written by the assistant:" : "El texto reescrito en el tono deseado, escrito por el asistente:",
     "Chat" : "Chat",
     "Chat with the assistant" : "Chatear con el asistente",
     "System prompt" : "Prompt del sistema",
@@ -339,6 +379,15 @@
     "The history of chat messages before the current message, starting with a message by the user" : "El historial de mensajes del chat antes del mensaje actual, empezando con un mensaje del usuario",
     "Response message" : "Mensaje de respuesta",
     "The generated response as part of the conversation" : "La respuesta generada como parte de la conversación",
+    "Chat with tools" : "Chat con herramientas:",
+    "Chat with the language model with tool calling support." : "Cheatea con el modelo de lenguaje con capacidad para llamar a herramientas.",
+    "Tool message" : "Mensaje de herramienta",
+    "The result of tool calls in the last interaction" : "El resultado de llamada a herramientas de la última interacción",
+    "Available tools" : "Herramientas disponibles",
+    "The available tools in JSON format" : "Las herramientas disponibles en formato JSON",
+    "The response from the chat model" : "La respuesta del modelo de chat",
+    "Tool calls" : "Llamadas a herramientas",
+    "Tools call instructions from the model in JSON format" : "Instrucciones para llamadas a herramientas del modelo en formato JSON",
     "Formalize text" : "Formalizar texto",
     "Takes a text and makes it sound more formal" : "Toma un texto y lo hace sonar más formal",
     "Write a text that you want the assistant to formalize" : "Escriba un texto que quiere que el asistente formalice",
@@ -349,7 +398,12 @@
     "Original text" : "Texto original",
     "The original text to generate a headline for" : "El texto original para el cual generar un titular",
     "The generated headline" : "El titular generado",
+    "Proofread" : "Corregir",
+    "Proofreads a text and lists corrections" : "Corrige un texto y muestra sugerencias",
     "Text" : "Texto",
+    "The text to proofread" : "El texto a corregir",
+    "Corrections" : "Correcciones",
+    "The corrections that should be made in your text" : "Las correcciones que deberían aplicarse a tu texto",
     "Reformulate text" : "Reformular texto",
     "Takes a text and reformulates it" : "Toma un texto y lo reformula",
     "Write a text that you want the assistant to reformulate" : "Escriba un texto que quiere que el asistente reformule",
@@ -386,41 +440,19 @@
     "Summarizes text by reducing its length without losing key information." : "Resume el texto reduciendo su longitud sin perder información clave.",
     "Extracts topics from a text and outputs them separated by commas." : "Extrae los tópicos de un texto y genera una salida separada por comas. ",
     "Education Edition" : "Edición Educación",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "La sesión del usuario debe corresponder a un administrador, subadministrador, o debe tener derechos especiales para acceder a esta configuración.",
-    "Logged in user must be an admin or sub admin" : "El usuario activo debe ser un administrador o subadministrador",
-    "Logged in user must be an admin" : "El usuario registrado debe ser un administrador",
     "File name is a reserved word" : "El nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un carácter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Usuario desconocido",
-    "Enter the database username and name for %s" : "Introduzca el nombre de usuario y la contraseña para la base de datos %s",
-    "Enter the database username for %s" : "Introduzca el nombre de usuario para la base datos %s",
-    "MySQL username and/or password not valid" : "Usuario y/o contraseña de MySQL no válidos",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle no válidos",
-    "PostgreSQL username and/or password not valid" : "Usuario y/o contraseña de PostgreSQL no válidos",
-    "Set an admin username." : "Configurar un nombre de usuario del administrador",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s ha compartido «%2$s» contigo y quiere añadir:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s ha compartido «%2$s» contigo y quiere añadir",
     "»%s« added a note to a file shared with you" : "«%s» ha añadido una nota a un archivo compartido contigo",
     "Open »%s«" : "Abrir »%s« ",
-    "Sharing %s failed, because this item is already shared with user %s" : "No se pudo compartir %s, porque este elemento ya está compartido con el usuario %s",
     "%1$s shared »%2$s« with you" : "%1$s ha compartido «%2$s» contigo",
     "%1$s shared »%2$s« with you." : "%1$s ha compartido «%2$s» contigo.",
     "Click the button below to open it." : "Haz clic en el botón de abajo para abrirlo.",
-    "The username is already being used" : "El nombre de usuario ya está en uso",
-    "Could not create user" : "No se ha podido crear el usuario",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Solo los siguientes caracteres están permitidos en un nombre de usuario: \"a-z\", \"A-Z\", \"0-9\", espacios y \"_.@-'\"",
-    "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El nombre de usuario contiene espacios en blanco al principio o al final",
-    "Username must not consist of dots only" : "El nombre de usuario no debe consistir solo de puntos",
-    "Username is invalid because files already exist for this user" : "El nombre de usuario es incorrecto debido a a que los archivos ya existen para este usuario",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente ocupado, por favor inténtelo de nuevo más tarde",
     "Cannot download file" : "No se puede descargar el archivo",
-    "Your data directory is readable by other users." : "Su carpeta de datos puede ser leída por otros usuarios.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor, cambie los permisos a 0770 para que el directorio no se pueda ser listado por otros usuarios.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegúrate de que existe un archivo llamado \".ocdata\" en la raíz del directorio de datos."
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/es_419.js b/lib/l10n/es_419.js
index 255a0ea6e6f..8daacda8e4c 100644
--- a/lib/l10n/es_419.js
+++ b/lib/l10n/es_419.js
@@ -153,23 +153,10 @@ OC.L10N.register(
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/es_419.json b/lib/l10n/es_419.json
index c5f1384804d..3801653918f 100644
--- a/lib/l10n/es_419.json
+++ b/lib/l10n/es_419.json
@@ -151,23 +151,10 @@
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/es_AR.js b/lib/l10n/es_AR.js
index adb9dc9693a..c4dee851f45 100644
--- a/lib/l10n/es_AR.js
+++ b/lib/l10n/es_AR.js
@@ -63,6 +63,12 @@ OC.L10N.register(
     "Sharing backend %s must implement the interface OCP\\Share_Backend" : "El backend %s que comparte debe implementar la interface OCP\\Share_Backend",
     "Sharing backend %s not found" : "No fue encontrado el Backend que comparte %s ",
     "Sharing backend for %s not found" : "No fue encontrado el Backend que comparte para %s",
+    "%1$s shared %2$s with you" : "%1$s ha compartido \"%2$s\" con usted",
+    "Open %s" : "Abrir %s",
+    "%1$s via %2$s" : "%1$s vía %2$s",
+    "%1$s shared %2$s with you and wants to add:" : "%1$s le compartió %2$s y quiere añadir:",
+    "%1$s shared %2$s with you and wants to add" : "%1$s le compartió %2$s y quiere añadir",
+    "%s added a note to a file shared with you" : "%s añadió una nota a un archivo compartido con Ud.",
     "Unknown share type" : "Tipo de elemento compartido desconocido",
     "You are not allowed to share %s" : "No tiene permitido compartir %s",
     "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s",
@@ -141,21 +147,14 @@ OC.L10N.register(
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "El nombre de usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El nombre de usuario y/o contraseña de PostgreSQL inválidos",
-    "Set an admin username." : "Configurar un nombre de usuario del administrador",
+    "%1$s shared »%2$s« with you and wants to add:" : "%1$s compartió »%2$s« contigo y quiere añadir:",
+    "%1$s shared »%2$s« with you and wants to add" : "%1$s compartió »%2$s« contigo y quiere añadir",
+    "»%s« added a note to a file shared with you" : "%s añadió una nota a un archivo compartido con Ud.",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
+    "%1$s shared »%2$s« with you" : "%1$s compartió »%2$s« contigo",
+    "%1$s shared »%2$s« with you." : "%1$s compartió »%2$s« contigo.",
     "Click the button below to open it." : "Haga click en el botón de abajo para abrirlo.",
-    "The username is already being used" : "Ese nombre de usuario ya está en uso",
-    "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El nombre del usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El nombre de usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
-    "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, favor de intentarlo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Favor de cambiar los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. "
+    "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, favor de intentarlo más tarde. "
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/es_AR.json b/lib/l10n/es_AR.json
index 1ca26790fa6..386d245ab52 100644
--- a/lib/l10n/es_AR.json
+++ b/lib/l10n/es_AR.json
@@ -61,6 +61,12 @@
     "Sharing backend %s must implement the interface OCP\\Share_Backend" : "El backend %s que comparte debe implementar la interface OCP\\Share_Backend",
     "Sharing backend %s not found" : "No fue encontrado el Backend que comparte %s ",
     "Sharing backend for %s not found" : "No fue encontrado el Backend que comparte para %s",
+    "%1$s shared %2$s with you" : "%1$s ha compartido \"%2$s\" con usted",
+    "Open %s" : "Abrir %s",
+    "%1$s via %2$s" : "%1$s vía %2$s",
+    "%1$s shared %2$s with you and wants to add:" : "%1$s le compartió %2$s y quiere añadir:",
+    "%1$s shared %2$s with you and wants to add" : "%1$s le compartió %2$s y quiere añadir",
+    "%s added a note to a file shared with you" : "%s añadió una nota a un archivo compartido con Ud.",
     "Unknown share type" : "Tipo de elemento compartido desconocido",
     "You are not allowed to share %s" : "No tiene permitido compartir %s",
     "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s",
@@ -139,21 +145,14 @@
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "El nombre de usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El nombre de usuario y/o contraseña de PostgreSQL inválidos",
-    "Set an admin username." : "Configurar un nombre de usuario del administrador",
+    "%1$s shared »%2$s« with you and wants to add:" : "%1$s compartió »%2$s« contigo y quiere añadir:",
+    "%1$s shared »%2$s« with you and wants to add" : "%1$s compartió »%2$s« contigo y quiere añadir",
+    "»%s« added a note to a file shared with you" : "%s añadió una nota a un archivo compartido con Ud.",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
+    "%1$s shared »%2$s« with you" : "%1$s compartió »%2$s« contigo",
+    "%1$s shared »%2$s« with you." : "%1$s compartió »%2$s« contigo.",
     "Click the button below to open it." : "Haga click en el botón de abajo para abrirlo.",
-    "The username is already being used" : "Ese nombre de usuario ya está en uso",
-    "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El nombre del usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El nombre de usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
-    "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, favor de intentarlo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Favor de cambiar los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. "
+    "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, favor de intentarlo más tarde. "
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/es_CL.js b/lib/l10n/es_CL.js
index aff23edde49..df567f1a532 100644
--- a/lib/l10n/es_CL.js
+++ b/lib/l10n/es_CL.js
@@ -150,27 +150,13 @@ OC.L10N.register(
     "Translate" : "Traducir",
     "Result" : "Resultado",
     "Education Edition" : "Edición Educativa",
-    "Logged in user must be an admin" : "El usuario firmado debe ser un administrador",
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/es_CL.json b/lib/l10n/es_CL.json
index 5ed12f34e74..0faf55971aa 100644
--- a/lib/l10n/es_CL.json
+++ b/lib/l10n/es_CL.json
@@ -148,27 +148,13 @@
     "Translate" : "Traducir",
     "Result" : "Resultado",
     "Education Edition" : "Edición Educativa",
-    "Logged in user must be an admin" : "El usuario firmado debe ser un administrador",
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/es_CO.js b/lib/l10n/es_CO.js
index 2181cd5b6d6..ab6df64fc76 100644
--- a/lib/l10n/es_CO.js
+++ b/lib/l10n/es_CO.js
@@ -150,27 +150,13 @@ OC.L10N.register(
     "Translate" : "Traducir",
     "Result" : "Resultado",
     "Education Edition" : "Edición Educativa",
-    "Logged in user must be an admin" : "El usuario firmado debe ser un administrador",
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/es_CO.json b/lib/l10n/es_CO.json
index 7b1be7937b5..6898fa9dda6 100644
--- a/lib/l10n/es_CO.json
+++ b/lib/l10n/es_CO.json
@@ -148,27 +148,13 @@
     "Translate" : "Traducir",
     "Result" : "Resultado",
     "Education Edition" : "Edición Educativa",
-    "Logged in user must be an admin" : "El usuario firmado debe ser un administrador",
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/es_CR.js b/lib/l10n/es_CR.js
index e2d7e87cb10..0c5c08f8532 100644
--- a/lib/l10n/es_CR.js
+++ b/lib/l10n/es_CR.js
@@ -150,27 +150,13 @@ OC.L10N.register(
     "Translate" : "Traducir",
     "Result" : "Resultado",
     "Education Edition" : "Edición Educativa",
-    "Logged in user must be an admin" : "El usuario firmado debe ser un administrador",
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/es_CR.json b/lib/l10n/es_CR.json
index 632abfc5ecb..e3a97e9bb56 100644
--- a/lib/l10n/es_CR.json
+++ b/lib/l10n/es_CR.json
@@ -148,27 +148,13 @@
     "Translate" : "Traducir",
     "Result" : "Resultado",
     "Education Edition" : "Edición Educativa",
-    "Logged in user must be an admin" : "El usuario firmado debe ser un administrador",
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/es_DO.js b/lib/l10n/es_DO.js
index 29a056a1d48..eb72292978b 100644
--- a/lib/l10n/es_DO.js
+++ b/lib/l10n/es_DO.js
@@ -150,27 +150,13 @@ OC.L10N.register(
     "Translate" : "Traducir",
     "Result" : "Resultado",
     "Education Edition" : "Edición Educativa",
-    "Logged in user must be an admin" : "El usuario firmado debe ser un administrador",
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/es_DO.json b/lib/l10n/es_DO.json
index 22d31719bb4..c8b4a71379a 100644
--- a/lib/l10n/es_DO.json
+++ b/lib/l10n/es_DO.json
@@ -148,27 +148,13 @@
     "Translate" : "Traducir",
     "Result" : "Resultado",
     "Education Edition" : "Edición Educativa",
-    "Logged in user must be an admin" : "El usuario firmado debe ser un administrador",
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/es_EC.js b/lib/l10n/es_EC.js
index ec3721bfd0c..7a6b1f72cd1 100644
--- a/lib/l10n/es_EC.js
+++ b/lib/l10n/es_EC.js
@@ -53,6 +53,7 @@ OC.L10N.register(
     "Avatar image is not square" : "La imagen del avatar no es un cuadrado",
     "Files" : "Archivos",
     "View profile" : "Ver perfil",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh"],
     "Local time: %s" : "Hora local: %s",
     "today" : "hoy",
     "tomorrow" : "mañana",
@@ -234,41 +235,19 @@ OC.L10N.register(
     "Target language" : "Lenguaje de destino",
     "Result" : "Resultado",
     "Education Edition" : "Edición Educativa",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "El usuario que ha iniciado sesión debe ser un administrador, un subadministrador o tener permisos especiales para acceder a esta configuración.",
-    "Logged in user must be an admin or sub admin" : "El usuario que ha iniciado sesión debe ser un administrador o un subadministrador.",
-    "Logged in user must be an admin" : "El usuario firmado debe ser un administrador",
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Enter the database username and name for %s" : "Introduce el nombre de usuario y el nombre de la base de datos para %s",
-    "Enter the database username for %s" : "Introduce el nombre de usuario de la base de datos para %s",
-    "MySQL username and/or password not valid" : "Nombre de usuario y/o contraseña de MySQL no válidos",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s compartió »%2$s« contigo y quiere añadir:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s compartió »%2$s« contigo y quiere añadir",
     "»%s« added a note to a file shared with you" : "»%s« añadió una nota a un archivo compartido contigo",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "%1$s shared »%2$s« with you" : "%1$s compartió »%2$s« contigo",
     "%1$s shared »%2$s« with you." : "%1$s compartió »%2$s« contigo.",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Solo se permiten los siguientes caracteres en un nombre de usuario: \"a-z\", \"A-Z\", \"0-9\", espacios y \"_.@-'\"",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "Username is invalid because files already exist for this user" : "El nombre de usuario no es válido porque ya existen archivos para este usuario",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
     "Cannot download file" : "No se puede descargar el archivo",
-    "Your data directory is readable by other users." : "Tu directorio de datos es legible por otros usuarios.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/es_EC.json b/lib/l10n/es_EC.json
index 9ca2ac93752..85b72fd2cb8 100644
--- a/lib/l10n/es_EC.json
+++ b/lib/l10n/es_EC.json
@@ -51,6 +51,7 @@
     "Avatar image is not square" : "La imagen del avatar no es un cuadrado",
     "Files" : "Archivos",
     "View profile" : "Ver perfil",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh"],
     "Local time: %s" : "Hora local: %s",
     "today" : "hoy",
     "tomorrow" : "mañana",
@@ -232,41 +233,19 @@
     "Target language" : "Lenguaje de destino",
     "Result" : "Resultado",
     "Education Edition" : "Edición Educativa",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "El usuario que ha iniciado sesión debe ser un administrador, un subadministrador o tener permisos especiales para acceder a esta configuración.",
-    "Logged in user must be an admin or sub admin" : "El usuario que ha iniciado sesión debe ser un administrador o un subadministrador.",
-    "Logged in user must be an admin" : "El usuario firmado debe ser un administrador",
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Enter the database username and name for %s" : "Introduce el nombre de usuario y el nombre de la base de datos para %s",
-    "Enter the database username for %s" : "Introduce el nombre de usuario de la base de datos para %s",
-    "MySQL username and/or password not valid" : "Nombre de usuario y/o contraseña de MySQL no válidos",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s compartió »%2$s« contigo y quiere añadir:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s compartió »%2$s« contigo y quiere añadir",
     "»%s« added a note to a file shared with you" : "»%s« añadió una nota a un archivo compartido contigo",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "%1$s shared »%2$s« with you" : "%1$s compartió »%2$s« contigo",
     "%1$s shared »%2$s« with you." : "%1$s compartió »%2$s« contigo.",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Solo se permiten los siguientes caracteres en un nombre de usuario: \"a-z\", \"A-Z\", \"0-9\", espacios y \"_.@-'\"",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "Username is invalid because files already exist for this user" : "El nombre de usuario no es válido porque ya existen archivos para este usuario",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
     "Cannot download file" : "No se puede descargar el archivo",
-    "Your data directory is readable by other users." : "Tu directorio de datos es legible por otros usuarios.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/es_GT.js b/lib/l10n/es_GT.js
index 227b0df30e4..ed9708fda71 100644
--- a/lib/l10n/es_GT.js
+++ b/lib/l10n/es_GT.js
@@ -150,27 +150,13 @@ OC.L10N.register(
     "Translate" : "Traducir",
     "Result" : "Resultado",
     "Education Edition" : "Edición Educativa",
-    "Logged in user must be an admin" : "El usuario firmado debe ser un administrador",
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/es_GT.json b/lib/l10n/es_GT.json
index 187ba066d1c..30e24703ecf 100644
--- a/lib/l10n/es_GT.json
+++ b/lib/l10n/es_GT.json
@@ -148,27 +148,13 @@
     "Translate" : "Traducir",
     "Result" : "Resultado",
     "Education Edition" : "Edición Educativa",
-    "Logged in user must be an admin" : "El usuario firmado debe ser un administrador",
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/es_HN.js b/lib/l10n/es_HN.js
index fec22ab23e8..653d0553964 100644
--- a/lib/l10n/es_HN.js
+++ b/lib/l10n/es_HN.js
@@ -152,23 +152,10 @@ OC.L10N.register(
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/es_HN.json b/lib/l10n/es_HN.json
index 15135e4fa6f..834995b8a00 100644
--- a/lib/l10n/es_HN.json
+++ b/lib/l10n/es_HN.json
@@ -150,23 +150,10 @@
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/es_MX.js b/lib/l10n/es_MX.js
index 3b7d0458a42..a77c4ff6108 100644
--- a/lib/l10n/es_MX.js
+++ b/lib/l10n/es_MX.js
@@ -59,6 +59,7 @@ OC.L10N.register(
     "Avatar image is not square" : "La imagen del avatar no es un cuadrado",
     "Files" : "Archivos",
     "View profile" : "Ver perfil",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh"],
     "Local time: %s" : "Hora local: %s",
     "today" : "hoy",
     "tomorrow" : "mañana",
@@ -381,41 +382,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Resume el texto reduciendo su longitud sin perder información clave.",
     "Extracts topics from a text and outputs them separated by commas." : "Extrae los temas de un texto y genera una salida separada por comas. ",
     "Education Edition" : "Edición Educativa",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "El usuario que ha iniciado sesión debe ser un administrador, un subadministrador o tener permisos especiales para acceder a esta configuración",
-    "Logged in user must be an admin or sub admin" : "El usuario conectado debe ser un administrador o un subadministrador",
-    "Logged in user must be an admin" : "El usuario firmado debe ser un administrador",
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Enter the database username and name for %s" : "Introduzca el usuario y el nombre para la base de datos %s",
-    "Enter the database username for %s" : "Introduzca el usuario de la base de datos %s",
-    "MySQL username and/or password not valid" : "Usuario y/o contraseña de MySQL inválidos",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s compartió »%2$s« contigo y quiere añadir:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s compartió »%2$s« contigo y quiere añadir",
     "»%s« added a note to a file shared with you" : "»%s« añadió una nota a un archivo compartido contigo",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "%1$s shared »%2$s« with you" : "%1$s compartió »%2$s« contigo",
     "%1$s shared »%2$s« with you." : "%1$s compartió »%2$s« contigo.",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Sólo los siguientes caracteres están permitidos en un nombre de usuario: \"a-z\", \"A-Z\", \"0-9\", espacios y \"_.@-'\"",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "Username is invalid because files already exist for this user" : "El nombre de usuario es inválido porque ya existen archivos para éste",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
     "Cannot download file" : "No se puede descargar el archivo",
-    "Your data directory is readable by other users." : "Su directorio de datos puede ser leído por otros usuarios.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/es_MX.json b/lib/l10n/es_MX.json
index 44037ea0bb5..b6029d9edf7 100644
--- a/lib/l10n/es_MX.json
+++ b/lib/l10n/es_MX.json
@@ -57,6 +57,7 @@
     "Avatar image is not square" : "La imagen del avatar no es un cuadrado",
     "Files" : "Archivos",
     "View profile" : "Ver perfil",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh"],
     "Local time: %s" : "Hora local: %s",
     "today" : "hoy",
     "tomorrow" : "mañana",
@@ -379,41 +380,19 @@
     "Summarizes text by reducing its length without losing key information." : "Resume el texto reduciendo su longitud sin perder información clave.",
     "Extracts topics from a text and outputs them separated by commas." : "Extrae los temas de un texto y genera una salida separada por comas. ",
     "Education Edition" : "Edición Educativa",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "El usuario que ha iniciado sesión debe ser un administrador, un subadministrador o tener permisos especiales para acceder a esta configuración",
-    "Logged in user must be an admin or sub admin" : "El usuario conectado debe ser un administrador o un subadministrador",
-    "Logged in user must be an admin" : "El usuario firmado debe ser un administrador",
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Enter the database username and name for %s" : "Introduzca el usuario y el nombre para la base de datos %s",
-    "Enter the database username for %s" : "Introduzca el usuario de la base de datos %s",
-    "MySQL username and/or password not valid" : "Usuario y/o contraseña de MySQL inválidos",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s compartió »%2$s« contigo y quiere añadir:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s compartió »%2$s« contigo y quiere añadir",
     "»%s« added a note to a file shared with you" : "»%s« añadió una nota a un archivo compartido contigo",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "%1$s shared »%2$s« with you" : "%1$s compartió »%2$s« contigo",
     "%1$s shared »%2$s« with you." : "%1$s compartió »%2$s« contigo.",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Sólo los siguientes caracteres están permitidos en un nombre de usuario: \"a-z\", \"A-Z\", \"0-9\", espacios y \"_.@-'\"",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "Username is invalid because files already exist for this user" : "El nombre de usuario es inválido porque ya existen archivos para éste",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
     "Cannot download file" : "No se puede descargar el archivo",
-    "Your data directory is readable by other users." : "Su directorio de datos puede ser leído por otros usuarios.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/es_NI.js b/lib/l10n/es_NI.js
index 1351a14ea25..f3435e04afd 100644
--- a/lib/l10n/es_NI.js
+++ b/lib/l10n/es_NI.js
@@ -152,23 +152,10 @@ OC.L10N.register(
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/es_NI.json b/lib/l10n/es_NI.json
index e91c76d7ada..46d7d082f21 100644
--- a/lib/l10n/es_NI.json
+++ b/lib/l10n/es_NI.json
@@ -150,23 +150,10 @@
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/es_PA.js b/lib/l10n/es_PA.js
index 1aebc1afbc6..a758198884f 100644
--- a/lib/l10n/es_PA.js
+++ b/lib/l10n/es_PA.js
@@ -152,23 +152,10 @@ OC.L10N.register(
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/es_PA.json b/lib/l10n/es_PA.json
index 49abe7d5ec9..b66a56fa023 100644
--- a/lib/l10n/es_PA.json
+++ b/lib/l10n/es_PA.json
@@ -150,23 +150,10 @@
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/es_PE.js b/lib/l10n/es_PE.js
index d750e716d7a..48df64970af 100644
--- a/lib/l10n/es_PE.js
+++ b/lib/l10n/es_PE.js
@@ -152,23 +152,10 @@ OC.L10N.register(
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/es_PE.json b/lib/l10n/es_PE.json
index d09130f7ce3..e83ba493572 100644
--- a/lib/l10n/es_PE.json
+++ b/lib/l10n/es_PE.json
@@ -150,23 +150,10 @@
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/es_PR.js b/lib/l10n/es_PR.js
index 7ff2fde3920..d9e338bac7e 100644
--- a/lib/l10n/es_PR.js
+++ b/lib/l10n/es_PR.js
@@ -152,23 +152,10 @@ OC.L10N.register(
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/es_PR.json b/lib/l10n/es_PR.json
index bca3c868baa..0614ca90559 100644
--- a/lib/l10n/es_PR.json
+++ b/lib/l10n/es_PR.json
@@ -150,23 +150,10 @@
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/es_PY.js b/lib/l10n/es_PY.js
index cccc794a16c..69ab180434e 100644
--- a/lib/l10n/es_PY.js
+++ b/lib/l10n/es_PY.js
@@ -152,23 +152,10 @@ OC.L10N.register(
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/es_PY.json b/lib/l10n/es_PY.json
index 641ceaf69ed..05ce59ef60e 100644
--- a/lib/l10n/es_PY.json
+++ b/lib/l10n/es_PY.json
@@ -150,23 +150,10 @@
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/es_SV.js b/lib/l10n/es_SV.js
index 3a8717b2b04..8d19fdfb68b 100644
--- a/lib/l10n/es_SV.js
+++ b/lib/l10n/es_SV.js
@@ -150,27 +150,13 @@ OC.L10N.register(
     "Translate" : "Traducir",
     "Result" : "Resultado",
     "Education Edition" : "Edición Educativa",
-    "Logged in user must be an admin" : "El usuario firmado debe ser un administrador",
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/es_SV.json b/lib/l10n/es_SV.json
index f0f8e4f5154..bc82aa42c4c 100644
--- a/lib/l10n/es_SV.json
+++ b/lib/l10n/es_SV.json
@@ -148,27 +148,13 @@
     "Translate" : "Traducir",
     "Result" : "Resultado",
     "Education Edition" : "Edición Educativa",
-    "Logged in user must be an admin" : "El usuario firmado debe ser un administrador",
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/es_UY.js b/lib/l10n/es_UY.js
index d162e10ce46..84b27fc8b92 100644
--- a/lib/l10n/es_UY.js
+++ b/lib/l10n/es_UY.js
@@ -152,23 +152,10 @@ OC.L10N.register(
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/es_UY.json b/lib/l10n/es_UY.json
index db4b18ad213..3345fc85200 100644
--- a/lib/l10n/es_UY.json
+++ b/lib/l10n/es_UY.json
@@ -150,23 +150,10 @@
     "File name is a reserved word" : "Nombre de archivo es una palabra reservada",
     "File name contains at least one invalid character" : "El nombre del archivo contiene al menos un caracter inválido",
     "File name is too long" : "El nombre del archivo es demasiado largo",
-    "Help" : "Ayuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Ususario desconocido",
-    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "El Usuario y/o Contraseña de PostgreSQL inválido(s)",
-    "Set an admin username." : "Establecer un Usuario administrador",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Se presento una falla al compartir %s, porque este elemento ya ha sido compartido con el usuario %s",
     "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ",
-    "The username is already being used" : "Ese usuario ya está en uso",
-    "Could not create user" : "No fue posible crear el usuario",
-    "A valid username must be provided" : "Debes proporcionar un nombre de usuario válido",
-    "Username contains whitespace at the beginning or at the end" : "El usuario contiene un espacio en blanco al inicio o al final",
-    "Username must not consist of dots only" : "El usuario no debe consistir de solo puntos. ",
-    "User disabled" : "Usuario deshabilitado",
     "File is currently busy, please try again later" : "El archivo se encuentra actualmente en uso, por favor intentalo más tarde. ",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambia los permisos a 0770 para que el directorio no pueda ser enlistado por otros usuarios. ",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegurate de que exista una archivo llamado \".ocdata\" en la raíz del directorio de datos. "
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/et_EE.js b/lib/l10n/et_EE.js
index 35ca6fcc549..ccb170950b8 100644
--- a/lib/l10n/et_EE.js
+++ b/lib/l10n/et_EE.js
@@ -138,22 +138,9 @@ OC.L10N.register(
     "File name is a reserved word" : "Failinimi sisaldab keelatud sõna",
     "File name contains at least one invalid character" : "Faili nimesonvähemalt üks keelatud märk",
     "File name is too long" : "Faili nimi on liiga pikk",
-    "Help" : "Abi",
     "Users" : "Kasutajad",
-    "Unknown user" : "Tundmatu kasutaja",
-    "Oracle username and/or password not valid" : "Oracle kasutajatunnus ja/või parool pole õiged",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL kasutajatunnus ja/või parool pole õiged",
-    "Set an admin username." : "Määra admin kasutajanimi.",
     "Open »%s«" : "Ava »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "%s jagamine ebaõnnestus, kuna see üksus on juba jagatud kasutajaga %s",
     "Click the button below to open it." : "Vajuta allolevat nuppu, et see avada.",
-    "The username is already being used" : "Kasutajanimi on juba kasutuses",
-    "Could not create user" : "Ei saanud kasutajat luua",
-    "A valid username must be provided" : "Sisesta nõuetele vastav kasutajatunnus",
-    "Username contains whitespace at the beginning or at the end" : "Kasutajanime alguses või lõpus on tühik",
-    "Username must not consist of dots only" : "Kasutajanimi ei tohi koosneda ainult punktidest",
-    "User disabled" : "Kasutaja deaktiveeritud",
-    "File is currently busy, please try again later" : "Fail on hetkel kasutuses, proovi hiljem uuesti",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Palun muuda kataloogi õigused 0770-ks, et kataloogi sisu poleks teistele kasutajatele nähtav"
+    "File is currently busy, please try again later" : "Fail on hetkel kasutuses, proovi hiljem uuesti"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/et_EE.json b/lib/l10n/et_EE.json
index b84d8f08832..93f4026cb75 100644
--- a/lib/l10n/et_EE.json
+++ b/lib/l10n/et_EE.json
@@ -136,22 +136,9 @@
     "File name is a reserved word" : "Failinimi sisaldab keelatud sõna",
     "File name contains at least one invalid character" : "Faili nimesonvähemalt üks keelatud märk",
     "File name is too long" : "Faili nimi on liiga pikk",
-    "Help" : "Abi",
     "Users" : "Kasutajad",
-    "Unknown user" : "Tundmatu kasutaja",
-    "Oracle username and/or password not valid" : "Oracle kasutajatunnus ja/või parool pole õiged",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL kasutajatunnus ja/või parool pole õiged",
-    "Set an admin username." : "Määra admin kasutajanimi.",
     "Open »%s«" : "Ava »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "%s jagamine ebaõnnestus, kuna see üksus on juba jagatud kasutajaga %s",
     "Click the button below to open it." : "Vajuta allolevat nuppu, et see avada.",
-    "The username is already being used" : "Kasutajanimi on juba kasutuses",
-    "Could not create user" : "Ei saanud kasutajat luua",
-    "A valid username must be provided" : "Sisesta nõuetele vastav kasutajatunnus",
-    "Username contains whitespace at the beginning or at the end" : "Kasutajanime alguses või lõpus on tühik",
-    "Username must not consist of dots only" : "Kasutajanimi ei tohi koosneda ainult punktidest",
-    "User disabled" : "Kasutaja deaktiveeritud",
-    "File is currently busy, please try again later" : "Fail on hetkel kasutuses, proovi hiljem uuesti",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Palun muuda kataloogi õigused 0770-ks, et kataloogi sisu poleks teistele kasutajatele nähtav"
+    "File is currently busy, please try again later" : "Fail on hetkel kasutuses, proovi hiljem uuesti"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/eu.js b/lib/l10n/eu.js
index 612cf45ea41..13b708fa8b4 100644
--- a/lib/l10n/eu.js
+++ b/lib/l10n/eu.js
@@ -59,6 +59,7 @@ OC.L10N.register(
     "Avatar image is not square" : "Abatarreko irudia ez da karratua",
     "Files" : "Fitxategiak",
     "View profile" : "Ikusi profila",
+    "_%nh_::_%nh_" : ["%nh","%nh"],
     "Local time: %s" : "Ordu lokala: %s",
     "today" : "gaur",
     "tomorrow" : "bihar",
@@ -92,6 +93,13 @@ OC.L10N.register(
     "Invalid path" : "Bide-izen baliogabea",
     "Failed to create file from template" : "Fitxategi berria txantiloitik sortzeak huts egin du",
     "Templates" : "Txantiloiak",
+    "Storage %s cannot be moved" : "%s biltegia ezin da mugitu",
+    "Moving a share (%s) into a shared folder is not allowed" : "Partekatze bat (%s) partekatutako karpeta batera mugitzea ez dago baimenduta",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Biltegi bat (%s) partekatutako karpeta batera mugitzea ez dago baimenduta",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Partekatze bat (%s) beste partekatze (%s) batera mugitzea ez dago baimenduta",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Biltegi bat (%s) beste biltegi (%s) batera mugitzea ez dago baimenduta",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Biltegi bat (%s) partekatze (%s) batera mugitzea ez dago baimenduta",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Biltegi bat (%s) beste biltegi (%s) batera mugitzea ez dago baimenduta",
     "Path contains invalid segments" : "Bideak segmentu baliogabeak ditu",
     "Filename is a reserved word" : "Fitxategi izena hitz erreserbatua da",
     "Filename contains at least one invalid character" : "Fitxategi-izenak karaktere baliogabe bat du gutxienez",
@@ -383,7 +391,12 @@ OC.L10N.register(
     "Original text" : "Jatorrizko testua",
     "The original text to generate a headline for" : "Izenburu bat sortzeko jatorrizko testua",
     "The generated headline" : "Sortutako izenburua",
+    "Proofread" : "Testu-azterketa",
+    "Proofreads a text and lists corrections" : "Testu bat aztertzen du eta zuzenketak zerrendatzen ditu",
     "Text" : "Testua",
+    "The text to proofread" : "Aztertzeko testua",
+    "Corrections" : "Zuzenketak",
+    "The corrections that should be made in your text" : "Zure testuan egin behar diren zuzenketak",
     "Reformulate text" : "Birformulatu testua",
     "Takes a text and reformulates it" : "Testu bat hartu eta birformulatu egiten du",
     "Write a text that you want the assistant to reformulate" : "Idatz ezazu laguntzaileak birformulatzea nahi duzun testu bat",
@@ -420,41 +433,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Testua laburtzen du bere luzera murrizten informazio baliotsua galdu gabe.",
     "Extracts topics from a text and outputs them separated by commas." : "Gaiak ateratzen ditu testu batetik eta komaz banatuta erakusten ditu.",
     "Education Edition" : "Hezkuntza edizioa",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Saioa hasitako erabiltzailea administratzailea, azpi-administratzailea edo baimen berezi bat duena izan behar da ezarpen hau aldatzeko.",
-    "Logged in user must be an admin or sub admin" : "Saioa hasitako erabiltzailea administratzaile edo azpi-administratzailea izan behar du",
-    "Logged in user must be an admin" : "Saioa hasitako erabiltzailea administratzailea izan behar da",
     "File name is a reserved word" : "Fitxategi izena hitz erreserbatua da",
     "File name contains at least one invalid character" : "Fitxategi izenak karaktere baliogabe bat du gutxienez ",
     "File name is too long" : "Fitxategi-izena luzeegia da",
-    "Help" : "Laguntza",
     "Users" : "Erabiltzaileak",
-    "Unknown user" : "Erabiltzaile ezezaguna",
-    "Enter the database username and name for %s" : "%s sartu datu-basearen izena eta erabiltzaile-izena",
-    "Enter the database username for %s" : "Sartu %s(r)en datu-base erabiltzaile-izena",
-    "MySQL username and/or password not valid" : "MySQL erabiltzaile-izen edota pasahitza baliogabea",
-    "Oracle username and/or password not valid" : "Oracle erabiltzaile edo/eta pasahitza ez dira baliozkoak.",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL erabiltzailea edo/eta pasahitza ez dira baliozkoak.",
-    "Set an admin username." : "Ezarri administraziorako erabiltzaile izena.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$serabiltzaileak »%2$s« partekatu du zurekin eta hau gehitu nahi du:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$serabiltzaileak »%2$s« partekatu du zurekin eta hau gehitu nahi du",
     "»%s« added a note to a file shared with you" : "»%s« erabiltzaileak ohar bat gehitu du partekatu dizun fitxategi batean",
     "Open »%s«" : "Ireki »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "%s partekatzeak huts egin du dagoeneko %serabiltzailearekin partekatuta dagoelako",
     "%1$s shared »%2$s« with you" : "%1$serabiltzaileak »%2$s« partekatu du zurekin",
     "%1$s shared »%2$s« with you." : "%1$serabiltzaileak »%2$s« partekatu du zurekin.",
     "Click the button below to open it." : "Egin klik beheko botoian hura irekitzeko.",
-    "The username is already being used" : "Erabiltzaile izena dagoeneko erabilita dago",
-    "Could not create user" : "Ezin izan da erabiltzailea sortu",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Honako karaktereak bakarrik onartzen dira erabiltzaile izenetan: \"a-z\", \"A-Z\", \"0-9\", zuriuneak eta \"_.@-'\"",
-    "A valid username must be provided" : "Baliozko erabiltzaile izena eman behar da",
-    "Username contains whitespace at the beginning or at the end" : "Erabiltzaile-izenak zuriuneren bat du hasieran edo amaieran",
-    "Username must not consist of dots only" : "Erabiltzaile-izena ezin da puntuz osatuta soilik egon",
-    "Username is invalid because files already exist for this user" : "Erabiltzaile-izena ez da baliozkoa erabiltzaile honentzako fitxategiak dagoeneko existitzen direlako",
-    "User disabled" : "Erabiltzaile desgaituta",
     "File is currently busy, please try again later" : "Fitxategia lanpetuta dago, saiatu berriro geroago",
     "Cannot download file" : "Ezin da fitxategia deskargatu",
-    "Your data directory is readable by other users." : "Zure datuen karpeta beste erabiltzaileek irakur dezakete.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Aldatu baimenak 0770ra beste erabiltzaileek karpetan sartu ezin izateko.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Ziurtatu datu direktorioaren erroan \".ocdata\" izeneko fitxategia dagoela."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/eu.json b/lib/l10n/eu.json
index 2c63ecdbf1e..7f4416dd3c3 100644
--- a/lib/l10n/eu.json
+++ b/lib/l10n/eu.json
@@ -57,6 +57,7 @@
     "Avatar image is not square" : "Abatarreko irudia ez da karratua",
     "Files" : "Fitxategiak",
     "View profile" : "Ikusi profila",
+    "_%nh_::_%nh_" : ["%nh","%nh"],
     "Local time: %s" : "Ordu lokala: %s",
     "today" : "gaur",
     "tomorrow" : "bihar",
@@ -90,6 +91,13 @@
     "Invalid path" : "Bide-izen baliogabea",
     "Failed to create file from template" : "Fitxategi berria txantiloitik sortzeak huts egin du",
     "Templates" : "Txantiloiak",
+    "Storage %s cannot be moved" : "%s biltegia ezin da mugitu",
+    "Moving a share (%s) into a shared folder is not allowed" : "Partekatze bat (%s) partekatutako karpeta batera mugitzea ez dago baimenduta",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Biltegi bat (%s) partekatutako karpeta batera mugitzea ez dago baimenduta",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Partekatze bat (%s) beste partekatze (%s) batera mugitzea ez dago baimenduta",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Biltegi bat (%s) beste biltegi (%s) batera mugitzea ez dago baimenduta",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Biltegi bat (%s) partekatze (%s) batera mugitzea ez dago baimenduta",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Biltegi bat (%s) beste biltegi (%s) batera mugitzea ez dago baimenduta",
     "Path contains invalid segments" : "Bideak segmentu baliogabeak ditu",
     "Filename is a reserved word" : "Fitxategi izena hitz erreserbatua da",
     "Filename contains at least one invalid character" : "Fitxategi-izenak karaktere baliogabe bat du gutxienez",
@@ -381,7 +389,12 @@
     "Original text" : "Jatorrizko testua",
     "The original text to generate a headline for" : "Izenburu bat sortzeko jatorrizko testua",
     "The generated headline" : "Sortutako izenburua",
+    "Proofread" : "Testu-azterketa",
+    "Proofreads a text and lists corrections" : "Testu bat aztertzen du eta zuzenketak zerrendatzen ditu",
     "Text" : "Testua",
+    "The text to proofread" : "Aztertzeko testua",
+    "Corrections" : "Zuzenketak",
+    "The corrections that should be made in your text" : "Zure testuan egin behar diren zuzenketak",
     "Reformulate text" : "Birformulatu testua",
     "Takes a text and reformulates it" : "Testu bat hartu eta birformulatu egiten du",
     "Write a text that you want the assistant to reformulate" : "Idatz ezazu laguntzaileak birformulatzea nahi duzun testu bat",
@@ -418,41 +431,19 @@
     "Summarizes text by reducing its length without losing key information." : "Testua laburtzen du bere luzera murrizten informazio baliotsua galdu gabe.",
     "Extracts topics from a text and outputs them separated by commas." : "Gaiak ateratzen ditu testu batetik eta komaz banatuta erakusten ditu.",
     "Education Edition" : "Hezkuntza edizioa",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Saioa hasitako erabiltzailea administratzailea, azpi-administratzailea edo baimen berezi bat duena izan behar da ezarpen hau aldatzeko.",
-    "Logged in user must be an admin or sub admin" : "Saioa hasitako erabiltzailea administratzaile edo azpi-administratzailea izan behar du",
-    "Logged in user must be an admin" : "Saioa hasitako erabiltzailea administratzailea izan behar da",
     "File name is a reserved word" : "Fitxategi izena hitz erreserbatua da",
     "File name contains at least one invalid character" : "Fitxategi izenak karaktere baliogabe bat du gutxienez ",
     "File name is too long" : "Fitxategi-izena luzeegia da",
-    "Help" : "Laguntza",
     "Users" : "Erabiltzaileak",
-    "Unknown user" : "Erabiltzaile ezezaguna",
-    "Enter the database username and name for %s" : "%s sartu datu-basearen izena eta erabiltzaile-izena",
-    "Enter the database username for %s" : "Sartu %s(r)en datu-base erabiltzaile-izena",
-    "MySQL username and/or password not valid" : "MySQL erabiltzaile-izen edota pasahitza baliogabea",
-    "Oracle username and/or password not valid" : "Oracle erabiltzaile edo/eta pasahitza ez dira baliozkoak.",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL erabiltzailea edo/eta pasahitza ez dira baliozkoak.",
-    "Set an admin username." : "Ezarri administraziorako erabiltzaile izena.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$serabiltzaileak »%2$s« partekatu du zurekin eta hau gehitu nahi du:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$serabiltzaileak »%2$s« partekatu du zurekin eta hau gehitu nahi du",
     "»%s« added a note to a file shared with you" : "»%s« erabiltzaileak ohar bat gehitu du partekatu dizun fitxategi batean",
     "Open »%s«" : "Ireki »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "%s partekatzeak huts egin du dagoeneko %serabiltzailearekin partekatuta dagoelako",
     "%1$s shared »%2$s« with you" : "%1$serabiltzaileak »%2$s« partekatu du zurekin",
     "%1$s shared »%2$s« with you." : "%1$serabiltzaileak »%2$s« partekatu du zurekin.",
     "Click the button below to open it." : "Egin klik beheko botoian hura irekitzeko.",
-    "The username is already being used" : "Erabiltzaile izena dagoeneko erabilita dago",
-    "Could not create user" : "Ezin izan da erabiltzailea sortu",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Honako karaktereak bakarrik onartzen dira erabiltzaile izenetan: \"a-z\", \"A-Z\", \"0-9\", zuriuneak eta \"_.@-'\"",
-    "A valid username must be provided" : "Baliozko erabiltzaile izena eman behar da",
-    "Username contains whitespace at the beginning or at the end" : "Erabiltzaile-izenak zuriuneren bat du hasieran edo amaieran",
-    "Username must not consist of dots only" : "Erabiltzaile-izena ezin da puntuz osatuta soilik egon",
-    "Username is invalid because files already exist for this user" : "Erabiltzaile-izena ez da baliozkoa erabiltzaile honentzako fitxategiak dagoeneko existitzen direlako",
-    "User disabled" : "Erabiltzaile desgaituta",
     "File is currently busy, please try again later" : "Fitxategia lanpetuta dago, saiatu berriro geroago",
     "Cannot download file" : "Ezin da fitxategia deskargatu",
-    "Your data directory is readable by other users." : "Zure datuen karpeta beste erabiltzaileek irakur dezakete.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Aldatu baimenak 0770ra beste erabiltzaileek karpetan sartu ezin izateko.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Ziurtatu datu direktorioaren erroan \".ocdata\" izeneko fitxategia dagoela."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/fa.js b/lib/l10n/fa.js
index eebebb80e17..066da88a966 100644
--- a/lib/l10n/fa.js
+++ b/lib/l10n/fa.js
@@ -53,6 +53,7 @@ OC.L10N.register(
     "Avatar image is not square" : "تصویر آواتار مربع نیست",
     "Files" : "پوشه‌ها",
     "View profile" : "مشاهدهٔ نمایه",
+    "_%nh_::_%nh_" : ["%nh","%nh"],
     "Local time: %s" : "Local time: %s",
     "today" : "امروز",
     "tomorrow" : "فردا",
@@ -244,41 +245,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Summarizes text by reducing its length without losing key information.",
     "Extracts topics from a text and outputs them separated by commas." : "Extracts topics from a text and outputs them separated by commas.",
     "Education Edition" : "نگارش آموزشی",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Logged in user must be an admin, a sub admin or gotten special right to access this setting",
-    "Logged in user must be an admin or sub admin" : "ورود به سیستم کاربر باید یک مدیر یا مدیر فرعی باشد",
-    "Logged in user must be an admin" : "ورود به سیستم کاربر باید مدیر سایت باشد",
     "File name is a reserved word" : "این نام فایل جزو کلمات رزرو می‌باشد",
     "File name contains at least one invalid character" : "نام فایل دارای حداقل یک کاراکتر نامعتبر است",
     "File name is too long" : "نام فایل خیلی بزرگ است",
-    "Help" : "راهنما",
     "Users" : "کاربران",
-    "Unknown user" : "کاربر نامعلوم",
-    "Enter the database username and name for %s" : "ورود نام و نام کاربری پایگاه داده برای %s",
-    "Enter the database username for %s" : "ورود نام کاربری پایگاه داده برای %s",
-    "MySQL username and/or password not valid" : "نام کاربری یا گذرواژهٔ مای‌سکول معتبر نیست",
-    "Oracle username and/or password not valid" : "نام کاربری و / یا رمزعبور اراکل معتبر نیست.",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL نام کاربری و / یا رمزعبور معتبر نیست.",
-    "Set an admin username." : "یک نام کاربری برای مدیر تنظیم نمایید.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s به اشتراک گذاشته شده »%2$s« با شماست و می خواهد اضافه کند:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s به اشتراک گذاشته شده »%2$s« با شماست و می خواهد اضافه کند:",
     "»%s« added a note to a file shared with you" : "»%s« یادداشتی را به پرونده ای که با شما به اشتراک گذاشته شده است اضافه کرد",
     "Open »%s«" : "باز کن »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Sharing %s failed, because this item is already shared with user %s",
     "%1$s shared »%2$s« with you" : "%1$s به اشتراک گذاشته » %2$s« با شما",
     "%1$s shared »%2$s« with you." : "%1$s به اشتراک گذاشته » %2$s« با شما",
     "Click the button below to open it." : "برای باز کردن آن روی دکمه زیر کلیک کنید.",
-    "The username is already being used" : "نام‌کاربری قبلا استفاده شده است",
-    "Could not create user" : "نتواسنت کاربر را ایجاد کند",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"",
-    "A valid username must be provided" : "نام کاربری صحیح باید وارد شود",
-    "Username contains whitespace at the beginning or at the end" : "نام کاربری دارای فضای سفید در ابتدا یا انتهای آن است",
-    "Username must not consist of dots only" : "نام کاربری نباید فقط از نقاط تشکیل شده باشد",
-    "Username is invalid because files already exist for this user" : "Username is invalid because files already exist for this user",
-    "User disabled" : "کاربر از کار افتاده",
     "File is currently busy, please try again later" : "فایل در حال حاضر مشغول است، لطفا مجددا تلاش کنید",
     "Cannot download file" : "نمی‌توان پرونده را بارگرفت",
-    "Your data directory is readable by other users." : "Your data directory is readable by other users.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "لطفاً مجوزها را به 0770 تغییر دهید تا فهرست توسط سایر کاربران فهرست نشود.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "اطمینان حاصل کنید که فایلی به نام \".ocdata\" در ریشه دایرکتوری داده وجود دارد."
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/lib/l10n/fa.json b/lib/l10n/fa.json
index 0e30fa0ddf4..be017c532c7 100644
--- a/lib/l10n/fa.json
+++ b/lib/l10n/fa.json
@@ -51,6 +51,7 @@
     "Avatar image is not square" : "تصویر آواتار مربع نیست",
     "Files" : "پوشه‌ها",
     "View profile" : "مشاهدهٔ نمایه",
+    "_%nh_::_%nh_" : ["%nh","%nh"],
     "Local time: %s" : "Local time: %s",
     "today" : "امروز",
     "tomorrow" : "فردا",
@@ -242,41 +243,19 @@
     "Summarizes text by reducing its length without losing key information." : "Summarizes text by reducing its length without losing key information.",
     "Extracts topics from a text and outputs them separated by commas." : "Extracts topics from a text and outputs them separated by commas.",
     "Education Edition" : "نگارش آموزشی",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Logged in user must be an admin, a sub admin or gotten special right to access this setting",
-    "Logged in user must be an admin or sub admin" : "ورود به سیستم کاربر باید یک مدیر یا مدیر فرعی باشد",
-    "Logged in user must be an admin" : "ورود به سیستم کاربر باید مدیر سایت باشد",
     "File name is a reserved word" : "این نام فایل جزو کلمات رزرو می‌باشد",
     "File name contains at least one invalid character" : "نام فایل دارای حداقل یک کاراکتر نامعتبر است",
     "File name is too long" : "نام فایل خیلی بزرگ است",
-    "Help" : "راهنما",
     "Users" : "کاربران",
-    "Unknown user" : "کاربر نامعلوم",
-    "Enter the database username and name for %s" : "ورود نام و نام کاربری پایگاه داده برای %s",
-    "Enter the database username for %s" : "ورود نام کاربری پایگاه داده برای %s",
-    "MySQL username and/or password not valid" : "نام کاربری یا گذرواژهٔ مای‌سکول معتبر نیست",
-    "Oracle username and/or password not valid" : "نام کاربری و / یا رمزعبور اراکل معتبر نیست.",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL نام کاربری و / یا رمزعبور معتبر نیست.",
-    "Set an admin username." : "یک نام کاربری برای مدیر تنظیم نمایید.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s به اشتراک گذاشته شده »%2$s« با شماست و می خواهد اضافه کند:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s به اشتراک گذاشته شده »%2$s« با شماست و می خواهد اضافه کند:",
     "»%s« added a note to a file shared with you" : "»%s« یادداشتی را به پرونده ای که با شما به اشتراک گذاشته شده است اضافه کرد",
     "Open »%s«" : "باز کن »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Sharing %s failed, because this item is already shared with user %s",
     "%1$s shared »%2$s« with you" : "%1$s به اشتراک گذاشته » %2$s« با شما",
     "%1$s shared »%2$s« with you." : "%1$s به اشتراک گذاشته » %2$s« با شما",
     "Click the button below to open it." : "برای باز کردن آن روی دکمه زیر کلیک کنید.",
-    "The username is already being used" : "نام‌کاربری قبلا استفاده شده است",
-    "Could not create user" : "نتواسنت کاربر را ایجاد کند",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"",
-    "A valid username must be provided" : "نام کاربری صحیح باید وارد شود",
-    "Username contains whitespace at the beginning or at the end" : "نام کاربری دارای فضای سفید در ابتدا یا انتهای آن است",
-    "Username must not consist of dots only" : "نام کاربری نباید فقط از نقاط تشکیل شده باشد",
-    "Username is invalid because files already exist for this user" : "Username is invalid because files already exist for this user",
-    "User disabled" : "کاربر از کار افتاده",
     "File is currently busy, please try again later" : "فایل در حال حاضر مشغول است، لطفا مجددا تلاش کنید",
     "Cannot download file" : "نمی‌توان پرونده را بارگرفت",
-    "Your data directory is readable by other users." : "Your data directory is readable by other users.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "لطفاً مجوزها را به 0770 تغییر دهید تا فهرست توسط سایر کاربران فهرست نشود.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "اطمینان حاصل کنید که فایلی به نام \".ocdata\" در ریشه دایرکتوری داده وجود دارد."
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/fi.js b/lib/l10n/fi.js
index 4853394e532..ea9feeec374 100644
--- a/lib/l10n/fi.js
+++ b/lib/l10n/fi.js
@@ -44,6 +44,7 @@ OC.L10N.register(
     "Avatar image is not square" : "Avatar-kuva ei ole neliö",
     "Files" : "Tiedostot",
     "View profile" : "Näytä profiili",
+    "_%nh_::_%nh_" : ["%nh","%nh"],
     "Local time: %s" : "Paikallinen aika: %s",
     "today" : "tänään",
     "tomorrow" : "huomenna",
@@ -218,36 +219,19 @@ OC.L10N.register(
     "Translate" : "Käännä",
     "Target language" : "Kohdekieli",
     "Result" : "Tulos",
-    "Logged in user must be an admin" : "Sisäänkirjautuneen käyttäjän tulee olla ylläpitäjä",
     "File name is a reserved word" : "Tiedoston nimi on varattu sana",
     "File name contains at least one invalid character" : "Tiedoston nimi sisältää ainakin yhden virheellisen merkin",
     "File name is too long" : "Tiedoston nimi on liian pitkä",
-    "Help" : "Ohje",
     "Users" : "Käyttäjät",
-    "Unknown user" : "Tuntematon käyttäjä",
-    "MySQL username and/or password not valid" : "MySQL-käyttäjätunnus ja/tai -salasana on väärin",
-    "Oracle username and/or password not valid" : "Oraclen käyttäjätunnus ja/tai salasana on väärin",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin",
-    "Set an admin username." : "Aseta ylläpitäjän käyttäjätunnus.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s jakoi kohteen »%2$s« kanssasi ja haluaa lisätä:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s jakoi kohteen »%2$s« kanssasi ja haluaa lisätä",
     "»%s« added a note to a file shared with you" : "»%s« lisäsi huomion jakamaasi tiedostoon",
     "Open »%s«" : "Avaa »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Kohteen %s jakaminen epäonnistui, koska kohde on jo jaettu käyttäjän %s kanssa",
     "%1$s shared »%2$s« with you" : "%1$s jakoi kohteen »%2$s« kanssasi",
     "%1$s shared »%2$s« with you." : "%1$s jakoi kohteen »%2$s« kanssasi.",
     "Click the button below to open it." : "Napsauta alla olevaa painiketta avataksesi sen.",
-    "The username is already being used" : "Käyttäjätunnus on jo käytössä",
-    "Could not create user" : "Ei voitu luoda käyttäjää",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Vain seuraavat merkit ovat sallittuja käyttäjätunnuksessa: \"a-z\", \"A-Z\", \"0-9\", välilyönnit ja \"_.@-'\"",
-    "A valid username must be provided" : "Anna kelvollinen käyttäjätunnus",
-    "Username contains whitespace at the beginning or at the end" : "Käyttäjätunnus sisältää tyhjätilaa joko alussa tai lopussa",
-    "Username must not consist of dots only" : "Käyttäjänimi ei voi koostua vain pisteistä",
-    "Username is invalid because files already exist for this user" : "Käyttäjänimi on virheellinen koska tiedostoja on olemassa tälle käyttäjälle",
-    "User disabled" : "Käyttäjä poistettu käytöstä",
     "File is currently busy, please try again later" : "Tiedosto on parhaillaan käytössä, yritä myöhemmin uudelleen",
     "Cannot download file" : "Tiedostoa ei voi ladata",
-    "Your data directory is readable by other users." : "Datahakemistosi on muiden käyttäjien luettavissa.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Varmista että datahakemiston juuressa on tiedosto nimeltä \".ocdata\"."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/fi.json b/lib/l10n/fi.json
index 71042573474..a4e919c025b 100644
--- a/lib/l10n/fi.json
+++ b/lib/l10n/fi.json
@@ -42,6 +42,7 @@
     "Avatar image is not square" : "Avatar-kuva ei ole neliö",
     "Files" : "Tiedostot",
     "View profile" : "Näytä profiili",
+    "_%nh_::_%nh_" : ["%nh","%nh"],
     "Local time: %s" : "Paikallinen aika: %s",
     "today" : "tänään",
     "tomorrow" : "huomenna",
@@ -216,36 +217,19 @@
     "Translate" : "Käännä",
     "Target language" : "Kohdekieli",
     "Result" : "Tulos",
-    "Logged in user must be an admin" : "Sisäänkirjautuneen käyttäjän tulee olla ylläpitäjä",
     "File name is a reserved word" : "Tiedoston nimi on varattu sana",
     "File name contains at least one invalid character" : "Tiedoston nimi sisältää ainakin yhden virheellisen merkin",
     "File name is too long" : "Tiedoston nimi on liian pitkä",
-    "Help" : "Ohje",
     "Users" : "Käyttäjät",
-    "Unknown user" : "Tuntematon käyttäjä",
-    "MySQL username and/or password not valid" : "MySQL-käyttäjätunnus ja/tai -salasana on väärin",
-    "Oracle username and/or password not valid" : "Oraclen käyttäjätunnus ja/tai salasana on väärin",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin",
-    "Set an admin username." : "Aseta ylläpitäjän käyttäjätunnus.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s jakoi kohteen »%2$s« kanssasi ja haluaa lisätä:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s jakoi kohteen »%2$s« kanssasi ja haluaa lisätä",
     "»%s« added a note to a file shared with you" : "»%s« lisäsi huomion jakamaasi tiedostoon",
     "Open »%s«" : "Avaa »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Kohteen %s jakaminen epäonnistui, koska kohde on jo jaettu käyttäjän %s kanssa",
     "%1$s shared »%2$s« with you" : "%1$s jakoi kohteen »%2$s« kanssasi",
     "%1$s shared »%2$s« with you." : "%1$s jakoi kohteen »%2$s« kanssasi.",
     "Click the button below to open it." : "Napsauta alla olevaa painiketta avataksesi sen.",
-    "The username is already being used" : "Käyttäjätunnus on jo käytössä",
-    "Could not create user" : "Ei voitu luoda käyttäjää",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Vain seuraavat merkit ovat sallittuja käyttäjätunnuksessa: \"a-z\", \"A-Z\", \"0-9\", välilyönnit ja \"_.@-'\"",
-    "A valid username must be provided" : "Anna kelvollinen käyttäjätunnus",
-    "Username contains whitespace at the beginning or at the end" : "Käyttäjätunnus sisältää tyhjätilaa joko alussa tai lopussa",
-    "Username must not consist of dots only" : "Käyttäjänimi ei voi koostua vain pisteistä",
-    "Username is invalid because files already exist for this user" : "Käyttäjänimi on virheellinen koska tiedostoja on olemassa tälle käyttäjälle",
-    "User disabled" : "Käyttäjä poistettu käytöstä",
     "File is currently busy, please try again later" : "Tiedosto on parhaillaan käytössä, yritä myöhemmin uudelleen",
     "Cannot download file" : "Tiedostoa ei voi ladata",
-    "Your data directory is readable by other users." : "Datahakemistosi on muiden käyttäjien luettavissa.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Varmista että datahakemiston juuressa on tiedosto nimeltä \".ocdata\"."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js
index 505143d1180..4f4775f81c9 100644
--- a/lib/l10n/fr.js
+++ b/lib/l10n/fr.js
@@ -59,6 +59,7 @@ OC.L10N.register(
     "Avatar image is not square" : "L'image d'avatar n'est pas carrée",
     "Files" : "Fichiers",
     "View profile" : "Voir le profil",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh"],
     "Local time: %s" : "Heure locale : %s",
     "today" : "aujourd’hui",
     "tomorrow" : "demain",
@@ -339,6 +340,11 @@ OC.L10N.register(
     "Describe a task that you want the assistant to do or ask a question" : "Décrivez une tâche que vous voulez que l'assistant effectue ou posez une question",
     "Generated reply" : "Réponse générée",
     "The generated text from the assistant" : "Texte généré par l'assistant",
+    "Change Tone" : "Changer de ton",
+    "Write a text that you want the assistant to rewrite in another tone." : "Écrivez un texte que vous souhaitez voir réécrit dans un autre ton par l'assistant",
+    "Desired tone" : "Ton souhaité",
+    "In which tone should your text be rewritten?" : "Dans quel ton souhaitez-vous que votre texte soit réécrit ?",
+    "The rewritten text in the desired tone, written by the assistant:" : "Le texte réécrit dans le ton souhaité par l'assistant : ",
     "Chat" : "Discussion instantanée ",
     "Chat with the assistant" : "Discuter avec l'assistant",
     "System prompt" : "Invite du système",
@@ -394,41 +400,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Résume un texte en réduisant sa longueur sans perdre d’informations essentielles.",
     "Extracts topics from a text and outputs them separated by commas." : "Extrait les thèmes d'un texte et les restitue séparés par des virgules.",
     "Education Edition" : "Édition pour l'éducation ",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "L'utilisateur connecté doit être un administrateur, un sous-administrateur ou se voir accorder des droits spéciaux pour accéder à ce réglage",
-    "Logged in user must be an admin or sub admin" : "L'utilisateur connecté doit être administrateur ou sous-administrateur",
-    "Logged in user must be an admin" : "L'utilisateur connecté doit être un administrateur",
     "File name is a reserved word" : "Ce nom de fichier est un mot réservé",
     "File name contains at least one invalid character" : "Le nom de fichier contient au moins un caractère invalide",
     "File name is too long" : "Nom de fichier trop long",
-    "Help" : "Aide",
     "Users" : "Utilisateurs",
-    "Unknown user" : "Utilisateur inconnu",
-    "Enter the database username and name for %s" : "Entrez le nom d'utilisateur et le nom de la base de données pour %s",
-    "Enter the database username for %s" : "Entrez le nom d'utilisateur de la base de données pour %s",
-    "MySQL username and/or password not valid" : "Nom d’utilisateur et/ou mot de passe de la base MySQL non valide(s)",
-    "Oracle username and/or password not valid" : "Nom d'utilisateur et/ou mot de passe de la base Oracle non valide(s)",
-    "PostgreSQL username and/or password not valid" : "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL non valide(s)",
-    "Set an admin username." : "Spécifiez un nom d'utilisateur pour l'administrateur.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s a partagé »%2$s« avec vous et souhaite ajouter :",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s a partagé »%2$s« avec vous et souhaite ajouter",
     "»%s« added a note to a file shared with you" : "»%s« a ajouté une note à un fichier partagé avec vous",
     "Open »%s«" : "Ouvrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Impossible de partager %s car il est déjà partagé avec l'utilisateur %s",
     "%1$s shared »%2$s« with you" : "%1$s a partagé »%2$s« avec vous",
     "%1$s shared »%2$s« with you." : "%1$s a partagé »%2$s« avec vous.",
     "Click the button below to open it." : "Cliquez sur le bouton ci-dessous pour l'ouvrir",
-    "The username is already being used" : "Ce nom d’utilisateur est déjà utilisé",
-    "Could not create user" : "Impossible de créer l'utilisateur",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Seuls les caractères suivants sont autorisés dans un nom d'utilisateur : \"a-z\", \"A-Z\", \"0-9\", espaces et \"_.@-'\"",
-    "A valid username must be provided" : "Un nom d’utilisateur valide doit être saisi",
-    "Username contains whitespace at the beginning or at the end" : "Le nom d’utilisateur contient des espaces au début ou à la fin",
-    "Username must not consist of dots only" : "Le nom d'utilisateur ne doit pas être composé uniquement de points",
-    "Username is invalid because files already exist for this user" : "Ce nom d’utilisateur n’est pas valide car des fichiers existent déjà pour cet utilisateur",
-    "User disabled" : "Utilisateur désactivé",
     "File is currently busy, please try again later" : "Le fichier est actuellement utilisé, veuillez réessayer plus tard",
     "Cannot download file" : "Impossible de télécharger le fichier",
-    "Your data directory is readable by other users." : "Votre répertoire est lisible par d'autres utilisateurs.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Veuillez changer les permissions du répertoire en mode 0770 afin que son contenu ne puisse pas être listé par les autres utilisateurs.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Assurez-vous que le répertoire de données contient un fichier \".ocdata\" à sa racine."
 },
 "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json
index 64ed518c94b..ed4c37fb3bd 100644
--- a/lib/l10n/fr.json
+++ b/lib/l10n/fr.json
@@ -57,6 +57,7 @@
     "Avatar image is not square" : "L'image d'avatar n'est pas carrée",
     "Files" : "Fichiers",
     "View profile" : "Voir le profil",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh"],
     "Local time: %s" : "Heure locale : %s",
     "today" : "aujourd’hui",
     "tomorrow" : "demain",
@@ -337,6 +338,11 @@
     "Describe a task that you want the assistant to do or ask a question" : "Décrivez une tâche que vous voulez que l'assistant effectue ou posez une question",
     "Generated reply" : "Réponse générée",
     "The generated text from the assistant" : "Texte généré par l'assistant",
+    "Change Tone" : "Changer de ton",
+    "Write a text that you want the assistant to rewrite in another tone." : "Écrivez un texte que vous souhaitez voir réécrit dans un autre ton par l'assistant",
+    "Desired tone" : "Ton souhaité",
+    "In which tone should your text be rewritten?" : "Dans quel ton souhaitez-vous que votre texte soit réécrit ?",
+    "The rewritten text in the desired tone, written by the assistant:" : "Le texte réécrit dans le ton souhaité par l'assistant : ",
     "Chat" : "Discussion instantanée ",
     "Chat with the assistant" : "Discuter avec l'assistant",
     "System prompt" : "Invite du système",
@@ -392,41 +398,19 @@
     "Summarizes text by reducing its length without losing key information." : "Résume un texte en réduisant sa longueur sans perdre d’informations essentielles.",
     "Extracts topics from a text and outputs them separated by commas." : "Extrait les thèmes d'un texte et les restitue séparés par des virgules.",
     "Education Edition" : "Édition pour l'éducation ",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "L'utilisateur connecté doit être un administrateur, un sous-administrateur ou se voir accorder des droits spéciaux pour accéder à ce réglage",
-    "Logged in user must be an admin or sub admin" : "L'utilisateur connecté doit être administrateur ou sous-administrateur",
-    "Logged in user must be an admin" : "L'utilisateur connecté doit être un administrateur",
     "File name is a reserved word" : "Ce nom de fichier est un mot réservé",
     "File name contains at least one invalid character" : "Le nom de fichier contient au moins un caractère invalide",
     "File name is too long" : "Nom de fichier trop long",
-    "Help" : "Aide",
     "Users" : "Utilisateurs",
-    "Unknown user" : "Utilisateur inconnu",
-    "Enter the database username and name for %s" : "Entrez le nom d'utilisateur et le nom de la base de données pour %s",
-    "Enter the database username for %s" : "Entrez le nom d'utilisateur de la base de données pour %s",
-    "MySQL username and/or password not valid" : "Nom d’utilisateur et/ou mot de passe de la base MySQL non valide(s)",
-    "Oracle username and/or password not valid" : "Nom d'utilisateur et/ou mot de passe de la base Oracle non valide(s)",
-    "PostgreSQL username and/or password not valid" : "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL non valide(s)",
-    "Set an admin username." : "Spécifiez un nom d'utilisateur pour l'administrateur.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s a partagé »%2$s« avec vous et souhaite ajouter :",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s a partagé »%2$s« avec vous et souhaite ajouter",
     "»%s« added a note to a file shared with you" : "»%s« a ajouté une note à un fichier partagé avec vous",
     "Open »%s«" : "Ouvrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Impossible de partager %s car il est déjà partagé avec l'utilisateur %s",
     "%1$s shared »%2$s« with you" : "%1$s a partagé »%2$s« avec vous",
     "%1$s shared »%2$s« with you." : "%1$s a partagé »%2$s« avec vous.",
     "Click the button below to open it." : "Cliquez sur le bouton ci-dessous pour l'ouvrir",
-    "The username is already being used" : "Ce nom d’utilisateur est déjà utilisé",
-    "Could not create user" : "Impossible de créer l'utilisateur",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Seuls les caractères suivants sont autorisés dans un nom d'utilisateur : \"a-z\", \"A-Z\", \"0-9\", espaces et \"_.@-'\"",
-    "A valid username must be provided" : "Un nom d’utilisateur valide doit être saisi",
-    "Username contains whitespace at the beginning or at the end" : "Le nom d’utilisateur contient des espaces au début ou à la fin",
-    "Username must not consist of dots only" : "Le nom d'utilisateur ne doit pas être composé uniquement de points",
-    "Username is invalid because files already exist for this user" : "Ce nom d’utilisateur n’est pas valide car des fichiers existent déjà pour cet utilisateur",
-    "User disabled" : "Utilisateur désactivé",
     "File is currently busy, please try again later" : "Le fichier est actuellement utilisé, veuillez réessayer plus tard",
     "Cannot download file" : "Impossible de télécharger le fichier",
-    "Your data directory is readable by other users." : "Votre répertoire est lisible par d'autres utilisateurs.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Veuillez changer les permissions du répertoire en mode 0770 afin que son contenu ne puisse pas être listé par les autres utilisateurs.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Assurez-vous que le répertoire de données contient un fichier \".ocdata\" à sa racine."
 },"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/ga.js b/lib/l10n/ga.js
index 8d77289a6de..44557565db6 100644
--- a/lib/l10n/ga.js
+++ b/lib/l10n/ga.js
@@ -59,6 +59,11 @@ OC.L10N.register(
     "Avatar image is not square" : "Níl an íomhá avatar cearnach",
     "Files" : "Comhaid",
     "View profile" : "Féach ar phróifíl",
+    "same time" : "am céanna",
+    "_%nh_::_%nh_" : ["%nuair","%nuair","%nuair","%nuair","%nuair"],
+    "_%nm_::_%nm_" : ["%nm","%nm","%nm","%nm","%nm"],
+    "%s ahead" : "%s romhainn",
+    "%s behind" : "%s taobh thiar",
     "Local time: %s" : "Am áitiúil: %s",
     "today" : "inniu",
     "tomorrow" : "amárach",
@@ -81,6 +86,12 @@ OC.L10N.register(
     "seconds ago" : "soicind ó shin",
     "Empty file" : "Comhad folamh",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modúl le haitheantas: níl %s ann. Cumasaigh é i socruithe d'aipeanna nó déan teagmháil le do riarthóir le do thoil.",
+    "No file conversion providers available" : "Níl soláthraithe comhshó comhad ar fáil",
+    "File is too large to convert" : "Tá an comhad rómhór le tiontú",
+    "Destination does not match conversion extension" : "Ní hionann an ceann scríbe agus an síneadh tiontaithe",
+    "Could not convert file" : "Níorbh fhéidir an comhad a thiontú",
+    "Destination does not exist" : "Níl ceann scríbe ann",
+    "Destination is not creatable" : "Níl ceann scríbe cruthaithe",
     "Dot files are not allowed" : "Ní cheadaítear comhaid ponc",
     "\"%1$s\" is a forbidden file or folder name." : "Is ainm toirmiscthe comhaid nó fillteáin é \"%1$s\".",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "Réimír toirmiscthe é \"%1$s\" d'ainmneacha comhaid nó fillteán.",
@@ -92,6 +103,13 @@ OC.L10N.register(
     "Invalid path" : "Conair neamhbhailí",
     "Failed to create file from template" : "Theip ar chruthú comhad ón teimpléad",
     "Templates" : "Teimpléid",
+    "Storage %s cannot be moved" : "Ní féidir stóráil %s a bhogadh",
+    "Moving a share (%s) into a shared folder is not allowed" : "Ní cheadaítear sciar (%s) a bhogadh isteach i bhfillteán comhroinnte",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Ní cheadaítear stóras (%s) a bhogadh isteach i bhfillteán comhroinnte",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Ní cheadaítear sciar (%s) a aistriú go sciar eile (%s).",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Ní cheadaítear sciar (%s) a aistriú go stóras eile (%s).",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Ní cheadaítear stóras (%s) a aistriú go sciar (%s).",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Ní cheadaítear stóras (%s) a aistriú go stóras eile (%s).",
     "Path contains invalid segments" : "Tá míreanna neamhbhailí sa chonair",
     "Filename is a reserved word" : "Focal forchoimeádta is ea ainm comhaid",
     "Filename contains at least one invalid character" : "Tá carachtar neamhbhailí amháin ar a laghad san ainm comhaid",
@@ -425,41 +443,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Déanann sé achoimre ar théacs trína fhad a laghdú gan eochairfhaisnéis a chailliúint.",
     "Extracts topics from a text and outputs them separated by commas." : "Sliocht topaicí as téacs agus aschuir iad scartha le camóga.",
     "Education Edition" : "Eagrán Oideachais",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Ní mór gur riarthóir, fo-riarthóir é an t-úsáideoir logáilte isteach nó go raibh ceart speisialta faighte aige chun an socrú seo a rochtain",
-    "Logged in user must be an admin or sub admin" : "Caithfidh úsáideoir logáilte isteach a bheith ina riarthóir nó ina fho-riarthóir",
-    "Logged in user must be an admin" : "Caithfidh úsáideoir logáilte isteach a bheith ina riarthóir",
     "File name is a reserved word" : "Focal in áirithe is ea ainm comhaid",
     "File name contains at least one invalid character" : "Tá carachtar neamhbhailí amháin ar a laghad san ainm comhaid",
     "File name is too long" : "Tá ainm an chomhaid rófhada",
-    "Help" : "Cabhrú",
     "Users" : "Úsáideoirí",
-    "Unknown user" : "Úsáideoir anaithnid",
-    "Enter the database username and name for %s" : "Cuir isteach ainm úsáideora agus ainm an bhunachair shonraí do %s",
-    "Enter the database username for %s" : "Cuir isteach ainm úsáideora an bhunachair shonraí le haghaidh %s",
-    "MySQL username and/or password not valid" : "Níl ainm úsáideora agus/nó pasfhocal MySQL bailí",
-    "Oracle username and/or password not valid" : "Ainm úsáideora agus/nó pasfhocal Oracle neamhbhailí",
-    "PostgreSQL username and/or password not valid" : "Ainm úsáideora agus/nó pasfhocal PostgreSQL neamhbhailí",
-    "Set an admin username." : "Socraigh ainm úsáideora admin.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s shared »%2$s« with you and wants to add:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s shared »%2$s« with you and wants to add",
     "»%s« added a note to a file shared with you" : "»%s« added a note to a file shared with you",
     "Open »%s«" : "Oscail »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Theip ar chomhroinnt %s, toisc go bhfuil an mhír seo roinnte le húsáideoir %s cheana féin",
     "%1$s shared »%2$s« with you" : "Roinn %1$s »%2$s« leat",
     "%1$s shared »%2$s« with you." : "Roinn %1$s »%2$s« leat.",
     "Click the button below to open it." : "Cliceáil ar an gcnaipe thíos chun é a oscailt.",
-    "The username is already being used" : "Tá an t-ainm úsáideora á úsáid cheana féin",
-    "Could not create user" : "Níorbh fhéidir úsáideoir a chruthú",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Ní cheadaítear ach na carachtair seo a leanas in ainm úsáideora: \"a-z\", \"A-Z\", \"0-9\", spásanna agus \"_.@-'\"",
-    "A valid username must be provided" : "Ní mór ainm úsáideora bailí a sholáthar",
-    "Username contains whitespace at the beginning or at the end" : "Tá spás bán san ainm úsáideora ag an tús nó ag an deireadh",
-    "Username must not consist of dots only" : "Ní ceadmhach poncanna amháin a bheith san ainm úsáideora",
-    "Username is invalid because files already exist for this user" : "Tá an t-ainm úsáideora neamhbhailí toisc go bhfuil comhaid ann cheana don úsáideoir seo",
-    "User disabled" : "Díchumasaíodh an t-úsáideoir",
     "File is currently busy, please try again later" : "Tá an comhad gnóthach faoi láthair, bain triail eile as ar ball le do thoil",
     "Cannot download file" : "Ní féidir an comhad a íoslódáil",
-    "Your data directory is readable by other users." : "Tá d'eolaire sonraí inléite ag úsáideoirí eile.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Athraigh na ceadanna go 0770 le do thoil ionas nach féidir le húsáideoirí eile an t-eolaire a liostú.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Cinntigh go bhfuil comhad darb ainm \".ocdata\" i bhfréamh an eolaire sonraí."
 },
 "nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);");
diff --git a/lib/l10n/ga.json b/lib/l10n/ga.json
index 73578c02928..24112cc57a5 100644
--- a/lib/l10n/ga.json
+++ b/lib/l10n/ga.json
@@ -57,6 +57,11 @@
     "Avatar image is not square" : "Níl an íomhá avatar cearnach",
     "Files" : "Comhaid",
     "View profile" : "Féach ar phróifíl",
+    "same time" : "am céanna",
+    "_%nh_::_%nh_" : ["%nuair","%nuair","%nuair","%nuair","%nuair"],
+    "_%nm_::_%nm_" : ["%nm","%nm","%nm","%nm","%nm"],
+    "%s ahead" : "%s romhainn",
+    "%s behind" : "%s taobh thiar",
     "Local time: %s" : "Am áitiúil: %s",
     "today" : "inniu",
     "tomorrow" : "amárach",
@@ -79,6 +84,12 @@
     "seconds ago" : "soicind ó shin",
     "Empty file" : "Comhad folamh",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modúl le haitheantas: níl %s ann. Cumasaigh é i socruithe d'aipeanna nó déan teagmháil le do riarthóir le do thoil.",
+    "No file conversion providers available" : "Níl soláthraithe comhshó comhad ar fáil",
+    "File is too large to convert" : "Tá an comhad rómhór le tiontú",
+    "Destination does not match conversion extension" : "Ní hionann an ceann scríbe agus an síneadh tiontaithe",
+    "Could not convert file" : "Níorbh fhéidir an comhad a thiontú",
+    "Destination does not exist" : "Níl ceann scríbe ann",
+    "Destination is not creatable" : "Níl ceann scríbe cruthaithe",
     "Dot files are not allowed" : "Ní cheadaítear comhaid ponc",
     "\"%1$s\" is a forbidden file or folder name." : "Is ainm toirmiscthe comhaid nó fillteáin é \"%1$s\".",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "Réimír toirmiscthe é \"%1$s\" d'ainmneacha comhaid nó fillteán.",
@@ -90,6 +101,13 @@
     "Invalid path" : "Conair neamhbhailí",
     "Failed to create file from template" : "Theip ar chruthú comhad ón teimpléad",
     "Templates" : "Teimpléid",
+    "Storage %s cannot be moved" : "Ní féidir stóráil %s a bhogadh",
+    "Moving a share (%s) into a shared folder is not allowed" : "Ní cheadaítear sciar (%s) a bhogadh isteach i bhfillteán comhroinnte",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Ní cheadaítear stóras (%s) a bhogadh isteach i bhfillteán comhroinnte",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Ní cheadaítear sciar (%s) a aistriú go sciar eile (%s).",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Ní cheadaítear sciar (%s) a aistriú go stóras eile (%s).",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Ní cheadaítear stóras (%s) a aistriú go sciar (%s).",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Ní cheadaítear stóras (%s) a aistriú go stóras eile (%s).",
     "Path contains invalid segments" : "Tá míreanna neamhbhailí sa chonair",
     "Filename is a reserved word" : "Focal forchoimeádta is ea ainm comhaid",
     "Filename contains at least one invalid character" : "Tá carachtar neamhbhailí amháin ar a laghad san ainm comhaid",
@@ -423,41 +441,19 @@
     "Summarizes text by reducing its length without losing key information." : "Déanann sé achoimre ar théacs trína fhad a laghdú gan eochairfhaisnéis a chailliúint.",
     "Extracts topics from a text and outputs them separated by commas." : "Sliocht topaicí as téacs agus aschuir iad scartha le camóga.",
     "Education Edition" : "Eagrán Oideachais",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Ní mór gur riarthóir, fo-riarthóir é an t-úsáideoir logáilte isteach nó go raibh ceart speisialta faighte aige chun an socrú seo a rochtain",
-    "Logged in user must be an admin or sub admin" : "Caithfidh úsáideoir logáilte isteach a bheith ina riarthóir nó ina fho-riarthóir",
-    "Logged in user must be an admin" : "Caithfidh úsáideoir logáilte isteach a bheith ina riarthóir",
     "File name is a reserved word" : "Focal in áirithe is ea ainm comhaid",
     "File name contains at least one invalid character" : "Tá carachtar neamhbhailí amháin ar a laghad san ainm comhaid",
     "File name is too long" : "Tá ainm an chomhaid rófhada",
-    "Help" : "Cabhrú",
     "Users" : "Úsáideoirí",
-    "Unknown user" : "Úsáideoir anaithnid",
-    "Enter the database username and name for %s" : "Cuir isteach ainm úsáideora agus ainm an bhunachair shonraí do %s",
-    "Enter the database username for %s" : "Cuir isteach ainm úsáideora an bhunachair shonraí le haghaidh %s",
-    "MySQL username and/or password not valid" : "Níl ainm úsáideora agus/nó pasfhocal MySQL bailí",
-    "Oracle username and/or password not valid" : "Ainm úsáideora agus/nó pasfhocal Oracle neamhbhailí",
-    "PostgreSQL username and/or password not valid" : "Ainm úsáideora agus/nó pasfhocal PostgreSQL neamhbhailí",
-    "Set an admin username." : "Socraigh ainm úsáideora admin.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s shared »%2$s« with you and wants to add:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s shared »%2$s« with you and wants to add",
     "»%s« added a note to a file shared with you" : "»%s« added a note to a file shared with you",
     "Open »%s«" : "Oscail »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Theip ar chomhroinnt %s, toisc go bhfuil an mhír seo roinnte le húsáideoir %s cheana féin",
     "%1$s shared »%2$s« with you" : "Roinn %1$s »%2$s« leat",
     "%1$s shared »%2$s« with you." : "Roinn %1$s »%2$s« leat.",
     "Click the button below to open it." : "Cliceáil ar an gcnaipe thíos chun é a oscailt.",
-    "The username is already being used" : "Tá an t-ainm úsáideora á úsáid cheana féin",
-    "Could not create user" : "Níorbh fhéidir úsáideoir a chruthú",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Ní cheadaítear ach na carachtair seo a leanas in ainm úsáideora: \"a-z\", \"A-Z\", \"0-9\", spásanna agus \"_.@-'\"",
-    "A valid username must be provided" : "Ní mór ainm úsáideora bailí a sholáthar",
-    "Username contains whitespace at the beginning or at the end" : "Tá spás bán san ainm úsáideora ag an tús nó ag an deireadh",
-    "Username must not consist of dots only" : "Ní ceadmhach poncanna amháin a bheith san ainm úsáideora",
-    "Username is invalid because files already exist for this user" : "Tá an t-ainm úsáideora neamhbhailí toisc go bhfuil comhaid ann cheana don úsáideoir seo",
-    "User disabled" : "Díchumasaíodh an t-úsáideoir",
     "File is currently busy, please try again later" : "Tá an comhad gnóthach faoi láthair, bain triail eile as ar ball le do thoil",
     "Cannot download file" : "Ní féidir an comhad a íoslódáil",
-    "Your data directory is readable by other users." : "Tá d'eolaire sonraí inléite ag úsáideoirí eile.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Athraigh na ceadanna go 0770 le do thoil ionas nach féidir le húsáideoirí eile an t-eolaire a liostú.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Cinntigh go bhfuil comhad darb ainm \".ocdata\" i bhfréamh an eolaire sonraí."
 },"pluralForm" :"nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);"
 }
\ No newline at end of file
diff --git a/lib/l10n/gd.js b/lib/l10n/gd.js
index c27a6bab48e..06e8f265aa3 100644
--- a/lib/l10n/gd.js
+++ b/lib/l10n/gd.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "Website" : "Làrach-lìn",
     "Address" : "Seòladh",
     "About" : "Mu dhèidhinn",
-    "Translate" : "Eadar-theangaich",
-    "Help" : "Cobhair"
+    "Translate" : "Eadar-theangaich"
 },
 "nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;");
diff --git a/lib/l10n/gd.json b/lib/l10n/gd.json
index 74dddce2e08..2b2cf5f1813 100644
--- a/lib/l10n/gd.json
+++ b/lib/l10n/gd.json
@@ -12,7 +12,6 @@
     "Website" : "Làrach-lìn",
     "Address" : "Seòladh",
     "About" : "Mu dhèidhinn",
-    "Translate" : "Eadar-theangaich",
-    "Help" : "Cobhair"
+    "Translate" : "Eadar-theangaich"
 },"pluralForm" :"nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;"
 }
\ No newline at end of file
diff --git a/lib/l10n/gl.js b/lib/l10n/gl.js
index 52faaaf45e1..c6fab0ad8aa 100644
--- a/lib/l10n/gl.js
+++ b/lib/l10n/gl.js
@@ -59,6 +59,11 @@ OC.L10N.register(
     "Avatar image is not square" : "A imaxe do avatar non é cadrada",
     "Files" : "Ficheiros",
     "View profile" : "Ver o perfil",
+    "same time" : "ao mesmo tempo",
+    "_%nh_::_%nh_" : ["%nh","%nh"],
+    "_%nm_::_%nm_" : ["%nm","%nm"],
+    "%s ahead" : "%s antes",
+    "%s behind" : "%s após",
     "Local time: %s" : "Hora local: %s",
     "today" : "hoxe",
     "tomorrow" : "mañá",
@@ -81,6 +86,12 @@ OC.L10N.register(
     "seconds ago" : "segundos atrás",
     "Empty file" : "Ficheiro baleiro",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Non existe o módulo co ID: %s. Actíveo nos axustes das aplicacións ou contacte coa administración desta instancia.",
+    "No file conversion providers available" : "Non hai ningún provedor de conversión de ficheiros dispoñíbel",
+    "File is too large to convert" : "O ficheiro é demasiado grande para convertelo",
+    "Destination does not match conversion extension" : "O destino non coincide coa extensión de conversión",
+    "Could not convert file" : "Non foi posíbel converter o ficheiro",
+    "Destination does not exist" : "Non existe ese destino",
+    "Destination is not creatable" : "Non é posíbel crear o destino",
     "Dot files are not allowed" : "Non se admiten os ficheiros con punto",
     "\"%1$s\" is a forbidden file or folder name." : "«%1$s» é un nome de ficheiro ou cartafol prohibido.",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "«%1$s» é un prefixo prohibido para os nomes de ficheiros ou cartafoles.",
@@ -92,6 +103,13 @@ OC.L10N.register(
     "Invalid path" : "A ruta non é correcta.",
     "Failed to create file from template" : "Produciuse un fallo ao crear un ficheiro a partir do modelo",
     "Templates" : "Modelos",
+    "Storage %s cannot be moved" : "Non é posíbel mover o almacenamento %s",
+    "Moving a share (%s) into a shared folder is not allowed" : "Non está permitido mover un recurso compartido (%s) a un cartafol compartido",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Non está permitido mover un almacenamento (%s) a un cartafol compartido",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Non está permitido mover un recurso compartido (%s) cara a outro recurso compartido (%s)",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Non está permitido mover un recurso compartido (%s) cara a outro almacenamento (%s)",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Non está permitido mover un recurso compartido (%s) cara a un recurso compartido (%s)",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Non está permitido mover un almacenamento (%s) cara a outro almacenamento (%s)",
     "Path contains invalid segments" : "A ruta contén segmentos non válidos",
     "Filename is a reserved word" : "O nome de ficheiro é unha palabra reservada",
     "Filename contains at least one invalid character" : "O nome de ficheiro contén algún carácter incorrecto",
@@ -189,9 +207,9 @@ OC.L10N.register(
     "Share does not have a full ID" : "A compartición non ten unha ID completa",
     "Cannot change share type" : "Non é posíbel cambiar o tipo de compartición",
     "Can only update recipient on user shares" : "Só é posíbel actualizar o destinatario nas comparticións por usuarios",
-    "Cannot enable sending the password by Talk with an empty password" : "Non é posíbel activar o envío do contrasinal por Talk cun contrasinal baleiro",
-    "Cannot enable sending the password by Talk without setting a new password" : "Non é posíbel activar o envío do contrasinal por Talk sen definir un novo contrasinal",
-    "Cannot disable sending the password by Talk without setting a new password" : "Non é posíbel desactivar o envío do contrasinal por Talk sen definir un novo contrasinal",
+    "Cannot enable sending the password by Talk with an empty password" : "Non é posíbel activar o envío do contrasinal por Parlar cun contrasinal baleiro",
+    "Cannot enable sending the password by Talk without setting a new password" : "Non é posíbel activar o envío do contrasinal por Parlar sen definir un novo contrasinal",
+    "Cannot disable sending the password by Talk without setting a new password" : "Non é posíbel desactivar o envío do contrasinal por Parlar sen definir un novo contrasinal",
     "Share provider does not support accepting" : "O provedor de comparticións non admite a aceptación",
     "Cannot change target of link share" : "Non é posíbel cambiar o destino da ligazón compartida",
     "Invalid share recipient" : "Destinatario de compartición incorrecto",
@@ -425,41 +443,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Resume o texto reducindo a súa lonxitude sen perder a información clave.",
     "Extracts topics from a text and outputs them separated by commas." : "Extrae temas dun texto e amósaos separados por comas.",
     "Education Edition" : "Edición para educación",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "O usuario que accede debe ser de administración, de subadministración ou ter dereitos especiais para acceder a este axuste",
-    "Logged in user must be an admin or sub admin" : "O usuario que accede debe ser de administración ou de subadministración",
-    "Logged in user must be an admin" : "O usuario que accede debe ser de administración",
     "File name is a reserved word" : "O nome de ficheiro é unha palabra reservada",
     "File name contains at least one invalid character" : "O nome de ficheiro contén algún carácter incorrecto",
     "File name is too long" : "O nome de ficheiro é longo de máis",
-    "Help" : "Axuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Usuario descoñecido",
-    "Enter the database username and name for %s" : "Introduza o nome de usuario da base de datos e o nome para %s",
-    "Enter the database username for %s" : "Introduza o nome de usuario da base de datos para %s",
-    "MySQL username and/or password not valid" : "Nome de usuario e/ou contrasinal de MySQL incorrecto",
-    "Oracle username and/or password not valid" : "O nome de usuario e/ou contrasinal de Oracle é incorrecto",
-    "PostgreSQL username and/or password not valid" : "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto",
-    "Set an admin username." : "Estabeleza un nome de usuario administrador",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s compartiu «%2$s» con Vde. e quere engadir:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s compartiu «%2$s» con Vde. e quere engadir",
     "»%s« added a note to a file shared with you" : "«%s» engadiu unha nota a un ficheiro compartido con Vde.",
     "Open »%s«" : "Abrir «%s»",
-    "Sharing %s failed, because this item is already shared with user %s" : "Fallou a compartición de %s por mor de que este elemento xa foi compartido co usuario %s",
     "%1$s shared »%2$s« with you" : "%1$s compartiu «%2$s» con Vde.",
     "%1$s shared »%2$s« with you." : "%1$s compartiu «%2$s» con Vde.",
     "Click the button below to open it." : "Prema no botón de embaixo para abrilo.",
-    "The username is already being used" : "Este nome de usuario xa está a ser usado",
-    "Could not create user" : "Non foi posíbel crear o usuario",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Só se permiten os seguintes caracteres nun nome de usuario: «a-z», «A-Z», «0-9», espazos e «_.@-'»",
-    "A valid username must be provided" : "Debe fornecer un nome de usuario correcto",
-    "Username contains whitespace at the beginning or at the end" : "O nome de usuario contén un espazo en branco no inicio ou no final",
-    "Username must not consist of dots only" : "O nome de usuario non debe consistir só de puntos",
-    "Username is invalid because files already exist for this user" : "O nome de usuario non é válido porque xa existen ficheiros para este usuario",
-    "User disabled" : "Usuario desactivado",
     "File is currently busy, please try again later" : "O ficheiro está ocupado neste momento, ténteo máis adiante.",
     "Cannot download file" : "Non é posíbel descargar o ficheiro",
-    "Your data directory is readable by other users." : "Outros usuarios poden ler o seu directorio de datos.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Cambie os permisos a 0770 para que o directorio non poida ser listado por outros usuarios.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegúrese de que existe un ficheiro chamado «.ocdata» na raíz do directorio de datos."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/gl.json b/lib/l10n/gl.json
index 15491b98b61..345505142ac 100644
--- a/lib/l10n/gl.json
+++ b/lib/l10n/gl.json
@@ -57,6 +57,11 @@
     "Avatar image is not square" : "A imaxe do avatar non é cadrada",
     "Files" : "Ficheiros",
     "View profile" : "Ver o perfil",
+    "same time" : "ao mesmo tempo",
+    "_%nh_::_%nh_" : ["%nh","%nh"],
+    "_%nm_::_%nm_" : ["%nm","%nm"],
+    "%s ahead" : "%s antes",
+    "%s behind" : "%s após",
     "Local time: %s" : "Hora local: %s",
     "today" : "hoxe",
     "tomorrow" : "mañá",
@@ -79,6 +84,12 @@
     "seconds ago" : "segundos atrás",
     "Empty file" : "Ficheiro baleiro",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Non existe o módulo co ID: %s. Actíveo nos axustes das aplicacións ou contacte coa administración desta instancia.",
+    "No file conversion providers available" : "Non hai ningún provedor de conversión de ficheiros dispoñíbel",
+    "File is too large to convert" : "O ficheiro é demasiado grande para convertelo",
+    "Destination does not match conversion extension" : "O destino non coincide coa extensión de conversión",
+    "Could not convert file" : "Non foi posíbel converter o ficheiro",
+    "Destination does not exist" : "Non existe ese destino",
+    "Destination is not creatable" : "Non é posíbel crear o destino",
     "Dot files are not allowed" : "Non se admiten os ficheiros con punto",
     "\"%1$s\" is a forbidden file or folder name." : "«%1$s» é un nome de ficheiro ou cartafol prohibido.",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "«%1$s» é un prefixo prohibido para os nomes de ficheiros ou cartafoles.",
@@ -90,6 +101,13 @@
     "Invalid path" : "A ruta non é correcta.",
     "Failed to create file from template" : "Produciuse un fallo ao crear un ficheiro a partir do modelo",
     "Templates" : "Modelos",
+    "Storage %s cannot be moved" : "Non é posíbel mover o almacenamento %s",
+    "Moving a share (%s) into a shared folder is not allowed" : "Non está permitido mover un recurso compartido (%s) a un cartafol compartido",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Non está permitido mover un almacenamento (%s) a un cartafol compartido",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Non está permitido mover un recurso compartido (%s) cara a outro recurso compartido (%s)",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Non está permitido mover un recurso compartido (%s) cara a outro almacenamento (%s)",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Non está permitido mover un recurso compartido (%s) cara a un recurso compartido (%s)",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Non está permitido mover un almacenamento (%s) cara a outro almacenamento (%s)",
     "Path contains invalid segments" : "A ruta contén segmentos non válidos",
     "Filename is a reserved word" : "O nome de ficheiro é unha palabra reservada",
     "Filename contains at least one invalid character" : "O nome de ficheiro contén algún carácter incorrecto",
@@ -187,9 +205,9 @@
     "Share does not have a full ID" : "A compartición non ten unha ID completa",
     "Cannot change share type" : "Non é posíbel cambiar o tipo de compartición",
     "Can only update recipient on user shares" : "Só é posíbel actualizar o destinatario nas comparticións por usuarios",
-    "Cannot enable sending the password by Talk with an empty password" : "Non é posíbel activar o envío do contrasinal por Talk cun contrasinal baleiro",
-    "Cannot enable sending the password by Talk without setting a new password" : "Non é posíbel activar o envío do contrasinal por Talk sen definir un novo contrasinal",
-    "Cannot disable sending the password by Talk without setting a new password" : "Non é posíbel desactivar o envío do contrasinal por Talk sen definir un novo contrasinal",
+    "Cannot enable sending the password by Talk with an empty password" : "Non é posíbel activar o envío do contrasinal por Parlar cun contrasinal baleiro",
+    "Cannot enable sending the password by Talk without setting a new password" : "Non é posíbel activar o envío do contrasinal por Parlar sen definir un novo contrasinal",
+    "Cannot disable sending the password by Talk without setting a new password" : "Non é posíbel desactivar o envío do contrasinal por Parlar sen definir un novo contrasinal",
     "Share provider does not support accepting" : "O provedor de comparticións non admite a aceptación",
     "Cannot change target of link share" : "Non é posíbel cambiar o destino da ligazón compartida",
     "Invalid share recipient" : "Destinatario de compartición incorrecto",
@@ -423,41 +441,19 @@
     "Summarizes text by reducing its length without losing key information." : "Resume o texto reducindo a súa lonxitude sen perder a información clave.",
     "Extracts topics from a text and outputs them separated by commas." : "Extrae temas dun texto e amósaos separados por comas.",
     "Education Edition" : "Edición para educación",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "O usuario que accede debe ser de administración, de subadministración ou ter dereitos especiais para acceder a este axuste",
-    "Logged in user must be an admin or sub admin" : "O usuario que accede debe ser de administración ou de subadministración",
-    "Logged in user must be an admin" : "O usuario que accede debe ser de administración",
     "File name is a reserved word" : "O nome de ficheiro é unha palabra reservada",
     "File name contains at least one invalid character" : "O nome de ficheiro contén algún carácter incorrecto",
     "File name is too long" : "O nome de ficheiro é longo de máis",
-    "Help" : "Axuda",
     "Users" : "Usuarios",
-    "Unknown user" : "Usuario descoñecido",
-    "Enter the database username and name for %s" : "Introduza o nome de usuario da base de datos e o nome para %s",
-    "Enter the database username for %s" : "Introduza o nome de usuario da base de datos para %s",
-    "MySQL username and/or password not valid" : "Nome de usuario e/ou contrasinal de MySQL incorrecto",
-    "Oracle username and/or password not valid" : "O nome de usuario e/ou contrasinal de Oracle é incorrecto",
-    "PostgreSQL username and/or password not valid" : "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto",
-    "Set an admin username." : "Estabeleza un nome de usuario administrador",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s compartiu «%2$s» con Vde. e quere engadir:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s compartiu «%2$s» con Vde. e quere engadir",
     "»%s« added a note to a file shared with you" : "«%s» engadiu unha nota a un ficheiro compartido con Vde.",
     "Open »%s«" : "Abrir «%s»",
-    "Sharing %s failed, because this item is already shared with user %s" : "Fallou a compartición de %s por mor de que este elemento xa foi compartido co usuario %s",
     "%1$s shared »%2$s« with you" : "%1$s compartiu «%2$s» con Vde.",
     "%1$s shared »%2$s« with you." : "%1$s compartiu «%2$s» con Vde.",
     "Click the button below to open it." : "Prema no botón de embaixo para abrilo.",
-    "The username is already being used" : "Este nome de usuario xa está a ser usado",
-    "Could not create user" : "Non foi posíbel crear o usuario",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Só se permiten os seguintes caracteres nun nome de usuario: «a-z», «A-Z», «0-9», espazos e «_.@-'»",
-    "A valid username must be provided" : "Debe fornecer un nome de usuario correcto",
-    "Username contains whitespace at the beginning or at the end" : "O nome de usuario contén un espazo en branco no inicio ou no final",
-    "Username must not consist of dots only" : "O nome de usuario non debe consistir só de puntos",
-    "Username is invalid because files already exist for this user" : "O nome de usuario non é válido porque xa existen ficheiros para este usuario",
-    "User disabled" : "Usuario desactivado",
     "File is currently busy, please try again later" : "O ficheiro está ocupado neste momento, ténteo máis adiante.",
     "Cannot download file" : "Non é posíbel descargar o ficheiro",
-    "Your data directory is readable by other users." : "Outros usuarios poden ler o seu directorio de datos.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Cambie os permisos a 0770 para que o directorio non poida ser listado por outros usuarios.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asegúrese de que existe un ficheiro chamado «.ocdata» na raíz do directorio de datos."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/he.js b/lib/l10n/he.js
index 38a84673952..27b5a9ce443 100644
--- a/lib/l10n/he.js
+++ b/lib/l10n/he.js
@@ -25,6 +25,7 @@ OC.L10N.register(
     "Invalid image" : "תמונה לא חוקית",
     "Avatar image is not square" : "התמונה המייצגת אינה מרובעת",
     "Files" : "קבצים",
+    "_%nh_::_%nh_" : ["שעה","שעתיים","%n שע׳"],
     "today" : "היום",
     "tomorrow" : "מחר",
     "yesterday" : "אתמול",
@@ -157,34 +158,18 @@ OC.L10N.register(
     "Translate" : "תרגום",
     "Result" : "תוצאה",
     "Education Edition" : "מהדורה חינוכית",
-    "Logged in user must be an admin" : "על המשתמש שנכנס להיות מנהל",
     "File name is a reserved word" : "שם קובץ הוא מילה שמורה",
     "File name contains at least one invalid character" : "שם הקובץ כולל לפחות תו אחד לא חוקי",
     "File name is too long" : "שם קובץ ארוך מדי",
-    "Help" : "עזרה",
     "Users" : "משתמשים",
-    "Unknown user" : "משתמש לא ידוע",
-    "MySQL username and/or password not valid" : "שם המשתמש ו/או הססמה של MySQL אינם תקינים",
-    "Oracle username and/or password not valid" : "שם משתמש ו/או סיסמת Oracle אינם תקפים",
-    "PostgreSQL username and/or password not valid" : "שם משתמש ו/או סיסמת PostgreSQL אינם תקפים",
-    "Set an admin username." : "קביעת שם משתמש מנהל",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s שיתף » %2$s« איתך, ורוצה להוסיף:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$sשיתף »%2$s« איתך, ורוצה להוסיף:",
     "»%s« added a note to a file shared with you" : "התווספה הערה על קובץ ששותף את על ידי „%s”",
     "Open »%s«" : "פתיחת „%s”",
-    "Sharing %s failed, because this item is already shared with user %s" : "השיתוף %s נכשל, כיוון שהפריט כבר משותף עם משתמש %s",
     "%1$s shared »%2$s« with you" : "%2$s שותף אתך על ידי %1$s",
     "%1$s shared »%2$s« with you." : "„%2$s” שותף אתך על ידי %1$s.",
     "Click the button below to open it." : "יש ללחוץ על הכפתור להלן כדי לפתוח אותו.",
-    "The username is already being used" : "השם משתמש כבר בשימוש",
-    "Could not create user" : "לא ניתן ליצור משתמש",
-    "A valid username must be provided" : "יש לספק שם משתמש תקני",
-    "Username contains whitespace at the beginning or at the end" : "שם המשתמש מכיל רווח בתחילתו או בסופו",
-    "Username must not consist of dots only" : "שם המשתמש לא יכול להיות מורכב מנקודות בלבד",
-    "Username is invalid because files already exist for this user" : "שם המשתמש שגוי כיוון שכבר קיימים קבצים למשתמש הזה",
-    "User disabled" : "משתמש מנוטרל",
     "File is currently busy, please try again later" : "הקובץ בשימוש כרגע, יש לנסות שוב מאוחר יותר",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "יש לשנות את ההרשאות ל- 0770 כך שהתיקייה לא תרשם על ידי משתמשים אחרים.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "נא לוודא שיש קובץ בשם „‎.ocdata” בבסיס תיקיית הנתונים שלך."
 },
 "nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;");
diff --git a/lib/l10n/he.json b/lib/l10n/he.json
index f859292d7b6..0d8a8114298 100644
--- a/lib/l10n/he.json
+++ b/lib/l10n/he.json
@@ -23,6 +23,7 @@
     "Invalid image" : "תמונה לא חוקית",
     "Avatar image is not square" : "התמונה המייצגת אינה מרובעת",
     "Files" : "קבצים",
+    "_%nh_::_%nh_" : ["שעה","שעתיים","%n שע׳"],
     "today" : "היום",
     "tomorrow" : "מחר",
     "yesterday" : "אתמול",
@@ -155,34 +156,18 @@
     "Translate" : "תרגום",
     "Result" : "תוצאה",
     "Education Edition" : "מהדורה חינוכית",
-    "Logged in user must be an admin" : "על המשתמש שנכנס להיות מנהל",
     "File name is a reserved word" : "שם קובץ הוא מילה שמורה",
     "File name contains at least one invalid character" : "שם הקובץ כולל לפחות תו אחד לא חוקי",
     "File name is too long" : "שם קובץ ארוך מדי",
-    "Help" : "עזרה",
     "Users" : "משתמשים",
-    "Unknown user" : "משתמש לא ידוע",
-    "MySQL username and/or password not valid" : "שם המשתמש ו/או הססמה של MySQL אינם תקינים",
-    "Oracle username and/or password not valid" : "שם משתמש ו/או סיסמת Oracle אינם תקפים",
-    "PostgreSQL username and/or password not valid" : "שם משתמש ו/או סיסמת PostgreSQL אינם תקפים",
-    "Set an admin username." : "קביעת שם משתמש מנהל",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s שיתף » %2$s« איתך, ורוצה להוסיף:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$sשיתף »%2$s« איתך, ורוצה להוסיף:",
     "»%s« added a note to a file shared with you" : "התווספה הערה על קובץ ששותף את על ידי „%s”",
     "Open »%s«" : "פתיחת „%s”",
-    "Sharing %s failed, because this item is already shared with user %s" : "השיתוף %s נכשל, כיוון שהפריט כבר משותף עם משתמש %s",
     "%1$s shared »%2$s« with you" : "%2$s שותף אתך על ידי %1$s",
     "%1$s shared »%2$s« with you." : "„%2$s” שותף אתך על ידי %1$s.",
     "Click the button below to open it." : "יש ללחוץ על הכפתור להלן כדי לפתוח אותו.",
-    "The username is already being used" : "השם משתמש כבר בשימוש",
-    "Could not create user" : "לא ניתן ליצור משתמש",
-    "A valid username must be provided" : "יש לספק שם משתמש תקני",
-    "Username contains whitespace at the beginning or at the end" : "שם המשתמש מכיל רווח בתחילתו או בסופו",
-    "Username must not consist of dots only" : "שם המשתמש לא יכול להיות מורכב מנקודות בלבד",
-    "Username is invalid because files already exist for this user" : "שם המשתמש שגוי כיוון שכבר קיימים קבצים למשתמש הזה",
-    "User disabled" : "משתמש מנוטרל",
     "File is currently busy, please try again later" : "הקובץ בשימוש כרגע, יש לנסות שוב מאוחר יותר",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "יש לשנות את ההרשאות ל- 0770 כך שהתיקייה לא תרשם על ידי משתמשים אחרים.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "נא לוודא שיש קובץ בשם „‎.ocdata” בבסיס תיקיית הנתונים שלך."
 },"pluralForm" :"nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/hr.js b/lib/l10n/hr.js
index 5d9d080a2c6..333f62de3a7 100644
--- a/lib/l10n/hr.js
+++ b/lib/l10n/hr.js
@@ -50,6 +50,7 @@ OC.L10N.register(
     "Avatar image is not square" : "Slika avatara nije kvadratna",
     "Files" : "Datoteke",
     "View profile" : "Prikaži profil",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh"],
     "today" : "danas",
     "tomorrow" : "sutra",
     "yesterday" : "jučer",
@@ -201,36 +202,18 @@ OC.L10N.register(
     "Translate" : "Prevedi",
     "Result" : "Rezultat",
     "Education Edition" : "Obrazovno izdanje",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Prijavljeni korisnik mora biti administrator, podadministrator ili imati posebna prava za pristupanje ovoj postavci",
-    "Logged in user must be an admin or sub admin" : "Prijavljeni korisnik mora biti administrator ili podadministrator",
-    "Logged in user must be an admin" : "Korisnik koji je prijavljen mora biti administrator",
     "File name is a reserved word" : "Naziv datoteke je rezervirana riječ",
     "File name contains at least one invalid character" : "Naziv datoteke sadrži barem jedan nevažeći znak",
     "File name is too long" : "Naziv datoteke je predugačak",
-    "Help" : "Pomoć",
     "Users" : "Korisnici",
-    "Unknown user" : "Nepoznat korisnik",
-    "MySQL username and/or password not valid" : "Neispravno korisničko ime i/ili zaporka baze podataka MySQL",
-    "Oracle username and/or password not valid" : "Neispravno korisničko ime i/ili zaporka baze podataka Oracle",
-    "PostgreSQL username and/or password not valid" : "Neispravno korisničko ime i/ili zaporka baze podataka PostgreSQL",
-    "Set an admin username." : "Postavite korisničko ime administratora.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s dijeli »%2$s« s vama i želi dodati:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s dijeli »%2$s« s vama i želi dodati",
     "»%s« added a note to a file shared with you" : "»%s« je dodao bilješku datoteci koju dijeli s vama",
     "Open »%s«" : "Otvori »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Dijeljenje %s nije uspjelo jer je ova stavka već podijeljena s korisnikom %s",
     "%1$s shared »%2$s« with you" : "%1$s dijeli »%2$s« s vama",
     "%1$s shared »%2$s« with you." : "%1$s dijeli »%2$s« s vama.",
     "Click the button below to open it." : "Kliknite gumb u nastavku za otvaranje.",
-    "The username is already being used" : "Korisničko ime se već koristi",
-    "Could not create user" : "Nije moguće stvoriti korisnika",
-    "A valid username must be provided" : "Nužno je navesti ispravno korisničko ime",
-    "Username contains whitespace at the beginning or at the end" : "Korisničko ime sadrži bijeli prostor na početku ili na kraju",
-    "Username must not consist of dots only" : "Korisničko ime ne smije se sastojati samo od točkica",
-    "Username is invalid because files already exist for this user" : "Korisničko ime je nevažeće jer već postoje datoteke za ovog korisnika",
-    "User disabled" : "Korisnik je onemogućen",
     "File is currently busy, please try again later" : "Datoteka je trenutno zauzeta, pokušajte ponovo kasnije",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Promijenite dozvole na 0770 tako da se tim direktorijem ne mogu služiti drugi korisnici.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Provjerite postoji li datoteka pod nazivom „.ocdata” u korijenu podatkovnog direktorija."
 },
 "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");
diff --git a/lib/l10n/hr.json b/lib/l10n/hr.json
index 17923108dee..195649d3a2a 100644
--- a/lib/l10n/hr.json
+++ b/lib/l10n/hr.json
@@ -48,6 +48,7 @@
     "Avatar image is not square" : "Slika avatara nije kvadratna",
     "Files" : "Datoteke",
     "View profile" : "Prikaži profil",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh"],
     "today" : "danas",
     "tomorrow" : "sutra",
     "yesterday" : "jučer",
@@ -199,36 +200,18 @@
     "Translate" : "Prevedi",
     "Result" : "Rezultat",
     "Education Edition" : "Obrazovno izdanje",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Prijavljeni korisnik mora biti administrator, podadministrator ili imati posebna prava za pristupanje ovoj postavci",
-    "Logged in user must be an admin or sub admin" : "Prijavljeni korisnik mora biti administrator ili podadministrator",
-    "Logged in user must be an admin" : "Korisnik koji je prijavljen mora biti administrator",
     "File name is a reserved word" : "Naziv datoteke je rezervirana riječ",
     "File name contains at least one invalid character" : "Naziv datoteke sadrži barem jedan nevažeći znak",
     "File name is too long" : "Naziv datoteke je predugačak",
-    "Help" : "Pomoć",
     "Users" : "Korisnici",
-    "Unknown user" : "Nepoznat korisnik",
-    "MySQL username and/or password not valid" : "Neispravno korisničko ime i/ili zaporka baze podataka MySQL",
-    "Oracle username and/or password not valid" : "Neispravno korisničko ime i/ili zaporka baze podataka Oracle",
-    "PostgreSQL username and/or password not valid" : "Neispravno korisničko ime i/ili zaporka baze podataka PostgreSQL",
-    "Set an admin username." : "Postavite korisničko ime administratora.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s dijeli »%2$s« s vama i želi dodati:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s dijeli »%2$s« s vama i želi dodati",
     "»%s« added a note to a file shared with you" : "»%s« je dodao bilješku datoteci koju dijeli s vama",
     "Open »%s«" : "Otvori »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Dijeljenje %s nije uspjelo jer je ova stavka već podijeljena s korisnikom %s",
     "%1$s shared »%2$s« with you" : "%1$s dijeli »%2$s« s vama",
     "%1$s shared »%2$s« with you." : "%1$s dijeli »%2$s« s vama.",
     "Click the button below to open it." : "Kliknite gumb u nastavku za otvaranje.",
-    "The username is already being used" : "Korisničko ime se već koristi",
-    "Could not create user" : "Nije moguće stvoriti korisnika",
-    "A valid username must be provided" : "Nužno je navesti ispravno korisničko ime",
-    "Username contains whitespace at the beginning or at the end" : "Korisničko ime sadrži bijeli prostor na početku ili na kraju",
-    "Username must not consist of dots only" : "Korisničko ime ne smije se sastojati samo od točkica",
-    "Username is invalid because files already exist for this user" : "Korisničko ime je nevažeće jer već postoje datoteke za ovog korisnika",
-    "User disabled" : "Korisnik je onemogućen",
     "File is currently busy, please try again later" : "Datoteka je trenutno zauzeta, pokušajte ponovo kasnije",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Promijenite dozvole na 0770 tako da se tim direktorijem ne mogu služiti drugi korisnici.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Provjerite postoji li datoteka pod nazivom „.ocdata” u korijenu podatkovnog direktorija."
 },"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/hu.js b/lib/l10n/hu.js
index c0b7be15f50..a188ef99c9b 100644
--- a/lib/l10n/hu.js
+++ b/lib/l10n/hu.js
@@ -53,6 +53,7 @@ OC.L10N.register(
     "Avatar image is not square" : "A profilkép nem négyzetes.",
     "Files" : "Fájlok",
     "View profile" : "Profil megtekintése",
+    "_%nh_::_%nh_" : ["%nó","%nó"],
     "Local time: %s" : "Helyi idő: %s",
     "today" : "ma",
     "tomorrow" : "holnap",
@@ -244,41 +245,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Összesíti a szöveget a hosszúság csökkentésével anélkül, hogy a kulcsinformációk elvesznének.",
     "Extracts topics from a text and outputs them separated by commas." : "Kinyeri a témákat a szövegből, és vesszőkkel elválasztva megjeleníti.",
     "Education Edition" : "Oktatási kiadás",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "A bejelentkezett felhasználónak rendszergazdának vagy alrendszergazdának kell lennie, vagy speciális hozzáféréssel kell rendelkeznie ehhez a beállításhoz",
-    "Logged in user must be an admin or sub admin" : "A bejelentkezett felhasználónak rendszergazdának vagy alrendszergazgának kell lennie",
-    "Logged in user must be an admin" : "A bejelentkezett felhasználónak rendszergazdának kell lennie",
     "File name is a reserved word" : "A fájl neve egy fenntartott szó",
     "File name contains at least one invalid character" : "A fájlnév legalább egy érvénytelen karaktert tartalmaz",
     "File name is too long" : "A fájlnév túl hosszú",
-    "Help" : "Súgó",
     "Users" : "Felhasználók",
-    "Unknown user" : "Ismeretlen felhasználó",
-    "Enter the database username and name for %s" : "Adja meg a %s adatbázisának nevét és a hozzá tartozó felhasználónevet",
-    "Enter the database username for %s" : "Adja meg a %s adatbázisához tartozó felhasználónevet",
-    "MySQL username and/or password not valid" : "A MySQL felhasználónév vagy jelszó érvénytelen",
-    "Oracle username and/or password not valid" : "Az Oracle felhasználónév vagy jelszó érvénytelen",
-    "PostgreSQL username and/or password not valid" : "A PostgreSQL felhasználói név vagy jelszó érvénytelen",
-    "Set an admin username." : "Állítson be egy rendszergazdai felhasználónevet.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s megosztotta Önnel: „%2$s”, és hozzá akarja adni:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s megosztotta Önnel: „%2$s”, és hozzá akarja adni",
     "»%s« added a note to a file shared with you" : "„%s” megjegyzést fűzött az Önnel megosztott fájlhoz",
     "Open »%s«" : "A(z) „%s” megnyitása",
-    "Sharing %s failed, because this item is already shared with user %s" : "A(z) %s megosztása nem sikerült, mert ez az elem már meg van osztva a(z) %s felhasználóval",
     "%1$s shared »%2$s« with you" : "%1$s megosztotta Önnel: „%2$s”",
     "%1$s shared »%2$s« with you." : "%1$s megosztotta Önnel: „%2$s”.",
     "Click the button below to open it." : "Kattintson a lenti gombra a megnyitáshoz.",
-    "The username is already being used" : "Ez a felhasználónév már foglalt",
-    "Could not create user" : "Nem sikerült létrehozni a felhasználót",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "A felhasználónévben csak a következő karakterek engedélyezettek: „a-z”, „A-Z”, „0-9”, szóköz és „_.@-'”",
-    "A valid username must be provided" : "Érvényes felhasználónevet kell megadnia",
-    "Username contains whitespace at the beginning or at the end" : "A felhasználónév szóközt tartalmaz az elején vagy a végén",
-    "Username must not consist of dots only" : "A felhasználónév nem állhat csak pontokból",
-    "Username is invalid because files already exist for this user" : "A felhasználónév érvénytelen, mert már vannak fájlok ehhez a felhasználóhoz",
-    "User disabled" : "Felhasználó letiltva",
     "File is currently busy, please try again later" : "A fájl jelenleg foglalt, próbálja újra később",
     "Cannot download file" : "A fájl nem tölthető le",
-    "Your data directory is readable by other users." : "Az adatkönyvtára más felhasználók által is olvasható.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Módosítsa a könyvtár elérhetőségi engedélybeállítását 0770-re, hogy a tartalmát más felhasználók ne listázhassák.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Győződjön meg róla, hogy az adatmappa gyökerében van-e egy „.ocdata” fájl."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/hu.json b/lib/l10n/hu.json
index 2b1f6843c0d..b522dbbe98f 100644
--- a/lib/l10n/hu.json
+++ b/lib/l10n/hu.json
@@ -51,6 +51,7 @@
     "Avatar image is not square" : "A profilkép nem négyzetes.",
     "Files" : "Fájlok",
     "View profile" : "Profil megtekintése",
+    "_%nh_::_%nh_" : ["%nó","%nó"],
     "Local time: %s" : "Helyi idő: %s",
     "today" : "ma",
     "tomorrow" : "holnap",
@@ -242,41 +243,19 @@
     "Summarizes text by reducing its length without losing key information." : "Összesíti a szöveget a hosszúság csökkentésével anélkül, hogy a kulcsinformációk elvesznének.",
     "Extracts topics from a text and outputs them separated by commas." : "Kinyeri a témákat a szövegből, és vesszőkkel elválasztva megjeleníti.",
     "Education Edition" : "Oktatási kiadás",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "A bejelentkezett felhasználónak rendszergazdának vagy alrendszergazdának kell lennie, vagy speciális hozzáféréssel kell rendelkeznie ehhez a beállításhoz",
-    "Logged in user must be an admin or sub admin" : "A bejelentkezett felhasználónak rendszergazdának vagy alrendszergazgának kell lennie",
-    "Logged in user must be an admin" : "A bejelentkezett felhasználónak rendszergazdának kell lennie",
     "File name is a reserved word" : "A fájl neve egy fenntartott szó",
     "File name contains at least one invalid character" : "A fájlnév legalább egy érvénytelen karaktert tartalmaz",
     "File name is too long" : "A fájlnév túl hosszú",
-    "Help" : "Súgó",
     "Users" : "Felhasználók",
-    "Unknown user" : "Ismeretlen felhasználó",
-    "Enter the database username and name for %s" : "Adja meg a %s adatbázisának nevét és a hozzá tartozó felhasználónevet",
-    "Enter the database username for %s" : "Adja meg a %s adatbázisához tartozó felhasználónevet",
-    "MySQL username and/or password not valid" : "A MySQL felhasználónév vagy jelszó érvénytelen",
-    "Oracle username and/or password not valid" : "Az Oracle felhasználónév vagy jelszó érvénytelen",
-    "PostgreSQL username and/or password not valid" : "A PostgreSQL felhasználói név vagy jelszó érvénytelen",
-    "Set an admin username." : "Állítson be egy rendszergazdai felhasználónevet.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s megosztotta Önnel: „%2$s”, és hozzá akarja adni:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s megosztotta Önnel: „%2$s”, és hozzá akarja adni",
     "»%s« added a note to a file shared with you" : "„%s” megjegyzést fűzött az Önnel megosztott fájlhoz",
     "Open »%s«" : "A(z) „%s” megnyitása",
-    "Sharing %s failed, because this item is already shared with user %s" : "A(z) %s megosztása nem sikerült, mert ez az elem már meg van osztva a(z) %s felhasználóval",
     "%1$s shared »%2$s« with you" : "%1$s megosztotta Önnel: „%2$s”",
     "%1$s shared »%2$s« with you." : "%1$s megosztotta Önnel: „%2$s”.",
     "Click the button below to open it." : "Kattintson a lenti gombra a megnyitáshoz.",
-    "The username is already being used" : "Ez a felhasználónév már foglalt",
-    "Could not create user" : "Nem sikerült létrehozni a felhasználót",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "A felhasználónévben csak a következő karakterek engedélyezettek: „a-z”, „A-Z”, „0-9”, szóköz és „_.@-'”",
-    "A valid username must be provided" : "Érvényes felhasználónevet kell megadnia",
-    "Username contains whitespace at the beginning or at the end" : "A felhasználónév szóközt tartalmaz az elején vagy a végén",
-    "Username must not consist of dots only" : "A felhasználónév nem állhat csak pontokból",
-    "Username is invalid because files already exist for this user" : "A felhasználónév érvénytelen, mert már vannak fájlok ehhez a felhasználóhoz",
-    "User disabled" : "Felhasználó letiltva",
     "File is currently busy, please try again later" : "A fájl jelenleg foglalt, próbálja újra később",
     "Cannot download file" : "A fájl nem tölthető le",
-    "Your data directory is readable by other users." : "Az adatkönyvtára más felhasználók által is olvasható.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Módosítsa a könyvtár elérhetőségi engedélybeállítását 0770-re, hogy a tartalmát más felhasználók ne listázhassák.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Győződjön meg róla, hogy az adatmappa gyökerében van-e egy „.ocdata” fájl."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/hy.js b/lib/l10n/hy.js
index 6ec5f1da3d8..03eec156fb5 100644
--- a/lib/l10n/hy.js
+++ b/lib/l10n/hy.js
@@ -58,7 +58,6 @@ OC.L10N.register(
     "Nov." : "Նոյ.",
     "Dec." : "Դեկ.",
     "Translate" : "Թարգմանել",
-    "File name contains at least one invalid character" : "Ֆայլի անունը առնվազն մի անվավեր նիշ է պարունակում",
-    "Help" : "Օգնություն"
+    "File name contains at least one invalid character" : "Ֆայլի անունը առնվազն մի անվավեր նիշ է պարունակում"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/hy.json b/lib/l10n/hy.json
index 4ac64665170..24bf5ae146b 100644
--- a/lib/l10n/hy.json
+++ b/lib/l10n/hy.json
@@ -56,7 +56,6 @@
     "Nov." : "Նոյ.",
     "Dec." : "Դեկ.",
     "Translate" : "Թարգմանել",
-    "File name contains at least one invalid character" : "Ֆայլի անունը առնվազն մի անվավեր նիշ է պարունակում",
-    "Help" : "Օգնություն"
+    "File name contains at least one invalid character" : "Ֆայլի անունը առնվազն մի անվավեր նիշ է պարունակում"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/ia.js b/lib/l10n/ia.js
index 96c3497f2a9..f5bd981b64f 100644
--- a/lib/l10n/ia.js
+++ b/lib/l10n/ia.js
@@ -65,9 +65,6 @@ OC.L10N.register(
     "Authentication error" : "Error in authentication",
     "Storage is temporarily not available" : "Immagazinage es provisorimente non disponibile",
     "Summary" : "Summario",
-    "Help" : "Adjuta",
-    "Users" : "Usatores",
-    "Unknown user" : "Usator incognite",
-    "A valid username must be provided" : "Un nomine de usator valide debe esser providite"
+    "Users" : "Usatores"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/ia.json b/lib/l10n/ia.json
index 6b535386f7a..e9513320161 100644
--- a/lib/l10n/ia.json
+++ b/lib/l10n/ia.json
@@ -63,9 +63,6 @@
     "Authentication error" : "Error in authentication",
     "Storage is temporarily not available" : "Immagazinage es provisorimente non disponibile",
     "Summary" : "Summario",
-    "Help" : "Adjuta",
-    "Users" : "Usatores",
-    "Unknown user" : "Usator incognite",
-    "A valid username must be provided" : "Un nomine de usator valide debe esser providite"
+    "Users" : "Usatores"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/id.js b/lib/l10n/id.js
index 0682605a8c1..3f15160c053 100644
--- a/lib/l10n/id.js
+++ b/lib/l10n/id.js
@@ -134,19 +134,8 @@ OC.L10N.register(
     "File name is a reserved word" : "Nama berkas merupakan kata yang disediakan",
     "File name contains at least one invalid character" : "Nama berkas berisi setidaknya satu karakter yang tidak sah.",
     "File name is too long" : "Nama berkas terlalu panjang",
-    "Help" : "Bantuan",
     "Users" : "Pengguna",
-    "Unknown user" : "Pengguna tidak dikenal",
-    "Oracle username and/or password not valid" : "Nama pengguna dan/atau kata sandi Oracle tidak sah",
-    "PostgreSQL username and/or password not valid" : "Nama pengguna dan/atau kata sandi PostgreSQL tidak valid",
-    "Set an admin username." : "Tetapkan nama pengguna admin.",
     "Open »%s«" : "Buka »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Berbagi %s gagal karena item ini sudah dibagikan dengan pengguna %s",
-    "The username is already being used" : "Nama pengguna ini telah digunakan",
-    "A valid username must be provided" : "Tuliskan nama pengguna yang valid",
-    "Username contains whitespace at the beginning or at the end" : "Nama pengguna mengandung spasi di depan atau di belakang.",
-    "User disabled" : "Pengguna dinonaktifkan",
-    "File is currently busy, please try again later" : "Berkas sedang sibuk, mohon coba lagi nanti",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Mohon ubah perizinan menjadi 0770 sehingga direktori tersebut tidak dapat dilihat oleh pengguna lain."
+    "File is currently busy, please try again later" : "Berkas sedang sibuk, mohon coba lagi nanti"
 },
 "nplurals=1; plural=0;");
diff --git a/lib/l10n/id.json b/lib/l10n/id.json
index 9fdeb950bee..cfe23c25fb3 100644
--- a/lib/l10n/id.json
+++ b/lib/l10n/id.json
@@ -132,19 +132,8 @@
     "File name is a reserved word" : "Nama berkas merupakan kata yang disediakan",
     "File name contains at least one invalid character" : "Nama berkas berisi setidaknya satu karakter yang tidak sah.",
     "File name is too long" : "Nama berkas terlalu panjang",
-    "Help" : "Bantuan",
     "Users" : "Pengguna",
-    "Unknown user" : "Pengguna tidak dikenal",
-    "Oracle username and/or password not valid" : "Nama pengguna dan/atau kata sandi Oracle tidak sah",
-    "PostgreSQL username and/or password not valid" : "Nama pengguna dan/atau kata sandi PostgreSQL tidak valid",
-    "Set an admin username." : "Tetapkan nama pengguna admin.",
     "Open »%s«" : "Buka »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Berbagi %s gagal karena item ini sudah dibagikan dengan pengguna %s",
-    "The username is already being used" : "Nama pengguna ini telah digunakan",
-    "A valid username must be provided" : "Tuliskan nama pengguna yang valid",
-    "Username contains whitespace at the beginning or at the end" : "Nama pengguna mengandung spasi di depan atau di belakang.",
-    "User disabled" : "Pengguna dinonaktifkan",
-    "File is currently busy, please try again later" : "Berkas sedang sibuk, mohon coba lagi nanti",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Mohon ubah perizinan menjadi 0770 sehingga direktori tersebut tidak dapat dilihat oleh pengguna lain."
+    "File is currently busy, please try again later" : "Berkas sedang sibuk, mohon coba lagi nanti"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/lib/l10n/is.js b/lib/l10n/is.js
index f2a6084f639..8033b673a07 100644
--- a/lib/l10n/is.js
+++ b/lib/l10n/is.js
@@ -19,9 +19,11 @@ OC.L10N.register(
     "%1$s, %2$s and %3$s" : "%1$s, %2$s og %3$s",
     "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s og %4$s",
     "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s og %5$s",
+    "Education bundle" : "Kennsluvöndull",
     "Enterprise bundle" : "Fyrirtækjavöndull",
     "Groupware bundle" : "Hópvinnsluvöndull",
-    "Hub bundle" : "Tengivöndull",
+    "Hub bundle" : "Miðstöðvarvöndull",
+    "Public sector bundle" : "Vöndull fyrir opinbera þjónustu",
     "Social sharing bundle" : "Deilivöndull fyrir samfélagsmiðla",
     "PHP %s or higher is required." : "Krafist er PHP %s eða hærra.",
     "PHP with a version lower than %s is required." : "Krafist er PHP útgáfu %s eða lægri.",
@@ -35,6 +37,9 @@ OC.L10N.register(
     "The following platforms are supported: %s" : "Eftirfarandi stýrikerfi eru studd: %s",
     "Server version %s or higher is required." : "Krafist er þjóns af útgáfu %s eða hærra.",
     "Server version %s or lower is required." : "Krafist er þjóns af útgáfu %s eða lægri.",
+    "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Innskráður notandi verður að vera kerfisstjóri eða undirstjórnandi eða hafa fengið sérstaka aðgangsheimild fyrir þessa stillingu",
+    "Logged in account must be an admin or sub admin" : "Innskráður notandi verður að vera kerfisstjóri eða undirstjórnandi",
+    "Logged in account must be an admin" : "Innskráður notandi verður að vera stjórnandi",
     "Wiping of device %s has started" : "Útþurrkun af tækinu %s er byrjuð",
     "Wiping of device »%s« has started" : "Útþurrkun af tækinu »%s« er byrjuð",
     "»%s« started remote wipe" : "»%s« byrjaði fjartengda útþurrkun",
@@ -53,6 +58,11 @@ OC.L10N.register(
     "Avatar image is not square" : "Auðkennismynd er ekki ferningslaga",
     "Files" : "Skrár",
     "View profile" : "Skoða notandasnið",
+    "same time" : "sami tími",
+    "_%nh_::_%nh_" : ["%nklst","%nklst"],
+    "_%nm_::_%nm_" : ["%nm","%nm"],
+    "%s ahead" : "%s á undan",
+    "%s behind" : "%s á eftir",
     "Local time: %s" : "Staðartími: %s",
     "today" : "í dag",
     "tomorrow" : "á morgun",
@@ -76,16 +86,19 @@ OC.L10N.register(
     "Empty file" : "Tóm skrá",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Eining með auðkenni: %s er ekki til. Virkjaðu hana í forritastillingum eða hafðu samband við kerfisstjóra.",
     "Dot files are not allowed" : "Skrár með punkti eru ekki leyfðar",
+    "Filenames must not end with \"%1$s\"." : "Skráaheiti mega ekki enda á \"%1$s\".",
     "File already exists" : "Skrá er þegar til",
     "Invalid path" : "Ógild slóð",
     "Failed to create file from template" : "Mistókst að búa til skrá út frá sniðmáti",
     "Templates" : "Sniðmát",
     "Filename contains at least one invalid character" : "Skráarheitið inniheldur að minnsta kosti einn ógildan staf",
+    "Filename is too long" : "Skráarheiti er of langt",
     "Empty filename is not allowed" : "Autt skráarheiti er ekki leyft.",
     "App \"%s\" cannot be installed because appinfo file cannot be read." : "Ekki er hægt að setja upp \"%s\" forritið vegna þess að ekki var hægt að lesa appinfo-skrána.",
     "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Ekki var hægt að setja upp forritið \"%s\" vegna þess að það er ekki samhæft þessari útgáfu vefþjónsins.",
     "__language_name__" : "Íslenska",
     "This is an automatically sent email, please do not reply." : "Þetta er sjálfvirk tölvupóstsending, ekki svara þessu.",
+    "Help & privacy" : "Aðstoð og gagnaleynd",
     "Appearance and accessibility" : "Útlit og aðgengi",
     "Apps" : "Forrit",
     "Personal settings" : "Persónulegar stillingar",
@@ -110,7 +123,9 @@ OC.L10N.register(
     "Headline" : "Fyrirsögn",
     "Organisation" : "Stofnun/Félag/Fyrirtæki",
     "Role" : "Role",
-    "Additional settings" : "Valfrjálsar stillingar",
+    "Pronouns" : "Fornöfn",
+    "Unknown account" : "Óþekktur aðgangur",
+    "Additional settings" : "Aukastillingar",
     "Enter the database name for %s" : "Settu inn nafn á gagnagrunni fyrir %s",
     "You cannot use dots in the database name %s" : "Þú mátt ekki nota punkta í gagnagrunnsheitinu %s",
     "You need to enter details of an existing account." : "Þú verður að setja inn auðkenni fyrirliggjandi notandaaðgangs.",
@@ -124,7 +139,12 @@ OC.L10N.register(
     "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Deilingarbakendinn %s verður að vera settur upp fyrir viðmótið OCP\\Share_Backend",
     "Sharing backend %s not found" : "Deilingarbakendinn %s fannst ekki",
     "Sharing backend for %s not found" : "Deilingarbakendi fyrir %s fannst ekki",
+    "%1$s shared %2$s with you" : "%1$s deildi %2$s með þér",
+    "Open %s" : "Opna %s",
     "%1$s via %2$s" : "%1$s með %2$s",
+    "%1$s shared %2$s with you and wants to add:" : "%1$s deildi %2$s með þér og vill bæta við:",
+    "%1$s shared %2$s with you and wants to add" : "%1$s deildi %2$s með þér og vill bæta við",
+    "%s added a note to a file shared with you" : "%s bætti minnispunkti við skrá sem deilt er með þér",
     "Unknown share type" : "Óþekkt tegund sameignar",
     "You are not allowed to share %s" : "Þú hefur ekki heimild til að deila %s",
     "Cannot increase permissions of %s" : "Get ekki aukið aðgangsheimildir %s",
@@ -133,6 +153,7 @@ OC.L10N.register(
     "Expiration date is in the past" : "Gildistíminn er þegar runninn út",
     "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Ekki er hægt að setja lokadagsetningu meira en %n dag fram í tímann","Ekki er hægt að setja lokadagsetningu meira en %n daga fram í tímann"],
     "Sharing is only allowed with group members" : "Deiling er aðeins leyfð með meðlimum hópsins",
+    "Sharing is disabled" : "Deiling er óvirk",
     "The requested share does not exist anymore" : "Umbeðin sameign er ekki lengur til",
     "The requested share comes from a disabled user" : "Umbeðin sameign kemur frá notanda sem er óvirkur",
     "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Notandinn var ekki búinn til þar sem takmörkum á fjölda notenda var náð. Skoðaðu tilkynningarnar þínar til að sjá meira.",
@@ -227,6 +248,7 @@ OC.L10N.register(
     "Storage connection error. %s" : "Villa í tengingu við gagnageymslu. %s",
     "Storage is temporarily not available" : "Gagnageymsla ekki tiltæk í augnablikinu",
     "Storage connection timeout. %s" : "Gagnageymsla féll á tíma. %s",
+    "Confirmation" : "Staðfesting",
     "Generates a possible headline for a text." : "Útbýr mögulega fyrirsögn fyrir texta.",
     "Text" : "Texti",
     "Summarize" : "Gera samantekt",
@@ -241,41 +263,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Tekur saman aðalatriði texta með því að stytta hann án þess að tapa mikilvægustu upplýsingum.",
     "Extracts topics from a text and outputs them separated by commas." : "Greinir efnisflokka úr texta og aðskilur þá með kommum.",
     "Education Edition" : "Kennsluútgáfa",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Innskráður notandi verður að vera kerfisstjóri eða undirstjórnandi eða hafa fengið sérstaka aðgangsheimild fyrir þessa stillingu",
-    "Logged in user must be an admin or sub admin" : "Innskráður notandi verður að vera kerfisstjóri eða undirstjórnandi",
-    "Logged in user must be an admin" : "Innskráður notandi verður að vera stjórnandi",
     "File name is a reserved word" : "Skráarheiti er þegar frátekið orð",
     "File name contains at least one invalid character" : "Skráarheitið inniheldur að minnsta kosti einn ógildan staf",
     "File name is too long" : "Skráarheiti er of langt",
-    "Help" : "Hjálp",
     "Users" : "Notendur",
-    "Unknown user" : "Óþekktur notandi",
-    "Enter the database username and name for %s" : "Settu inn notandanafn og nafn í gagnagrunni fyrir %s",
-    "Enter the database username for %s" : "Settu inn notandanafn í gagnagrunni fyrir %s",
-    "MySQL username and/or password not valid" : "Notandanafn eða lykilorð MySQL er ekki gilt",
-    "Oracle username and/or password not valid" : "Notandanafn eða lykilorð Oracle er ekki gilt",
-    "PostgreSQL username and/or password not valid" : "Notandanafn eða lykilorð PostgreSQL er ekki gilt",
-    "Set an admin username." : "Stilltu notandanafn kerfisstjóra.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s deildi »%2$s« með þér og vill bæta við:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s deildi »%2$s« með þér og vill bæta við",
     "»%s« added a note to a file shared with you" : "»%s« bætti minnispunkti við skrá sem deilt er með þér",
     "Open »%s«" : "Opna »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Deiling %s mistókst, því þessu atriði er þegar deilt með notandanum %s",
     "%1$s shared »%2$s« with you" : "%1$s deildi »%2$s« með þér",
     "%1$s shared »%2$s« with you." : "%1$s deildi »%2$s« með þér.",
     "Click the button below to open it." : "Smelltu á hnappinn hér fyrir neðan til að opna það.",
-    "The username is already being used" : "Notandanafnið er þegar í notkun",
-    "Could not create user" : "Gat ekki búið til notanda",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Einungis eru leyfilegir eftirfarandi stafir í notandanafni: \"a-z\", \"A-Z\", \"0-9\", bil og \"_.@-'\"",
-    "A valid username must be provided" : "Skráðu inn gilt notandanafn",
-    "Username contains whitespace at the beginning or at the end" : "Notandanafnið inniheldur orðabil í upphafi eða enda",
-    "Username must not consist of dots only" : "Notandanafn má ekki einungis samanstanda af punktum",
-    "Username is invalid because files already exist for this user" : "Notandanafnið er ógilt vegna þess að þegar eru fyrir hendi skrár sem tilheyra þessum notanda",
-    "User disabled" : "Notandi óvirkur",
     "File is currently busy, please try again later" : "Skráin er upptekin í augnablikinu, reyndu aftur síðar",
     "Cannot download file" : "Get ekki sótt skrá",
-    "Your data directory is readable by other users." : "Gagnamappn þín er lesanleg fyrir aðra notendur.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Endilega breyttu heimildunum í 0770 svo að aðrir notendur geti ekki listað upp innihald hennar.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Gakktu úr skugga um að til staðar sé skrá með heitinu \".ocdata\" í rót gagnageymslunnar."
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/lib/l10n/is.json b/lib/l10n/is.json
index dbd095603c6..5c7c555c77e 100644
--- a/lib/l10n/is.json
+++ b/lib/l10n/is.json
@@ -17,9 +17,11 @@
     "%1$s, %2$s and %3$s" : "%1$s, %2$s og %3$s",
     "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s og %4$s",
     "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s og %5$s",
+    "Education bundle" : "Kennsluvöndull",
     "Enterprise bundle" : "Fyrirtækjavöndull",
     "Groupware bundle" : "Hópvinnsluvöndull",
-    "Hub bundle" : "Tengivöndull",
+    "Hub bundle" : "Miðstöðvarvöndull",
+    "Public sector bundle" : "Vöndull fyrir opinbera þjónustu",
     "Social sharing bundle" : "Deilivöndull fyrir samfélagsmiðla",
     "PHP %s or higher is required." : "Krafist er PHP %s eða hærra.",
     "PHP with a version lower than %s is required." : "Krafist er PHP útgáfu %s eða lægri.",
@@ -33,6 +35,9 @@
     "The following platforms are supported: %s" : "Eftirfarandi stýrikerfi eru studd: %s",
     "Server version %s or higher is required." : "Krafist er þjóns af útgáfu %s eða hærra.",
     "Server version %s or lower is required." : "Krafist er þjóns af útgáfu %s eða lægri.",
+    "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Innskráður notandi verður að vera kerfisstjóri eða undirstjórnandi eða hafa fengið sérstaka aðgangsheimild fyrir þessa stillingu",
+    "Logged in account must be an admin or sub admin" : "Innskráður notandi verður að vera kerfisstjóri eða undirstjórnandi",
+    "Logged in account must be an admin" : "Innskráður notandi verður að vera stjórnandi",
     "Wiping of device %s has started" : "Útþurrkun af tækinu %s er byrjuð",
     "Wiping of device »%s« has started" : "Útþurrkun af tækinu »%s« er byrjuð",
     "»%s« started remote wipe" : "»%s« byrjaði fjartengda útþurrkun",
@@ -51,6 +56,11 @@
     "Avatar image is not square" : "Auðkennismynd er ekki ferningslaga",
     "Files" : "Skrár",
     "View profile" : "Skoða notandasnið",
+    "same time" : "sami tími",
+    "_%nh_::_%nh_" : ["%nklst","%nklst"],
+    "_%nm_::_%nm_" : ["%nm","%nm"],
+    "%s ahead" : "%s á undan",
+    "%s behind" : "%s á eftir",
     "Local time: %s" : "Staðartími: %s",
     "today" : "í dag",
     "tomorrow" : "á morgun",
@@ -74,16 +84,19 @@
     "Empty file" : "Tóm skrá",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Eining með auðkenni: %s er ekki til. Virkjaðu hana í forritastillingum eða hafðu samband við kerfisstjóra.",
     "Dot files are not allowed" : "Skrár með punkti eru ekki leyfðar",
+    "Filenames must not end with \"%1$s\"." : "Skráaheiti mega ekki enda á \"%1$s\".",
     "File already exists" : "Skrá er þegar til",
     "Invalid path" : "Ógild slóð",
     "Failed to create file from template" : "Mistókst að búa til skrá út frá sniðmáti",
     "Templates" : "Sniðmát",
     "Filename contains at least one invalid character" : "Skráarheitið inniheldur að minnsta kosti einn ógildan staf",
+    "Filename is too long" : "Skráarheiti er of langt",
     "Empty filename is not allowed" : "Autt skráarheiti er ekki leyft.",
     "App \"%s\" cannot be installed because appinfo file cannot be read." : "Ekki er hægt að setja upp \"%s\" forritið vegna þess að ekki var hægt að lesa appinfo-skrána.",
     "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Ekki var hægt að setja upp forritið \"%s\" vegna þess að það er ekki samhæft þessari útgáfu vefþjónsins.",
     "__language_name__" : "Íslenska",
     "This is an automatically sent email, please do not reply." : "Þetta er sjálfvirk tölvupóstsending, ekki svara þessu.",
+    "Help & privacy" : "Aðstoð og gagnaleynd",
     "Appearance and accessibility" : "Útlit og aðgengi",
     "Apps" : "Forrit",
     "Personal settings" : "Persónulegar stillingar",
@@ -108,7 +121,9 @@
     "Headline" : "Fyrirsögn",
     "Organisation" : "Stofnun/Félag/Fyrirtæki",
     "Role" : "Role",
-    "Additional settings" : "Valfrjálsar stillingar",
+    "Pronouns" : "Fornöfn",
+    "Unknown account" : "Óþekktur aðgangur",
+    "Additional settings" : "Aukastillingar",
     "Enter the database name for %s" : "Settu inn nafn á gagnagrunni fyrir %s",
     "You cannot use dots in the database name %s" : "Þú mátt ekki nota punkta í gagnagrunnsheitinu %s",
     "You need to enter details of an existing account." : "Þú verður að setja inn auðkenni fyrirliggjandi notandaaðgangs.",
@@ -122,7 +137,12 @@
     "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Deilingarbakendinn %s verður að vera settur upp fyrir viðmótið OCP\\Share_Backend",
     "Sharing backend %s not found" : "Deilingarbakendinn %s fannst ekki",
     "Sharing backend for %s not found" : "Deilingarbakendi fyrir %s fannst ekki",
+    "%1$s shared %2$s with you" : "%1$s deildi %2$s með þér",
+    "Open %s" : "Opna %s",
     "%1$s via %2$s" : "%1$s með %2$s",
+    "%1$s shared %2$s with you and wants to add:" : "%1$s deildi %2$s með þér og vill bæta við:",
+    "%1$s shared %2$s with you and wants to add" : "%1$s deildi %2$s með þér og vill bæta við",
+    "%s added a note to a file shared with you" : "%s bætti minnispunkti við skrá sem deilt er með þér",
     "Unknown share type" : "Óþekkt tegund sameignar",
     "You are not allowed to share %s" : "Þú hefur ekki heimild til að deila %s",
     "Cannot increase permissions of %s" : "Get ekki aukið aðgangsheimildir %s",
@@ -131,6 +151,7 @@
     "Expiration date is in the past" : "Gildistíminn er þegar runninn út",
     "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Ekki er hægt að setja lokadagsetningu meira en %n dag fram í tímann","Ekki er hægt að setja lokadagsetningu meira en %n daga fram í tímann"],
     "Sharing is only allowed with group members" : "Deiling er aðeins leyfð með meðlimum hópsins",
+    "Sharing is disabled" : "Deiling er óvirk",
     "The requested share does not exist anymore" : "Umbeðin sameign er ekki lengur til",
     "The requested share comes from a disabled user" : "Umbeðin sameign kemur frá notanda sem er óvirkur",
     "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Notandinn var ekki búinn til þar sem takmörkum á fjölda notenda var náð. Skoðaðu tilkynningarnar þínar til að sjá meira.",
@@ -225,6 +246,7 @@
     "Storage connection error. %s" : "Villa í tengingu við gagnageymslu. %s",
     "Storage is temporarily not available" : "Gagnageymsla ekki tiltæk í augnablikinu",
     "Storage connection timeout. %s" : "Gagnageymsla féll á tíma. %s",
+    "Confirmation" : "Staðfesting",
     "Generates a possible headline for a text." : "Útbýr mögulega fyrirsögn fyrir texta.",
     "Text" : "Texti",
     "Summarize" : "Gera samantekt",
@@ -239,41 +261,19 @@
     "Summarizes text by reducing its length without losing key information." : "Tekur saman aðalatriði texta með því að stytta hann án þess að tapa mikilvægustu upplýsingum.",
     "Extracts topics from a text and outputs them separated by commas." : "Greinir efnisflokka úr texta og aðskilur þá með kommum.",
     "Education Edition" : "Kennsluútgáfa",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Innskráður notandi verður að vera kerfisstjóri eða undirstjórnandi eða hafa fengið sérstaka aðgangsheimild fyrir þessa stillingu",
-    "Logged in user must be an admin or sub admin" : "Innskráður notandi verður að vera kerfisstjóri eða undirstjórnandi",
-    "Logged in user must be an admin" : "Innskráður notandi verður að vera stjórnandi",
     "File name is a reserved word" : "Skráarheiti er þegar frátekið orð",
     "File name contains at least one invalid character" : "Skráarheitið inniheldur að minnsta kosti einn ógildan staf",
     "File name is too long" : "Skráarheiti er of langt",
-    "Help" : "Hjálp",
     "Users" : "Notendur",
-    "Unknown user" : "Óþekktur notandi",
-    "Enter the database username and name for %s" : "Settu inn notandanafn og nafn í gagnagrunni fyrir %s",
-    "Enter the database username for %s" : "Settu inn notandanafn í gagnagrunni fyrir %s",
-    "MySQL username and/or password not valid" : "Notandanafn eða lykilorð MySQL er ekki gilt",
-    "Oracle username and/or password not valid" : "Notandanafn eða lykilorð Oracle er ekki gilt",
-    "PostgreSQL username and/or password not valid" : "Notandanafn eða lykilorð PostgreSQL er ekki gilt",
-    "Set an admin username." : "Stilltu notandanafn kerfisstjóra.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s deildi »%2$s« með þér og vill bæta við:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s deildi »%2$s« með þér og vill bæta við",
     "»%s« added a note to a file shared with you" : "»%s« bætti minnispunkti við skrá sem deilt er með þér",
     "Open »%s«" : "Opna »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Deiling %s mistókst, því þessu atriði er þegar deilt með notandanum %s",
     "%1$s shared »%2$s« with you" : "%1$s deildi »%2$s« með þér",
     "%1$s shared »%2$s« with you." : "%1$s deildi »%2$s« með þér.",
     "Click the button below to open it." : "Smelltu á hnappinn hér fyrir neðan til að opna það.",
-    "The username is already being used" : "Notandanafnið er þegar í notkun",
-    "Could not create user" : "Gat ekki búið til notanda",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Einungis eru leyfilegir eftirfarandi stafir í notandanafni: \"a-z\", \"A-Z\", \"0-9\", bil og \"_.@-'\"",
-    "A valid username must be provided" : "Skráðu inn gilt notandanafn",
-    "Username contains whitespace at the beginning or at the end" : "Notandanafnið inniheldur orðabil í upphafi eða enda",
-    "Username must not consist of dots only" : "Notandanafn má ekki einungis samanstanda af punktum",
-    "Username is invalid because files already exist for this user" : "Notandanafnið er ógilt vegna þess að þegar eru fyrir hendi skrár sem tilheyra þessum notanda",
-    "User disabled" : "Notandi óvirkur",
     "File is currently busy, please try again later" : "Skráin er upptekin í augnablikinu, reyndu aftur síðar",
     "Cannot download file" : "Get ekki sótt skrá",
-    "Your data directory is readable by other users." : "Gagnamappn þín er lesanleg fyrir aðra notendur.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Endilega breyttu heimildunum í 0770 svo að aðrir notendur geti ekki listað upp innihald hennar.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Gakktu úr skugga um að til staðar sé skrá með heitinu \".ocdata\" í rót gagnageymslunnar."
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/lib/l10n/it.js b/lib/l10n/it.js
index ec34dccbc64..1fcdff74887 100644
--- a/lib/l10n/it.js
+++ b/lib/l10n/it.js
@@ -53,6 +53,7 @@ OC.L10N.register(
     "Avatar image is not square" : "L'immagine personale non è quadrata",
     "Files" : "File",
     "View profile" : "Vedi profilo",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh"],
     "Local time: %s" : "Ora locale: %s",
     "today" : "oggi",
     "tomorrow" : "domani",
@@ -256,41 +257,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Riassume il testo riducendone la lunghezza senza perdere le informazioni chiave.",
     "Extracts topics from a text and outputs them separated by commas." : "Estrae gli argomenti da un testo e li elenca separati da virgole.",
     "Education Edition" : "Edizione didattica",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "L'utente connesso deve essere un admin, un sub admin o avere il permesso di accedere a questa impostazione",
-    "Logged in user must be an admin or sub admin" : "L'utente che ha eseguito l'accesso deve essere un amministratore o sub-amministratore",
-    "Logged in user must be an admin" : "L'utente che ha eseguito l'accesso deve essere un amministratore ",
     "File name is a reserved word" : "Il nome del file è una parola riservata",
     "File name contains at least one invalid character" : "Il nome del file contiene almeno un carattere non valido",
     "File name is too long" : "Il nome del file è troppo lungo",
-    "Help" : "Aiuto",
     "Users" : "Utenti",
-    "Unknown user" : "Utente sconosciuto",
-    "Enter the database username and name for %s" : "Inserisci il nome utente del database e il nome per %s",
-    "Enter the database username for %s" : "Inserisci il nome utente del database per %s",
-    "MySQL username and/or password not valid" : "Nome utente e/o password di MySQL non validi",
-    "Oracle username and/or password not valid" : "Nome utente e/o password di Oracle non validi",
-    "PostgreSQL username and/or password not valid" : "Nome utente e/o password di PostgreSQL non validi",
-    "Set an admin username." : "Imposta un nome utente di amministrazione.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s ha condiviso «%2$s» con te e vuole aggiungere:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s ha condiviso «%2$s» con te e vuole aggiungere",
     "»%s« added a note to a file shared with you" : "«%s» ha aggiunto una nota a un file condiviso con te",
     "Open »%s«" : "Apri «%s»",
-    "Sharing %s failed, because this item is already shared with user %s" : "Condivisione di %s non riuscita, poiché l'oggetto è già condiviso con l'utente %s",
     "%1$s shared »%2$s« with you" : "%1$s ha condiviso «%2$s» con te",
     "%1$s shared »%2$s« with you." : "%1$s ha condiviso «%2$s» con te.",
     "Click the button below to open it." : "Fai clic sul pulsante sotto per aprirlo.",
-    "The username is already being used" : "Il nome utente è già utilizzato",
-    "Could not create user" : "Impossibile creare l'utente",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Solo i seguenti caratteri sono consentiti in un nome utente: \"a-z\", \"A-Z\", \"0-9\", spazi e \"_.@-'\"",
-    "A valid username must be provided" : "Deve essere fornito un nome utente valido",
-    "Username contains whitespace at the beginning or at the end" : "Il nome utente contiene spazi all'inizio o alla fine",
-    "Username must not consist of dots only" : "Il nome utente non può consistere di soli punti",
-    "Username is invalid because files already exist for this user" : "Il nome utente non è valido poiché esiste già per questo utente",
-    "User disabled" : "Utente disabilitato",
     "File is currently busy, please try again later" : "Il file è attualmente occupato, riprova più tardi",
     "Cannot download file" : "Impossibile scaricare il file",
-    "Your data directory is readable by other users." : "La cartella dei dati è leggibile dagli altri utenti.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Modifica i permessi in 0770 in modo tale che la cartella non sia leggibile dagli altri utenti.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Assicurati che ci sia un file \".ocdata\" nella radice della cartella data."
 },
 "nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/it.json b/lib/l10n/it.json
index e3c6123567a..03f1073c467 100644
--- a/lib/l10n/it.json
+++ b/lib/l10n/it.json
@@ -51,6 +51,7 @@
     "Avatar image is not square" : "L'immagine personale non è quadrata",
     "Files" : "File",
     "View profile" : "Vedi profilo",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh"],
     "Local time: %s" : "Ora locale: %s",
     "today" : "oggi",
     "tomorrow" : "domani",
@@ -254,41 +255,19 @@
     "Summarizes text by reducing its length without losing key information." : "Riassume il testo riducendone la lunghezza senza perdere le informazioni chiave.",
     "Extracts topics from a text and outputs them separated by commas." : "Estrae gli argomenti da un testo e li elenca separati da virgole.",
     "Education Edition" : "Edizione didattica",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "L'utente connesso deve essere un admin, un sub admin o avere il permesso di accedere a questa impostazione",
-    "Logged in user must be an admin or sub admin" : "L'utente che ha eseguito l'accesso deve essere un amministratore o sub-amministratore",
-    "Logged in user must be an admin" : "L'utente che ha eseguito l'accesso deve essere un amministratore ",
     "File name is a reserved word" : "Il nome del file è una parola riservata",
     "File name contains at least one invalid character" : "Il nome del file contiene almeno un carattere non valido",
     "File name is too long" : "Il nome del file è troppo lungo",
-    "Help" : "Aiuto",
     "Users" : "Utenti",
-    "Unknown user" : "Utente sconosciuto",
-    "Enter the database username and name for %s" : "Inserisci il nome utente del database e il nome per %s",
-    "Enter the database username for %s" : "Inserisci il nome utente del database per %s",
-    "MySQL username and/or password not valid" : "Nome utente e/o password di MySQL non validi",
-    "Oracle username and/or password not valid" : "Nome utente e/o password di Oracle non validi",
-    "PostgreSQL username and/or password not valid" : "Nome utente e/o password di PostgreSQL non validi",
-    "Set an admin username." : "Imposta un nome utente di amministrazione.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s ha condiviso «%2$s» con te e vuole aggiungere:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s ha condiviso «%2$s» con te e vuole aggiungere",
     "»%s« added a note to a file shared with you" : "«%s» ha aggiunto una nota a un file condiviso con te",
     "Open »%s«" : "Apri «%s»",
-    "Sharing %s failed, because this item is already shared with user %s" : "Condivisione di %s non riuscita, poiché l'oggetto è già condiviso con l'utente %s",
     "%1$s shared »%2$s« with you" : "%1$s ha condiviso «%2$s» con te",
     "%1$s shared »%2$s« with you." : "%1$s ha condiviso «%2$s» con te.",
     "Click the button below to open it." : "Fai clic sul pulsante sotto per aprirlo.",
-    "The username is already being used" : "Il nome utente è già utilizzato",
-    "Could not create user" : "Impossibile creare l'utente",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Solo i seguenti caratteri sono consentiti in un nome utente: \"a-z\", \"A-Z\", \"0-9\", spazi e \"_.@-'\"",
-    "A valid username must be provided" : "Deve essere fornito un nome utente valido",
-    "Username contains whitespace at the beginning or at the end" : "Il nome utente contiene spazi all'inizio o alla fine",
-    "Username must not consist of dots only" : "Il nome utente non può consistere di soli punti",
-    "Username is invalid because files already exist for this user" : "Il nome utente non è valido poiché esiste già per questo utente",
-    "User disabled" : "Utente disabilitato",
     "File is currently busy, please try again later" : "Il file è attualmente occupato, riprova più tardi",
     "Cannot download file" : "Impossibile scaricare il file",
-    "Your data directory is readable by other users." : "La cartella dei dati è leggibile dagli altri utenti.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Modifica i permessi in 0770 in modo tale che la cartella non sia leggibile dagli altri utenti.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Assicurati che ci sia un file \".ocdata\" nella radice della cartella data."
 },"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/ja.js b/lib/l10n/ja.js
index 4573f7e0b33..7515d73048b 100644
--- a/lib/l10n/ja.js
+++ b/lib/l10n/ja.js
@@ -59,6 +59,7 @@ OC.L10N.register(
     "Avatar image is not square" : "アバター画像が正方形ではありません",
     "Files" : "ファイル",
     "View profile" : "プロフィールを表示",
+    "_%nh_::_%nh_" : ["%n時間"],
     "Local time: %s" : "現地時間: %s",
     "today" : "今日",
     "tomorrow" : "明日",
@@ -92,6 +93,13 @@ OC.L10N.register(
     "Invalid path" : "パスが無効",
     "Failed to create file from template" : "テンプレートからファイルを作成できませんでした",
     "Templates" : "テンプレート",
+    "Storage %s cannot be moved" : "ストレージ%sは移動できません",
+    "Moving a share (%s) into a shared folder is not allowed" : "共有(%s)を共有フォルダに移動することは許可されていません",
+    "Moving a storage (%s) into a shared folder is not allowed" : "ストレージ(%s)を共有フォルダに移動することは許可されていません",
+    "Moving a share (%s) into another share (%s) is not allowed" : "共有 (%s) を別の共有 (%s) に移動することは許可されていません",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "共有(%s)を別のストレージ(%s)に移動することは許可されていません",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "ストレージ(%s)を共有(%s)に移動することは許可されていません",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "ストレージ(%s)を別のストレージ(%s)に移動することは許可されていません。",
     "Path contains invalid segments" : "パスに無効なセグメントが含まれています",
     "Filename is a reserved word" : "ファイル名が予約された単語です",
     "Filename contains at least one invalid character" : "ファイル名に使用できない文字が含まれています",
@@ -425,41 +433,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "重要な情報を失わずにテキストの長さを要約して短縮する。",
     "Extracts topics from a text and outputs them separated by commas." : "テキストからトピックを抽出し、カンマ区切りで出力します。",
     "Education Edition" : "教育向けエディション",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "この設定にアクセスするには、ログインしたユーザーが管理者、サブ管理者、または特別な権利が必要です。",
-    "Logged in user must be an admin or sub admin" : "ログインユーザーは管理者またはサブ管理者である必要があります",
-    "Logged in user must be an admin" : "ログインユーザーは管理者である必要があります",
     "File name is a reserved word" : "ファイル名が予約された単語です",
     "File name contains at least one invalid character" : "ファイル名に1文字以上の無効な文字が含まれています",
     "File name is too long" : "ファイル名が長すぎます",
-    "Help" : "ヘルプ",
     "Users" : "ユーザー",
-    "Unknown user" : "不明なユーザー",
-    "Enter the database username and name for %s" : "%sのデータベース名とユーザー名を入力してください",
-    "Enter the database username for %s" : "%sのデータベースのユーザー名を指定してください",
-    "MySQL username and/or password not valid" : "MySQLのユーザー名またはパスワードが有効ではありません",
-    "Oracle username and/or password not valid" : "Oracleのユーザー名またはパスワードが有効ではありません",
-    "PostgreSQL username and/or password not valid" : "PostgreSQLのユーザー名またはパスワードが有効ではありません",
-    "Set an admin username." : "管理者のユーザー名を設定",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s さんが »%2$s« にノートを追加しました。",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s shared »%2$s« with you and wants to add",
     "»%s« added a note to a file shared with you" : "»%s« があなたと共有しているファイルにノートを追加しました。 ",
     "Open »%s«" : "»%s«を開く",
-    "Sharing %s failed, because this item is already shared with user %s" : "このアイテム%sはすでにユーザー%sと共有されているため、共有に失敗しました",
     "%1$s shared »%2$s« with you" : "%1$s は »%2$s« をあなたと共有しました",
     "%1$s shared »%2$s« with you." : "%1$sが あなたと »%2$s« を共有しました。",
     "Click the button below to open it." : "開くには下のボタンをクリック",
-    "The username is already being used" : "このユーザー名はすでに使われています",
-    "Could not create user" : "ユーザーを作成できませんでした",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "ユーザー名で利用できる文字列： \"a-z\", \"A-Z\", \"0-9\", スペース, \"_.@-\"",
-    "A valid username must be provided" : "有効なユーザー名を指定する必要があります",
-    "Username contains whitespace at the beginning or at the end" : "ユーザー名の最初か最後に空白が含まれています",
-    "Username must not consist of dots only" : "ユーザー名に、ドットのみはつけられません",
-    "Username is invalid because files already exist for this user" : "このユーザーのファイルが既に存在するため、このユーザー名は使用できません",
-    "User disabled" : "ユーザーは無効です",
     "File is currently busy, please try again later" : "現在ファイルはビジーです。後でもう一度試してください。",
     "Cannot download file" : "ファイルをダウンロードできません",
-    "Your data directory is readable by other users." : "データディレクトリは他のユーザーからも読み取ることができます",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "ディレクトリが他のユーザーから見えないように、パーミッションを 0770 に変更してください。",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "データディレクトリの直下に \".ocdata\" ファイルがあるのを確認してください。"
 },
 "nplurals=1; plural=0;");
diff --git a/lib/l10n/ja.json b/lib/l10n/ja.json
index b2ee6efbcbf..95b8f409f1e 100644
--- a/lib/l10n/ja.json
+++ b/lib/l10n/ja.json
@@ -57,6 +57,7 @@
     "Avatar image is not square" : "アバター画像が正方形ではありません",
     "Files" : "ファイル",
     "View profile" : "プロフィールを表示",
+    "_%nh_::_%nh_" : ["%n時間"],
     "Local time: %s" : "現地時間: %s",
     "today" : "今日",
     "tomorrow" : "明日",
@@ -90,6 +91,13 @@
     "Invalid path" : "パスが無効",
     "Failed to create file from template" : "テンプレートからファイルを作成できませんでした",
     "Templates" : "テンプレート",
+    "Storage %s cannot be moved" : "ストレージ%sは移動できません",
+    "Moving a share (%s) into a shared folder is not allowed" : "共有(%s)を共有フォルダに移動することは許可されていません",
+    "Moving a storage (%s) into a shared folder is not allowed" : "ストレージ(%s)を共有フォルダに移動することは許可されていません",
+    "Moving a share (%s) into another share (%s) is not allowed" : "共有 (%s) を別の共有 (%s) に移動することは許可されていません",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "共有(%s)を別のストレージ(%s)に移動することは許可されていません",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "ストレージ(%s)を共有(%s)に移動することは許可されていません",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "ストレージ(%s)を別のストレージ(%s)に移動することは許可されていません。",
     "Path contains invalid segments" : "パスに無効なセグメントが含まれています",
     "Filename is a reserved word" : "ファイル名が予約された単語です",
     "Filename contains at least one invalid character" : "ファイル名に使用できない文字が含まれています",
@@ -423,41 +431,19 @@
     "Summarizes text by reducing its length without losing key information." : "重要な情報を失わずにテキストの長さを要約して短縮する。",
     "Extracts topics from a text and outputs them separated by commas." : "テキストからトピックを抽出し、カンマ区切りで出力します。",
     "Education Edition" : "教育向けエディション",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "この設定にアクセスするには、ログインしたユーザーが管理者、サブ管理者、または特別な権利が必要です。",
-    "Logged in user must be an admin or sub admin" : "ログインユーザーは管理者またはサブ管理者である必要があります",
-    "Logged in user must be an admin" : "ログインユーザーは管理者である必要があります",
     "File name is a reserved word" : "ファイル名が予約された単語です",
     "File name contains at least one invalid character" : "ファイル名に1文字以上の無効な文字が含まれています",
     "File name is too long" : "ファイル名が長すぎます",
-    "Help" : "ヘルプ",
     "Users" : "ユーザー",
-    "Unknown user" : "不明なユーザー",
-    "Enter the database username and name for %s" : "%sのデータベース名とユーザー名を入力してください",
-    "Enter the database username for %s" : "%sのデータベースのユーザー名を指定してください",
-    "MySQL username and/or password not valid" : "MySQLのユーザー名またはパスワードが有効ではありません",
-    "Oracle username and/or password not valid" : "Oracleのユーザー名またはパスワードが有効ではありません",
-    "PostgreSQL username and/or password not valid" : "PostgreSQLのユーザー名またはパスワードが有効ではありません",
-    "Set an admin username." : "管理者のユーザー名を設定",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s さんが »%2$s« にノートを追加しました。",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s shared »%2$s« with you and wants to add",
     "»%s« added a note to a file shared with you" : "»%s« があなたと共有しているファイルにノートを追加しました。 ",
     "Open »%s«" : "»%s«を開く",
-    "Sharing %s failed, because this item is already shared with user %s" : "このアイテム%sはすでにユーザー%sと共有されているため、共有に失敗しました",
     "%1$s shared »%2$s« with you" : "%1$s は »%2$s« をあなたと共有しました",
     "%1$s shared »%2$s« with you." : "%1$sが あなたと »%2$s« を共有しました。",
     "Click the button below to open it." : "開くには下のボタンをクリック",
-    "The username is already being used" : "このユーザー名はすでに使われています",
-    "Could not create user" : "ユーザーを作成できませんでした",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "ユーザー名で利用できる文字列： \"a-z\", \"A-Z\", \"0-9\", スペース, \"_.@-\"",
-    "A valid username must be provided" : "有効なユーザー名を指定する必要があります",
-    "Username contains whitespace at the beginning or at the end" : "ユーザー名の最初か最後に空白が含まれています",
-    "Username must not consist of dots only" : "ユーザー名に、ドットのみはつけられません",
-    "Username is invalid because files already exist for this user" : "このユーザーのファイルが既に存在するため、このユーザー名は使用できません",
-    "User disabled" : "ユーザーは無効です",
     "File is currently busy, please try again later" : "現在ファイルはビジーです。後でもう一度試してください。",
     "Cannot download file" : "ファイルをダウンロードできません",
-    "Your data directory is readable by other users." : "データディレクトリは他のユーザーからも読み取ることができます",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "ディレクトリが他のユーザーから見えないように、パーミッションを 0770 に変更してください。",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "データディレクトリの直下に \".ocdata\" ファイルがあるのを確認してください。"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/lib/l10n/ka.js b/lib/l10n/ka.js
index 72563c4f453..463d548829e 100644
--- a/lib/l10n/ka.js
+++ b/lib/l10n/ka.js
@@ -241,41 +241,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Summarizes text by reducing its length without losing key information.",
     "Extracts topics from a text and outputs them separated by commas." : "Extracts topics from a text and outputs them separated by commas.",
     "Education Edition" : "Education Edition",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Logged in user must be an admin, a sub admin or gotten special right to access this setting",
-    "Logged in user must be an admin or sub admin" : "Logged in user must be an admin or sub admin",
-    "Logged in user must be an admin" : "Logged in user must be an admin",
     "File name is a reserved word" : "File name is a reserved word",
     "File name contains at least one invalid character" : "File name contains at least one invalid character",
     "File name is too long" : "File name is too long",
-    "Help" : "Help",
     "Users" : "Users",
-    "Unknown user" : "Unknown user",
-    "Enter the database username and name for %s" : "Enter the database username and name for %s",
-    "Enter the database username for %s" : "Enter the database username for %s",
-    "MySQL username and/or password not valid" : "MySQL username and/or password not valid",
-    "Oracle username and/or password not valid" : "Oracle username and/or password not valid",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL username and/or password not valid",
-    "Set an admin username." : "Set an admin username.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s shared »%2$s« with you and wants to add:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s shared »%2$s« with you and wants to add",
     "»%s« added a note to a file shared with you" : "»%s« added a note to a file shared with you",
     "Open »%s«" : "Open »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Sharing %s failed, because this item is already shared with user %s",
     "%1$s shared »%2$s« with you" : "%1$s shared »%2$s« with you",
     "%1$s shared »%2$s« with you." : "%1$s shared »%2$s« with you.",
     "Click the button below to open it." : "Click the button below to open it.",
-    "The username is already being used" : "The username is already being used",
-    "Could not create user" : "Could not create user",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"",
-    "A valid username must be provided" : "A valid username must be provided",
-    "Username contains whitespace at the beginning or at the end" : "Username contains whitespace at the beginning or at the end",
-    "Username must not consist of dots only" : "Username must not consist of dots only",
-    "Username is invalid because files already exist for this user" : "Username is invalid because files already exist for this user",
-    "User disabled" : "User disabled",
     "File is currently busy, please try again later" : "File is currently busy, please try again later",
     "Cannot download file" : "Cannot download file",
-    "Your data directory is readable by other users." : "Your data directory is readable by other users.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Please change the permissions to 0770 so that the directory cannot be listed by other users.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Ensure there is a file called \".ocdata\" in the root of the data directory."
 },
 "nplurals=2; plural=(n!=1);");
diff --git a/lib/l10n/ka.json b/lib/l10n/ka.json
index 6451fc458c9..467c6f26988 100644
--- a/lib/l10n/ka.json
+++ b/lib/l10n/ka.json
@@ -239,41 +239,19 @@
     "Summarizes text by reducing its length without losing key information." : "Summarizes text by reducing its length without losing key information.",
     "Extracts topics from a text and outputs them separated by commas." : "Extracts topics from a text and outputs them separated by commas.",
     "Education Edition" : "Education Edition",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Logged in user must be an admin, a sub admin or gotten special right to access this setting",
-    "Logged in user must be an admin or sub admin" : "Logged in user must be an admin or sub admin",
-    "Logged in user must be an admin" : "Logged in user must be an admin",
     "File name is a reserved word" : "File name is a reserved word",
     "File name contains at least one invalid character" : "File name contains at least one invalid character",
     "File name is too long" : "File name is too long",
-    "Help" : "Help",
     "Users" : "Users",
-    "Unknown user" : "Unknown user",
-    "Enter the database username and name for %s" : "Enter the database username and name for %s",
-    "Enter the database username for %s" : "Enter the database username for %s",
-    "MySQL username and/or password not valid" : "MySQL username and/or password not valid",
-    "Oracle username and/or password not valid" : "Oracle username and/or password not valid",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL username and/or password not valid",
-    "Set an admin username." : "Set an admin username.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s shared »%2$s« with you and wants to add:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s shared »%2$s« with you and wants to add",
     "»%s« added a note to a file shared with you" : "»%s« added a note to a file shared with you",
     "Open »%s«" : "Open »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Sharing %s failed, because this item is already shared with user %s",
     "%1$s shared »%2$s« with you" : "%1$s shared »%2$s« with you",
     "%1$s shared »%2$s« with you." : "%1$s shared »%2$s« with you.",
     "Click the button below to open it." : "Click the button below to open it.",
-    "The username is already being used" : "The username is already being used",
-    "Could not create user" : "Could not create user",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"",
-    "A valid username must be provided" : "A valid username must be provided",
-    "Username contains whitespace at the beginning or at the end" : "Username contains whitespace at the beginning or at the end",
-    "Username must not consist of dots only" : "Username must not consist of dots only",
-    "Username is invalid because files already exist for this user" : "Username is invalid because files already exist for this user",
-    "User disabled" : "User disabled",
     "File is currently busy, please try again later" : "File is currently busy, please try again later",
     "Cannot download file" : "Cannot download file",
-    "Your data directory is readable by other users." : "Your data directory is readable by other users.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Please change the permissions to 0770 so that the directory cannot be listed by other users.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Ensure there is a file called \".ocdata\" in the root of the data directory."
 },"pluralForm" :"nplurals=2; plural=(n!=1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/ka_GE.js b/lib/l10n/ka_GE.js
index 2cb2910a711..36ecc421579 100644
--- a/lib/l10n/ka_GE.js
+++ b/lib/l10n/ka_GE.js
@@ -151,27 +151,13 @@ OC.L10N.register(
     "Translate" : "გადათარგმნეთ",
     "Result" : "შედეგი",
     "Education Edition" : "საგანმანათლებლო გამოცემა",
-    "Logged in user must be an admin" : "ავტორიზირებული მომხმარებელი უნდა იყოს ადმინისტრატორი",
     "File name is a reserved word" : "ფაილის სახელი რეზერვირებული სიტყვაა",
     "File name contains at least one invalid character" : "ფაილის სახელი მოიცავს დაუშვებელ სიმბოლოს",
     "File name is too long" : "ფაილის სახელი ზედმეტად გრძელია",
-    "Help" : "დახმარება",
     "Users" : "მომხმარებლები",
-    "Unknown user" : "ამოუცნობი მომხმარებელი",
-    "Oracle username and/or password not valid" : "Oracle მომხმარებლის სახელი და/ან პაროლი არ არის სწორი",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL მომხმარებლის სახელი და/ან პაროლი არ არის სწორი",
-    "Set an admin username." : "დააყენეთ ადმინისტრატორის სახელი.",
     "Open »%s«" : "გახნსნა »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "%s-ის გაზიარება არ მოხერხდა, რადგან ობიექტი მომხმარებელ %s-თან უკვე გაზიარებულია",
     "Click the button below to open it." : "გასახსნელად დააჭირეთ ქვემოთ მყოფ ღილაკს.",
-    "The username is already being used" : "ესეთი მომხმარებლის სახელი უკვე არსებობს",
-    "Could not create user" : "მომხმარებლის შექმნა ვერ მოხერხდა",
-    "A valid username must be provided" : "უნდა მიუთითოთ არსებული მომხმარებლის სახელი",
-    "Username contains whitespace at the beginning or at the end" : "მომხმარებლის სახელი დასაწყისსში ან დასასრულში მოიცავს სიცარიელეს",
-    "Username must not consist of dots only" : "მომხმარებლის სახელი ვერ იქნება შემდგარი მხოლოდ წერტილებისგან",
-    "User disabled" : "მომხმარებელი გათიშულია",
     "File is currently busy, please try again later" : "ფაილი ამჟამად დაკავებულია, გთხოვთ მოგვიანებით სცადოთ ახლიდან",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "გთხოვთ შეცვალოთ უფლებები 0770-ზე, რათა დირექტორია სხვა მომხმარებლების მიერ აღარ იყოს კითხვადი.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "დარწმუნდით რომ ფაილი სახელად \".ocdata\" მონაცემების დირექტორიის საწყისშია."
 },
 "nplurals=2; plural=(n!=1);");
diff --git a/lib/l10n/ka_GE.json b/lib/l10n/ka_GE.json
index f426c810bd3..f69375fec61 100644
--- a/lib/l10n/ka_GE.json
+++ b/lib/l10n/ka_GE.json
@@ -149,27 +149,13 @@
     "Translate" : "გადათარგმნეთ",
     "Result" : "შედეგი",
     "Education Edition" : "საგანმანათლებლო გამოცემა",
-    "Logged in user must be an admin" : "ავტორიზირებული მომხმარებელი უნდა იყოს ადმინისტრატორი",
     "File name is a reserved word" : "ფაილის სახელი რეზერვირებული სიტყვაა",
     "File name contains at least one invalid character" : "ფაილის სახელი მოიცავს დაუშვებელ სიმბოლოს",
     "File name is too long" : "ფაილის სახელი ზედმეტად გრძელია",
-    "Help" : "დახმარება",
     "Users" : "მომხმარებლები",
-    "Unknown user" : "ამოუცნობი მომხმარებელი",
-    "Oracle username and/or password not valid" : "Oracle მომხმარებლის სახელი და/ან პაროლი არ არის სწორი",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL მომხმარებლის სახელი და/ან პაროლი არ არის სწორი",
-    "Set an admin username." : "დააყენეთ ადმინისტრატორის სახელი.",
     "Open »%s«" : "გახნსნა »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "%s-ის გაზიარება არ მოხერხდა, რადგან ობიექტი მომხმარებელ %s-თან უკვე გაზიარებულია",
     "Click the button below to open it." : "გასახსნელად დააჭირეთ ქვემოთ მყოფ ღილაკს.",
-    "The username is already being used" : "ესეთი მომხმარებლის სახელი უკვე არსებობს",
-    "Could not create user" : "მომხმარებლის შექმნა ვერ მოხერხდა",
-    "A valid username must be provided" : "უნდა მიუთითოთ არსებული მომხმარებლის სახელი",
-    "Username contains whitespace at the beginning or at the end" : "მომხმარებლის სახელი დასაწყისსში ან დასასრულში მოიცავს სიცარიელეს",
-    "Username must not consist of dots only" : "მომხმარებლის სახელი ვერ იქნება შემდგარი მხოლოდ წერტილებისგან",
-    "User disabled" : "მომხმარებელი გათიშულია",
     "File is currently busy, please try again later" : "ფაილი ამჟამად დაკავებულია, გთხოვთ მოგვიანებით სცადოთ ახლიდან",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "გთხოვთ შეცვალოთ უფლებები 0770-ზე, რათა დირექტორია სხვა მომხმარებლების მიერ აღარ იყოს კითხვადი.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "დარწმუნდით რომ ფაილი სახელად \".ocdata\" მონაცემების დირექტორიის საწყისშია."
 },"pluralForm" :"nplurals=2; plural=(n!=1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/kab.js b/lib/l10n/kab.js
index 3f910bbf965..fa7d5300223 100644
--- a/lib/l10n/kab.js
+++ b/lib/l10n/kab.js
@@ -13,7 +13,6 @@ OC.L10N.register(
     "Address" : "Adresse",
     "About" : "Γef",
     "Translate" : "Suqel",
-    "Help" : "Tallalt",
     "Users" : "Iseqdacen"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/kab.json b/lib/l10n/kab.json
index d121f39e512..d34c0f8ed40 100644
--- a/lib/l10n/kab.json
+++ b/lib/l10n/kab.json
@@ -11,7 +11,6 @@
     "Address" : "Adresse",
     "About" : "Γef",
     "Translate" : "Suqel",
-    "Help" : "Tallalt",
     "Users" : "Iseqdacen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/km.js b/lib/l10n/km.js
index 11aa3537f19..05d9e5c1ff0 100644
--- a/lib/l10n/km.js
+++ b/lib/l10n/km.js
@@ -64,11 +64,6 @@ OC.L10N.register(
     "A valid password must be provided" : "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
     "Application is not enabled" : "មិន​បាន​បើក​កម្មវិធី",
     "Authentication error" : "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ",
-    "Help" : "ជំនួយ",
-    "Users" : "អ្នកប្រើ",
-    "Unknown user" : "មិនស្គាល់អ្នកប្រើប្រាស់",
-    "PostgreSQL username and/or password not valid" : "ឈ្មោះ​អ្នក​ប្រើ និង/ឬ ពាក្យ​សម្ងាត់ PostgreSQL គឺ​មិន​ត្រូវ​ទេ",
-    "Set an admin username." : "កំណត់​ឈ្មោះ​អ្នក​គ្រប់គ្រង។",
-    "A valid username must be provided" : "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ"
+    "Users" : "អ្នកប្រើ"
 },
 "nplurals=1; plural=0;");
diff --git a/lib/l10n/km.json b/lib/l10n/km.json
index 4b85eb8ad64..0f311106bf0 100644
--- a/lib/l10n/km.json
+++ b/lib/l10n/km.json
@@ -62,11 +62,6 @@
     "A valid password must be provided" : "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
     "Application is not enabled" : "មិន​បាន​បើក​កម្មវិធី",
     "Authentication error" : "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ",
-    "Help" : "ជំនួយ",
-    "Users" : "អ្នកប្រើ",
-    "Unknown user" : "មិនស្គាល់អ្នកប្រើប្រាស់",
-    "PostgreSQL username and/or password not valid" : "ឈ្មោះ​អ្នក​ប្រើ និង/ឬ ពាក្យ​សម្ងាត់ PostgreSQL គឺ​មិន​ត្រូវ​ទេ",
-    "Set an admin username." : "កំណត់​ឈ្មោះ​អ្នក​គ្រប់គ្រង។",
-    "A valid username must be provided" : "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ"
+    "Users" : "អ្នកប្រើ"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/lib/l10n/kn.js b/lib/l10n/kn.js
index 490ea65483e..f3e2c7dd050 100644
--- a/lib/l10n/kn.js
+++ b/lib/l10n/kn.js
@@ -31,8 +31,6 @@ OC.L10N.register(
     "December" : "ಡಿಸೆಂಬರ್",
     "A valid password must be provided" : "ಸರಿಯಾದ ಬಳಕೆದಾರ ಗುಪ್ತಪದ ಒದಗಿಸಬೇಕಾಗಿದೆ",
     "Authentication error" : "ದೃಢೀಕರಣ ದೋಷ",
-    "Help" : "ಸಹಾಯ",
-    "Users" : "ಬಳಕೆದಾರರು",
-    "A valid username must be provided" : "ಮಾನ್ಯ ಬಳಕೆದಾರ ಹೆಸರು ಒದಗಿಸಬೇಕಾಗುತ್ತದೆ"
+    "Users" : "ಬಳಕೆದಾರರು"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/lib/l10n/kn.json b/lib/l10n/kn.json
index e7ac74ebf4f..ef0e81d6b6f 100644
--- a/lib/l10n/kn.json
+++ b/lib/l10n/kn.json
@@ -29,8 +29,6 @@
     "December" : "ಡಿಸೆಂಬರ್",
     "A valid password must be provided" : "ಸರಿಯಾದ ಬಳಕೆದಾರ ಗುಪ್ತಪದ ಒದಗಿಸಬೇಕಾಗಿದೆ",
     "Authentication error" : "ದೃಢೀಕರಣ ದೋಷ",
-    "Help" : "ಸಹಾಯ",
-    "Users" : "ಬಳಕೆದಾರರು",
-    "A valid username must be provided" : "ಮಾನ್ಯ ಬಳಕೆದಾರ ಹೆಸರು ಒದಗಿಸಬೇಕಾಗುತ್ತದೆ"
+    "Users" : "ಬಳಕೆದಾರರು"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/ko.js b/lib/l10n/ko.js
index 1427e616be5..acfb47a54d0 100644
--- a/lib/l10n/ko.js
+++ b/lib/l10n/ko.js
@@ -253,41 +253,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "중요 정보로 내용을 축약하십시오.",
     "Extracts topics from a text and outputs them separated by commas." : "내용에서 주요 주제를 추출하고 쉼표로 이를 구분하십시오.",
     "Education Edition" : "교육용 에디션",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "로그인된 사용자가 관리자, 부 관리자, 또는 이 설정에 접근할 수 있는 권한을 부여받은 사용자일 것입니다.",
-    "Logged in user must be an admin or sub admin" : "로그인한 사용자는 관리자 또는 부 관리자여야 합니다.",
-    "Logged in user must be an admin" : "로그인한 사용자는 관리자여야 합니다.",
     "File name is a reserved word" : "파일 이름이 예약된 단어임",
     "File name contains at least one invalid character" : "파일 이름에 잘못된 글자가 한 자 이상 있음",
     "File name is too long" : "파일 이름이 너무 김",
-    "Help" : "도움말",
     "Users" : "사용자",
-    "Unknown user" : "알려지지 않은 사용자",
-    "Enter the database username and name for %s" : "%s에 대한 데이터베이스 사용자 이름과 이름을 입력하십시오",
-    "Enter the database username for %s" : "%s에 대한 데이터베이스 사용자 이름을 입력하십시오",
-    "MySQL username and/or password not valid" : "MySQL 사용자 이름 또는 암호가 잘못되었습니다",
-    "Oracle username and/or password not valid" : "Oracle 사용자 이름이나 암호가 잘못되었습니다.",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL 사용자 이름 또는 암호가 잘못되었습니다",
-    "Set an admin username." : "관리자의 사용자 이름을 설정합니다.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s님이 %2$s을(를) 당신과 공유하며, 다음을 추가하고자 함:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s님이 %2$s을(를) 당신과 공유하며 다음을 추가하고자 함",
     "»%s« added a note to a file shared with you" : "%s님이 당신과 공유한 파일에 메모를 추가함",
     "Open »%s«" : "%s 열기",
-    "Sharing %s failed, because this item is already shared with user %s" : "%s을(를) 공유할 수 없습니다. 이 항목을 이미 %s 님과 공유하고 있습니다",
     "%1$s shared »%2$s« with you" : "%1$s 님이 »%2$s« 항목을 공유했습니다",
     "%1$s shared »%2$s« with you." : "%1$s 님이 »%2$s« 항목을 공유했습니다",
     "Click the button below to open it." : "아래 단추를 눌러서 열 수 있습니다.",
-    "The username is already being used" : "사용자 이름이 이미 존재합니다",
-    "Could not create user" : "사용자를 만들 수 없습니다",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "사용자 이름에는 다음 문자만 사용할 수 있습니다: \"a-z, \"A-Z\", \"0-9\", 공백, \"_.@-'\"",
-    "A valid username must be provided" : "올바른 사용자 이름을 입력해야 합니다",
-    "Username contains whitespace at the beginning or at the end" : "사용자 이름의 시작이나 끝에 공백이 있습니다",
-    "Username must not consist of dots only" : "사용자 이름에 마침표만 있으면 안 됩니다",
-    "Username is invalid because files already exist for this user" : "무효한 사용자이름. 이미 존재함",
-    "User disabled" : "사용자 비활성화됨",
     "File is currently busy, please try again later" : "파일이 현재 사용 중, 나중에 다시 시도하십시오",
     "Cannot download file" : "파일을 다운로드할 수 없음",
-    "Your data directory is readable by other users." : "현재 데이터 디렉토리를 다른 사람이 읽을 수 있습니다.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "권한을 0770으로 변경하여 다른 사용자가 읽을 수 없도록 하십시오.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "데이터 디렉터리의 최상위 디렉터리에 \".ocdata\" 파일이 있는지 확인하십시오."
 },
 "nplurals=1; plural=0;");
diff --git a/lib/l10n/ko.json b/lib/l10n/ko.json
index 20de149ffae..32cebf6ba75 100644
--- a/lib/l10n/ko.json
+++ b/lib/l10n/ko.json
@@ -251,41 +251,19 @@
     "Summarizes text by reducing its length without losing key information." : "중요 정보로 내용을 축약하십시오.",
     "Extracts topics from a text and outputs them separated by commas." : "내용에서 주요 주제를 추출하고 쉼표로 이를 구분하십시오.",
     "Education Edition" : "교육용 에디션",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "로그인된 사용자가 관리자, 부 관리자, 또는 이 설정에 접근할 수 있는 권한을 부여받은 사용자일 것입니다.",
-    "Logged in user must be an admin or sub admin" : "로그인한 사용자는 관리자 또는 부 관리자여야 합니다.",
-    "Logged in user must be an admin" : "로그인한 사용자는 관리자여야 합니다.",
     "File name is a reserved word" : "파일 이름이 예약된 단어임",
     "File name contains at least one invalid character" : "파일 이름에 잘못된 글자가 한 자 이상 있음",
     "File name is too long" : "파일 이름이 너무 김",
-    "Help" : "도움말",
     "Users" : "사용자",
-    "Unknown user" : "알려지지 않은 사용자",
-    "Enter the database username and name for %s" : "%s에 대한 데이터베이스 사용자 이름과 이름을 입력하십시오",
-    "Enter the database username for %s" : "%s에 대한 데이터베이스 사용자 이름을 입력하십시오",
-    "MySQL username and/or password not valid" : "MySQL 사용자 이름 또는 암호가 잘못되었습니다",
-    "Oracle username and/or password not valid" : "Oracle 사용자 이름이나 암호가 잘못되었습니다.",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL 사용자 이름 또는 암호가 잘못되었습니다",
-    "Set an admin username." : "관리자의 사용자 이름을 설정합니다.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s님이 %2$s을(를) 당신과 공유하며, 다음을 추가하고자 함:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s님이 %2$s을(를) 당신과 공유하며 다음을 추가하고자 함",
     "»%s« added a note to a file shared with you" : "%s님이 당신과 공유한 파일에 메모를 추가함",
     "Open »%s«" : "%s 열기",
-    "Sharing %s failed, because this item is already shared with user %s" : "%s을(를) 공유할 수 없습니다. 이 항목을 이미 %s 님과 공유하고 있습니다",
     "%1$s shared »%2$s« with you" : "%1$s 님이 »%2$s« 항목을 공유했습니다",
     "%1$s shared »%2$s« with you." : "%1$s 님이 »%2$s« 항목을 공유했습니다",
     "Click the button below to open it." : "아래 단추를 눌러서 열 수 있습니다.",
-    "The username is already being used" : "사용자 이름이 이미 존재합니다",
-    "Could not create user" : "사용자를 만들 수 없습니다",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "사용자 이름에는 다음 문자만 사용할 수 있습니다: \"a-z, \"A-Z\", \"0-9\", 공백, \"_.@-'\"",
-    "A valid username must be provided" : "올바른 사용자 이름을 입력해야 합니다",
-    "Username contains whitespace at the beginning or at the end" : "사용자 이름의 시작이나 끝에 공백이 있습니다",
-    "Username must not consist of dots only" : "사용자 이름에 마침표만 있으면 안 됩니다",
-    "Username is invalid because files already exist for this user" : "무효한 사용자이름. 이미 존재함",
-    "User disabled" : "사용자 비활성화됨",
     "File is currently busy, please try again later" : "파일이 현재 사용 중, 나중에 다시 시도하십시오",
     "Cannot download file" : "파일을 다운로드할 수 없음",
-    "Your data directory is readable by other users." : "현재 데이터 디렉토리를 다른 사람이 읽을 수 있습니다.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "권한을 0770으로 변경하여 다른 사용자가 읽을 수 없도록 하십시오.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "데이터 디렉터리의 최상위 디렉터리에 \".ocdata\" 파일이 있는지 확인하십시오."
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/lib/l10n/lb.js b/lib/l10n/lb.js
index a107b551717..a036aa4e6a4 100644
--- a/lib/l10n/lb.js
+++ b/lib/l10n/lb.js
@@ -68,7 +68,6 @@ OC.L10N.register(
     "Authentication error" : "Authentifikatioun's Fehler",
     "Storage is temporarily not available" : "Späicherplaatz temporär net erreeschbar",
     "Translate" : "Iwwersetzen",
-    "Help" : "Hëllef",
     "Users" : "Benotzer"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/lb.json b/lib/l10n/lb.json
index 144a73b024b..054c6337f7a 100644
--- a/lib/l10n/lb.json
+++ b/lib/l10n/lb.json
@@ -66,7 +66,6 @@
     "Authentication error" : "Authentifikatioun's Fehler",
     "Storage is temporarily not available" : "Späicherplaatz temporär net erreeschbar",
     "Translate" : "Iwwersetzen",
-    "Help" : "Hëllef",
     "Users" : "Benotzer"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/lo.js b/lib/l10n/lo.js
index 150cf4f4a57..be20249c046 100644
--- a/lib/l10n/lo.js
+++ b/lib/l10n/lo.js
@@ -18,8 +18,6 @@ OC.L10N.register(
     "About" : "ກ່ຽວກັບ",
     "Role" : "ພາລະບົດບາດ",
     "Translate" : "ແປ",
-    "Help" : "ການຊ່ວຍເຫຼືອ",
-    "Users" : "ຜູ້ໃຊ້",
-    "User disabled" : "ປິດຊື່ຜູ້ໃຊ້"
+    "Users" : "ຜູ້ໃຊ້"
 },
 "nplurals=1; plural=0;");
diff --git a/lib/l10n/lo.json b/lib/l10n/lo.json
index c67941ae01a..575a364c6f3 100644
--- a/lib/l10n/lo.json
+++ b/lib/l10n/lo.json
@@ -16,8 +16,6 @@
     "About" : "ກ່ຽວກັບ",
     "Role" : "ພາລະບົດບາດ",
     "Translate" : "ແປ",
-    "Help" : "ການຊ່ວຍເຫຼືອ",
-    "Users" : "ຜູ້ໃຊ້",
-    "User disabled" : "ປິດຊື່ຜູ້ໃຊ້"
+    "Users" : "ຜູ້ໃຊ້"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/lib/l10n/lt_LT.js b/lib/l10n/lt_LT.js
index 7b6b450e3f0..c7b35e99458 100644
--- a/lib/l10n/lt_LT.js
+++ b/lib/l10n/lt_LT.js
@@ -36,6 +36,7 @@ OC.L10N.register(
     "Avatar image is not square" : "Avataro paveikslas nėra kvadratinis",
     "Files" : "Failai",
     "View profile" : "Rodyti profilį",
+    "Local time: %s" : "Vietinis laikas: %s",
     "today" : "šiandien",
     "tomorrow" : "rytoj",
     "yesterday" : "vakar",
@@ -56,15 +57,19 @@ OC.L10N.register(
     "seconds ago" : "prieš keletą sekundžių",
     "Empty file" : "Tuščias failas",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modulio, kurio ID: %s, nėra. Prašome jį įjungti savo programėlių nustatymuose arba susisiekti su savo administratoriumi.",
+    "\"%1$s\" is a forbidden file or folder name." : "„%1$s“ yra draudžiamas failo ar aplanko pavadinimas.",
+    "\"%1$s\" is a forbidden file type." : "„%1$s“ yra draudžiamas failo tipas.",
     "File already exists" : "Failas jau yra",
     "Invalid path" : "Neteisingas kelias",
     "Templates" : "Šablonai",
     "Filename contains at least one invalid character" : "Failo pavadinime yra bent vienas neteisingas simbolis",
+    "Filename is too long" : "Failo pavadinimas per ilgas",
     "Empty filename is not allowed" : "Tuščias failo pavadinimas nėra leidžiamas",
     "App \"%s\" cannot be installed because appinfo file cannot be read." : "Programėlė „%s“ negali būti įdiegta, nes nepavyksta perskaityti appinfo failo.",
     "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Programėlė „%s“ negali būti įdiegta, nes ji nėra suderinama su šia serverio versija.",
     "__language_name__" : "Lietuvių",
     "This is an automatically sent email, please do not reply." : "Tai yra automatinis pranešimas, prašome neatsakyti.",
+    "Help & privacy" : "Pagalba ir privatumas",
     "Appearance and accessibility" : "Išvaizda ir prieinamumas",
     "Apps" : "Programėlės",
     "Personal settings" : "Asmeniniai nustatymai",
@@ -85,6 +90,7 @@ OC.L10N.register(
     "Headline" : "Antraštė",
     "Organisation" : "Organizacija",
     "Role" : "Vaidmuo",
+    "Unknown account" : "Nežinoma paskyra",
     "Additional settings" : "Papildomi nustatymai",
     "You need to enter details of an existing account." : "Jūs turite suvesti egzistuojančios paskyros duomenis.",
     "Oracle connection could not be established" : "Nepavyko užmegzti Oracle ryšio",
@@ -92,11 +98,16 @@ OC.L10N.register(
     "For the best results, please consider using a GNU/Linux server instead." : "Geriausiems rezultatams, apsvarstykite galimybę, vietoj šio, naudoti GNU/Linux serverį",
     "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Pašalinkite savo php.ini faile open_basedir nustatymą arba persijunkite į 64-bitų PHP.",
     "Set an admin password." : "Nustatyti administratoriaus slaptažodį.",
+    "Open %s" : "Atverti %s",
     "%1$s via %2$s" : "%1$s per %2$s",
     "Unknown share type" : "Nežinomas viešinio tipas",
     "You are not allowed to share %s" : "Jums neleidžiama bendrinti %s",
     "Cannot increase permissions of %s" : "Negalima pridėti papildomų %s leidimų",
     "Expiration date is in the past" : "Bendrinimo pabaigos data yra praėjęs laikas",
+    "Path is already shared with this group" : "Kelias jau yra bendrinamas su šia grupe",
+    "Sharing is disabled" : "Bendrinimas yra išjungtas",
+    "Share does not have a full ID" : "Viešinys neturi viso ID",
+    "Group \"%s\" does not exist" : "Grupės „%s“ nėra",
     "The requested share does not exist anymore" : "Pageidaujamas bendrinimas daugiau neegzistuoja.",
     "Could not find category \"%s\"" : "Nepavyko rasti kategorijos „%s“",
     "Sunday" : "Sekmadienis",
@@ -145,6 +156,8 @@ OC.L10N.register(
     "Nov." : "Lap.",
     "Dec." : "Grd.",
     "A valid password must be provided" : "Slaptažodis turi būti tinkamas",
+    "Could not create account" : "Nepavyko sukurti paskyros",
+    "Account disabled" : "Paskyra išjungta",
     "Login canceled by app" : "Programėlė nutraukė prisijungimo procesą",
     "App \"%1$s\" cannot be installed because the following dependencies are not fulfilled: %2$s" : "Programėlė \"%1$s\" negali būti įdiegta, nes nėra patenkinamos šios priklausomybės: %2$s",
     "a safe home for all your data" : "saugūs namai visiems jūsų duomenims",
@@ -169,33 +182,19 @@ OC.L10N.register(
     "Text" : "Tekstas",
     "Summary" : "Santrauka",
     "Translate" : "Verskite",
-    "Logged in user must be an admin" : "Prisijungęs naudotojas privalo būti administratoriumi",
     "File name is a reserved word" : "Failo pavadinimas negalimas, žodis rezervuotas",
     "File name contains at least one invalid character" : "Failo vardas sudarytas iš neleistinų simbolių",
     "File name is too long" : "Failo pavadinimas per ilgas",
-    "Help" : "Pagalba",
     "Users" : "Naudotojai",
-    "Unknown user" : "Nežinomas naudotojas",
-    "MySQL username and/or password not valid" : "Neteisingas MySQL naudotojo vardas ir/arba slaptažodis",
-    "Oracle username and/or password not valid" : "Neteisingas Oracle naudotojo vardas ir/arba slaptažodis",
-    "PostgreSQL username and/or password not valid" : "Neteisingas PostgreSQL naudotojo vardas ir/arba slaptažodis",
-    "Set an admin username." : "Nustatyti administratoriaus naudotojo vardą.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s pasidalino „%2$s“ su jumis ir parašė pastabą:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s pasidalino „%2$s“ su jumis ir parašė pastabą",
     "»%s« added a note to a file shared with you" : "„%s“ parašė pastabą su jumis pasidalintam failui",
     "Open »%s«" : "Atverti \"%s\"",
-    "Sharing %s failed, because this item is already shared with user %s" : "%s bendrinimas nepavyko, kadangi šis elementas jau yra bendrinamas su naudotoju %s",
     "%1$s shared »%2$s« with you" : "%1$s pasidalino „%2$s“ su jumis",
     "%1$s shared »%2$s« with you." : "%1$s pasidalino „%2$s“ su jumis.",
     "Click the button below to open it." : "Norėdami atverti failą, spustelėkite mygtuką žemiau.",
-    "The username is already being used" : "Naudotojo vardas jau yra naudojamas",
-    "Could not create user" : "Nepavyko sukurti naudotojo",
-    "A valid username must be provided" : "Privalo būti pateiktas tinkamas naudotojo vardas",
-    "Username contains whitespace at the beginning or at the end" : "Naudotojo varde pradžioje ar pabaigoje yra tarpas",
-    "Username must not consist of dots only" : "Naudotojo vardas negali būti sudarytas tik iš taškų.",
-    "User disabled" : "Naudotojas išjungtas",
     "File is currently busy, please try again later" : "Failas šiuo metu yra užimtas, prašome vėliau pabandyti dar kartą",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Pakeiskite leidimus į 0770, kad šis katalogas negalėtų būti išvardytas kitiems naudotojams.",
+    "Cannot download file" : "Nepavyksta atsisiųsti failo",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Įsitikinkite, kad šakniniame duomenų kataloge yra failas, pavadinimu „.ocdata“."
 },
 "nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);");
diff --git a/lib/l10n/lt_LT.json b/lib/l10n/lt_LT.json
index 4ca6f7e7e15..2a0f94860b5 100644
--- a/lib/l10n/lt_LT.json
+++ b/lib/l10n/lt_LT.json
@@ -34,6 +34,7 @@
     "Avatar image is not square" : "Avataro paveikslas nėra kvadratinis",
     "Files" : "Failai",
     "View profile" : "Rodyti profilį",
+    "Local time: %s" : "Vietinis laikas: %s",
     "today" : "šiandien",
     "tomorrow" : "rytoj",
     "yesterday" : "vakar",
@@ -54,15 +55,19 @@
     "seconds ago" : "prieš keletą sekundžių",
     "Empty file" : "Tuščias failas",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modulio, kurio ID: %s, nėra. Prašome jį įjungti savo programėlių nustatymuose arba susisiekti su savo administratoriumi.",
+    "\"%1$s\" is a forbidden file or folder name." : "„%1$s“ yra draudžiamas failo ar aplanko pavadinimas.",
+    "\"%1$s\" is a forbidden file type." : "„%1$s“ yra draudžiamas failo tipas.",
     "File already exists" : "Failas jau yra",
     "Invalid path" : "Neteisingas kelias",
     "Templates" : "Šablonai",
     "Filename contains at least one invalid character" : "Failo pavadinime yra bent vienas neteisingas simbolis",
+    "Filename is too long" : "Failo pavadinimas per ilgas",
     "Empty filename is not allowed" : "Tuščias failo pavadinimas nėra leidžiamas",
     "App \"%s\" cannot be installed because appinfo file cannot be read." : "Programėlė „%s“ negali būti įdiegta, nes nepavyksta perskaityti appinfo failo.",
     "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Programėlė „%s“ negali būti įdiegta, nes ji nėra suderinama su šia serverio versija.",
     "__language_name__" : "Lietuvių",
     "This is an automatically sent email, please do not reply." : "Tai yra automatinis pranešimas, prašome neatsakyti.",
+    "Help & privacy" : "Pagalba ir privatumas",
     "Appearance and accessibility" : "Išvaizda ir prieinamumas",
     "Apps" : "Programėlės",
     "Personal settings" : "Asmeniniai nustatymai",
@@ -83,6 +88,7 @@
     "Headline" : "Antraštė",
     "Organisation" : "Organizacija",
     "Role" : "Vaidmuo",
+    "Unknown account" : "Nežinoma paskyra",
     "Additional settings" : "Papildomi nustatymai",
     "You need to enter details of an existing account." : "Jūs turite suvesti egzistuojančios paskyros duomenis.",
     "Oracle connection could not be established" : "Nepavyko užmegzti Oracle ryšio",
@@ -90,11 +96,16 @@
     "For the best results, please consider using a GNU/Linux server instead." : "Geriausiems rezultatams, apsvarstykite galimybę, vietoj šio, naudoti GNU/Linux serverį",
     "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Pašalinkite savo php.ini faile open_basedir nustatymą arba persijunkite į 64-bitų PHP.",
     "Set an admin password." : "Nustatyti administratoriaus slaptažodį.",
+    "Open %s" : "Atverti %s",
     "%1$s via %2$s" : "%1$s per %2$s",
     "Unknown share type" : "Nežinomas viešinio tipas",
     "You are not allowed to share %s" : "Jums neleidžiama bendrinti %s",
     "Cannot increase permissions of %s" : "Negalima pridėti papildomų %s leidimų",
     "Expiration date is in the past" : "Bendrinimo pabaigos data yra praėjęs laikas",
+    "Path is already shared with this group" : "Kelias jau yra bendrinamas su šia grupe",
+    "Sharing is disabled" : "Bendrinimas yra išjungtas",
+    "Share does not have a full ID" : "Viešinys neturi viso ID",
+    "Group \"%s\" does not exist" : "Grupės „%s“ nėra",
     "The requested share does not exist anymore" : "Pageidaujamas bendrinimas daugiau neegzistuoja.",
     "Could not find category \"%s\"" : "Nepavyko rasti kategorijos „%s“",
     "Sunday" : "Sekmadienis",
@@ -143,6 +154,8 @@
     "Nov." : "Lap.",
     "Dec." : "Grd.",
     "A valid password must be provided" : "Slaptažodis turi būti tinkamas",
+    "Could not create account" : "Nepavyko sukurti paskyros",
+    "Account disabled" : "Paskyra išjungta",
     "Login canceled by app" : "Programėlė nutraukė prisijungimo procesą",
     "App \"%1$s\" cannot be installed because the following dependencies are not fulfilled: %2$s" : "Programėlė \"%1$s\" negali būti įdiegta, nes nėra patenkinamos šios priklausomybės: %2$s",
     "a safe home for all your data" : "saugūs namai visiems jūsų duomenims",
@@ -167,33 +180,19 @@
     "Text" : "Tekstas",
     "Summary" : "Santrauka",
     "Translate" : "Verskite",
-    "Logged in user must be an admin" : "Prisijungęs naudotojas privalo būti administratoriumi",
     "File name is a reserved word" : "Failo pavadinimas negalimas, žodis rezervuotas",
     "File name contains at least one invalid character" : "Failo vardas sudarytas iš neleistinų simbolių",
     "File name is too long" : "Failo pavadinimas per ilgas",
-    "Help" : "Pagalba",
     "Users" : "Naudotojai",
-    "Unknown user" : "Nežinomas naudotojas",
-    "MySQL username and/or password not valid" : "Neteisingas MySQL naudotojo vardas ir/arba slaptažodis",
-    "Oracle username and/or password not valid" : "Neteisingas Oracle naudotojo vardas ir/arba slaptažodis",
-    "PostgreSQL username and/or password not valid" : "Neteisingas PostgreSQL naudotojo vardas ir/arba slaptažodis",
-    "Set an admin username." : "Nustatyti administratoriaus naudotojo vardą.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s pasidalino „%2$s“ su jumis ir parašė pastabą:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s pasidalino „%2$s“ su jumis ir parašė pastabą",
     "»%s« added a note to a file shared with you" : "„%s“ parašė pastabą su jumis pasidalintam failui",
     "Open »%s«" : "Atverti \"%s\"",
-    "Sharing %s failed, because this item is already shared with user %s" : "%s bendrinimas nepavyko, kadangi šis elementas jau yra bendrinamas su naudotoju %s",
     "%1$s shared »%2$s« with you" : "%1$s pasidalino „%2$s“ su jumis",
     "%1$s shared »%2$s« with you." : "%1$s pasidalino „%2$s“ su jumis.",
     "Click the button below to open it." : "Norėdami atverti failą, spustelėkite mygtuką žemiau.",
-    "The username is already being used" : "Naudotojo vardas jau yra naudojamas",
-    "Could not create user" : "Nepavyko sukurti naudotojo",
-    "A valid username must be provided" : "Privalo būti pateiktas tinkamas naudotojo vardas",
-    "Username contains whitespace at the beginning or at the end" : "Naudotojo varde pradžioje ar pabaigoje yra tarpas",
-    "Username must not consist of dots only" : "Naudotojo vardas negali būti sudarytas tik iš taškų.",
-    "User disabled" : "Naudotojas išjungtas",
     "File is currently busy, please try again later" : "Failas šiuo metu yra užimtas, prašome vėliau pabandyti dar kartą",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Pakeiskite leidimus į 0770, kad šis katalogas negalėtų būti išvardytas kitiems naudotojams.",
+    "Cannot download file" : "Nepavyksta atsisiųsti failo",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Įsitikinkite, kad šakniniame duomenų kataloge yra failas, pavadinimu „.ocdata“."
 },"pluralForm" :"nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);"
 }
\ No newline at end of file
diff --git a/lib/l10n/lv.js b/lib/l10n/lv.js
index 19848d9c564..8b5402d881f 100644
--- a/lib/l10n/lv.js
+++ b/lib/l10n/lv.js
@@ -130,16 +130,8 @@ OC.L10N.register(
     "Translate" : "Tulkot",
     "File name is a reserved word" : "Datnes nosaukums ir aizņemts vārds",
     "File name is too long" : "Datnes nosaukums ir pārāk garš",
-    "Help" : "Palīdzība",
     "Users" : "Lietotāji",
-    "Unknown user" : "Nezināms lietotājs",
-    "Oracle username and/or password not valid" : "Nav derīga Oracle parole un/vai lietotājvārds",
-    "PostgreSQL username and/or password not valid" : "Nav derīga PostgreSQL parole un/vai lietotājvārds",
-    "Set an admin username." : "Iestatīt pārvaldītāja lietotājvārdu.",
     "Open »%s«" : "Atvērt »%s«",
-    "The username is already being used" : "Šāds lietotājvārds jau tiek izmantots",
-    "A valid username must be provided" : "Jānorāda derīgs lietotājvārds",
-    "User disabled" : "Lietotājs deaktivizēts",
     "File is currently busy, please try again later" : "Datne pašlaik ir aizņemta. Lūgums vēlāk mēģināt vēlreiz"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/lib/l10n/lv.json b/lib/l10n/lv.json
index 76755326897..d4ce98c9afc 100644
--- a/lib/l10n/lv.json
+++ b/lib/l10n/lv.json
@@ -128,16 +128,8 @@
     "Translate" : "Tulkot",
     "File name is a reserved word" : "Datnes nosaukums ir aizņemts vārds",
     "File name is too long" : "Datnes nosaukums ir pārāk garš",
-    "Help" : "Palīdzība",
     "Users" : "Lietotāji",
-    "Unknown user" : "Nezināms lietotājs",
-    "Oracle username and/or password not valid" : "Nav derīga Oracle parole un/vai lietotājvārds",
-    "PostgreSQL username and/or password not valid" : "Nav derīga PostgreSQL parole un/vai lietotājvārds",
-    "Set an admin username." : "Iestatīt pārvaldītāja lietotājvārdu.",
     "Open »%s«" : "Atvērt »%s«",
-    "The username is already being used" : "Šāds lietotājvārds jau tiek izmantots",
-    "A valid username must be provided" : "Jānorāda derīgs lietotājvārds",
-    "User disabled" : "Lietotājs deaktivizēts",
     "File is currently busy, please try again later" : "Datne pašlaik ir aizņemta. Lūgums vēlāk mēģināt vēlreiz"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/lib/l10n/mk.js b/lib/l10n/mk.js
index 910de3e999f..f06a511cf1f 100644
--- a/lib/l10n/mk.js
+++ b/lib/l10n/mk.js
@@ -230,41 +230,19 @@ OC.L10N.register(
     "Translate" : "Преведи",
     "Generate headline" : "Генерирај заглавие",
     "Education Edition" : "Едукативно издание",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Најавените корисници мора да бидат администратори, ко-администратори или да имаат специјални дозволи за да пристапат до овие поставки",
-    "Logged in user must be an admin or sub admin" : "Најавениот корисник мора да биде администратор или заменик администратор",
-    "Logged in user must be an admin" : "Најавениот корисник мора да биде администратор",
     "File name is a reserved word" : "Името на датотеката е резервиран збор",
     "File name contains at least one invalid character" : "Името на датотеката соджи невалиден карактер",
     "File name is too long" : "Името на датотеката е премногу долго",
-    "Help" : "Помош",
     "Users" : "Корисници",
-    "Unknown user" : "Непознат корисник",
-    "Enter the database username and name for %s" : "Внесете го корисничкото име и името на базата за %s",
-    "Enter the database username for %s" : "Внесете го корисничкото име на базата за %s",
-    "MySQL username and/or password not valid" : "Погрешно MySQL корисничко име и/или лозинка",
-    "Oracle username and/or password not valid" : "Oracle корисничкото име и/или лозинката не се валидни",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL корисничкото име и/или лозинка не се валидни",
-    "Set an admin username." : "Постави администраторско корисничко име",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s ја сподели папката »%2$s« и додаде:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s ја сподели папката »%2$s« и додаде",
     "»%s« added a note to a file shared with you" : "»%s« додаде белешка до датотеката што ја сподели со вас",
     "Open »%s«" : "Отвори »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Споделувањето на %s е неуспешно, бидејќи истото веќе е споделено со корисникот %s",
     "%1$s shared »%2$s« with you" : "%1$s сподели »%2$s« со вас",
     "%1$s shared »%2$s« with you." : "%1$s сподели »%2$s« со вас.",
     "Click the button below to open it." : "Кликнете на копчето подолу за да ја отворите.",
-    "The username is already being used" : "Корисничкото име е веќе во употреба",
-    "Could not create user" : "Неможе да се креира корисник",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Само следниве карактери се дозволени во корисничкото име: \"a-z\", \"A-Z\", \"0-9\", празно место и \"_.@-'\"",
-    "A valid username must be provided" : "Мора да се внесе валидно корисничко име ",
-    "Username contains whitespace at the beginning or at the end" : "Корисничкото име содржи празно место на почетокот или на крајот",
-    "Username must not consist of dots only" : "Корисничкото име не смее да се состои само од точки",
-    "Username is invalid because files already exist for this user" : "Невалидно корисничкото име бидејќи веќе постојат датотеки за овој корисник",
-    "User disabled" : "Оневозможен корисник",
     "File is currently busy, please try again later" : "Датотеката моментално е зафатена, обидете се повторно",
     "Cannot download file" : "Не може да се преземе датотеката",
-    "Your data directory is readable by other users." : "Вашата папка со податоци може да се чита и од други корисници.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Поставете дозвола на папката 0770, за да неможе да се чита од други корисници.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Осигурете се дека има датотека наречена \".ocdata\" во главната папка со податоци."
 },
 "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
diff --git a/lib/l10n/mk.json b/lib/l10n/mk.json
index 1025646899e..b0a4e0f3f05 100644
--- a/lib/l10n/mk.json
+++ b/lib/l10n/mk.json
@@ -228,41 +228,19 @@
     "Translate" : "Преведи",
     "Generate headline" : "Генерирај заглавие",
     "Education Edition" : "Едукативно издание",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Најавените корисници мора да бидат администратори, ко-администратори или да имаат специјални дозволи за да пристапат до овие поставки",
-    "Logged in user must be an admin or sub admin" : "Најавениот корисник мора да биде администратор или заменик администратор",
-    "Logged in user must be an admin" : "Најавениот корисник мора да биде администратор",
     "File name is a reserved word" : "Името на датотеката е резервиран збор",
     "File name contains at least one invalid character" : "Името на датотеката соджи невалиден карактер",
     "File name is too long" : "Името на датотеката е премногу долго",
-    "Help" : "Помош",
     "Users" : "Корисници",
-    "Unknown user" : "Непознат корисник",
-    "Enter the database username and name for %s" : "Внесете го корисничкото име и името на базата за %s",
-    "Enter the database username for %s" : "Внесете го корисничкото име на базата за %s",
-    "MySQL username and/or password not valid" : "Погрешно MySQL корисничко име и/или лозинка",
-    "Oracle username and/or password not valid" : "Oracle корисничкото име и/или лозинката не се валидни",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL корисничкото име и/или лозинка не се валидни",
-    "Set an admin username." : "Постави администраторско корисничко име",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s ја сподели папката »%2$s« и додаде:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s ја сподели папката »%2$s« и додаде",
     "»%s« added a note to a file shared with you" : "»%s« додаде белешка до датотеката што ја сподели со вас",
     "Open »%s«" : "Отвори »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Споделувањето на %s е неуспешно, бидејќи истото веќе е споделено со корисникот %s",
     "%1$s shared »%2$s« with you" : "%1$s сподели »%2$s« со вас",
     "%1$s shared »%2$s« with you." : "%1$s сподели »%2$s« со вас.",
     "Click the button below to open it." : "Кликнете на копчето подолу за да ја отворите.",
-    "The username is already being used" : "Корисничкото име е веќе во употреба",
-    "Could not create user" : "Неможе да се креира корисник",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Само следниве карактери се дозволени во корисничкото име: \"a-z\", \"A-Z\", \"0-9\", празно место и \"_.@-'\"",
-    "A valid username must be provided" : "Мора да се внесе валидно корисничко име ",
-    "Username contains whitespace at the beginning or at the end" : "Корисничкото име содржи празно место на почетокот или на крајот",
-    "Username must not consist of dots only" : "Корисничкото име не смее да се состои само од точки",
-    "Username is invalid because files already exist for this user" : "Невалидно корисничкото име бидејќи веќе постојат датотеки за овој корисник",
-    "User disabled" : "Оневозможен корисник",
     "File is currently busy, please try again later" : "Датотеката моментално е зафатена, обидете се повторно",
     "Cannot download file" : "Не може да се преземе датотеката",
-    "Your data directory is readable by other users." : "Вашата папка со податоци може да се чита и од други корисници.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Поставете дозвола на папката 0770, за да неможе да се чита од други корисници.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Осигурете се дека има датотека наречена \".ocdata\" во главната папка со податоци."
 },"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
 }
\ No newline at end of file
diff --git a/lib/l10n/mn.js b/lib/l10n/mn.js
index 0cace9e812b..1ccd1474f1d 100644
--- a/lib/l10n/mn.js
+++ b/lib/l10n/mn.js
@@ -40,9 +40,7 @@ OC.L10N.register(
     "File name is a reserved word" : "Файлын нэр нь нийцгүй  үг",
     "File name contains at least one invalid character" : "файлын нэр нь хамгийн багадаа нэг нь хүчингүй тэмдэгт агуулж байна",
     "File name is too long" : "Файлын нэр хэтэрхий урт байна",
-    "Help" : "Туслах",
     "Users" : "хэрэглэгч",
-    "Unknown user" : "Тодорхойгүй хэрэглэгч",
     "Open »%s«" : "»%s« нээх"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/mn.json b/lib/l10n/mn.json
index 807881c57d9..39d71d8d439 100644
--- a/lib/l10n/mn.json
+++ b/lib/l10n/mn.json
@@ -38,9 +38,7 @@
     "File name is a reserved word" : "Файлын нэр нь нийцгүй  үг",
     "File name contains at least one invalid character" : "файлын нэр нь хамгийн багадаа нэг нь хүчингүй тэмдэгт агуулж байна",
     "File name is too long" : "Файлын нэр хэтэрхий урт байна",
-    "Help" : "Туслах",
     "Users" : "хэрэглэгч",
-    "Unknown user" : "Тодорхойгүй хэрэглэгч",
     "Open »%s«" : "»%s« нээх"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/ms_MY.js b/lib/l10n/ms_MY.js
index a5329df5cbb..35f8508eee0 100644
--- a/lib/l10n/ms_MY.js
+++ b/lib/l10n/ms_MY.js
@@ -50,7 +50,6 @@ OC.L10N.register(
     "Nov." : "Nov.",
     "Dec." : "Dis.",
     "Authentication error" : "Ralat pengesahan",
-    "Help" : "Bantuan",
     "Users" : "Pengguna",
     "Open »%s«" : "Buka %s"
 },
diff --git a/lib/l10n/ms_MY.json b/lib/l10n/ms_MY.json
index 6350f9af24d..2c507965ac0 100644
--- a/lib/l10n/ms_MY.json
+++ b/lib/l10n/ms_MY.json
@@ -48,7 +48,6 @@
     "Nov." : "Nov.",
     "Dec." : "Dis.",
     "Authentication error" : "Ralat pengesahan",
-    "Help" : "Bantuan",
     "Users" : "Pengguna",
     "Open »%s«" : "Buka %s"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/lib/l10n/nb.js b/lib/l10n/nb.js
index 05247ede845..352d6097f89 100644
--- a/lib/l10n/nb.js
+++ b/lib/l10n/nb.js
@@ -59,6 +59,7 @@ OC.L10N.register(
     "Avatar image is not square" : "Avatarbilde er ikke firkantet",
     "Files" : "Filer",
     "View profile" : "Vis profil",
+    "_%nh_::_%nh_" : ["%nh","%nh"],
     "Local time: %s" : "Lokal tid: %s",
     "today" : "i dag",
     "tomorrow" : "I morgen",
@@ -161,7 +162,10 @@ OC.L10N.register(
     "Share recipient should not be empty" : "Delingsmottakeren skal ikke være tom",
     "Share recipient is not a valid circle" : "Delingsmottakeren er ikke en gyldig sirkel",
     "Unknown share type" : "Ukjent ressurstype",
+    "Cannot share with yourself" : "Kan ikke dele med deg selv",
+    "You cannot share your root folder" : "Du kan ikke dele rot-mappen din",
     "You are not allowed to share %s" : "Du har ikke lov til å dele %s",
+    "Valid permissions are required for sharing" : "Gyldige tillatelser kreves for deling",
     "Cannot increase permissions of %s" : "Kan ikke øke tillatelser for %s",
     "Files cannot be shared with delete permissions" : "Filer kan ikke deles med slett-rettigheter",
     "Files cannot be shared with create permissions" : "Filer kan ikke deles med opprettingstillatelser",
@@ -169,6 +173,7 @@ OC.L10N.register(
     "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Kan ikke sette utløpsdato mer enn %n dag i fremtiden","Kan ikke sette utløpsdato mer enn %n dager i fremtiden"],
     "Sharing is only allowed with group members" : "Deling er kun tillatt med gruppemedlemmer",
     "Sharing %s failed, because this item is already shared with the account %s" : "Deling av %s feilet, fordi dette elementet er allerede delt med kontoen %s",
+    "Group \"%s\" does not exist" : "Gruppen «%s» finnes ikke.",
     "The requested share does not exist anymore" : "Forespurt ressurs finnes ikke lenger",
     "The requested share comes from a disabled user" : "Den forespurte delingen kommer fra en deaktivert bruker",
     "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Brukeren ble ikke opprettet fordi brukergrensen er nådd. Sjekk varslene dine for å finne ut mer.",
@@ -366,41 +371,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Oppsummerer tekst ved å redusere lengden uten å miste nøkkelinformasjon.",
     "Extracts topics from a text and outputs them separated by commas." : "Trekker ut emner fra en tekst og sender dem ut atskilt med komma.",
     "Education Edition" : "Utdanningsversjon",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Innlogget bruker må være administrator, underadministrator eller ha fått spesiell rett til å få tilgang til denne innstillingen.",
-    "Logged in user must be an admin or sub admin" : "Innlogget bruker må være administrator eller en underadministrator.",
-    "Logged in user must be an admin" : "Innlogget bruker må være administrator",
     "File name is a reserved word" : "Filnavnet er et reservert ord",
     "File name contains at least one invalid character" : "Filnavnet inneholder minst ett ulovlig tegn",
     "File name is too long" : "Filnavnet er for langt",
-    "Help" : "Hjelp",
     "Users" : "Brukere",
-    "Unknown user" : "Ukjent bruker",
-    "Enter the database username and name for %s" : "Skriv inn databasens brukernavn og navn for %s",
-    "Enter the database username for %s" : "Skriv inn databasens brukernavn for %s",
-    "MySQL username and/or password not valid" : "MySQL-brukernavn og/eller passord ikke gyldig",
-    "Oracle username and/or password not valid" : "Oracle-brukernavn og/eller passord er ikke gyldig",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL-brukernavn og/eller passord er ikke gyldig",
-    "Set an admin username." : "Sett et admin-brukernavn.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s delte »%2$s« med deg og vil legge til:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s delte »%2$s« med deg og vil legge til",
     "»%s« added a note to a file shared with you" : "»%s« la til en melding til en fil delt med deg",
     "Open »%s«" : "Åpne »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Deling av %s mislyktes, fordi dette elementet allerede er delt med bruker %s",
     "%1$s shared »%2$s« with you" : "%1$s delte »%2$s« med deg",
     "%1$s shared »%2$s« with you." : "%1$s delte »%2$s« med deg.",
     "Click the button below to open it." : "Klikk på knappen nedenfor for å åpne den.",
-    "The username is already being used" : "Brukernavnet er allerede i bruk",
-    "Could not create user" : "Kunne ikke opprette bruker",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Kun følgende tegn er tillatt i et brukernavn: \"a-z\", \"A-Z\", \"0-9\", mellomrom og \"_.@-'\"",
-    "A valid username must be provided" : "Oppgi et gyldig brukernavn",
-    "Username contains whitespace at the beginning or at the end" : "Brukernavn inneholder blanke på begynnelsen eller slutten",
-    "Username must not consist of dots only" : "Brukernavn kan ikke bare bestå av punktum",
-    "Username is invalid because files already exist for this user" : "Brukernavnet er ugyldig fordi det finnes allerede filer for denne brukeren.",
-    "User disabled" : "Brukeren er deaktivert",
     "File is currently busy, please try again later" : "Filen er opptatt for øyeblikket, prøv igjen senere",
     "Cannot download file" : "Kan ikke laste ned fil",
-    "Your data directory is readable by other users." : "Datakatalogen din kan leses av andre brukere.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Endre tillatelsene til 0770 slik at mappen ikke kan listes av andre brukere.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Forsikre deg om at det finnes ei fil kalt \".ocdata\" på rota av datamappa."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/nb.json b/lib/l10n/nb.json
index 8c2cc23c435..8dab3756f23 100644
--- a/lib/l10n/nb.json
+++ b/lib/l10n/nb.json
@@ -57,6 +57,7 @@
     "Avatar image is not square" : "Avatarbilde er ikke firkantet",
     "Files" : "Filer",
     "View profile" : "Vis profil",
+    "_%nh_::_%nh_" : ["%nh","%nh"],
     "Local time: %s" : "Lokal tid: %s",
     "today" : "i dag",
     "tomorrow" : "I morgen",
@@ -159,7 +160,10 @@
     "Share recipient should not be empty" : "Delingsmottakeren skal ikke være tom",
     "Share recipient is not a valid circle" : "Delingsmottakeren er ikke en gyldig sirkel",
     "Unknown share type" : "Ukjent ressurstype",
+    "Cannot share with yourself" : "Kan ikke dele med deg selv",
+    "You cannot share your root folder" : "Du kan ikke dele rot-mappen din",
     "You are not allowed to share %s" : "Du har ikke lov til å dele %s",
+    "Valid permissions are required for sharing" : "Gyldige tillatelser kreves for deling",
     "Cannot increase permissions of %s" : "Kan ikke øke tillatelser for %s",
     "Files cannot be shared with delete permissions" : "Filer kan ikke deles med slett-rettigheter",
     "Files cannot be shared with create permissions" : "Filer kan ikke deles med opprettingstillatelser",
@@ -167,6 +171,7 @@
     "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Kan ikke sette utløpsdato mer enn %n dag i fremtiden","Kan ikke sette utløpsdato mer enn %n dager i fremtiden"],
     "Sharing is only allowed with group members" : "Deling er kun tillatt med gruppemedlemmer",
     "Sharing %s failed, because this item is already shared with the account %s" : "Deling av %s feilet, fordi dette elementet er allerede delt med kontoen %s",
+    "Group \"%s\" does not exist" : "Gruppen «%s» finnes ikke.",
     "The requested share does not exist anymore" : "Forespurt ressurs finnes ikke lenger",
     "The requested share comes from a disabled user" : "Den forespurte delingen kommer fra en deaktivert bruker",
     "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Brukeren ble ikke opprettet fordi brukergrensen er nådd. Sjekk varslene dine for å finne ut mer.",
@@ -364,41 +369,19 @@
     "Summarizes text by reducing its length without losing key information." : "Oppsummerer tekst ved å redusere lengden uten å miste nøkkelinformasjon.",
     "Extracts topics from a text and outputs them separated by commas." : "Trekker ut emner fra en tekst og sender dem ut atskilt med komma.",
     "Education Edition" : "Utdanningsversjon",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Innlogget bruker må være administrator, underadministrator eller ha fått spesiell rett til å få tilgang til denne innstillingen.",
-    "Logged in user must be an admin or sub admin" : "Innlogget bruker må være administrator eller en underadministrator.",
-    "Logged in user must be an admin" : "Innlogget bruker må være administrator",
     "File name is a reserved word" : "Filnavnet er et reservert ord",
     "File name contains at least one invalid character" : "Filnavnet inneholder minst ett ulovlig tegn",
     "File name is too long" : "Filnavnet er for langt",
-    "Help" : "Hjelp",
     "Users" : "Brukere",
-    "Unknown user" : "Ukjent bruker",
-    "Enter the database username and name for %s" : "Skriv inn databasens brukernavn og navn for %s",
-    "Enter the database username for %s" : "Skriv inn databasens brukernavn for %s",
-    "MySQL username and/or password not valid" : "MySQL-brukernavn og/eller passord ikke gyldig",
-    "Oracle username and/or password not valid" : "Oracle-brukernavn og/eller passord er ikke gyldig",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL-brukernavn og/eller passord er ikke gyldig",
-    "Set an admin username." : "Sett et admin-brukernavn.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s delte »%2$s« med deg og vil legge til:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s delte »%2$s« med deg og vil legge til",
     "»%s« added a note to a file shared with you" : "»%s« la til en melding til en fil delt med deg",
     "Open »%s«" : "Åpne »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Deling av %s mislyktes, fordi dette elementet allerede er delt med bruker %s",
     "%1$s shared »%2$s« with you" : "%1$s delte »%2$s« med deg",
     "%1$s shared »%2$s« with you." : "%1$s delte »%2$s« med deg.",
     "Click the button below to open it." : "Klikk på knappen nedenfor for å åpne den.",
-    "The username is already being used" : "Brukernavnet er allerede i bruk",
-    "Could not create user" : "Kunne ikke opprette bruker",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Kun følgende tegn er tillatt i et brukernavn: \"a-z\", \"A-Z\", \"0-9\", mellomrom og \"_.@-'\"",
-    "A valid username must be provided" : "Oppgi et gyldig brukernavn",
-    "Username contains whitespace at the beginning or at the end" : "Brukernavn inneholder blanke på begynnelsen eller slutten",
-    "Username must not consist of dots only" : "Brukernavn kan ikke bare bestå av punktum",
-    "Username is invalid because files already exist for this user" : "Brukernavnet er ugyldig fordi det finnes allerede filer for denne brukeren.",
-    "User disabled" : "Brukeren er deaktivert",
     "File is currently busy, please try again later" : "Filen er opptatt for øyeblikket, prøv igjen senere",
     "Cannot download file" : "Kan ikke laste ned fil",
-    "Your data directory is readable by other users." : "Datakatalogen din kan leses av andre brukere.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Endre tillatelsene til 0770 slik at mappen ikke kan listes av andre brukere.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Forsikre deg om at det finnes ei fil kalt \".ocdata\" på rota av datamappa."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js
index 8ca8824a05e..f4f35d239d1 100644
--- a/lib/l10n/nl.js
+++ b/lib/l10n/nl.js
@@ -52,6 +52,7 @@ OC.L10N.register(
     "Avatar image is not square" : "Avatar afbeelding is niet vierkant",
     "Files" : "Bestanden",
     "View profile" : "Bekijk profiel",
+    "_%nh_::_%nh_" : ["%nh","%nh"],
     "today" : "vandaag",
     "tomorrow" : "morgen",
     "yesterday" : "gisteren",
@@ -222,37 +223,18 @@ OC.L10N.register(
     "Translate" : "Vertaal",
     "Result" : "Resultaat",
     "Education Edition" : "Onderwijs Editie",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Ingelogde gebruiken moet beheerder, sub-beheerder of gebruiker met speciale rechten om deze instelling te veranderen zijn",
-    "Logged in user must be an admin or sub admin" : "Ingelogde gebruiker moet een beheerder of subbeheerder zijn",
-    "Logged in user must be an admin" : "Ingelogde gebruiker moet een beheerder zijn",
     "File name is a reserved word" : "Bestandsnaam is een gereserveerd woord",
     "File name contains at least one invalid character" : "De bestandsnaam bevat in ieder geval één verboden teken",
     "File name is too long" : "De bestandsnaam is te lang",
-    "Help" : "Help",
     "Users" : "Gebruikers",
-    "Unknown user" : "Onbekende gebruiker",
-    "MySQL username and/or password not valid" : "MySQL gebruikersnaam en/of wachtwoord ongeldig",
-    "Oracle username and/or password not valid" : "Oracle gebruikersnaam en/of wachtwoord ongeldig",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL gebruikersnaam en/of wachtwoord ongeldig",
-    "Set an admin username." : "Stel de gebruikersnaam van de beheerder in.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s deelde \"%2$s\" met jou en wil toevoegen:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s deelde \"%2$s\" met jou en wil toevoegen",
     "»%s« added a note to a file shared with you" : "\"%s\" voegde een notitie toe aan een bestand dat met jou is gedeeld",
     "Open »%s«" : "Open \"%s\"",
-    "Sharing %s failed, because this item is already shared with user %s" : "Delen van %s is mislukt, omdat het object al wordt gedeeld met gebruiker %s",
     "%1$s shared »%2$s« with you" : "%1$s deelde \"%2$s\" met jou",
     "%1$s shared »%2$s« with you." : "%1$s deelde \"%2$s\" met jou.",
     "Click the button below to open it." : "Klik de onderstaande button om te openen.",
-    "The username is already being used" : "De gebruikersnaam bestaat al",
-    "Could not create user" : "Kan gebruiker niet aanmaken.",
-    "A valid username must be provided" : "Er moet een geldige gebruikersnaam worden opgegeven",
-    "Username contains whitespace at the beginning or at the end" : "De gebruikersnaam bevat spaties aan het begin of aan het eind",
-    "Username must not consist of dots only" : "De gebruikersnaam mag niet uit alleen punten bestaan",
-    "Username is invalid because files already exist for this user" : "Gebruikersnaam is ongeldig omdat er al bestanden voor deze gebruiker bestaan",
-    "User disabled" : "Gebruiker uitgeschakeld",
     "File is currently busy, please try again later" : "Bestandsverwerking bezig, probeer het later opnieuw",
-    "Your data directory is readable by other users." : "Je datamap is leesbaar voor andere gebruikers.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Wijzig de machtiging in 0770 zodat de directory niet door andere gebruikers bekeken kan worden.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Zorg dat er een bestand genaamd \".ocdata\" in de hoofddirectory aanwezig is."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json
index a0b1eb65bf3..383c68fd19d 100644
--- a/lib/l10n/nl.json
+++ b/lib/l10n/nl.json
@@ -50,6 +50,7 @@
     "Avatar image is not square" : "Avatar afbeelding is niet vierkant",
     "Files" : "Bestanden",
     "View profile" : "Bekijk profiel",
+    "_%nh_::_%nh_" : ["%nh","%nh"],
     "today" : "vandaag",
     "tomorrow" : "morgen",
     "yesterday" : "gisteren",
@@ -220,37 +221,18 @@
     "Translate" : "Vertaal",
     "Result" : "Resultaat",
     "Education Edition" : "Onderwijs Editie",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Ingelogde gebruiken moet beheerder, sub-beheerder of gebruiker met speciale rechten om deze instelling te veranderen zijn",
-    "Logged in user must be an admin or sub admin" : "Ingelogde gebruiker moet een beheerder of subbeheerder zijn",
-    "Logged in user must be an admin" : "Ingelogde gebruiker moet een beheerder zijn",
     "File name is a reserved word" : "Bestandsnaam is een gereserveerd woord",
     "File name contains at least one invalid character" : "De bestandsnaam bevat in ieder geval één verboden teken",
     "File name is too long" : "De bestandsnaam is te lang",
-    "Help" : "Help",
     "Users" : "Gebruikers",
-    "Unknown user" : "Onbekende gebruiker",
-    "MySQL username and/or password not valid" : "MySQL gebruikersnaam en/of wachtwoord ongeldig",
-    "Oracle username and/or password not valid" : "Oracle gebruikersnaam en/of wachtwoord ongeldig",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL gebruikersnaam en/of wachtwoord ongeldig",
-    "Set an admin username." : "Stel de gebruikersnaam van de beheerder in.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s deelde \"%2$s\" met jou en wil toevoegen:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s deelde \"%2$s\" met jou en wil toevoegen",
     "»%s« added a note to a file shared with you" : "\"%s\" voegde een notitie toe aan een bestand dat met jou is gedeeld",
     "Open »%s«" : "Open \"%s\"",
-    "Sharing %s failed, because this item is already shared with user %s" : "Delen van %s is mislukt, omdat het object al wordt gedeeld met gebruiker %s",
     "%1$s shared »%2$s« with you" : "%1$s deelde \"%2$s\" met jou",
     "%1$s shared »%2$s« with you." : "%1$s deelde \"%2$s\" met jou.",
     "Click the button below to open it." : "Klik de onderstaande button om te openen.",
-    "The username is already being used" : "De gebruikersnaam bestaat al",
-    "Could not create user" : "Kan gebruiker niet aanmaken.",
-    "A valid username must be provided" : "Er moet een geldige gebruikersnaam worden opgegeven",
-    "Username contains whitespace at the beginning or at the end" : "De gebruikersnaam bevat spaties aan het begin of aan het eind",
-    "Username must not consist of dots only" : "De gebruikersnaam mag niet uit alleen punten bestaan",
-    "Username is invalid because files already exist for this user" : "Gebruikersnaam is ongeldig omdat er al bestanden voor deze gebruiker bestaan",
-    "User disabled" : "Gebruiker uitgeschakeld",
     "File is currently busy, please try again later" : "Bestandsverwerking bezig, probeer het later opnieuw",
-    "Your data directory is readable by other users." : "Je datamap is leesbaar voor andere gebruikers.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Wijzig de machtiging in 0770 zodat de directory niet door andere gebruikers bekeken kan worden.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Zorg dat er een bestand genaamd \".ocdata\" in de hoofddirectory aanwezig is."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/nn_NO.js b/lib/l10n/nn_NO.js
index 680b671b105..9a97c6f4bd3 100644
--- a/lib/l10n/nn_NO.js
+++ b/lib/l10n/nn_NO.js
@@ -76,11 +76,7 @@ OC.L10N.register(
     "Authentication error" : "Feil i autentisering",
     "Summary" : "Oppsumering",
     "File name is too long" : "Filnamnet er for langt",
-    "Help" : "Hjelp",
     "Users" : "Brukarar",
-    "Unknown user" : "Ukjend brukar",
-    "Open »%s«" : "Opna »%s«",
-    "A valid username must be provided" : "Du må oppgje eit gyldig brukarnamn",
-    "User disabled" : "Brukar deaktivert"
+    "Open »%s«" : "Opna »%s«"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/nn_NO.json b/lib/l10n/nn_NO.json
index 97652b01724..fffeb3e6bb6 100644
--- a/lib/l10n/nn_NO.json
+++ b/lib/l10n/nn_NO.json
@@ -74,11 +74,7 @@
     "Authentication error" : "Feil i autentisering",
     "Summary" : "Oppsumering",
     "File name is too long" : "Filnamnet er for langt",
-    "Help" : "Hjelp",
     "Users" : "Brukarar",
-    "Unknown user" : "Ukjend brukar",
-    "Open »%s«" : "Opna »%s«",
-    "A valid username must be provided" : "Du må oppgje eit gyldig brukarnamn",
-    "User disabled" : "Brukar deaktivert"
+    "Open »%s«" : "Opna »%s«"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/oc.js b/lib/l10n/oc.js
index 2239187271a..15589751143 100644
--- a/lib/l10n/oc.js
+++ b/lib/l10n/oc.js
@@ -72,9 +72,7 @@ OC.L10N.register(
     "Chat" : "Messatjariá",
     "Text" : "Tèxt",
     "Translate" : "Tradurre",
-    "Help" : "Ajuda",
     "Users" : "Utilizaires",
-    "Open »%s«" : "Dobrir « %s »",
-    "User disabled" : "Utilizaire desactivat"
+    "Open »%s«" : "Dobrir « %s »"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/lib/l10n/oc.json b/lib/l10n/oc.json
index 8441c029d51..bae811f580e 100644
--- a/lib/l10n/oc.json
+++ b/lib/l10n/oc.json
@@ -70,9 +70,7 @@
     "Chat" : "Messatjariá",
     "Text" : "Tèxt",
     "Translate" : "Tradurre",
-    "Help" : "Ajuda",
     "Users" : "Utilizaires",
-    "Open »%s«" : "Dobrir « %s »",
-    "User disabled" : "Utilizaire desactivat"
+    "Open »%s«" : "Dobrir « %s »"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/pl.js b/lib/l10n/pl.js
index 85359de4509..8a51e6dcaf9 100644
--- a/lib/l10n/pl.js
+++ b/lib/l10n/pl.js
@@ -59,6 +59,7 @@ OC.L10N.register(
     "Avatar image is not square" : "Obraz awatara nie jest kwadratowy",
     "Files" : "Pliki",
     "View profile" : "Zobacz profil",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh","%ngodz."],
     "Local time: %s" : "Czas lokalny: %s",
     "today" : "dzisiaj",
     "tomorrow" : "jutro",
@@ -320,41 +321,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Podsumowuje tekst, zmniejszając jego długość bez utraty kluczowych informacji.",
     "Extracts topics from a text and outputs them separated by commas." : "Wyodrębnia tematy z tekstu i wyświetla je oddzielone przecinkami.",
     "Education Edition" : "Edycja edukacyjna",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Zalogowany użytkownik musi być administratorem, subadministratorem lub mieć specjalne uprawnienia dostępu do tego ustawienia",
-    "Logged in user must be an admin or sub admin" : "Zalogowany użytkownik musi być administratorem lub współadministratorem",
-    "Logged in user must be an admin" : "Zalogowany użytkownik musi być administratorem",
     "File name is a reserved word" : "Nazwa pliku jest zarezerwowana",
     "File name contains at least one invalid character" : "Nazwa pliku zawiera co najmniej jeden nieprawidłowy znak",
     "File name is too long" : "Nazwa pliku jest za długa",
-    "Help" : "Pomoc",
     "Users" : "Użytkownicy",
-    "Unknown user" : "Nieznany użytkownik",
-    "Enter the database username and name for %s" : "Podaj nazwę użytkownika i nazwę bazy danych dla %s",
-    "Enter the database username for %s" : "Podaj nazwę użytkownika bazy danych dla %s",
-    "MySQL username and/or password not valid" : "Błędna nazwa użytkownika i/lub hasło do bazy danych MySQL",
-    "Oracle username and/or password not valid" : "Zła nazwa użytkownika i/lub hasło do bazy danych Oracle",
-    "PostgreSQL username and/or password not valid" : "Zła nazwa użytkownika i/lub hasło do bazy danych PostgreSQL",
-    "Set an admin username." : "Ustaw nazwę administratora.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s udostępnił Tobie »%2$s« i chce dodać: ",
     "%1$s shared »%2$s« with you and wants to add" : " %1$s udostępnił Tobie »%2$s« i chce dodać",
     "»%s« added a note to a file shared with you" : "»%s« dodał notatkę do udostępnionego dla Ciebie pliku",
     "Open »%s«" : "Otwórz »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Udostępnianie %s nie powiodło się, ponieważ element jest już udostępniony użytkownikowi %s",
     "%1$s shared »%2$s« with you" : "%1$s udostępnił Tobie »%2$s«",
     "%1$s shared »%2$s« with you." : "%1$s udostępnił Tobie »%2$s«.",
     "Click the button below to open it." : "Kliknij przycisk poniżej, aby otworzyć.",
-    "The username is already being used" : "Ta nazwa użytkownika jest już używana",
-    "Could not create user" : "Nie można utworzyć użytkownika",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "W nazwie użytkownika dozwolone są tylko następujące znaki : \"a-z\", \"A-Z\", \"0-9\", spacje i \"_.@-'\"",
-    "A valid username must be provided" : "Należy podać prawidłową nazwę użytkownika",
-    "Username contains whitespace at the beginning or at the end" : "Nazwa użytkownika zawiera spację na początku albo na końcu",
-    "Username must not consist of dots only" : "Nazwa użytkownika nie może się składać tylko z kropek",
-    "Username is invalid because files already exist for this user" : "Nazwa użytkownika jest nieprawidłowa, ponieważ pliki już istnieją dla tego użytkownika",
-    "User disabled" : "Użytkownik zablokowany",
     "File is currently busy, please try again later" : "Plik jest obecnie niedostępny, spróbuj później",
     "Cannot download file" : "Nie można pobrać pliku",
-    "Your data directory is readable by other users." : "Twój katalog danych jest widoczny dla innych użytkowników.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Zmień uprawnienia na 0770, aby katalog nie był widoczny dla innych użytkowników.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Upewnij się, że w katalogu \"data\" znajduje się plik o nazwie \".ocdata\"."
 },
 "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);");
diff --git a/lib/l10n/pl.json b/lib/l10n/pl.json
index 932e5126282..f3f4a2bd199 100644
--- a/lib/l10n/pl.json
+++ b/lib/l10n/pl.json
@@ -57,6 +57,7 @@
     "Avatar image is not square" : "Obraz awatara nie jest kwadratowy",
     "Files" : "Pliki",
     "View profile" : "Zobacz profil",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh","%ngodz."],
     "Local time: %s" : "Czas lokalny: %s",
     "today" : "dzisiaj",
     "tomorrow" : "jutro",
@@ -318,41 +319,19 @@
     "Summarizes text by reducing its length without losing key information." : "Podsumowuje tekst, zmniejszając jego długość bez utraty kluczowych informacji.",
     "Extracts topics from a text and outputs them separated by commas." : "Wyodrębnia tematy z tekstu i wyświetla je oddzielone przecinkami.",
     "Education Edition" : "Edycja edukacyjna",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Zalogowany użytkownik musi być administratorem, subadministratorem lub mieć specjalne uprawnienia dostępu do tego ustawienia",
-    "Logged in user must be an admin or sub admin" : "Zalogowany użytkownik musi być administratorem lub współadministratorem",
-    "Logged in user must be an admin" : "Zalogowany użytkownik musi być administratorem",
     "File name is a reserved word" : "Nazwa pliku jest zarezerwowana",
     "File name contains at least one invalid character" : "Nazwa pliku zawiera co najmniej jeden nieprawidłowy znak",
     "File name is too long" : "Nazwa pliku jest za długa",
-    "Help" : "Pomoc",
     "Users" : "Użytkownicy",
-    "Unknown user" : "Nieznany użytkownik",
-    "Enter the database username and name for %s" : "Podaj nazwę użytkownika i nazwę bazy danych dla %s",
-    "Enter the database username for %s" : "Podaj nazwę użytkownika bazy danych dla %s",
-    "MySQL username and/or password not valid" : "Błędna nazwa użytkownika i/lub hasło do bazy danych MySQL",
-    "Oracle username and/or password not valid" : "Zła nazwa użytkownika i/lub hasło do bazy danych Oracle",
-    "PostgreSQL username and/or password not valid" : "Zła nazwa użytkownika i/lub hasło do bazy danych PostgreSQL",
-    "Set an admin username." : "Ustaw nazwę administratora.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s udostępnił Tobie »%2$s« i chce dodać: ",
     "%1$s shared »%2$s« with you and wants to add" : " %1$s udostępnił Tobie »%2$s« i chce dodać",
     "»%s« added a note to a file shared with you" : "»%s« dodał notatkę do udostępnionego dla Ciebie pliku",
     "Open »%s«" : "Otwórz »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Udostępnianie %s nie powiodło się, ponieważ element jest już udostępniony użytkownikowi %s",
     "%1$s shared »%2$s« with you" : "%1$s udostępnił Tobie »%2$s«",
     "%1$s shared »%2$s« with you." : "%1$s udostępnił Tobie »%2$s«.",
     "Click the button below to open it." : "Kliknij przycisk poniżej, aby otworzyć.",
-    "The username is already being used" : "Ta nazwa użytkownika jest już używana",
-    "Could not create user" : "Nie można utworzyć użytkownika",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "W nazwie użytkownika dozwolone są tylko następujące znaki : \"a-z\", \"A-Z\", \"0-9\", spacje i \"_.@-'\"",
-    "A valid username must be provided" : "Należy podać prawidłową nazwę użytkownika",
-    "Username contains whitespace at the beginning or at the end" : "Nazwa użytkownika zawiera spację na początku albo na końcu",
-    "Username must not consist of dots only" : "Nazwa użytkownika nie może się składać tylko z kropek",
-    "Username is invalid because files already exist for this user" : "Nazwa użytkownika jest nieprawidłowa, ponieważ pliki już istnieją dla tego użytkownika",
-    "User disabled" : "Użytkownik zablokowany",
     "File is currently busy, please try again later" : "Plik jest obecnie niedostępny, spróbuj później",
     "Cannot download file" : "Nie można pobrać pliku",
-    "Your data directory is readable by other users." : "Twój katalog danych jest widoczny dla innych użytkowników.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Zmień uprawnienia na 0770, aby katalog nie był widoczny dla innych użytkowników.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Upewnij się, że w katalogu \"data\" znajduje się plik o nazwie \".ocdata\"."
 },"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);"
 }
\ No newline at end of file
diff --git a/lib/l10n/ps.js b/lib/l10n/ps.js
index 869fe674bf5..ad12839299a 100644
--- a/lib/l10n/ps.js
+++ b/lib/l10n/ps.js
@@ -8,7 +8,6 @@ OC.L10N.register(
     "Apps" : "اپلېکشنونه",
     "Settings" : "سمونې",
     "Storage is temporarily not available" : "ذخیره د لنډې مودې لپاره نشته",
-    "Help" : "مرسته",
     "Users" : "کارنان"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/ps.json b/lib/l10n/ps.json
index 479bab99040..280d92e6b22 100644
--- a/lib/l10n/ps.json
+++ b/lib/l10n/ps.json
@@ -6,7 +6,6 @@
     "Apps" : "اپلېکشنونه",
     "Settings" : "سمونې",
     "Storage is temporarily not available" : "ذخیره د لنډې مودې لپاره نشته",
-    "Help" : "مرسته",
     "Users" : "کارنان"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js
index 97418444570..c2b419034ca 100644
--- a/lib/l10n/pt_BR.js
+++ b/lib/l10n/pt_BR.js
@@ -59,6 +59,7 @@ OC.L10N.register(
     "Avatar image is not square" : "A imagem do avatar não é quadrada",
     "Files" : "Arquivos",
     "View profile" : "Visualizar perfil",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh"],
     "Local time: %s" : "Hora local: %s",
     "today" : "hoje",
     "tomorrow" : "amanhã",
@@ -393,41 +394,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Resume o texto reduzindo seu comprimento sem perder informações importantes.",
     "Extracts topics from a text and outputs them separated by commas." : "Extrai tópicos de um texto e os gera separados por vírgulas.",
     "Education Edition" : "Edição Educativa",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "O usuário conectado deve ser um administrador, um subadministrador ou ter direito especial para acessar esta configuração",
-    "Logged in user must be an admin or sub admin" : "O usuário conectado deve ser um administrador ou subadministrador",
-    "Logged in user must be an admin" : "O usuário conectado deve ser um administrador",
     "File name is a reserved word" : "O nome do arquivo é uma palavra reservada",
     "File name contains at least one invalid character" : "O nome do arquivo contém pelo menos um caracter inválido",
     "File name is too long" : "O nome do arquivo é muito longo",
-    "Help" : "Ajuda",
     "Users" : "Usuários",
-    "Unknown user" : "Usuário desconhecido",
-    "Enter the database username and name for %s" : "Digite o nome de usuário e o nome do banco de dados para %s",
-    "Enter the database username for %s" : "Digite o nome de usuário do banco de dados para %s",
-    "MySQL username and/or password not valid" : "Nome de usuário e/ou senha do MySQL inválidos",
-    "Oracle username and/or password not valid" : "Nome de usuário e/ou senha Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "Nome de usuário e/ou senha PostgreSQL inválidos",
-    "Set an admin username." : "Defina um nome do usuário administrador.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s compartilhou »%2$s« com você e quer adicionar:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s compartilhou »%2$s« com você e quer adicionar",
     "»%s« added a note to a file shared with you" : "»%s« adicionou uma anotação num arquivo compartilhado com você",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Compartilhamento %s falhou, porque este item já está compartilhado com o usuário %s",
     "%1$s shared »%2$s« with you" : "%1$s compartilhou »%2$s« com você",
     "%1$s shared »%2$s« with you." : "%1$s compartilhou »%2$s« com você.",
     "Click the button below to open it." : "Clique no botão abaixo para abri-lo.",
-    "The username is already being used" : "Este nome de usuário já está em uso",
-    "Could not create user" : "Não foi possível criar o usuário",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Apenas os seguintes caracteres são permitidos em um nome de usuário: \"a-z\", \"A-Z\", \"0-9\", espaços e \"_.@-'\"",
-    "A valid username must be provided" : "Um nome de usuário válido deve ser fornecido",
-    "Username contains whitespace at the beginning or at the end" : "O nome de usuário contém espaço em branco no início ou no fim",
-    "Username must not consist of dots only" : "Nome do usuário não pode consistir de pontos somente",
-    "Username is invalid because files already exist for this user" : "O nome de usuário é inválido porque já exstem arquivos para este usuário",
-    "User disabled" : "Usuário desativado",
     "File is currently busy, please try again later" : "O arquivo está ocupado, tente novamente mais tarde",
     "Cannot download file" : "Não é possível baixar o arquivo",
-    "Your data directory is readable by other users." : "Seu diretório de dados pode ser lido por outros usuários.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor altere as permissões para 0770 para que o diretório não possa ser lido por outros usuários.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Assegure-se que exista um arquivo chamado \".ocdata\" na raiz do diretório \"data\"."
 },
 "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json
index 0805a89c62c..69f3a86d367 100644
--- a/lib/l10n/pt_BR.json
+++ b/lib/l10n/pt_BR.json
@@ -57,6 +57,7 @@
     "Avatar image is not square" : "A imagem do avatar não é quadrada",
     "Files" : "Arquivos",
     "View profile" : "Visualizar perfil",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh"],
     "Local time: %s" : "Hora local: %s",
     "today" : "hoje",
     "tomorrow" : "amanhã",
@@ -391,41 +392,19 @@
     "Summarizes text by reducing its length without losing key information." : "Resume o texto reduzindo seu comprimento sem perder informações importantes.",
     "Extracts topics from a text and outputs them separated by commas." : "Extrai tópicos de um texto e os gera separados por vírgulas.",
     "Education Edition" : "Edição Educativa",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "O usuário conectado deve ser um administrador, um subadministrador ou ter direito especial para acessar esta configuração",
-    "Logged in user must be an admin or sub admin" : "O usuário conectado deve ser um administrador ou subadministrador",
-    "Logged in user must be an admin" : "O usuário conectado deve ser um administrador",
     "File name is a reserved word" : "O nome do arquivo é uma palavra reservada",
     "File name contains at least one invalid character" : "O nome do arquivo contém pelo menos um caracter inválido",
     "File name is too long" : "O nome do arquivo é muito longo",
-    "Help" : "Ajuda",
     "Users" : "Usuários",
-    "Unknown user" : "Usuário desconhecido",
-    "Enter the database username and name for %s" : "Digite o nome de usuário e o nome do banco de dados para %s",
-    "Enter the database username for %s" : "Digite o nome de usuário do banco de dados para %s",
-    "MySQL username and/or password not valid" : "Nome de usuário e/ou senha do MySQL inválidos",
-    "Oracle username and/or password not valid" : "Nome de usuário e/ou senha Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "Nome de usuário e/ou senha PostgreSQL inválidos",
-    "Set an admin username." : "Defina um nome do usuário administrador.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s compartilhou »%2$s« com você e quer adicionar:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s compartilhou »%2$s« com você e quer adicionar",
     "»%s« added a note to a file shared with you" : "»%s« adicionou uma anotação num arquivo compartilhado com você",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Compartilhamento %s falhou, porque este item já está compartilhado com o usuário %s",
     "%1$s shared »%2$s« with you" : "%1$s compartilhou »%2$s« com você",
     "%1$s shared »%2$s« with you." : "%1$s compartilhou »%2$s« com você.",
     "Click the button below to open it." : "Clique no botão abaixo para abri-lo.",
-    "The username is already being used" : "Este nome de usuário já está em uso",
-    "Could not create user" : "Não foi possível criar o usuário",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Apenas os seguintes caracteres são permitidos em um nome de usuário: \"a-z\", \"A-Z\", \"0-9\", espaços e \"_.@-'\"",
-    "A valid username must be provided" : "Um nome de usuário válido deve ser fornecido",
-    "Username contains whitespace at the beginning or at the end" : "O nome de usuário contém espaço em branco no início ou no fim",
-    "Username must not consist of dots only" : "Nome do usuário não pode consistir de pontos somente",
-    "Username is invalid because files already exist for this user" : "O nome de usuário é inválido porque já exstem arquivos para este usuário",
-    "User disabled" : "Usuário desativado",
     "File is currently busy, please try again later" : "O arquivo está ocupado, tente novamente mais tarde",
     "Cannot download file" : "Não é possível baixar o arquivo",
-    "Your data directory is readable by other users." : "Seu diretório de dados pode ser lido por outros usuários.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor altere as permissões para 0770 para que o diretório não possa ser lido por outros usuários.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Assegure-se que exista um arquivo chamado \".ocdata\" na raiz do diretório \"data\"."
 },"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/pt_PT.js b/lib/l10n/pt_PT.js
index 6d7c0486f2b..3e4f4a0e9df 100644
--- a/lib/l10n/pt_PT.js
+++ b/lib/l10n/pt_PT.js
@@ -177,34 +177,19 @@ OC.L10N.register(
     "Summary" : "Resumo",
     "Translate" : "Traduzir",
     "Education Edition" : "Edição Educação",
-    "Logged in user must be an admin or sub admin" : "O utilizador autenticado tem de ser um administrador ou subadministrador",
-    "Logged in user must be an admin" : "O utilizador autenticado tem de ser um administrador",
     "File name is a reserved word" : "Nome de ficheiro é uma palavra reservada",
     "File name contains at least one invalid character" : "Nome de ficheiro contém pelo menos um caráter inválido",
     "File name is too long" : "Nome do ficheiro demasiado longo",
-    "Help" : "Ajuda",
     "Users" : "Utilizadores",
-    "Unknown user" : "Utilizador desconhecido",
-    "Oracle username and/or password not valid" : "Nome de utilizador/palavra-passe do Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "Nome de utilizador/password do PostgreSQL inválidos",
-    "Set an admin username." : "Definir um nome de utilizador de administrador",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s partilhado »%2$s« consigo e quer adicionar:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s partilhado »%2$s« consigo e quer adicionar:",
     "»%s« added a note to a file shared with you" : "»%s« adicionou uma nota a um ficheiro partilhado consigo",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "A partilha de %s falhou, porque este item já está a ser partilhado com o utilizador %s",
     "%1$s shared »%2$s« with you" : "%1$s partilhado »%2$s« contigo",
     "%1$s shared »%2$s« with you." : "%1$s partilhado »%2$s« contigo.",
     "Click the button below to open it." : "Clicar no botão abaixo para abrir.",
-    "The username is already being used" : "O nome de utilizador já está a ser usado",
-    "Could not create user" : "Não foi possível criar o utilizador",
-    "A valid username must be provided" : "Um nome de utilizador válido deve ser fornecido",
-    "Username contains whitespace at the beginning or at the end" : "Nome de utilizador contém espaço em branco no início ou no fim",
-    "Username must not consist of dots only" : "O utilizador não pode consistir de apenas pontos",
-    "User disabled" : "Utilizador desativado",
     "File is currently busy, please try again later" : "O ficheiro está ocupado, por favor, tente mais tarde",
     "Cannot download file" : "Não é possível transferir o ficheiro",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor altere as permissões para 0770 para que esse directório não possa ser listado por outros utilizadores.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Garanta que existe um ficheiro chamado \".occdata\" na raiz do directório de dados"
 },
 "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/lib/l10n/pt_PT.json b/lib/l10n/pt_PT.json
index 8e3532bbbb4..07d3265cec9 100644
--- a/lib/l10n/pt_PT.json
+++ b/lib/l10n/pt_PT.json
@@ -175,34 +175,19 @@
     "Summary" : "Resumo",
     "Translate" : "Traduzir",
     "Education Edition" : "Edição Educação",
-    "Logged in user must be an admin or sub admin" : "O utilizador autenticado tem de ser um administrador ou subadministrador",
-    "Logged in user must be an admin" : "O utilizador autenticado tem de ser um administrador",
     "File name is a reserved word" : "Nome de ficheiro é uma palavra reservada",
     "File name contains at least one invalid character" : "Nome de ficheiro contém pelo menos um caráter inválido",
     "File name is too long" : "Nome do ficheiro demasiado longo",
-    "Help" : "Ajuda",
     "Users" : "Utilizadores",
-    "Unknown user" : "Utilizador desconhecido",
-    "Oracle username and/or password not valid" : "Nome de utilizador/palavra-passe do Oracle inválidos",
-    "PostgreSQL username and/or password not valid" : "Nome de utilizador/password do PostgreSQL inválidos",
-    "Set an admin username." : "Definir um nome de utilizador de administrador",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s partilhado »%2$s« consigo e quer adicionar:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s partilhado »%2$s« consigo e quer adicionar:",
     "»%s« added a note to a file shared with you" : "»%s« adicionou uma nota a um ficheiro partilhado consigo",
     "Open »%s«" : "Abrir »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "A partilha de %s falhou, porque este item já está a ser partilhado com o utilizador %s",
     "%1$s shared »%2$s« with you" : "%1$s partilhado »%2$s« contigo",
     "%1$s shared »%2$s« with you." : "%1$s partilhado »%2$s« contigo.",
     "Click the button below to open it." : "Clicar no botão abaixo para abrir.",
-    "The username is already being used" : "O nome de utilizador já está a ser usado",
-    "Could not create user" : "Não foi possível criar o utilizador",
-    "A valid username must be provided" : "Um nome de utilizador válido deve ser fornecido",
-    "Username contains whitespace at the beginning or at the end" : "Nome de utilizador contém espaço em branco no início ou no fim",
-    "Username must not consist of dots only" : "O utilizador não pode consistir de apenas pontos",
-    "User disabled" : "Utilizador desativado",
     "File is currently busy, please try again later" : "O ficheiro está ocupado, por favor, tente mais tarde",
     "Cannot download file" : "Não é possível transferir o ficheiro",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor altere as permissões para 0770 para que esse directório não possa ser listado por outros utilizadores.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Garanta que existe um ficheiro chamado \".occdata\" na raiz do directório de dados"
 },"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/lib/l10n/ro.js b/lib/l10n/ro.js
index 91f0f9ad53d..6854b8bd3ed 100644
--- a/lib/l10n/ro.js
+++ b/lib/l10n/ro.js
@@ -237,41 +237,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Rezumă textul prin reducerea lungimii acestuia, fără a pierde informațiile cheie.",
     "Extracts topics from a text and outputs them separated by commas." : "Extrage subiecte din text și le furnizează separate prin virgulă.",
     "Education Edition" : "Ediția pentru educație",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Utilizatorul trebuie să fie administrator, sub-administrator sau să aibă permisiunea specială de a accesa această setare",
-    "Logged in user must be an admin or sub admin" : "Utilizatorul trebuie să fie administrator sau sub-administrator",
-    "Logged in user must be an admin" : "Utilizatorul trebuie să fie administrator",
     "File name is a reserved word" : "Numele fișierului este un cuvânt rezervat",
     "File name contains at least one invalid character" : "Numele fișierului conține cel puțin un caracter invalid",
     "File name is too long" : "Numele fișierului este prea lung",
-    "Help" : "Ajutor",
     "Users" : "Utilizatori",
-    "Unknown user" : "Utilizator necunoscut",
-    "Enter the database username and name for %s" : "Introduceți utilizatorul pentru baza de date și numele pentru %s",
-    "Enter the database username for %s" : "Introduceți utilizatorul pentru %s",
-    "MySQL username and/or password not valid" : "Utilizatorul sau/și parola MySQL invalide",
-    "Oracle username and/or password not valid" : "Numele de utilizator sau / și parola Oracle nu sunt valide",
-    "PostgreSQL username and/or password not valid" : "Nume utilizator și/sau parolă PostgreSQL greșită",
-    "Set an admin username." : "Setează un nume de administrator.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s a partajat »%2$s« cu tine și vrea să adauge:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s a partajat »%2$s« cu tine și vrea să adauge",
     "»%s« added a note to a file shared with you" : "%s« a adaugat un comentariu la un fișier partajat cu tine",
     "Open »%s«" : "Deschide »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Partajarea %s a eșuat deoarece acest element este deja partajat cu utilizatorul %s",
     "%1$s shared »%2$s« with you" : "%1$s a partajat »%2$s« cu tine",
     "%1$s shared »%2$s« with you." : "%1$sa partajat »%2$s« cu tine.",
     "Click the button below to open it." : "Apasă pe butonul de jos pentru a deschide.",
-    "The username is already being used" : "Numele de utilizator este deja folosit",
-    "Could not create user" : "Nu s-a putut crea utilizatorul",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Doar următoarele caractere sunt permise în numele de utilizatori: \"a-z\", \"A-Z\", \"0-9\", spații și \"_.@-'\"",
-    "A valid username must be provided" : "Trebuie să furnizaţi un nume de utilizator valid",
-    "Username contains whitespace at the beginning or at the end" : "Utilizatorul contine spațiu liber la început sau la sfârșit",
-    "Username must not consist of dots only" : "Numele utilizatorului nu poate conține numai puncte",
-    "Username is invalid because files already exist for this user" : "Numele utilizatorului este invalid deoarece există deja fișiere pentru acesta",
-    "User disabled" : "Utilizator dezactivat",
     "File is currently busy, please try again later" : "Fișierul este blocat momentan, încercați din nou mai târziu",
     "Cannot download file" : "Fișierul nu se poate descărca",
-    "Your data directory is readable by other users." : "Directorul de date este accesibil altor utilizatori.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Setați permisiunea 0770 astfel ca directorul să nu poată fi parcurs de alți utilizatori.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asigurați-vă că fișierul \".ocdata\" există în rădăcina directorului de date."
 },
 "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/lib/l10n/ro.json b/lib/l10n/ro.json
index 84a12d9afa1..2661c757b69 100644
--- a/lib/l10n/ro.json
+++ b/lib/l10n/ro.json
@@ -235,41 +235,19 @@
     "Summarizes text by reducing its length without losing key information." : "Rezumă textul prin reducerea lungimii acestuia, fără a pierde informațiile cheie.",
     "Extracts topics from a text and outputs them separated by commas." : "Extrage subiecte din text și le furnizează separate prin virgulă.",
     "Education Edition" : "Ediția pentru educație",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Utilizatorul trebuie să fie administrator, sub-administrator sau să aibă permisiunea specială de a accesa această setare",
-    "Logged in user must be an admin or sub admin" : "Utilizatorul trebuie să fie administrator sau sub-administrator",
-    "Logged in user must be an admin" : "Utilizatorul trebuie să fie administrator",
     "File name is a reserved word" : "Numele fișierului este un cuvânt rezervat",
     "File name contains at least one invalid character" : "Numele fișierului conține cel puțin un caracter invalid",
     "File name is too long" : "Numele fișierului este prea lung",
-    "Help" : "Ajutor",
     "Users" : "Utilizatori",
-    "Unknown user" : "Utilizator necunoscut",
-    "Enter the database username and name for %s" : "Introduceți utilizatorul pentru baza de date și numele pentru %s",
-    "Enter the database username for %s" : "Introduceți utilizatorul pentru %s",
-    "MySQL username and/or password not valid" : "Utilizatorul sau/și parola MySQL invalide",
-    "Oracle username and/or password not valid" : "Numele de utilizator sau / și parola Oracle nu sunt valide",
-    "PostgreSQL username and/or password not valid" : "Nume utilizator și/sau parolă PostgreSQL greșită",
-    "Set an admin username." : "Setează un nume de administrator.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s a partajat »%2$s« cu tine și vrea să adauge:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s a partajat »%2$s« cu tine și vrea să adauge",
     "»%s« added a note to a file shared with you" : "%s« a adaugat un comentariu la un fișier partajat cu tine",
     "Open »%s«" : "Deschide »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Partajarea %s a eșuat deoarece acest element este deja partajat cu utilizatorul %s",
     "%1$s shared »%2$s« with you" : "%1$s a partajat »%2$s« cu tine",
     "%1$s shared »%2$s« with you." : "%1$sa partajat »%2$s« cu tine.",
     "Click the button below to open it." : "Apasă pe butonul de jos pentru a deschide.",
-    "The username is already being used" : "Numele de utilizator este deja folosit",
-    "Could not create user" : "Nu s-a putut crea utilizatorul",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Doar următoarele caractere sunt permise în numele de utilizatori: \"a-z\", \"A-Z\", \"0-9\", spații și \"_.@-'\"",
-    "A valid username must be provided" : "Trebuie să furnizaţi un nume de utilizator valid",
-    "Username contains whitespace at the beginning or at the end" : "Utilizatorul contine spațiu liber la început sau la sfârșit",
-    "Username must not consist of dots only" : "Numele utilizatorului nu poate conține numai puncte",
-    "Username is invalid because files already exist for this user" : "Numele utilizatorului este invalid deoarece există deja fișiere pentru acesta",
-    "User disabled" : "Utilizator dezactivat",
     "File is currently busy, please try again later" : "Fișierul este blocat momentan, încercați din nou mai târziu",
     "Cannot download file" : "Fișierul nu se poate descărca",
-    "Your data directory is readable by other users." : "Directorul de date este accesibil altor utilizatori.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Setați permisiunea 0770 astfel ca directorul să nu poată fi parcurs de alți utilizatori.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Asigurați-vă că fișierul \".ocdata\" există în rădăcina directorului de date."
 },"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
 }
\ No newline at end of file
diff --git a/lib/l10n/ru.js b/lib/l10n/ru.js
index 485e2207e17..4f2c05d2d66 100644
--- a/lib/l10n/ru.js
+++ b/lib/l10n/ru.js
@@ -59,6 +59,7 @@ OC.L10N.register(
     "Avatar image is not square" : "Изображение аватара не квадратное",
     "Files" : "Файлы",
     "View profile" : "Открыть профиль",
+    "_%nh_::_%nh_" : ["%nч","%nч","%nч","%nч"],
     "Local time: %s" : "Местное время: %s",
     "today" : "сегодня",
     "tomorrow" : "завтра",
@@ -374,41 +375,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Обобщает текст, сокращая его длину без потери ключевой информации.",
     "Extracts topics from a text and outputs them separated by commas." : "Извлекает темы из текста и выводит их через запятую.",
     "Education Edition" : "Набор приложений для образовательных учреждений",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Для доступа к этому параметру необходимо состоять в группе администраторов, суб-администраторов или иметь специальные права",
-    "Logged in user must be an admin or sub admin" : "Вошедший в систему пользователь должен обладать правами администратора или суб-администратора",
-    "Logged in user must be an admin" : "Вошедший в систему пользователь должен обладать правами администратора",
     "File name is a reserved word" : "Имя файла является зарезервированным словом",
     "File name contains at least one invalid character" : "Имя файла содержит по крайней мере один недопустимый символ",
     "File name is too long" : "Имя файла слишком длинное.",
-    "Help" : "Помощь",
     "Users" : "Пользователи",
-    "Unknown user" : "Неизвестный пользователь",
-    "Enter the database username and name for %s" : "Укажите имя пользователя и название базы данных %s",
-    "Enter the database username for %s" : "Укажите имя пользователя базы данных %s",
-    "MySQL username and/or password not valid" : "Неверное имя пользователя и/или пароль для подключения к MySQL",
-    "Oracle username and/or password not valid" : "Неверное имя пользователя и/или пароль Oracle",
-    "PostgreSQL username and/or password not valid" : "Неверное имя пользователя и/или пароль PostgreSQL",
-    "Set an admin username." : "Задать имя пользователя для администратора.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s предоставил(а) вам доступ к «%2$s» и хочет добавить:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s предоставил(а) вам доступ к «%2$s» и хочет добавить",
     "»%s« added a note to a file shared with you" : "%s добавил(а) примечание к файлу, к которому вам открыт доступ",
     "Open »%s«" : "Открыть «%s»",
-    "Sharing %s failed, because this item is already shared with user %s" : "Не удалось поделиться %s, так как элемент находится в общем доступе у %s",
     "%1$s shared »%2$s« with you" : "%1$s предоставил(а) вам доступ к «%2$s»",
     "%1$s shared »%2$s« with you." : "%1$s предоставил(а) вам доступ к «%2$s».",
     "Click the button below to open it." : "Нажмите расположенную ниже кнопку для перехода к полученному общему ресурсу.",
-    "The username is already being used" : "Имя пользователя уже используется",
-    "Could not create user" : "Не удалось создать пользователя",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "В имени пользователя допускаются следующие символы: «a–z», «A–Z», «0–9» и «_.@-'»",
-    "A valid username must be provided" : "Укажите допустимое имя пользователя",
-    "Username contains whitespace at the beginning or at the end" : "Имя пользователя содержит пробел в начале или в конце",
-    "Username must not consist of dots only" : "Имя пользователя должно состоять не только из точек",
-    "Username is invalid because files already exist for this user" : "Это имя не может быть использовано, файлы этого пользователя уже существуют",
-    "User disabled" : "Пользователь отключен",
     "File is currently busy, please try again later" : "Файл в данный момент используется, повторите попытку позже.",
     "Cannot download file" : "Не удалось скачать файл",
-    "Your data directory is readable by other users." : "Каталог данных доступен для чтения другим пользователям.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Измените права доступа на 0770, чтобы другие пользователи не могли получить список файлов этого каталога.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Убедитесь, что в корне каталога данных присутствует файл «.ocdata»."
 },
 "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
diff --git a/lib/l10n/ru.json b/lib/l10n/ru.json
index d6c56912d2c..2a2cce7e76b 100644
--- a/lib/l10n/ru.json
+++ b/lib/l10n/ru.json
@@ -57,6 +57,7 @@
     "Avatar image is not square" : "Изображение аватара не квадратное",
     "Files" : "Файлы",
     "View profile" : "Открыть профиль",
+    "_%nh_::_%nh_" : ["%nч","%nч","%nч","%nч"],
     "Local time: %s" : "Местное время: %s",
     "today" : "сегодня",
     "tomorrow" : "завтра",
@@ -372,41 +373,19 @@
     "Summarizes text by reducing its length without losing key information." : "Обобщает текст, сокращая его длину без потери ключевой информации.",
     "Extracts topics from a text and outputs them separated by commas." : "Извлекает темы из текста и выводит их через запятую.",
     "Education Edition" : "Набор приложений для образовательных учреждений",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Для доступа к этому параметру необходимо состоять в группе администраторов, суб-администраторов или иметь специальные права",
-    "Logged in user must be an admin or sub admin" : "Вошедший в систему пользователь должен обладать правами администратора или суб-администратора",
-    "Logged in user must be an admin" : "Вошедший в систему пользователь должен обладать правами администратора",
     "File name is a reserved word" : "Имя файла является зарезервированным словом",
     "File name contains at least one invalid character" : "Имя файла содержит по крайней мере один недопустимый символ",
     "File name is too long" : "Имя файла слишком длинное.",
-    "Help" : "Помощь",
     "Users" : "Пользователи",
-    "Unknown user" : "Неизвестный пользователь",
-    "Enter the database username and name for %s" : "Укажите имя пользователя и название базы данных %s",
-    "Enter the database username for %s" : "Укажите имя пользователя базы данных %s",
-    "MySQL username and/or password not valid" : "Неверное имя пользователя и/или пароль для подключения к MySQL",
-    "Oracle username and/or password not valid" : "Неверное имя пользователя и/или пароль Oracle",
-    "PostgreSQL username and/or password not valid" : "Неверное имя пользователя и/или пароль PostgreSQL",
-    "Set an admin username." : "Задать имя пользователя для администратора.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s предоставил(а) вам доступ к «%2$s» и хочет добавить:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s предоставил(а) вам доступ к «%2$s» и хочет добавить",
     "»%s« added a note to a file shared with you" : "%s добавил(а) примечание к файлу, к которому вам открыт доступ",
     "Open »%s«" : "Открыть «%s»",
-    "Sharing %s failed, because this item is already shared with user %s" : "Не удалось поделиться %s, так как элемент находится в общем доступе у %s",
     "%1$s shared »%2$s« with you" : "%1$s предоставил(а) вам доступ к «%2$s»",
     "%1$s shared »%2$s« with you." : "%1$s предоставил(а) вам доступ к «%2$s».",
     "Click the button below to open it." : "Нажмите расположенную ниже кнопку для перехода к полученному общему ресурсу.",
-    "The username is already being used" : "Имя пользователя уже используется",
-    "Could not create user" : "Не удалось создать пользователя",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "В имени пользователя допускаются следующие символы: «a–z», «A–Z», «0–9» и «_.@-'»",
-    "A valid username must be provided" : "Укажите допустимое имя пользователя",
-    "Username contains whitespace at the beginning or at the end" : "Имя пользователя содержит пробел в начале или в конце",
-    "Username must not consist of dots only" : "Имя пользователя должно состоять не только из точек",
-    "Username is invalid because files already exist for this user" : "Это имя не может быть использовано, файлы этого пользователя уже существуют",
-    "User disabled" : "Пользователь отключен",
     "File is currently busy, please try again later" : "Файл в данный момент используется, повторите попытку позже.",
     "Cannot download file" : "Не удалось скачать файл",
-    "Your data directory is readable by other users." : "Каталог данных доступен для чтения другим пользователям.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Измените права доступа на 0770, чтобы другие пользователи не могли получить список файлов этого каталога.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Убедитесь, что в корне каталога данных присутствует файл «.ocdata»."
 },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
 }
\ No newline at end of file
diff --git a/lib/l10n/sc.js b/lib/l10n/sc.js
index 192f6e33363..c8053d7e19f 100644
--- a/lib/l10n/sc.js
+++ b/lib/l10n/sc.js
@@ -46,6 +46,7 @@ OC.L10N.register(
     "Avatar image is not square" : "S'immàgine de s'avatar no est cuadrada",
     "Files" : "Archìvios",
     "View profile" : "Ammustra su profilu",
+    "_%nh_::_%nh_" : ["%nh","%nh"],
     "today" : "oe",
     "tomorrow" : "cras",
     "yesterday" : "eris",
@@ -202,35 +203,18 @@ OC.L10N.register(
     "Result" : "Resurtadu",
     "Generate headline" : "Gènera unu tìtulu",
     "Education Edition" : "Editzione didàtica",
-    "Logged in user must be an admin or sub admin" : "S'utente devet essere de s'amministratzione o de sa suta-amministratzione ",
-    "Logged in user must be an admin" : "S'utente devet essere de s'amministratzione ",
     "File name is a reserved word" : "Su nùmene de s'archìviu est unu faeddu riservadu",
     "File name contains at least one invalid character" : "Su nùmene de s'archìviu cuntenet a su mancu unu caràtere imbàlidu",
     "File name is too long" : "Su nùmene de s'archìviu est tropu longu",
-    "Help" : "Agiudu",
     "Users" : "Utentes",
-    "Unknown user" : "Utèntzia disconnota",
-    "MySQL username and/or password not valid" : "Su nùmene utente e/o sa crae de MySQL no sunt bàlidos",
-    "Oracle username and/or password not valid" : "Su nùmene utente e/o sa crae de Oracle no sunt bàlidos",
-    "PostgreSQL username and/or password not valid" : "Su nùmene utente e/o sa crae de Postgre SQL no sunt bàlidos",
-    "Set an admin username." : "Cunfigura unu nùmene utente de amministratzione.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s at cumpartzidu »%2$s« cun tegus e bolet agiùnghere:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s at cumpartzidu »%2$s« cun tegus e bolet agiùnghere",
     "»%s« added a note to a file shared with you" : "»%s« at agiuntu una nota a un'archìviu cumpartzidu cun tegus",
     "Open »%s«" : "Aberi »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "No at fatu a cumpartzire %s, ca custu elementu est giai istadu cumpartzidu cun s'utente %s",
     "%1$s shared »%2$s« with you" : "%1$s at cumpartzidu »%2$s cun tegus",
     "%1$s shared »%2$s« with you." : "%1$s at cumpartzidu »%2$s cun tegus.",
     "Click the button below to open it." : "Incarca su butone a suta pro dd'abèrrere.",
-    "The username is already being used" : "Su nùmene utente est giai impreadu",
-    "Could not create user" : "No at fatu a creare s'utente",
-    "A valid username must be provided" : "Depes frunire unu nùmene utente bàlidu",
-    "Username contains whitespace at the beginning or at the end" : "Su nùmene utente cuntenet ispàtzios bòidos a su cumintzu o a sa fine",
-    "Username must not consist of dots only" : "Su nùmene utente no depet tènnere isceti puntos",
-    "Username is invalid because files already exist for this user" : "Su nùmene utente no est bàlidu, ca is archìvios bi sunt giai pro cust'utèntzia",
-    "User disabled" : "Utèntzia disativada",
     "File is currently busy, please try again later" : "Pro immoe s'archìviu est impreadu, torra a proare a coa",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Càmbia is permissos a 0770 aici sa cartella no podet èssere in is elencos de àteras utèntzias.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Assegura•ti chi in sa cartella de datos de orìgine nche siat un'archìviu cun nùmene \".ocdata\"."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/sc.json b/lib/l10n/sc.json
index 6048e8f441b..645a426a9c1 100644
--- a/lib/l10n/sc.json
+++ b/lib/l10n/sc.json
@@ -44,6 +44,7 @@
     "Avatar image is not square" : "S'immàgine de s'avatar no est cuadrada",
     "Files" : "Archìvios",
     "View profile" : "Ammustra su profilu",
+    "_%nh_::_%nh_" : ["%nh","%nh"],
     "today" : "oe",
     "tomorrow" : "cras",
     "yesterday" : "eris",
@@ -200,35 +201,18 @@
     "Result" : "Resurtadu",
     "Generate headline" : "Gènera unu tìtulu",
     "Education Edition" : "Editzione didàtica",
-    "Logged in user must be an admin or sub admin" : "S'utente devet essere de s'amministratzione o de sa suta-amministratzione ",
-    "Logged in user must be an admin" : "S'utente devet essere de s'amministratzione ",
     "File name is a reserved word" : "Su nùmene de s'archìviu est unu faeddu riservadu",
     "File name contains at least one invalid character" : "Su nùmene de s'archìviu cuntenet a su mancu unu caràtere imbàlidu",
     "File name is too long" : "Su nùmene de s'archìviu est tropu longu",
-    "Help" : "Agiudu",
     "Users" : "Utentes",
-    "Unknown user" : "Utèntzia disconnota",
-    "MySQL username and/or password not valid" : "Su nùmene utente e/o sa crae de MySQL no sunt bàlidos",
-    "Oracle username and/or password not valid" : "Su nùmene utente e/o sa crae de Oracle no sunt bàlidos",
-    "PostgreSQL username and/or password not valid" : "Su nùmene utente e/o sa crae de Postgre SQL no sunt bàlidos",
-    "Set an admin username." : "Cunfigura unu nùmene utente de amministratzione.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s at cumpartzidu »%2$s« cun tegus e bolet agiùnghere:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s at cumpartzidu »%2$s« cun tegus e bolet agiùnghere",
     "»%s« added a note to a file shared with you" : "»%s« at agiuntu una nota a un'archìviu cumpartzidu cun tegus",
     "Open »%s«" : "Aberi »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "No at fatu a cumpartzire %s, ca custu elementu est giai istadu cumpartzidu cun s'utente %s",
     "%1$s shared »%2$s« with you" : "%1$s at cumpartzidu »%2$s cun tegus",
     "%1$s shared »%2$s« with you." : "%1$s at cumpartzidu »%2$s cun tegus.",
     "Click the button below to open it." : "Incarca su butone a suta pro dd'abèrrere.",
-    "The username is already being used" : "Su nùmene utente est giai impreadu",
-    "Could not create user" : "No at fatu a creare s'utente",
-    "A valid username must be provided" : "Depes frunire unu nùmene utente bàlidu",
-    "Username contains whitespace at the beginning or at the end" : "Su nùmene utente cuntenet ispàtzios bòidos a su cumintzu o a sa fine",
-    "Username must not consist of dots only" : "Su nùmene utente no depet tènnere isceti puntos",
-    "Username is invalid because files already exist for this user" : "Su nùmene utente no est bàlidu, ca is archìvios bi sunt giai pro cust'utèntzia",
-    "User disabled" : "Utèntzia disativada",
     "File is currently busy, please try again later" : "Pro immoe s'archìviu est impreadu, torra a proare a coa",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Càmbia is permissos a 0770 aici sa cartella no podet èssere in is elencos de àteras utèntzias.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Assegura•ti chi in sa cartella de datos de orìgine nche siat un'archìviu cun nùmene \".ocdata\"."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/si.js b/lib/l10n/si.js
index 6b2915d16af..30bcd4d5772 100644
--- a/lib/l10n/si.js
+++ b/lib/l10n/si.js
@@ -65,8 +65,6 @@ OC.L10N.register(
     "Summary" : "සාරාංශය",
     "Translate" : "පරිවර්තනය",
     "File name is too long" : "ගොනුවේ නම දිග වැඩිය",
-    "Help" : "උපකාර",
-    "Users" : "පරිශීලකයින්",
-    "Unknown user" : "නොදන්නා පරිශීලකයෙකි"
+    "Users" : "පරිශීලකයින්"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/si.json b/lib/l10n/si.json
index fd5b2f45d86..87e5644d70b 100644
--- a/lib/l10n/si.json
+++ b/lib/l10n/si.json
@@ -63,8 +63,6 @@
     "Summary" : "සාරාංශය",
     "Translate" : "පරිවර්තනය",
     "File name is too long" : "ගොනුවේ නම දිග වැඩිය",
-    "Help" : "උපකාර",
-    "Users" : "පරිශීලකයින්",
-    "Unknown user" : "නොදන්නා පරිශීලකයෙකි"
+    "Users" : "පරිශීලකයින්"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/sk.js b/lib/l10n/sk.js
index 77d0662f418..10364290bdf 100644
--- a/lib/l10n/sk.js
+++ b/lib/l10n/sk.js
@@ -59,6 +59,11 @@ OC.L10N.register(
     "Avatar image is not square" : "Obrázok avatara nie je štvorcový",
     "Files" : "Súbory",
     "View profile" : "Zobraziť profil",
+    "same time" : "rovnaký čas",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh","%nh"],
+    "_%nm_::_%nm_" : ["%nm","%nm","%nm","%nm"],
+    "%s ahead" : "%s dopredu",
+    "%s behind" : "%s dozadu",
     "Local time: %s" : "Miestny čas: %s",
     "today" : "dnes",
     "tomorrow" : "zajtra",
@@ -81,6 +86,12 @@ OC.L10N.register(
     "seconds ago" : "pred sekundami",
     "Empty file" : "Prázdny súbor",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modul s ID: %s neexistuje. Povoľte ho prosím vo vašom nastavení aplikácií alebo kontaktujte správcu.",
+    "No file conversion providers available" : "Nie sú dostupný žiadny poskytovatelia konverzie",
+    "File is too large to convert" : "Súbor je príliš veľký pre konverziu",
+    "Destination does not match conversion extension" : "Cieľ nesúhlasí s príponou konverzie",
+    "Could not convert file" : "Nemožno skonvertovať súbor",
+    "Destination does not exist" : "Cieľ neexistuje",
+    "Destination is not creatable" : "Cieľ nie je možné vytvoriť",
     "Dot files are not allowed" : "Názov súboru začínajúci bodkou nie je povolený.",
     "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" je zakázané pre súbor alebo adresár",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" je zakázaná predpona pre názov súboru alebo adresára.",
@@ -92,6 +103,13 @@ OC.L10N.register(
     "Invalid path" : "Neplatná cesta",
     "Failed to create file from template" : "Nemôžem vytvoriť súbor zo šablóny",
     "Templates" : "Šablóny",
+    "Storage %s cannot be moved" : "Úložisko %s nemôže byť presunuté",
+    "Moving a share (%s) into a shared folder is not allowed" : "Presun zdieľania (%s) do zdieľaného adresára nie je povolený",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Presun úložiska (%s) do zdieľaného adresára nie je povolený",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Presun zdieľania (%s) do iného zdieľania (%s) nie je povolený",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Presun zdieľania (%s) do iného úložiska (%s) nie je povolený",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Presun úložiska (%s) do zdieľania (%s) nie je povolený",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Presun úložiska (%s) do iného úložiska (%s) nie je povolený",
     "Path contains invalid segments" : "Cesta obsahuje neplatné časti",
     "Filename is a reserved word" : "Názov súboru je rezervované slovo",
     "Filename contains at least one invalid character" : "Názov súboru obsahuje najmenej jeden nepovolený znak",
@@ -151,6 +169,9 @@ OC.L10N.register(
     "%1$s shared %2$s with you" : "%1$s s vami zdieľal %2$s ",
     "Open %s" : "Otvoriť %s",
     "%1$s via %2$s" : "%1$s cez %2$s",
+    "%1$s shared %2$s with you and wants to add:" : "%1$s zdieľal %2$s s vami a chce pridať:",
+    "%1$s shared %2$s with you and wants to add" : "%1$s zdieľal %2$s s vami a chce pridať",
+    "%s added a note to a file shared with you" : "%s pridal poznámku k súboru ktorý s vami zdieľa",
     "Passwords are enforced for link and mail shares" : "Heslo je vyžadováné pre zdieľanie odkazom alebo e-mailom",
     "Share recipient is not a valid user" : "Príjemca zdieľania nie je platným uživateľom",
     "Share recipient is not a valid group" : "Príjemca zdieľania nie je platnou skupinou",
@@ -186,6 +207,11 @@ OC.L10N.register(
     "Share does not have a full ID" : "Zdieľanie nemá plné ID",
     "Cannot change share type" : "Nie je možné zmeniť typ zdieľania",
     "Can only update recipient on user shares" : "Príjemcu je možné aktualizovať iba v užívateľských zdieľaniach",
+    "Cannot enable sending the password by Talk with an empty password" : "Nie je možné povoliť odosielanie hesla službou Rozhovor/Talk s prázdnym heslom",
+    "Cannot enable sending the password by Talk without setting a new password" : "Nie je možné povoliť odosielanie hesla službou Rozhovor/Talk bez nastavenia nového hesla",
+    "Cannot disable sending the password by Talk without setting a new password" : "Nie je možné zakázať odosielanie hesla službou Rozhovor/Talk bez nastavenia nového hesla",
+    "Share provider does not support accepting" : "Poskytovateľ zdieľania nepodporuje prijímanie",
+    "Cannot change target of link share" : "Nie je možné zmeniť cieľ zdieľaného odkazu",
     "Invalid share recipient" : "Neplatný príjemca zdieľania",
     "Group \"%s\" does not exist" : "Skupina \"%s\" neexistuje",
     "The requested share does not exist anymore" : "Požadované zdieľanie už neexistuje",
@@ -283,6 +309,7 @@ OC.L10N.register(
     "Your data directory must be an absolute path." : "Priečinok s dátami musí byť zadaný ako absolútna cesta.",
     "Check the value of \"datadirectory\" in your configuration." : "Skontrolujte hodnotu \"datadirectory\" vo vašej konfigurácii.",
     "Your data directory is invalid." : "Priečinok pre dáta je neplatný.",
+    "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Uistite sa, že v koreňovom adresári údajov je súbor s názvom \"%1$s\". Mal by mať obsah: \"%2$s\"",
     "Action \"%s\" not supported or implemented." : "Akcia \"%s\" nie je podporovaná alebo implementovaná.",
     "Authentication failed, wrong token or provider ID given" : "Autentifikácia zlyhala, bol zadaný neplatný token alebo ID poskytovateľa",
     "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Pre dokončenie požiadavky chýbajú parametre.  Chýbajúce parametre: \"%s\"",
@@ -301,8 +328,20 @@ OC.L10N.register(
     "The audio to transcribe" : "Zvuk pre prepísanie",
     "Transcription" : "Prepis",
     "The transcribed text" : "Prepísaný text",
+    "ContextAgent" : "ContextAgent",
+    "Chat with an agent" : "Čet s agentom",
     "Chat message" : "Správa chatu",
+    "A chat message to send to the agent." : "Správa četu pre poslanie agentovi.",
     "Confirmation" : "Potvrdenie",
+    "Whether to confirm previously requested actions: 0 for denial and 1 for confirmation." : "Či potvrdiť predtým požadované akcie: 0 pre odmietnutie a 1 pre potvrdenie.",
+    "Conversation token" : "Token konverzácie",
+    "A token representing the conversation." : "Token reprezentujúci konverzáciu.",
+    "Generated response" : "Vygenerovaná odpoveď",
+    "The response from the chat model." : "Odpoveď z modelu četu.",
+    "The new conversation token" : "Nový token konverzácie",
+    "Send this along with the next interaction." : "Odoslať to spolu s ďalšou interakciou.",
+    "Requested actions by the agent" : "Vyžiadané akcie agentom",
+    "Actions that the agent would like to carry out in JSON format." : "Akcie, ktoré by chcel agent vykonať vo formáte JSON.",
     "Context write" : "Kontextový zápis",
     "Writes text in a given style based on the provided source material." : "Napíše text v danom štýle na základe poskytnutého zdrojového materiálu.",
     "Writing style" : "Štýl písania",
@@ -324,15 +363,37 @@ OC.L10N.register(
     "How many images to generate" : "Koľko obrázkov sa bude generovať",
     "Output images" : "Výstupné obrázky",
     "The generated images" : "Vygenerované obrázky",
+    "Free text to text prompt" : "Výzva pre voľný text na text",
+    "Runs an arbitrary prompt through a language model that returns a reply" : "Spustí ľubovoľnú výzvu cez jazykový model, ktorý vráti odpoveď",
+    "Describe a task that you want the assistant to do or ask a question" : "Opíšte úlohu, ktorú má asistent vykonať, alebo položte otázku",
     "Generated reply" : "Vygenerovaná odpoveď",
+    "The generated text from the assistant" : "Generovaný text od asistenta",
+    "Change Tone" : "Zmeniť tón",
+    "Change the tone of a piece of text." : "Zmeniť tón časti textu",
+    "Write a text that you want the assistant to rewrite in another tone." : "Napíšte text pre ktorý chcete aby asistent prepísal v inom tóne.",
+    "Desired tone" : "Požadovaný tón",
+    "In which tone should your text be rewritten?" : "V akom tóne by mal byť váš text prepísaný?",
+    "The rewritten text in the desired tone, written by the assistant:" : "Prepísaný text v požadovanom tóne, napísaný asistentom:",
     "Chat" : "Chat",
     "Chat with the assistant" : "Chat s asistentom",
     "System prompt" : "Systémová výzva",
+    "Define rules and assumptions that the assistant should follow during the conversation." : "Definovať pravidlá a predpoklady, ktoré by mal asistent počas rozhovoru dodržiavať.",
     "Chat history" : "História chatu",
+    "The history of chat messages before the current message, starting with a message by the user" : "História četových správ pred aktuálnou správou, počnúc správou od užívateľa",
     "Response message" : "Správa s odpoveďou",
+    "The generated response as part of the conversation" : "Vygenerovaná odpoveď ako súčasť konverzácie",
+    "Chat with tools" : "Čet s nástrojom",
+    "Chat with the language model with tool calling support." : "Chatujte s jazykovým modelom s podporou volania pomocou nástroja.",
     "Tool message" : "Správa nástroja",
+    "The result of tool calls in the last interaction" : "Výsledok volaní nástroja v poslednej interakcii",
     "Available tools" : "Dostupné nástroje",
+    "The available tools in JSON format" : "Dostupné nástroje vo formáte JSON",
+    "The response from the chat model" : "Odpoveď z modelu četu",
+    "Tool calls" : "Žiadosti nástroja",
+    "Tools call instructions from the model in JSON format" : "Inštrukcie volaní nástroja z modelu v JSON formáte",
     "Formalize text" : "Formalizovať text",
+    "Takes a text and makes it sound more formal" : "Zobrať text a urobiť ho viac formálnym",
+    "Write a text that you want the assistant to formalize" : "Napíšte text ktorý chcete štylyzovať asistentom",
     "Formalized text" : "Formalizovaný text",
     "The formalized text" : "Formalizovaný text",
     "Generate a headline" : "Vygenerovať titulok",
@@ -340,8 +401,12 @@ OC.L10N.register(
     "Original text" : "Originálny text",
     "The original text to generate a headline for" : "Originálny text pre ktorý sa vygeneruje titulok",
     "The generated headline" : "Vygenerovaný titulok",
+    "Proofread" : "Korektúra",
+    "Proofreads a text and lists corrections" : "Urobiť korektúru textu a zobraziť korekcie",
     "Text" : "Text",
+    "The text to proofread" : "Text pre korektúru",
     "Corrections" : "Opravy",
+    "The corrections that should be made in your text" : "Korekcie ktoré môžu byť urobené vo vašom texte",
     "Reformulate text" : "Preformulovať text",
     "Takes a text and reformulates it" : "Zoberie text a preformuluje ho",
     "Write a text that you want the assistant to reformulate" : "Napíšte text pre ktorý chcete aby asistent preforumuloval",
@@ -378,41 +443,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Zhrňuje text tým, že znižuje jeho dĺžku bez straty kľúčových informácií.",
     "Extracts topics from a text and outputs them separated by commas." : "Extrahuje témy z textu a vypisuje ich oddelené čiarkami.",
     "Education Edition" : "Edícia pre výuku",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Prihlásený používateľ musí byť správcom, podadministrátorom alebo musí mať špeciálne právo na prístup k tomuto nastaveniu",
-    "Logged in user must be an admin or sub admin" : "Prihlásený používateľ musí byť správcom alebo správcom pre čiastkovú oblasť.",
-    "Logged in user must be an admin" : "Prihlásený používateľ musí byť správca",
     "File name is a reserved word" : "Názov súboru je rezervované slovo.",
     "File name contains at least one invalid character" : "Názov súboru obsahuje nepovolené znaky.",
     "File name is too long" : "Meno súboru je veľmi dlhé.",
-    "Help" : "Pomoc",
     "Users" : "Používatelia",
-    "Unknown user" : "Neznámy používateľ",
-    "Enter the database username and name for %s" : "Zadajte užívateľské meno a názov databázy pre %s",
-    "Enter the database username for %s" : "Zadajte užívateľské meno databázy pre %s",
-    "MySQL username and/or password not valid" : "Neplatné užívateľské meno a/alebo heslo do MySQL",
-    "Oracle username and/or password not valid" : "Používateľské meno a/alebo heslo pre Oracle databázu je neplatné",
-    "PostgreSQL username and/or password not valid" : "Používateľské meno a/alebo heslo pre PostgreSQL databázu je neplatné",
-    "Set an admin username." : "Zadajte používateľské meno administrátora.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s vám sprístupnil »%2$s« s poznámkou:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s vám sprístupnil »%2$s« s poznámkou",
     "»%s« added a note to a file shared with you" : "»%s« pridal poznámku k súboru ktorý s Vami zdieľa",
     "Open »%s«" : "Otvoriť »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Zdieľanie %s zlyhalo, táto položka už je používateľovi %s zozdieľaná",
     "%1$s shared »%2$s« with you" : "%1$s vám sprístupnil »%2$s«",
     "%1$s shared »%2$s« with you." : "%1$s vám sprístupnil »%2$s«.",
     "Click the button below to open it." : "Pre otvorenie klienta kliknite na tlačítko nižšie.",
-    "The username is already being used" : "Meno používateľa je už použité",
-    "Could not create user" : "Nepodarilo sa vytvoriť používateľa",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "V mene užívateľa je možné použiť iba nasledovné znaky: \"a-z\", \"A-Z\", \"0-9\", medzery a \"_.@-'\"",
-    "A valid username must be provided" : "Musíte zadať platné používateľské meno",
-    "Username contains whitespace at the beginning or at the end" : "Meno používateľa obsahuje na začiatku, alebo na konci medzeru",
-    "Username must not consist of dots only" : "Používateľské meno sa nesmie skladať len z bodiek",
-    "Username is invalid because files already exist for this user" : "Používateľské meno je neplatné, pretože pre tohto používateľa už existujú súbory",
-    "User disabled" : "Používateľ zakázaný",
     "File is currently busy, please try again later" : "Súbor sa práve používa, skúste prosím neskôr",
     "Cannot download file" : "Nemožno stiahnuť súbor",
-    "Your data directory is readable by other users." : "Váš priečinok s dátami je prístupný na čítanie ostatným užívateľom.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Prosím, zmeňte oprávnenia na 0770, aby tento priečinok nemohli ostatní používatelia otvoriť.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Uistite sa, že v koreňovom adresári sa nachádza súbor s názvom \".ocdata\"."
 },
 "nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);");
diff --git a/lib/l10n/sk.json b/lib/l10n/sk.json
index 321bc7432a0..50f2acf29ab 100644
--- a/lib/l10n/sk.json
+++ b/lib/l10n/sk.json
@@ -57,6 +57,11 @@
     "Avatar image is not square" : "Obrázok avatara nie je štvorcový",
     "Files" : "Súbory",
     "View profile" : "Zobraziť profil",
+    "same time" : "rovnaký čas",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh","%nh"],
+    "_%nm_::_%nm_" : ["%nm","%nm","%nm","%nm"],
+    "%s ahead" : "%s dopredu",
+    "%s behind" : "%s dozadu",
     "Local time: %s" : "Miestny čas: %s",
     "today" : "dnes",
     "tomorrow" : "zajtra",
@@ -79,6 +84,12 @@
     "seconds ago" : "pred sekundami",
     "Empty file" : "Prázdny súbor",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modul s ID: %s neexistuje. Povoľte ho prosím vo vašom nastavení aplikácií alebo kontaktujte správcu.",
+    "No file conversion providers available" : "Nie sú dostupný žiadny poskytovatelia konverzie",
+    "File is too large to convert" : "Súbor je príliš veľký pre konverziu",
+    "Destination does not match conversion extension" : "Cieľ nesúhlasí s príponou konverzie",
+    "Could not convert file" : "Nemožno skonvertovať súbor",
+    "Destination does not exist" : "Cieľ neexistuje",
+    "Destination is not creatable" : "Cieľ nie je možné vytvoriť",
     "Dot files are not allowed" : "Názov súboru začínajúci bodkou nie je povolený.",
     "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" je zakázané pre súbor alebo adresár",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" je zakázaná predpona pre názov súboru alebo adresára.",
@@ -90,6 +101,13 @@
     "Invalid path" : "Neplatná cesta",
     "Failed to create file from template" : "Nemôžem vytvoriť súbor zo šablóny",
     "Templates" : "Šablóny",
+    "Storage %s cannot be moved" : "Úložisko %s nemôže byť presunuté",
+    "Moving a share (%s) into a shared folder is not allowed" : "Presun zdieľania (%s) do zdieľaného adresára nie je povolený",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Presun úložiska (%s) do zdieľaného adresára nie je povolený",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Presun zdieľania (%s) do iného zdieľania (%s) nie je povolený",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Presun zdieľania (%s) do iného úložiska (%s) nie je povolený",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Presun úložiska (%s) do zdieľania (%s) nie je povolený",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Presun úložiska (%s) do iného úložiska (%s) nie je povolený",
     "Path contains invalid segments" : "Cesta obsahuje neplatné časti",
     "Filename is a reserved word" : "Názov súboru je rezervované slovo",
     "Filename contains at least one invalid character" : "Názov súboru obsahuje najmenej jeden nepovolený znak",
@@ -149,6 +167,9 @@
     "%1$s shared %2$s with you" : "%1$s s vami zdieľal %2$s ",
     "Open %s" : "Otvoriť %s",
     "%1$s via %2$s" : "%1$s cez %2$s",
+    "%1$s shared %2$s with you and wants to add:" : "%1$s zdieľal %2$s s vami a chce pridať:",
+    "%1$s shared %2$s with you and wants to add" : "%1$s zdieľal %2$s s vami a chce pridať",
+    "%s added a note to a file shared with you" : "%s pridal poznámku k súboru ktorý s vami zdieľa",
     "Passwords are enforced for link and mail shares" : "Heslo je vyžadováné pre zdieľanie odkazom alebo e-mailom",
     "Share recipient is not a valid user" : "Príjemca zdieľania nie je platným uživateľom",
     "Share recipient is not a valid group" : "Príjemca zdieľania nie je platnou skupinou",
@@ -184,6 +205,11 @@
     "Share does not have a full ID" : "Zdieľanie nemá plné ID",
     "Cannot change share type" : "Nie je možné zmeniť typ zdieľania",
     "Can only update recipient on user shares" : "Príjemcu je možné aktualizovať iba v užívateľských zdieľaniach",
+    "Cannot enable sending the password by Talk with an empty password" : "Nie je možné povoliť odosielanie hesla službou Rozhovor/Talk s prázdnym heslom",
+    "Cannot enable sending the password by Talk without setting a new password" : "Nie je možné povoliť odosielanie hesla službou Rozhovor/Talk bez nastavenia nového hesla",
+    "Cannot disable sending the password by Talk without setting a new password" : "Nie je možné zakázať odosielanie hesla službou Rozhovor/Talk bez nastavenia nového hesla",
+    "Share provider does not support accepting" : "Poskytovateľ zdieľania nepodporuje prijímanie",
+    "Cannot change target of link share" : "Nie je možné zmeniť cieľ zdieľaného odkazu",
     "Invalid share recipient" : "Neplatný príjemca zdieľania",
     "Group \"%s\" does not exist" : "Skupina \"%s\" neexistuje",
     "The requested share does not exist anymore" : "Požadované zdieľanie už neexistuje",
@@ -281,6 +307,7 @@
     "Your data directory must be an absolute path." : "Priečinok s dátami musí byť zadaný ako absolútna cesta.",
     "Check the value of \"datadirectory\" in your configuration." : "Skontrolujte hodnotu \"datadirectory\" vo vašej konfigurácii.",
     "Your data directory is invalid." : "Priečinok pre dáta je neplatný.",
+    "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Uistite sa, že v koreňovom adresári údajov je súbor s názvom \"%1$s\". Mal by mať obsah: \"%2$s\"",
     "Action \"%s\" not supported or implemented." : "Akcia \"%s\" nie je podporovaná alebo implementovaná.",
     "Authentication failed, wrong token or provider ID given" : "Autentifikácia zlyhala, bol zadaný neplatný token alebo ID poskytovateľa",
     "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Pre dokončenie požiadavky chýbajú parametre.  Chýbajúce parametre: \"%s\"",
@@ -299,8 +326,20 @@
     "The audio to transcribe" : "Zvuk pre prepísanie",
     "Transcription" : "Prepis",
     "The transcribed text" : "Prepísaný text",
+    "ContextAgent" : "ContextAgent",
+    "Chat with an agent" : "Čet s agentom",
     "Chat message" : "Správa chatu",
+    "A chat message to send to the agent." : "Správa četu pre poslanie agentovi.",
     "Confirmation" : "Potvrdenie",
+    "Whether to confirm previously requested actions: 0 for denial and 1 for confirmation." : "Či potvrdiť predtým požadované akcie: 0 pre odmietnutie a 1 pre potvrdenie.",
+    "Conversation token" : "Token konverzácie",
+    "A token representing the conversation." : "Token reprezentujúci konverzáciu.",
+    "Generated response" : "Vygenerovaná odpoveď",
+    "The response from the chat model." : "Odpoveď z modelu četu.",
+    "The new conversation token" : "Nový token konverzácie",
+    "Send this along with the next interaction." : "Odoslať to spolu s ďalšou interakciou.",
+    "Requested actions by the agent" : "Vyžiadané akcie agentom",
+    "Actions that the agent would like to carry out in JSON format." : "Akcie, ktoré by chcel agent vykonať vo formáte JSON.",
     "Context write" : "Kontextový zápis",
     "Writes text in a given style based on the provided source material." : "Napíše text v danom štýle na základe poskytnutého zdrojového materiálu.",
     "Writing style" : "Štýl písania",
@@ -322,15 +361,37 @@
     "How many images to generate" : "Koľko obrázkov sa bude generovať",
     "Output images" : "Výstupné obrázky",
     "The generated images" : "Vygenerované obrázky",
+    "Free text to text prompt" : "Výzva pre voľný text na text",
+    "Runs an arbitrary prompt through a language model that returns a reply" : "Spustí ľubovoľnú výzvu cez jazykový model, ktorý vráti odpoveď",
+    "Describe a task that you want the assistant to do or ask a question" : "Opíšte úlohu, ktorú má asistent vykonať, alebo položte otázku",
     "Generated reply" : "Vygenerovaná odpoveď",
+    "The generated text from the assistant" : "Generovaný text od asistenta",
+    "Change Tone" : "Zmeniť tón",
+    "Change the tone of a piece of text." : "Zmeniť tón časti textu",
+    "Write a text that you want the assistant to rewrite in another tone." : "Napíšte text pre ktorý chcete aby asistent prepísal v inom tóne.",
+    "Desired tone" : "Požadovaný tón",
+    "In which tone should your text be rewritten?" : "V akom tóne by mal byť váš text prepísaný?",
+    "The rewritten text in the desired tone, written by the assistant:" : "Prepísaný text v požadovanom tóne, napísaný asistentom:",
     "Chat" : "Chat",
     "Chat with the assistant" : "Chat s asistentom",
     "System prompt" : "Systémová výzva",
+    "Define rules and assumptions that the assistant should follow during the conversation." : "Definovať pravidlá a predpoklady, ktoré by mal asistent počas rozhovoru dodržiavať.",
     "Chat history" : "História chatu",
+    "The history of chat messages before the current message, starting with a message by the user" : "História četových správ pred aktuálnou správou, počnúc správou od užívateľa",
     "Response message" : "Správa s odpoveďou",
+    "The generated response as part of the conversation" : "Vygenerovaná odpoveď ako súčasť konverzácie",
+    "Chat with tools" : "Čet s nástrojom",
+    "Chat with the language model with tool calling support." : "Chatujte s jazykovým modelom s podporou volania pomocou nástroja.",
     "Tool message" : "Správa nástroja",
+    "The result of tool calls in the last interaction" : "Výsledok volaní nástroja v poslednej interakcii",
     "Available tools" : "Dostupné nástroje",
+    "The available tools in JSON format" : "Dostupné nástroje vo formáte JSON",
+    "The response from the chat model" : "Odpoveď z modelu četu",
+    "Tool calls" : "Žiadosti nástroja",
+    "Tools call instructions from the model in JSON format" : "Inštrukcie volaní nástroja z modelu v JSON formáte",
     "Formalize text" : "Formalizovať text",
+    "Takes a text and makes it sound more formal" : "Zobrať text a urobiť ho viac formálnym",
+    "Write a text that you want the assistant to formalize" : "Napíšte text ktorý chcete štylyzovať asistentom",
     "Formalized text" : "Formalizovaný text",
     "The formalized text" : "Formalizovaný text",
     "Generate a headline" : "Vygenerovať titulok",
@@ -338,8 +399,12 @@
     "Original text" : "Originálny text",
     "The original text to generate a headline for" : "Originálny text pre ktorý sa vygeneruje titulok",
     "The generated headline" : "Vygenerovaný titulok",
+    "Proofread" : "Korektúra",
+    "Proofreads a text and lists corrections" : "Urobiť korektúru textu a zobraziť korekcie",
     "Text" : "Text",
+    "The text to proofread" : "Text pre korektúru",
     "Corrections" : "Opravy",
+    "The corrections that should be made in your text" : "Korekcie ktoré môžu byť urobené vo vašom texte",
     "Reformulate text" : "Preformulovať text",
     "Takes a text and reformulates it" : "Zoberie text a preformuluje ho",
     "Write a text that you want the assistant to reformulate" : "Napíšte text pre ktorý chcete aby asistent preforumuloval",
@@ -376,41 +441,19 @@
     "Summarizes text by reducing its length without losing key information." : "Zhrňuje text tým, že znižuje jeho dĺžku bez straty kľúčových informácií.",
     "Extracts topics from a text and outputs them separated by commas." : "Extrahuje témy z textu a vypisuje ich oddelené čiarkami.",
     "Education Edition" : "Edícia pre výuku",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Prihlásený používateľ musí byť správcom, podadministrátorom alebo musí mať špeciálne právo na prístup k tomuto nastaveniu",
-    "Logged in user must be an admin or sub admin" : "Prihlásený používateľ musí byť správcom alebo správcom pre čiastkovú oblasť.",
-    "Logged in user must be an admin" : "Prihlásený používateľ musí byť správca",
     "File name is a reserved word" : "Názov súboru je rezervované slovo.",
     "File name contains at least one invalid character" : "Názov súboru obsahuje nepovolené znaky.",
     "File name is too long" : "Meno súboru je veľmi dlhé.",
-    "Help" : "Pomoc",
     "Users" : "Používatelia",
-    "Unknown user" : "Neznámy používateľ",
-    "Enter the database username and name for %s" : "Zadajte užívateľské meno a názov databázy pre %s",
-    "Enter the database username for %s" : "Zadajte užívateľské meno databázy pre %s",
-    "MySQL username and/or password not valid" : "Neplatné užívateľské meno a/alebo heslo do MySQL",
-    "Oracle username and/or password not valid" : "Používateľské meno a/alebo heslo pre Oracle databázu je neplatné",
-    "PostgreSQL username and/or password not valid" : "Používateľské meno a/alebo heslo pre PostgreSQL databázu je neplatné",
-    "Set an admin username." : "Zadajte používateľské meno administrátora.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s vám sprístupnil »%2$s« s poznámkou:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s vám sprístupnil »%2$s« s poznámkou",
     "»%s« added a note to a file shared with you" : "»%s« pridal poznámku k súboru ktorý s Vami zdieľa",
     "Open »%s«" : "Otvoriť »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Zdieľanie %s zlyhalo, táto položka už je používateľovi %s zozdieľaná",
     "%1$s shared »%2$s« with you" : "%1$s vám sprístupnil »%2$s«",
     "%1$s shared »%2$s« with you." : "%1$s vám sprístupnil »%2$s«.",
     "Click the button below to open it." : "Pre otvorenie klienta kliknite na tlačítko nižšie.",
-    "The username is already being used" : "Meno používateľa je už použité",
-    "Could not create user" : "Nepodarilo sa vytvoriť používateľa",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "V mene užívateľa je možné použiť iba nasledovné znaky: \"a-z\", \"A-Z\", \"0-9\", medzery a \"_.@-'\"",
-    "A valid username must be provided" : "Musíte zadať platné používateľské meno",
-    "Username contains whitespace at the beginning or at the end" : "Meno používateľa obsahuje na začiatku, alebo na konci medzeru",
-    "Username must not consist of dots only" : "Používateľské meno sa nesmie skladať len z bodiek",
-    "Username is invalid because files already exist for this user" : "Používateľské meno je neplatné, pretože pre tohto používateľa už existujú súbory",
-    "User disabled" : "Používateľ zakázaný",
     "File is currently busy, please try again later" : "Súbor sa práve používa, skúste prosím neskôr",
     "Cannot download file" : "Nemožno stiahnuť súbor",
-    "Your data directory is readable by other users." : "Váš priečinok s dátami je prístupný na čítanie ostatným užívateľom.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Prosím, zmeňte oprávnenia na 0770, aby tento priečinok nemohli ostatní používatelia otvoriť.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Uistite sa, že v koreňovom adresári sa nachádza súbor s názvom \".ocdata\"."
 },"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);"
 }
\ No newline at end of file
diff --git a/lib/l10n/sl.js b/lib/l10n/sl.js
index 17a5aeff504..44478124cb3 100644
--- a/lib/l10n/sl.js
+++ b/lib/l10n/sl.js
@@ -51,6 +51,7 @@ OC.L10N.register(
     "Avatar image is not square" : "Slika podobe ni kvadratna",
     "Files" : "Datoteke",
     "View profile" : "Pokaži profil",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh","%nh"],
     "Local time: %s" : "Krajevni čas: %s",
     "today" : "danes",
     "tomorrow" : "jutri",
@@ -230,40 +231,19 @@ OC.L10N.register(
     "Target language" : "Ciljni jezik",
     "Result" : "Rezultat",
     "Education Edition" : "Izobraževalna različica",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Prijavljen uporabnik mora biti določen za skrbnika, pomočnika skrbnika ali pa mora imeti dodeljene posebna dovoljenja za dostop do nastavitve.",
-    "Logged in user must be an admin or sub admin" : "Prijavljen uporabnik mora imeti dovoljenja skrbnika ali podpornega skrbnika",
-    "Logged in user must be an admin" : "Prijavljen uporabnik mora biti tudi skrbnik",
     "File name is a reserved word" : "Ime datoteke je zadržana beseda",
     "File name contains at least one invalid character" : "Ime datoteke vsebuje vsaj en nedovoljen znak.",
     "File name is too long" : "Ime datoteke je predolgo",
-    "Help" : "Pomoč",
     "Users" : "Uporabniki",
-    "Unknown user" : "Neznan uporabnik",
-    "Enter the database username and name for %s" : "Vpis uporabniškega imena in imena podatkovne zbirke za %s.",
-    "Enter the database username for %s" : "Vpis uporabniškega imena podatkovne zbirke za %s.",
-    "MySQL username and/or password not valid" : "Uporabniško ime ali geslo MySQL ni veljavno",
-    "Oracle username and/or password not valid" : "Uporabniško ime ali geslo Oracle ni veljavno",
-    "PostgreSQL username and/or password not valid" : "Uporabniško ime ali geslo PostgreSQL ni veljavno",
-    "Set an admin username." : "Nastavi uporabniško ime skrbnika.",
     "%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«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Nastavljanje souporabe %s je spodletelo, ker je predmet že v souporabi z uporabnikom %s.",
     "%1$s shared »%2$s« with you" : "%1$s vam omogoča souporabo »%2$s«",
     "%1$s shared »%2$s« with you." : "%1$s vam omogoča souporabo »%2$s«.",
     "Click the button below to open it." : "Kliknite na gumb za odpiranje.",
-    "The username is already being used" : "Vpisano uporabniško ime je že v uporabi",
-    "Could not create user" : "Uporabnika ni mogoče ustvariti",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "V uporabniškem imenu je dovoljeno uporabiti le znake: »a–z«, »A–Z«, »0–9«, presledki in »_.@-«\".",
-    "A valid username must be provided" : "Navedeno mora biti veljavno uporabniško ime",
-    "Username contains whitespace at the beginning or at the end" : "Uporabniško ime vsebuje presledni znak na začetku ali na koncu imena.",
-    "Username must not consist of dots only" : "Uporabniško ime ne sme biti zgolj iz pik",
-    "Username is invalid because files already exist for this user" : "Uporabniško ime ni veljavno, ker za tega uporabnika že obstajajo datoteke",
-    "User disabled" : "Uporabnik je onemogočen",
     "File is currently busy, please try again later" : "Datoteka je trenutno v uporabi. Poskusite znova kasneje.",
     "Cannot download file" : "Datoteke ni mogoče prejeti",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Spremenite dovoljenja mape na 0770 in s tem onemogočite branje vsebine drugim uporabnikom.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Prepričajte se, da je datoteka ».ocdata« v korenu podatkovne mape."
 },
 "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/lib/l10n/sl.json b/lib/l10n/sl.json
index 60ddbb44328..63a909d738e 100644
--- a/lib/l10n/sl.json
+++ b/lib/l10n/sl.json
@@ -49,6 +49,7 @@
     "Avatar image is not square" : "Slika podobe ni kvadratna",
     "Files" : "Datoteke",
     "View profile" : "Pokaži profil",
+    "_%nh_::_%nh_" : ["%nh","%nh","%nh","%nh"],
     "Local time: %s" : "Krajevni čas: %s",
     "today" : "danes",
     "tomorrow" : "jutri",
@@ -228,40 +229,19 @@
     "Target language" : "Ciljni jezik",
     "Result" : "Rezultat",
     "Education Edition" : "Izobraževalna različica",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Prijavljen uporabnik mora biti določen za skrbnika, pomočnika skrbnika ali pa mora imeti dodeljene posebna dovoljenja za dostop do nastavitve.",
-    "Logged in user must be an admin or sub admin" : "Prijavljen uporabnik mora imeti dovoljenja skrbnika ali podpornega skrbnika",
-    "Logged in user must be an admin" : "Prijavljen uporabnik mora biti tudi skrbnik",
     "File name is a reserved word" : "Ime datoteke je zadržana beseda",
     "File name contains at least one invalid character" : "Ime datoteke vsebuje vsaj en nedovoljen znak.",
     "File name is too long" : "Ime datoteke je predolgo",
-    "Help" : "Pomoč",
     "Users" : "Uporabniki",
-    "Unknown user" : "Neznan uporabnik",
-    "Enter the database username and name for %s" : "Vpis uporabniškega imena in imena podatkovne zbirke za %s.",
-    "Enter the database username for %s" : "Vpis uporabniškega imena podatkovne zbirke za %s.",
-    "MySQL username and/or password not valid" : "Uporabniško ime ali geslo MySQL ni veljavno",
-    "Oracle username and/or password not valid" : "Uporabniško ime ali geslo Oracle ni veljavno",
-    "PostgreSQL username and/or password not valid" : "Uporabniško ime ali geslo PostgreSQL ni veljavno",
-    "Set an admin username." : "Nastavi uporabniško ime skrbnika.",
     "%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«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Nastavljanje souporabe %s je spodletelo, ker je predmet že v souporabi z uporabnikom %s.",
     "%1$s shared »%2$s« with you" : "%1$s vam omogoča souporabo »%2$s«",
     "%1$s shared »%2$s« with you." : "%1$s vam omogoča souporabo »%2$s«.",
     "Click the button below to open it." : "Kliknite na gumb za odpiranje.",
-    "The username is already being used" : "Vpisano uporabniško ime je že v uporabi",
-    "Could not create user" : "Uporabnika ni mogoče ustvariti",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "V uporabniškem imenu je dovoljeno uporabiti le znake: »a–z«, »A–Z«, »0–9«, presledki in »_.@-«\".",
-    "A valid username must be provided" : "Navedeno mora biti veljavno uporabniško ime",
-    "Username contains whitespace at the beginning or at the end" : "Uporabniško ime vsebuje presledni znak na začetku ali na koncu imena.",
-    "Username must not consist of dots only" : "Uporabniško ime ne sme biti zgolj iz pik",
-    "Username is invalid because files already exist for this user" : "Uporabniško ime ni veljavno, ker za tega uporabnika že obstajajo datoteke",
-    "User disabled" : "Uporabnik je onemogočen",
     "File is currently busy, please try again later" : "Datoteka je trenutno v uporabi. Poskusite znova kasneje.",
     "Cannot download file" : "Datoteke ni mogoče prejeti",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Spremenite dovoljenja mape na 0770 in s tem onemogočite branje vsebine drugim uporabnikom.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Prepričajte se, da je datoteka ».ocdata« v korenu podatkovne mape."
 },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
 }
\ No newline at end of file
diff --git a/lib/l10n/sq.js b/lib/l10n/sq.js
index e22641af387..5ca58c3a9db 100644
--- a/lib/l10n/sq.js
+++ b/lib/l10n/sq.js
@@ -145,22 +145,10 @@ OC.L10N.register(
     "File name is a reserved word" : "Emri i kartelës është një emër i rezervuar",
     "File name contains at least one invalid character" : "Emri i kartelës përmban të paktën një shenjë të pavlefshme",
     "File name is too long" : "Emri i kartelës është shumë i gjatë",
-    "Help" : "Ndihmë",
     "Users" : "Përdorues",
-    "Unknown user" : "Përdorues i panjohur",
-    "Oracle username and/or password not valid" : "Emër përdoruesi dhe/ose fjalëkalim Oracle-i i pavlefshëm",
-    "PostgreSQL username and/or password not valid" : "Emër përdoruesi dhe/ose fjalëkalim PostgreSQL jo të vlefshëm",
-    "Set an admin username." : "Caktoni një emër përdoruesi për përgjegjësin.",
     "Open »%s«" : "Hap»1 %s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Ndarja e %s me të tjerët dështoi, ngaqë ky objekt është ndarë tashmë me përdoruesin %s",
     "Click the button below to open it." : "Kliko butonin më poshtë për të hapur atë.",
-    "The username is already being used" : "Emri i përdoruesit është tashmë i përdorur",
-    "A valid username must be provided" : "Duhet dhënë një emër i vlefshëm përdoruesi",
-    "Username contains whitespace at the beginning or at the end" : "Emri i përdoruesit përmban hapësirë në fillim ose në fund",
-    "Username must not consist of dots only" : "Emri i përdoruesit nuk duhet të përbëhet vetëm nga pika",
-    "User disabled" : "Përdorues i çaktivizuar",
     "File is currently busy, please try again later" : "Kartela tani është e zënë, ju lutemi, riprovoni më vonë.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Ju lutemi, kalojani lejet në 0770, që kështu atë drejtori të mos mund ta shfaqin përdorues të tjerë.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Sigurohu që ekziston një skedar i quajtur \".ocdata\" në rrënjën e direktorisë së të dhënave."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/sq.json b/lib/l10n/sq.json
index f6d51853c0c..80fa202158f 100644
--- a/lib/l10n/sq.json
+++ b/lib/l10n/sq.json
@@ -143,22 +143,10 @@
     "File name is a reserved word" : "Emri i kartelës është një emër i rezervuar",
     "File name contains at least one invalid character" : "Emri i kartelës përmban të paktën një shenjë të pavlefshme",
     "File name is too long" : "Emri i kartelës është shumë i gjatë",
-    "Help" : "Ndihmë",
     "Users" : "Përdorues",
-    "Unknown user" : "Përdorues i panjohur",
-    "Oracle username and/or password not valid" : "Emër përdoruesi dhe/ose fjalëkalim Oracle-i i pavlefshëm",
-    "PostgreSQL username and/or password not valid" : "Emër përdoruesi dhe/ose fjalëkalim PostgreSQL jo të vlefshëm",
-    "Set an admin username." : "Caktoni një emër përdoruesi për përgjegjësin.",
     "Open »%s«" : "Hap»1 %s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "Ndarja e %s me të tjerët dështoi, ngaqë ky objekt është ndarë tashmë me përdoruesin %s",
     "Click the button below to open it." : "Kliko butonin më poshtë për të hapur atë.",
-    "The username is already being used" : "Emri i përdoruesit është tashmë i përdorur",
-    "A valid username must be provided" : "Duhet dhënë një emër i vlefshëm përdoruesi",
-    "Username contains whitespace at the beginning or at the end" : "Emri i përdoruesit përmban hapësirë në fillim ose në fund",
-    "Username must not consist of dots only" : "Emri i përdoruesit nuk duhet të përbëhet vetëm nga pika",
-    "User disabled" : "Përdorues i çaktivizuar",
     "File is currently busy, please try again later" : "Kartela tani është e zënë, ju lutemi, riprovoni më vonë.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Ju lutemi, kalojani lejet në 0770, që kështu atë drejtori të mos mund ta shfaqin përdorues të tjerë.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Sigurohu që ekziston një skedar i quajtur \".ocdata\" në rrënjën e direktorisë së të dhënave."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/sr.js b/lib/l10n/sr.js
index 4d2589022e4..0d0226c48d5 100644
--- a/lib/l10n/sr.js
+++ b/lib/l10n/sr.js
@@ -59,6 +59,11 @@ OC.L10N.register(
     "Avatar image is not square" : "Слика аватара није квадратна",
     "Files" : "Фајлови",
     "View profile" : "Погледај профил",
+    "same time" : "исто време",
+    "_%nh_::_%nh_" : ["%nч","%nч","%nч"],
+    "_%nm_::_%nm_" : ["%nм","%nм","%nм"],
+    "%s ahead" : "%s испред",
+    "%s behind" : "%s иза",
     "Local time: %s" : "Локално време: %s",
     "today" : "данас",
     "tomorrow" : "сутра",
@@ -81,6 +86,12 @@ OC.L10N.register(
     "seconds ago" : "пре неколико секунди",
     "Empty file" : "Празан фајл",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Модул са идентификацијом: %s не постоји. Омогућите га у подешавањима апликација или контактирајте администратора.",
+    "No file conversion providers available" : "Није доступан ниједан пружалац услуге конверзије фајла",
+    "File is too large to convert" : "Фајл је сувише велики да би могао да се конвертује",
+    "Destination does not match conversion extension" : "Одредиште не одговара екстензији конверзије",
+    "Could not convert file" : "Фајл није могао да се конвертује",
+    "Destination does not exist" : "Одредиште не постоји",
+    "Destination is not creatable" : "Одредиште не може да се креира",
     "Dot files are not allowed" : "Фајлови са почетном тачком нису дозвољени",
     "\"%1$s\" is a forbidden file or folder name." : "„%1$s” је забрањено име фајла или фолдера.",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "„%1$s” је забрањени префикс имена фајла или фолдера.",
@@ -92,6 +103,13 @@ OC.L10N.register(
     "Invalid path" : "Неисправна путања",
     "Failed to create file from template" : "Није успело креирање фајла из шаблона",
     "Templates" : "Шаблони",
+    "Storage %s cannot be moved" : "Складиште %s не може да се премести",
+    "Moving a share (%s) into a shared folder is not allowed" : "Није дозвољено премештање дељења (%s) у дељени фолдер",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Није дозвољено премештање складишта (%s) у дељени фолдер",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Није дозвољено премештање дељења (%s) у друго дељење (%s)",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Није дозвољено премештање дељења (%s) у друго складиште (%s)",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Није дозвољено премештање складишта (%s) у дељење (%s)",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Није дозвољено премештање складишта (%s) у друго складиште (%s)",
     "Path contains invalid segments" : "Путања садржи неисправне сегменте",
     "Filename is a reserved word" : "Име фајла је резервисана реч",
     "Filename contains at least one invalid character" : "Назив фајла садржи бар један недозвољен знак",
@@ -425,41 +443,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Резимира текст тако што га скраћује без губитка кључних информација.",
     "Extracts topics from a text and outputs them separated by commas." : "Издваја теме из текста и исписује их раздвојене запетама.",
     "Education Edition" : "Образовно издање",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Пријављени корисник мора бити админ, под админ или да поседује специјално право да приступи овом подешавању",
-    "Logged in user must be an admin or sub admin" : "Пријављени корисник мора бити администратор или подадминистратор",
-    "Logged in user must be an admin" : "Пријављени корисник мора бити администратор",
     "File name is a reserved word" : "Назив фајла је резервисана реч",
     "File name contains at least one invalid character" : "Назив фајла садржи бар један недозвољен знак",
     "File name is too long" : "Назив фајла је предугачак",
-    "Help" : "Помоћ",
     "Users" : "Корисници",
-    "Unknown user" : "Непознат корисник",
-    "Enter the database username and name for %s" : "Унесите корисничко име базе података и назив за %s",
-    "Enter the database username for %s" : "Унесите корисничко име базе података за %s",
-    "MySQL username and/or password not valid" : "MySQL корисничко име и/или лозинка нису исправни",
-    "Oracle username and/or password not valid" : "Oracle корисничко име и/или лозинка нису исправни",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL корисничко име и/или лозинка нису исправни",
-    "Set an admin username." : "Поставите име за администратора.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s је поделио „%2$s“ са Вама и жели да дода:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s је поделио „%2$s“ са Вама и жели да дода",
     "»%s« added a note to a file shared with you" : "\"%s\" је додао белешку на фајл који дели са Вама",
     "Open »%s«" : "Отвори „%s“",
-    "Sharing %s failed, because this item is already shared with user %s" : "Дељење %s није успело зато што се ова ставка већ дели са корисником %s",
     "%1$s shared »%2$s« with you" : "%1$s је поделио „%2$s“ са Вама",
     "%1$s shared »%2$s« with you." : "%1$s је поделио „%2$s“ са Вама.",
     "Click the button below to open it." : "Кликните дугме испод да га отворите.",
-    "The username is already being used" : "Корисничко име се већ користи",
-    "Could not create user" : "Не могу да направим корисника",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "У корисничком имену су дозвољени само следећи карактери: „a-z”, „A-Z”, „0-9”, размаци и „_.@-'",
-    "A valid username must be provided" : "Морате унети исправно корисничко име",
-    "Username contains whitespace at the beginning or at the end" : "Корисничко име садржи белине на почетку или на крају",
-    "Username must not consist of dots only" : "Корисничко име не могу бити само тачке",
-    "Username is invalid because files already exist for this user" : "Корисничко име није исправно пошто већ постоје фајлови за овог корисника",
-    "User disabled" : "Корисник онемогућен",
     "File is currently busy, please try again later" : "Фајл је тренутно заузет, покушајте поново касније",
     "Cannot download file" : "Фајл не може да се преузме",
-    "Your data directory is readable by other users." : "Ваш директоријум са подацима могу да читају остали корисници.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Промените дозволе у 0770 како директоријуми не би могли бити излистани од стране других корисника.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Уверите се да фајл \".ocdata\" постоји у корену директоријума са подацима."
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/lib/l10n/sr.json b/lib/l10n/sr.json
index 25db5b57688..0492958c088 100644
--- a/lib/l10n/sr.json
+++ b/lib/l10n/sr.json
@@ -57,6 +57,11 @@
     "Avatar image is not square" : "Слика аватара није квадратна",
     "Files" : "Фајлови",
     "View profile" : "Погледај профил",
+    "same time" : "исто време",
+    "_%nh_::_%nh_" : ["%nч","%nч","%nч"],
+    "_%nm_::_%nm_" : ["%nм","%nм","%nм"],
+    "%s ahead" : "%s испред",
+    "%s behind" : "%s иза",
     "Local time: %s" : "Локално време: %s",
     "today" : "данас",
     "tomorrow" : "сутра",
@@ -79,6 +84,12 @@
     "seconds ago" : "пре неколико секунди",
     "Empty file" : "Празан фајл",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Модул са идентификацијом: %s не постоји. Омогућите га у подешавањима апликација или контактирајте администратора.",
+    "No file conversion providers available" : "Није доступан ниједан пружалац услуге конверзије фајла",
+    "File is too large to convert" : "Фајл је сувише велики да би могао да се конвертује",
+    "Destination does not match conversion extension" : "Одредиште не одговара екстензији конверзије",
+    "Could not convert file" : "Фајл није могао да се конвертује",
+    "Destination does not exist" : "Одредиште не постоји",
+    "Destination is not creatable" : "Одредиште не може да се креира",
     "Dot files are not allowed" : "Фајлови са почетном тачком нису дозвољени",
     "\"%1$s\" is a forbidden file or folder name." : "„%1$s” је забрањено име фајла или фолдера.",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "„%1$s” је забрањени префикс имена фајла или фолдера.",
@@ -90,6 +101,13 @@
     "Invalid path" : "Неисправна путања",
     "Failed to create file from template" : "Није успело креирање фајла из шаблона",
     "Templates" : "Шаблони",
+    "Storage %s cannot be moved" : "Складиште %s не може да се премести",
+    "Moving a share (%s) into a shared folder is not allowed" : "Није дозвољено премештање дељења (%s) у дељени фолдер",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Није дозвољено премештање складишта (%s) у дељени фолдер",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Није дозвољено премештање дељења (%s) у друго дељење (%s)",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Није дозвољено премештање дељења (%s) у друго складиште (%s)",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Није дозвољено премештање складишта (%s) у дељење (%s)",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Није дозвољено премештање складишта (%s) у друго складиште (%s)",
     "Path contains invalid segments" : "Путања садржи неисправне сегменте",
     "Filename is a reserved word" : "Име фајла је резервисана реч",
     "Filename contains at least one invalid character" : "Назив фајла садржи бар један недозвољен знак",
@@ -423,41 +441,19 @@
     "Summarizes text by reducing its length without losing key information." : "Резимира текст тако што га скраћује без губитка кључних информација.",
     "Extracts topics from a text and outputs them separated by commas." : "Издваја теме из текста и исписује их раздвојене запетама.",
     "Education Edition" : "Образовно издање",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Пријављени корисник мора бити админ, под админ или да поседује специјално право да приступи овом подешавању",
-    "Logged in user must be an admin or sub admin" : "Пријављени корисник мора бити администратор или подадминистратор",
-    "Logged in user must be an admin" : "Пријављени корисник мора бити администратор",
     "File name is a reserved word" : "Назив фајла је резервисана реч",
     "File name contains at least one invalid character" : "Назив фајла садржи бар један недозвољен знак",
     "File name is too long" : "Назив фајла је предугачак",
-    "Help" : "Помоћ",
     "Users" : "Корисници",
-    "Unknown user" : "Непознат корисник",
-    "Enter the database username and name for %s" : "Унесите корисничко име базе података и назив за %s",
-    "Enter the database username for %s" : "Унесите корисничко име базе података за %s",
-    "MySQL username and/or password not valid" : "MySQL корисничко име и/или лозинка нису исправни",
-    "Oracle username and/or password not valid" : "Oracle корисничко име и/или лозинка нису исправни",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL корисничко име и/или лозинка нису исправни",
-    "Set an admin username." : "Поставите име за администратора.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s је поделио „%2$s“ са Вама и жели да дода:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s је поделио „%2$s“ са Вама и жели да дода",
     "»%s« added a note to a file shared with you" : "\"%s\" је додао белешку на фајл који дели са Вама",
     "Open »%s«" : "Отвори „%s“",
-    "Sharing %s failed, because this item is already shared with user %s" : "Дељење %s није успело зато што се ова ставка већ дели са корисником %s",
     "%1$s shared »%2$s« with you" : "%1$s је поделио „%2$s“ са Вама",
     "%1$s shared »%2$s« with you." : "%1$s је поделио „%2$s“ са Вама.",
     "Click the button below to open it." : "Кликните дугме испод да га отворите.",
-    "The username is already being used" : "Корисничко име се већ користи",
-    "Could not create user" : "Не могу да направим корисника",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "У корисничком имену су дозвољени само следећи карактери: „a-z”, „A-Z”, „0-9”, размаци и „_.@-'",
-    "A valid username must be provided" : "Морате унети исправно корисничко име",
-    "Username contains whitespace at the beginning or at the end" : "Корисничко име садржи белине на почетку или на крају",
-    "Username must not consist of dots only" : "Корисничко име не могу бити само тачке",
-    "Username is invalid because files already exist for this user" : "Корисничко име није исправно пошто већ постоје фајлови за овог корисника",
-    "User disabled" : "Корисник онемогућен",
     "File is currently busy, please try again later" : "Фајл је тренутно заузет, покушајте поново касније",
     "Cannot download file" : "Фајл не може да се преузме",
-    "Your data directory is readable by other users." : "Ваш директоријум са подацима могу да читају остали корисници.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Промените дозволе у 0770 како директоријуми не би могли бити излистани од стране других корисника.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Уверите се да фајл \".ocdata\" постоји у корену директоријума са подацима."
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/lib/l10n/sr@latin.js b/lib/l10n/sr@latin.js
index 042f035355f..3b65c71f694 100644
--- a/lib/l10n/sr@latin.js
+++ b/lib/l10n/sr@latin.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "Thursday" : "Četvrtak",
     "Friday" : "Petak",
     "Saturday" : "Subota",
-    "Translate" : "Prevedi",
-    "Help" : "Help"
+    "Translate" : "Prevedi"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/lib/l10n/sr@latin.json b/lib/l10n/sr@latin.json
index 7ff0358bacf..c31a77690d0 100644
--- a/lib/l10n/sr@latin.json
+++ b/lib/l10n/sr@latin.json
@@ -20,7 +20,6 @@
     "Thursday" : "Četvrtak",
     "Friday" : "Petak",
     "Saturday" : "Subota",
-    "Translate" : "Prevedi",
-    "Help" : "Help"
+    "Translate" : "Prevedi"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/lib/l10n/sv.js b/lib/l10n/sv.js
index 449d4ae6239..dbc95ae7cb3 100644
--- a/lib/l10n/sv.js
+++ b/lib/l10n/sv.js
@@ -92,6 +92,13 @@ OC.L10N.register(
     "Invalid path" : "Ogiltig sökväg",
     "Failed to create file from template" : "Kunde skapa fil från mall",
     "Templates" : "Mallar",
+    "Storage %s cannot be moved" : "Lagring %s kan inte flyttas",
+    "Moving a share (%s) into a shared folder is not allowed" : "Att flytta en delning (%s) till en delad mapp är inte tillåtet",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Att flytta en lagring (%s) till en delad mapp är inte tillåtet",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Att flytta en delning (%s) till en annan delning (%s) är inte tillåtet",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Att flytta en delning (%s) till en annan lagring (%s) är inte tillåtet",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Att flytta en lagring (%s) till en delning (%s) är inte tillåtet",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Att flytta en lagring (%s) till en annan lagring (%s) är inte tillåtet",
     "Path contains invalid segments" : "Sökvägen innehåller ogiltiga segment",
     "Filename is a reserved word" : "Filnamnet är ett reserverat ord",
     "Filename contains at least one invalid character" : "Filnamnet innehåller minst ett ogiltigt tecken",
@@ -393,41 +400,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Sammanfattar text genom att minska dess längd utan att förlora viktig information.",
     "Extracts topics from a text and outputs them separated by commas." : "Extraherar ämnen från en text och matar ut dem separerade med kommatecken.",
     "Education Edition" : "Utbildningspaket",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Inloggad användare måste vara en admin, sub-admin eller ha tilldelats speciella rättigheter för att komma åt denna inställning",
-    "Logged in user must be an admin or sub admin" : "Inloggad användare måste vara administratör eller del-administratör",
-    "Logged in user must be an admin" : "Inloggad användare måste vara administratör",
     "File name is a reserved word" : "Filnamnet är ett reserverat ord",
     "File name contains at least one invalid character" : "Filnamnet innehåller minst ett ogiltigt tecken",
     "File name is too long" : "Filnamnet är för långt",
-    "Help" : "Hjälp",
     "Users" : "Användare",
-    "Unknown user" : "Okänd användare",
-    "Enter the database username and name for %s" : "Ange databasanvändarnamn och lösenord för %s",
-    "Enter the database username for %s" : "Ange databasanvändare för %s",
-    "MySQL username and/or password not valid" : "MySQL-användarnamn och/eller lösenord är felaktigt",
-    "Oracle username and/or password not valid" : "Oracle-användarnamnet och/eller lösenordet är felaktigt",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL-användarnamnet och/eller lösenordet är felaktigt",
-    "Set an admin username." : "Ange ett användarnamn för administratören.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s delade \"%2$s\" med dig och vill lägga till:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s delade \"%2$s\" med dig och vill lägga till",
     "»%s« added a note to a file shared with you" : "\"%s\" lade till en kommentar till en fil som delats med dig",
     "Open »%s«" : "Öppna \"%s\"",
-    "Sharing %s failed, because this item is already shared with user %s" : "Delning av %s misslyckades eftersom detta redan är delat med användaren %s",
     "%1$s shared »%2$s« with you" : "%1$s delade \"%2$s\" med dig",
     "%1$s shared »%2$s« with you." : "%1$s delade \"%2$s\" med dig.",
     "Click the button below to open it." : "Klicka på knappen nedan för att öppna det.",
-    "The username is already being used" : "Användarnamnet används redan",
-    "Could not create user" : "Kunde inte skapa användare",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Endast följande tecken är tillåtna i ett användarnamn: \"a-z\", \"A-Z\", \"0-9\", mellanslag och \"_.@-'\"",
-    "A valid username must be provided" : "Ett giltigt användarnamn måste anges",
-    "Username contains whitespace at the beginning or at the end" : "Användarnamnet består av ett mellanslag i början eller i slutet",
-    "Username must not consist of dots only" : "Användarnamnet får inte innehålla enbart punkter",
-    "Username is invalid because files already exist for this user" : "Användarnamnet är ogiltigt eftersom det redan finns filer för den här användaren",
-    "User disabled" : "Användare inaktiverad",
     "File is currently busy, please try again later" : "Filen är för tillfället upptagen, försök igen senare",
     "Cannot download file" : "Kan inte ladda ner fil",
-    "Your data directory is readable by other users." : "Din datakatalog kan läsas av andra användare.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Ändra behörigheterna till 0770 så att katalogen inte kan listas av andra användare.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Säkerställ att du har filen \".ocdata\" i huvudkatalogen för din data."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/sv.json b/lib/l10n/sv.json
index 312f26d3385..9069b38a02c 100644
--- a/lib/l10n/sv.json
+++ b/lib/l10n/sv.json
@@ -90,6 +90,13 @@
     "Invalid path" : "Ogiltig sökväg",
     "Failed to create file from template" : "Kunde skapa fil från mall",
     "Templates" : "Mallar",
+    "Storage %s cannot be moved" : "Lagring %s kan inte flyttas",
+    "Moving a share (%s) into a shared folder is not allowed" : "Att flytta en delning (%s) till en delad mapp är inte tillåtet",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Att flytta en lagring (%s) till en delad mapp är inte tillåtet",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Att flytta en delning (%s) till en annan delning (%s) är inte tillåtet",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Att flytta en delning (%s) till en annan lagring (%s) är inte tillåtet",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Att flytta en lagring (%s) till en delning (%s) är inte tillåtet",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Att flytta en lagring (%s) till en annan lagring (%s) är inte tillåtet",
     "Path contains invalid segments" : "Sökvägen innehåller ogiltiga segment",
     "Filename is a reserved word" : "Filnamnet är ett reserverat ord",
     "Filename contains at least one invalid character" : "Filnamnet innehåller minst ett ogiltigt tecken",
@@ -391,41 +398,19 @@
     "Summarizes text by reducing its length without losing key information." : "Sammanfattar text genom att minska dess längd utan att förlora viktig information.",
     "Extracts topics from a text and outputs them separated by commas." : "Extraherar ämnen från en text och matar ut dem separerade med kommatecken.",
     "Education Edition" : "Utbildningspaket",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Inloggad användare måste vara en admin, sub-admin eller ha tilldelats speciella rättigheter för att komma åt denna inställning",
-    "Logged in user must be an admin or sub admin" : "Inloggad användare måste vara administratör eller del-administratör",
-    "Logged in user must be an admin" : "Inloggad användare måste vara administratör",
     "File name is a reserved word" : "Filnamnet är ett reserverat ord",
     "File name contains at least one invalid character" : "Filnamnet innehåller minst ett ogiltigt tecken",
     "File name is too long" : "Filnamnet är för långt",
-    "Help" : "Hjälp",
     "Users" : "Användare",
-    "Unknown user" : "Okänd användare",
-    "Enter the database username and name for %s" : "Ange databasanvändarnamn och lösenord för %s",
-    "Enter the database username for %s" : "Ange databasanvändare för %s",
-    "MySQL username and/or password not valid" : "MySQL-användarnamn och/eller lösenord är felaktigt",
-    "Oracle username and/or password not valid" : "Oracle-användarnamnet och/eller lösenordet är felaktigt",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL-användarnamnet och/eller lösenordet är felaktigt",
-    "Set an admin username." : "Ange ett användarnamn för administratören.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s delade \"%2$s\" med dig och vill lägga till:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s delade \"%2$s\" med dig och vill lägga till",
     "»%s« added a note to a file shared with you" : "\"%s\" lade till en kommentar till en fil som delats med dig",
     "Open »%s«" : "Öppna \"%s\"",
-    "Sharing %s failed, because this item is already shared with user %s" : "Delning av %s misslyckades eftersom detta redan är delat med användaren %s",
     "%1$s shared »%2$s« with you" : "%1$s delade \"%2$s\" med dig",
     "%1$s shared »%2$s« with you." : "%1$s delade \"%2$s\" med dig.",
     "Click the button below to open it." : "Klicka på knappen nedan för att öppna det.",
-    "The username is already being used" : "Användarnamnet används redan",
-    "Could not create user" : "Kunde inte skapa användare",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Endast följande tecken är tillåtna i ett användarnamn: \"a-z\", \"A-Z\", \"0-9\", mellanslag och \"_.@-'\"",
-    "A valid username must be provided" : "Ett giltigt användarnamn måste anges",
-    "Username contains whitespace at the beginning or at the end" : "Användarnamnet består av ett mellanslag i början eller i slutet",
-    "Username must not consist of dots only" : "Användarnamnet får inte innehålla enbart punkter",
-    "Username is invalid because files already exist for this user" : "Användarnamnet är ogiltigt eftersom det redan finns filer för den här användaren",
-    "User disabled" : "Användare inaktiverad",
     "File is currently busy, please try again later" : "Filen är för tillfället upptagen, försök igen senare",
     "Cannot download file" : "Kan inte ladda ner fil",
-    "Your data directory is readable by other users." : "Din datakatalog kan läsas av andra användare.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Ändra behörigheterna till 0770 så att katalogen inte kan listas av andra användare.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Säkerställ att du har filen \".ocdata\" i huvudkatalogen för din data."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/ta.js b/lib/l10n/ta.js
index b93c197b614..7caacb6a45c 100644
--- a/lib/l10n/ta.js
+++ b/lib/l10n/ta.js
@@ -58,7 +58,6 @@ OC.L10N.register(
     "Authentication error" : "அத்தாட்சிப்படுத்தலில் வழு",
     "Token expired. Please reload page." : "அடையாளவில்லை காலாவதியாகிவிட்டது. தயவுசெய்து பக்கத்தை மீள் ஏற்றுக.",
     "Translate" : "Translate",
-    "Help" : "உதவி",
     "Users" : "பயனாளர்"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/ta.json b/lib/l10n/ta.json
index 66cc40fe3f8..39d16e4d163 100644
--- a/lib/l10n/ta.json
+++ b/lib/l10n/ta.json
@@ -56,7 +56,6 @@
     "Authentication error" : "அத்தாட்சிப்படுத்தலில் வழு",
     "Token expired. Please reload page." : "அடையாளவில்லை காலாவதியாகிவிட்டது. தயவுசெய்து பக்கத்தை மீள் ஏற்றுக.",
     "Translate" : "Translate",
-    "Help" : "உதவி",
     "Users" : "பயனாளர்"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/th.js b/lib/l10n/th.js
index 84d216c77f2..679a179b64c 100644
--- a/lib/l10n/th.js
+++ b/lib/l10n/th.js
@@ -156,19 +156,8 @@ OC.L10N.register(
     "File name is a reserved word" : "ชื่อแฟ้มเป็นคำสงวน",
     "File name contains at least one invalid character" : "ชื่อไฟล์มีตัวอักษรที่ไม่ถูกต้องอย่างน้อย 1 ตัว",
     "File name is too long" : "ชื่อไฟล์ยาวเกินไป",
-    "Help" : "ช่วยเหลือ",
     "Users" : "ผู้ใช้งาน",
-    "Unknown user" : "ผู้ใช้ที่ไม่รู้จัก",
-    "Oracle username and/or password not valid" : "ชื่อผู้ใช้และ/หรือรหัสผ่าน Oracle ไม่ถูกต้อง",
-    "PostgreSQL username and/or password not valid" : "ชื่อผู้ใช้และ/หรือรหัสผ่าน PostgreSQL ไม่ถูกต้อง",
-    "Set an admin username." : "ตั้งค่าชื่อผู้ดูแลระบบ",
     "Open »%s«" : "เปิด »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "การแชร์ %s ล้มเหลว เพราะรายการนี้ได้แชร์กับผู้ใช้ %s ไปแล้ว",
-    "The username is already being used" : "ชื่อผู้ใช้นี้ถูกใช้ไปแล้ว",
-    "A valid username must be provided" : "ต้องระบุชื่อผู้ใช้ที่ถูกต้อง",
-    "Username contains whitespace at the beginning or at the end" : "ชื่อผู้ใช้มีช่องว่างอยู่ด้านหน้าหรือด้านหลัง",
-    "User disabled" : "ผู้ใช้ถูกปิดใช้งาน",
-    "File is currently busy, please try again later" : "ไฟล์กำลังใช้งานอยู่ โปรดลองอีกครั้งในภายหลัง",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "กรุณาเปลี่ยนสิทธิ์การเข้าถึงเป็น 0770 เพื่อให้ไดเรกทอรีไม่สามารถแก้ไขโดยผู้ใช้อื่น"
+    "File is currently busy, please try again later" : "ไฟล์กำลังใช้งานอยู่ โปรดลองอีกครั้งในภายหลัง"
 },
 "nplurals=1; plural=0;");
diff --git a/lib/l10n/th.json b/lib/l10n/th.json
index 9ed2a749aaf..210db980d78 100644
--- a/lib/l10n/th.json
+++ b/lib/l10n/th.json
@@ -154,19 +154,8 @@
     "File name is a reserved word" : "ชื่อแฟ้มเป็นคำสงวน",
     "File name contains at least one invalid character" : "ชื่อไฟล์มีตัวอักษรที่ไม่ถูกต้องอย่างน้อย 1 ตัว",
     "File name is too long" : "ชื่อไฟล์ยาวเกินไป",
-    "Help" : "ช่วยเหลือ",
     "Users" : "ผู้ใช้งาน",
-    "Unknown user" : "ผู้ใช้ที่ไม่รู้จัก",
-    "Oracle username and/or password not valid" : "ชื่อผู้ใช้และ/หรือรหัสผ่าน Oracle ไม่ถูกต้อง",
-    "PostgreSQL username and/or password not valid" : "ชื่อผู้ใช้และ/หรือรหัสผ่าน PostgreSQL ไม่ถูกต้อง",
-    "Set an admin username." : "ตั้งค่าชื่อผู้ดูแลระบบ",
     "Open »%s«" : "เปิด »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "การแชร์ %s ล้มเหลว เพราะรายการนี้ได้แชร์กับผู้ใช้ %s ไปแล้ว",
-    "The username is already being used" : "ชื่อผู้ใช้นี้ถูกใช้ไปแล้ว",
-    "A valid username must be provided" : "ต้องระบุชื่อผู้ใช้ที่ถูกต้อง",
-    "Username contains whitespace at the beginning or at the end" : "ชื่อผู้ใช้มีช่องว่างอยู่ด้านหน้าหรือด้านหลัง",
-    "User disabled" : "ผู้ใช้ถูกปิดใช้งาน",
-    "File is currently busy, please try again later" : "ไฟล์กำลังใช้งานอยู่ โปรดลองอีกครั้งในภายหลัง",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "กรุณาเปลี่ยนสิทธิ์การเข้าถึงเป็น 0770 เพื่อให้ไดเรกทอรีไม่สามารถแก้ไขโดยผู้ใช้อื่น"
+    "File is currently busy, please try again later" : "ไฟล์กำลังใช้งานอยู่ โปรดลองอีกครั้งในภายหลัง"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/lib/l10n/tk.js b/lib/l10n/tk.js
index 1934bafa03c..8bf4eb72e2a 100644
--- a/lib/l10n/tk.js
+++ b/lib/l10n/tk.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "Website" : "Website",
     "Address" : "Salgysy",
     "About" : "Hakynda",
-    "Translate" : "Terjime et",
-    "Help" : "Kömek"
+    "Translate" : "Terjime et"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/tk.json b/lib/l10n/tk.json
index d1d18522cbd..fdc115784b3 100644
--- a/lib/l10n/tk.json
+++ b/lib/l10n/tk.json
@@ -9,7 +9,6 @@
     "Website" : "Website",
     "Address" : "Salgysy",
     "About" : "Hakynda",
-    "Translate" : "Terjime et",
-    "Help" : "Kömek"
+    "Translate" : "Terjime et"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/tr.js b/lib/l10n/tr.js
index 5bdee6d2801..a757589f715 100644
--- a/lib/l10n/tr.js
+++ b/lib/l10n/tr.js
@@ -59,6 +59,11 @@ OC.L10N.register(
     "Avatar image is not square" : "Avatar görseli kare değil",
     "Files" : "Dosyalar",
     "View profile" : "Profili görüntüle",
+    "same time" : "aynı zamanda",
+    "_%nh_::_%nh_" : ["%ns","%ns"],
+    "_%nm_::_%nm_" : ["%nd","%nd"],
+    "%s ahead" : "%s ileride",
+    "%s behind" : "%s geride",
     "Local time: %s" : "Yerel zaman: %s",
     "today" : "bugün",
     "tomorrow" : "yarın",
@@ -81,6 +86,12 @@ OC.L10N.register(
     "seconds ago" : "saniyeler önce",
     "Empty file" : "Dosya boş",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "%s kimlikli modül bulunamadı. Lütfen uygulamalarınız içinden modülü kullanıma alın ya da BT yöneticiniz ile görüşün.",
+    "No file conversion providers available" : "Kullanılabilecek bir dosya dönüştürücü hizmeti sağlayıcı yok",
+    "File is too large to convert" : "Dosya dönüştürülmek için çok büyük",
+    "Destination does not match conversion extension" : "Hedef dönüştürme eklentisiyle eşleşmiyor",
+    "Could not convert file" : "Dosya dönüştürülemedi",
+    "Destination does not exist" : "Hedef bulunamadı",
+    "Destination is not creatable" : "Hedef oluşturulamadı",
     "Dot files are not allowed" : "Nokta dosyalarına izin verilmiyor",
     "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" dosya ya da klasör adı olarak kullanılamaz.",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" dosya ya da klasör adı ön eki olarak kullanılamaz.",
@@ -92,6 +103,13 @@ OC.L10N.register(
     "Invalid path" : "Yol geçersiz",
     "Failed to create file from template" : "Kalıptan dosya oluşturulamadı",
     "Templates" : "Kalıplar",
+    "Storage %s cannot be moved" : "%s depolama alanı taşınamadı",
+    "Moving a share (%s) into a shared folder is not allowed" : "Bir paylaşımın (%s) paylaşılan bir klasöre taşınmasına izin verilmiyor",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Bir depolama alanının (%s) paylaşılan bir klasöre taşınmasına izin verilmiyor",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Bir paylaşımın (%s) başka bir paylaşıma (%s) taşınmasına izin verilmiyor",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Bir paylaşımın (%s) başka bir depolama alanına (%s) taşınmasına izin verilmiyor",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Bir depolama alanının (%s) başka bir paylaşıma (%s) taşınmasına izin verilmiyor",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Bir depolama alanının (%s) başka bir depolama alanına (%s) taşınmasına izin verilmiyor",
     "Path contains invalid segments" : "Yolda geçersiz bölümler var",
     "Filename is a reserved word" : "Dosya adı sistem kullanımına ayrılmış bir sözcük",
     "Filename contains at least one invalid character" : "Dosya adında en az bir geçersiz karakter var",
@@ -425,41 +443,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Temel içeriği kaybetmeden uzunluğunu kısaltarak metni özetler.",
     "Extracts topics from a text and outputs them separated by commas." : "Bir metindeki konuları ayıklar ve bunları virgül ile ayırarak sıralar.",
     "Education Edition" : "Eğitim sürümü",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Oturum açmış kullanıcı bir yönetici, bir alt yönetici veya bu ayara erişmek için özel izne sahip olmalıdır",
-    "Logged in user must be an admin or sub admin" : "Oturum açmış kullanıcı bir yönetici ya da alt yönetici olmalıdır",
-    "Logged in user must be an admin" : "Oturum açmış kullanıcı bir yönetici olmalıdır",
     "File name is a reserved word" : "Bu dosya adı sistem kullanıma ayrılmıştır",
     "File name contains at least one invalid character" : "Dosya adında en az bir geçersiz karakter var",
     "File name is too long" : "Dosya adı çok uzun",
-    "Help" : "Yardım",
     "Users" : "Kullanıcılar",
-    "Unknown user" : "Kullanıcı bilinmiyor",
-    "Enter the database username and name for %s" : "%s için veri tabanı adını ve kullanıcı adını yazın",
-    "Enter the database username for %s" : "%s için veri tabanı kullanıcı adını yazın",
-    "MySQL username and/or password not valid" : "MySQL kullanıcı adı ya da parolası geçersiz",
-    "Oracle username and/or password not valid" : "Oracle kullanıcı adı ya da parolası geçersiz",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL kullanıcı adı ya da parolası geçersiz",
-    "Set an admin username." : "Bir yönetici kullanıcı adı yazın.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s sizinle »%2$s« ögesini paylaştı ve eklemenizi istiyor:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s sizinle »%2$s« ögesini paylaştı ve eklemenizi istiyor",
     "»%s« added a note to a file shared with you" : "»%s« sizinle paylaştığı bir dosyaya bir not ekledi",
     "Open »%s«" : "»%s« aç",
-    "Sharing %s failed, because this item is already shared with user %s" : "%s paylaşılamadı. Bu öge zaten %s kullanıcısı ile paylaşılmış",
     "%1$s shared »%2$s« with you" : "%1$s, sizinle »%2$s« ögesini paylaştı",
     "%1$s shared »%2$s« with you." : "%1$s, sizinle »%2$s« ögesini paylaştı.",
     "Click the button below to open it." : "Açmak için aşağıdaki düğmeye tıklayın.",
-    "The username is already being used" : "Bu kullanıcı adı zaten var",
-    "Could not create user" : "Kullanıcı oluşturulamadı",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Kullanıcı adında yalnızca şu karakterler kullanılabilir: \"a-z\", \"A-Z\", \"0-9\", boşluk ve \"_.@-'\"",
-    "A valid username must be provided" : "Geçerli bir kullanıcı adı yazmalısınız",
-    "Username contains whitespace at the beginning or at the end" : "Kullanıcı adının başı ya da sonunda boşluk var",
-    "Username must not consist of dots only" : "Kullanıcı adı yalnızca noktalardan oluşamaz",
-    "Username is invalid because files already exist for this user" : "Kullanıcı adı geçersiz, bu kullanıcı için zaten bazı dosyalar var",
-    "User disabled" : "Kullanıcı kullanımdan kaldırılmış",
     "File is currently busy, please try again later" : "Dosya şu anda meşgul. Lütfen bir süre sonra yeniden deneyin",
     "Cannot download file" : "Dosya indirilemedi",
-    "Your data directory is readable by other users." : "Veri klasörünüz diğer kullanıcılar tarafından okunabilir.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Lütfen izinleri 0770 olarak ayarlayarak diğer kullanıcıların klasörü görebilmesini sağlayın.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Veri klasörü kökünde \".ocdata\" adında bir dosya bulunduğundan emin olun."
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/lib/l10n/tr.json b/lib/l10n/tr.json
index 3264e039bdc..76a752038c5 100644
--- a/lib/l10n/tr.json
+++ b/lib/l10n/tr.json
@@ -57,6 +57,11 @@
     "Avatar image is not square" : "Avatar görseli kare değil",
     "Files" : "Dosyalar",
     "View profile" : "Profili görüntüle",
+    "same time" : "aynı zamanda",
+    "_%nh_::_%nh_" : ["%ns","%ns"],
+    "_%nm_::_%nm_" : ["%nd","%nd"],
+    "%s ahead" : "%s ileride",
+    "%s behind" : "%s geride",
     "Local time: %s" : "Yerel zaman: %s",
     "today" : "bugün",
     "tomorrow" : "yarın",
@@ -79,6 +84,12 @@
     "seconds ago" : "saniyeler önce",
     "Empty file" : "Dosya boş",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "%s kimlikli modül bulunamadı. Lütfen uygulamalarınız içinden modülü kullanıma alın ya da BT yöneticiniz ile görüşün.",
+    "No file conversion providers available" : "Kullanılabilecek bir dosya dönüştürücü hizmeti sağlayıcı yok",
+    "File is too large to convert" : "Dosya dönüştürülmek için çok büyük",
+    "Destination does not match conversion extension" : "Hedef dönüştürme eklentisiyle eşleşmiyor",
+    "Could not convert file" : "Dosya dönüştürülemedi",
+    "Destination does not exist" : "Hedef bulunamadı",
+    "Destination is not creatable" : "Hedef oluşturulamadı",
     "Dot files are not allowed" : "Nokta dosyalarına izin verilmiyor",
     "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" dosya ya da klasör adı olarak kullanılamaz.",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" dosya ya da klasör adı ön eki olarak kullanılamaz.",
@@ -90,6 +101,13 @@
     "Invalid path" : "Yol geçersiz",
     "Failed to create file from template" : "Kalıptan dosya oluşturulamadı",
     "Templates" : "Kalıplar",
+    "Storage %s cannot be moved" : "%s depolama alanı taşınamadı",
+    "Moving a share (%s) into a shared folder is not allowed" : "Bir paylaşımın (%s) paylaşılan bir klasöre taşınmasına izin verilmiyor",
+    "Moving a storage (%s) into a shared folder is not allowed" : "Bir depolama alanının (%s) paylaşılan bir klasöre taşınmasına izin verilmiyor",
+    "Moving a share (%s) into another share (%s) is not allowed" : "Bir paylaşımın (%s) başka bir paylaşıma (%s) taşınmasına izin verilmiyor",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "Bir paylaşımın (%s) başka bir depolama alanına (%s) taşınmasına izin verilmiyor",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "Bir depolama alanının (%s) başka bir paylaşıma (%s) taşınmasına izin verilmiyor",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "Bir depolama alanının (%s) başka bir depolama alanına (%s) taşınmasına izin verilmiyor",
     "Path contains invalid segments" : "Yolda geçersiz bölümler var",
     "Filename is a reserved word" : "Dosya adı sistem kullanımına ayrılmış bir sözcük",
     "Filename contains at least one invalid character" : "Dosya adında en az bir geçersiz karakter var",
@@ -423,41 +441,19 @@
     "Summarizes text by reducing its length without losing key information." : "Temel içeriği kaybetmeden uzunluğunu kısaltarak metni özetler.",
     "Extracts topics from a text and outputs them separated by commas." : "Bir metindeki konuları ayıklar ve bunları virgül ile ayırarak sıralar.",
     "Education Edition" : "Eğitim sürümü",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Oturum açmış kullanıcı bir yönetici, bir alt yönetici veya bu ayara erişmek için özel izne sahip olmalıdır",
-    "Logged in user must be an admin or sub admin" : "Oturum açmış kullanıcı bir yönetici ya da alt yönetici olmalıdır",
-    "Logged in user must be an admin" : "Oturum açmış kullanıcı bir yönetici olmalıdır",
     "File name is a reserved word" : "Bu dosya adı sistem kullanıma ayrılmıştır",
     "File name contains at least one invalid character" : "Dosya adında en az bir geçersiz karakter var",
     "File name is too long" : "Dosya adı çok uzun",
-    "Help" : "Yardım",
     "Users" : "Kullanıcılar",
-    "Unknown user" : "Kullanıcı bilinmiyor",
-    "Enter the database username and name for %s" : "%s için veri tabanı adını ve kullanıcı adını yazın",
-    "Enter the database username for %s" : "%s için veri tabanı kullanıcı adını yazın",
-    "MySQL username and/or password not valid" : "MySQL kullanıcı adı ya da parolası geçersiz",
-    "Oracle username and/or password not valid" : "Oracle kullanıcı adı ya da parolası geçersiz",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL kullanıcı adı ya da parolası geçersiz",
-    "Set an admin username." : "Bir yönetici kullanıcı adı yazın.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s sizinle »%2$s« ögesini paylaştı ve eklemenizi istiyor:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s sizinle »%2$s« ögesini paylaştı ve eklemenizi istiyor",
     "»%s« added a note to a file shared with you" : "»%s« sizinle paylaştığı bir dosyaya bir not ekledi",
     "Open »%s«" : "»%s« aç",
-    "Sharing %s failed, because this item is already shared with user %s" : "%s paylaşılamadı. Bu öge zaten %s kullanıcısı ile paylaşılmış",
     "%1$s shared »%2$s« with you" : "%1$s, sizinle »%2$s« ögesini paylaştı",
     "%1$s shared »%2$s« with you." : "%1$s, sizinle »%2$s« ögesini paylaştı.",
     "Click the button below to open it." : "Açmak için aşağıdaki düğmeye tıklayın.",
-    "The username is already being used" : "Bu kullanıcı adı zaten var",
-    "Could not create user" : "Kullanıcı oluşturulamadı",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Kullanıcı adında yalnızca şu karakterler kullanılabilir: \"a-z\", \"A-Z\", \"0-9\", boşluk ve \"_.@-'\"",
-    "A valid username must be provided" : "Geçerli bir kullanıcı adı yazmalısınız",
-    "Username contains whitespace at the beginning or at the end" : "Kullanıcı adının başı ya da sonunda boşluk var",
-    "Username must not consist of dots only" : "Kullanıcı adı yalnızca noktalardan oluşamaz",
-    "Username is invalid because files already exist for this user" : "Kullanıcı adı geçersiz, bu kullanıcı için zaten bazı dosyalar var",
-    "User disabled" : "Kullanıcı kullanımdan kaldırılmış",
     "File is currently busy, please try again later" : "Dosya şu anda meşgul. Lütfen bir süre sonra yeniden deneyin",
     "Cannot download file" : "Dosya indirilemedi",
-    "Your data directory is readable by other users." : "Veri klasörünüz diğer kullanıcılar tarafından okunabilir.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Lütfen izinleri 0770 olarak ayarlayarak diğer kullanıcıların klasörü görebilmesini sağlayın.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Veri klasörü kökünde \".ocdata\" adında bir dosya bulunduğundan emin olun."
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/ug.js b/lib/l10n/ug.js
index fc54c5e74f1..2a6611bbb81 100644
--- a/lib/l10n/ug.js
+++ b/lib/l10n/ug.js
@@ -382,41 +382,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "ئاچقۇچلۇق ئۇچۇرلارنى يوقىتىپ قويماي ئۇزۇنلۇقىنى قىسقارتىش ئارقىلىق تېكىستنى خۇلاسىلەيدۇ.",
     "Extracts topics from a text and outputs them separated by commas." : "تېكىستتىن تېمىنى چىقىرىپ ، پەش ئارقىلىق ئايرىلىدۇ.",
     "Education Edition" : "مائارىپ نەشرى",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "تىزىمغا كىرگەن ئىشلەتكۈچى چوقۇم باشقۇرغۇچى ، تارماق باشقۇرغۇچى بولۇشى ياكى بۇ تەڭشەكنى زىيارەت قىلىش ھوقۇقىغا ئېرىشىشى كېرەك",
-    "Logged in user must be an admin or sub admin" : "تىزىملاتقان ئىشلەتكۈچى چوقۇم باشقۇرغۇچى ياكى تارماق باشقۇرغۇچى بولۇشى كېرەك",
-    "Logged in user must be an admin" : "تىزىملاتقان ئىشلەتكۈچى چوقۇم باشقۇرغۇچى بولۇشى كېرەك",
     "File name is a reserved word" : "ھۆججەت ئىسمى زاپاس سۆز",
     "File name contains at least one invalid character" : "ھۆججەت ئىسمى كەم دېگەندە بىر ئىناۋەتسىز ھەرپنى ئۆز ئىچىگە ئالىدۇ",
     "File name is too long" : "ھۆججەت ئىسمى بەك ئۇزۇن",
-    "Help" : "ياردەم",
     "Users" : "ئىشلەتكۈچىلەر",
-    "Unknown user" : "نامەلۇم ئىشلەتكۈچى",
-    "Enter the database username and name for %s" : "سانداننىڭ ئىشلەتكۈچى ئىسمى ۋە% s نىڭ نامىنى كىرگۈزۈڭ",
-    "Enter the database username for %s" : "% S ئۈچۈن ساندان ئىشلەتكۈچى نامىنى كىرگۈزۈڭ",
-    "MySQL username and/or password not valid" : "MySQL ئىشلەتكۈچى ئىسمى ۋە / ياكى پارول ئىناۋەتلىك ئەمەس",
-    "Oracle username and/or password not valid" : "Oracle ئىشلەتكۈچى ئىسمى ۋە / ياكى پارول ئىناۋەتلىك ئەمەس",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL ئىشلەتكۈچى ئىسمى ۋە / ياكى پارول ئىناۋەتلىك ئەمەس",
-    "Set an admin username." : "باشقۇرغۇچى ئىشلەتكۈچى نامىنى بەلگىلەڭ.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1 $ s ئورتاقلاشتى »%2 $ s« سىز بىلەن قوشماقچى:",
     "%1$s shared »%2$s« with you and wants to add" : "%1 $ s ئورتاقلاشتى »%2 $ s« سىز بىلەن قوشماقچى",
     "»%s« added a note to a file shared with you" : "»% S« سىز بىلەن ئورتاقلاشقان ھۆججەتكە خاتىرە قوشتى",
     "Open »%s«" : "ئېچىڭ »% s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "% S نى ئورتاقلىشىش مەغلۇب بولدى ، چۈنكى بۇ تۈر ئاللىقاچان% s ئىشلەتكۈچى بىلەن ئورتاقلاشتى",
     "%1$s shared »%2$s« with you" : "%1 $ s ئورتاقلاشتى »%2 $ s« سىز بىلەن",
     "%1$s shared »%2$s« with you." : "%1 $ s ئورتاقلاشتى »%2 $ s« سىز بىلەن.",
     "Click the button below to open it." : "ئۇنى ئېچىش ئۈچۈن تۆۋەندىكى كۇنۇپكىنى بېسىڭ.",
-    "The username is already being used" : "ئىشلەتكۈچى ئىسمى ئاللىبۇرۇن ئىشلىتىلىۋاتىدۇ",
-    "Could not create user" : "ئىشلەتكۈچى قۇرالمىدى",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "ئىشلەتكۈچى نامىدا پەقەت تۆۋەندىكى ھەرپلەرلا رۇخسەت قىلىنىدۇ: \"a-z\", \"A-Z\", \"0-9\", بوشلۇق ۋە \"_. @ - '\"",
-    "A valid username must be provided" : "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك",
-    "Username contains whitespace at the beginning or at the end" : "ئىشلەتكۈچى نامىنىڭ بېشىدا ياكى ئاخىرىدا ئاق بوشلۇق بار",
-    "Username must not consist of dots only" : "ئىشلەتكۈچى ئىسمى پەقەت چېكىتتىن تەركىب تاپقان بولۇشى كېرەك",
-    "Username is invalid because files already exist for this user" : "ئىشلەتكۈچى ئىسمى ئىناۋەتسىز ، چۈنكى بۇ ئىشلەتكۈچى ئۈچۈن ھۆججەتلەر بار",
-    "User disabled" : "ئىشلەتكۈچى چەكلەنگەن",
     "File is currently busy, please try again later" : "ھۆججەت ھازىر ئالدىراش ، كېيىن قايتا سىناڭ",
     "Cannot download file" : "ھۆججەتنى چۈشۈرگىلى بولمايدۇ",
-    "Your data directory is readable by other users." : "سانلىق مەلۇمات مۇندەرىجىسىڭىزنى باشقا ئىشلەتكۈچىلەر ئوقۇيالايدۇ.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "ئىجازەتنى 0770 غا ئۆزگەرتىڭ ، بۇنداق بولغاندا مۇندەرىجىنى باشقا ئىشلەتكۈچىلەر تىزىپ قويمايدۇ.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "سانلىق مەلۇمات مۇندەرىجىسىنىڭ يىلتىزىدا \".ocdata\" دەپ ئاتىلىدىغان ھۆججەتنىڭ بارلىقىغا كاپالەتلىك قىلىڭ."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/ug.json b/lib/l10n/ug.json
index a63e313409b..15cb4c7946f 100644
--- a/lib/l10n/ug.json
+++ b/lib/l10n/ug.json
@@ -380,41 +380,19 @@
     "Summarizes text by reducing its length without losing key information." : "ئاچقۇچلۇق ئۇچۇرلارنى يوقىتىپ قويماي ئۇزۇنلۇقىنى قىسقارتىش ئارقىلىق تېكىستنى خۇلاسىلەيدۇ.",
     "Extracts topics from a text and outputs them separated by commas." : "تېكىستتىن تېمىنى چىقىرىپ ، پەش ئارقىلىق ئايرىلىدۇ.",
     "Education Edition" : "مائارىپ نەشرى",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "تىزىمغا كىرگەن ئىشلەتكۈچى چوقۇم باشقۇرغۇچى ، تارماق باشقۇرغۇچى بولۇشى ياكى بۇ تەڭشەكنى زىيارەت قىلىش ھوقۇقىغا ئېرىشىشى كېرەك",
-    "Logged in user must be an admin or sub admin" : "تىزىملاتقان ئىشلەتكۈچى چوقۇم باشقۇرغۇچى ياكى تارماق باشقۇرغۇچى بولۇشى كېرەك",
-    "Logged in user must be an admin" : "تىزىملاتقان ئىشلەتكۈچى چوقۇم باشقۇرغۇچى بولۇشى كېرەك",
     "File name is a reserved word" : "ھۆججەت ئىسمى زاپاس سۆز",
     "File name contains at least one invalid character" : "ھۆججەت ئىسمى كەم دېگەندە بىر ئىناۋەتسىز ھەرپنى ئۆز ئىچىگە ئالىدۇ",
     "File name is too long" : "ھۆججەت ئىسمى بەك ئۇزۇن",
-    "Help" : "ياردەم",
     "Users" : "ئىشلەتكۈچىلەر",
-    "Unknown user" : "نامەلۇم ئىشلەتكۈچى",
-    "Enter the database username and name for %s" : "سانداننىڭ ئىشلەتكۈچى ئىسمى ۋە% s نىڭ نامىنى كىرگۈزۈڭ",
-    "Enter the database username for %s" : "% S ئۈچۈن ساندان ئىشلەتكۈچى نامىنى كىرگۈزۈڭ",
-    "MySQL username and/or password not valid" : "MySQL ئىشلەتكۈچى ئىسمى ۋە / ياكى پارول ئىناۋەتلىك ئەمەس",
-    "Oracle username and/or password not valid" : "Oracle ئىشلەتكۈچى ئىسمى ۋە / ياكى پارول ئىناۋەتلىك ئەمەس",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL ئىشلەتكۈچى ئىسمى ۋە / ياكى پارول ئىناۋەتلىك ئەمەس",
-    "Set an admin username." : "باشقۇرغۇچى ئىشلەتكۈچى نامىنى بەلگىلەڭ.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1 $ s ئورتاقلاشتى »%2 $ s« سىز بىلەن قوشماقچى:",
     "%1$s shared »%2$s« with you and wants to add" : "%1 $ s ئورتاقلاشتى »%2 $ s« سىز بىلەن قوشماقچى",
     "»%s« added a note to a file shared with you" : "»% S« سىز بىلەن ئورتاقلاشقان ھۆججەتكە خاتىرە قوشتى",
     "Open »%s«" : "ئېچىڭ »% s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "% S نى ئورتاقلىشىش مەغلۇب بولدى ، چۈنكى بۇ تۈر ئاللىقاچان% s ئىشلەتكۈچى بىلەن ئورتاقلاشتى",
     "%1$s shared »%2$s« with you" : "%1 $ s ئورتاقلاشتى »%2 $ s« سىز بىلەن",
     "%1$s shared »%2$s« with you." : "%1 $ s ئورتاقلاشتى »%2 $ s« سىز بىلەن.",
     "Click the button below to open it." : "ئۇنى ئېچىش ئۈچۈن تۆۋەندىكى كۇنۇپكىنى بېسىڭ.",
-    "The username is already being used" : "ئىشلەتكۈچى ئىسمى ئاللىبۇرۇن ئىشلىتىلىۋاتىدۇ",
-    "Could not create user" : "ئىشلەتكۈچى قۇرالمىدى",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "ئىشلەتكۈچى نامىدا پەقەت تۆۋەندىكى ھەرپلەرلا رۇخسەت قىلىنىدۇ: \"a-z\", \"A-Z\", \"0-9\", بوشلۇق ۋە \"_. @ - '\"",
-    "A valid username must be provided" : "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك",
-    "Username contains whitespace at the beginning or at the end" : "ئىشلەتكۈچى نامىنىڭ بېشىدا ياكى ئاخىرىدا ئاق بوشلۇق بار",
-    "Username must not consist of dots only" : "ئىشلەتكۈچى ئىسمى پەقەت چېكىتتىن تەركىب تاپقان بولۇشى كېرەك",
-    "Username is invalid because files already exist for this user" : "ئىشلەتكۈچى ئىسمى ئىناۋەتسىز ، چۈنكى بۇ ئىشلەتكۈچى ئۈچۈن ھۆججەتلەر بار",
-    "User disabled" : "ئىشلەتكۈچى چەكلەنگەن",
     "File is currently busy, please try again later" : "ھۆججەت ھازىر ئالدىراش ، كېيىن قايتا سىناڭ",
     "Cannot download file" : "ھۆججەتنى چۈشۈرگىلى بولمايدۇ",
-    "Your data directory is readable by other users." : "سانلىق مەلۇمات مۇندەرىجىسىڭىزنى باشقا ئىشلەتكۈچىلەر ئوقۇيالايدۇ.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "ئىجازەتنى 0770 غا ئۆزگەرتىڭ ، بۇنداق بولغاندا مۇندەرىجىنى باشقا ئىشلەتكۈچىلەر تىزىپ قويمايدۇ.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "سانلىق مەلۇمات مۇندەرىجىسىنىڭ يىلتىزىدا \".ocdata\" دەپ ئاتىلىدىغان ھۆججەتنىڭ بارلىقىغا كاپالەتلىك قىلىڭ."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/uk.js b/lib/l10n/uk.js
index b3bc3ffbb0a..82060b10d17 100644
--- a/lib/l10n/uk.js
+++ b/lib/l10n/uk.js
@@ -92,6 +92,7 @@ OC.L10N.register(
     "Invalid path" : "Недійсний шлях",
     "Failed to create file from template" : "Не вдалося створити файл із шаблону",
     "Templates" : "Шаблони",
+    "Storage %s cannot be moved" : "Неможливо перемістити сховище даних %s",
     "Path contains invalid segments" : "Шлях містить недійсні елементи в назві",
     "Filename is a reserved word" : "Ім'я файлу є зарезервованим словом",
     "Filename contains at least one invalid character" : "У назві файлу міститься щонайменше один неправильний символ",
@@ -331,41 +332,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "Викокремлює головне у тексті шляхом зменшення довжини тексту без втрати ключової інформації.",
     "Extracts topics from a text and outputs them separated by commas." : "Виділяє теми, які висвітлює текст, зводить їх у перелік, що розділено комами.",
     "Education Edition" : "Для навчання",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Користувач, який увійшов у систему, має бути адміністратором, підадміністратором або мати спеціальні права доступу до цього налаштування",
-    "Logged in user must be an admin or sub admin" : "Увійшовши в систему користувач повинен бути адміністратором або підадміністратором",
-    "Logged in user must be an admin" : "Зареєстрований користувач має бути адміністратором",
     "File name is a reserved word" : "Ім’я файлу є зарезервованим словом",
     "File name contains at least one invalid character" : "Ім’я файлу містить принаймні один некоректний символ",
     "File name is too long" : "Ім’я файлу занадто довге",
-    "Help" : "Допомога",
     "Users" : "Користувачі",
-    "Unknown user" : "Невідомий користувач",
-    "Enter the database username and name for %s" : "Введіть ім’я користувача та назву бази даних %s",
-    "Enter the database username for %s" : "Введіть ім’я користувача бази даних для %s",
-    "MySQL username and/or password not valid" : "Ім'я користувача та/або пароль MySQL недійсні",
-    "Oracle username and/or password not valid" : "Oracle ім'я користувача та/або пароль не дійсні",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL ім'я користувача та/або пароль не дійсні",
-    "Set an admin username." : "Встановіть ім'я адміністратора.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s надав(-ла) доступ до \"%2$s\" та хоче додати:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s надав(-ла) доступ до \"%2$s\" та хоче додати",
     "»%s« added a note to a file shared with you" : "\"%s\" додано примітку до файлу у спільному доступі",
     "Open »%s«" : "Відкрити %s",
-    "Sharing %s failed, because this item is already shared with user %s" : "Не вдалося поділитися %s, оскільки %s вже має до нього доступ",
     "%1$s shared »%2$s« with you" : "%1$s надав(-ла) доступ до \"%2$s\"",
     "%1$s shared »%2$s« with you." : "%1$s надав(-ла) доступ до \"%2$s\".",
     "Click the button below to open it." : "Щоб відкрити файл, натисніть кнопку нижче.",
-    "The username is already being used" : "Ім'я користувача вже використовується",
-    "Could not create user" : "Не вдалося створити користувача",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Лише такі символи дозволено у імені користувача: \"a-z\", \"A-Z\", \"0-9\", пробіл та \"_.@-'\"",
-    "A valid username must be provided" : "Потрібно зазначити дійсне ім'я користувача",
-    "Username contains whitespace at the beginning or at the end" : "Ім'я користувача містить символ пробілу в початку або в кінці",
-    "Username must not consist of dots only" : "Ім'я користувача не повинно складатися лише з крапок",
-    "Username is invalid because files already exist for this user" : "Ім'я користувача недійсне, оскільки файли для цього користувача вже існують",
-    "User disabled" : "Користувач виключений",
     "File is currently busy, please try again later" : "Файл на разі зайнятий, будь ласка, спробуйте пізніше",
     "Cannot download file" : "Неможливо звантажити файл",
-    "Your data directory is readable by other users." : "Ваш каталог даних доступний для читання іншим користувачам.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Змініть права доступу на 0770, щоб інші користувачі не могли отримати список файлів цього каталогу.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Переконайтеся, що в корені каталогу даних є файл під назвою \".ocdata\"."
 },
 "nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);");
diff --git a/lib/l10n/uk.json b/lib/l10n/uk.json
index daa3994eadd..31ae318cde4 100644
--- a/lib/l10n/uk.json
+++ b/lib/l10n/uk.json
@@ -90,6 +90,7 @@
     "Invalid path" : "Недійсний шлях",
     "Failed to create file from template" : "Не вдалося створити файл із шаблону",
     "Templates" : "Шаблони",
+    "Storage %s cannot be moved" : "Неможливо перемістити сховище даних %s",
     "Path contains invalid segments" : "Шлях містить недійсні елементи в назві",
     "Filename is a reserved word" : "Ім'я файлу є зарезервованим словом",
     "Filename contains at least one invalid character" : "У назві файлу міститься щонайменше один неправильний символ",
@@ -329,41 +330,19 @@
     "Summarizes text by reducing its length without losing key information." : "Викокремлює головне у тексті шляхом зменшення довжини тексту без втрати ключової інформації.",
     "Extracts topics from a text and outputs them separated by commas." : "Виділяє теми, які висвітлює текст, зводить їх у перелік, що розділено комами.",
     "Education Edition" : "Для навчання",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "Користувач, який увійшов у систему, має бути адміністратором, підадміністратором або мати спеціальні права доступу до цього налаштування",
-    "Logged in user must be an admin or sub admin" : "Увійшовши в систему користувач повинен бути адміністратором або підадміністратором",
-    "Logged in user must be an admin" : "Зареєстрований користувач має бути адміністратором",
     "File name is a reserved word" : "Ім’я файлу є зарезервованим словом",
     "File name contains at least one invalid character" : "Ім’я файлу містить принаймні один некоректний символ",
     "File name is too long" : "Ім’я файлу занадто довге",
-    "Help" : "Допомога",
     "Users" : "Користувачі",
-    "Unknown user" : "Невідомий користувач",
-    "Enter the database username and name for %s" : "Введіть ім’я користувача та назву бази даних %s",
-    "Enter the database username for %s" : "Введіть ім’я користувача бази даних для %s",
-    "MySQL username and/or password not valid" : "Ім'я користувача та/або пароль MySQL недійсні",
-    "Oracle username and/or password not valid" : "Oracle ім'я користувача та/або пароль не дійсні",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL ім'я користувача та/або пароль не дійсні",
-    "Set an admin username." : "Встановіть ім'я адміністратора.",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s надав(-ла) доступ до \"%2$s\" та хоче додати:",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s надав(-ла) доступ до \"%2$s\" та хоче додати",
     "»%s« added a note to a file shared with you" : "\"%s\" додано примітку до файлу у спільному доступі",
     "Open »%s«" : "Відкрити %s",
-    "Sharing %s failed, because this item is already shared with user %s" : "Не вдалося поділитися %s, оскільки %s вже має до нього доступ",
     "%1$s shared »%2$s« with you" : "%1$s надав(-ла) доступ до \"%2$s\"",
     "%1$s shared »%2$s« with you." : "%1$s надав(-ла) доступ до \"%2$s\".",
     "Click the button below to open it." : "Щоб відкрити файл, натисніть кнопку нижче.",
-    "The username is already being used" : "Ім'я користувача вже використовується",
-    "Could not create user" : "Не вдалося створити користувача",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Лише такі символи дозволено у імені користувача: \"a-z\", \"A-Z\", \"0-9\", пробіл та \"_.@-'\"",
-    "A valid username must be provided" : "Потрібно зазначити дійсне ім'я користувача",
-    "Username contains whitespace at the beginning or at the end" : "Ім'я користувача містить символ пробілу в початку або в кінці",
-    "Username must not consist of dots only" : "Ім'я користувача не повинно складатися лише з крапок",
-    "Username is invalid because files already exist for this user" : "Ім'я користувача недійсне, оскільки файли для цього користувача вже існують",
-    "User disabled" : "Користувач виключений",
     "File is currently busy, please try again later" : "Файл на разі зайнятий, будь ласка, спробуйте пізніше",
     "Cannot download file" : "Неможливо звантажити файл",
-    "Your data directory is readable by other users." : "Ваш каталог даних доступний для читання іншим користувачам.",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Змініть права доступу на 0770, щоб інші користувачі не могли отримати список файлів цього каталогу.",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Переконайтеся, що в корені каталогу даних є файл під назвою \".ocdata\"."
 },"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);"
 }
\ No newline at end of file
diff --git a/lib/l10n/ur_PK.js b/lib/l10n/ur_PK.js
index e58134e8957..0758c55ebe9 100644
--- a/lib/l10n/ur_PK.js
+++ b/lib/l10n/ur_PK.js
@@ -32,7 +32,6 @@ OC.L10N.register(
     "October" : "اکتوبر",
     "November" : "نومبر",
     "December" : "دسمبر",
-    "Help" : "مدد",
     "Users" : "یوزرز"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/ur_PK.json b/lib/l10n/ur_PK.json
index 6054376b210..e1cdfc9e1d5 100644
--- a/lib/l10n/ur_PK.json
+++ b/lib/l10n/ur_PK.json
@@ -30,7 +30,6 @@
     "October" : "اکتوبر",
     "November" : "نومبر",
     "December" : "دسمبر",
-    "Help" : "مدد",
     "Users" : "یوزرز"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/uz.js b/lib/l10n/uz.js
index 17830cba76b..379db129f82 100644
--- a/lib/l10n/uz.js
+++ b/lib/l10n/uz.js
@@ -18,8 +18,6 @@ OC.L10N.register(
     "Authentication error" : "Authentication error",
     "Storage is temporarily not available" : "Storage is temporarily not available",
     "File name is too long" : "File name is too long",
-    "Help" : "Help",
-    "Users" : "Users",
-    "Unknown user" : "Unknown user"
+    "Users" : "Users"
 },
 "nplurals=1; plural=0;");
diff --git a/lib/l10n/uz.json b/lib/l10n/uz.json
index bb313c8fa89..e7b8cfd7b6e 100644
--- a/lib/l10n/uz.json
+++ b/lib/l10n/uz.json
@@ -16,8 +16,6 @@
     "Authentication error" : "Authentication error",
     "Storage is temporarily not available" : "Storage is temporarily not available",
     "File name is too long" : "File name is too long",
-    "Help" : "Help",
-    "Users" : "Users",
-    "Unknown user" : "Unknown user"
+    "Users" : "Users"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/lib/l10n/vi.js b/lib/l10n/vi.js
index 040a70be53d..4a0ea6e39b0 100644
--- a/lib/l10n/vi.js
+++ b/lib/l10n/vi.js
@@ -105,12 +105,8 @@ OC.L10N.register(
     "Summary" : "Tóm tắt",
     "Translate" : "Dịch",
     "Education Edition" : "Bản Giáo dục",
-    "Help" : "Giúp đỡ",
     "Users" : "Người dùng",
-    "Unknown user" : "Người dùng không tồn tại",
     "Open »%s«" : "Mở »%s«",
-    "Click the button below to open it." : "Bấm vào nút bên dưới để mở nó.",
-    "The username is already being used" : "Tên đăng nhập đã được sử dụng",
-    "User disabled" : "Vô hiệu hóa sử dụng"
+    "Click the button below to open it." : "Bấm vào nút bên dưới để mở nó."
 },
 "nplurals=1; plural=0;");
diff --git a/lib/l10n/vi.json b/lib/l10n/vi.json
index 532df87c4d9..b8b5adc7de6 100644
--- a/lib/l10n/vi.json
+++ b/lib/l10n/vi.json
@@ -103,12 +103,8 @@
     "Summary" : "Tóm tắt",
     "Translate" : "Dịch",
     "Education Edition" : "Bản Giáo dục",
-    "Help" : "Giúp đỡ",
     "Users" : "Người dùng",
-    "Unknown user" : "Người dùng không tồn tại",
     "Open »%s«" : "Mở »%s«",
-    "Click the button below to open it." : "Bấm vào nút bên dưới để mở nó.",
-    "The username is already being used" : "Tên đăng nhập đã được sử dụng",
-    "User disabled" : "Vô hiệu hóa sử dụng"
+    "Click the button below to open it." : "Bấm vào nút bên dưới để mở nó."
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/lib/l10n/zh_CN.js b/lib/l10n/zh_CN.js
index fbeeebe1e67..afd95c1aeb3 100644
--- a/lib/l10n/zh_CN.js
+++ b/lib/l10n/zh_CN.js
@@ -59,6 +59,7 @@ OC.L10N.register(
     "Avatar image is not square" : "头像图像不是正方形",
     "Files" : "文件",
     "View profile" : "查看个人资料",
+    "_%nh_::_%nh_" : ["%n 小时"],
     "Local time: %s" : "当地时间：%s",
     "today" : "今天",
     "tomorrow" : "明天",
@@ -92,6 +93,13 @@ OC.L10N.register(
     "Invalid path" : "无效的路径",
     "Failed to create file from template" : "从模板创建文件失败",
     "Templates" : "模板",
+    "Storage %s cannot be moved" : "无法移动存储空间 %s",
+    "Moving a share (%s) into a shared folder is not allowed" : "不允许将分享（%s）移动到共享文件夹中",
+    "Moving a storage (%s) into a shared folder is not allowed" : "不允许将储存空间（%s）移动到共享文件夹中",
+    "Moving a share (%s) into another share (%s) is not allowed" : "不允许将分享（%s）移动到另一个分享（%s）中",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "不允许将分享（%s）移动到另一个储存空间（%s）中",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "不允许将储存空间（%s）移动到分享（%s）中",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "不允许将储存空间（%s）移动到另一个储存空间（%s）中",
     "Path contains invalid segments" : "路径包含无效段",
     "Filename is a reserved word" : "Filename 是保留字",
     "Filename contains at least one invalid character" : "文件名中存在至少一个非法字符",
@@ -194,10 +202,14 @@ OC.L10N.register(
     "Cannot disable sending the password by Talk without setting a new password" : "如果不设置新密码，则无法禁用 Talk 发送密码",
     "Share provider does not support accepting" : "共享提供商不支持接受",
     "Cannot change target of link share" : "无法更改链接共享的目标",
+    "Invalid share recipient" : "无效的分享接收者",
+    "Group \"%s\" does not exist" : "组“%s”不存在",
     "The requested share does not exist anymore" : "当前请求的共享已经不存在",
     "The requested share comes from a disabled user" : "请求的分享来自一个被禁用的用户",
     "The user was not created because the user limit has been reached. Check your notifications to learn more." : "由于已达用户数量上限，用户未创建。请检查通知以了解详情。",
     "Could not find category \"%s\"" : "无法找到分类 \"%s\"",
+    "Input text" : "输入文本",
+    "The input text" : "输入文本",
     "Sunday" : "星期日",
     "Monday" : "星期一",
     "Tuesday" : "星期二",
@@ -304,19 +316,40 @@ OC.L10N.register(
     "Transcribe the things said in an audio" : "将音频中的内容转录下来",
     "Audio input" : "音频输入",
     "The audio to transcribe" : "要转录的音频",
+    "Transcription" : "转录",
+    "The transcribed text" : "已转录的文本",
+    "Chat with an agent" : "和 agent 对话",
+    "Chat message" : "聊天消息",
+    "A chat message to send to the agent." : "要发送给 agent 的聊天消息。",
     "Confirmation" : "确认",
+    "Whether to confirm previously requested actions: 0 for denial and 1 for confirmation." : "是否确认之前的操作：0表示拒绝，1表示确认。",
+    "A token representing the conversation." : "代表对话的 token。",
+    "Generated response" : "生成的回复",
+    "The response from the chat model." : "来自聊天模型的回应。",
+    "The new conversation token" : "新的对话 token",
+    "Send this along with the next interaction." : "下次交互时一起发送。",
+    "Requested actions by the agent" : "Agent 要求的操作",
     "Context write" : "文本撰写",
     "Writes text in a given style based on the provided source material." : "通过给出语料的风格生成文字",
     "Writing style" : "撰写风格",
     "Demonstrate a writing style that you would like to immitate" : "展示你想模仿的写作风格",
     "Source material" : "来源材料",
     "The content that would like to be rewritten in the new writing style" : "希望以新文风重写的内容",
+    "Generated text" : "生成的文本",
     "The generated text with content from the source material in the given style" : "生成的文本内容来自给定风格的源材料",
+    "Emoji generator" : "表情生成器",
+    "Takes text and generates a representative emoji for it." : "应用文本并生成一个相应的表情。",
+    "The text to generate an emoji for" : "用于生成表情的文字",
+    "Generated emoji" : "生成的表情",
     "The generated emoji based on the input text" : "根据输入文本生成的表情符号",
     "Generate image" : "生成图片",
     "Generate an image from a text prompt" : "根据文本提示生成图像",
     "Prompt" : "提示",
     "Describe the image you want to generate" : "描述你想要生成的图像",
+    "Number of images" : "图像数量",
+    "How many images to generate" : "生成多少张图片",
+    "Output images" : "输出图像",
+    "The generated images" : "生成的图像",
     "Runs an arbitrary prompt through a language model that returns a reply" : "通过语言模型运行任意提示并返回答复",
     "Describe a task that you want the assistant to do or ask a question" : "描述你希望助手执行的任务或提出问题",
     "The generated text from the assistant" : "助手生成的文本",
@@ -356,41 +389,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "总结一段文本以减少长度而不丢失关键信息",
     "Extracts topics from a text and outputs them separated by commas." : "从文本中摘出主题，输出逗号分隔的结果",
     "Education Edition" : "教育版",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "登录用户必须是管理员、子管理员或具有访问此设置的特殊权限",
-    "Logged in user must be an admin or sub admin" : "当前登录用户必须为管理员或子管理员",
-    "Logged in user must be an admin" : "当前登录用户必须为管理员",
     "File name is a reserved word" : "文件名包含敏感字符",
     "File name contains at least one invalid character" : "文件名中存在至少一个非法字符",
     "File name is too long" : "文件名过长",
-    "Help" : "帮助",
     "Users" : "用户",
-    "Unknown user" : "未知用户",
-    "Enter the database username and name for %s" : "输入 %s 的数据库用户名和名称",
-    "Enter the database username for %s" : "输入 %s 的数据库用户名",
-    "MySQL username and/or password not valid" : "MySQL 数据库用户名和/或密码无效",
-    "Oracle username and/or password not valid" : "Oracle 数据库用户名和/或密码无效",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL 数据库用户名和/或密码无效",
-    "Set an admin username." : "请设置一个管理员用户名。",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s 与您共享了 »%2$s« 并希望添加：",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s 与您共享了 »%2$s« 并希望添加",
     "»%s« added a note to a file shared with you" : "»%s« 在与你共享的文件中添加了备注",
     "Open »%s«" : "打开 »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "共享 %s 失败了，因为该项目已和用户 %s 进行了分享。",
     "%1$s shared »%2$s« with you" : "%1$s 对您共享了 »%2$s«",
     "%1$s shared »%2$s« with you." : "%1$s 对您共享了 »%2$s«。",
     "Click the button below to open it." : "点击下方按钮可打开它。",
-    "The username is already being used" : "用户名已被使用",
-    "Could not create user" : "无法创建用户",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "在用户名中只允许使用以下字符：“a-z”、“A-Z”、“0-9”、空格和 \"_.@-'\"",
-    "A valid username must be provided" : "必须提供合法的用户名",
-    "Username contains whitespace at the beginning or at the end" : "用户名在开头或结尾处包含空格",
-    "Username must not consist of dots only" : "用户名不能仅由点组成",
-    "Username is invalid because files already exist for this user" : "用户名无效，因为该用户已经存在文件",
-    "User disabled" : "用户已禁用",
     "File is currently busy, please try again later" : "文件当前正忙，请稍后再试",
     "Cannot download file" : "无法下载文件",
-    "Your data directory is readable by other users." : "您的数据目录可被其他用户读取。",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "请更改权限为 0770 以避免其他用户查看目录。",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "请确定在根目录下有一个名为\".ocdata\"的文件。"
 },
 "nplurals=1; plural=0;");
diff --git a/lib/l10n/zh_CN.json b/lib/l10n/zh_CN.json
index 34e5e3d3c60..075be8ba64f 100644
--- a/lib/l10n/zh_CN.json
+++ b/lib/l10n/zh_CN.json
@@ -57,6 +57,7 @@
     "Avatar image is not square" : "头像图像不是正方形",
     "Files" : "文件",
     "View profile" : "查看个人资料",
+    "_%nh_::_%nh_" : ["%n 小时"],
     "Local time: %s" : "当地时间：%s",
     "today" : "今天",
     "tomorrow" : "明天",
@@ -90,6 +91,13 @@
     "Invalid path" : "无效的路径",
     "Failed to create file from template" : "从模板创建文件失败",
     "Templates" : "模板",
+    "Storage %s cannot be moved" : "无法移动存储空间 %s",
+    "Moving a share (%s) into a shared folder is not allowed" : "不允许将分享（%s）移动到共享文件夹中",
+    "Moving a storage (%s) into a shared folder is not allowed" : "不允许将储存空间（%s）移动到共享文件夹中",
+    "Moving a share (%s) into another share (%s) is not allowed" : "不允许将分享（%s）移动到另一个分享（%s）中",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "不允许将分享（%s）移动到另一个储存空间（%s）中",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "不允许将储存空间（%s）移动到分享（%s）中",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "不允许将储存空间（%s）移动到另一个储存空间（%s）中",
     "Path contains invalid segments" : "路径包含无效段",
     "Filename is a reserved word" : "Filename 是保留字",
     "Filename contains at least one invalid character" : "文件名中存在至少一个非法字符",
@@ -192,10 +200,14 @@
     "Cannot disable sending the password by Talk without setting a new password" : "如果不设置新密码，则无法禁用 Talk 发送密码",
     "Share provider does not support accepting" : "共享提供商不支持接受",
     "Cannot change target of link share" : "无法更改链接共享的目标",
+    "Invalid share recipient" : "无效的分享接收者",
+    "Group \"%s\" does not exist" : "组“%s”不存在",
     "The requested share does not exist anymore" : "当前请求的共享已经不存在",
     "The requested share comes from a disabled user" : "请求的分享来自一个被禁用的用户",
     "The user was not created because the user limit has been reached. Check your notifications to learn more." : "由于已达用户数量上限，用户未创建。请检查通知以了解详情。",
     "Could not find category \"%s\"" : "无法找到分类 \"%s\"",
+    "Input text" : "输入文本",
+    "The input text" : "输入文本",
     "Sunday" : "星期日",
     "Monday" : "星期一",
     "Tuesday" : "星期二",
@@ -302,19 +314,40 @@
     "Transcribe the things said in an audio" : "将音频中的内容转录下来",
     "Audio input" : "音频输入",
     "The audio to transcribe" : "要转录的音频",
+    "Transcription" : "转录",
+    "The transcribed text" : "已转录的文本",
+    "Chat with an agent" : "和 agent 对话",
+    "Chat message" : "聊天消息",
+    "A chat message to send to the agent." : "要发送给 agent 的聊天消息。",
     "Confirmation" : "确认",
+    "Whether to confirm previously requested actions: 0 for denial and 1 for confirmation." : "是否确认之前的操作：0表示拒绝，1表示确认。",
+    "A token representing the conversation." : "代表对话的 token。",
+    "Generated response" : "生成的回复",
+    "The response from the chat model." : "来自聊天模型的回应。",
+    "The new conversation token" : "新的对话 token",
+    "Send this along with the next interaction." : "下次交互时一起发送。",
+    "Requested actions by the agent" : "Agent 要求的操作",
     "Context write" : "文本撰写",
     "Writes text in a given style based on the provided source material." : "通过给出语料的风格生成文字",
     "Writing style" : "撰写风格",
     "Demonstrate a writing style that you would like to immitate" : "展示你想模仿的写作风格",
     "Source material" : "来源材料",
     "The content that would like to be rewritten in the new writing style" : "希望以新文风重写的内容",
+    "Generated text" : "生成的文本",
     "The generated text with content from the source material in the given style" : "生成的文本内容来自给定风格的源材料",
+    "Emoji generator" : "表情生成器",
+    "Takes text and generates a representative emoji for it." : "应用文本并生成一个相应的表情。",
+    "The text to generate an emoji for" : "用于生成表情的文字",
+    "Generated emoji" : "生成的表情",
     "The generated emoji based on the input text" : "根据输入文本生成的表情符号",
     "Generate image" : "生成图片",
     "Generate an image from a text prompt" : "根据文本提示生成图像",
     "Prompt" : "提示",
     "Describe the image you want to generate" : "描述你想要生成的图像",
+    "Number of images" : "图像数量",
+    "How many images to generate" : "生成多少张图片",
+    "Output images" : "输出图像",
+    "The generated images" : "生成的图像",
     "Runs an arbitrary prompt through a language model that returns a reply" : "通过语言模型运行任意提示并返回答复",
     "Describe a task that you want the assistant to do or ask a question" : "描述你希望助手执行的任务或提出问题",
     "The generated text from the assistant" : "助手生成的文本",
@@ -354,41 +387,19 @@
     "Summarizes text by reducing its length without losing key information." : "总结一段文本以减少长度而不丢失关键信息",
     "Extracts topics from a text and outputs them separated by commas." : "从文本中摘出主题，输出逗号分隔的结果",
     "Education Edition" : "教育版",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "登录用户必须是管理员、子管理员或具有访问此设置的特殊权限",
-    "Logged in user must be an admin or sub admin" : "当前登录用户必须为管理员或子管理员",
-    "Logged in user must be an admin" : "当前登录用户必须为管理员",
     "File name is a reserved word" : "文件名包含敏感字符",
     "File name contains at least one invalid character" : "文件名中存在至少一个非法字符",
     "File name is too long" : "文件名过长",
-    "Help" : "帮助",
     "Users" : "用户",
-    "Unknown user" : "未知用户",
-    "Enter the database username and name for %s" : "输入 %s 的数据库用户名和名称",
-    "Enter the database username for %s" : "输入 %s 的数据库用户名",
-    "MySQL username and/or password not valid" : "MySQL 数据库用户名和/或密码无效",
-    "Oracle username and/or password not valid" : "Oracle 数据库用户名和/或密码无效",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL 数据库用户名和/或密码无效",
-    "Set an admin username." : "请设置一个管理员用户名。",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s 与您共享了 »%2$s« 并希望添加：",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s 与您共享了 »%2$s« 并希望添加",
     "»%s« added a note to a file shared with you" : "»%s« 在与你共享的文件中添加了备注",
     "Open »%s«" : "打开 »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "共享 %s 失败了，因为该项目已和用户 %s 进行了分享。",
     "%1$s shared »%2$s« with you" : "%1$s 对您共享了 »%2$s«",
     "%1$s shared »%2$s« with you." : "%1$s 对您共享了 »%2$s«。",
     "Click the button below to open it." : "点击下方按钮可打开它。",
-    "The username is already being used" : "用户名已被使用",
-    "Could not create user" : "无法创建用户",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "在用户名中只允许使用以下字符：“a-z”、“A-Z”、“0-9”、空格和 \"_.@-'\"",
-    "A valid username must be provided" : "必须提供合法的用户名",
-    "Username contains whitespace at the beginning or at the end" : "用户名在开头或结尾处包含空格",
-    "Username must not consist of dots only" : "用户名不能仅由点组成",
-    "Username is invalid because files already exist for this user" : "用户名无效，因为该用户已经存在文件",
-    "User disabled" : "用户已禁用",
     "File is currently busy, please try again later" : "文件当前正忙，请稍后再试",
     "Cannot download file" : "无法下载文件",
-    "Your data directory is readable by other users." : "您的数据目录可被其他用户读取。",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "请更改权限为 0770 以避免其他用户查看目录。",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "请确定在根目录下有一个名为\".ocdata\"的文件。"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/lib/l10n/zh_HK.js b/lib/l10n/zh_HK.js
index 94da18cd40e..b0b48cf4079 100644
--- a/lib/l10n/zh_HK.js
+++ b/lib/l10n/zh_HK.js
@@ -59,6 +59,11 @@ OC.L10N.register(
     "Avatar image is not square" : "虛擬化身圖像不是正方形",
     "Files" : "檔案",
     "View profile" : "查看個人資料",
+    "same time" : "相同時間",
+    "_%nh_::_%nh_" : ["%n小時"],
+    "_%nm_::_%nm_" : ["%n分鐘"],
+    "%s ahead" : "提早 %s",
+    "%s behind" : "落後 %s",
     "Local time: %s" : "本地時間︰%s",
     "today" : "今日",
     "tomorrow" : "明日",
@@ -81,6 +86,12 @@ OC.L10N.register(
     "seconds ago" : "幾秒前",
     "Empty file" : "空檔案",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "名為 %s 的模組不存在，請在應用程式設定中啟用，或是聯絡系統管理員",
+    "No file conversion providers available" : "沒有可用的檔案轉換提供者",
+    "File is too large to convert" : "檔案太大，無法轉換",
+    "Destination does not match conversion extension" : "目的地不符合轉換副檔名",
+    "Could not convert file" : "無法轉換檔案",
+    "Destination does not exist" : "目的地不存在",
+    "Destination is not creatable" : "無法建立目的地",
     "Dot files are not allowed" : "不允許小數點開頭的檔案",
     "\"%1$s\" is a forbidden file or folder name." : "「%1$s」是禁止的檔案或資料夾名稱。",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "「%1$s」是禁止的檔案或資料夾名稱前綴。",
@@ -92,6 +103,13 @@ OC.L10N.register(
     "Invalid path" : "路徑無效",
     "Failed to create file from template" : "無法從模板創建檔案",
     "Templates" : "模板",
+    "Storage %s cannot be moved" : "無法移動儲存空間 %s",
+    "Moving a share (%s) into a shared folder is not allowed" : "不允許將分享 (%s) 移動到共享資料夾中",
+    "Moving a storage (%s) into a shared folder is not allowed" : "不允許將儲存空間(%s) 移動到共享資料夾中",
+    "Moving a share (%s) into another share (%s) is not allowed" : "不允許將分享 (%s) 移動到其他分享 (%s) 中",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "不允許將分享 (%s) 移動到其他儲存空間 (%s) 中",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "不允許將儲存空間 (%s) 移動到分享 (%s) 中",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "不允許將儲存空間 (%s) 移動到其他儲存空間 (%s) 中",
     "Path contains invalid segments" : "路徑包含無效的部份",
     "Filename is a reserved word" : "檔案名稱是保留字",
     "Filename contains at least one invalid character" : "檔名至少要有一個有效字元",
@@ -425,41 +443,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "通過減少文字長度來總結而不丟失關鍵資訊。",
     "Extracts topics from a text and outputs them separated by commas." : "從文字中提取主題並輸出，並用逗號分隔。",
     "Education Edition" : "教育版",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "登錄用戶必須是管理員、子管理員或具有存取此設定的特殊權限",
-    "Logged in user must be an admin or sub admin" : "登入的用戶必須要是管理員或是子管理員",
-    "Logged in user must be an admin" : "登入的用戶必須有管理員權限",
     "File name is a reserved word" : "檔案名稱是保留字",
     "File name contains at least one invalid character" : "檔案名稱含有不允許的字元",
     "File name is too long" : "檔案名稱太長",
-    "Help" : "說明",
     "Users" : "用戶",
-    "Unknown user" : "用戶不詳",
-    "Enter the database username and name for %s" : "輸入 %s 的數據庫用戶名及名稱",
-    "Enter the database username for %s" : "輸入 %s 的數據庫用戶名",
-    "MySQL username and/or password not valid" : "MySQL 用戶名稱或密碼不正確",
-    "Oracle username and/or password not valid" : "Oracle 用戶名和/或密碼無效",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL 用戶名和/或密碼無效",
-    "Set an admin username." : "設定管理員帳號",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s 與您分享了 %2$s ，且想要加入：",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s 與您分享了 %2$s ，且想要加入",
     "»%s« added a note to a file shared with you" : "%s 在與您分享的檔案中加入了註解",
     "Open »%s«" : "開啟 »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "分享 %s 失敗，此項目已經與用戶 %s 分享",
     "%1$s shared »%2$s« with you" : "%1$s 與您分享了 %2$s",
     "%1$s shared »%2$s« with you." : "%1$s 與您分享了 %2$s",
     "Click the button below to open it." : "點下方連結開啟",
-    "The username is already being used" : "這個用戶名稱已經有人使用了",
-    "Could not create user" : "無法建立用戶",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "用戶名稱當中只能包含下列字元：\"a-z\"， \"A-Z\"， \"0-9\"，空格 和 \"_.@-'\"",
-    "A valid username must be provided" : "必須提供一個有效的用戶名",
-    "Username contains whitespace at the beginning or at the end" : "用戶名的開頭或結尾有空白",
-    "Username must not consist of dots only" : "用戶名稱不能只包含小數點",
-    "Username is invalid because files already exist for this user" : "用戶名稱無效，因為用戶的檔案已經存在",
-    "User disabled" : "用戶已停用",
     "File is currently busy, please try again later" : "檔案目前忙碌中，請稍候再試",
     "Cannot download file" : "無法下載檔案",
-    "Your data directory is readable by other users." : "您的資料目錄可以被其他用戶讀取。",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "請將該目錄權限設定為 0770 ，以免其他用戶讀取目錄列表",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "請確保資料目錄最上層有一個 \"。ocdata\" 檔案"
 },
 "nplurals=1; plural=0;");
diff --git a/lib/l10n/zh_HK.json b/lib/l10n/zh_HK.json
index 39ff6ab722f..59990942327 100644
--- a/lib/l10n/zh_HK.json
+++ b/lib/l10n/zh_HK.json
@@ -57,6 +57,11 @@
     "Avatar image is not square" : "虛擬化身圖像不是正方形",
     "Files" : "檔案",
     "View profile" : "查看個人資料",
+    "same time" : "相同時間",
+    "_%nh_::_%nh_" : ["%n小時"],
+    "_%nm_::_%nm_" : ["%n分鐘"],
+    "%s ahead" : "提早 %s",
+    "%s behind" : "落後 %s",
     "Local time: %s" : "本地時間︰%s",
     "today" : "今日",
     "tomorrow" : "明日",
@@ -79,6 +84,12 @@
     "seconds ago" : "幾秒前",
     "Empty file" : "空檔案",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "名為 %s 的模組不存在，請在應用程式設定中啟用，或是聯絡系統管理員",
+    "No file conversion providers available" : "沒有可用的檔案轉換提供者",
+    "File is too large to convert" : "檔案太大，無法轉換",
+    "Destination does not match conversion extension" : "目的地不符合轉換副檔名",
+    "Could not convert file" : "無法轉換檔案",
+    "Destination does not exist" : "目的地不存在",
+    "Destination is not creatable" : "無法建立目的地",
     "Dot files are not allowed" : "不允許小數點開頭的檔案",
     "\"%1$s\" is a forbidden file or folder name." : "「%1$s」是禁止的檔案或資料夾名稱。",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "「%1$s」是禁止的檔案或資料夾名稱前綴。",
@@ -90,6 +101,13 @@
     "Invalid path" : "路徑無效",
     "Failed to create file from template" : "無法從模板創建檔案",
     "Templates" : "模板",
+    "Storage %s cannot be moved" : "無法移動儲存空間 %s",
+    "Moving a share (%s) into a shared folder is not allowed" : "不允許將分享 (%s) 移動到共享資料夾中",
+    "Moving a storage (%s) into a shared folder is not allowed" : "不允許將儲存空間(%s) 移動到共享資料夾中",
+    "Moving a share (%s) into another share (%s) is not allowed" : "不允許將分享 (%s) 移動到其他分享 (%s) 中",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "不允許將分享 (%s) 移動到其他儲存空間 (%s) 中",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "不允許將儲存空間 (%s) 移動到分享 (%s) 中",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "不允許將儲存空間 (%s) 移動到其他儲存空間 (%s) 中",
     "Path contains invalid segments" : "路徑包含無效的部份",
     "Filename is a reserved word" : "檔案名稱是保留字",
     "Filename contains at least one invalid character" : "檔名至少要有一個有效字元",
@@ -423,41 +441,19 @@
     "Summarizes text by reducing its length without losing key information." : "通過減少文字長度來總結而不丟失關鍵資訊。",
     "Extracts topics from a text and outputs them separated by commas." : "從文字中提取主題並輸出，並用逗號分隔。",
     "Education Edition" : "教育版",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "登錄用戶必須是管理員、子管理員或具有存取此設定的特殊權限",
-    "Logged in user must be an admin or sub admin" : "登入的用戶必須要是管理員或是子管理員",
-    "Logged in user must be an admin" : "登入的用戶必須有管理員權限",
     "File name is a reserved word" : "檔案名稱是保留字",
     "File name contains at least one invalid character" : "檔案名稱含有不允許的字元",
     "File name is too long" : "檔案名稱太長",
-    "Help" : "說明",
     "Users" : "用戶",
-    "Unknown user" : "用戶不詳",
-    "Enter the database username and name for %s" : "輸入 %s 的數據庫用戶名及名稱",
-    "Enter the database username for %s" : "輸入 %s 的數據庫用戶名",
-    "MySQL username and/or password not valid" : "MySQL 用戶名稱或密碼不正確",
-    "Oracle username and/or password not valid" : "Oracle 用戶名和/或密碼無效",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL 用戶名和/或密碼無效",
-    "Set an admin username." : "設定管理員帳號",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s 與您分享了 %2$s ，且想要加入：",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s 與您分享了 %2$s ，且想要加入",
     "»%s« added a note to a file shared with you" : "%s 在與您分享的檔案中加入了註解",
     "Open »%s«" : "開啟 »%s«",
-    "Sharing %s failed, because this item is already shared with user %s" : "分享 %s 失敗，此項目已經與用戶 %s 分享",
     "%1$s shared »%2$s« with you" : "%1$s 與您分享了 %2$s",
     "%1$s shared »%2$s« with you." : "%1$s 與您分享了 %2$s",
     "Click the button below to open it." : "點下方連結開啟",
-    "The username is already being used" : "這個用戶名稱已經有人使用了",
-    "Could not create user" : "無法建立用戶",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "用戶名稱當中只能包含下列字元：\"a-z\"， \"A-Z\"， \"0-9\"，空格 和 \"_.@-'\"",
-    "A valid username must be provided" : "必須提供一個有效的用戶名",
-    "Username contains whitespace at the beginning or at the end" : "用戶名的開頭或結尾有空白",
-    "Username must not consist of dots only" : "用戶名稱不能只包含小數點",
-    "Username is invalid because files already exist for this user" : "用戶名稱無效，因為用戶的檔案已經存在",
-    "User disabled" : "用戶已停用",
     "File is currently busy, please try again later" : "檔案目前忙碌中，請稍候再試",
     "Cannot download file" : "無法下載檔案",
-    "Your data directory is readable by other users." : "您的資料目錄可以被其他用戶讀取。",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "請將該目錄權限設定為 0770 ，以免其他用戶讀取目錄列表",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "請確保資料目錄最上層有一個 \"。ocdata\" 檔案"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/lib/l10n/zh_TW.js b/lib/l10n/zh_TW.js
index efc18239465..7cd644c2e24 100644
--- a/lib/l10n/zh_TW.js
+++ b/lib/l10n/zh_TW.js
@@ -59,6 +59,11 @@ OC.L10N.register(
     "Avatar image is not square" : "頭像不是正方形",
     "Files" : "檔案",
     "View profile" : "檢視個人檔案",
+    "same time" : "相同時間",
+    "_%nh_::_%nh_" : ["%n小時"],
+    "_%nm_::_%nm_" : ["%n分鐘"],
+    "%s ahead" : "提早 %s",
+    "%s behind" : "落後 %s",
     "Local time: %s" : "本機時間：%s",
     "today" : "今天",
     "tomorrow" : "明天",
@@ -81,6 +86,12 @@ OC.L10N.register(
     "seconds ago" : "幾秒前",
     "Empty file" : "空白檔案",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "ID 為 %s 的模組不存在。請在應用程式設定中啟用，或是聯絡系統管理員。",
+    "No file conversion providers available" : "沒有可用的檔案轉換提供者",
+    "File is too large to convert" : "檔案太大，無法轉換",
+    "Destination does not match conversion extension" : "目的地不符合轉換副檔名",
+    "Could not convert file" : "無法轉換檔案",
+    "Destination does not exist" : "目的地不存在",
+    "Destination is not creatable" : "無法建立目的地",
     "Dot files are not allowed" : "不允許小數點開頭的檔案",
     "\"%1$s\" is a forbidden file or folder name." : "「%1$s」是禁止的檔案或資料夾名稱。",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "「%1$s」是禁止的檔案或資料夾名稱前綴。",
@@ -92,6 +103,13 @@ OC.L10N.register(
     "Invalid path" : "無效的路徑",
     "Failed to create file from template" : "無法從範本建立檔案",
     "Templates" : "範本",
+    "Storage %s cannot be moved" : "無法移動儲存空間 %s",
+    "Moving a share (%s) into a shared folder is not allowed" : "不允許將分享 (%s) 移動到共享資料夾中",
+    "Moving a storage (%s) into a shared folder is not allowed" : "不允許將儲存空間(%s) 移動到共享資料夾中",
+    "Moving a share (%s) into another share (%s) is not allowed" : "不允許將分享 (%s) 移動到其他分享 (%s) 中",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "不允許將分享 (%s) 移動到其他儲存空間 (%s) 中",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "不允許將儲存空間 (%s) 移動到分享 (%s) 中",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "不允許將儲存空間 (%s) 移動到其他儲存空間 (%s) 中",
     "Path contains invalid segments" : "路徑包含無效的部份",
     "Filename is a reserved word" : "檔案名稱是保留字",
     "Filename contains at least one invalid character" : "檔案名稱包含了至少一個無效的字元",
@@ -425,41 +443,19 @@ OC.L10N.register(
     "Summarizes text by reducing its length without losing key information." : "寫成摘要，減少文字長度而不丟失關鍵資訊。",
     "Extracts topics from a text and outputs them separated by commas." : "從文字中取出涵蓋的主題並輸出，然後用逗號分隔。",
     "Education Edition" : "教育版",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "登入使用者必須為管理員、子管理員，或有可存取此設定的特定權限使用者",
-    "Logged in user must be an admin or sub admin" : "登入的使用者必須要是管理員或是子管理員",
-    "Logged in user must be an admin" : "登入的使用者必須有管理員職權",
     "File name is a reserved word" : "檔案名稱是保留字",
     "File name contains at least one invalid character" : "檔案名稱含有不允許的字元",
     "File name is too long" : "檔案名稱太長",
-    "Help" : "說明",
     "Users" : "使用者",
-    "Unknown user" : "未知的使用者",
-    "Enter the database username and name for %s" : "輸入 %s 的資料庫使用者名稱及其名稱",
-    "Enter the database username for %s" : "輸入 %s 的資料庫使用者名稱",
-    "MySQL username and/or password not valid" : "MySQL 使用者名稱或密碼不正確",
-    "Oracle username and/or password not valid" : "Oracle 使用者名稱和/或密碼無效",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL 使用者名稱和/或密碼無效",
-    "Set an admin username." : "設定管理員使用者名稱。",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s 與您分享了「%2$s 」，且想要新增：",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s 與您分享了「%2$s」，且想要新增",
     "»%s« added a note to a file shared with you" : "「%s」在與您分享的檔案中加入了備註",
     "Open »%s«" : "開啟「%s」",
-    "Sharing %s failed, because this item is already shared with user %s" : "分享 %s 失敗，因為此項目已與使用者 %s 分享",
     "%1$s shared »%2$s« with you" : "%1$s 與您分享了「%2$s」",
     "%1$s shared »%2$s« with you." : "%1$s 與您分享了「%2$s」。",
     "Click the button below to open it." : "點擊下方的按鈕將其打開。",
-    "The username is already being used" : "這個使用者名稱已有人使用",
-    "Could not create user" : "無法建立使用者",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "使用者名稱僅允許以下字元：「a-z」、「A-Z」、「0-9」、空格與「_.@-'」",
-    "A valid username must be provided" : "必須提供有效的使用者名稱",
-    "Username contains whitespace at the beginning or at the end" : "使用者名稱的開頭或結尾有空白",
-    "Username must not consist of dots only" : "使用者名稱不能只包含小數點",
-    "Username is invalid because files already exist for this user" : "使用者名稱無效，因為使用者的檔案已存在",
-    "User disabled" : "使用者已停用",
     "File is currently busy, please try again later" : "檔案目前忙碌中，請稍候再試",
     "Cannot download file" : "無法下載檔案",
-    "Your data directory is readable by other users." : "您的 data 目錄可被其他使用者讀取。",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "請將該目錄權限設定為 0770 ，以免其他使用者讀取目錄列表。",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "請確保資料目錄最上層有一個「.ocdata」檔案。"
 },
 "nplurals=1; plural=0;");
diff --git a/lib/l10n/zh_TW.json b/lib/l10n/zh_TW.json
index 9c4bc0091dc..e32dc8bd298 100644
--- a/lib/l10n/zh_TW.json
+++ b/lib/l10n/zh_TW.json
@@ -57,6 +57,11 @@
     "Avatar image is not square" : "頭像不是正方形",
     "Files" : "檔案",
     "View profile" : "檢視個人檔案",
+    "same time" : "相同時間",
+    "_%nh_::_%nh_" : ["%n小時"],
+    "_%nm_::_%nm_" : ["%n分鐘"],
+    "%s ahead" : "提早 %s",
+    "%s behind" : "落後 %s",
     "Local time: %s" : "本機時間：%s",
     "today" : "今天",
     "tomorrow" : "明天",
@@ -79,6 +84,12 @@
     "seconds ago" : "幾秒前",
     "Empty file" : "空白檔案",
     "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "ID 為 %s 的模組不存在。請在應用程式設定中啟用，或是聯絡系統管理員。",
+    "No file conversion providers available" : "沒有可用的檔案轉換提供者",
+    "File is too large to convert" : "檔案太大，無法轉換",
+    "Destination does not match conversion extension" : "目的地不符合轉換副檔名",
+    "Could not convert file" : "無法轉換檔案",
+    "Destination does not exist" : "目的地不存在",
+    "Destination is not creatable" : "無法建立目的地",
     "Dot files are not allowed" : "不允許小數點開頭的檔案",
     "\"%1$s\" is a forbidden file or folder name." : "「%1$s」是禁止的檔案或資料夾名稱。",
     "\"%1$s\" is a forbidden prefix for file or folder names." : "「%1$s」是禁止的檔案或資料夾名稱前綴。",
@@ -90,6 +101,13 @@
     "Invalid path" : "無效的路徑",
     "Failed to create file from template" : "無法從範本建立檔案",
     "Templates" : "範本",
+    "Storage %s cannot be moved" : "無法移動儲存空間 %s",
+    "Moving a share (%s) into a shared folder is not allowed" : "不允許將分享 (%s) 移動到共享資料夾中",
+    "Moving a storage (%s) into a shared folder is not allowed" : "不允許將儲存空間(%s) 移動到共享資料夾中",
+    "Moving a share (%s) into another share (%s) is not allowed" : "不允許將分享 (%s) 移動到其他分享 (%s) 中",
+    "Moving a share (%s) into another storage (%s) is not allowed" : "不允許將分享 (%s) 移動到其他儲存空間 (%s) 中",
+    "Moving a storage (%s) into a share (%s) is not allowed" : "不允許將儲存空間 (%s) 移動到分享 (%s) 中",
+    "Moving a storage (%s) into another storage (%s) is not allowed" : "不允許將儲存空間 (%s) 移動到其他儲存空間 (%s) 中",
     "Path contains invalid segments" : "路徑包含無效的部份",
     "Filename is a reserved word" : "檔案名稱是保留字",
     "Filename contains at least one invalid character" : "檔案名稱包含了至少一個無效的字元",
@@ -423,41 +441,19 @@
     "Summarizes text by reducing its length without losing key information." : "寫成摘要，減少文字長度而不丟失關鍵資訊。",
     "Extracts topics from a text and outputs them separated by commas." : "從文字中取出涵蓋的主題並輸出，然後用逗號分隔。",
     "Education Edition" : "教育版",
-    "Logged in user must be an admin, a sub admin or gotten special right to access this setting" : "登入使用者必須為管理員、子管理員，或有可存取此設定的特定權限使用者",
-    "Logged in user must be an admin or sub admin" : "登入的使用者必須要是管理員或是子管理員",
-    "Logged in user must be an admin" : "登入的使用者必須有管理員職權",
     "File name is a reserved word" : "檔案名稱是保留字",
     "File name contains at least one invalid character" : "檔案名稱含有不允許的字元",
     "File name is too long" : "檔案名稱太長",
-    "Help" : "說明",
     "Users" : "使用者",
-    "Unknown user" : "未知的使用者",
-    "Enter the database username and name for %s" : "輸入 %s 的資料庫使用者名稱及其名稱",
-    "Enter the database username for %s" : "輸入 %s 的資料庫使用者名稱",
-    "MySQL username and/or password not valid" : "MySQL 使用者名稱或密碼不正確",
-    "Oracle username and/or password not valid" : "Oracle 使用者名稱和/或密碼無效",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL 使用者名稱和/或密碼無效",
-    "Set an admin username." : "設定管理員使用者名稱。",
     "%1$s shared »%2$s« with you and wants to add:" : "%1$s 與您分享了「%2$s 」，且想要新增：",
     "%1$s shared »%2$s« with you and wants to add" : "%1$s 與您分享了「%2$s」，且想要新增",
     "»%s« added a note to a file shared with you" : "「%s」在與您分享的檔案中加入了備註",
     "Open »%s«" : "開啟「%s」",
-    "Sharing %s failed, because this item is already shared with user %s" : "分享 %s 失敗，因為此項目已與使用者 %s 分享",
     "%1$s shared »%2$s« with you" : "%1$s 與您分享了「%2$s」",
     "%1$s shared »%2$s« with you." : "%1$s 與您分享了「%2$s」。",
     "Click the button below to open it." : "點擊下方的按鈕將其打開。",
-    "The username is already being used" : "這個使用者名稱已有人使用",
-    "Could not create user" : "無法建立使用者",
-    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "使用者名稱僅允許以下字元：「a-z」、「A-Z」、「0-9」、空格與「_.@-'」",
-    "A valid username must be provided" : "必須提供有效的使用者名稱",
-    "Username contains whitespace at the beginning or at the end" : "使用者名稱的開頭或結尾有空白",
-    "Username must not consist of dots only" : "使用者名稱不能只包含小數點",
-    "Username is invalid because files already exist for this user" : "使用者名稱無效，因為使用者的檔案已存在",
-    "User disabled" : "使用者已停用",
     "File is currently busy, please try again later" : "檔案目前忙碌中，請稍候再試",
     "Cannot download file" : "無法下載檔案",
-    "Your data directory is readable by other users." : "您的 data 目錄可被其他使用者讀取。",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "請將該目錄權限設定為 0770 ，以免其他使用者讀取目錄列表。",
     "Ensure there is a file called \".ocdata\" in the root of the data directory." : "請確保資料目錄最上層有一個「.ocdata」檔案。"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php
index fe5d3e2faeb..b6f7f9b13b7 100644
--- a/lib/private/App/AppManager.php
+++ b/lib/private/App/AppManager.php
@@ -27,6 +27,7 @@ use OCP\INavigationManager;
 use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\IUserSession;
+use OCP\ServerVersion;
 use OCP\Settings\IManager as ISettingsManager;
 use Psr\Log\LoggerInterface;
 
@@ -80,6 +81,7 @@ class AppManager implements IAppManager {
 		private ICacheFactory $memCacheFactory,
 		private IEventDispatcher $dispatcher,
 		private LoggerInterface $logger,
+		private ServerVersion $serverVersion,
 	) {
 	}
 
@@ -786,8 +788,12 @@ class AppManager implements IAppManager {
 
 	public function getAppVersion(string $appId, bool $useCache = true): string {
 		if (!$useCache || !isset($this->appVersions[$appId])) {
-			$appInfo = $this->getAppInfo($appId);
-			$this->appVersions[$appId] = ($appInfo !== null && isset($appInfo['version'])) ? $appInfo['version'] : '0';
+			if ($appId === 'core') {
+				$this->appVersions[$appId] = $this->serverVersion->getVersionString();
+			} else {
+				$appInfo = $this->getAppInfo($appId);
+				$this->appVersions[$appId] = ($appInfo !== null && isset($appInfo['version'])) ? $appInfo['version'] : '0';
+			}
 		}
 		return $this->appVersions[$appId];
 	}
diff --git a/lib/private/AppConfig.php b/lib/private/AppConfig.php
index 71c958703e9..f10684c4971 100644
--- a/lib/private/AppConfig.php
+++ b/lib/private/AppConfig.php
@@ -1093,6 +1093,7 @@ class AppConfig implements IAppConfig {
 
 		unset($this->lazyCache[$app][$key]);
 		unset($this->fastCache[$app][$key]);
+		unset($this->valueTypes[$app][$key]);
 	}
 
 	/**
diff --git a/lib/private/AppFramework/Bootstrap/RegistrationContext.php b/lib/private/AppFramework/Bootstrap/RegistrationContext.php
index f3b612edc38..c3b829825c2 100644
--- a/lib/private/AppFramework/Bootstrap/RegistrationContext.php
+++ b/lib/private/AppFramework/Bootstrap/RegistrationContext.php
@@ -11,6 +11,7 @@ namespace OC\AppFramework\Bootstrap;
 
 use Closure;
 use NCU\Config\Lexicon\IConfigLexicon;
+use OC\Config\Lexicon\CoreConfigLexicon;
 use OC\Support\CrashReport\Registry;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
@@ -143,7 +144,7 @@ class RegistrationContext {
 	private array $declarativeSettings = [];
 
 	/** @var array<array-key, string> */
-	private array $configLexiconClasses = [];
+	private array $configLexiconClasses = ['core' => CoreConfigLexicon::class];
 
 	/** @var ServiceRegistration<ITeamResourceProvider>[] */
 	private array $teamResourceProviders = [];
@@ -153,6 +154,9 @@ class RegistrationContext {
 
 	/** @var ServiceRegistration<\OCP\TaskProcessing\ITaskType>[] */
 	private array $taskProcessingTaskTypes = [];
+
+	/** @var ServiceRegistration<\OCP\Files\Conversion\IConversionProvider>[] */
+	private array $fileConversionProviders = [];
 	
 	/** @var ServiceRegistration<IMailProvider>[] */
 	private $mailProviders = [];
@@ -420,6 +424,13 @@ class RegistrationContext {
 				);
 			}
 
+			public function registerFileConversionProvider(string $class): void {
+				$this->context->registerFileConversionProvider(
+					$this->appId,
+					$class
+				);
+			}
+
 			public function registerMailProvider(string $class): void {
 				$this->context->registerMailProvider(
 					$this->appId,
@@ -625,6 +636,14 @@ class RegistrationContext {
 	public function registerTaskProcessingTaskType(string $appId, string $taskProcessingTaskTypeClass) {
 		$this->taskProcessingTaskTypes[] = new ServiceRegistration($appId, $taskProcessingTaskTypeClass);
 	}
+
+	/**
+	 * @psalm-param class-string<\OCP\Files\Conversion\IConversionProvider> $class
+	 */
+	public function registerFileConversionProvider(string $appId, string $class): void {
+		$this->fileConversionProviders[] = new ServiceRegistration($appId, $class);
+	}
+
 	/**
 	 * @psalm-param class-string<IMailProvider> $migratorClass
 	 */
@@ -985,6 +1004,13 @@ class RegistrationContext {
 	}
 
 	/**
+	 * @return ServiceRegistration<\OCP\Files\Conversion\IConversionProvider>[]
+	 */
+	public function getFileConversionProviders(): array {
+		return $this->fileConversionProviders;
+	}
+
+	/**
 	 * @return ServiceRegistration<IMailProvider>[]
 	 */
 	public function getMailProviders(): array {
diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index 2083a0e7195..be4f6897da8 100644
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -274,15 +274,7 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 					$c->get(LoggerInterface::class)
 				)
 			);
-			$dispatcher->registerMiddleware(
-				new RateLimitingMiddleware(
-					$c->get(IRequest::class),
-					$c->get(IUserSession::class),
-					$c->get(IControllerMethodReflector::class),
-					$c->get(OC\Security\RateLimiting\Limiter::class),
-					$c->get(ISession::class)
-				)
-			);
+			$dispatcher->registerMiddleware($c->get(RateLimitingMiddleware::class));
 			$dispatcher->registerMiddleware(
 				new OC\AppFramework\Middleware\PublicShare\PublicShareMiddleware(
 					$c->get(IRequest::class),
diff --git a/lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php b/lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php
index f4d120ebc30..2d19be97993 100644
--- a/lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php
+++ b/lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php
@@ -9,6 +9,7 @@ declare(strict_types=1);
 namespace OC\AppFramework\Middleware\Security;
 
 use OC\AppFramework\Utility\ControllerMethodReflector;
+use OC\Security\Ip\BruteforceAllowList;
 use OC\Security\RateLimiting\Exception\RateLimitExceededException;
 use OC\Security\RateLimiting\Limiter;
 use OC\User\Session;
@@ -20,6 +21,7 @@ use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Middleware;
+use OCP\IAppConfig;
 use OCP\IRequest;
 use OCP\ISession;
 use OCP\IUserSession;
@@ -53,6 +55,8 @@ class RateLimitingMiddleware extends Middleware {
 		protected ControllerMethodReflector $reflector,
 		protected Limiter $limiter,
 		protected ISession $session,
+		protected IAppConfig $appConfig,
+		protected BruteforceAllowList $bruteForceAllowList,
 	) {
 	}
 
@@ -73,6 +77,11 @@ class RateLimitingMiddleware extends Middleware {
 			$rateLimit = $this->readLimitFromAnnotationOrAttribute($controller, $methodName, 'UserRateThrottle', UserRateLimit::class);
 
 			if ($rateLimit !== null) {
+				if ($this->appConfig->getValueBool('bruteforcesettings', 'apply_allowlist_to_ratelimit')
+					&& $this->bruteForceAllowList->isBypassListed($this->request->getRemoteAddress())) {
+					return;
+				}
+
 				$this->limiter->registerUserRequest(
 					$rateLimitIdentifier,
 					$rateLimit->getLimit(),
diff --git a/lib/private/AppFramework/OCS/BaseResponse.php b/lib/private/AppFramework/OCS/BaseResponse.php
index 3b0a28fe89c..cc7f7845760 100644
--- a/lib/private/AppFramework/OCS/BaseResponse.php
+++ b/lib/private/AppFramework/OCS/BaseResponse.php
@@ -11,10 +11,10 @@ use OCP\AppFramework\Http\Response;
 
 /**
  * @psalm-import-type DataResponseType from DataResponse
- * @template S of int
+ * @template S of Http::STATUS_*
  * @template-covariant T of DataResponseType
  * @template H of array<string, mixed>
- * @template-extends Response<int, array<string, mixed>>
+ * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 abstract class BaseResponse extends Response {
 	/** @var array */
diff --git a/lib/private/AppFramework/OCS/V1Response.php b/lib/private/AppFramework/OCS/V1Response.php
index c56aa9cf478..131ca22ff24 100644
--- a/lib/private/AppFramework/OCS/V1Response.php
+++ b/lib/private/AppFramework/OCS/V1Response.php
@@ -11,17 +11,17 @@ use OCP\AppFramework\OCSController;
 
 /**
  * @psalm-import-type DataResponseType from DataResponse
- * @template S of int
+ * @template S of Http::STATUS_*
  * @template-covariant T of DataResponseType
  * @template H of array<string, mixed>
- * @template-extends BaseResponse<int, DataResponseType, array<string, mixed>>
+ * @template-extends BaseResponse<Http::STATUS_*, DataResponseType, array<string, mixed>>
  */
 class V1Response extends BaseResponse {
 	/**
 	 * The V1 endpoint has very limited http status codes basically everything
 	 * is status 200 except 401
 	 *
-	 * @return int
+	 * @return Http::STATUS_*
 	 */
 	public function getStatus() {
 		$status = parent::getStatus();
diff --git a/lib/private/AppFramework/OCS/V2Response.php b/lib/private/AppFramework/OCS/V2Response.php
index caa8302a673..47cf0f60200 100644
--- a/lib/private/AppFramework/OCS/V2Response.php
+++ b/lib/private/AppFramework/OCS/V2Response.php
@@ -11,17 +11,17 @@ use OCP\AppFramework\OCSController;
 
 /**
  * @psalm-import-type DataResponseType from DataResponse
- * @template S of int
+ * @template S of Http::STATUS_*
  * @template-covariant T of DataResponseType
  * @template H of array<string, mixed>
- * @template-extends BaseResponse<int, DataResponseType, array<string, mixed>>
+ * @template-extends BaseResponse<Http::STATUS_*, DataResponseType, array<string, mixed>>
  */
 class V2Response extends BaseResponse {
 	/**
 	 * The V2 endpoint just passes on status codes.
 	 * Of course we have to map the OCS specific codes to proper HTTP status codes
 	 *
-	 * @return int
+	 * @return Http::STATUS_*
 	 */
 	public function getStatus() {
 		$status = parent::getStatus();
diff --git a/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php b/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php
index 1d0a502df6d..b84dd61fc5f 100644
--- a/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php
+++ b/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php
@@ -27,7 +27,7 @@ use OCP\Lock\LockedException;
  * @template-implements IEventListener<AMetadataEvent>
  */
 class GenerateBlurhashMetadata implements IEventListener {
-	private const RESIZE_BOXSIZE = 300;
+	private const RESIZE_BOXSIZE = 30;
 
 	private const COMPONENTS_X = 4;
 	private const COMPONENTS_Y = 3;
diff --git a/lib/private/Calendar/AvailabilityResult.php b/lib/private/Calendar/AvailabilityResult.php
new file mode 100644
index 00000000000..8031758f64e
--- /dev/null
+++ b/lib/private/Calendar/AvailabilityResult.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OC\Calendar;
+
+use OCP\Calendar\IAvailabilityResult;
+
+class AvailabilityResult implements IAvailabilityResult {
+	public function __construct(
+		private readonly string $attendee,
+		private readonly bool $available,
+	) {
+	}
+
+	public function getAttendeeEmail(): string {
+		return $this->attendee;
+	}
+
+	public function isAvailable(): bool {
+		return $this->available;
+	}
+}
diff --git a/lib/private/Calendar/CalendarEventBuilder.php b/lib/private/Calendar/CalendarEventBuilder.php
new file mode 100644
index 00000000000..9198d383ef9
--- /dev/null
+++ b/lib/private/Calendar/CalendarEventBuilder.php
@@ -0,0 +1,132 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OC\Calendar;
+
+use DateTimeInterface;
+use InvalidArgumentException;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\Calendar\ICalendarEventBuilder;
+use OCP\Calendar\ICreateFromString;
+use Sabre\VObject\Component\VCalendar;
+use Sabre\VObject\Component\VEvent;
+
+class CalendarEventBuilder implements ICalendarEventBuilder {
+	private ?DateTimeInterface $startDate = null;
+	private ?DateTimeInterface $endDate = null;
+	private ?string $summary = null;
+	private ?string $description = null;
+	private ?string $location = null;
+	private ?array $organizer = null;
+	private array $attendees = [];
+
+	public function __construct(
+		private readonly string $uid,
+		private readonly ITimeFactory $timeFactory,
+	) {
+	}
+
+	public function setStartDate(DateTimeInterface $start): ICalendarEventBuilder {
+		$this->startDate = $start;
+		return $this;
+	}
+
+	public function setEndDate(DateTimeInterface $end): ICalendarEventBuilder {
+		$this->endDate = $end;
+		return $this;
+	}
+
+	public function setSummary(string $summary): ICalendarEventBuilder {
+		$this->summary = $summary;
+		return $this;
+	}
+
+	public function setDescription(string $description): ICalendarEventBuilder {
+		$this->description = $description;
+		return $this;
+	}
+
+	public function setLocation(string $location): ICalendarEventBuilder {
+		$this->location = $location;
+		return $this;
+	}
+
+	public function setOrganizer(string $email, ?string $commonName = null): ICalendarEventBuilder {
+		$this->organizer = [$email, $commonName];
+		return $this;
+	}
+
+	public function addAttendee(string $email, ?string $commonName = null): ICalendarEventBuilder {
+		$this->attendees[] = [$email, $commonName];
+		return $this;
+	}
+
+	public function toIcs(): string {
+		if ($this->startDate === null) {
+			throw new InvalidArgumentException('Event is missing a start date');
+		}
+
+		if ($this->endDate === null) {
+			throw new InvalidArgumentException('Event is missing an end date');
+		}
+
+		if ($this->summary === null) {
+			throw new InvalidArgumentException('Event is missing a summary');
+		}
+
+		if ($this->organizer === null && $this->attendees !== []) {
+			throw new InvalidArgumentException('Event has attendees but is missing an organizer');
+		}
+
+		$vcalendar = new VCalendar();
+		$props = [
+			'UID' => $this->uid,
+			'DTSTAMP' => $this->timeFactory->now(),
+			'SUMMARY' => $this->summary,
+			'DTSTART' => $this->startDate,
+			'DTEND' => $this->endDate,
+		];
+		if ($this->description !== null) {
+			$props['DESCRIPTION'] = $this->description;
+		}
+		if ($this->location !== null) {
+			$props['LOCATION'] = $this->location;
+		}
+		/** @var VEvent $vevent */
+		$vevent = $vcalendar->add('VEVENT', $props);
+		if ($this->organizer !== null) {
+			self::addAttendeeToVEvent($vevent, 'ORGANIZER', $this->organizer);
+		}
+		foreach ($this->attendees as $attendee) {
+			self::addAttendeeToVEvent($vevent, 'ATTENDEE', $attendee);
+		}
+		return $vcalendar->serialize();
+	}
+
+	public function createInCalendar(ICreateFromString $calendar): string {
+		$fileName = $this->uid . '.ics';
+		$calendar->createFromString($fileName, $this->toIcs());
+		return $fileName;
+	}
+
+	/**
+	 * @param array{0: string, 1: ?string} $tuple A tuple of [$email, $commonName] where $commonName may be null.
+	 */
+	private static function addAttendeeToVEvent(VEvent $vevent, string $name, array $tuple): void {
+		[$email, $cn] = $tuple;
+		if (!str_starts_with($email, 'mailto:')) {
+			$email = "mailto:$email";
+		}
+		$params = [];
+		if ($cn !== null) {
+			$params['CN'] = $cn;
+		}
+		$vevent->add($name, $email, $params);
+	}
+}
diff --git a/lib/private/Calendar/Manager.php b/lib/private/Calendar/Manager.php
index ba2124a5c23..e86e0e1d410 100644
--- a/lib/private/Calendar/Manager.php
+++ b/lib/private/Calendar/Manager.php
@@ -8,10 +8,14 @@ declare(strict_types=1);
  */
 namespace OC\Calendar;
 
+use DateTimeInterface;
 use OC\AppFramework\Bootstrap\Coordinator;
+use OCA\DAV\CalDAV\Auth\CustomPrincipalPlugin;
+use OCA\DAV\ServerFactory;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Calendar\Exceptions\CalendarException;
 use OCP\Calendar\ICalendar;
+use OCP\Calendar\ICalendarEventBuilder;
 use OCP\Calendar\ICalendarIsShared;
 use OCP\Calendar\ICalendarIsWritable;
 use OCP\Calendar\ICalendarProvider;
@@ -19,10 +23,16 @@ use OCP\Calendar\ICalendarQuery;
 use OCP\Calendar\ICreateFromString;
 use OCP\Calendar\IHandleImipMessage;
 use OCP\Calendar\IManager;
+use OCP\IUser;
+use OCP\IUserManager;
+use OCP\Security\ISecureRandom;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
+use Sabre\HTTP\Request;
+use Sabre\HTTP\Response;
 use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\Component\VEvent;
+use Sabre\VObject\Component\VFreeBusy;
 use Sabre\VObject\Property\VCard\DateTime;
 use Sabre\VObject\Reader;
 use Throwable;
@@ -45,6 +55,9 @@ class Manager implements IManager {
 		private ContainerInterface $container,
 		private LoggerInterface $logger,
 		private ITimeFactory $timeFactory,
+		private ISecureRandom $random,
+		private IUserManager $userManager,
+		private ServerFactory $serverFactory,
 	) {
 	}
 
@@ -216,21 +229,21 @@ class Manager implements IManager {
 		string $recipient,
 		string $calendarData,
 	): bool {
-		
+
 		$userCalendars = $this->getCalendarsForPrincipal($principalUri);
 		if (empty($userCalendars)) {
 			$this->logger->warning('iMip message could not be processed because user has no calendars');
 			return false;
 		}
-		
+
 		/** @var VCalendar $vObject|null */
 		$calendarObject = Reader::read($calendarData);
-		
+
 		if (!isset($calendarObject->METHOD) || $calendarObject->METHOD->getValue() !== 'REQUEST') {
 			$this->logger->warning('iMip message contains an incorrect or invalid method');
 			return false;
 		}
-		
+
 		if (!isset($calendarObject->VEVENT)) {
 			$this->logger->warning('iMip message contains no event');
 			return false;
@@ -242,12 +255,12 @@ class Manager implements IManager {
 			$this->logger->warning('iMip message event dose not contains a UID');
 			return false;
 		}
-		
+
 		if (!isset($eventObject->ATTENDEE)) {
 			$this->logger->warning('iMip message event dose not contains any attendees');
 			return false;
 		}
-		
+
 		foreach ($eventObject->ATTENDEE as $entry) {
 			$address = trim(str_replace('mailto:', '', $entry->getValue()));
 			if ($address === $recipient) {
@@ -259,17 +272,17 @@ class Manager implements IManager {
 			$this->logger->warning('iMip message event does not contain a attendee that matches the recipient');
 			return false;
 		}
-		
+
 		foreach ($userCalendars as $calendar) {
-			
+
 			if (!$calendar instanceof ICalendarIsWritable && !$calendar instanceof ICalendarIsShared) {
 				continue;
 			}
-			
+
 			if ($calendar->isDeleted() || !$calendar->isWritable() || $calendar->isShared()) {
 				continue;
 			}
-			
+
 			if (!empty($calendar->search($recipient, ['ATTENDEE'], ['uid' => $eventObject->UID->getValue()]))) {
 				try {
 					if ($calendar instanceof IHandleImipMessage) {
@@ -282,7 +295,7 @@ class Manager implements IManager {
 				}
 			}
 		}
-		
+
 		$this->logger->warning('iMip message event could not be processed because the no corresponding event was found in any calendar');
 		return false;
 	}
@@ -464,4 +477,92 @@ class Manager implements IManager {
 			return false;
 		}
 	}
+
+	public function createEventBuilder(): ICalendarEventBuilder {
+		$uid = $this->random->generate(32, ISecureRandom::CHAR_ALPHANUMERIC);
+		return new CalendarEventBuilder($uid, $this->timeFactory);
+	}
+
+	public function checkAvailability(
+		DateTimeInterface $start,
+		DateTimeInterface $end,
+		IUser $organizer,
+		array $attendees,
+	): array {
+		$organizerMailto = 'mailto:' . $organizer->getEMailAddress();
+		$request = new VCalendar();
+		$request->METHOD = 'REQUEST';
+		$request->add('VFREEBUSY', [
+			'DTSTART' => $start,
+			'DTEND' => $end,
+			'ORGANIZER' => $organizerMailto,
+			'ATTENDEE' => $organizerMailto,
+		]);
+
+		$mailtoLen = strlen('mailto:');
+		foreach ($attendees as $attendee) {
+			if (str_starts_with($attendee, 'mailto:')) {
+				$attendee = substr($attendee, $mailtoLen);
+			}
+
+			$attendeeUsers = $this->userManager->getByEmail($attendee);
+			if ($attendeeUsers === []) {
+				continue;
+			}
+
+			$request->VFREEBUSY->add('ATTENDEE', "mailto:$attendee");
+		}
+
+		$organizerUid = $organizer->getUID();
+		$server = $this->serverFactory->createAttendeeAvailabilityServer();
+		/** @var CustomPrincipalPlugin $plugin */
+		$plugin = $server->getPlugin('auth');
+		$plugin->setCurrentPrincipal("principals/users/$organizerUid");
+
+		$request = new Request(
+			'POST',
+			"/calendars/$organizerUid/outbox/",
+			[
+				'Content-Type' => 'text/calendar',
+				'Depth' => 0,
+			],
+			$request->serialize(),
+		);
+		$response = new Response();
+		$server->invokeMethod($request, $response, false);
+
+		$xmlService = new \Sabre\Xml\Service();
+		$xmlService->elementMap = [
+			'{urn:ietf:params:xml:ns:caldav}response' => 'Sabre\Xml\Deserializer\keyValue',
+			'{urn:ietf:params:xml:ns:caldav}recipient' => 'Sabre\Xml\Deserializer\keyValue',
+		];
+		$parsedResponse = $xmlService->parse($response->getBodyAsString());
+
+		$result = [];
+		foreach ($parsedResponse as $freeBusyResponse) {
+			$freeBusyResponse = $freeBusyResponse['value'];
+			if ($freeBusyResponse['{urn:ietf:params:xml:ns:caldav}request-status'] !== '2.0;Success') {
+				continue;
+			}
+
+			$freeBusyResponseData = \Sabre\VObject\Reader::read(
+				$freeBusyResponse['{urn:ietf:params:xml:ns:caldav}calendar-data']
+			);
+
+			$attendee = substr(
+				$freeBusyResponse['{urn:ietf:params:xml:ns:caldav}recipient']['{DAV:}href'],
+				$mailtoLen,
+			);
+
+			$vFreeBusy = $freeBusyResponseData->VFREEBUSY;
+			if (!($vFreeBusy instanceof VFreeBusy)) {
+				continue;
+			}
+
+			// TODO: actually check values of FREEBUSY properties to find a free slot
+			$result[] = new AvailabilityResult($attendee, $vFreeBusy->isFree($start, $end));
+		}
+
+		return $result;
+	}
 }
diff --git a/lib/private/CapabilitiesManager.php b/lib/private/CapabilitiesManager.php
index d7bf25f078a..07076d9aacd 100644
--- a/lib/private/CapabilitiesManager.php
+++ b/lib/private/CapabilitiesManager.php
@@ -32,7 +32,7 @@ class CapabilitiesManager {
 	}
 
 	/**
-	 * Get an array of al the capabilities that are registered at this manager
+	 * Get an array of all the capabilities that are registered at this manager
 	 *
 	 * @param bool $public get public capabilities only
 	 * @throws \InvalidArgumentException
diff --git a/lib/private/Config/Lexicon/CoreConfigLexicon.php b/lib/private/Config/Lexicon/CoreConfigLexicon.php
new file mode 100644
index 00000000000..34a0b883c54
--- /dev/null
+++ b/lib/private/Config/Lexicon/CoreConfigLexicon.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OC\Config\Lexicon;
+
+use NCU\Config\Lexicon\ConfigLexiconEntry;
+use NCU\Config\Lexicon\ConfigLexiconStrictness;
+use NCU\Config\Lexicon\IConfigLexicon;
+use NCU\Config\ValueType;
+
+/**
+ * ConfigLexicon for 'core' app/user configs
+ */
+class CoreConfigLexicon implements IConfigLexicon {
+	public function getStrictness(): ConfigLexiconStrictness {
+		return ConfigLexiconStrictness::IGNORE;
+	}
+
+	/**
+	 * @inheritDoc
+	 * @return ConfigLexiconEntry[]
+	 */
+	public function getAppConfigs(): array {
+		return [
+			new ConfigLexiconEntry('lastcron', ValueType::INT, 0, 'timestamp of last cron execution'),
+		];
+	}
+
+	/**
+	 * @inheritDoc
+	 * @return ConfigLexiconEntry[]
+	 */
+	public function getUserConfigs(): array {
+		return [
+			new ConfigLexiconEntry('lang', ValueType::STRING, null, 'language'),
+		];
+	}
+}
diff --git a/lib/private/Config/UserConfig.php b/lib/private/Config/UserConfig.php
index 78c43fc4321..77a86a5e1c7 100644
--- a/lib/private/Config/UserConfig.php
+++ b/lib/private/Config/UserConfig.php
@@ -58,10 +58,6 @@ class UserConfig implements IUserConfig {
 	private array $lazyCache = [];   // cache for lazy config keys
 	/** @var array<string, array<string, array<string, array<string, mixed>>>> ['user_id' => ['app_id' => ['key' => ['type' => ValueType, 'flags' => bitflag]]]] */
 	private array $valueDetails = [];  // type for all config values
-	/** @var array<string, array<string, array<string, ValueType>>> ['user_id' => ['app_id' => ['key' => bitflag]]] */
-	private array $valueTypes = [];  // type for all config values
-	/** @var array<string, array<string, array<string, int>>> ['user_id' => ['app_id' => ['key' => bitflag]]] */
-	private array $valueFlags = [];  // type for all config values
 	/** @var array<string, boolean> ['user_id' => bool] */
 	private array $fastLoaded = [];
 	/** @var array<string, boolean> ['user_id' => bool] */
@@ -71,6 +67,7 @@ class UserConfig implements IUserConfig {
 
 	public function __construct(
 		protected IDBConnection $connection,
+		protected IConfig $config,
 		protected LoggerInterface $logger,
 		protected ICrypto $crypto,
 	) {
@@ -228,7 +225,8 @@ class UserConfig implements IUserConfig {
 		// there is a huge probability the non-lazy config are already loaded
 		// meaning that we can start by only checking if a current non-lazy key exists
 		if ($this->hasKey($userId, $app, $key, false)) {
-			return false; // meaning key is not lazy.
+			// meaning key is not lazy.
+			return false;
 		}
 
 		// as key is not found as non-lazy, we load and search in the lazy config
@@ -263,7 +261,8 @@ class UserConfig implements IUserConfig {
 		$values = array_filter(
 			$this->formatAppValues($userId, $app, ($this->fastCache[$userId][$app] ?? []) + ($this->lazyCache[$userId][$app] ?? []), $filtered),
 			function (string $key) use ($prefix): bool {
-				return str_starts_with($key, $prefix); // filter values based on $prefix
+				// filter values based on $prefix
+				return str_starts_with($key, $prefix);
 			}, ARRAY_FILTER_USE_KEY
 		);
 
@@ -711,8 +710,9 @@ class UserConfig implements IUserConfig {
 		ValueType $type,
 	): string {
 		$this->assertParams($userId, $app, $key);
-		if (!$this->matchAndApplyLexiconDefinition($app, $key, $lazy, $type, default: $default)) {
-			return $default; // returns default if strictness of lexicon is set to WARNING (block and report)
+		if (!$this->matchAndApplyLexiconDefinition($userId, $app, $key, $lazy, $type, default: $default)) {
+			// returns default if strictness of lexicon is set to WARNING (block and report)
+			return $default;
 		}
 		$this->loadConfig($userId, $lazy);
 
@@ -1046,8 +1046,9 @@ class UserConfig implements IUserConfig {
 		ValueType $type,
 	): bool {
 		$this->assertParams($userId, $app, $key);
-		if (!$this->matchAndApplyLexiconDefinition($app, $key, $lazy, $type, $flags)) {
-			return false; // returns false as database is not updated
+		if (!$this->matchAndApplyLexiconDefinition($userId, $app, $key, $lazy, $type, $flags)) {
+			// returns false as database is not updated
+			return false;
 		}
 		$this->loadConfig($userId, $lazy);
 
@@ -1100,7 +1101,8 @@ class UserConfig implements IUserConfig {
 				$inserted = true;
 			} catch (DBException $e) {
 				if ($e->getReason() !== DBException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-					throw $e; // TODO: throw exception or just log and returns false !?
+					// TODO: throw exception or just log and returns false !?
+					throw $e;
 				}
 			}
 		}
@@ -1195,7 +1197,8 @@ class UserConfig implements IUserConfig {
 	public function updateType(string $userId, string $app, string $key, ValueType $type = ValueType::MIXED): bool {
 		$this->assertParams($userId, $app, $key);
 		$this->loadConfigAll($userId);
-		$this->isLazy($userId, $app, $key); // confirm key exists
+		// confirm key exists
+		$this->isLazy($userId, $app, $key);
 
 		$update = $this->connection->getQueryBuilder();
 		$update->update('preferences')
@@ -1287,7 +1290,8 @@ class UserConfig implements IUserConfig {
 			}
 		}
 
-		$this->clearCacheAll(); // we clear all cache
+		// we clear all cache
+		$this->clearCacheAll();
 	}
 
 	/**
@@ -1370,7 +1374,8 @@ class UserConfig implements IUserConfig {
 			}
 		}
 
-		$this->clearCacheAll(); // we clear all cache
+		// we clear all cache
+		$this->clearCacheAll();
 	}
 
 	/**
@@ -1502,6 +1507,7 @@ class UserConfig implements IUserConfig {
 
 		unset($this->lazyCache[$userId][$app][$key]);
 		unset($this->fastCache[$userId][$app][$key]);
+		unset($this->valueDetails[$userId][$app][$key]);
 	}
 
 	/**
@@ -1793,6 +1799,14 @@ class UserConfig implements IUserConfig {
 	}
 
 
+	/**
+	 * will change referenced $value with the decrypted value in case of encrypted (sensitive value)
+	 *
+	 * @param string $userId
+	 * @param string $app
+	 * @param string $key
+	 * @param string $value
+	 */
 	private function decryptSensitiveValue(string $userId, string $app, string $key, string &$value): void {
 		if (!$this->isFlagged(self::FLAG_SENSITIVE, $this->valueDetails[$userId][$app][$key]['flags'] ?? 0)) {
 			return;
@@ -1820,8 +1834,10 @@ class UserConfig implements IUserConfig {
 	 *
 	 * @throws UnknownKeyException
 	 * @throws TypeConflictException
+	 * @return bool FALSE if conflict with defined lexicon were observed in the process
 	 */
 	private function matchAndApplyLexiconDefinition(
+		string $userId,
 		string $app,
 		string $key,
 		bool &$lazy,
@@ -1837,20 +1853,50 @@ class UserConfig implements IUserConfig {
 		/** @var ConfigLexiconEntry $configValue */
 		$configValue = $configDetails['entries'][$key];
 		if ($type === ValueType::MIXED) {
-			$type = $configValue->getValueType(); // we overwrite if value was requested as mixed
+			// we overwrite if value was requested as mixed
+			$type = $configValue->getValueType();
 		} elseif ($configValue->getValueType() !== $type) {
 			throw new TypeConflictException('The user config key ' . $app . '/' . $key . ' is typed incorrectly in relation to the config lexicon');
 		}
 
 		$lazy = $configValue->isLazy();
-		$default = $configValue->getDefault() ?? $default; // default from Lexicon got priority
 		$flags = $configValue->getFlags();
-
 		if ($configValue->isDeprecated()) {
 			$this->logger->notice('User config key ' . $app . '/' . $key . ' is set as deprecated.');
 		}
 
-		return true;
+		$enforcedValue = $this->config->getSystemValue('lexicon.default.userconfig.enforced', [])[$app][$key] ?? false;
+		if (!$enforcedValue && $this->hasKey($userId, $app, $key, $lazy)) {
+			// if key exists there should be no need to extract default
+			return true;
+		}
+
+		// default from Lexicon got priority but it can still be overwritten by admin
+		$default = $this->getSystemDefault($app, $configValue) ?? $configValue->getDefault() ?? $default;
+
+		// returning false will make get() returning $default and set() not changing value in database
+		return !$enforcedValue;
+	}
+
+	/**
+	 * get default value set in config/config.php if stored in key:
+	 *
+	 * 'lexicon.default.userconfig' => [
+	 *        <appId> => [
+	 *           <configKey> => 'my value',
+	 *        ]
+	 *     ],
+	 *
+	 * The entry is converted to string to fit the expected type when managing default value
+	 */
+	private function getSystemDefault(string $appId, ConfigLexiconEntry $configValue): ?string {
+		$default = $this->config->getSystemValue('lexicon.default.userconfig', [])[$appId][$configValue->getKey()] ?? null;
+		if ($default === null) {
+			// no system default, using default default.
+			return null;
+		}
+
+		return $configValue->convertToString($default);
 	}
 
 	/**
diff --git a/lib/private/Contacts/ContactsMenu/Providers/LocalTimeProvider.php b/lib/private/Contacts/ContactsMenu/Providers/LocalTimeProvider.php
index b51ade4d74d..f62e989fd64 100644
--- a/lib/private/Contacts/ContactsMenu/Providers/LocalTimeProvider.php
+++ b/lib/private/Contacts/ContactsMenu/Providers/LocalTimeProvider.php
@@ -17,6 +17,7 @@ use OCP\IConfig;
 use OCP\IDateTimeFormatter;
 use OCP\IURLGenerator;
 use OCP\IUserManager;
+use OCP\IUserSession;
 use OCP\L10N\IFactory as IL10NFactory;
 
 class LocalTimeProvider implements IProvider {
@@ -28,6 +29,7 @@ class LocalTimeProvider implements IProvider {
 		private ITimeFactory $timeFactory,
 		private IDateTimeFormatter $dateTimeFormatter,
 		private IConfig $config,
+		private IUserSession $currentSession,
 	) {
 	}
 
@@ -35,14 +37,51 @@ class LocalTimeProvider implements IProvider {
 		$targetUserId = $entry->getProperty('UID');
 		$targetUser = $this->userManager->get($targetUserId);
 		if (!empty($targetUser)) {
-			$timezone = $this->config->getUserValue($targetUser->getUID(), 'core', 'timezone') ?: $this->config->getSystemValueString('default_timezone', 'UTC');
-			$dateTimeZone = new \DateTimeZone($timezone);
-			$localTime = $this->dateTimeFormatter->formatTime($this->timeFactory->getDateTime(), 'short', $dateTimeZone);
+			$timezoneStringTarget = $this->config->getUserValue($targetUser->getUID(), 'core', 'timezone') ?: $this->config->getSystemValueString('default_timezone', 'UTC');
+			$timezoneTarget = new \DateTimeZone($timezoneStringTarget);
+			$localTimeTarget = $this->timeFactory->getDateTime('now', $timezoneTarget);
+			$localTimeString = $this->dateTimeFormatter->formatTime($localTimeTarget, 'short', $timezoneTarget);
 
-			$iconUrl = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/recent.svg'));
 			$l = $this->l10nFactory->get('lib');
-			$profileActionText = $l->t('Local time: %s', [$localTime]);
+			$currentUser = $this->currentSession->getUser();
+			if ($currentUser !== null) {
+				$timezoneStringCurrent = $this->config->getUserValue($currentUser->getUID(), 'core', 'timezone') ?: $this->config->getSystemValueString('default_timezone', 'UTC');
+				$timezoneCurrent = new \DateTimeZone($timezoneStringCurrent);
+				$localTimeCurrent = $this->timeFactory->getDateTime('now', $timezoneCurrent);
+
+				// Get the timezone offsets to GMT on this very time (needed to handle daylight saving time)
+				$timeOffsetCurrent = $timezoneCurrent->getOffset($localTimeCurrent);
+				$timeOffsetTarget = $timezoneTarget->getOffset($localTimeTarget);
+				// Get the difference between the current users offset to GMT and then targets user to GMT
+				$timeOffset = $timeOffsetTarget - $timeOffsetCurrent;
+				if ($timeOffset === 0) {
+					// No offset means both users are in the same timezone
+					$timeOffsetString = $l->t('same time');
+				} else {
+					// We need to cheat here as the offset could be up to 26h we can not use formatTime.
+					$hours = abs((int)($timeOffset / 3600));
+					$minutes = abs(($timeOffset / 60) % 60);
+					// TRANSLATORS %n hours in a short form
+					$hoursString = $l->n('%nh', '%nh', $hours);
+					// TRANSLATORS %n minutes in a short form
+					$minutesString = $l->n('%nm', '%nm', $minutes);
+
+					$timeOffsetString = ($hours > 0 ? $hoursString : '') . ($minutes > 0 ? $minutesString : '');
 
+					if ($timeOffset > 0) {
+						// TRANSLATORS meaning the user is %s time ahead - like 1h30m
+						$timeOffsetString = $l->t('%s ahead', [$timeOffsetString]);
+					} else {
+						// TRANSLATORS meaning the user is %s time behind - like 1h30m
+						$timeOffsetString = $l->t('%s behind', [$timeOffsetString]);
+					}
+				}
+				$profileActionText = "{$localTimeString} • {$timeOffsetString}";
+			} else {
+				$profileActionText = $l->t('Local time: %s', [$localTimeString]);
+			}
+
+			$iconUrl = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/recent.svg'));
 			$action = $this->actionFactory->newLinkAction($iconUrl, $profileActionText, '#', 'timezone');
 			// Order after the profile page
 			$action->setPriority(19);
diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php
index cb841755efd..7fbb625050b 100644
--- a/lib/private/Files/Cache/Cache.php
+++ b/lib/private/Files/Cache/Cache.php
@@ -109,7 +109,7 @@ class Cache implements ICache {
 	/**
 	 * get the stored metadata of a file or folder
 	 *
-	 * @param string | int $file either the path of a file or folder or the file id for a file or folder
+	 * @param string|int $file either the path of a file or folder or the file id for a file or folder
 	 * @return ICacheEntry|false the cache entry as array or false if the file is not found in the cache
 	 */
 	public function get($file) {
@@ -131,15 +131,17 @@ class Cache implements ICache {
 		$data = $result->fetch();
 		$result->closeCursor();
 
-		//merge partial data
-		if (!$data && is_string($file) && isset($this->partial[$file])) {
-			return $this->partial[$file];
-		} elseif (!$data) {
-			return $data;
-		} else {
+		if ($data !== false) {
 			$data['metadata'] = $metadataQuery->extractMetadata($data)->asArray();
 			return self::cacheEntryFromData($data, $this->mimetypeLoader);
+		} else {
+			//merge partial data
+			if (is_string($file) && isset($this->partial[$file])) {
+				return $this->partial[$file];
+			}
 		}
+
+		return false;
 	}
 
 	/**
@@ -886,19 +888,23 @@ class Cache implements ICache {
 	/**
 	 * Re-calculate the folder size and the size of all parent folders
 	 *
-	 * @param string|boolean $path
-	 * @param array $data (optional) meta data of the folder
+	 * @param array|ICacheEntry|null $data (optional) meta data of the folder
 	 */
-	public function correctFolderSize($path, $data = null, $isBackgroundScan = false) {
+	public function correctFolderSize(string $path, $data = null, bool $isBackgroundScan = false): void {
 		$this->calculateFolderSize($path, $data);
+
 		if ($path !== '') {
 			$parent = dirname($path);
 			if ($parent === '.' || $parent === '/') {
 				$parent = '';
 			}
+
 			if ($isBackgroundScan) {
 				$parentData = $this->get($parent);
-				if ($parentData['size'] !== -1 && $this->getIncompleteChildrenCount($parentData['fileid']) === 0) {
+				if ($parentData !== false
+					&& $parentData['size'] !== -1
+					&& $this->getIncompleteChildrenCount($parentData['fileid']) === 0
+				) {
 					$this->correctFolderSize($parent, $parentData, $isBackgroundScan);
 				}
 			} else {
@@ -1009,8 +1015,8 @@ class Cache implements ICache {
 			}
 
 			// only set unencrypted size for a folder if any child entries have it set, or the folder is empty
-			$shouldWriteUnEncryptedSize = $unencryptedMax > 0 || $totalSize === 0 || $entry['unencrypted_size'] > 0;
-			if ($entry['size'] !== $totalSize || ($entry['unencrypted_size'] !== $unencryptedTotal && $shouldWriteUnEncryptedSize)) {
+			$shouldWriteUnEncryptedSize = $unencryptedMax > 0 || $totalSize === 0 || ($entry['unencrypted_size'] ?? 0) > 0;
+			if ($entry['size'] !== $totalSize || (($entry['unencrypted_size'] ?? 0) !== $unencryptedTotal && $shouldWriteUnEncryptedSize)) {
 				if ($shouldWriteUnEncryptedSize) {
 					// if all children have an unencrypted size of 0, just set the folder unencrypted size to 0 instead of summing the sizes
 					if ($unencryptedMax === 0) {
diff --git a/lib/private/Files/Cache/Scanner.php b/lib/private/Files/Cache/Scanner.php
index 3bd674f79e2..1fb408a0655 100644
--- a/lib/private/Files/Cache/Scanner.php
+++ b/lib/private/Files/Cache/Scanner.php
@@ -83,7 +83,7 @@ class Scanner extends BasicEmitter implements IScanner {
 	 *
 	 * @param bool $useTransactions
 	 */
-	public function setUseTransactions($useTransactions) {
+	public function setUseTransactions($useTransactions): void {
 		$this->useTransactions = $useTransactions;
 	}
 
@@ -108,9 +108,9 @@ class Scanner extends BasicEmitter implements IScanner {
 	 * @param string $file
 	 * @param int $reuseExisting
 	 * @param int $parentId
-	 * @param array|null|false $cacheData existing data in the cache for the file to be scanned
+	 * @param array|CacheEntry|null|false $cacheData existing data in the cache for the file to be scanned
 	 * @param bool $lock set to false to disable getting an additional read lock during scanning
-	 * @param null $data the metadata for the file, as returned by the storage
+	 * @param array|null $data the metadata for the file, as returned by the storage
 	 * @return array|null an array of metadata of the scanned file
 	 * @throws \OCP\Lock\LockedException
 	 */
@@ -122,139 +122,130 @@ class Scanner extends BasicEmitter implements IScanner {
 				return null;
 			}
 		}
+
 		// only proceed if $file is not a partial file, blacklist is handled by the storage
-		if (!self::isPartialFile($file)) {
-			// acquire a lock
+		if (self::isPartialFile($file)) {
+			return null;
+		}
+
+		// acquire a lock
+		if ($lock) {
+			if ($this->storage->instanceOfStorage(ILockingStorage::class)) {
+				$this->storage->acquireLock($file, ILockingProvider::LOCK_SHARED, $this->lockingProvider);
+			}
+		}
+
+		try {
+			$data = $data ?? $this->getData($file);
+		} catch (ForbiddenException $e) {
 			if ($lock) {
 				if ($this->storage->instanceOfStorage(ILockingStorage::class)) {
-					$this->storage->acquireLock($file, ILockingProvider::LOCK_SHARED, $this->lockingProvider);
+					$this->storage->releaseLock($file, ILockingProvider::LOCK_SHARED, $this->lockingProvider);
 				}
 			}
 
-			try {
-				$data = $data ?? $this->getData($file);
-			} catch (ForbiddenException $e) {
-				if ($lock) {
-					if ($this->storage->instanceOfStorage(ILockingStorage::class)) {
-						$this->storage->releaseLock($file, ILockingProvider::LOCK_SHARED, $this->lockingProvider);
-					}
+			return null;
+		}
+
+		try {
+			if ($data === null) {
+				$this->removeFromCache($file);
+			} else {
+				// pre-emit only if it was a file. By that we avoid counting/treating folders as files
+				if ($data['mimetype'] !== 'httpd/unix-directory') {
+					$this->emit('\OC\Files\Cache\Scanner', 'scanFile', [$file, $this->storageId]);
+					\OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_file', ['path' => $file, 'storage' => $this->storageId]);
 				}
 
-				return null;
-			}
+				$parent = dirname($file);
+				if ($parent === '.' || $parent === '/') {
+					$parent = '';
+				}
+				if ($parentId === -1) {
+					$parentId = $this->cache->getParentId($file);
+				}
 
-			try {
-				if ($data) {
-					// pre-emit only if it was a file. By that we avoid counting/treating folders as files
-					if ($data['mimetype'] !== 'httpd/unix-directory') {
-						$this->emit('\OC\Files\Cache\Scanner', 'scanFile', [$file, $this->storageId]);
-						\OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_file', ['path' => $file, 'storage' => $this->storageId]);
+				// scan the parent if it's not in the cache (id -1) and the current file is not the root folder
+				if ($file && $parentId === -1) {
+					$parentData = $this->scanFile($parent);
+					if ($parentData === null) {
+						return null;
 					}
 
-					$parent = dirname($file);
-					if ($parent === '.' || $parent === '/') {
-						$parent = '';
-					}
-					if ($parentId === -1) {
-						$parentId = $this->cache->getParentId($file);
-					}
+					$parentId = $parentData['fileid'];
+				}
+				if ($parent) {
+					$data['parent'] = $parentId;
+				}
 
-					// scan the parent if it's not in the cache (id -1) and the current file is not the root folder
-					if ($file && $parentId === -1) {
-						$parentData = $this->scanFile($parent);
-						if (!$parentData) {
-							return null;
-						}
-						$parentId = $parentData['fileid'];
-					}
-					if ($parent) {
-						$data['parent'] = $parentId;
-					}
-					if (is_null($cacheData)) {
-						/** @var CacheEntry $cacheData */
-						$cacheData = $this->cache->get($file);
-					}
-					if ($cacheData && $reuseExisting && isset($cacheData['fileid'])) {
-						// prevent empty etag
-						$etag = empty($cacheData['etag']) ? $data['etag'] : $cacheData['etag'];
-						$fileId = $cacheData['fileid'];
-						$data['fileid'] = $fileId;
-						// only reuse data if the file hasn't explicitly changed
-						$mtimeUnchanged = isset($data['storage_mtime']) && isset($cacheData['storage_mtime']) && $data['storage_mtime'] === $cacheData['storage_mtime'];
-						// if the folder is marked as unscanned, never reuse etags
-						if ($mtimeUnchanged && $cacheData['size'] !== -1) {
-							$data['mtime'] = $cacheData['mtime'];
-							if (($reuseExisting & self::REUSE_SIZE) && ($data['size'] === -1)) {
-								$data['size'] = $cacheData['size'];
-							}
-							if ($reuseExisting & self::REUSE_ETAG && !$this->storage->instanceOfStorage(IReliableEtagStorage::class)) {
-								$data['etag'] = $etag;
-							}
+				$cacheData = $cacheData ?? $this->cache->get($file);
+				if ($reuseExisting && $cacheData !== false && isset($cacheData['fileid'])) {
+					// prevent empty etag
+					$etag = empty($cacheData['etag']) ? $data['etag'] : $cacheData['etag'];
+					$fileId = $cacheData['fileid'];
+					$data['fileid'] = $fileId;
+					// only reuse data if the file hasn't explicitly changed
+					$mtimeUnchanged = isset($data['storage_mtime']) && isset($cacheData['storage_mtime']) && $data['storage_mtime'] === $cacheData['storage_mtime'];
+					// if the folder is marked as unscanned, never reuse etags
+					if ($mtimeUnchanged && $cacheData['size'] !== -1) {
+						$data['mtime'] = $cacheData['mtime'];
+						if (($reuseExisting & self::REUSE_SIZE) && ($data['size'] === -1)) {
+							$data['size'] = $cacheData['size'];
 						}
-
-						// we only updated unencrypted_size if it's already set
-						if ($cacheData['unencrypted_size'] === 0) {
-							unset($data['unencrypted_size']);
+						if ($reuseExisting & self::REUSE_ETAG && !$this->storage->instanceOfStorage(IReliableEtagStorage::class)) {
+							$data['etag'] = $etag;
 						}
-
-						// Only update metadata that has changed
-						// i.e. get all the values in $data that are not present in the cache already
-						$newData = $this->array_diff_assoc_multi($data, $cacheData->getData());
-						
-						// make it known to the caller that etag has been changed and needs propagation
-						if (isset($newData['etag'])) {
-							$data['etag_changed'] = true;
-						}
-					} else {
-						// we only updated unencrypted_size if it's already set
-						unset($data['unencrypted_size']);
-						$newData = $data;
-						$fileId = -1;
 					}
-					if (!empty($newData)) {
-						// Reset the checksum if the data has changed
-						$newData['checksum'] = '';
-						$newData['parent'] = $parentId;
-						$data['fileid'] = $this->addToCache($file, $newData, $fileId);
-					}
-
-					$data['oldSize'] = ($cacheData && isset($cacheData['size'])) ? $cacheData['size'] : 0;
 
-					if ($cacheData && isset($cacheData['encrypted'])) {
-						$data['encrypted'] = $cacheData['encrypted'];
+					// we only updated unencrypted_size if it's already set
+					if (isset($cacheData['unencrypted_size']) && $cacheData['unencrypted_size'] === 0) {
+						unset($data['unencrypted_size']);
 					}
 
-					// post-emit only if it was a file. By that we avoid counting/treating folders as files
-					if ($data['mimetype'] !== 'httpd/unix-directory') {
-						$this->emit('\OC\Files\Cache\Scanner', 'postScanFile', [$file, $this->storageId]);
-						\OC_Hook::emit('\OC\Files\Cache\Scanner', 'post_scan_file', ['path' => $file, 'storage' => $this->storageId]);
+					/**
+					 * Only update metadata that has changed.
+					 * i.e. get all the values in $data that are not present in the cache already
+					 *
+					 * We need the OC implementation for usage of "getData" method below.
+					 * @var \OC\Files\Cache\CacheEntry $cacheData
+					 */
+					$newData = $this->array_diff_assoc_multi($data, $cacheData->getData());
+					
+					// make it known to the caller that etag has been changed and needs propagation
+					if (isset($newData['etag'])) {
+						$data['etag_changed'] = true;
 					}
 				} else {
-					$this->removeFromCache($file);
+					unset($data['unencrypted_size']);
+					$newData = $data;
+					$fileId = -1;
 				}
-			} catch (\Exception $e) {
-				if ($lock) {
-					if ($this->storage->instanceOfStorage(ILockingStorage::class)) {
-						$this->storage->releaseLock($file, ILockingProvider::LOCK_SHARED, $this->lockingProvider);
-					}
+				if (!empty($newData)) {
+					// Reset the checksum if the data has changed
+					$newData['checksum'] = '';
+					$newData['parent'] = $parentId;
+					$data['fileid'] = $this->addToCache($file, $newData, $fileId);
 				}
-				throw $e;
-			}
 
-			// release the acquired lock
-			if ($lock) {
-				if ($this->storage->instanceOfStorage(ILockingStorage::class)) {
-					$this->storage->releaseLock($file, ILockingProvider::LOCK_SHARED, $this->lockingProvider);
+				if ($cacheData !== false) {
+					$data['oldSize'] = $cacheData['size'] ?? 0;
+					$data['encrypted'] = $cacheData['encrypted'] ?? false;
 				}
-			}
 
-			if ($data && !isset($data['encrypted'])) {
-				$data['encrypted'] = false;
+				// post-emit only if it was a file. By that we avoid counting/treating folders as files
+				if ($data['mimetype'] !== 'httpd/unix-directory') {
+					$this->emit('\OC\Files\Cache\Scanner', 'postScanFile', [$file, $this->storageId]);
+					\OC_Hook::emit('\OC\Files\Cache\Scanner', 'post_scan_file', ['path' => $file, 'storage' => $this->storageId]);
+				}
+			}
+		} finally {
+			// release the acquired lock
+			if ($lock && $this->storage->instanceOfStorage(ILockingStorage::class)) {
+				$this->storage->releaseLock($file, ILockingProvider::LOCK_SHARED, $this->lockingProvider);
 			}
-			return $data;
 		}
 
-		return null;
+		return $data;
 	}
 
 	protected function removeFromCache($path) {
@@ -319,29 +310,26 @@ class Scanner extends BasicEmitter implements IScanner {
 		if ($reuse === -1) {
 			$reuse = ($recursive === self::SCAN_SHALLOW) ? self::REUSE_ETAG | self::REUSE_SIZE : self::REUSE_ETAG;
 		}
-		if ($lock) {
-			if ($this->storage->instanceOfStorage(ILockingStorage::class)) {
-				$this->storage->acquireLock('scanner::' . $path, ILockingProvider::LOCK_EXCLUSIVE, $this->lockingProvider);
-				$this->storage->acquireLock($path, ILockingProvider::LOCK_SHARED, $this->lockingProvider);
-			}
+
+		if ($lock && $this->storage->instanceOfStorage(ILockingStorage::class)) {
+			$this->storage->acquireLock('scanner::' . $path, ILockingProvider::LOCK_EXCLUSIVE, $this->lockingProvider);
+			$this->storage->acquireLock($path, ILockingProvider::LOCK_SHARED, $this->lockingProvider);
 		}
+
 		try {
-			try {
-				$data = $this->scanFile($path, $reuse, -1, null, $lock);
-				if ($data && $data['mimetype'] === 'httpd/unix-directory') {
-					$size = $this->scanChildren($path, $recursive, $reuse, $data['fileid'], $lock, $data['size']);
-					$data['size'] = $size;
-				}
-			} catch (NotFoundException $e) {
-				$this->removeFromCache($path);
-				return null;
+			$data = $this->scanFile($path, $reuse, -1, lock: $lock);
+
+			if ($data !== null && $data['mimetype'] === 'httpd/unix-directory') {
+				$size = $this->scanChildren($path, $recursive, $reuse, $data['fileid'], $lock, $data['size']);
+				$data['size'] = $size;
 			}
+		} catch (NotFoundException $e) {
+			$this->removeFromCache($path);
+			return null;
 		} finally {
-			if ($lock) {
-				if ($this->storage->instanceOfStorage(ILockingStorage::class)) {
-					$this->storage->releaseLock($path, ILockingProvider::LOCK_SHARED, $this->lockingProvider);
-					$this->storage->releaseLock('scanner::' . $path, ILockingProvider::LOCK_EXCLUSIVE, $this->lockingProvider);
-				}
+			if ($lock && $this->storage->instanceOfStorage(ILockingStorage::class)) {
+				$this->storage->releaseLock($path, ILockingProvider::LOCK_SHARED, $this->lockingProvider);
+				$this->storage->releaseLock('scanner::' . $path, ILockingProvider::LOCK_EXCLUSIVE, $this->lockingProvider);
 			}
 		}
 		return $data;
@@ -395,9 +383,9 @@ class Scanner extends BasicEmitter implements IScanner {
 	 * Get the children currently in the cache
 	 *
 	 * @param int $folderId
-	 * @return array[]
+	 * @return array<string, \OCP\Files\Cache\ICacheEntry>
 	 */
-	protected function getExistingChildren($folderId) {
+	protected function getExistingChildren($folderId): array {
 		$existingChildren = [];
 		$children = $this->cache->getFolderContentsById($folderId);
 		foreach ($children as $child) {
diff --git a/lib/private/Files/Cache/SearchBuilder.php b/lib/private/Files/Cache/SearchBuilder.php
index e89b95b756f..6a0cba7f1f2 100644
--- a/lib/private/Files/Cache/SearchBuilder.php
+++ b/lib/private/Files/Cache/SearchBuilder.php
@@ -12,6 +12,7 @@ use OCP\Files\Search\ISearchBinaryOperator;
 use OCP\Files\Search\ISearchComparison;
 use OCP\Files\Search\ISearchOperator;
 use OCP\Files\Search\ISearchOrder;
+use OCP\FilesMetadata\IFilesMetadataManager;
 use OCP\FilesMetadata\IMetadataQuery;
 
 /**
@@ -80,13 +81,10 @@ class SearchBuilder {
 
 	public const TAG_FAVORITE = '_$!<Favorite>!$_';
 
-	/** @var IMimeTypeLoader */
-	private $mimetypeLoader;
-
 	public function __construct(
-		IMimeTypeLoader $mimetypeLoader,
+		private IMimeTypeLoader $mimetypeLoader,
+		private IFilesMetadataManager $filesMetadataManager,
 	) {
-		$this->mimetypeLoader = $mimetypeLoader;
 	}
 
 	/**
@@ -285,11 +283,18 @@ class SearchBuilder {
 
 
 	private function getExtraOperatorField(ISearchComparison $operator, IMetadataQuery $metadataQuery): array {
-		$paramType = self::$fieldTypes[$operator->getField()];
 		$field = $operator->getField();
 		$value = $operator->getValue();
 		$type = $operator->getType();
 
+		$knownMetadata = $this->filesMetadataManager->getKnownMetadata();
+		$isIndex = $knownMetadata->isIndex($field);
+		$paramType = $knownMetadata->getType($field) === 'int' ? 'integer' : 'string';
+
+		if (!$isIndex) {
+			throw new \InvalidArgumentException('Cannot search non indexed metadata key');
+		}
+
 		switch ($operator->getExtra()) {
 			case IMetadataQuery::EXTRA:
 				$metadataQuery->joinIndex($field); // join index table if not joined yet
diff --git a/lib/private/Files/Cache/Wrapper/CacheJail.php b/lib/private/Files/Cache/Wrapper/CacheJail.php
index ea0f992114a..5c7bd4334f3 100644
--- a/lib/private/Files/Cache/Wrapper/CacheJail.php
+++ b/lib/private/Files/Cache/Wrapper/CacheJail.php
@@ -21,19 +21,15 @@ use OCP\Files\Search\ISearchOperator;
  * Jail to a subdirectory of the wrapped cache
  */
 class CacheJail extends CacheWrapper {
-	/**
-	 * @var string
-	 */
-	protected $root;
-	protected $unjailedRoot;
+
+	protected string $unjailedRoot;
 
 	public function __construct(
 		?ICache $cache,
-		string $root,
+		protected string $root,
 		?CacheDependencies $dependencies = null,
 	) {
 		parent::__construct($cache, $dependencies);
-		$this->root = $root;
 
 		if ($cache instanceof CacheJail) {
 			$this->unjailedRoot = $cache->getSourcePath($root);
@@ -42,6 +38,9 @@ class CacheJail extends CacheWrapper {
 		}
 	}
 
+	/**
+	 * @return string
+	 */
 	protected function getRoot() {
 		return $this->root;
 	}
@@ -55,7 +54,10 @@ class CacheJail extends CacheWrapper {
 		return $this->unjailedRoot;
 	}
 
-	protected function getSourcePath($path) {
+	/**
+	 * @return string
+	 */
+	protected function getSourcePath(string $path) {
 		if ($path === '') {
 			return $this->getRoot();
 		} else {
@@ -95,7 +97,7 @@ class CacheJail extends CacheWrapper {
 	/**
 	 * get the stored metadata of a file or folder
 	 *
-	 * @param string /int $file
+	 * @param string|int $file
 	 * @return ICacheEntry|false
 	 */
 	public function get($file) {
@@ -206,12 +208,12 @@ class CacheJail extends CacheWrapper {
 	/**
 	 * update the folder size and the size of all parent folders
 	 *
-	 * @param string|boolean $path
-	 * @param array $data (optional) meta data of the folder
+	 * @param array|ICacheEntry|null $data (optional) meta data of the folder
 	 */
-	public function correctFolderSize($path, $data = null, $isBackgroundScan = false) {
-		if ($this->getCache() instanceof Cache) {
-			$this->getCache()->correctFolderSize($this->getSourcePath($path), $data, $isBackgroundScan);
+	public function correctFolderSize(string $path, $data = null, bool $isBackgroundScan = false): void {
+		$cache = $this->getCache();
+		if ($cache instanceof Cache) {
+			$cache->correctFolderSize($this->getSourcePath($path), $data, $isBackgroundScan);
 		}
 	}
 
@@ -223,8 +225,9 @@ class CacheJail extends CacheWrapper {
 	 * @return int|float
 	 */
 	public function calculateFolderSize($path, $entry = null) {
-		if ($this->getCache() instanceof Cache) {
-			return $this->getCache()->calculateFolderSize($this->getSourcePath($path), $entry);
+		$cache = $this->getCache();
+		if ($cache instanceof Cache) {
+			return $cache->calculateFolderSize($this->getSourcePath($path), $entry);
 		} else {
 			return 0;
 		}
diff --git a/lib/private/Files/Cache/Wrapper/CacheWrapper.php b/lib/private/Files/Cache/Wrapper/CacheWrapper.php
index fdaa2cf4b7a..f2f1036d6a3 100644
--- a/lib/private/Files/Cache/Wrapper/CacheWrapper.php
+++ b/lib/private/Files/Cache/Wrapper/CacheWrapper.php
@@ -221,12 +221,12 @@ class CacheWrapper extends Cache {
 	/**
 	 * update the folder size and the size of all parent folders
 	 *
-	 * @param string|boolean $path
-	 * @param array $data (optional) meta data of the folder
+	 * @param array|ICacheEntry|null $data (optional) meta data of the folder
 	 */
-	public function correctFolderSize($path, $data = null, $isBackgroundScan = false) {
-		if ($this->getCache() instanceof Cache) {
-			$this->getCache()->correctFolderSize($path, $data, $isBackgroundScan);
+	public function correctFolderSize(string $path, $data = null, bool $isBackgroundScan = false): void {
+		$cache = $this->getCache();
+		if ($cache instanceof Cache) {
+			$cache->correctFolderSize($path, $data, $isBackgroundScan);
 		}
 	}
 
@@ -238,8 +238,9 @@ class CacheWrapper extends Cache {
 	 * @return int|float
 	 */
 	public function calculateFolderSize($path, $entry = null) {
-		if ($this->getCache() instanceof Cache) {
-			return $this->getCache()->calculateFolderSize($path, $entry);
+		$cache = $this->getCache();
+		if ($cache instanceof Cache) {
+			return $cache->calculateFolderSize($path, $entry);
 		} else {
 			return 0;
 		}
diff --git a/lib/private/Files/Conversion/ConversionManager.php b/lib/private/Files/Conversion/ConversionManager.php
new file mode 100644
index 00000000000..cf1085f66f0
--- /dev/null
+++ b/lib/private/Files/Conversion/ConversionManager.php
@@ -0,0 +1,181 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OC\Files\Conversion;
+
+use OC\AppFramework\Bootstrap\Coordinator;
+use OC\ForbiddenException;
+use OC\SystemConfig;
+use OCP\Files\Conversion\IConversionManager;
+use OCP\Files\Conversion\IConversionProvider;
+use OCP\Files\File;
+use OCP\Files\GenericFileException;
+use OCP\Files\IRootFolder;
+use OCP\IL10N;
+use OCP\ITempManager;
+use OCP\L10N\IFactory;
+use OCP\PreConditionNotMetException;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\ContainerInterface;
+use Psr\Container\NotFoundExceptionInterface;
+use Psr\Log\LoggerInterface;
+use RuntimeException;
+use Throwable;
+
+class ConversionManager implements IConversionManager {
+	/** @var string[] */
+	private array $preferredApps = [
+		'richdocuments',
+	];
+
+	/** @var list<IConversionProvider> */
+	private array $preferredProviders = [];
+
+	/** @var list<IConversionProvider> */
+	private array $providers = [];
+
+	private IL10N $l10n;
+	public function __construct(
+		private Coordinator $coordinator,
+		private ContainerInterface $serverContainer,
+		private IRootFolder $rootFolder,
+		private ITempManager $tempManager,
+		private LoggerInterface $logger,
+		private SystemConfig $config,
+		IFactory $l10nFactory,
+	) {
+		$this->l10n = $l10nFactory->get('files');
+	}
+
+	public function hasProviders(): bool {
+		$context = $this->coordinator->getRegistrationContext();
+		return !empty($context->getFileConversionProviders());
+	}
+
+	public function getProviders(): array {
+		$providers = [];
+		foreach ($this->getRegisteredProviders() as $provider) {
+			$providers = array_merge($providers, $provider->getSupportedMimeTypes());
+		}
+		return $providers;
+	}
+
+	public function convert(File $file, string $targetMimeType, ?string $destination = null): string {
+		if (!$this->hasProviders()) {
+			throw new PreConditionNotMetException($this->l10n->t('No file conversion providers available'));
+		}
+
+		// Operate in mebibytes
+		$fileSize = $file->getSize() / (1024 * 1024);
+		$threshold = $this->config->getValue('max_file_conversion_filesize', 100);
+		if ($fileSize > $threshold) {
+			throw new GenericFileException($this->l10n->t('File is too large to convert'));
+		}
+
+		$fileMimeType = $file->getMimetype();
+		$validProvider = $this->getValidProvider($fileMimeType, $targetMimeType);
+
+		if ($validProvider !== null) {
+			// Get the target extension given by the provider
+			$targetExtension = '';
+			foreach ($validProvider->getSupportedMimeTypes() as $mimeProvider) {
+				if ($mimeProvider->getTo() === $targetMimeType) {
+					$targetExtension = $mimeProvider->getExtension();
+					break;
+				}
+			}
+			// If destination not provided, we use the same path
+			// as the original file, but with the new extension
+			if ($destination === null) {
+				$basename = pathinfo($file->getPath(), PATHINFO_FILENAME);
+				$parent = $file->getParent();
+				$destination = $parent->getFullPath($basename . '.' . $targetExtension);
+			}
+
+			// If destination doesn't match the target extension, we throw an error
+			if (pathinfo($destination, PATHINFO_EXTENSION) !== $targetExtension) {
+				throw new GenericFileException($this->l10n->t('Destination does not match conversion extension'));
+			}
+
+			// Check destination before converting
+			$this->checkDestination($destination);
+
+			// Convert the file and write it to the destination
+			$convertedFile = $validProvider->convertFile($file, $targetMimeType);
+			$convertedFile = $this->writeToDestination($destination, $convertedFile);
+			return $convertedFile->getPath();
+		}
+
+		throw new RuntimeException($this->l10n->t('Could not convert file'));
+	}
+
+	/**
+	 * @return list<IConversionProvider>
+	 */
+	private function getRegisteredProviders(): array {
+		$context = $this->coordinator->getRegistrationContext();
+		foreach ($context->getFileConversionProviders() as $providerRegistration) {
+			$class = $providerRegistration->getService();
+			$appId = $providerRegistration->getAppId();
+
+			try {
+				if (in_array($appId, $this->preferredApps)) {
+					$this->preferredProviders[$class] = $this->serverContainer->get($class);
+					continue;
+				}
+				
+				$this->providers[$class] = $this->serverContainer->get($class);
+			} catch (NotFoundExceptionInterface|ContainerExceptionInterface|Throwable $e) {
+				$this->logger->error('Failed to load file conversion provider ' . $class, [
+					'exception' => $e,
+				]);
+			}
+		}
+
+		return array_values(array_merge([], $this->preferredProviders, $this->providers));
+	}
+
+	private function checkDestination(string $destination): void {
+		if (!$this->rootFolder->nodeExists(dirname($destination))) {
+			throw new ForbiddenException($this->l10n->t('Destination does not exist'));
+		}
+
+		$folder = $this->rootFolder->get(dirname($destination));
+		if (!$folder->isCreatable()) {
+			throw new ForbiddenException($this->l10n->t('Destination is not creatable'));
+		}
+	}
+
+	private function writeToDestination(string $destination, mixed $content): File {
+		$this->checkDestination($destination);
+
+		if ($this->rootFolder->nodeExists($destination)) {
+			$file = $this->rootFolder->get($destination);
+			$parent = $file->getParent();
+
+			// Folder permissions is already checked in checkDestination method
+			$newName = $parent->getNonExistingName(basename($destination));
+			$destination = $parent->getFullPath($newName);
+		}
+
+		return $this->rootFolder->newFile($destination, $content);
+	}
+
+	private function getValidProvider(string $fileMimeType, string $targetMimeType): ?IConversionProvider {
+		foreach ($this->getRegisteredProviders() as $provider) {
+			foreach ($provider->getSupportedMimeTypes() as $mimeProvider) {
+				if ($mimeProvider->getFrom() === $fileMimeType && $mimeProvider->getTo() === $targetMimeType) {
+					return $provider;
+				}
+			}
+		}
+		
+		return null;
+	}
+}
diff --git a/lib/private/Files/Mount/MountPoint.php b/lib/private/Files/Mount/MountPoint.php
index 7a5a87be35b..bab2dc8e4bd 100644
--- a/lib/private/Files/Mount/MountPoint.php
+++ b/lib/private/Files/Mount/MountPoint.php
@@ -198,7 +198,7 @@ class MountPoint implements IMountPoint {
 			if (is_null($storage)) {
 				return -1;
 			}
-			$this->numericStorageId = $storage->getStorageCache()->getNumericId();
+			$this->numericStorageId = $storage->getCache()->getNumericStorageId();
 		}
 		return $this->numericStorageId;
 	}
diff --git a/lib/private/Files/ObjectStore/ObjectStoreScanner.php b/lib/private/Files/ObjectStore/ObjectStoreScanner.php
index d8a77d36dee..05929a49aab 100644
--- a/lib/private/Files/ObjectStore/ObjectStoreScanner.php
+++ b/lib/private/Files/ObjectStore/ObjectStoreScanner.php
@@ -13,11 +13,11 @@ use OCP\Files\FileInfo;
 
 class ObjectStoreScanner extends Scanner {
 	public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true, $data = null) {
-		return [];
+		return null;
 	}
 
 	public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) {
-		return [];
+		return null;
 	}
 
 	protected function scanChildren(string $path, $recursive, int $reuse, int $folderId, bool $lock, int|float $oldSize, &$etagChanged = false) {
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
index cce8752c360..65fc61ffa77 100644
--- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php
+++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
@@ -213,7 +213,7 @@ trait S3ConnectionTrait {
 	}
 
 	protected function getSSECKey(): ?string {
-		if (isset($this->params['sse_c_key'])) {
+		if (isset($this->params['sse_c_key']) && !empty($this->params['sse_c_key'])) {
 			return $this->params['sse_c_key'];
 		}
 
diff --git a/lib/private/Files/Storage/Wrapper/Encryption.php b/lib/private/Files/Storage/Wrapper/Encryption.php
index eb073d24087..ba23f3c43ec 100644
--- a/lib/private/Files/Storage/Wrapper/Encryption.php
+++ b/lib/private/Files/Storage/Wrapper/Encryption.php
@@ -628,6 +628,7 @@ class Encryption extends Wrapper {
 						$info->getUnencryptedSize()
 					);
 				}
+				$this->updateEncryptedVersion($sourceStorage, $sourceInternalPath, $targetInternalPath, $isRename, true);
 			}
 			return $result;
 		}
diff --git a/lib/private/Files/Template/TemplateManager.php b/lib/private/Files/Template/TemplateManager.php
index 5a3f16872e6..8032cdf941f 100644
--- a/lib/private/Files/Template/TemplateManager.php
+++ b/lib/private/Files/Template/TemplateManager.php
@@ -179,7 +179,6 @@ class TemplateManager implements ITemplateManager {
 			if ($path instanceof Folder) {
 				return $path;
 			}
-			$this->logger->warning('Template folder ' . $path . ' not found or invalid', ['app' => 'files_templates']);
 		}
 		throw new NotFoundException();
 	}
diff --git a/lib/private/Files/Utils/PathHelper.php b/lib/private/Files/Utils/PathHelper.php
index a6ae029b957..db1294bcc10 100644
--- a/lib/private/Files/Utils/PathHelper.php
+++ b/lib/private/Files/Utils/PathHelper.php
@@ -37,6 +37,8 @@ class PathHelper {
 		if ($path === '' or $path === '/') {
 			return '/';
 		}
+		// No null bytes
+		$path = str_replace(chr(0), '', $path);
 		//no windows style slashes
 		$path = str_replace('\\', '/', $path);
 		//add leading slash
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
index 072d3520ae9..5e09ce69fb2 100644
--- a/lib/private/Files/View.php
+++ b/lib/private/Files/View.php
@@ -610,13 +610,13 @@ class View {
 				$this->lockFile($path, ILockingProvider::LOCK_SHARED);
 
 				$exists = $this->file_exists($path);
-				$run = true;
 				if ($this->shouldEmitHooks($path)) {
+					$run = true;
 					$this->emit_file_hooks_pre($exists, $path, $run);
-				}
-				if (!$run) {
-					$this->unlockFile($path, ILockingProvider::LOCK_SHARED);
-					return false;
+					if (!$run) {
+						$this->unlockFile($path, ILockingProvider::LOCK_SHARED);
+						return false;
+					}
 				}
 
 				try {
diff --git a/lib/private/Log.php b/lib/private/Log.php
index 55e41134692..746e4d75b91 100644
--- a/lib/private/Log.php
+++ b/lib/private/Log.php
@@ -271,6 +271,7 @@ class Log implements ILogger, IDataLogger {
 		if (!isset($logCondition['matches'])) {
 			$configLogLevel = $this->config->getValue('loglevel', ILogger::WARN);
 			if (is_numeric($configLogLevel)) {
+				$this->nestingLevel--;
 				return min((int)$configLogLevel, ILogger::FATAL);
 			}
 
diff --git a/lib/private/Preview/BackgroundCleanupJob.php b/lib/private/Preview/BackgroundCleanupJob.php
index e816ae22743..3138abb1bf9 100644
--- a/lib/private/Preview/BackgroundCleanupJob.php
+++ b/lib/private/Preview/BackgroundCleanupJob.php
@@ -63,13 +63,13 @@ class BackgroundCleanupJob extends TimedJob {
 				$qb->expr()->castColumn('a.name', IQueryBuilder::PARAM_INT), 'b.fileid'
 			))
 			->where(
-				$qb->expr()->isNull('b.fileid')
-			)->andWhere(
-				$qb->expr()->eq('a.storage', $qb->createNamedParameter($this->previewFolder->getStorageId()))
-			)->andWhere(
-				$qb->expr()->eq('a.parent', $qb->createNamedParameter($this->previewFolder->getId()))
-			)->andWhere(
-				$qb->expr()->like('a.name', $qb->createNamedParameter('__%'))
+				$qb->expr()->andX(
+					$qb->expr()->isNull('b.fileid'),
+					$qb->expr()->eq('a.storage', $qb->createNamedParameter($this->previewFolder->getStorageId())),
+					$qb->expr()->eq('a.parent', $qb->createNamedParameter($this->previewFolder->getId())),
+					$qb->expr()->like('a.name', $qb->createNamedParameter('__%')),
+					$qb->expr()->eq('a.mimetype', $qb->createNamedParameter($this->mimeTypeLoader->getId('httpd/unix-directory')))
+				)
 			);
 
 		if (!$this->isCLI) {
diff --git a/lib/private/PreviewManager.php b/lib/private/PreviewManager.php
index c8ef2fac8f3..8417554566e 100644
--- a/lib/private/PreviewManager.php
+++ b/lib/private/PreviewManager.php
@@ -343,7 +343,7 @@ class PreviewManager implements IPreview {
 		$this->registerCoreProvider(Preview\XBitmap::class, '/image\/x-xbitmap/');
 		$this->registerCoreProvider(Preview\WebP::class, '/image\/webp/');
 		$this->registerCoreProvider(Preview\Krita::class, '/application\/x-krita/');
-		$this->registerCoreProvider(Preview\MP3::class, '/audio\/mpeg/');
+		$this->registerCoreProvider(Preview\MP3::class, '/audio\/mpeg$/');
 		$this->registerCoreProvider(Preview\OpenDocument::class, '/application\/vnd.oasis.opendocument.*/');
 		$this->registerCoreProvider(Preview\Imaginary::class, Preview\Imaginary::supportedMimeTypes());
 		$this->registerCoreProvider(Preview\ImaginaryPDF::class, Preview\ImaginaryPDF::supportedMimeTypes());
diff --git a/lib/private/Security/Bruteforce/Throttler.php b/lib/private/Security/Bruteforce/Throttler.php
index 924ae3685f3..21d50848641 100644
--- a/lib/private/Security/Bruteforce/Throttler.php
+++ b/lib/private/Security/Bruteforce/Throttler.php
@@ -9,6 +9,7 @@ declare(strict_types=1);
 namespace OC\Security\Bruteforce;
 
 use OC\Security\Bruteforce\Backend\IBackend;
+use OC\Security\Ip\BruteforceAllowList;
 use OC\Security\Normalizer\IpAddress;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\IConfig;
@@ -32,14 +33,13 @@ use Psr\Log\LoggerInterface;
 class Throttler implements IThrottler {
 	/** @var bool[] */
 	private array $hasAttemptsDeleted = [];
-	/** @var bool[] */
-	private array $ipIsWhitelisted = [];
 
 	public function __construct(
 		private ITimeFactory $timeFactory,
 		private LoggerInterface $logger,
 		private IConfig $config,
 		private IBackend $backend,
+		private BruteforceAllowList $allowList,
 	) {
 	}
 
@@ -83,70 +83,7 @@ class Throttler implements IThrottler {
 	 * Check if the IP is whitelisted
 	 */
 	public function isBypassListed(string $ip): bool {
-		if (isset($this->ipIsWhitelisted[$ip])) {
-			return $this->ipIsWhitelisted[$ip];
-		}
-
-		if (!$this->config->getSystemValueBool('auth.bruteforce.protection.enabled', true)) {
-			$this->ipIsWhitelisted[$ip] = true;
-			return true;
-		}
-
-		$keys = $this->config->getAppKeys('bruteForce');
-		$keys = array_filter($keys, function ($key) {
-			return str_starts_with($key, 'whitelist_');
-		});
-
-		if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-			$type = 4;
-		} elseif (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-			$type = 6;
-		} else {
-			$this->ipIsWhitelisted[$ip] = false;
-			return false;
-		}
-
-		$ip = inet_pton($ip);
-
-		foreach ($keys as $key) {
-			$cidr = $this->config->getAppValue('bruteForce', $key, null);
-
-			$cx = explode('/', $cidr);
-			$addr = $cx[0];
-			$mask = (int)$cx[1];
-
-			// Do not compare ipv4 to ipv6
-			if (($type === 4 && !filter_var($addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) ||
-				($type === 6 && !filter_var($addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))) {
-				continue;
-			}
-
-			$addr = inet_pton($addr);
-
-			$valid = true;
-			for ($i = 0; $i < $mask; $i++) {
-				$part = ord($addr[(int)($i / 8)]);
-				$orig = ord($ip[(int)($i / 8)]);
-
-				$bitmask = 1 << (7 - ($i % 8));
-
-				$part = $part & $bitmask;
-				$orig = $orig & $bitmask;
-
-				if ($part !== $orig) {
-					$valid = false;
-					break;
-				}
-			}
-
-			if ($valid === true) {
-				$this->ipIsWhitelisted[$ip] = true;
-				return true;
-			}
-		}
-
-		$this->ipIsWhitelisted[$ip] = false;
-		return false;
+		return $this->allowList->isBypassListed($ip);
 	}
 
 	/**
diff --git a/lib/private/Security/Ip/BruteforceAllowList.php b/lib/private/Security/Ip/BruteforceAllowList.php
new file mode 100644
index 00000000000..cc4f0ceebe5
--- /dev/null
+++ b/lib/private/Security/Ip/BruteforceAllowList.php
@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OC\Security\Ip;
+
+use OCP\IAppConfig;
+use OCP\Security\Ip\IFactory;
+
+class BruteforceAllowList {
+	/** @var array<string, bool> */
+	protected array $ipIsAllowListed = [];
+
+	public function __construct(
+		private readonly IAppConfig $appConfig,
+		private readonly IFactory $factory,
+	) {
+	}
+
+	/**
+	 * Check if the IP is allowed to bypass bruteforce protection
+	 */
+	public function isBypassListed(string $ip): bool {
+		if (isset($this->ipIsAllowListed[$ip])) {
+			return $this->ipIsAllowListed[$ip];
+		}
+
+		try {
+			$address = $this->factory->addressFromString($ip);
+		} catch (\InvalidArgumentException) {
+			$this->ipIsAllowListed[$ip] = false;
+			return false;
+		}
+
+		$keys = $this->appConfig->getKeys('bruteForce');
+		$keys = array_filter($keys, static fn ($key): bool => str_starts_with($key, 'whitelist_'));
+
+		foreach ($keys as $key) {
+			$rangeString = $this->appConfig->getValueString('bruteForce', $key);
+			try {
+				$range = $this->factory->rangeFromString($rangeString);
+			} catch (\InvalidArgumentException) {
+				continue;
+			}
+
+			$allowed = $range->contains($address);
+			if ($allowed) {
+				$this->ipIsAllowListed[$ip] = true;
+				return true;
+			}
+		}
+
+		$this->ipIsAllowListed[$ip] = false;
+		return false;
+	}
+}
diff --git a/lib/private/Server.php b/lib/private/Server.php
index a20c37732a7..be9d7595e42 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -45,6 +45,7 @@ use OC\Files\Cache\FileAccess;
 use OC\Files\Config\MountProviderCollection;
 use OC\Files\Config\UserMountCache;
 use OC\Files\Config\UserMountCacheListener;
+use OC\Files\Conversion\ConversionManager;
 use OC\Files\Lock\LockManager;
 use OC\Files\Mount\CacheMountProvider;
 use OC\Files\Mount\LocalHomeMountProvider;
@@ -155,6 +156,7 @@ use OCP\Federation\ICloudIdManager;
 use OCP\Files\Cache\IFileAccess;
 use OCP\Files\Config\IMountProviderCollection;
 use OCP\Files\Config\IUserMountCache;
+use OCP\Files\Conversion\IConversionManager;
 use OCP\Files\IMimeTypeDetector;
 use OCP\Files\IMimeTypeLoader;
 use OCP\Files\IRootFolder;
@@ -789,6 +791,7 @@ class Server extends ServerContainer implements IServerContainer {
 				$c->get(ICacheFactory::class),
 				$c->get(IEventDispatcher::class),
 				$c->get(LoggerInterface::class),
+				$c->get(ServerVersion::class),
 			);
 		});
 		$this->registerAlias(IAppManager::class, AppManager::class);
@@ -1258,6 +1261,8 @@ class Server extends ServerContainer implements IServerContainer {
 
 		$this->registerAlias(ITranslationManager::class, TranslationManager::class);
 
+		$this->registerAlias(IConversionManager::class, ConversionManager::class);
+
 		$this->registerAlias(ISpeechToTextManager::class, SpeechToTextManager::class);
 
 		$this->registerAlias(IEventSourceFactory::class, EventSourceFactory::class);
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index 219f3d86380..a84481730c4 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -21,6 +21,7 @@ use OCP\Files\Mount\IShareOwnerlessMount;
 use OCP\Files\Node;
 use OCP\Files\NotFoundException;
 use OCP\HintException;
+use OCP\IAppConfig;
 use OCP\IConfig;
 use OCP\IDateTimeZone;
 use OCP\IGroupManager;
@@ -34,6 +35,7 @@ use OCP\Mail\IMailer;
 use OCP\Security\Events\ValidatePasswordPolicyEvent;
 use OCP\Security\IHasher;
 use OCP\Security\ISecureRandom;
+use OCP\Security\PasswordContext;
 use OCP\Share;
 use OCP\Share\Events\BeforeShareDeletedEvent;
 use OCP\Share\Events\ShareAcceptedEvent;
@@ -43,6 +45,7 @@ use OCP\Share\Events\ShareDeletedFromSelfEvent;
 use OCP\Share\Exceptions\AlreadySharedException;
 use OCP\Share\Exceptions\GenericShareException;
 use OCP\Share\Exceptions\ShareNotFound;
+use OCP\Share\Exceptions\ShareTokenException;
 use OCP\Share\IManager;
 use OCP\Share\IProviderFactory;
 use OCP\Share\IShare;
@@ -78,6 +81,7 @@ class Manager implements IManager {
 		private KnownUserService $knownUserService,
 		private ShareDisableChecker $shareDisableChecker,
 		private IDateTimeZone $dateTimeZone,
+		private IAppConfig $appConfig,
 	) {
 		$this->l = $this->l10nFactory->get('lib');
 		// The constructor of LegacyHooks registers the listeners of share events
@@ -113,7 +117,8 @@ class Manager implements IManager {
 
 		// Let others verify the password
 		try {
-			$this->dispatcher->dispatchTyped(new ValidatePasswordPolicyEvent($password));
+			$event = new ValidatePasswordPolicyEvent($password, PasswordContext::SHARING);
+			$this->dispatcher->dispatchTyped($event);
 		} catch (HintException $e) {
 			/* Wrap in a 400 bad request error */
 			throw new HintException($e->getMessage(), $e->getHint(), 400, $e);
@@ -212,6 +217,17 @@ class Manager implements IManager {
 			throw new \InvalidArgumentException($this->l->t('Valid permissions are required for sharing'));
 		}
 
+		// Permissions must be valid
+		if ($share->getPermissions() < 0 || $share->getPermissions() > \OCP\Constants::PERMISSION_ALL) {
+			throw new \InvalidArgumentException($this->l->t('Valid permissions are required for sharing'));
+		}
+
+		// Single file shares should never have delete or create permissions
+		if (($share->getNode() instanceof File)
+			&& (($share->getPermissions() & (\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_DELETE)) !== 0)) {
+			throw new \InvalidArgumentException($this->l->t('File shares cannot have create or delete permissions'));
+		}
+
 		$permissions = 0;
 		$nodesForUser = $userFolder->getById($share->getNodeId());
 		foreach ($nodesForUser as $node) {
@@ -659,41 +675,7 @@ class Manager implements IManager {
 				$this->linkCreateChecks($share);
 				$this->setLinkParent($share);
 
-				// Initial token length
-				$tokenLength = \OC\Share\Helper::getTokenLength();
-
-				do {
-					$tokenExists = false;
-
-					for ($i = 0; $i <= 2; $i++) {
-						// Generate a new token
-						$token = $this->secureRandom->generate(
-							$tokenLength,
-							\OCP\Security\ISecureRandom::CHAR_HUMAN_READABLE
-						);
-
-						try {
-							// Try to fetch a share with the generated token
-							$this->getShareByToken($token);
-							$tokenExists = true; // Token exists, we need to try again
-						} catch (\OCP\Share\Exceptions\ShareNotFound $e) {
-							// Token is unique, exit the loop
-							$tokenExists = false;
-							break;
-						}
-					}
-
-					// If we've reached the maximum attempts and the token still exists, increase the token length
-					if ($tokenExists) {
-						$tokenLength++;
-
-						// Check if the token length exceeds the maximum allowed length
-						if ($tokenLength > \OC\Share\Constants::MAX_TOKEN_LENGTH) {
-							throw new \Exception('Unable to generate a unique share token. Maximum token length exceeded.');
-						}
-					}
-				} while ($tokenExists);
-
+				$token = $this->generateToken();
 				// Set the unique token
 				$share->setToken($token);
 
@@ -1493,15 +1475,6 @@ class Manager implements IManager {
 			$this->deleteShare($share);
 			throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
 		}
-
-		try {
-			$share->getNode();
-			// Ignore share, file is still accessible
-		} catch (NotFoundException) {
-			// Access lost, but maybe only temporarily, so don't delete the share right away
-			throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
-		}
-
 		if ($this->config->getAppValue('files_sharing', 'hide_disabled_user_shares', 'no') === 'yes') {
 			$uids = array_unique([$share->getShareOwner(),$share->getSharedBy()]);
 			foreach ($uids as $uid) {
@@ -1939,6 +1912,10 @@ class Manager implements IManager {
 		return $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no') === 'yes';
 	}
 
+	public function allowCustomTokens(): bool {
+		return $this->appConfig->getValueBool('core', 'shareapi_allow_custom_tokens', false);
+	}
+
 	public function currentUserCanEnumerateTargetUser(?IUser $currentUser, IUser $targetUser): bool {
 		if ($this->allowEnumerationFullMatch()) {
 			return true;
@@ -2025,4 +2002,43 @@ class Manager implements IManager {
 			yield from $provider->getAllShares();
 		}
 	}
+
+	public function generateToken(): string {
+		// Initial token length
+		$tokenLength = \OC\Share\Helper::getTokenLength();
+
+		do {
+			$tokenExists = false;
+
+			for ($i = 0; $i <= 2; $i++) {
+				// Generate a new token
+				$token = $this->secureRandom->generate(
+					$tokenLength,
+					ISecureRandom::CHAR_HUMAN_READABLE,
+				);
+
+				try {
+					// Try to fetch a share with the generated token
+					$this->getShareByToken($token);
+					$tokenExists = true; // Token exists, we need to try again
+				} catch (ShareNotFound $e) {
+					// Token is unique, exit the loop
+					$tokenExists = false;
+					break;
+				}
+			}
+
+			// If we've reached the maximum attempts and the token still exists, increase the token length
+			if ($tokenExists) {
+				$tokenLength++;
+
+				// Check if the token length exceeds the maximum allowed length
+				if ($tokenLength > \OC\Share\Constants::MAX_TOKEN_LENGTH) {
+					throw new ShareTokenException('Unable to generate a unique share token. Maximum token length exceeded.');
+				}
+			}
+		} while ($tokenExists);
+
+		return $token;
+	}
 }
diff --git a/lib/private/Share20/Share.php b/lib/private/Share20/Share.php
index c1c13c77fa4..466817efc9a 100644
--- a/lib/private/Share20/Share.php
+++ b/lib/private/Share20/Share.php
@@ -66,14 +66,13 @@ class Share implements IShare {
 	private $shareTime;
 	/** @var bool */
 	private $mailSend;
-	/** @var string */
-	private $label = '';
 	/** @var ICacheEntry|null */
 	private $nodeCacheEntry;
 	/** @var bool */
 	private $hideDownload = false;
 	private bool $reminderSent = false;
 
+	private string $label = '';
 	private bool $noExpirationDate = false;
 
 	public function __construct(
diff --git a/lib/private/Support/Subscription/Registry.php b/lib/private/Support/Subscription/Registry.php
index 3d3daa97abb..5eed6885f78 100644
--- a/lib/private/Support/Subscription/Registry.php
+++ b/lib/private/Support/Subscription/Registry.php
@@ -8,7 +8,6 @@ declare(strict_types=1);
  */
 namespace OC\Support\Subscription;
 
-use OC\User\Backend;
 use OCP\AppFramework\QueryException;
 use OCP\IConfig;
 use OCP\IGroupManager;
@@ -19,8 +18,6 @@ use OCP\Support\Subscription\Exception\AlreadyRegisteredException;
 use OCP\Support\Subscription\IRegistry;
 use OCP\Support\Subscription\ISubscription;
 use OCP\Support\Subscription\ISupportedApps;
-use OCP\User\Backend\ICountMappedUsersBackend;
-use OCP\User\Backend\ICountUsersBackend;
 use Psr\Log\LoggerInterface;
 
 class Registry implements IRegistry {
@@ -167,22 +164,8 @@ class Registry implements IRegistry {
 	}
 
 	private function getUserCount(): int {
-		$userCount = 0;
-		$backends = $this->userManager->getBackends();
-		foreach ($backends as $backend) {
-			if ($backend instanceof ICountMappedUsersBackend) {
-				$userCount += $backend->countMappedUsers();
-			} elseif ($backend->implementsActions(Backend::COUNT_USERS)) {
-				/** @var ICountUsersBackend $backend */
-				$backendUsers = $backend->countUsers();
-				if ($backendUsers !== false) {
-					$userCount += $backendUsers;
-				} else {
-					// TODO what if the user count can't be determined?
-					$this->logger->warning('Can not determine user count for ' . get_class($backend), ['app' => 'lib']);
-				}
-			}
-		}
+		/* We cannot limit because we substract disabled users afterward. But we limit to mapped users so should be not too expensive. */
+		$userCount = (int)$this->userManager->countUsersTotal(0, true);
 
 		$disabledUsers = $this->config->getUsersForUserValue('core', 'enabled', 'false');
 		$disabledUsersCount = count($disabledUsers);
diff --git a/lib/private/SystemTag/ManagerFactory.php b/lib/private/SystemTag/ManagerFactory.php
index 0fd2ca5fd36..4d3a1396529 100644
--- a/lib/private/SystemTag/ManagerFactory.php
+++ b/lib/private/SystemTag/ManagerFactory.php
@@ -9,7 +9,11 @@ declare(strict_types=1);
 namespace OC\SystemTag;
 
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\IAppConfig;
+use OCP\IDBConnection;
+use OCP\IGroupManager;
 use OCP\IServerContainer;
+use OCP\IUserSession;
 use OCP\SystemTag\ISystemTagManager;
 use OCP\SystemTag\ISystemTagManagerFactory;
 use OCP\SystemTag\ISystemTagObjectMapper;
@@ -36,9 +40,11 @@ class ManagerFactory implements ISystemTagManagerFactory {
 	 */
 	public function getManager(): ISystemTagManager {
 		return new SystemTagManager(
-			$this->serverContainer->getDatabaseConnection(),
-			$this->serverContainer->getGroupManager(),
+			$this->serverContainer->get(IDBConnection::class),
+			$this->serverContainer->get(IGroupManager::class),
 			$this->serverContainer->get(IEventDispatcher::class),
+			$this->serverContainer->get(IUserSession::class),
+			$this->serverContainer->get(IAppConfig::class),
 		);
 	}
 
@@ -50,7 +56,7 @@ class ManagerFactory implements ISystemTagManagerFactory {
 	 */
 	public function getObjectMapper(): ISystemTagObjectMapper {
 		return new SystemTagObjectMapper(
-			$this->serverContainer->getDatabaseConnection(),
+			$this->serverContainer->get(IDBConnection::class),
 			$this->getManager(),
 			$this->serverContainer->get(IEventDispatcher::class),
 		);
diff --git a/lib/private/SystemTag/SystemTagManager.php b/lib/private/SystemTag/SystemTagManager.php
index 4f05d40c34c..7979b3916f1 100644
--- a/lib/private/SystemTag/SystemTagManager.php
+++ b/lib/private/SystemTag/SystemTagManager.php
@@ -11,13 +11,16 @@ namespace OC\SystemTag;
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\IAppConfig;
 use OCP\IDBConnection;
 use OCP\IGroupManager;
 use OCP\IUser;
+use OCP\IUserSession;
 use OCP\SystemTag\ISystemTag;
 use OCP\SystemTag\ISystemTagManager;
 use OCP\SystemTag\ManagerEvent;
 use OCP\SystemTag\TagAlreadyExistsException;
+use OCP\SystemTag\TagCreationForbiddenException;
 use OCP\SystemTag\TagNotFoundException;
 
 /**
@@ -36,6 +39,8 @@ class SystemTagManager implements ISystemTagManager {
 		protected IDBConnection $connection,
 		protected IGroupManager $groupManager,
 		protected IEventDispatcher $dispatcher,
+		private IUserSession $userSession,
+		private IAppConfig $appConfig,
 	) {
 		$query = $this->connection->getQueryBuilder();
 		$this->selectTagQuery = $query->select('*')
@@ -145,6 +150,10 @@ class SystemTagManager implements ISystemTagManager {
 	}
 
 	public function createTag(string $tagName, bool $userVisible, bool $userAssignable): ISystemTag {
+		$user = $this->userSession->getUser();
+		if (!$this->canUserCreateTag($user)) {
+			throw new TagCreationForbiddenException('Tag creation forbidden');
+		}
 		// Length of name column is 64
 		$truncatedTagName = substr($tagName, 0, 64);
 		$query = $this->connection->getQueryBuilder();
@@ -199,6 +208,7 @@ class SystemTagManager implements ISystemTagManager {
 
 		$beforeUpdate = array_shift($tags);
 		// Length of name column is 64
+		$newName = trim($newName);
 		$truncatedNewName = substr($newName, 0, 64);
 		$afterUpdate = new SystemTag(
 			$tagId,
@@ -319,6 +329,19 @@ class SystemTagManager implements ISystemTagManager {
 		return false;
 	}
 
+	public function canUserCreateTag(?IUser $user): bool {
+		if ($user === null) {
+			// If no user given, allows only calls from CLI
+			return \OC::$CLI;
+		}
+
+		if ($this->appConfig->getValueBool('systemtags', 'restrict_creation_to_admin', false) === false) {
+			return true;
+		}
+
+		return $this->groupManager->isAdmin($user->getUID());
+	}
+
 	public function canUserSeeTag(ISystemTag $tag, ?IUser $user): bool {
 		// If no user, then we only show public tags
 		if (!$user && $tag->getAccessLevel() === ISystemTag::ACCESS_LEVEL_PUBLIC) {
diff --git a/lib/private/TaskProcessing/Manager.php b/lib/private/TaskProcessing/Manager.php
index e2047be9c2c..cb2434422aa 100644
--- a/lib/private/TaskProcessing/Manager.php
+++ b/lib/private/TaskProcessing/Manager.php
@@ -31,6 +31,8 @@ use OCP\Files\Node;
 use OCP\Files\NotPermittedException;
 use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\Http\Client\IClientService;
+use OCP\ICache;
+use OCP\ICacheFactory;
 use OCP\IConfig;
 use OCP\IL10N;
 use OCP\IServerContainer;
@@ -77,6 +79,11 @@ class Manager implements IManager {
 	private ?array $availableTaskTypes = null;
 
 	private IAppData $appData;
+	private ?array $preferences = null;
+	private ?array $providersById = null;
+	private ICache $cache;
+	private ICache $distributedCache;
+
 	public function __construct(
 		private IConfig $config,
 		private Coordinator $coordinator,
@@ -91,8 +98,11 @@ class Manager implements IManager {
 		private IUserMountCache $userMountCache,
 		private IClientService $clientService,
 		private IAppManager $appManager,
+		ICacheFactory $cacheFactory,
 	) {
 		$this->appData = $appDataFactory->get('core');
+		$this->cache = $cacheFactory->createLocal('task_processing::');
+		$this->distributedCache = $cacheFactory->createDistributed('task_processing::');
 	}
 
 
@@ -582,10 +592,10 @@ class Manager implements IManager {
 			foreach ($taskTypes as $taskType) {
 				$taskTypeSettings[$taskType->getId()] = false;
 			};
-			
+
 			return $taskTypeSettings;
 		}
-		
+
 	}
 
 	/**
@@ -725,12 +735,23 @@ class Manager implements IManager {
 
 	public function getPreferredProvider(string $taskTypeId) {
 		try {
-			$preferences = json_decode($this->config->getAppValue('core', 'ai.taskprocessing_provider_preferences', 'null'), associative: true, flags: JSON_THROW_ON_ERROR);
+			if ($this->preferences === null) {
+				$this->preferences = $this->distributedCache->get('ai.taskprocessing_provider_preferences');
+				if ($this->preferences === null) {
+					$this->preferences = json_decode($this->config->getAppValue('core', 'ai.taskprocessing_provider_preferences', 'null'), associative: true, flags: JSON_THROW_ON_ERROR);
+					$this->distributedCache->set('ai.taskprocessing_provider_preferences', $this->preferences, 60 * 3);
+				}
+			}
+
 			$providers = $this->getProviders();
-			if (isset($preferences[$taskTypeId])) {
-				$provider = current(array_values(array_filter($providers, fn ($provider) => $provider->getId() === $preferences[$taskTypeId])));
-				if ($provider !== false) {
-					return $provider;
+			if (isset($this->preferences[$taskTypeId])) {
+				$providersById = $this->providersById ?? array_reduce($providers, static function (array $carry, IProvider $provider) {
+					$carry[$provider->getId()] = $provider;
+					return $carry;
+				}, []);
+				$this->providersById = $providersById;
+				if (isset($providersById[$this->preferences[$taskTypeId]])) {
+					return $providersById[$this->preferences[$taskTypeId]];
 				}
 			}
 			// By default, use the first available provider
@@ -746,6 +767,10 @@ class Manager implements IManager {
 	}
 
 	public function getAvailableTaskTypes(bool $showDisabled = false): array {
+		if ($this->availableTaskTypes === null) {
+			// We use local cache only because distributed cache uses JSOn stringify which would botch our ShapeDescriptor objects
+			$this->availableTaskTypes = $this->cache->get('available_task_types');
+		}
 		// Either we have no cache or showDisabled is turned on, which we don't want to cache, ever.
 		if ($this->availableTaskTypes === null || $showDisabled) {
 			$taskTypes = $this->_getTaskTypes();
@@ -787,6 +812,7 @@ class Manager implements IManager {
 			}
 
 			$this->availableTaskTypes = $availableTaskTypes;
+			$this->cache->set('available_task_types', $this->availableTaskTypes, 60);
 		}
 
 
@@ -973,7 +999,7 @@ class Manager implements IManager {
 				$task->setEndedAt(time());
 				$error = 'The task was processed successfully but the provider\'s output doesn\'t pass validation against the task type\'s outputShape spec and/or the provider\'s own optionalOutputShape spec';
 				$task->setErrorMessage($error);
-				$this->logger->error($error, ['exception' => $e]);
+				$this->logger->error($error . ' Output was: ' . var_export($result, true), ['exception' => $e]);
 			} catch (NotPermittedException $e) {
 				$task->setProgress(1);
 				$task->setStatus(Task::STATUS_FAILED);
@@ -990,7 +1016,11 @@ class Manager implements IManager {
 				$this->logger->error($error, ['exception' => $e]);
 			}
 		}
-		$taskEntity = \OC\TaskProcessing\Db\Task::fromPublicTask($task);
+		try {
+			$taskEntity = \OC\TaskProcessing\Db\Task::fromPublicTask($task);
+		} catch (\JsonException $e) {
+			throw new \OCP\TaskProcessing\Exception\Exception('The task was processed successfully but the provider\'s output could not be encoded as JSON for the database.', 0, $e);
+		}
 		try {
 			$this->taskMapper->update($taskEntity);
 			$this->runWebhook($task);
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index 2bc9ff5a2af..e52ef702ad3 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -158,6 +158,14 @@ class TemplateLayout extends \OC_Template {
 			$this->assign('appid', $appId);
 			$this->assign('bodyid', 'body-public');
 
+			// Set body data-theme
+			$this->assign('enabledThemes', []);
+			if ($this->appManager->isEnabledForUser('theming') && class_exists('\OCA\Theming\Service\ThemesService')) {
+				/** @var \OCA\Theming\Service\ThemesService $themesService */
+				$themesService = \OC::$server->get(\OCA\Theming\Service\ThemesService::class);
+				$this->assign('enabledThemes', $themesService->getEnabledThemes());
+			}
+
 			// Set logo link target
 			$logoUrl = $this->config->getSystemValueString('logo_url', '');
 			$this->assign('logoUrl', $logoUrl);
@@ -296,12 +304,7 @@ class TemplateLayout extends \OC_Template {
 		$this->assign('id-app-navigation', $renderAs === TemplateResponse::RENDER_AS_USER ? '#app-navigation' : null);
 	}
 
-	/**
-	 * @param string $path
-	 * @param string $file
-	 * @return string
-	 */
-	protected function getVersionHashSuffix($path = false, $file = false) {
+	protected function getVersionHashSuffix(string $path = '', string $file = ''): string {
 		if ($this->config->getSystemValueBool('debug', false)) {
 			// allows chrome workspace mapping in debug mode
 			return '';
@@ -314,11 +317,11 @@ class TemplateLayout extends \OC_Template {
 
 		$hash = false;
 		// Try the web-root first
-		if (is_string($path) && $path !== '') {
+		if ($path !== '') {
 			$hash = $this->getVersionHashByPath($path);
 		}
 		// If not found try the file
-		if ($hash === false && is_string($file) && $file !== '') {
+		if ($hash === false && $file !== '') {
 			$hash = $this->getVersionHashByPath($file);
 		}
 		// As a last resort we use the server version hash
@@ -341,13 +344,18 @@ class TemplateLayout extends \OC_Template {
 				return false;
 			}
 
-			$appVersion = $this->appManager->getAppVersion($appId);
-			// For shipped apps the app version is not a single source of truth, we rather also need to consider the Nextcloud version
-			if ($this->appManager->isShipped($appId)) {
-				$appVersion .= '-' . self::$versionHash;
-			}
+			if ($appId === 'core') {
+				// core is not a real app but the server itself
+				$hash = self::$versionHash;
+			} else {
+				$appVersion = $this->appManager->getAppVersion($appId);
+				// For shipped apps the app version is not a single source of truth, we rather also need to consider the Nextcloud version
+				if ($this->appManager->isShipped($appId)) {
+					$appVersion .= '-' . self::$versionHash;
+				}
 
-			$hash = substr(md5($appVersion), 0, 8);
+				$hash = substr(md5($appVersion), 0, 8);
+			}
 			self::$cacheBusterCache[$path] = $hash;
 		}
 
@@ -368,7 +376,7 @@ class TemplateLayout extends \OC_Template {
 
 	/**
 	 * @param string $path
-	 * @return string|boolean
+	 * @return string|false
 	 */
 	public function getAppNamefromPath($path) {
 		if ($path !== '' && is_string($path)) {
@@ -376,6 +384,8 @@ class TemplateLayout extends \OC_Template {
 			if ($pathParts[0] === 'css') {
 				// This is a scss request
 				return $pathParts[1];
+			} elseif ($pathParts[0] === 'core') {
+				return 'core';
 			}
 			return end($pathParts);
 		}
diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php
index d2ec835a25d..d82a3be81e5 100644
--- a/lib/private/User/Database.php
+++ b/lib/private/User/Database.php
@@ -17,11 +17,11 @@ use OCP\Security\Events\ValidatePasswordPolicyEvent;
 use OCP\Security\IHasher;
 use OCP\User\Backend\ABackend;
 use OCP\User\Backend\ICheckPasswordBackend;
-use OCP\User\Backend\ICountUsersBackend;
 use OCP\User\Backend\ICreateUserBackend;
 use OCP\User\Backend\IGetDisplayNameBackend;
 use OCP\User\Backend\IGetHomeBackend;
 use OCP\User\Backend\IGetRealUIDBackend;
+use OCP\User\Backend\ILimitAwareCountUsersBackend;
 use OCP\User\Backend\IPasswordHashBackend;
 use OCP\User\Backend\ISearchKnownUsersBackend;
 use OCP\User\Backend\ISetDisplayNameBackend;
@@ -37,7 +37,7 @@ class Database extends ABackend implements
 	IGetDisplayNameBackend,
 	ICheckPasswordBackend,
 	IGetHomeBackend,
-	ICountUsersBackend,
+	ILimitAwareCountUsersBackend,
 	ISearchKnownUsersBackend,
 	IGetRealUIDBackend,
 	IPasswordHashBackend {
@@ -463,10 +463,8 @@ class Database extends ABackend implements
 
 	/**
 	 * counts the users in the database
-	 *
-	 * @return int|false
 	 */
-	public function countUsers() {
+	public function countUsers(int $limit = 0): int|false {
 		$this->fixDI();
 
 		$query = $this->dbConn->getQueryBuilder();
diff --git a/lib/private/User/LazyUser.php b/lib/private/User/LazyUser.php
index 92a0c735215..9eb5f9afb25 100644
--- a/lib/private/User/LazyUser.php
+++ b/lib/private/User/LazyUser.php
@@ -60,11 +60,15 @@ class LazyUser implements IUser {
 		return $this->getUser()->setDisplayName($displayName);
 	}
 
-	public function getLastLogin() {
+	public function getLastLogin(): int {
 		return $this->getUser()->getLastLogin();
 	}
 
-	public function updateLastLoginTimestamp() {
+	public function getFirstLogin(): int {
+		return $this->getUser()->getFirstLogin();
+	}
+
+	public function updateLastLoginTimestamp(): bool {
 		return $this->getUser()->updateLastLoginTimestamp();
 	}
 
diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php
index 7f5b06cc5f6..aa2acb55782 100644
--- a/lib/private/User/Manager.php
+++ b/lib/private/User/Manager.php
@@ -24,8 +24,10 @@ use OCP\L10N\IFactory;
 use OCP\Server;
 use OCP\Support\Subscription\IAssertion;
 use OCP\User\Backend\ICheckPasswordBackend;
+use OCP\User\Backend\ICountMappedUsersBackend;
 use OCP\User\Backend\ICountUsersBackend;
 use OCP\User\Backend\IGetRealUIDBackend;
+use OCP\User\Backend\ILimitAwareCountUsersBackend;
 use OCP\User\Backend\IProvideEnabledStateBackend;
 use OCP\User\Backend\ISearchKnownUsersBackend;
 use OCP\User\Events\BeforeUserCreatedEvent;
@@ -488,6 +490,36 @@ class Manager extends PublicEmitter implements IUserManager {
 		return $userCountStatistics;
 	}
 
+	public function countUsersTotal(int $limit = 0, bool $onlyMappedUsers = false): int|false {
+		$userCount = false;
+
+		foreach ($this->backends as $backend) {
+			if ($onlyMappedUsers && $backend instanceof ICountMappedUsersBackend) {
+				$backendUsers = $backend->countMappedUsers();
+			} elseif ($backend instanceof ILimitAwareCountUsersBackend) {
+				$backendUsers = $backend->countUsers($limit);
+			} elseif ($backend instanceof ICountUsersBackend || $backend->implementsActions(Backend::COUNT_USERS)) {
+				/** @var ICountUsersBackend $backend */
+				$backendUsers = $backend->countUsers();
+			} else {
+				$this->logger->debug('Skip backend for user count: ' . get_class($backend));
+				continue;
+			}
+			if ($backendUsers !== false) {
+				$userCount = (int)$userCount + $backendUsers;
+				if ($limit > 0) {
+					if ($userCount >= $limit) {
+						break;
+					}
+					$limit -= $userCount;
+				}
+			} else {
+				$this->logger->warning('Can not determine user count for ' . get_class($backend));
+			}
+		}
+		return $userCount;
+	}
+
 	/**
 	 * returns how many users per backend exist in the requested groups (if supported by backend)
 	 *
diff --git a/lib/private/User/User.php b/lib/private/User/User.php
index 4b1ec4366d0..3d5c13d4431 100644
--- a/lib/private/User/User.php
+++ b/lib/private/User/User.php
@@ -65,8 +65,8 @@ class User implements IUser {
 	/** @var string */
 	private $home;
 
-	/** @var int|null */
-	private $lastLogin;
+	private ?int $lastLogin = null;
+	private ?int $firstLogin = null;
 
 	/** @var IAvatarManager */
 	private $avatarManager;
@@ -202,28 +202,47 @@ class User implements IUser {
 	/**
 	 * returns the timestamp of the user's last login or 0 if the user did never
 	 * login
-	 *
-	 * @return int
 	 */
-	public function getLastLogin() {
+	public function getLastLogin(): int {
 		if ($this->lastLogin === null) {
 			$this->lastLogin = (int)$this->config->getUserValue($this->uid, 'login', 'lastLogin', 0);
 		}
-		return (int)$this->lastLogin;
+		return $this->lastLogin;
+	}
+
+	/**
+	 * returns the timestamp of the user's last login or 0 if the user did never
+	 * login
+	 */
+	public function getFirstLogin(): int {
+		if ($this->firstLogin === null) {
+			$this->firstLogin = (int)$this->config->getUserValue($this->uid, 'login', 'firstLogin', 0);
+		}
+		return $this->firstLogin;
 	}
 
 	/**
 	 * updates the timestamp of the most recent login of this user
 	 */
-	public function updateLastLoginTimestamp() {
+	public function updateLastLoginTimestamp(): bool {
 		$previousLogin = $this->getLastLogin();
+		$firstLogin = $this->getFirstLogin();
 		$now = time();
 		$firstTimeLogin = $previousLogin === 0;
 
 		if ($now - $previousLogin > 60) {
-			$this->lastLogin = time();
-			$this->config->setUserValue(
-				$this->uid, 'login', 'lastLogin', (string)$this->lastLogin);
+			$this->lastLogin = $now;
+			$this->config->setUserValue($this->uid, 'login', 'lastLogin', (string)$this->lastLogin);
+		}
+
+		if ($firstLogin === 0) {
+			if ($firstTimeLogin) {
+				$this->firstLogin = $now;
+			} else {
+				/* Unknown first login, most likely was before upgrade to Nextcloud 31 */
+				$this->firstLogin = -1;
+			}
+			$this->config->setUserValue($this->uid, 'login', 'firstLogin', (string)$this->firstLogin);
 		}
 
 		return $firstTimeLogin;
diff --git a/lib/public/AppFramework/Bootstrap/IRegistrationContext.php b/lib/public/AppFramework/Bootstrap/IRegistrationContext.php
index 8a18ec8ae9d..011d1520414 100644
--- a/lib/public/AppFramework/Bootstrap/IRegistrationContext.php
+++ b/lib/public/AppFramework/Bootstrap/IRegistrationContext.php
@@ -415,6 +415,19 @@ interface IRegistrationContext {
 	public function registerTaskProcessingTaskType(string $taskProcessingTaskTypeClass): void;
 
 	/**
+	 * Register an implementation of \OCP\Files\Conversion\IConversionProvider
+	 * that will handle the conversion of files from one MIME type to another
+	 *
+	 * @param string $class
+	 * @psalm-param class-string<\OCP\Files\Conversion\IConversionProvider> $class
+	 *
+	 * @return void
+	 *
+	 * @since 31.0.0
+	 */
+	public function registerFileConversionProvider(string $class): void;
+
+	/**
 	 * Register a mail provider
 	 *
 	 * @param string $class
diff --git a/lib/public/AppFramework/Db/Entity.php b/lib/public/AppFramework/Db/Entity.php
index d90d3ed4837..a44a9a8bced 100644
--- a/lib/public/AppFramework/Db/Entity.php
+++ b/lib/public/AppFramework/Db/Entity.php
@@ -215,7 +215,7 @@ abstract class Entity {
 	 * @return string the property name
 	 * @since 7.0.0
 	 */
-	public function columnToProperty(string $columnName): string {
+	public function columnToProperty(string $columnName) {
 		$parts = explode('_', $columnName);
 		$property = '';
 
diff --git a/lib/public/AppFramework/Http/Attribute/CORS.php b/lib/public/AppFramework/Http/Attribute/CORS.php
index 2c3eac362cf..ff639635635 100644
--- a/lib/public/AppFramework/Http/Attribute/CORS.php
+++ b/lib/public/AppFramework/Http/Attribute/CORS.php
@@ -12,7 +12,9 @@ namespace OCP\AppFramework\Http\Attribute;
 use Attribute;
 
 /**
- * Attribute for controller methods that can also be accessed by not logged-in user
+ * Attribute for controller methods that can also be accessed by other websites.
+ * See https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS for an explanation of the functionality and the security implications.
+ * See https://docs.nextcloud.com/server/latest/developer_manual/digging_deeper/rest_apis.html on how to implement it in your controller.
  *
  * @since 27.0.0
  */
diff --git a/lib/public/AppFramework/Http/DataDisplayResponse.php b/lib/public/AppFramework/Http/DataDisplayResponse.php
index 889c57a7901..e1ded910328 100644
--- a/lib/public/AppFramework/Http/DataDisplayResponse.php
+++ b/lib/public/AppFramework/Http/DataDisplayResponse.php
@@ -13,9 +13,9 @@ use OCP\AppFramework\Http;
  * Class DataDisplayResponse
  *
  * @since 8.1.0
- * @template S of int
+ * @template S of Http::STATUS_*
  * @template H of array<string, mixed>
- * @template-extends Response<int, array<string, mixed>>
+ * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class DataDisplayResponse extends Response {
 	/**
diff --git a/lib/public/AppFramework/Http/DataDownloadResponse.php b/lib/public/AppFramework/Http/DataDownloadResponse.php
index 80100137c48..ee6bcf0d0c5 100644
--- a/lib/public/AppFramework/Http/DataDownloadResponse.php
+++ b/lib/public/AppFramework/Http/DataDownloadResponse.php
@@ -13,10 +13,10 @@ use OCP\AppFramework\Http;
  * Class DataDownloadResponse
  *
  * @since 8.0.0
- * @template S of int
+ * @template S of Http::STATUS_*
  * @template C of string
  * @template H of array<string, mixed>
- * @template-extends DownloadResponse<int, string, array<string, mixed>>
+ * @template-extends DownloadResponse<Http::STATUS_*, string, array<string, mixed>>
  */
 class DataDownloadResponse extends DownloadResponse {
 	/**
diff --git a/lib/public/AppFramework/Http/DataResponse.php b/lib/public/AppFramework/Http/DataResponse.php
index 2ebb66f9e73..2b54ce848ef 100644
--- a/lib/public/AppFramework/Http/DataResponse.php
+++ b/lib/public/AppFramework/Http/DataResponse.php
@@ -14,10 +14,10 @@ use OCP\AppFramework\Http;
  * for responders to transform
  * @since 8.0.0
  * @psalm-type DataResponseType = array|int|float|string|bool|object|null|\stdClass|\JsonSerializable
- * @template S of int
+ * @template S of Http::STATUS_*
  * @template-covariant T of DataResponseType
  * @template H of array<string, mixed>
- * @template-extends Response<int, array<string, mixed>>
+ * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class DataResponse extends Response {
 	/**
diff --git a/lib/public/AppFramework/Http/DownloadResponse.php b/lib/public/AppFramework/Http/DownloadResponse.php
index 058b3070297..190de022d36 100644
--- a/lib/public/AppFramework/Http/DownloadResponse.php
+++ b/lib/public/AppFramework/Http/DownloadResponse.php
@@ -12,10 +12,10 @@ use OCP\AppFramework\Http;
 /**
  * Prompts the user to download the a file
  * @since 7.0.0
- * @template S of int
+ * @template S of Http::STATUS_*
  * @template C of string
  * @template H of array<string, mixed>
- * @template-extends Response<int, array<string, mixed>>
+ * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class DownloadResponse extends Response {
 	/**
diff --git a/lib/public/AppFramework/Http/FileDisplayResponse.php b/lib/public/AppFramework/Http/FileDisplayResponse.php
index 0cc51f7c59f..fda160eafc5 100644
--- a/lib/public/AppFramework/Http/FileDisplayResponse.php
+++ b/lib/public/AppFramework/Http/FileDisplayResponse.php
@@ -13,9 +13,9 @@ use OCP\Files\SimpleFS\ISimpleFile;
  * Class FileDisplayResponse
  *
  * @since 11.0.0
- * @template S of int
+ * @template S of Http::STATUS_*
  * @template H of array<string, mixed>
- * @template-extends Response<int, array<string, mixed>>
+ * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class FileDisplayResponse extends Response implements ICallbackResponse {
 	/** @var File|ISimpleFile */
diff --git a/lib/public/AppFramework/Http/JSONResponse.php b/lib/public/AppFramework/Http/JSONResponse.php
index 1d2564afab0..efcf79d5e87 100644
--- a/lib/public/AppFramework/Http/JSONResponse.php
+++ b/lib/public/AppFramework/Http/JSONResponse.php
@@ -12,10 +12,10 @@ use OCP\AppFramework\Http;
 /**
  * A renderer for JSON calls
  * @since 6.0.0
- * @template S of int
+ * @template S of Http::STATUS_*
  * @template-covariant T of null|string|int|float|bool|array|\stdClass|\JsonSerializable
  * @template H of array<string, mixed>
- * @template-extends Response<int, array<string, mixed>>
+ * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class JSONResponse extends Response {
 	/**
diff --git a/lib/public/AppFramework/Http/NotFoundResponse.php b/lib/public/AppFramework/Http/NotFoundResponse.php
index 9ebefe69be1..137d1a26655 100644
--- a/lib/public/AppFramework/Http/NotFoundResponse.php
+++ b/lib/public/AppFramework/Http/NotFoundResponse.php
@@ -12,9 +12,9 @@ use OCP\AppFramework\Http;
 /**
  * A generic 404 response showing an 404 error page as well to the end-user
  * @since 8.1.0
- * @template S of int
+ * @template S of Http::STATUS_*
  * @template H of array<string, mixed>
- * @template-extends TemplateResponse<int, array<string, mixed>>
+ * @template-extends TemplateResponse<Http::STATUS_*, array<string, mixed>>
  */
 class NotFoundResponse extends TemplateResponse {
 	/**
diff --git a/lib/public/AppFramework/Http/RedirectResponse.php b/lib/public/AppFramework/Http/RedirectResponse.php
index 41fc4d83856..74847205976 100644
--- a/lib/public/AppFramework/Http/RedirectResponse.php
+++ b/lib/public/AppFramework/Http/RedirectResponse.php
@@ -12,9 +12,9 @@ use OCP\AppFramework\Http;
 /**
  * Redirects to a different URL
  * @since 7.0.0
- * @template S of int
+ * @template S of Http::STATUS_*
  * @template H of array<string, mixed>
- * @template-extends Response<int, array<string, mixed>>
+ * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class RedirectResponse extends Response {
 	private $redirectURL;
diff --git a/lib/public/AppFramework/Http/RedirectToDefaultAppResponse.php b/lib/public/AppFramework/Http/RedirectToDefaultAppResponse.php
index 3e2fcf6f6c7..1681b39ce50 100644
--- a/lib/public/AppFramework/Http/RedirectToDefaultAppResponse.php
+++ b/lib/public/AppFramework/Http/RedirectToDefaultAppResponse.php
@@ -16,9 +16,9 @@ use OCP\IURLGenerator;
  *
  * @since 16.0.0
  * @deprecated 23.0.0 Use RedirectResponse() with IURLGenerator::linkToDefaultPageUrl() instead
- * @template S of int
+ * @template S of Http::STATUS_*
  * @template H of array<string, mixed>
- * @template-extends RedirectResponse<int, array<string, mixed>>
+ * @template-extends RedirectResponse<Http::STATUS_*, array<string, mixed>>
  */
 class RedirectToDefaultAppResponse extends RedirectResponse {
 	/**
diff --git a/lib/public/AppFramework/Http/Response.php b/lib/public/AppFramework/Http/Response.php
index d1860402359..6fc3d4b98ea 100644
--- a/lib/public/AppFramework/Http/Response.php
+++ b/lib/public/AppFramework/Http/Response.php
@@ -18,7 +18,7 @@ use Psr\Log\LoggerInterface;
  *
  * It handles headers, HTTP status code, last modified and ETag.
  * @since 6.0.0
- * @template S of int
+ * @template S of Http::STATUS_*
  * @template H of array<string, mixed>
  */
 class Response {
diff --git a/lib/public/AppFramework/Http/StandaloneTemplateResponse.php b/lib/public/AppFramework/Http/StandaloneTemplateResponse.php
index f729bd772fb..244a6b80f9f 100644
--- a/lib/public/AppFramework/Http/StandaloneTemplateResponse.php
+++ b/lib/public/AppFramework/Http/StandaloneTemplateResponse.php
@@ -7,6 +7,8 @@ declare(strict_types=1);
  */
 namespace OCP\AppFramework\Http;
 
+use OCP\AppFramework\Http;
+
 /**
  * A template response that does not emit the loadAdditionalScripts events.
  *
@@ -14,9 +16,9 @@ namespace OCP\AppFramework\Http;
  * full nextcloud UI. Like the 2FA page, or the grant page in the login flow.
  *
  * @since 16.0.0
- * @template S of int
+ * @template S of Http::STATUS_*
  * @template H of array<string, mixed>
- * @template-extends TemplateResponse<int, array<string, mixed>>
+ * @template-extends TemplateResponse<Http::STATUS_*, array<string, mixed>>
  */
 class StandaloneTemplateResponse extends TemplateResponse {
 }
diff --git a/lib/public/AppFramework/Http/StreamResponse.php b/lib/public/AppFramework/Http/StreamResponse.php
index 1039e20e5c5..d0e6e3e148a 100644
--- a/lib/public/AppFramework/Http/StreamResponse.php
+++ b/lib/public/AppFramework/Http/StreamResponse.php
@@ -13,9 +13,9 @@ use OCP\AppFramework\Http;
  * Class StreamResponse
  *
  * @since 8.1.0
- * @template S of int
+ * @template S of Http::STATUS_*
  * @template H of array<string, mixed>
- * @template-extends Response<int, array<string, mixed>>
+ * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class StreamResponse extends Response implements ICallbackResponse {
 	/** @var string */
diff --git a/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php b/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php
index 1000f4db549..ef5d2f67f7e 100644
--- a/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php
+++ b/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php
@@ -15,8 +15,8 @@ use OCP\IInitialStateService;
  *
  * @since 14.0.0
  * @template H of array<string, mixed>
- * @template S of int
- * @template-extends TemplateResponse<int, array<string, mixed>>
+ * @template S of Http::STATUS_*
+ * @template-extends TemplateResponse<Http::STATUS_*, array<string, mixed>>
  */
 class PublicTemplateResponse extends TemplateResponse {
 	private $headerTitle = '';
diff --git a/lib/public/AppFramework/Http/TemplateResponse.php b/lib/public/AppFramework/Http/TemplateResponse.php
index 2c7567c080b..55b9f2b06af 100644
--- a/lib/public/AppFramework/Http/TemplateResponse.php
+++ b/lib/public/AppFramework/Http/TemplateResponse.php
@@ -13,9 +13,9 @@ use OCP\AppFramework\Http;
  * Response for a normal template
  * @since 6.0.0
  *
- * @template S of int
+ * @template S of Http::STATUS_*
  * @template H of array<string, mixed>
- * @template-extends Response<int, array<string, mixed>>
+ * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class TemplateResponse extends Response {
 	/**
diff --git a/lib/public/AppFramework/Http/TextPlainResponse.php b/lib/public/AppFramework/Http/TextPlainResponse.php
index e7c728c37ab..9dfa2c5544d 100644
--- a/lib/public/AppFramework/Http/TextPlainResponse.php
+++ b/lib/public/AppFramework/Http/TextPlainResponse.php
@@ -12,9 +12,9 @@ use OCP\AppFramework\Http;
 /**
  * A renderer for text responses
  * @since 22.0.0
- * @template S of int
+ * @template S of Http::STATUS_*
  * @template H of array<string, mixed>
- * @template-extends Response<int, array<string, mixed>>
+ * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class TextPlainResponse extends Response {
 	/** @var string */
diff --git a/lib/public/AppFramework/Http/TooManyRequestsResponse.php b/lib/public/AppFramework/Http/TooManyRequestsResponse.php
index b7b0a98c9e1..6b2ef5b1b90 100644
--- a/lib/public/AppFramework/Http/TooManyRequestsResponse.php
+++ b/lib/public/AppFramework/Http/TooManyRequestsResponse.php
@@ -13,9 +13,9 @@ use OCP\Template;
 /**
  * A generic 429 response showing an 404 error page as well to the end-user
  * @since 19.0.0
- * @template S of int
+ * @template S of Http::STATUS_*
  * @template H of array<string, mixed>
- * @template-extends Response<int, array<string, mixed>>
+ * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class TooManyRequestsResponse extends Response {
 	/**
diff --git a/lib/public/AppFramework/Http/ZipResponse.php b/lib/public/AppFramework/Http/ZipResponse.php
index 3b9e251d332..a552eb1294f 100644
--- a/lib/public/AppFramework/Http/ZipResponse.php
+++ b/lib/public/AppFramework/Http/ZipResponse.php
@@ -15,9 +15,9 @@ use OCP\IRequest;
  * Public library to send several files in one zip archive.
  *
  * @since 15.0.0
- * @template S of int
+ * @template S of Http::STATUS_*
  * @template H of array<string, mixed>
- * @template-extends Response<int, array<string, mixed>>
+ * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class ZipResponse extends Response implements ICallbackResponse {
 	/** @var array{internalName: string, resource: resource, size: int, time: int}[] Files to be added to the zip response */
diff --git a/lib/public/AppFramework/Services/IInitialState.php b/lib/public/AppFramework/Services/IInitialState.php
index 24698108d68..ac58bcad3cc 100644
--- a/lib/public/AppFramework/Services/IInitialState.php
+++ b/lib/public/AppFramework/Services/IInitialState.php
@@ -37,7 +37,7 @@ interface IInitialState {
 	 *
 	 * @param string $key
 	 * @param Closure $closure returns a primitive or an object that implements JsonSerializable
-	 * @psalm-param Closure():bool|Closure():int|Closure():float|Closure():string|Closure():\JsonSerializable $closure
+	 * @psalm-param Closure():bool|Closure():int|Closure():float|Closure():string|Closure():array|Closure():\JsonSerializable $closure
 	 */
 	public function provideLazyInitialState(string $key, Closure $closure): void;
 }
diff --git a/lib/public/Calendar/IAvailabilityResult.php b/lib/public/Calendar/IAvailabilityResult.php
new file mode 100644
index 00000000000..d437a5da047
--- /dev/null
+++ b/lib/public/Calendar/IAvailabilityResult.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCP\Calendar;
+
+/**
+ * DTO for the availability check results.
+ * Holds information about whether an attendee is available or not during the request time slot.
+ *
+ * @since 31.0.0
+ */
+interface IAvailabilityResult {
+	/**
+	 * Get the attendee's email address.
+	 *
+	 * @since 31.0.0
+	 */
+	public function getAttendeeEmail(): string;
+
+	/**
+	 * Whether the attendee is available during the requested time slot.
+	 *
+	 * @since 31.0.0
+	 */
+	public function isAvailable(): bool;
+}
diff --git a/lib/public/Calendar/ICalendarEventBuilder.php b/lib/public/Calendar/ICalendarEventBuilder.php
new file mode 100644
index 00000000000..8afc817a61e
--- /dev/null
+++ b/lib/public/Calendar/ICalendarEventBuilder.php
@@ -0,0 +1,110 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCP\Calendar;
+
+use DateTimeInterface;
+use InvalidArgumentException;
+use OCP\Calendar\Exceptions\CalendarException;
+
+/**
+ * The calendar event builder can be used to conveniently build a calendar event and then serialize
+ * it to a ICS string. The ICS string can be submitted to calendar instances implementing the
+ * {@see \OCP\Calendar\ICreateFromString} interface.
+ *
+ * Also note this class can not be injected directly with dependency injection.
+ * Instead, inject {@see \OCP\Calendar\IManager} and use
+ * {@see \OCP\Calendar\IManager::createEventBuilder()} afterwards.
+ *
+ * All setters return self to allow chaining method calls.
+ *
+ * @since 31.0.0
+ */
+interface ICalendarEventBuilder {
+	/**
+	 * Set the start date, time and time zone.
+	 * This property is required!
+	 *
+	 * @since 31.0.0
+	 */
+	public function setStartDate(DateTimeInterface $start): self;
+
+	/**
+	 * Set the end date, time and time zone.
+	 * This property is required!
+	 *
+	 * @since 31.0.0
+	 */
+	public function setEndDate(DateTimeInterface $end): self;
+
+	/**
+	 * Set the event summary or title.
+	 * This property is required!
+	 *
+	 * @since 31.0.0
+	 */
+	public function setSummary(string $summary): self;
+
+	/**
+	 * Set the event description.
+	 *
+	 * @since 31.0.0
+	 */
+	public function setDescription(string $description): self;
+
+	/**
+	 * Set the event location. It can either be a physical address or a URL.
+	 *
+	 * @since 31.0.0
+	 */
+	public function setLocation(string $location): self;
+
+	/**
+	 * Set the event organizer.
+	 * This property is required if attendees are added!
+	 *
+	 * The "mailto:" prefix is optional and will be added automatically if it is missing.
+	 *
+	 * @since 31.0.0
+	 */
+	public function setOrganizer(string $email, ?string $commonName = null): self;
+
+	/**
+	 * Add a new attendee to the event.
+	 * Adding at least one attendee requires also setting the organizer!
+	 *
+	 * The "mailto:" prefix is optional and will be added automatically if it is missing.
+	 *
+	 * @since 31.0.0
+	 */
+	public function addAttendee(string $email, ?string $commonName = null): self;
+
+	/**
+	 * Serialize the built event to an ICS string if all required properties set.
+	 *
+	 * @since 31.0.0
+	 *
+	 * @return string The serialized ICS string
+	 *
+	 * @throws InvalidArgumentException If required properties were not set
+	 */
+	public function toIcs(): string;
+
+	/**
+	 * Create the event in the given calendar.
+	 *
+	 * @since 31.0.0
+	 *
+	 * @return string The filename of the created event
+	 *
+	 * @throws InvalidArgumentException If required properties were not set
+	 * @throws CalendarException If writing the event to the calendar fails
+	 */
+	public function createInCalendar(ICreateFromString $calendar): string;
+}
diff --git a/lib/public/Calendar/IManager.php b/lib/public/Calendar/IManager.php
index bb3808f133c..124dc65f5f6 100644
--- a/lib/public/Calendar/IManager.php
+++ b/lib/public/Calendar/IManager.php
@@ -8,6 +8,9 @@ declare(strict_types=1);
  */
 namespace OCP\Calendar;
 
+use DateTimeInterface;
+use OCP\IUser;
+
 /**
  * This class provides access to the Nextcloud CalDAV backend.
  * Use this class exclusively if you want to access calendars.
@@ -157,4 +160,28 @@ interface IManager {
 	 * @since 25.0.0
 	 */
 	public function handleIMipCancel(string $principalUri, string $sender, ?string $replyTo, string $recipient, string $calendarData): bool;
+
+	/**
+	 * Create a new event builder instance. Please have a look at its documentation and the
+	 * \OCP\Calendar\ICreateFromString interface on how to use it.
+	 *
+	 * @since 31.0.0
+	 */
+	public function createEventBuilder(): ICalendarEventBuilder;
+
+	/**
+	 * Check the availability of the given organizer and attendees in the given time range.
+	 *
+	 * @since 31.0.0
+	 *
+	 * @param IUser $organizer The organizing user from whose perspective to do the availability check.
+	 * @param string[] $attendees Email addresses of attendees to check for (with or without a "mailto:" prefix). Only users on this instance can be checked. The rest will be silently ignored.
+	 * @return IAvailabilityResult[] Availabilities of the organizer and all attendees which are also users on this instance. As such, the array might not contain an entry for each given attendee.
+	 */
+	public function checkAvailability(
+		DateTimeInterface $start,
+		DateTimeInterface $end,
+		IUser $organizer,
+		array $attendees,
+	): array;
 }
diff --git a/lib/public/Files/Conversion/ConversionMimeProvider.php b/lib/public/Files/Conversion/ConversionMimeProvider.php
new file mode 100644
index 00000000000..0daf4a10648
--- /dev/null
+++ b/lib/public/Files/Conversion/ConversionMimeProvider.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCP\Files\Conversion;
+
+use JsonSerializable;
+
+/**
+ * A tuple-like object representing both an original and target
+ * MIME type for a file conversion
+ *
+ * @since 31.0.0
+ */
+class ConversionMimeProvider implements JsonSerializable {
+	/**
+	 * @param string $from The source MIME type of a file
+	 * @param string $to The target MIME type for the file
+	 * @param string $extension The file extension for the target MIME type (e.g. 'png')
+	 * @param string $displayName The human-readable name of the target MIME type (e.g. 'Image (.png)')
+	 *
+	 * @since 31.0.0
+	 */
+	public function __construct(
+		private string $from,
+		private string $to,
+		private string $extension,
+		private string $displayName,
+	) {
+	}
+
+	public function getFrom(): string {
+		return $this->from;
+	}
+
+	public function getTo(): string {
+		return $this->to;
+	}
+
+	public function getExtension(): string {
+		return $this->extension;
+	}
+
+	public function getDisplayName(): string {
+		return $this->displayName;
+	}
+
+	/**
+	 * @return array{from: string, to: string, extension: string, displayName: string}
+	 *
+	 * @since 31.0.0
+	 */
+	public function jsonSerialize(): array {
+		return [
+			'from' => $this->from,
+			'to' => $this->to,
+			'extension' => $this->extension,
+			'displayName' => $this->displayName,
+		];
+	}
+}
diff --git a/lib/public/Files/Conversion/IConversionManager.php b/lib/public/Files/Conversion/IConversionManager.php
new file mode 100644
index 00000000000..ed418129d3b
--- /dev/null
+++ b/lib/public/Files/Conversion/IConversionManager.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCP\Files\Conversion;
+
+use OCP\Files\File;
+
+/**
+ * @since 31.0.0
+ */
+interface IConversionManager {
+	/**
+	 * Determines whether or not conversion providers are available
+	 *
+	 * @since 31.0.0
+	 */
+	public function hasProviders(): bool;
+
+	/**
+	 * Gets all supported MIME type conversions
+	 *
+	 * @return list<ConversionMimeProvider>
+	 *
+	 * @since 31.0.0
+	 */
+	public function getProviders(): array;
+
+	/**
+	 * Convert a file to a given MIME type
+	 *
+	 * @param File $file The file to be converted
+	 * @param string $targetMimeType The MIME type to convert the file to
+	 * @param ?string $destination The destination to save the converted file
+	 *
+	 * @return string Path to the converted file
+	 *
+	 * @since 31.0.0
+	 */
+	public function convert(File $file, string $targetMimeType, ?string $destination = null): string;
+}
diff --git a/lib/public/Files/Conversion/IConversionProvider.php b/lib/public/Files/Conversion/IConversionProvider.php
new file mode 100644
index 00000000000..3b5c5945c99
--- /dev/null
+++ b/lib/public/Files/Conversion/IConversionProvider.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCP\Files\Conversion;
+
+use OCP\Files\File;
+
+/**
+ * This interface is implemented by apps that provide
+ * a file conversion provider
+ *
+ * @since 31.0.0
+ */
+interface IConversionProvider {
+	/**
+	 * Get an array of MIME type tuples this conversion provider supports
+	 *
+	 * @return list<ConversionMimeProvider>
+	 *
+	 * @since 31.0.0
+	 */
+	public function getSupportedMimeTypes(): array;
+
+	/**
+	 * Convert a file to a given MIME type
+	 *
+	 * @param File $file The file to be converted
+	 * @param string $targetMimeType The MIME type to convert the file to
+	 *
+	 * @return resource|string Resource or string content of the file
+	 *
+	 * @since 31.0.0
+	 */
+	public function convertFile(File $file, string $targetMimeType): mixed;
+}
diff --git a/lib/public/Files/Template/ICustomTemplateProvider.php b/lib/public/Files/Template/ICustomTemplateProvider.php
index 305f2c9a55e..6136bc4f1c0 100644
--- a/lib/public/Files/Template/ICustomTemplateProvider.php
+++ b/lib/public/Files/Template/ICustomTemplateProvider.php
@@ -17,7 +17,7 @@ interface ICustomTemplateProvider {
 	/**
 	 * Return a list of additional templates that the template provider is offering
 	 *
-	 * @return File[]
+	 * @return Template[]
 	 * @since 21.0.0
 	 */
 	public function getCustomTemplates(string $mimetype): array;
diff --git a/lib/public/IUser.php b/lib/public/IUser.php
index 8c7d6a1283e..b4808ec045a 100644
--- a/lib/public/IUser.php
+++ b/lib/public/IUser.php
@@ -50,13 +50,22 @@ interface IUser {
 	 * @return int
 	 * @since 8.0.0
 	 */
-	public function getLastLogin();
+	public function getLastLogin(): int;
 
 	/**
-	 * updates the timestamp of the most recent login of this user
+	 * Returns the timestamp of the user's first login, 0 if the user did never login, or -1 if the data is unknown (first login was on an older version)
+	 *
+	 * @since 31.0.0
+	 */
+	public function getFirstLogin(): int;
+
+	/**
+	 * Updates the timestamp of the most recent login of this user (and first login if needed)
+	 *
+	 * @return bool whether this is the first login
 	 * @since 8.0.0
 	 */
-	public function updateLastLoginTimestamp();
+	public function updateLastLoginTimestamp(): bool;
 
 	/**
 	 * Delete the user
diff --git a/lib/public/IUserManager.php b/lib/public/IUserManager.php
index 091ccd89048..50eaa9c98b7 100644
--- a/lib/public/IUserManager.php
+++ b/lib/public/IUserManager.php
@@ -164,6 +164,16 @@ interface IUserManager {
 	public function countUsers();
 
 	/**
+	 * Get how many users exists in total, whithin limit
+	 *
+	 * @param int $limit Limit the count to avoid resource waste. 0 to disable
+	 * @param bool $onlyMappedUsers Count mapped users instead of all users for compatible backends
+	 *
+	 * @since 31.0.0
+	 */
+	public function countUsersTotal(int $limit = 0, bool $onlyMappedUsers = false): int|false;
+
+	/**
 	 * @param \Closure $callback
 	 * @psalm-param \Closure(\OCP\IUser):void $callback
 	 * @param string $search
diff --git a/lib/public/ServerVersion.php b/lib/public/ServerVersion.php
index 637c34d3619..d44452d42d0 100644
--- a/lib/public/ServerVersion.php
+++ b/lib/public/ServerVersion.php
@@ -77,6 +77,12 @@ class ServerVersion {
 	 * @since 31.0.0
 	 */
 	public function getChannel(): string {
+		$updaterChannel = Server::get(IConfig::class)->getSystemValueString('updater.release.channel', $this->channel);
+
+		if (in_array($updaterChannel, ['beta', 'stable', 'enterprise', 'git'], true)) {
+			return $updaterChannel;
+		}
+
 		return $this->channel;
 	}
 
diff --git a/lib/public/Share/Exceptions/ShareTokenException.php b/lib/public/Share/Exceptions/ShareTokenException.php
new file mode 100644
index 00000000000..027d00640e9
--- /dev/null
+++ b/lib/public/Share/Exceptions/ShareTokenException.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCP\Share\Exceptions;
+
+use Exception;
+
+/**
+ * @since 31.0.0
+ */
+class ShareTokenException extends Exception {
+}
diff --git a/lib/public/Share/IManager.php b/lib/public/Share/IManager.php
index c3a8494a5ac..23713f2e462 100644
--- a/lib/public/Share/IManager.php
+++ b/lib/public/Share/IManager.php
@@ -13,6 +13,7 @@ use OCP\Files\Node;
 use OCP\IUser;
 use OCP\Share\Exceptions\GenericShareException;
 use OCP\Share\Exceptions\ShareNotFound;
+use OCP\Share\Exceptions\ShareTokenException;
 
 /**
  * This interface allows to manage sharing files between users and groups.
@@ -463,6 +464,14 @@ interface IManager {
 	 */
 	public function ignoreSecondDisplayName(): bool;
 
+
+	/**
+	 * Check if custom tokens are allowed
+	 *
+	 * @since 31.0.0
+	 */
+	public function allowCustomTokens(): bool;
+
 	/**
 	 * Check if the current user can enumerate the target user
 	 *
@@ -522,4 +531,12 @@ interface IManager {
 	 * @since 18.0.0
 	 */
 	public function getAllShares(): iterable;
+
+	/**
+	 * Generate a unique share token
+	 *
+	 * @throws ShareTokenException Failed to generate a unique token
+	 * @since 31.0.0
+	 */
+	public function generateToken(): string;
 }
diff --git a/lib/public/SystemTag/ISystemTagManager.php b/lib/public/SystemTag/ISystemTagManager.php
index 04804798114..66206d677f9 100644
--- a/lib/public/SystemTag/ISystemTagManager.php
+++ b/lib/public/SystemTag/ISystemTagManager.php
@@ -57,8 +57,10 @@ interface ISystemTagManager {
 	 * @return ISystemTag system tag
 	 *
 	 * @throws TagAlreadyExistsException if tag already exists
+	 * @throws TagCreationForbiddenException if user doesn't have the right to create a new tag
 	 *
 	 * @since 9.0.0
+	 * @since 31.0.0 Can throw TagCreationForbiddenExceptionif user doesn't have the right to create a new tag
 	 */
 	public function createTag(string $tagName, bool $userVisible, bool $userAssignable): ISystemTag;
 
@@ -118,6 +120,16 @@ interface ISystemTagManager {
 	public function canUserAssignTag(ISystemTag $tag, ?IUser $user): bool;
 
 	/**
+	 * Checks whether the given user is allowed to create new tags
+	 *
+	 * @param IUser|null $user user to check permission for
+	 * @return bool true if the user is allowed to create a new tag, false otherwise
+	 *
+	 * @since 31.0.0
+	 */
+	public function canUserCreateTag(?IUser $user): bool;
+
+	/**
 	 * Checks whether the given user is allowed to see the tag with the given id.
 	 *
 	 * @param ISystemTag $tag tag to check permission for
diff --git a/lib/public/SystemTag/TagCreationForbiddenException.php b/lib/public/SystemTag/TagCreationForbiddenException.php
new file mode 100644
index 00000000000..eeae38e31f7
--- /dev/null
+++ b/lib/public/SystemTag/TagCreationForbiddenException.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+namespace OCP\SystemTag;
+
+/**
+ * Exception when a user doesn't have the right to create a tag
+ *
+ * @since 31.0.0
+ */
+class TagCreationForbiddenException extends \RuntimeException {
+}
diff --git a/lib/public/User/Backend/ICountUsersBackend.php b/lib/public/User/Backend/ICountUsersBackend.php
index e337147dd14..194cf465cbe 100644
--- a/lib/public/User/Backend/ICountUsersBackend.php
+++ b/lib/public/User/Backend/ICountUsersBackend.php
@@ -10,6 +10,7 @@ namespace OCP\User\Backend;
 
 /**
  * @since 14.0.0
+ * @deprecated 31.0.0 use and implement ILimitAwareCountUsersBackend instead.
  */
 interface ICountUsersBackend {
 	/**
diff --git a/lib/public/User/Backend/ILimitAwareCountUsersBackend.php b/lib/public/User/Backend/ILimitAwareCountUsersBackend.php
new file mode 100644
index 00000000000..a59c0bd8e04
--- /dev/null
+++ b/lib/public/User/Backend/ILimitAwareCountUsersBackend.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCP\User\Backend;
+
+/**
+ * @since 31.0.0
+ */
+interface ILimitAwareCountUsersBackend extends ICountUsersBackend {
+	/**
+	 * @since 31.0.0
+	 *
+	 * @param int $limit Limit to stop counting users if there are more than $limit. 0 to disable limiting.
+	 * @return int|false The number of users (may be limited to $limit) on success false on failure
+	 */
+	public function countUsers(int $limit = 0): int|false;
+}
diff --git a/lib/unstable/Config/Lexicon/ConfigLexiconEntry.php b/lib/unstable/Config/Lexicon/ConfigLexiconEntry.php
index e6c6579881d..d7d781d8e26 100644
--- a/lib/unstable/Config/Lexicon/ConfigLexiconEntry.php
+++ b/lib/unstable/Config/Lexicon/ConfigLexiconEntry.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-only
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 namespace NCU\Config\Lexicon;
@@ -35,25 +35,12 @@ class ConfigLexiconEntry {
 	public function __construct(
 		private readonly string $key,
 		private readonly ValueType $type,
-		null|string|int|float|bool|array $default = null,
+		private null|string|int|float|bool|array $defaultRaw = null,
 		string $definition = '',
 		private readonly bool $lazy = false,
 		private readonly int $flags = 0,
 		private readonly bool $deprecated = false,
 	) {
-		if ($default !== null) {
-			// in case $default is array but is not expected to be an array...
-			$default = ($type !== ValueType::ARRAY && is_array($default)) ? json_encode($default) : $default;
-			$this->default = match ($type) {
-				ValueType::MIXED => (string)$default,
-				ValueType::STRING => $this->convertFromString((string)$default),
-				ValueType::INT => $this->convertFromInt((int)$default),
-				ValueType::FLOAT => $this->convertFromFloat((float)$default),
-				ValueType::BOOL => $this->convertFromBool((bool)$default),
-				ValueType::ARRAY => $this->convertFromArray((array)$default)
-			};
-		}
-
 		/** @psalm-suppress UndefinedClass */
 		if (\OC::$CLI) { // only store definition if ran from CLI
 			$this->definition = $definition;
@@ -61,7 +48,7 @@ class ConfigLexiconEntry {
 	}
 
 	/**
-	 * @inheritDoc
+	 * returns the config key
 	 *
 	 * @return string config key
 	 * @experimental 31.0.0
@@ -71,7 +58,7 @@ class ConfigLexiconEntry {
 	}
 
 	/**
-	 * @inheritDoc
+	 * get expected type for config value
 	 *
 	 * @return ValueType
 	 * @experimental 31.0.0
@@ -126,17 +113,51 @@ class ConfigLexiconEntry {
 	}
 
 	/**
-	 * @inheritDoc
+	 * returns default value
 	 *
 	 * @return string|null NULL if no default is set
 	 * @experimental 31.0.0
 	 */
 	public function getDefault(): ?string {
+		if ($this->defaultRaw === null) {
+			return null;
+		}
+
+		if ($this->default === null) {
+			$this->default = $this->convertToString($this->defaultRaw);
+		}
+
 		return $this->default;
 	}
 
 	/**
-	 * @inheritDoc
+	 * convert $entry into string, based on the expected type for config value
+	 *
+	 * @param string|int|float|bool|array $entry
+	 *
+	 * @return string
+	 * @experimental 31.0.0
+	 * @psalm-suppress PossiblyInvalidCast arrays are managed pre-cast
+	 * @psalm-suppress RiskyCast
+	 */
+	public function convertToString(string|int|float|bool|array $entry): string {
+		// in case $default is array but is not expected to be an array...
+		if ($this->getValueType() !== ValueType::ARRAY && is_array($entry)) {
+			$entry = json_encode($entry, JSON_THROW_ON_ERROR);
+		}
+
+		return match ($this->getValueType()) {
+			ValueType::MIXED => (string)$entry,
+			ValueType::STRING => $this->convertFromString((string)$entry),
+			ValueType::INT => $this->convertFromInt((int)$entry),
+			ValueType::FLOAT => $this->convertFromFloat((float)$entry),
+			ValueType::BOOL => $this->convertFromBool((bool)$entry),
+			ValueType::ARRAY => $this->convertFromArray((array)$entry)
+		};
+	}
+
+	/**
+	 * returns definition
 	 *
 	 * @return string
 	 * @experimental 31.0.0
@@ -146,7 +167,7 @@ class ConfigLexiconEntry {
 	}
 
 	/**
-	 * @inheritDoc
+	 * returns if config key is set as lazy
 	 *
 	 * @see IAppConfig for details on lazy config values
 	 * @return bool TRUE if config value is lazy
@@ -157,7 +178,7 @@ class ConfigLexiconEntry {
 	}
 
 	/**
-	 * @inheritDoc
+	 * returns flags
 	 *
 	 * @see IAppConfig for details on sensitive config values
 	 * @return int bitflag about the config value
@@ -178,7 +199,7 @@ class ConfigLexiconEntry {
 	}
 
 	/**
-	 * @inheritDoc
+	 * returns if config key is set as deprecated
 	 *
 	 * @return bool TRUE if config si deprecated
 	 * @experimental 31.0.0