diff options
| author | Robin Appelman <robin@icewind.nl> | 2024-09-16 15:13:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-16 15:13:29 +0200 |
| commit | 13088b745a7b3cd0d81aae63c0c1ff9028cafbf6 (patch) | |
| tree | bdd5a6afa92350a2b0586db66c637ae5188731d0 /lib | |
| parent | 34a9e48827b3a03da48699d32c6138c2c89c139f (diff) | |
| parent | cfed24cb0254caf570b2a520979a83435a677cc8 (diff) | |
| download | nextcloud-server-fix-nc-env-inclusion.tar.gz nextcloud-server-fix-nc-env-inclusion.zip | |
Merge branch 'master' into fix-nc-env-inclusionfix-nc-env-inclusion
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib')
689 files changed, 17362 insertions, 6142 deletions
diff --git a/lib/base.php b/lib/base.php index c84a1246288..1f9caf473e2 100644 --- a/lib/base.php +++ b/lib/base.php @@ -43,7 +43,7 @@ class OC { */ private static string $SUBURI = ''; /** - * the Nextcloud root path for http requests (e.g. nextcloud/) + * the Nextcloud root path for http requests (e.g. /nextcloud) */ public static string $WEBROOT = ''; /** @@ -74,7 +74,7 @@ class OC { /** * @throws \RuntimeException when the 3rdparty directory is missing or - * the app path list is empty or contains an invalid path + * the app path list is empty or contains an invalid path */ public static function initPaths(): void { if (defined('PHPUNIT_CONFIG_DIR')) { @@ -88,7 +88,7 @@ class OC { } self::$config = new \OC\Config(self::$configDir); - OC::$SUBURI = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"] ?? ''), strlen(OC::$SERVERROOT))); + OC::$SUBURI = str_replace('\\', '/', substr(realpath($_SERVER['SCRIPT_FILENAME'] ?? ''), strlen(OC::$SERVERROOT))); /** * FIXME: The following lines are required because we can't yet instantiate * Server::get(\OCP\IRequest::class) since \OC::$server does not yet exist. @@ -231,7 +231,7 @@ class OC { public static function checkMaintenanceMode(\OC\SystemConfig $systemConfig): void { // Allow ajax update script to execute without being stopped - if (((bool) $systemConfig->getValue('maintenance', false)) && OC::$SUBURI != '/core/ajax/update.php') { + if (((bool)$systemConfig->getValue('maintenance', false)) && OC::$SUBURI != '/core/ajax/update.php') { // send http status 503 http_response_code(503); header('X-Nextcloud-Maintenance-Mode: 1'); @@ -387,8 +387,16 @@ class OC { $sessionName = OC_Util::getInstanceId(); try { + $logger = null; + if (Server::get(\OC\SystemConfig::class)->getValue('installed', false)) { + $logger = logger('core'); + } + // set the session name to the instance id - which is unique - $session = new \OC\Session\Internal($sessionName); + $session = new \OC\Session\Internal( + $sessionName, + $logger, + ); $cryptoWrapper = Server::get(\OC\Session\CryptoWrapper::class); $session = $cryptoWrapper->wrapSession($session); @@ -536,7 +544,7 @@ class OC { }); // calculate the root directories - OC::$SERVERROOT = str_replace("\\", '/', substr(__DIR__, 0, -4)); + OC::$SERVERROOT = str_replace('\\', '/', substr(__DIR__, 0, -4)); // register autoloader $loaderStart = microtime(true); @@ -649,6 +657,13 @@ class OC { $bootstrapCoordinator->runInitialRegistration(); $eventLogger->start('init_session', 'Initialize session'); + + // Check for PHP SimpleXML extension earlier since we need it before our other checks and want to provide a useful hint for web users + // see https://github.com/nextcloud/server/pull/2619 + if (!function_exists('simplexml_load_file')) { + throw new \OCP\HintException('The PHP SimpleXML/PHP-XML extension is not installed.', 'Install the extension or make sure it is enabled.'); + } + OC_App::loadApps(['session']); if (!self::$CLI) { self::initSession(); @@ -699,7 +714,7 @@ class OC { } // User and Groups - if (!$systemConfig->getValue("installed", false)) { + if (!$systemConfig->getValue('installed', false)) { self::$server->getSession()->set('user_id', ''); } @@ -732,7 +747,7 @@ class OC { self::registerAppRestrictionsHooks(); // Make sure that the application class is not loaded before the database is setup - if ($systemConfig->getValue("installed", false)) { + if ($systemConfig->getValue('installed', false)) { OC_App::loadApp('settings'); /* Build core application to make sure that listeners are registered */ Server::get(\OC\Core\Application::class); @@ -954,7 +969,7 @@ class OC { if (function_exists('opcache_reset')) { opcache_reset(); } - if (!((bool) $systemConfig->getValue('maintenance', false))) { + if (!((bool)$systemConfig->getValue('maintenance', false))) { self::printUpgradePage($systemConfig); exit(); } @@ -967,7 +982,7 @@ class OC { // Load minimum set of apps if (!\OCP\Util::needUpgrade() - && !((bool) $systemConfig->getValue('maintenance', false))) { + && !((bool)$systemConfig->getValue('maintenance', false))) { // For logged-in users: Load everything if (Server::get(IUserSession::class)->isLoggedIn()) { OC_App::loadApps(); @@ -986,7 +1001,7 @@ class OC { if (!self::$CLI) { try { - if (!((bool) $systemConfig->getValue('maintenance', false)) && !\OCP\Util::needUpgrade()) { + if (!((bool)$systemConfig->getValue('maintenance', false)) && !\OCP\Util::needUpgrade()) { OC_App::loadApps(['filesystem', 'logging']); OC_App::loadApps(); } diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index f0addbcdaa8..37013ecc1ae 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -44,6 +44,7 @@ return array( 'OCP\\AppFramework\\Http\\Attribute\\ARateLimit' => $baseDir . '/lib/public/AppFramework/Http/Attribute/ARateLimit.php', 'OCP\\AppFramework\\Http\\Attribute\\AnonRateLimit' => $baseDir . '/lib/public/AppFramework/Http/Attribute/AnonRateLimit.php', 'OCP\\AppFramework\\Http\\Attribute\\ApiRoute' => $baseDir . '/lib/public/AppFramework/Http/Attribute/ApiRoute.php', + 'OCP\\AppFramework\\Http\\Attribute\\AppApiAdminAccessWithoutUser' => $baseDir . '/lib/public/AppFramework/Http/Attribute/AppApiAdminAccessWithoutUser.php', 'OCP\\AppFramework\\Http\\Attribute\\AuthorizedAdminSetting' => $baseDir . '/lib/public/AppFramework/Http/Attribute/AuthorizedAdminSetting.php', 'OCP\\AppFramework\\Http\\Attribute\\BruteForceProtection' => $baseDir . '/lib/public/AppFramework/Http/Attribute/BruteForceProtection.php', 'OCP\\AppFramework\\Http\\Attribute\\CORS' => $baseDir . '/lib/public/AppFramework/Http/Attribute/CORS.php', @@ -189,6 +190,7 @@ return array( 'OCP\\Collaboration\\Collaborators\\SearchResultType' => $baseDir . '/lib/public/Collaboration/Collaborators/SearchResultType.php', 'OCP\\Collaboration\\Reference\\ADiscoverableReferenceProvider' => $baseDir . '/lib/public/Collaboration/Reference/ADiscoverableReferenceProvider.php', 'OCP\\Collaboration\\Reference\\IDiscoverableReferenceProvider' => $baseDir . '/lib/public/Collaboration/Reference/IDiscoverableReferenceProvider.php', + 'OCP\\Collaboration\\Reference\\IPublicReferenceProvider' => $baseDir . '/lib/public/Collaboration/Reference/IPublicReferenceProvider.php', 'OCP\\Collaboration\\Reference\\IReference' => $baseDir . '/lib/public/Collaboration/Reference/IReference.php', 'OCP\\Collaboration\\Reference\\IReferenceManager' => $baseDir . '/lib/public/Collaboration/Reference/IReferenceManager.php', 'OCP\\Collaboration\\Reference\\IReferenceProvider' => $baseDir . '/lib/public/Collaboration/Reference/IReferenceProvider.php', @@ -245,6 +247,7 @@ return array( 'OCP\\DB\\QueryBuilder\\IParameter' => $baseDir . '/lib/public/DB/QueryBuilder/IParameter.php', 'OCP\\DB\\QueryBuilder\\IQueryBuilder' => $baseDir . '/lib/public/DB/QueryBuilder/IQueryBuilder.php', 'OCP\\DB\\QueryBuilder\\IQueryFunction' => $baseDir . '/lib/public/DB/QueryBuilder/IQueryFunction.php', + 'OCP\\DB\\QueryBuilder\\Sharded\\IShardMapper' => $baseDir . '/lib/public/DB/QueryBuilder/Sharded/IShardMapper.php', 'OCP\\DB\\Types' => $baseDir . '/lib/public/DB/Types.php', 'OCP\\Dashboard\\IAPIWidget' => $baseDir . '/lib/public/Dashboard/IAPIWidget.php', 'OCP\\Dashboard\\IAPIWidgetV2' => $baseDir . '/lib/public/Dashboard/IAPIWidgetV2.php', @@ -379,6 +382,7 @@ return array( 'OCP\\Files\\ForbiddenException' => $baseDir . '/lib/public/Files/ForbiddenException.php', 'OCP\\Files\\GenericFileException' => $baseDir . '/lib/public/Files/GenericFileException.php', 'OCP\\Files\\IAppData' => $baseDir . '/lib/public/Files/IAppData.php', + 'OCP\\Files\\IFilenameValidator' => $baseDir . '/lib/public/Files/IFilenameValidator.php', 'OCP\\Files\\IHomeStorage' => $baseDir . '/lib/public/Files/IHomeStorage.php', 'OCP\\Files\\IMimeTypeDetector' => $baseDir . '/lib/public/Files/IMimeTypeDetector.php', 'OCP\\Files\\IMimeTypeLoader' => $baseDir . '/lib/public/Files/IMimeTypeLoader.php', @@ -429,12 +433,20 @@ return array( 'OCP\\Files\\Storage\\ILockingStorage' => $baseDir . '/lib/public/Files/Storage/ILockingStorage.php', 'OCP\\Files\\Storage\\INotifyStorage' => $baseDir . '/lib/public/Files/Storage/INotifyStorage.php', 'OCP\\Files\\Storage\\IReliableEtagStorage' => $baseDir . '/lib/public/Files/Storage/IReliableEtagStorage.php', + 'OCP\\Files\\Storage\\ISharedStorage' => $baseDir . '/lib/public/Files/Storage/ISharedStorage.php', 'OCP\\Files\\Storage\\IStorage' => $baseDir . '/lib/public/Files/Storage/IStorage.php', 'OCP\\Files\\Storage\\IStorageFactory' => $baseDir . '/lib/public/Files/Storage/IStorageFactory.php', 'OCP\\Files\\Storage\\IWriteStreamStorage' => $baseDir . '/lib/public/Files/Storage/IWriteStreamStorage.php', + 'OCP\\Files\\Template\\BeforeGetTemplatesEvent' => $baseDir . '/lib/public/Files/Template/BeforeGetTemplatesEvent.php', + 'OCP\\Files\\Template\\Field' => $baseDir . '/lib/public/Files/Template/Field.php', + 'OCP\\Files\\Template\\FieldFactory' => $baseDir . '/lib/public/Files/Template/FieldFactory.php', + 'OCP\\Files\\Template\\FieldType' => $baseDir . '/lib/public/Files/Template/FieldType.php', + 'OCP\\Files\\Template\\Fields\\CheckBoxField' => $baseDir . '/lib/public/Files/Template/Fields/CheckBoxField.php', + 'OCP\\Files\\Template\\Fields\\RichTextField' => $baseDir . '/lib/public/Files/Template/Fields/RichTextField.php', 'OCP\\Files\\Template\\FileCreatedFromTemplateEvent' => $baseDir . '/lib/public/Files/Template/FileCreatedFromTemplateEvent.php', 'OCP\\Files\\Template\\ICustomTemplateProvider' => $baseDir . '/lib/public/Files/Template/ICustomTemplateProvider.php', 'OCP\\Files\\Template\\ITemplateManager' => $baseDir . '/lib/public/Files/Template/ITemplateManager.php', + 'OCP\\Files\\Template\\InvalidFieldTypeException' => $baseDir . '/lib/public/Files/Template/InvalidFieldTypeException.php', 'OCP\\Files\\Template\\RegisterTemplateCreatorEvent' => $baseDir . '/lib/public/Files/Template/RegisterTemplateCreatorEvent.php', 'OCP\\Files\\Template\\Template' => $baseDir . '/lib/public/Files/Template/Template.php', 'OCP\\Files\\Template\\TemplateFileCreator' => $baseDir . '/lib/public/Files/Template/TemplateFileCreator.php', @@ -530,7 +542,6 @@ return array( 'OCP\\IPreview' => $baseDir . '/lib/public/IPreview.php', 'OCP\\IRequest' => $baseDir . '/lib/public/IRequest.php', 'OCP\\IRequestId' => $baseDir . '/lib/public/IRequestId.php', - 'OCP\\ISearch' => $baseDir . '/lib/public/ISearch.php', 'OCP\\IServerContainer' => $baseDir . '/lib/public/IServerContainer.php', 'OCP\\ISession' => $baseDir . '/lib/public/ISession.php', 'OCP\\IStreamImage' => $baseDir . '/lib/public/IStreamImage.php', @@ -565,6 +576,32 @@ return array( 'OCP\\Mail\\IEMailTemplate' => $baseDir . '/lib/public/Mail/IEMailTemplate.php', 'OCP\\Mail\\IMailer' => $baseDir . '/lib/public/Mail/IMailer.php', 'OCP\\Mail\\IMessage' => $baseDir . '/lib/public/Mail/IMessage.php', + 'OCP\\Mail\\Provider\\Address' => $baseDir . '/lib/public/Mail/Provider/Address.php', + 'OCP\\Mail\\Provider\\Attachment' => $baseDir . '/lib/public/Mail/Provider/Attachment.php', + 'OCP\\Mail\\Provider\\Exception\\Exception' => $baseDir . '/lib/public/Mail/Provider/Exception/Exception.php', + 'OCP\\Mail\\Provider\\Exception\\SendException' => $baseDir . '/lib/public/Mail/Provider/Exception/SendException.php', + 'OCP\\Mail\\Provider\\IAddress' => $baseDir . '/lib/public/Mail/Provider/IAddress.php', + 'OCP\\Mail\\Provider\\IAttachment' => $baseDir . '/lib/public/Mail/Provider/IAttachment.php', + 'OCP\\Mail\\Provider\\IManager' => $baseDir . '/lib/public/Mail/Provider/IManager.php', + 'OCP\\Mail\\Provider\\IMessage' => $baseDir . '/lib/public/Mail/Provider/IMessage.php', + 'OCP\\Mail\\Provider\\IMessageSend' => $baseDir . '/lib/public/Mail/Provider/IMessageSend.php', + 'OCP\\Mail\\Provider\\IProvider' => $baseDir . '/lib/public/Mail/Provider/IProvider.php', + 'OCP\\Mail\\Provider\\IService' => $baseDir . '/lib/public/Mail/Provider/IService.php', + 'OCP\\Mail\\Provider\\Message' => $baseDir . '/lib/public/Mail/Provider/Message.php', + 'OCP\\Migration\\Attributes\\AddColumn' => $baseDir . '/lib/public/Migration/Attributes/AddColumn.php', + 'OCP\\Migration\\Attributes\\AddIndex' => $baseDir . '/lib/public/Migration/Attributes/AddIndex.php', + 'OCP\\Migration\\Attributes\\ColumnMigrationAttribute' => $baseDir . '/lib/public/Migration/Attributes/ColumnMigrationAttribute.php', + 'OCP\\Migration\\Attributes\\ColumnType' => $baseDir . '/lib/public/Migration/Attributes/ColumnType.php', + 'OCP\\Migration\\Attributes\\CreateTable' => $baseDir . '/lib/public/Migration/Attributes/CreateTable.php', + 'OCP\\Migration\\Attributes\\DropColumn' => $baseDir . '/lib/public/Migration/Attributes/DropColumn.php', + 'OCP\\Migration\\Attributes\\DropIndex' => $baseDir . '/lib/public/Migration/Attributes/DropIndex.php', + 'OCP\\Migration\\Attributes\\DropTable' => $baseDir . '/lib/public/Migration/Attributes/DropTable.php', + 'OCP\\Migration\\Attributes\\GenericMigrationAttribute' => $baseDir . '/lib/public/Migration/Attributes/GenericMigrationAttribute.php', + 'OCP\\Migration\\Attributes\\IndexMigrationAttribute' => $baseDir . '/lib/public/Migration/Attributes/IndexMigrationAttribute.php', + 'OCP\\Migration\\Attributes\\IndexType' => $baseDir . '/lib/public/Migration/Attributes/IndexType.php', + 'OCP\\Migration\\Attributes\\MigrationAttribute' => $baseDir . '/lib/public/Migration/Attributes/MigrationAttribute.php', + 'OCP\\Migration\\Attributes\\ModifyColumn' => $baseDir . '/lib/public/Migration/Attributes/ModifyColumn.php', + 'OCP\\Migration\\Attributes\\TableMigrationAttribute' => $baseDir . '/lib/public/Migration/Attributes/TableMigrationAttribute.php', 'OCP\\Migration\\BigIntMigration' => $baseDir . '/lib/public/Migration/BigIntMigration.php', 'OCP\\Migration\\IMigrationStep' => $baseDir . '/lib/public/Migration/IMigrationStep.php', 'OCP\\Migration\\IOutput' => $baseDir . '/lib/public/Migration/IOutput.php', @@ -641,6 +678,11 @@ return array( 'OCP\\Security\\IRemoteHostValidator' => $baseDir . '/lib/public/Security/IRemoteHostValidator.php', 'OCP\\Security\\ISecureRandom' => $baseDir . '/lib/public/Security/ISecureRandom.php', 'OCP\\Security\\ITrustedDomainHelper' => $baseDir . '/lib/public/Security/ITrustedDomainHelper.php', + 'OCP\\Security\\Ip\\IAddress' => $baseDir . '/lib/public/Security/Ip/IAddress.php', + 'OCP\\Security\\Ip\\IFactory' => $baseDir . '/lib/public/Security/Ip/IFactory.php', + 'OCP\\Security\\Ip\\IRange' => $baseDir . '/lib/public/Security/Ip/IRange.php', + 'OCP\\Security\\Ip\\IRemoteAddress' => $baseDir . '/lib/public/Security/Ip/IRemoteAddress.php', + 'OCP\\Security\\PasswordContext' => $baseDir . '/lib/public/Security/PasswordContext.php', 'OCP\\Security\\RateLimiting\\ILimiter' => $baseDir . '/lib/public/Security/RateLimiting/ILimiter.php', 'OCP\\Security\\RateLimiting\\IRateLimitExceededException' => $baseDir . '/lib/public/Security/RateLimiting/IRateLimitExceededException.php', 'OCP\\Security\\VerificationToken\\IVerificationToken' => $baseDir . '/lib/public/Security/VerificationToken/IVerificationToken.php', @@ -681,6 +723,8 @@ return array( 'OCP\\Share\\IShare' => $baseDir . '/lib/public/Share/IShare.php', 'OCP\\Share\\IShareHelper' => $baseDir . '/lib/public/Share/IShareHelper.php', 'OCP\\Share\\IShareProvider' => $baseDir . '/lib/public/Share/IShareProvider.php', + 'OCP\\Share\\IShareProviderSupportsAccept' => $baseDir . '/lib/public/Share/IShareProviderSupportsAccept.php', + 'OCP\\Share\\IShareProviderWithNotification' => $baseDir . '/lib/public/Share/IShareProviderWithNotification.php', 'OCP\\Share_Backend' => $baseDir . '/lib/public/Share_Backend.php', 'OCP\\Share_Backend_Collection' => $baseDir . '/lib/public/Share_Backend_Collection.php', 'OCP\\Share_Backend_File_Dependent' => $baseDir . '/lib/public/Share_Backend_File_Dependent.php', @@ -729,6 +773,7 @@ return array( 'OCP\\TaskProcessing\\ISynchronousProvider' => $baseDir . '/lib/public/TaskProcessing/ISynchronousProvider.php', 'OCP\\TaskProcessing\\ITaskType' => $baseDir . '/lib/public/TaskProcessing/ITaskType.php', 'OCP\\TaskProcessing\\ShapeDescriptor' => $baseDir . '/lib/public/TaskProcessing/ShapeDescriptor.php', + 'OCP\\TaskProcessing\\ShapeEnumValue' => $baseDir . '/lib/public/TaskProcessing/ShapeEnumValue.php', 'OCP\\TaskProcessing\\Task' => $baseDir . '/lib/public/TaskProcessing/Task.php', 'OCP\\TaskProcessing\\TaskTypes\\AudioToText' => $baseDir . '/lib/public/TaskProcessing/TaskTypes/AudioToText.php', 'OCP\\TaskProcessing\\TaskTypes\\ContextWrite' => $baseDir . '/lib/public/TaskProcessing/TaskTypes/ContextWrite.php', @@ -742,6 +787,7 @@ return array( 'OCP\\TaskProcessing\\TaskTypes\\TextToTextSimplification' => $baseDir . '/lib/public/TaskProcessing/TaskTypes/TextToTextSimplification.php', 'OCP\\TaskProcessing\\TaskTypes\\TextToTextSummary' => $baseDir . '/lib/public/TaskProcessing/TaskTypes/TextToTextSummary.php', 'OCP\\TaskProcessing\\TaskTypes\\TextToTextTopics' => $baseDir . '/lib/public/TaskProcessing/TaskTypes/TextToTextTopics.php', + 'OCP\\TaskProcessing\\TaskTypes\\TextToTextTranslate' => $baseDir . '/lib/public/TaskProcessing/TaskTypes/TextToTextTranslate.php', 'OCP\\Teams\\ITeamManager' => $baseDir . '/lib/public/Teams/ITeamManager.php', 'OCP\\Teams\\ITeamResourceProvider' => $baseDir . '/lib/public/Teams/ITeamResourceProvider.php', 'OCP\\Teams\\Team' => $baseDir . '/lib/public/Teams/Team.php', @@ -799,6 +845,7 @@ return array( '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\\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', 'OCP\\User\\Backend\\IProvideEnabledStateBackend' => $baseDir . '/lib/public/User/Backend/IProvideEnabledStateBackend.php', 'OCP\\User\\Backend\\ISearchKnownUsersBackend' => $baseDir . '/lib/public/User/Backend/ISearchKnownUsersBackend.php', @@ -807,6 +854,7 @@ return array( 'OCP\\User\\Events\\BeforePasswordUpdatedEvent' => $baseDir . '/lib/public/User/Events/BeforePasswordUpdatedEvent.php', 'OCP\\User\\Events\\BeforeUserCreatedEvent' => $baseDir . '/lib/public/User/Events/BeforeUserCreatedEvent.php', 'OCP\\User\\Events\\BeforeUserDeletedEvent' => $baseDir . '/lib/public/User/Events/BeforeUserDeletedEvent.php', + 'OCP\\User\\Events\\BeforeUserIdUnassignedEvent' => $baseDir . '/lib/public/User/Events/BeforeUserIdUnassignedEvent.php', 'OCP\\User\\Events\\BeforeUserLoggedInEvent' => $baseDir . '/lib/public/User/Events/BeforeUserLoggedInEvent.php', 'OCP\\User\\Events\\BeforeUserLoggedInWithCookieEvent' => $baseDir . '/lib/public/User/Events/BeforeUserLoggedInWithCookieEvent.php', 'OCP\\User\\Events\\BeforeUserLoggedOutEvent' => $baseDir . '/lib/public/User/Events/BeforeUserLoggedOutEvent.php', @@ -821,6 +869,8 @@ return array( 'OCP\\User\\Events\\UserCreatedEvent' => $baseDir . '/lib/public/User/Events/UserCreatedEvent.php', 'OCP\\User\\Events\\UserDeletedEvent' => $baseDir . '/lib/public/User/Events/UserDeletedEvent.php', 'OCP\\User\\Events\\UserFirstTimeLoggedInEvent' => $baseDir . '/lib/public/User/Events/UserFirstTimeLoggedInEvent.php', + 'OCP\\User\\Events\\UserIdAssignedEvent' => $baseDir . '/lib/public/User/Events/UserIdAssignedEvent.php', + 'OCP\\User\\Events\\UserIdUnassignedEvent' => $baseDir . '/lib/public/User/Events/UserIdUnassignedEvent.php', 'OCP\\User\\Events\\UserLiveStatusEvent' => $baseDir . '/lib/public/User/Events/UserLiveStatusEvent.php', 'OCP\\User\\Events\\UserLoggedInEvent' => $baseDir . '/lib/public/User/Events/UserLoggedInEvent.php', 'OCP\\User\\Events\\UserLoggedInWithCookieEvent' => $baseDir . '/lib/public/User/Events/UserLoggedInWithCookieEvent.php', @@ -891,6 +941,7 @@ return array( 'OC\\AppFramework\\Middleware\\Security\\BruteForceMiddleware' => $baseDir . '/lib/private/AppFramework/Middleware/Security/BruteForceMiddleware.php', 'OC\\AppFramework\\Middleware\\Security\\CORSMiddleware' => $baseDir . '/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php', 'OC\\AppFramework\\Middleware\\Security\\CSPMiddleware' => $baseDir . '/lib/private/AppFramework/Middleware/Security/CSPMiddleware.php', + 'OC\\AppFramework\\Middleware\\Security\\Exceptions\\AdminIpNotAllowedException' => $baseDir . '/lib/private/AppFramework/Middleware/Security/Exceptions/AdminIpNotAllowedException.php', 'OC\\AppFramework\\Middleware\\Security\\Exceptions\\AppNotEnabledException' => $baseDir . '/lib/private/AppFramework/Middleware/Security/Exceptions/AppNotEnabledException.php', 'OC\\AppFramework\\Middleware\\Security\\Exceptions\\CrossSiteRequestForgeryException' => $baseDir . '/lib/private/AppFramework/Middleware/Security/Exceptions/CrossSiteRequestForgeryException.php', 'OC\\AppFramework\\Middleware\\Security\\Exceptions\\ExAppRequiredException' => $baseDir . '/lib/private/AppFramework/Middleware/Security/Exceptions/ExAppRequiredException.php', @@ -1115,7 +1166,9 @@ return array( 'OC\\Core\\Command\\Db\\ExportSchema' => $baseDir . '/core/Command/Db/ExportSchema.php', 'OC\\Core\\Command\\Db\\Migrations\\ExecuteCommand' => $baseDir . '/core/Command/Db/Migrations/ExecuteCommand.php', 'OC\\Core\\Command\\Db\\Migrations\\GenerateCommand' => $baseDir . '/core/Command/Db/Migrations/GenerateCommand.php', + 'OC\\Core\\Command\\Db\\Migrations\\GenerateMetadataCommand' => $baseDir . '/core/Command/Db/Migrations/GenerateMetadataCommand.php', 'OC\\Core\\Command\\Db\\Migrations\\MigrateCommand' => $baseDir . '/core/Command/Db/Migrations/MigrateCommand.php', + 'OC\\Core\\Command\\Db\\Migrations\\PreviewCommand' => $baseDir . '/core/Command/Db/Migrations/PreviewCommand.php', 'OC\\Core\\Command\\Db\\Migrations\\StatusCommand' => $baseDir . '/core/Command/Db/Migrations/StatusCommand.php', 'OC\\Core\\Command\\Db\\SchemaEncoder' => $baseDir . '/core/Command/Db/SchemaEncoder.php', 'OC\\Core\\Command\\Encryption\\ChangeKeyStorageRoot' => $baseDir . '/core/Command/Encryption/ChangeKeyStorageRoot.php', @@ -1156,11 +1209,13 @@ return array( 'OC\\Core\\Command\\Maintenance\\RepairShareOwnership' => $baseDir . '/core/Command/Maintenance/RepairShareOwnership.php', 'OC\\Core\\Command\\Maintenance\\UpdateHtaccess' => $baseDir . '/core/Command/Maintenance/UpdateHtaccess.php', 'OC\\Core\\Command\\Maintenance\\UpdateTheme' => $baseDir . '/core/Command/Maintenance/UpdateTheme.php', + 'OC\\Core\\Command\\Memcache\\RedisCommand' => $baseDir . '/core/Command/Memcache/RedisCommand.php', 'OC\\Core\\Command\\Preview\\Generate' => $baseDir . '/core/Command/Preview/Generate.php', 'OC\\Core\\Command\\Preview\\Repair' => $baseDir . '/core/Command/Preview/Repair.php', 'OC\\Core\\Command\\Preview\\ResetRenderedTexts' => $baseDir . '/core/Command/Preview/ResetRenderedTexts.php', 'OC\\Core\\Command\\Security\\BruteforceAttempts' => $baseDir . '/core/Command/Security/BruteforceAttempts.php', 'OC\\Core\\Command\\Security\\BruteforceResetAttempts' => $baseDir . '/core/Command/Security/BruteforceResetAttempts.php', + 'OC\\Core\\Command\\Security\\ExportCertificates' => $baseDir . '/core/Command/Security/ExportCertificates.php', 'OC\\Core\\Command\\Security\\ImportCertificate' => $baseDir . '/core/Command/Security/ImportCertificate.php', 'OC\\Core\\Command\\Security\\ListCertificates' => $baseDir . '/core/Command/Security/ListCertificates.php', 'OC\\Core\\Command\\Security\\RemoveCertificate' => $baseDir . '/core/Command/Security/RemoveCertificate.php', @@ -1170,6 +1225,8 @@ return array( 'OC\\Core\\Command\\SystemTag\\Delete' => $baseDir . '/core/Command/SystemTag/Delete.php', 'OC\\Core\\Command\\SystemTag\\Edit' => $baseDir . '/core/Command/SystemTag/Edit.php', 'OC\\Core\\Command\\SystemTag\\ListCommand' => $baseDir . '/core/Command/SystemTag/ListCommand.php', + 'OC\\Core\\Command\\TaskProcessing\\ListCommand' => $baseDir . '/core/Command/TaskProcessing/ListCommand.php', + 'OC\\Core\\Command\\TaskProcessing\\Statistics' => $baseDir . '/core/Command/TaskProcessing/Statistics.php', 'OC\\Core\\Command\\TwoFactorAuth\\Base' => $baseDir . '/core/Command/TwoFactorAuth/Base.php', 'OC\\Core\\Command\\TwoFactorAuth\\Cleanup' => $baseDir . '/core/Command/TwoFactorAuth/Cleanup.php', 'OC\\Core\\Command\\TwoFactorAuth\\Disable' => $baseDir . '/core/Command/TwoFactorAuth/Disable.php', @@ -1193,6 +1250,7 @@ return array( 'OC\\Core\\Command\\User\\ResetPassword' => $baseDir . '/core/Command/User/ResetPassword.php', 'OC\\Core\\Command\\User\\Setting' => $baseDir . '/core/Command/User/Setting.php', 'OC\\Core\\Command\\User\\SyncAccountDataCommand' => $baseDir . '/core/Command/User/SyncAccountDataCommand.php', + 'OC\\Core\\Command\\User\\Welcome' => $baseDir . '/core/Command/User/Welcome.php', 'OC\\Core\\Controller\\AppPasswordController' => $baseDir . '/core/Controller/AppPasswordController.php', 'OC\\Core\\Controller\\AutoCompleteController' => $baseDir . '/core/Controller/AutoCompleteController.php', 'OC\\Core\\Controller\\AvatarController' => $baseDir . '/core/Controller/AvatarController.php', @@ -1218,7 +1276,6 @@ return array( 'OC\\Core\\Controller\\RecommendedAppsController' => $baseDir . '/core/Controller/RecommendedAppsController.php', 'OC\\Core\\Controller\\ReferenceApiController' => $baseDir . '/core/Controller/ReferenceApiController.php', 'OC\\Core\\Controller\\ReferenceController' => $baseDir . '/core/Controller/ReferenceController.php', - 'OC\\Core\\Controller\\SearchController' => $baseDir . '/core/Controller/SearchController.php', 'OC\\Core\\Controller\\SetupController' => $baseDir . '/core/Controller/SetupController.php', 'OC\\Core\\Controller\\TaskProcessingApiController' => $baseDir . '/core/Controller/TaskProcessingApiController.php', 'OC\\Core\\Controller\\TeamsApiController' => $baseDir . '/core/Controller/TeamsApiController.php', @@ -1310,19 +1367,27 @@ return array( 'OC\\Core\\Migrations\\Version28000Date20231004103301' => $baseDir . '/core/Migrations/Version28000Date20231004103301.php', 'OC\\Core\\Migrations\\Version28000Date20231103104802' => $baseDir . '/core/Migrations/Version28000Date20231103104802.php', 'OC\\Core\\Migrations\\Version28000Date20231126110901' => $baseDir . '/core/Migrations/Version28000Date20231126110901.php', + 'OC\\Core\\Migrations\\Version28000Date20240828142927' => $baseDir . '/core/Migrations/Version28000Date20240828142927.php', 'OC\\Core\\Migrations\\Version29000Date20231126110901' => $baseDir . '/core/Migrations/Version29000Date20231126110901.php', 'OC\\Core\\Migrations\\Version29000Date20231213104850' => $baseDir . '/core/Migrations/Version29000Date20231213104850.php', 'OC\\Core\\Migrations\\Version29000Date20240124132201' => $baseDir . '/core/Migrations/Version29000Date20240124132201.php', 'OC\\Core\\Migrations\\Version29000Date20240124132202' => $baseDir . '/core/Migrations/Version29000Date20240124132202.php', 'OC\\Core\\Migrations\\Version29000Date20240131122720' => $baseDir . '/core/Migrations/Version29000Date20240131122720.php', 'OC\\Core\\Migrations\\Version30000Date20240429122720' => $baseDir . '/core/Migrations/Version30000Date20240429122720.php', + 'OC\\Core\\Migrations\\Version30000Date20240708160048' => $baseDir . '/core/Migrations/Version30000Date20240708160048.php', + 'OC\\Core\\Migrations\\Version30000Date20240717111406' => $baseDir . '/core/Migrations/Version30000Date20240717111406.php', + 'OC\\Core\\Migrations\\Version30000Date20240814180800' => $baseDir . '/core/Migrations/Version30000Date20240814180800.php', + 'OC\\Core\\Migrations\\Version30000Date20240815080800' => $baseDir . '/core/Migrations/Version30000Date20240815080800.php', + 'OC\\Core\\Migrations\\Version30000Date20240906095113' => $baseDir . '/core/Migrations/Version30000Date20240906095113.php', 'OC\\Core\\Notification\\CoreNotifier' => $baseDir . '/core/Notification/CoreNotifier.php', + 'OC\\Core\\ResponseDefinitions' => $baseDir . '/core/ResponseDefinitions.php', 'OC\\Core\\Service\\LoginFlowV2Service' => $baseDir . '/core/Service/LoginFlowV2Service.php', 'OC\\DB\\Adapter' => $baseDir . '/lib/private/DB/Adapter.php', 'OC\\DB\\AdapterMySQL' => $baseDir . '/lib/private/DB/AdapterMySQL.php', 'OC\\DB\\AdapterOCI8' => $baseDir . '/lib/private/DB/AdapterOCI8.php', 'OC\\DB\\AdapterPgSql' => $baseDir . '/lib/private/DB/AdapterPgSql.php', 'OC\\DB\\AdapterSqlite' => $baseDir . '/lib/private/DB/AdapterSqlite.php', + 'OC\\DB\\ArrayResult' => $baseDir . '/lib/private/DB/ArrayResult.php', 'OC\\DB\\BacktraceDebugStack' => $baseDir . '/lib/private/DB/BacktraceDebugStack.php', 'OC\\DB\\Connection' => $baseDir . '/lib/private/DB/Connection.php', 'OC\\DB\\ConnectionAdapter' => $baseDir . '/lib/private/DB/ConnectionAdapter.php', @@ -1349,15 +1414,31 @@ return array( 'OC\\DB\\QueryBuilder\\ExpressionBuilder\\OCIExpressionBuilder' => $baseDir . '/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php', 'OC\\DB\\QueryBuilder\\ExpressionBuilder\\PgSqlExpressionBuilder' => $baseDir . '/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php', 'OC\\DB\\QueryBuilder\\ExpressionBuilder\\SqliteExpressionBuilder' => $baseDir . '/lib/private/DB/QueryBuilder/ExpressionBuilder/SqliteExpressionBuilder.php', + 'OC\\DB\\QueryBuilder\\ExtendedQueryBuilder' => $baseDir . '/lib/private/DB/QueryBuilder/ExtendedQueryBuilder.php', 'OC\\DB\\QueryBuilder\\FunctionBuilder\\FunctionBuilder' => $baseDir . '/lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php', 'OC\\DB\\QueryBuilder\\FunctionBuilder\\OCIFunctionBuilder' => $baseDir . '/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php', 'OC\\DB\\QueryBuilder\\FunctionBuilder\\PgSqlFunctionBuilder' => $baseDir . '/lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php', 'OC\\DB\\QueryBuilder\\FunctionBuilder\\SqliteFunctionBuilder' => $baseDir . '/lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php', 'OC\\DB\\QueryBuilder\\Literal' => $baseDir . '/lib/private/DB/QueryBuilder/Literal.php', 'OC\\DB\\QueryBuilder\\Parameter' => $baseDir . '/lib/private/DB/QueryBuilder/Parameter.php', + 'OC\\DB\\QueryBuilder\\Partitioned\\InvalidPartitionedQueryException' => $baseDir . '/lib/private/DB/QueryBuilder/Partitioned/InvalidPartitionedQueryException.php', + 'OC\\DB\\QueryBuilder\\Partitioned\\JoinCondition' => $baseDir . '/lib/private/DB/QueryBuilder/Partitioned/JoinCondition.php', + 'OC\\DB\\QueryBuilder\\Partitioned\\PartitionQuery' => $baseDir . '/lib/private/DB/QueryBuilder/Partitioned/PartitionQuery.php', + 'OC\\DB\\QueryBuilder\\Partitioned\\PartitionSplit' => $baseDir . '/lib/private/DB/QueryBuilder/Partitioned/PartitionSplit.php', + 'OC\\DB\\QueryBuilder\\Partitioned\\PartitionedQueryBuilder' => $baseDir . '/lib/private/DB/QueryBuilder/Partitioned/PartitionedQueryBuilder.php', + 'OC\\DB\\QueryBuilder\\Partitioned\\PartitionedResult' => $baseDir . '/lib/private/DB/QueryBuilder/Partitioned/PartitionedResult.php', 'OC\\DB\\QueryBuilder\\QueryBuilder' => $baseDir . '/lib/private/DB/QueryBuilder/QueryBuilder.php', 'OC\\DB\\QueryBuilder\\QueryFunction' => $baseDir . '/lib/private/DB/QueryBuilder/QueryFunction.php', 'OC\\DB\\QueryBuilder\\QuoteHelper' => $baseDir . '/lib/private/DB/QueryBuilder/QuoteHelper.php', + 'OC\\DB\\QueryBuilder\\Sharded\\AutoIncrementHandler' => $baseDir . '/lib/private/DB/QueryBuilder/Sharded/AutoIncrementHandler.php', + 'OC\\DB\\QueryBuilder\\Sharded\\CrossShardMoveHelper' => $baseDir . '/lib/private/DB/QueryBuilder/Sharded/CrossShardMoveHelper.php', + 'OC\\DB\\QueryBuilder\\Sharded\\HashShardMapper' => $baseDir . '/lib/private/DB/QueryBuilder/Sharded/HashShardMapper.php', + 'OC\\DB\\QueryBuilder\\Sharded\\InvalidShardedQueryException' => $baseDir . '/lib/private/DB/QueryBuilder/Sharded/InvalidShardedQueryException.php', + 'OC\\DB\\QueryBuilder\\Sharded\\RoundRobinShardMapper' => $baseDir . '/lib/private/DB/QueryBuilder/Sharded/RoundRobinShardMapper.php', + 'OC\\DB\\QueryBuilder\\Sharded\\ShardConnectionManager' => $baseDir . '/lib/private/DB/QueryBuilder/Sharded/ShardConnectionManager.php', + 'OC\\DB\\QueryBuilder\\Sharded\\ShardDefinition' => $baseDir . '/lib/private/DB/QueryBuilder/Sharded/ShardDefinition.php', + 'OC\\DB\\QueryBuilder\\Sharded\\ShardQueryRunner' => $baseDir . '/lib/private/DB/QueryBuilder/Sharded/ShardQueryRunner.php', + 'OC\\DB\\QueryBuilder\\Sharded\\ShardedQueryBuilder' => $baseDir . '/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php', 'OC\\DB\\ResultAdapter' => $baseDir . '/lib/private/DB/ResultAdapter.php', 'OC\\DB\\SQLiteMigrator' => $baseDir . '/lib/private/DB/SQLiteMigrator.php', 'OC\\DB\\SQLiteSessionInit' => $baseDir . '/lib/private/DB/SQLiteSessionInit.php', @@ -1444,6 +1525,7 @@ return array( 'OC\\Files\\Config\\UserMountCache' => $baseDir . '/lib/private/Files/Config/UserMountCache.php', 'OC\\Files\\Config\\UserMountCacheListener' => $baseDir . '/lib/private/Files/Config/UserMountCacheListener.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', 'OC\\Files\\Lock\\LockManager' => $baseDir . '/lib/private/Files/Lock/LockManager.php', 'OC\\Files\\Mount\\CacheMountProvider' => $baseDir . '/lib/private/Files/Mount/CacheMountProvider.php', @@ -1559,6 +1641,7 @@ return array( 'OC\\Http\\Client\\Response' => $baseDir . '/lib/private/Http/Client/Response.php', 'OC\\Http\\CookieHelper' => $baseDir . '/lib/private/Http/CookieHelper.php', 'OC\\Http\\WellKnown\\RequestManager' => $baseDir . '/lib/private/Http/WellKnown/RequestManager.php', + 'OC\\Image' => $baseDir . '/lib/private/Image.php', 'OC\\InitialStateService' => $baseDir . '/lib/private/InitialStateService.php', 'OC\\Installer' => $baseDir . '/lib/private/Installer.php', 'OC\\IntegrityCheck\\Checker' => $baseDir . '/lib/private/IntegrityCheck/Checker.php', @@ -1601,6 +1684,7 @@ return array( 'OC\\Mail\\EMailTemplate' => $baseDir . '/lib/private/Mail/EMailTemplate.php', 'OC\\Mail\\Mailer' => $baseDir . '/lib/private/Mail/Mailer.php', 'OC\\Mail\\Message' => $baseDir . '/lib/private/Mail/Message.php', + 'OC\\Mail\\Provider\\Manager' => $baseDir . '/lib/private/Mail/Provider/Manager.php', 'OC\\Memcache\\APCu' => $baseDir . '/lib/private/Memcache/APCu.php', 'OC\\Memcache\\ArrayCache' => $baseDir . '/lib/private/Memcache/ArrayCache.php', 'OC\\Memcache\\CADTrait' => $baseDir . '/lib/private/Memcache/CADTrait.php', @@ -1616,6 +1700,8 @@ return array( 'OC\\MemoryInfo' => $baseDir . '/lib/private/MemoryInfo.php', 'OC\\Migration\\BackgroundRepair' => $baseDir . '/lib/private/Migration/BackgroundRepair.php', 'OC\\Migration\\ConsoleOutput' => $baseDir . '/lib/private/Migration/ConsoleOutput.php', + 'OC\\Migration\\Exceptions\\AttributeException' => $baseDir . '/lib/private/Migration/Exceptions/AttributeException.php', + 'OC\\Migration\\MetadataManager' => $baseDir . '/lib/private/Migration/MetadataManager.php', 'OC\\Migration\\NullOutput' => $baseDir . '/lib/private/Migration/NullOutput.php', 'OC\\Migration\\SimpleOutput' => $baseDir . '/lib/private/Migration/SimpleOutput.php', 'OC\\NaturalSort' => $baseDir . '/lib/private/NaturalSort.php', @@ -1631,11 +1717,10 @@ return array( 'OC\\OCM\\Model\\OCMProvider' => $baseDir . '/lib/private/OCM/Model/OCMProvider.php', 'OC\\OCM\\Model\\OCMResource' => $baseDir . '/lib/private/OCM/Model/OCMResource.php', 'OC\\OCM\\OCMDiscoveryService' => $baseDir . '/lib/private/OCM/OCMDiscoveryService.php', + 'OC\\OCS\\ApiHelper' => $baseDir . '/lib/private/OCS/ApiHelper.php', 'OC\\OCS\\CoreCapabilities' => $baseDir . '/lib/private/OCS/CoreCapabilities.php', 'OC\\OCS\\DiscoveryService' => $baseDir . '/lib/private/OCS/DiscoveryService.php', - 'OC\\OCS\\Exception' => $baseDir . '/lib/private/OCS/Exception.php', 'OC\\OCS\\Provider' => $baseDir . '/lib/private/OCS/Provider.php', - 'OC\\OCS\\Result' => $baseDir . '/lib/private/OCS/Result.php', 'OC\\PhoneNumberUtil' => $baseDir . '/lib/private/PhoneNumberUtil.php', 'OC\\PreviewManager' => $baseDir . '/lib/private/PreviewManager.php', 'OC\\PreviewNotAvailableException' => $baseDir . '/lib/private/PreviewNotAvailableException.php', @@ -1653,6 +1738,7 @@ return array( 'OC\\Preview\\Illustrator' => $baseDir . '/lib/private/Preview/Illustrator.php', 'OC\\Preview\\Image' => $baseDir . '/lib/private/Preview/Image.php', 'OC\\Preview\\Imaginary' => $baseDir . '/lib/private/Preview/Imaginary.php', + 'OC\\Preview\\ImaginaryPDF' => $baseDir . '/lib/private/Preview/ImaginaryPDF.php', 'OC\\Preview\\JPEG' => $baseDir . '/lib/private/Preview/JPEG.php', 'OC\\Preview\\Krita' => $baseDir . '/lib/private/Preview/Krita.php', 'OC\\Preview\\MP3' => $baseDir . '/lib/private/Preview/MP3.php', @@ -1724,7 +1810,6 @@ return array( 'OC\\Repair\\Events\\RepairStepEvent' => $baseDir . '/lib/private/Repair/Events/RepairStepEvent.php', 'OC\\Repair\\Events\\RepairWarningEvent' => $baseDir . '/lib/private/Repair/Events/RepairWarningEvent.php', 'OC\\Repair\\MoveUpdaterStepFile' => $baseDir . '/lib/private/Repair/MoveUpdaterStepFile.php', - 'OC\\Repair\\NC11\\FixMountStorages' => $baseDir . '/lib/private/Repair/NC11/FixMountStorages.php', 'OC\\Repair\\NC13\\AddLogRotateJob' => $baseDir . '/lib/private/Repair/NC13/AddLogRotateJob.php', 'OC\\Repair\\NC14\\AddPreviewBackgroundCleanupJob' => $baseDir . '/lib/private/Repair/NC14/AddPreviewBackgroundCleanupJob.php', 'OC\\Repair\\NC16\\AddClenupLoginFlowV2BackgroundJob' => $baseDir . '/lib/private/Repair/NC16/AddClenupLoginFlowV2BackgroundJob.php', @@ -1739,6 +1824,7 @@ return array( 'OC\\Repair\\NC22\\LookupServerSendCheck' => $baseDir . '/lib/private/Repair/NC22/LookupServerSendCheck.php', 'OC\\Repair\\NC24\\AddTokenCleanupJob' => $baseDir . '/lib/private/Repair/NC24/AddTokenCleanupJob.php', 'OC\\Repair\\NC25\\AddMissingSecretJob' => $baseDir . '/lib/private/Repair/NC25/AddMissingSecretJob.php', + 'OC\\Repair\\NC30\\RemoveLegacyDatadirFile' => $baseDir . '/lib/private/Repair/NC30/RemoveLegacyDatadirFile.php', 'OC\\Repair\\OldGroupMembershipShares' => $baseDir . '/lib/private/Repair/OldGroupMembershipShares.php', 'OC\\Repair\\Owncloud\\CleanPreviews' => $baseDir . '/lib/private/Repair/Owncloud/CleanPreviews.php', 'OC\\Repair\\Owncloud\\CleanPreviewsBackgroundJob' => $baseDir . '/lib/private/Repair/Owncloud/CleanPreviewsBackgroundJob.php', @@ -1751,12 +1837,12 @@ return array( 'OC\\Repair\\RemoveLinkShares' => $baseDir . '/lib/private/Repair/RemoveLinkShares.php', 'OC\\Repair\\RepairDavShares' => $baseDir . '/lib/private/Repair/RepairDavShares.php', 'OC\\Repair\\RepairInvalidShares' => $baseDir . '/lib/private/Repair/RepairInvalidShares.php', + 'OC\\Repair\\RepairLogoDimension' => $baseDir . '/lib/private/Repair/RepairLogoDimension.php', 'OC\\Repair\\RepairMimeTypes' => $baseDir . '/lib/private/Repair/RepairMimeTypes.php', 'OC\\RichObjectStrings\\Validator' => $baseDir . '/lib/private/RichObjectStrings/Validator.php', 'OC\\Route\\CachingRouter' => $baseDir . '/lib/private/Route/CachingRouter.php', 'OC\\Route\\Route' => $baseDir . '/lib/private/Route/Route.php', 'OC\\Route\\Router' => $baseDir . '/lib/private/Route/Router.php', - 'OC\\Search' => $baseDir . '/lib/private/Search.php', 'OC\\Search\\FilterCollection' => $baseDir . '/lib/private/Search/FilterCollection.php', 'OC\\Search\\FilterFactory' => $baseDir . '/lib/private/Search/FilterFactory.php', 'OC\\Search\\Filter\\BooleanFilter' => $baseDir . '/lib/private/Search/Filter/BooleanFilter.php', @@ -1767,11 +1853,6 @@ return array( 'OC\\Search\\Filter\\StringFilter' => $baseDir . '/lib/private/Search/Filter/StringFilter.php', 'OC\\Search\\Filter\\StringsFilter' => $baseDir . '/lib/private/Search/Filter/StringsFilter.php', 'OC\\Search\\Filter\\UserFilter' => $baseDir . '/lib/private/Search/Filter/UserFilter.php', - 'OC\\Search\\Provider\\File' => $baseDir . '/lib/private/Search/Provider/File.php', - 'OC\\Search\\Result\\Audio' => $baseDir . '/lib/private/Search/Result/Audio.php', - 'OC\\Search\\Result\\File' => $baseDir . '/lib/private/Search/Result/File.php', - 'OC\\Search\\Result\\Folder' => $baseDir . '/lib/private/Search/Result/Folder.php', - 'OC\\Search\\Result\\Image' => $baseDir . '/lib/private/Search/Result/Image.php', 'OC\\Search\\SearchComposer' => $baseDir . '/lib/private/Search/SearchComposer.php', 'OC\\Search\\SearchQuery' => $baseDir . '/lib/private/Search/SearchQuery.php', 'OC\\Search\\UnsupportedFilter' => $baseDir . '/lib/private/Search/UnsupportedFilter.php', @@ -1798,6 +1879,10 @@ return array( 'OC\\Security\\IdentityProof\\Key' => $baseDir . '/lib/private/Security/IdentityProof/Key.php', '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\\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', 'OC\\Security\\Normalizer\\IpAddress' => $baseDir . '/lib/private/Security/Normalizer/IpAddress.php', 'OC\\Security\\RateLimiting\\Backend\\DatabaseBackend' => $baseDir . '/lib/private/Security/RateLimiting/Backend/DatabaseBackend.php', 'OC\\Security\\RateLimiting\\Backend\\IBackend' => $baseDir . '/lib/private/Security/RateLimiting/Backend/IBackend.php', @@ -1899,6 +1984,8 @@ return array( 'OC\\Updater\\Changes' => $baseDir . '/lib/private/Updater/Changes.php', 'OC\\Updater\\ChangesCheck' => $baseDir . '/lib/private/Updater/ChangesCheck.php', 'OC\\Updater\\ChangesMapper' => $baseDir . '/lib/private/Updater/ChangesMapper.php', + 'OC\\Updater\\Exceptions\\ReleaseMetadataException' => $baseDir . '/lib/private/Updater/Exceptions/ReleaseMetadataException.php', + 'OC\\Updater\\ReleaseMetadata' => $baseDir . '/lib/private/Updater/ReleaseMetadata.php', 'OC\\Updater\\VersionCheck' => $baseDir . '/lib/private/Updater/VersionCheck.php', 'OC\\UserStatus\\ISettableProvider' => $baseDir . '/lib/private/UserStatus/ISettableProvider.php', 'OC\\UserStatus\\Manager' => $baseDir . '/lib/private/UserStatus/Manager.php', @@ -1915,13 +2002,11 @@ return array( 'OC\\User\\OutOfOfficeData' => $baseDir . '/lib/private/User/OutOfOfficeData.php', 'OC\\User\\Session' => $baseDir . '/lib/private/User/Session.php', 'OC\\User\\User' => $baseDir . '/lib/private/User/User.php', - 'OC_API' => $baseDir . '/lib/private/legacy/OC_API.php', 'OC_App' => $baseDir . '/lib/private/legacy/OC_App.php', 'OC_Defaults' => $baseDir . '/lib/private/legacy/OC_Defaults.php', 'OC_Files' => $baseDir . '/lib/private/legacy/OC_Files.php', 'OC_Helper' => $baseDir . '/lib/private/legacy/OC_Helper.php', 'OC_Hook' => $baseDir . '/lib/private/legacy/OC_Hook.php', - 'OC_Image' => $baseDir . '/lib/private/legacy/OC_Image.php', 'OC_JSON' => $baseDir . '/lib/private/legacy/OC_JSON.php', 'OC_Response' => $baseDir . '/lib/private/legacy/OC_Response.php', 'OC_Template' => $baseDir . '/lib/private/legacy/OC_Template.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 51044d28a46..293e79f80c6 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -77,6 +77,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OCP\\AppFramework\\Http\\Attribute\\ARateLimit' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/Attribute/ARateLimit.php', 'OCP\\AppFramework\\Http\\Attribute\\AnonRateLimit' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/Attribute/AnonRateLimit.php', 'OCP\\AppFramework\\Http\\Attribute\\ApiRoute' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/Attribute/ApiRoute.php', + 'OCP\\AppFramework\\Http\\Attribute\\AppApiAdminAccessWithoutUser' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/Attribute/AppApiAdminAccessWithoutUser.php', 'OCP\\AppFramework\\Http\\Attribute\\AuthorizedAdminSetting' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/Attribute/AuthorizedAdminSetting.php', 'OCP\\AppFramework\\Http\\Attribute\\BruteForceProtection' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/Attribute/BruteForceProtection.php', 'OCP\\AppFramework\\Http\\Attribute\\CORS' => __DIR__ . '/../../..' . '/lib/public/AppFramework/Http/Attribute/CORS.php', @@ -222,6 +223,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OCP\\Collaboration\\Collaborators\\SearchResultType' => __DIR__ . '/../../..' . '/lib/public/Collaboration/Collaborators/SearchResultType.php', 'OCP\\Collaboration\\Reference\\ADiscoverableReferenceProvider' => __DIR__ . '/../../..' . '/lib/public/Collaboration/Reference/ADiscoverableReferenceProvider.php', 'OCP\\Collaboration\\Reference\\IDiscoverableReferenceProvider' => __DIR__ . '/../../..' . '/lib/public/Collaboration/Reference/IDiscoverableReferenceProvider.php', + 'OCP\\Collaboration\\Reference\\IPublicReferenceProvider' => __DIR__ . '/../../..' . '/lib/public/Collaboration/Reference/IPublicReferenceProvider.php', 'OCP\\Collaboration\\Reference\\IReference' => __DIR__ . '/../../..' . '/lib/public/Collaboration/Reference/IReference.php', 'OCP\\Collaboration\\Reference\\IReferenceManager' => __DIR__ . '/../../..' . '/lib/public/Collaboration/Reference/IReferenceManager.php', 'OCP\\Collaboration\\Reference\\IReferenceProvider' => __DIR__ . '/../../..' . '/lib/public/Collaboration/Reference/IReferenceProvider.php', @@ -278,6 +280,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OCP\\DB\\QueryBuilder\\IParameter' => __DIR__ . '/../../..' . '/lib/public/DB/QueryBuilder/IParameter.php', 'OCP\\DB\\QueryBuilder\\IQueryBuilder' => __DIR__ . '/../../..' . '/lib/public/DB/QueryBuilder/IQueryBuilder.php', 'OCP\\DB\\QueryBuilder\\IQueryFunction' => __DIR__ . '/../../..' . '/lib/public/DB/QueryBuilder/IQueryFunction.php', + 'OCP\\DB\\QueryBuilder\\Sharded\\IShardMapper' => __DIR__ . '/../../..' . '/lib/public/DB/QueryBuilder/Sharded/IShardMapper.php', 'OCP\\DB\\Types' => __DIR__ . '/../../..' . '/lib/public/DB/Types.php', 'OCP\\Dashboard\\IAPIWidget' => __DIR__ . '/../../..' . '/lib/public/Dashboard/IAPIWidget.php', 'OCP\\Dashboard\\IAPIWidgetV2' => __DIR__ . '/../../..' . '/lib/public/Dashboard/IAPIWidgetV2.php', @@ -412,6 +415,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OCP\\Files\\ForbiddenException' => __DIR__ . '/../../..' . '/lib/public/Files/ForbiddenException.php', 'OCP\\Files\\GenericFileException' => __DIR__ . '/../../..' . '/lib/public/Files/GenericFileException.php', 'OCP\\Files\\IAppData' => __DIR__ . '/../../..' . '/lib/public/Files/IAppData.php', + 'OCP\\Files\\IFilenameValidator' => __DIR__ . '/../../..' . '/lib/public/Files/IFilenameValidator.php', 'OCP\\Files\\IHomeStorage' => __DIR__ . '/../../..' . '/lib/public/Files/IHomeStorage.php', 'OCP\\Files\\IMimeTypeDetector' => __DIR__ . '/../../..' . '/lib/public/Files/IMimeTypeDetector.php', 'OCP\\Files\\IMimeTypeLoader' => __DIR__ . '/../../..' . '/lib/public/Files/IMimeTypeLoader.php', @@ -462,12 +466,20 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OCP\\Files\\Storage\\ILockingStorage' => __DIR__ . '/../../..' . '/lib/public/Files/Storage/ILockingStorage.php', 'OCP\\Files\\Storage\\INotifyStorage' => __DIR__ . '/../../..' . '/lib/public/Files/Storage/INotifyStorage.php', 'OCP\\Files\\Storage\\IReliableEtagStorage' => __DIR__ . '/../../..' . '/lib/public/Files/Storage/IReliableEtagStorage.php', + 'OCP\\Files\\Storage\\ISharedStorage' => __DIR__ . '/../../..' . '/lib/public/Files/Storage/ISharedStorage.php', 'OCP\\Files\\Storage\\IStorage' => __DIR__ . '/../../..' . '/lib/public/Files/Storage/IStorage.php', 'OCP\\Files\\Storage\\IStorageFactory' => __DIR__ . '/../../..' . '/lib/public/Files/Storage/IStorageFactory.php', 'OCP\\Files\\Storage\\IWriteStreamStorage' => __DIR__ . '/../../..' . '/lib/public/Files/Storage/IWriteStreamStorage.php', + 'OCP\\Files\\Template\\BeforeGetTemplatesEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Template/BeforeGetTemplatesEvent.php', + 'OCP\\Files\\Template\\Field' => __DIR__ . '/../../..' . '/lib/public/Files/Template/Field.php', + 'OCP\\Files\\Template\\FieldFactory' => __DIR__ . '/../../..' . '/lib/public/Files/Template/FieldFactory.php', + 'OCP\\Files\\Template\\FieldType' => __DIR__ . '/../../..' . '/lib/public/Files/Template/FieldType.php', + 'OCP\\Files\\Template\\Fields\\CheckBoxField' => __DIR__ . '/../../..' . '/lib/public/Files/Template/Fields/CheckBoxField.php', + 'OCP\\Files\\Template\\Fields\\RichTextField' => __DIR__ . '/../../..' . '/lib/public/Files/Template/Fields/RichTextField.php', 'OCP\\Files\\Template\\FileCreatedFromTemplateEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Template/FileCreatedFromTemplateEvent.php', 'OCP\\Files\\Template\\ICustomTemplateProvider' => __DIR__ . '/../../..' . '/lib/public/Files/Template/ICustomTemplateProvider.php', 'OCP\\Files\\Template\\ITemplateManager' => __DIR__ . '/../../..' . '/lib/public/Files/Template/ITemplateManager.php', + 'OCP\\Files\\Template\\InvalidFieldTypeException' => __DIR__ . '/../../..' . '/lib/public/Files/Template/InvalidFieldTypeException.php', 'OCP\\Files\\Template\\RegisterTemplateCreatorEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Template/RegisterTemplateCreatorEvent.php', 'OCP\\Files\\Template\\Template' => __DIR__ . '/../../..' . '/lib/public/Files/Template/Template.php', 'OCP\\Files\\Template\\TemplateFileCreator' => __DIR__ . '/../../..' . '/lib/public/Files/Template/TemplateFileCreator.php', @@ -563,7 +575,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OCP\\IPreview' => __DIR__ . '/../../..' . '/lib/public/IPreview.php', 'OCP\\IRequest' => __DIR__ . '/../../..' . '/lib/public/IRequest.php', 'OCP\\IRequestId' => __DIR__ . '/../../..' . '/lib/public/IRequestId.php', - 'OCP\\ISearch' => __DIR__ . '/../../..' . '/lib/public/ISearch.php', 'OCP\\IServerContainer' => __DIR__ . '/../../..' . '/lib/public/IServerContainer.php', 'OCP\\ISession' => __DIR__ . '/../../..' . '/lib/public/ISession.php', 'OCP\\IStreamImage' => __DIR__ . '/../../..' . '/lib/public/IStreamImage.php', @@ -598,6 +609,32 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OCP\\Mail\\IEMailTemplate' => __DIR__ . '/../../..' . '/lib/public/Mail/IEMailTemplate.php', 'OCP\\Mail\\IMailer' => __DIR__ . '/../../..' . '/lib/public/Mail/IMailer.php', 'OCP\\Mail\\IMessage' => __DIR__ . '/../../..' . '/lib/public/Mail/IMessage.php', + 'OCP\\Mail\\Provider\\Address' => __DIR__ . '/../../..' . '/lib/public/Mail/Provider/Address.php', + 'OCP\\Mail\\Provider\\Attachment' => __DIR__ . '/../../..' . '/lib/public/Mail/Provider/Attachment.php', + 'OCP\\Mail\\Provider\\Exception\\Exception' => __DIR__ . '/../../..' . '/lib/public/Mail/Provider/Exception/Exception.php', + 'OCP\\Mail\\Provider\\Exception\\SendException' => __DIR__ . '/../../..' . '/lib/public/Mail/Provider/Exception/SendException.php', + 'OCP\\Mail\\Provider\\IAddress' => __DIR__ . '/../../..' . '/lib/public/Mail/Provider/IAddress.php', + 'OCP\\Mail\\Provider\\IAttachment' => __DIR__ . '/../../..' . '/lib/public/Mail/Provider/IAttachment.php', + 'OCP\\Mail\\Provider\\IManager' => __DIR__ . '/../../..' . '/lib/public/Mail/Provider/IManager.php', + 'OCP\\Mail\\Provider\\IMessage' => __DIR__ . '/../../..' . '/lib/public/Mail/Provider/IMessage.php', + 'OCP\\Mail\\Provider\\IMessageSend' => __DIR__ . '/../../..' . '/lib/public/Mail/Provider/IMessageSend.php', + 'OCP\\Mail\\Provider\\IProvider' => __DIR__ . '/../../..' . '/lib/public/Mail/Provider/IProvider.php', + 'OCP\\Mail\\Provider\\IService' => __DIR__ . '/../../..' . '/lib/public/Mail/Provider/IService.php', + 'OCP\\Mail\\Provider\\Message' => __DIR__ . '/../../..' . '/lib/public/Mail/Provider/Message.php', + 'OCP\\Migration\\Attributes\\AddColumn' => __DIR__ . '/../../..' . '/lib/public/Migration/Attributes/AddColumn.php', + 'OCP\\Migration\\Attributes\\AddIndex' => __DIR__ . '/../../..' . '/lib/public/Migration/Attributes/AddIndex.php', + 'OCP\\Migration\\Attributes\\ColumnMigrationAttribute' => __DIR__ . '/../../..' . '/lib/public/Migration/Attributes/ColumnMigrationAttribute.php', + 'OCP\\Migration\\Attributes\\ColumnType' => __DIR__ . '/../../..' . '/lib/public/Migration/Attributes/ColumnType.php', + 'OCP\\Migration\\Attributes\\CreateTable' => __DIR__ . '/../../..' . '/lib/public/Migration/Attributes/CreateTable.php', + 'OCP\\Migration\\Attributes\\DropColumn' => __DIR__ . '/../../..' . '/lib/public/Migration/Attributes/DropColumn.php', + 'OCP\\Migration\\Attributes\\DropIndex' => __DIR__ . '/../../..' . '/lib/public/Migration/Attributes/DropIndex.php', + 'OCP\\Migration\\Attributes\\DropTable' => __DIR__ . '/../../..' . '/lib/public/Migration/Attributes/DropTable.php', + 'OCP\\Migration\\Attributes\\GenericMigrationAttribute' => __DIR__ . '/../../..' . '/lib/public/Migration/Attributes/GenericMigrationAttribute.php', + 'OCP\\Migration\\Attributes\\IndexMigrationAttribute' => __DIR__ . '/../../..' . '/lib/public/Migration/Attributes/IndexMigrationAttribute.php', + 'OCP\\Migration\\Attributes\\IndexType' => __DIR__ . '/../../..' . '/lib/public/Migration/Attributes/IndexType.php', + 'OCP\\Migration\\Attributes\\MigrationAttribute' => __DIR__ . '/../../..' . '/lib/public/Migration/Attributes/MigrationAttribute.php', + 'OCP\\Migration\\Attributes\\ModifyColumn' => __DIR__ . '/../../..' . '/lib/public/Migration/Attributes/ModifyColumn.php', + 'OCP\\Migration\\Attributes\\TableMigrationAttribute' => __DIR__ . '/../../..' . '/lib/public/Migration/Attributes/TableMigrationAttribute.php', 'OCP\\Migration\\BigIntMigration' => __DIR__ . '/../../..' . '/lib/public/Migration/BigIntMigration.php', 'OCP\\Migration\\IMigrationStep' => __DIR__ . '/../../..' . '/lib/public/Migration/IMigrationStep.php', 'OCP\\Migration\\IOutput' => __DIR__ . '/../../..' . '/lib/public/Migration/IOutput.php', @@ -674,6 +711,11 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OCP\\Security\\IRemoteHostValidator' => __DIR__ . '/../../..' . '/lib/public/Security/IRemoteHostValidator.php', 'OCP\\Security\\ISecureRandom' => __DIR__ . '/../../..' . '/lib/public/Security/ISecureRandom.php', 'OCP\\Security\\ITrustedDomainHelper' => __DIR__ . '/../../..' . '/lib/public/Security/ITrustedDomainHelper.php', + 'OCP\\Security\\Ip\\IAddress' => __DIR__ . '/../../..' . '/lib/public/Security/Ip/IAddress.php', + 'OCP\\Security\\Ip\\IFactory' => __DIR__ . '/../../..' . '/lib/public/Security/Ip/IFactory.php', + 'OCP\\Security\\Ip\\IRange' => __DIR__ . '/../../..' . '/lib/public/Security/Ip/IRange.php', + 'OCP\\Security\\Ip\\IRemoteAddress' => __DIR__ . '/../../..' . '/lib/public/Security/Ip/IRemoteAddress.php', + 'OCP\\Security\\PasswordContext' => __DIR__ . '/../../..' . '/lib/public/Security/PasswordContext.php', 'OCP\\Security\\RateLimiting\\ILimiter' => __DIR__ . '/../../..' . '/lib/public/Security/RateLimiting/ILimiter.php', 'OCP\\Security\\RateLimiting\\IRateLimitExceededException' => __DIR__ . '/../../..' . '/lib/public/Security/RateLimiting/IRateLimitExceededException.php', 'OCP\\Security\\VerificationToken\\IVerificationToken' => __DIR__ . '/../../..' . '/lib/public/Security/VerificationToken/IVerificationToken.php', @@ -714,6 +756,8 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OCP\\Share\\IShare' => __DIR__ . '/../../..' . '/lib/public/Share/IShare.php', 'OCP\\Share\\IShareHelper' => __DIR__ . '/../../..' . '/lib/public/Share/IShareHelper.php', 'OCP\\Share\\IShareProvider' => __DIR__ . '/../../..' . '/lib/public/Share/IShareProvider.php', + 'OCP\\Share\\IShareProviderSupportsAccept' => __DIR__ . '/../../..' . '/lib/public/Share/IShareProviderSupportsAccept.php', + 'OCP\\Share\\IShareProviderWithNotification' => __DIR__ . '/../../..' . '/lib/public/Share/IShareProviderWithNotification.php', 'OCP\\Share_Backend' => __DIR__ . '/../../..' . '/lib/public/Share_Backend.php', 'OCP\\Share_Backend_Collection' => __DIR__ . '/../../..' . '/lib/public/Share_Backend_Collection.php', 'OCP\\Share_Backend_File_Dependent' => __DIR__ . '/../../..' . '/lib/public/Share_Backend_File_Dependent.php', @@ -762,6 +806,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OCP\\TaskProcessing\\ISynchronousProvider' => __DIR__ . '/../../..' . '/lib/public/TaskProcessing/ISynchronousProvider.php', 'OCP\\TaskProcessing\\ITaskType' => __DIR__ . '/../../..' . '/lib/public/TaskProcessing/ITaskType.php', 'OCP\\TaskProcessing\\ShapeDescriptor' => __DIR__ . '/../../..' . '/lib/public/TaskProcessing/ShapeDescriptor.php', + 'OCP\\TaskProcessing\\ShapeEnumValue' => __DIR__ . '/../../..' . '/lib/public/TaskProcessing/ShapeEnumValue.php', 'OCP\\TaskProcessing\\Task' => __DIR__ . '/../../..' . '/lib/public/TaskProcessing/Task.php', 'OCP\\TaskProcessing\\TaskTypes\\AudioToText' => __DIR__ . '/../../..' . '/lib/public/TaskProcessing/TaskTypes/AudioToText.php', 'OCP\\TaskProcessing\\TaskTypes\\ContextWrite' => __DIR__ . '/../../..' . '/lib/public/TaskProcessing/TaskTypes/ContextWrite.php', @@ -775,6 +820,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OCP\\TaskProcessing\\TaskTypes\\TextToTextSimplification' => __DIR__ . '/../../..' . '/lib/public/TaskProcessing/TaskTypes/TextToTextSimplification.php', 'OCP\\TaskProcessing\\TaskTypes\\TextToTextSummary' => __DIR__ . '/../../..' . '/lib/public/TaskProcessing/TaskTypes/TextToTextSummary.php', 'OCP\\TaskProcessing\\TaskTypes\\TextToTextTopics' => __DIR__ . '/../../..' . '/lib/public/TaskProcessing/TaskTypes/TextToTextTopics.php', + 'OCP\\TaskProcessing\\TaskTypes\\TextToTextTranslate' => __DIR__ . '/../../..' . '/lib/public/TaskProcessing/TaskTypes/TextToTextTranslate.php', 'OCP\\Teams\\ITeamManager' => __DIR__ . '/../../..' . '/lib/public/Teams/ITeamManager.php', 'OCP\\Teams\\ITeamResourceProvider' => __DIR__ . '/../../..' . '/lib/public/Teams/ITeamResourceProvider.php', 'OCP\\Teams\\Team' => __DIR__ . '/../../..' . '/lib/public/Teams/Team.php', @@ -832,6 +878,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 '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\\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', 'OCP\\User\\Backend\\IProvideEnabledStateBackend' => __DIR__ . '/../../..' . '/lib/public/User/Backend/IProvideEnabledStateBackend.php', 'OCP\\User\\Backend\\ISearchKnownUsersBackend' => __DIR__ . '/../../..' . '/lib/public/User/Backend/ISearchKnownUsersBackend.php', @@ -840,6 +887,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OCP\\User\\Events\\BeforePasswordUpdatedEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/BeforePasswordUpdatedEvent.php', 'OCP\\User\\Events\\BeforeUserCreatedEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/BeforeUserCreatedEvent.php', 'OCP\\User\\Events\\BeforeUserDeletedEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/BeforeUserDeletedEvent.php', + 'OCP\\User\\Events\\BeforeUserIdUnassignedEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/BeforeUserIdUnassignedEvent.php', 'OCP\\User\\Events\\BeforeUserLoggedInEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/BeforeUserLoggedInEvent.php', 'OCP\\User\\Events\\BeforeUserLoggedInWithCookieEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/BeforeUserLoggedInWithCookieEvent.php', 'OCP\\User\\Events\\BeforeUserLoggedOutEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/BeforeUserLoggedOutEvent.php', @@ -854,6 +902,8 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OCP\\User\\Events\\UserCreatedEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/UserCreatedEvent.php', 'OCP\\User\\Events\\UserDeletedEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/UserDeletedEvent.php', 'OCP\\User\\Events\\UserFirstTimeLoggedInEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/UserFirstTimeLoggedInEvent.php', + 'OCP\\User\\Events\\UserIdAssignedEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/UserIdAssignedEvent.php', + 'OCP\\User\\Events\\UserIdUnassignedEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/UserIdUnassignedEvent.php', 'OCP\\User\\Events\\UserLiveStatusEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/UserLiveStatusEvent.php', 'OCP\\User\\Events\\UserLoggedInEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/UserLoggedInEvent.php', 'OCP\\User\\Events\\UserLoggedInWithCookieEvent' => __DIR__ . '/../../..' . '/lib/public/User/Events/UserLoggedInWithCookieEvent.php', @@ -924,6 +974,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\AppFramework\\Middleware\\Security\\BruteForceMiddleware' => __DIR__ . '/../../..' . '/lib/private/AppFramework/Middleware/Security/BruteForceMiddleware.php', 'OC\\AppFramework\\Middleware\\Security\\CORSMiddleware' => __DIR__ . '/../../..' . '/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php', 'OC\\AppFramework\\Middleware\\Security\\CSPMiddleware' => __DIR__ . '/../../..' . '/lib/private/AppFramework/Middleware/Security/CSPMiddleware.php', + 'OC\\AppFramework\\Middleware\\Security\\Exceptions\\AdminIpNotAllowedException' => __DIR__ . '/../../..' . '/lib/private/AppFramework/Middleware/Security/Exceptions/AdminIpNotAllowedException.php', 'OC\\AppFramework\\Middleware\\Security\\Exceptions\\AppNotEnabledException' => __DIR__ . '/../../..' . '/lib/private/AppFramework/Middleware/Security/Exceptions/AppNotEnabledException.php', 'OC\\AppFramework\\Middleware\\Security\\Exceptions\\CrossSiteRequestForgeryException' => __DIR__ . '/../../..' . '/lib/private/AppFramework/Middleware/Security/Exceptions/CrossSiteRequestForgeryException.php', 'OC\\AppFramework\\Middleware\\Security\\Exceptions\\ExAppRequiredException' => __DIR__ . '/../../..' . '/lib/private/AppFramework/Middleware/Security/Exceptions/ExAppRequiredException.php', @@ -1148,7 +1199,9 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Core\\Command\\Db\\ExportSchema' => __DIR__ . '/../../..' . '/core/Command/Db/ExportSchema.php', 'OC\\Core\\Command\\Db\\Migrations\\ExecuteCommand' => __DIR__ . '/../../..' . '/core/Command/Db/Migrations/ExecuteCommand.php', 'OC\\Core\\Command\\Db\\Migrations\\GenerateCommand' => __DIR__ . '/../../..' . '/core/Command/Db/Migrations/GenerateCommand.php', + 'OC\\Core\\Command\\Db\\Migrations\\GenerateMetadataCommand' => __DIR__ . '/../../..' . '/core/Command/Db/Migrations/GenerateMetadataCommand.php', 'OC\\Core\\Command\\Db\\Migrations\\MigrateCommand' => __DIR__ . '/../../..' . '/core/Command/Db/Migrations/MigrateCommand.php', + 'OC\\Core\\Command\\Db\\Migrations\\PreviewCommand' => __DIR__ . '/../../..' . '/core/Command/Db/Migrations/PreviewCommand.php', 'OC\\Core\\Command\\Db\\Migrations\\StatusCommand' => __DIR__ . '/../../..' . '/core/Command/Db/Migrations/StatusCommand.php', 'OC\\Core\\Command\\Db\\SchemaEncoder' => __DIR__ . '/../../..' . '/core/Command/Db/SchemaEncoder.php', 'OC\\Core\\Command\\Encryption\\ChangeKeyStorageRoot' => __DIR__ . '/../../..' . '/core/Command/Encryption/ChangeKeyStorageRoot.php', @@ -1189,11 +1242,13 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Core\\Command\\Maintenance\\RepairShareOwnership' => __DIR__ . '/../../..' . '/core/Command/Maintenance/RepairShareOwnership.php', 'OC\\Core\\Command\\Maintenance\\UpdateHtaccess' => __DIR__ . '/../../..' . '/core/Command/Maintenance/UpdateHtaccess.php', 'OC\\Core\\Command\\Maintenance\\UpdateTheme' => __DIR__ . '/../../..' . '/core/Command/Maintenance/UpdateTheme.php', + 'OC\\Core\\Command\\Memcache\\RedisCommand' => __DIR__ . '/../../..' . '/core/Command/Memcache/RedisCommand.php', 'OC\\Core\\Command\\Preview\\Generate' => __DIR__ . '/../../..' . '/core/Command/Preview/Generate.php', 'OC\\Core\\Command\\Preview\\Repair' => __DIR__ . '/../../..' . '/core/Command/Preview/Repair.php', 'OC\\Core\\Command\\Preview\\ResetRenderedTexts' => __DIR__ . '/../../..' . '/core/Command/Preview/ResetRenderedTexts.php', 'OC\\Core\\Command\\Security\\BruteforceAttempts' => __DIR__ . '/../../..' . '/core/Command/Security/BruteforceAttempts.php', 'OC\\Core\\Command\\Security\\BruteforceResetAttempts' => __DIR__ . '/../../..' . '/core/Command/Security/BruteforceResetAttempts.php', + 'OC\\Core\\Command\\Security\\ExportCertificates' => __DIR__ . '/../../..' . '/core/Command/Security/ExportCertificates.php', 'OC\\Core\\Command\\Security\\ImportCertificate' => __DIR__ . '/../../..' . '/core/Command/Security/ImportCertificate.php', 'OC\\Core\\Command\\Security\\ListCertificates' => __DIR__ . '/../../..' . '/core/Command/Security/ListCertificates.php', 'OC\\Core\\Command\\Security\\RemoveCertificate' => __DIR__ . '/../../..' . '/core/Command/Security/RemoveCertificate.php', @@ -1203,6 +1258,8 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Core\\Command\\SystemTag\\Delete' => __DIR__ . '/../../..' . '/core/Command/SystemTag/Delete.php', 'OC\\Core\\Command\\SystemTag\\Edit' => __DIR__ . '/../../..' . '/core/Command/SystemTag/Edit.php', 'OC\\Core\\Command\\SystemTag\\ListCommand' => __DIR__ . '/../../..' . '/core/Command/SystemTag/ListCommand.php', + 'OC\\Core\\Command\\TaskProcessing\\ListCommand' => __DIR__ . '/../../..' . '/core/Command/TaskProcessing/ListCommand.php', + 'OC\\Core\\Command\\TaskProcessing\\Statistics' => __DIR__ . '/../../..' . '/core/Command/TaskProcessing/Statistics.php', 'OC\\Core\\Command\\TwoFactorAuth\\Base' => __DIR__ . '/../../..' . '/core/Command/TwoFactorAuth/Base.php', 'OC\\Core\\Command\\TwoFactorAuth\\Cleanup' => __DIR__ . '/../../..' . '/core/Command/TwoFactorAuth/Cleanup.php', 'OC\\Core\\Command\\TwoFactorAuth\\Disable' => __DIR__ . '/../../..' . '/core/Command/TwoFactorAuth/Disable.php', @@ -1226,6 +1283,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Core\\Command\\User\\ResetPassword' => __DIR__ . '/../../..' . '/core/Command/User/ResetPassword.php', 'OC\\Core\\Command\\User\\Setting' => __DIR__ . '/../../..' . '/core/Command/User/Setting.php', 'OC\\Core\\Command\\User\\SyncAccountDataCommand' => __DIR__ . '/../../..' . '/core/Command/User/SyncAccountDataCommand.php', + 'OC\\Core\\Command\\User\\Welcome' => __DIR__ . '/../../..' . '/core/Command/User/Welcome.php', 'OC\\Core\\Controller\\AppPasswordController' => __DIR__ . '/../../..' . '/core/Controller/AppPasswordController.php', 'OC\\Core\\Controller\\AutoCompleteController' => __DIR__ . '/../../..' . '/core/Controller/AutoCompleteController.php', 'OC\\Core\\Controller\\AvatarController' => __DIR__ . '/../../..' . '/core/Controller/AvatarController.php', @@ -1251,7 +1309,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Core\\Controller\\RecommendedAppsController' => __DIR__ . '/../../..' . '/core/Controller/RecommendedAppsController.php', 'OC\\Core\\Controller\\ReferenceApiController' => __DIR__ . '/../../..' . '/core/Controller/ReferenceApiController.php', 'OC\\Core\\Controller\\ReferenceController' => __DIR__ . '/../../..' . '/core/Controller/ReferenceController.php', - 'OC\\Core\\Controller\\SearchController' => __DIR__ . '/../../..' . '/core/Controller/SearchController.php', 'OC\\Core\\Controller\\SetupController' => __DIR__ . '/../../..' . '/core/Controller/SetupController.php', 'OC\\Core\\Controller\\TaskProcessingApiController' => __DIR__ . '/../../..' . '/core/Controller/TaskProcessingApiController.php', 'OC\\Core\\Controller\\TeamsApiController' => __DIR__ . '/../../..' . '/core/Controller/TeamsApiController.php', @@ -1343,19 +1400,27 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Core\\Migrations\\Version28000Date20231004103301' => __DIR__ . '/../../..' . '/core/Migrations/Version28000Date20231004103301.php', 'OC\\Core\\Migrations\\Version28000Date20231103104802' => __DIR__ . '/../../..' . '/core/Migrations/Version28000Date20231103104802.php', 'OC\\Core\\Migrations\\Version28000Date20231126110901' => __DIR__ . '/../../..' . '/core/Migrations/Version28000Date20231126110901.php', + 'OC\\Core\\Migrations\\Version28000Date20240828142927' => __DIR__ . '/../../..' . '/core/Migrations/Version28000Date20240828142927.php', 'OC\\Core\\Migrations\\Version29000Date20231126110901' => __DIR__ . '/../../..' . '/core/Migrations/Version29000Date20231126110901.php', 'OC\\Core\\Migrations\\Version29000Date20231213104850' => __DIR__ . '/../../..' . '/core/Migrations/Version29000Date20231213104850.php', 'OC\\Core\\Migrations\\Version29000Date20240124132201' => __DIR__ . '/../../..' . '/core/Migrations/Version29000Date20240124132201.php', 'OC\\Core\\Migrations\\Version29000Date20240124132202' => __DIR__ . '/../../..' . '/core/Migrations/Version29000Date20240124132202.php', 'OC\\Core\\Migrations\\Version29000Date20240131122720' => __DIR__ . '/../../..' . '/core/Migrations/Version29000Date20240131122720.php', 'OC\\Core\\Migrations\\Version30000Date20240429122720' => __DIR__ . '/../../..' . '/core/Migrations/Version30000Date20240429122720.php', + 'OC\\Core\\Migrations\\Version30000Date20240708160048' => __DIR__ . '/../../..' . '/core/Migrations/Version30000Date20240708160048.php', + 'OC\\Core\\Migrations\\Version30000Date20240717111406' => __DIR__ . '/../../..' . '/core/Migrations/Version30000Date20240717111406.php', + 'OC\\Core\\Migrations\\Version30000Date20240814180800' => __DIR__ . '/../../..' . '/core/Migrations/Version30000Date20240814180800.php', + 'OC\\Core\\Migrations\\Version30000Date20240815080800' => __DIR__ . '/../../..' . '/core/Migrations/Version30000Date20240815080800.php', + 'OC\\Core\\Migrations\\Version30000Date20240906095113' => __DIR__ . '/../../..' . '/core/Migrations/Version30000Date20240906095113.php', 'OC\\Core\\Notification\\CoreNotifier' => __DIR__ . '/../../..' . '/core/Notification/CoreNotifier.php', + 'OC\\Core\\ResponseDefinitions' => __DIR__ . '/../../..' . '/core/ResponseDefinitions.php', 'OC\\Core\\Service\\LoginFlowV2Service' => __DIR__ . '/../../..' . '/core/Service/LoginFlowV2Service.php', 'OC\\DB\\Adapter' => __DIR__ . '/../../..' . '/lib/private/DB/Adapter.php', 'OC\\DB\\AdapterMySQL' => __DIR__ . '/../../..' . '/lib/private/DB/AdapterMySQL.php', 'OC\\DB\\AdapterOCI8' => __DIR__ . '/../../..' . '/lib/private/DB/AdapterOCI8.php', 'OC\\DB\\AdapterPgSql' => __DIR__ . '/../../..' . '/lib/private/DB/AdapterPgSql.php', 'OC\\DB\\AdapterSqlite' => __DIR__ . '/../../..' . '/lib/private/DB/AdapterSqlite.php', + 'OC\\DB\\ArrayResult' => __DIR__ . '/../../..' . '/lib/private/DB/ArrayResult.php', 'OC\\DB\\BacktraceDebugStack' => __DIR__ . '/../../..' . '/lib/private/DB/BacktraceDebugStack.php', 'OC\\DB\\Connection' => __DIR__ . '/../../..' . '/lib/private/DB/Connection.php', 'OC\\DB\\ConnectionAdapter' => __DIR__ . '/../../..' . '/lib/private/DB/ConnectionAdapter.php', @@ -1382,15 +1447,31 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\DB\\QueryBuilder\\ExpressionBuilder\\OCIExpressionBuilder' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php', 'OC\\DB\\QueryBuilder\\ExpressionBuilder\\PgSqlExpressionBuilder' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php', 'OC\\DB\\QueryBuilder\\ExpressionBuilder\\SqliteExpressionBuilder' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/ExpressionBuilder/SqliteExpressionBuilder.php', + 'OC\\DB\\QueryBuilder\\ExtendedQueryBuilder' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/ExtendedQueryBuilder.php', 'OC\\DB\\QueryBuilder\\FunctionBuilder\\FunctionBuilder' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php', 'OC\\DB\\QueryBuilder\\FunctionBuilder\\OCIFunctionBuilder' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php', 'OC\\DB\\QueryBuilder\\FunctionBuilder\\PgSqlFunctionBuilder' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php', 'OC\\DB\\QueryBuilder\\FunctionBuilder\\SqliteFunctionBuilder' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php', 'OC\\DB\\QueryBuilder\\Literal' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/Literal.php', 'OC\\DB\\QueryBuilder\\Parameter' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/Parameter.php', + 'OC\\DB\\QueryBuilder\\Partitioned\\InvalidPartitionedQueryException' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/Partitioned/InvalidPartitionedQueryException.php', + 'OC\\DB\\QueryBuilder\\Partitioned\\JoinCondition' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/Partitioned/JoinCondition.php', + 'OC\\DB\\QueryBuilder\\Partitioned\\PartitionQuery' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/Partitioned/PartitionQuery.php', + 'OC\\DB\\QueryBuilder\\Partitioned\\PartitionSplit' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/Partitioned/PartitionSplit.php', + 'OC\\DB\\QueryBuilder\\Partitioned\\PartitionedQueryBuilder' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/Partitioned/PartitionedQueryBuilder.php', + 'OC\\DB\\QueryBuilder\\Partitioned\\PartitionedResult' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/Partitioned/PartitionedResult.php', 'OC\\DB\\QueryBuilder\\QueryBuilder' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/QueryBuilder.php', 'OC\\DB\\QueryBuilder\\QueryFunction' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/QueryFunction.php', 'OC\\DB\\QueryBuilder\\QuoteHelper' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/QuoteHelper.php', + 'OC\\DB\\QueryBuilder\\Sharded\\AutoIncrementHandler' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/Sharded/AutoIncrementHandler.php', + 'OC\\DB\\QueryBuilder\\Sharded\\CrossShardMoveHelper' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/Sharded/CrossShardMoveHelper.php', + 'OC\\DB\\QueryBuilder\\Sharded\\HashShardMapper' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/Sharded/HashShardMapper.php', + 'OC\\DB\\QueryBuilder\\Sharded\\InvalidShardedQueryException' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/Sharded/InvalidShardedQueryException.php', + 'OC\\DB\\QueryBuilder\\Sharded\\RoundRobinShardMapper' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/Sharded/RoundRobinShardMapper.php', + 'OC\\DB\\QueryBuilder\\Sharded\\ShardConnectionManager' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/Sharded/ShardConnectionManager.php', + 'OC\\DB\\QueryBuilder\\Sharded\\ShardDefinition' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/Sharded/ShardDefinition.php', + 'OC\\DB\\QueryBuilder\\Sharded\\ShardQueryRunner' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/Sharded/ShardQueryRunner.php', + 'OC\\DB\\QueryBuilder\\Sharded\\ShardedQueryBuilder' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php', 'OC\\DB\\ResultAdapter' => __DIR__ . '/../../..' . '/lib/private/DB/ResultAdapter.php', 'OC\\DB\\SQLiteMigrator' => __DIR__ . '/../../..' . '/lib/private/DB/SQLiteMigrator.php', 'OC\\DB\\SQLiteSessionInit' => __DIR__ . '/../../..' . '/lib/private/DB/SQLiteSessionInit.php', @@ -1477,6 +1558,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Files\\Config\\UserMountCache' => __DIR__ . '/../../..' . '/lib/private/Files/Config/UserMountCache.php', 'OC\\Files\\Config\\UserMountCacheListener' => __DIR__ . '/../../..' . '/lib/private/Files/Config/UserMountCacheListener.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', 'OC\\Files\\Lock\\LockManager' => __DIR__ . '/../../..' . '/lib/private/Files/Lock/LockManager.php', 'OC\\Files\\Mount\\CacheMountProvider' => __DIR__ . '/../../..' . '/lib/private/Files/Mount/CacheMountProvider.php', @@ -1592,6 +1674,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Http\\Client\\Response' => __DIR__ . '/../../..' . '/lib/private/Http/Client/Response.php', 'OC\\Http\\CookieHelper' => __DIR__ . '/../../..' . '/lib/private/Http/CookieHelper.php', 'OC\\Http\\WellKnown\\RequestManager' => __DIR__ . '/../../..' . '/lib/private/Http/WellKnown/RequestManager.php', + 'OC\\Image' => __DIR__ . '/../../..' . '/lib/private/Image.php', 'OC\\InitialStateService' => __DIR__ . '/../../..' . '/lib/private/InitialStateService.php', 'OC\\Installer' => __DIR__ . '/../../..' . '/lib/private/Installer.php', 'OC\\IntegrityCheck\\Checker' => __DIR__ . '/../../..' . '/lib/private/IntegrityCheck/Checker.php', @@ -1634,6 +1717,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Mail\\EMailTemplate' => __DIR__ . '/../../..' . '/lib/private/Mail/EMailTemplate.php', 'OC\\Mail\\Mailer' => __DIR__ . '/../../..' . '/lib/private/Mail/Mailer.php', 'OC\\Mail\\Message' => __DIR__ . '/../../..' . '/lib/private/Mail/Message.php', + 'OC\\Mail\\Provider\\Manager' => __DIR__ . '/../../..' . '/lib/private/Mail/Provider/Manager.php', 'OC\\Memcache\\APCu' => __DIR__ . '/../../..' . '/lib/private/Memcache/APCu.php', 'OC\\Memcache\\ArrayCache' => __DIR__ . '/../../..' . '/lib/private/Memcache/ArrayCache.php', 'OC\\Memcache\\CADTrait' => __DIR__ . '/../../..' . '/lib/private/Memcache/CADTrait.php', @@ -1649,6 +1733,8 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\MemoryInfo' => __DIR__ . '/../../..' . '/lib/private/MemoryInfo.php', 'OC\\Migration\\BackgroundRepair' => __DIR__ . '/../../..' . '/lib/private/Migration/BackgroundRepair.php', 'OC\\Migration\\ConsoleOutput' => __DIR__ . '/../../..' . '/lib/private/Migration/ConsoleOutput.php', + 'OC\\Migration\\Exceptions\\AttributeException' => __DIR__ . '/../../..' . '/lib/private/Migration/Exceptions/AttributeException.php', + 'OC\\Migration\\MetadataManager' => __DIR__ . '/../../..' . '/lib/private/Migration/MetadataManager.php', 'OC\\Migration\\NullOutput' => __DIR__ . '/../../..' . '/lib/private/Migration/NullOutput.php', 'OC\\Migration\\SimpleOutput' => __DIR__ . '/../../..' . '/lib/private/Migration/SimpleOutput.php', 'OC\\NaturalSort' => __DIR__ . '/../../..' . '/lib/private/NaturalSort.php', @@ -1664,11 +1750,10 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\OCM\\Model\\OCMProvider' => __DIR__ . '/../../..' . '/lib/private/OCM/Model/OCMProvider.php', 'OC\\OCM\\Model\\OCMResource' => __DIR__ . '/../../..' . '/lib/private/OCM/Model/OCMResource.php', 'OC\\OCM\\OCMDiscoveryService' => __DIR__ . '/../../..' . '/lib/private/OCM/OCMDiscoveryService.php', + 'OC\\OCS\\ApiHelper' => __DIR__ . '/../../..' . '/lib/private/OCS/ApiHelper.php', 'OC\\OCS\\CoreCapabilities' => __DIR__ . '/../../..' . '/lib/private/OCS/CoreCapabilities.php', 'OC\\OCS\\DiscoveryService' => __DIR__ . '/../../..' . '/lib/private/OCS/DiscoveryService.php', - 'OC\\OCS\\Exception' => __DIR__ . '/../../..' . '/lib/private/OCS/Exception.php', 'OC\\OCS\\Provider' => __DIR__ . '/../../..' . '/lib/private/OCS/Provider.php', - 'OC\\OCS\\Result' => __DIR__ . '/../../..' . '/lib/private/OCS/Result.php', 'OC\\PhoneNumberUtil' => __DIR__ . '/../../..' . '/lib/private/PhoneNumberUtil.php', 'OC\\PreviewManager' => __DIR__ . '/../../..' . '/lib/private/PreviewManager.php', 'OC\\PreviewNotAvailableException' => __DIR__ . '/../../..' . '/lib/private/PreviewNotAvailableException.php', @@ -1686,6 +1771,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Preview\\Illustrator' => __DIR__ . '/../../..' . '/lib/private/Preview/Illustrator.php', 'OC\\Preview\\Image' => __DIR__ . '/../../..' . '/lib/private/Preview/Image.php', 'OC\\Preview\\Imaginary' => __DIR__ . '/../../..' . '/lib/private/Preview/Imaginary.php', + 'OC\\Preview\\ImaginaryPDF' => __DIR__ . '/../../..' . '/lib/private/Preview/ImaginaryPDF.php', 'OC\\Preview\\JPEG' => __DIR__ . '/../../..' . '/lib/private/Preview/JPEG.php', 'OC\\Preview\\Krita' => __DIR__ . '/../../..' . '/lib/private/Preview/Krita.php', 'OC\\Preview\\MP3' => __DIR__ . '/../../..' . '/lib/private/Preview/MP3.php', @@ -1757,7 +1843,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Repair\\Events\\RepairStepEvent' => __DIR__ . '/../../..' . '/lib/private/Repair/Events/RepairStepEvent.php', 'OC\\Repair\\Events\\RepairWarningEvent' => __DIR__ . '/../../..' . '/lib/private/Repair/Events/RepairWarningEvent.php', 'OC\\Repair\\MoveUpdaterStepFile' => __DIR__ . '/../../..' . '/lib/private/Repair/MoveUpdaterStepFile.php', - 'OC\\Repair\\NC11\\FixMountStorages' => __DIR__ . '/../../..' . '/lib/private/Repair/NC11/FixMountStorages.php', 'OC\\Repair\\NC13\\AddLogRotateJob' => __DIR__ . '/../../..' . '/lib/private/Repair/NC13/AddLogRotateJob.php', 'OC\\Repair\\NC14\\AddPreviewBackgroundCleanupJob' => __DIR__ . '/../../..' . '/lib/private/Repair/NC14/AddPreviewBackgroundCleanupJob.php', 'OC\\Repair\\NC16\\AddClenupLoginFlowV2BackgroundJob' => __DIR__ . '/../../..' . '/lib/private/Repair/NC16/AddClenupLoginFlowV2BackgroundJob.php', @@ -1772,6 +1857,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Repair\\NC22\\LookupServerSendCheck' => __DIR__ . '/../../..' . '/lib/private/Repair/NC22/LookupServerSendCheck.php', 'OC\\Repair\\NC24\\AddTokenCleanupJob' => __DIR__ . '/../../..' . '/lib/private/Repair/NC24/AddTokenCleanupJob.php', 'OC\\Repair\\NC25\\AddMissingSecretJob' => __DIR__ . '/../../..' . '/lib/private/Repair/NC25/AddMissingSecretJob.php', + 'OC\\Repair\\NC30\\RemoveLegacyDatadirFile' => __DIR__ . '/../../..' . '/lib/private/Repair/NC30/RemoveLegacyDatadirFile.php', 'OC\\Repair\\OldGroupMembershipShares' => __DIR__ . '/../../..' . '/lib/private/Repair/OldGroupMembershipShares.php', 'OC\\Repair\\Owncloud\\CleanPreviews' => __DIR__ . '/../../..' . '/lib/private/Repair/Owncloud/CleanPreviews.php', 'OC\\Repair\\Owncloud\\CleanPreviewsBackgroundJob' => __DIR__ . '/../../..' . '/lib/private/Repair/Owncloud/CleanPreviewsBackgroundJob.php', @@ -1784,12 +1870,12 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Repair\\RemoveLinkShares' => __DIR__ . '/../../..' . '/lib/private/Repair/RemoveLinkShares.php', 'OC\\Repair\\RepairDavShares' => __DIR__ . '/../../..' . '/lib/private/Repair/RepairDavShares.php', 'OC\\Repair\\RepairInvalidShares' => __DIR__ . '/../../..' . '/lib/private/Repair/RepairInvalidShares.php', + 'OC\\Repair\\RepairLogoDimension' => __DIR__ . '/../../..' . '/lib/private/Repair/RepairLogoDimension.php', 'OC\\Repair\\RepairMimeTypes' => __DIR__ . '/../../..' . '/lib/private/Repair/RepairMimeTypes.php', 'OC\\RichObjectStrings\\Validator' => __DIR__ . '/../../..' . '/lib/private/RichObjectStrings/Validator.php', 'OC\\Route\\CachingRouter' => __DIR__ . '/../../..' . '/lib/private/Route/CachingRouter.php', 'OC\\Route\\Route' => __DIR__ . '/../../..' . '/lib/private/Route/Route.php', 'OC\\Route\\Router' => __DIR__ . '/../../..' . '/lib/private/Route/Router.php', - 'OC\\Search' => __DIR__ . '/../../..' . '/lib/private/Search.php', 'OC\\Search\\FilterCollection' => __DIR__ . '/../../..' . '/lib/private/Search/FilterCollection.php', 'OC\\Search\\FilterFactory' => __DIR__ . '/../../..' . '/lib/private/Search/FilterFactory.php', 'OC\\Search\\Filter\\BooleanFilter' => __DIR__ . '/../../..' . '/lib/private/Search/Filter/BooleanFilter.php', @@ -1800,11 +1886,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Search\\Filter\\StringFilter' => __DIR__ . '/../../..' . '/lib/private/Search/Filter/StringFilter.php', 'OC\\Search\\Filter\\StringsFilter' => __DIR__ . '/../../..' . '/lib/private/Search/Filter/StringsFilter.php', 'OC\\Search\\Filter\\UserFilter' => __DIR__ . '/../../..' . '/lib/private/Search/Filter/UserFilter.php', - 'OC\\Search\\Provider\\File' => __DIR__ . '/../../..' . '/lib/private/Search/Provider/File.php', - 'OC\\Search\\Result\\Audio' => __DIR__ . '/../../..' . '/lib/private/Search/Result/Audio.php', - 'OC\\Search\\Result\\File' => __DIR__ . '/../../..' . '/lib/private/Search/Result/File.php', - 'OC\\Search\\Result\\Folder' => __DIR__ . '/../../..' . '/lib/private/Search/Result/Folder.php', - 'OC\\Search\\Result\\Image' => __DIR__ . '/../../..' . '/lib/private/Search/Result/Image.php', 'OC\\Search\\SearchComposer' => __DIR__ . '/../../..' . '/lib/private/Search/SearchComposer.php', 'OC\\Search\\SearchQuery' => __DIR__ . '/../../..' . '/lib/private/Search/SearchQuery.php', 'OC\\Search\\UnsupportedFilter' => __DIR__ . '/../../..' . '/lib/private/Search/UnsupportedFilter.php', @@ -1831,6 +1912,10 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Security\\IdentityProof\\Key' => __DIR__ . '/../../..' . '/lib/private/Security/IdentityProof/Key.php', '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\\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', 'OC\\Security\\Normalizer\\IpAddress' => __DIR__ . '/../../..' . '/lib/private/Security/Normalizer/IpAddress.php', 'OC\\Security\\RateLimiting\\Backend\\DatabaseBackend' => __DIR__ . '/../../..' . '/lib/private/Security/RateLimiting/Backend/DatabaseBackend.php', 'OC\\Security\\RateLimiting\\Backend\\IBackend' => __DIR__ . '/../../..' . '/lib/private/Security/RateLimiting/Backend/IBackend.php', @@ -1932,6 +2017,8 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Updater\\Changes' => __DIR__ . '/../../..' . '/lib/private/Updater/Changes.php', 'OC\\Updater\\ChangesCheck' => __DIR__ . '/../../..' . '/lib/private/Updater/ChangesCheck.php', 'OC\\Updater\\ChangesMapper' => __DIR__ . '/../../..' . '/lib/private/Updater/ChangesMapper.php', + 'OC\\Updater\\Exceptions\\ReleaseMetadataException' => __DIR__ . '/../../..' . '/lib/private/Updater/Exceptions/ReleaseMetadataException.php', + 'OC\\Updater\\ReleaseMetadata' => __DIR__ . '/../../..' . '/lib/private/Updater/ReleaseMetadata.php', 'OC\\Updater\\VersionCheck' => __DIR__ . '/../../..' . '/lib/private/Updater/VersionCheck.php', 'OC\\UserStatus\\ISettableProvider' => __DIR__ . '/../../..' . '/lib/private/UserStatus/ISettableProvider.php', 'OC\\UserStatus\\Manager' => __DIR__ . '/../../..' . '/lib/private/UserStatus/Manager.php', @@ -1948,13 +2035,11 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\User\\OutOfOfficeData' => __DIR__ . '/../../..' . '/lib/private/User/OutOfOfficeData.php', 'OC\\User\\Session' => __DIR__ . '/../../..' . '/lib/private/User/Session.php', 'OC\\User\\User' => __DIR__ . '/../../..' . '/lib/private/User/User.php', - 'OC_API' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_API.php', 'OC_App' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_App.php', 'OC_Defaults' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_Defaults.php', 'OC_Files' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_Files.php', 'OC_Helper' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_Helper.php', 'OC_Hook' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_Hook.php', - 'OC_Image' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_Image.php', 'OC_JSON' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_JSON.php', 'OC_Response' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_Response.php', 'OC_Template' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_Template.php', diff --git a/lib/composer/composer/installed.php b/lib/composer/composer/installed.php index efdbecf06c5..5fe8d8f7f49 100644 --- a/lib/composer/composer/installed.php +++ b/lib/composer/composer/installed.php @@ -3,7 +3,7 @@ 'name' => '__root__', 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => 'e0b9ff4fa255b4dd4c1e3881e26dff18053e129a', + 'reference' => 'b99276fdfbac6b1ff243807b8b5b8161f0f67a24', 'type' => 'library', 'install_path' => __DIR__ . '/../../../', 'aliases' => array(), @@ -13,7 +13,7 @@ '__root__' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => 'e0b9ff4fa255b4dd4c1e3881e26dff18053e129a', + 'reference' => 'b99276fdfbac6b1ff243807b8b5b8161f0f67a24', 'type' => 'library', 'install_path' => __DIR__ . '/../../../', 'aliases' => array(), diff --git a/lib/l10n/ar.js b/lib/l10n/ar.js index 2ba892dd468..692a8337843 100644 --- a/lib/l10n/ar.js +++ b/lib/l10n/ar.js @@ -19,7 +19,7 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s، %2$s و %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s، %2$s، %3$s و %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s، %2$s، %3$s، %4$s و %5$s", - "Education Edition" : "الإصدار التعليمي", + "Education bundle" : "الحزمة التعليمية", "Enterprise bundle" : "حزمة المؤسسة", "Groupware bundle" : "حزمة أدوات العمل الجماعي", "Hub bundle" : "حزمة الـ\"هَبْ\" Hub", @@ -38,6 +38,7 @@ OC.L10N.register( "Server version %s or higher is required." : "مطلوب إصدار الخادم %s أو أعلى.", "Server version %s or lower is required." : "مطلوب إصدار الخادم %s أو أقل.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "الداخل للحساب يجب أن يكون مُشرفاً أو مشرفاً فرعيّاً أو يملك حقاً خاصاً للوصول إلى هذا الإعداد", + "Your current IP address doesn’t allow you to perform admin actions" : "عنوانك الحالي IP يمنعك من أداء مهام المشرف", "Logged in account must be an admin or sub admin" : "الداخل للحساب يجب أن يكون مُشرفاً أو مشرفاً فرعيّاً ", "Logged in account must be an admin" : "الداخل للحساب يجب أن يكون مُشرفاً ", "Wiping of device %s has started" : "بدأ مسح الجهاز %s ", @@ -80,14 +81,21 @@ 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 غير موجودة. رجاءً، فعّلها في إعدادات التطبيقات لديك، أو اتصل بمشرف نظامك.", + "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\" غير مسموح به أن يكون بادئة لاسم ملف أو مجلد.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" غير مسموح به أن يكون داخل اسم ملف أو مجلد.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" غير مسموح به كنوع لملف.", + "Filenames must not end with \"%1$s\"." : "أسماء الملفات يجب ألّا تنتهي بـ \"%1$s\".", + "Invalid parent path" : "مسار المجلد الأب غير صحيح", "File already exists" : "الملف موجود مسبقاً", "Invalid path" : "مسار غير صالح !", "Failed to create file from template" : "تعذّر إنشاء ملفٍ من قالبٍ", "Templates" : "القوالب", - "File name is a reserved word" : "اسم الملف كلمة محجوزة", - "File name contains at least one invalid character" : "اسم الملف به ، على الأقل ، حرف غير صالح", - "File name is too long" : "اسم الملف طويل جداً", - "Dot files are not allowed" : "الملفات النقطية (ملفات ذات أسماء تبدأ بنقطة) غير مسموح بها", + "Path contains invalid segments" : "يحتوي المسار على أجزاء غير صحيحة", + "Filename is a reserved word" : "اسم الملف غير مقبوله لأنه كلمة محجوزة", + "Filename contains at least one invalid character" : "اسم الملف به على الأقل حرفٌ غير صالح", + "Filename is too long" : "اسم الملف أطول مما يجب", "Empty filename is not allowed" : "لا يسمح بأسماء فارغة للملفات", "App \"%s\" cannot be installed because appinfo file cannot be read." : "لا يمكن تثبيت التطبيق \"%s\" لأنه لا يمكن قراءة ملف معلومات التطبيق.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "لا يمكن تثبيت التطبيق \"%s\" لأنه غير متوافق مع هذا الإصدار من الخادم.", @@ -139,22 +147,56 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "يجب أن تقوم الواجهة الخلفية للمشاركة (Sharing backend) %s بتطبيق الواجهة OCP\\Share_Backend", "Sharing backend %s not found" : "لم يتم العثور على الواجهة الخلفية (Sharing backend) %s", "Sharing backend for %s not found" : "مشاركة الخلفية لـ %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." : "اضغط على الزر الذي تحته ليتم فتحه.", + "Open »%s«" : "فتح »%s«", + "%1$s via %2$s" : "%1$s عبر %2$s", "%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«", - "%1$s via %2$s" : "%1$s عبر %2$s", + "Passwords are enforced for link and mail shares" : "كلمة المرور لازمة للمشاركات عن طريق الروابط و الإيميل", + "SharedWith is not a valid user" : "SharedWith غير مقبول كمستخدِم", + "SharedWith is not a valid group" : "SharedWith غير مقبول كمجموعة", + "SharedWith should be empty" : "SharedWith يجب أن يكون فارغاً", + "SharedWith should not be empty" : "SharedWith يجب ألّا يكون فارغاً", + "SharedWith is not a valid circle" : "SharedWith ليس حلقة اتصال مقبولة", + "Unknown share type" : "نوع مشاركة غير معروف", + "SharedBy should be set" : "SharedBy يجب تعيينه", + "Cannot share with yourself" : "لا يمكنك المشاركة مع نفسك", + "Path should be set" : "يجب تعيين المسار", + "Path should be either a file or a folder" : "يجب أن يكون المسار إمّا ملفاً أو مجلداً", + "You cannot share your root folder" : "لا يمكنك مشاركة مجلدك الجذر", "You are not allowed to share %s" : "أنت غير مسموح لك أن تشارك %s", + "A share requires permissions" : "مشاركة تتطلب إذونات", "Cannot increase permissions of %s" : "لا يمكن زيادة أذونات %s", + "Shares need at least read permissions" : "المشاركات تتطلب في الحد الأدنى إذناً بالقراءة", "Files cannot be shared with delete permissions" : "لا يمكن مشاركة ملفات بأذونات حذفٍ", "Files cannot be shared with create permissions" : "لا يمكن مشاركة ملفات بأذونات إنشاء", "Expiration date is in the past" : "تاريخ انتهاء الصلاحية غير صالح. التاريخ المحدد في الماضي!", + "Expiration date is enforced" : "تاريخ انتهاء الصلاحية لازم", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["لا يمكن تعيين تاريخ انتهاء الصلاحية لأكثر من %n أيام في المستقبل","لا يمكن تعيين تاريخ انتهاء الصلاحية لأكثر من %n يوم في المستقبل","لا يمكن تعيين تاريخ انتهاء الصلاحية لأكثر %n من أيام في المستقبل","لا يمكن تعيين تاريخ انتهاء الصلاحية لأكثر %n من أيام في المستقبل","لا يمكن تعيين تاريخ انتهاء الصلاحية لأكثر %n من أيام في المستقبل","لا يمكن تعيين تاريخ انتهاء الصلاحية لأكثر %n من أيام في المستقبل"], "Sharing is only allowed with group members" : "النشر مسموح فقط مع أعضاء المجموعة.", "Sharing %s failed, because this item is already shared with the account %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." : "اضغط على الزر الذي تحته ليتم فتحه.", + "Group sharing is now allowed" : "المشاركة مع المجموعات غير مسموحة", + "Sharing is only allowed within your own groups" : "المشاركة مسموحة فقط ضمن مجموعتك الخاصة", + "Path is already shared with this group" : "المسار تمّت مشاركته سلفاً مع هذه المجموعة", + "Link sharing is not allowed" : "المشاركة عبر الروابط غير مسموحة", + "Public upload is not allowed" : "الرفع من قِبَل العموم غير مسموح به", + "Path contains files shared with you" : "يحتوي المسار على ملفات تمّت مشاركتها معك", + "Sharing is disabled" : "المشاركة معطلة", + "Sharing is disabled for you" : "المشاركة معطلة بالنسبة لك", + "Cannot share with the share owner" : "لا يمكنك المشاركة مع مالك المشاركة", + "Share does not have a full ID" : "المشاركة ليس لها مُعرِّف ID كامل", + "Cannot change share type" : "لا يمكن تغيير نوع المشاركة", + "Can only update recipient on user shares" : "يمكن فقط تحديث المستلم على مشاركات المستخدم", + "Cannot enable sending the password by Talk with an empty password" : "لا يمكن تمكين إرسال كلمة المرور عن طريق برنامج \"المحادثة\" Talk بكلمة مرور فارغة", + "Cannot enable sending the password by Talk without setting a new password" : "لا يمكن تمكين إرسال كلمة المرور عن طريق برنامج \"المحادثة\" Talk بدون تعيين كلمة مرور جديدة", + "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 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." : "تعذر إنشاء المستخدم بسبب تجاوز الحد الأقصى لعدد المستخدمين المسموح به. يرجى الرجوع إلى الإشعارات لمزيد من التفاصيل.", @@ -252,7 +294,7 @@ OC.L10N.register( "Your data directory must be an absolute path." : "مسار دليل بياناتك data directory يجب أن يكون مساراً مُطلقاً absolute path.", "Check the value of \"datadirectory\" in your configuration." : "راجع قيمة \"datadirectory\" في تهيئتك.", "Your data directory is invalid." : "دليل بياناتك data directory غير صحيح.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "تأكد من وجود ملفٍ باسم \".ocdata\" في جذر دليل البيانات data directory.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "تأكّد من وجود ملف باسم \"%1$s\" في جذر دليل البيانات. وهو يجب أن يحتوى على: \"%2$s\"", "Action \"%s\" not supported or implemented." : "الإجراء \"%s\" غيرُ مدعومٍ أو غيرً مُطبّقٍ.", "Authentication failed, wrong token or provider ID given" : "فشلت المصادقة بسبب خطأ في الرمز token أو في رقم المُزوّد provider ID المُعطى.", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "بارامترات لازمة لإكمال الطلب مفقودةٌ. و البارامترات هي: \"%s\"", @@ -270,7 +312,7 @@ OC.L10N.register( "The audio to transcribe" : "الكلام المطلوب تحويله إلى نص", "Transcription" : "تحويل الكلام لنص", "The transcribed text" : "النص المُولّد من الكلام", - "ContextWrite" : "ContextWrite", + "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" : "قدّم نموذجاً لأسلوب الكتابة الذي ترغب في محاكاته", @@ -292,7 +334,7 @@ OC.L10N.register( "Output images" : "الصِّوَر الناتجة", "The generated images" : "الصِّوَر المُولَّدة", "Free text to text prompt" : "نص حر إلى نص طلب", - "Runs an arbitrary prompt through a language model that retuns a reply" : "يُشغِّل مطالبة حرة من خلال نموذج لغوي يُعطي ردّاً", + "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" : "صِف المهمة التي تطلب العون لإنجازها أو اسأل سؤالاً", "Generated reply" : "الرَّدّ المُولَّد", "The generated text from the assistant" : "النص المُولَّد من قِبَل المُساعِد", @@ -335,15 +377,28 @@ OC.L10N.register( "The original text to extract topics from" : "النص الأصلي المطوب استخلاص المواضيع منه", "Topics" : "المواضيع", "The list of extracted topics" : "قائمة المواضيع المستخلصة", + "Translate" : "ترجِم", + "Translate text from one language to another" : "ترجمة النص من لغة لأخرى", + "Origin text" : "النص الأصلي", + "The text to translate" : "النص المطلوب ترجمته", + "Origin language" : "اللغة الأصل", + "The language of the origin text" : "لغة النص الأصلي", + "Target language" : "اللغة المطلوبة", + "The desired language to translate the origin text in" : "اللغة المطلوب ترجمة النص إليها", + "Result" : "النتيجة", + "The translated text" : "النص المترجم", "Free prompt" : "مَحَثْ prompt مجاني", "Runs an arbitrary prompt through the language model." : "يقوم بتشغيل مَحَث عشوائي arbitrary prompt من خلال نموذج اللغة language model.", "Generate headline" : "توليد العنوان", "Summarizes text by reducing its length without losing key information." : "يُلَخِّص النص بتقليل طوله دون فقدان المعنى.", "Extracts topics from a text and outputs them separated by commas." : "يستخلص المواضيع من النص و إخراجها مفصولة بفواصل.", - "404" : "لم يتم العثور على الصفحة خطأ عدد 404", + "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 admin.", "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" : "المستخدم مجهول", @@ -362,9 +417,8 @@ OC.L10N.register( "Username must not consist of dots only" : "اسم المستخدم يجب ألاّ يتكون من نقاطٍ dots فقط", "Username is invalid because files already exist for this user" : "اسم المستخدم غير صحيحٍ لأن هنالك ملفات موجودة سلفاً لهذا المستخدم", "User disabled" : "تم تعطيل المستخدم", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 مطلوبة.", - "Please upgrade your database version." : "رجاءً، قم بترقية إصدار قاعدة بياناتك.", "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 حتى لا يتمكن المستخدمون الآخرون من عرض محتويات المجلد." + "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 a59cc24d508..befa4669278 100644 --- a/lib/l10n/ar.json +++ b/lib/l10n/ar.json @@ -17,7 +17,7 @@ "%1$s, %2$s and %3$s" : "%1$s، %2$s و %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s، %2$s، %3$s و %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s، %2$s، %3$s، %4$s و %5$s", - "Education Edition" : "الإصدار التعليمي", + "Education bundle" : "الحزمة التعليمية", "Enterprise bundle" : "حزمة المؤسسة", "Groupware bundle" : "حزمة أدوات العمل الجماعي", "Hub bundle" : "حزمة الـ\"هَبْ\" Hub", @@ -36,6 +36,7 @@ "Server version %s or higher is required." : "مطلوب إصدار الخادم %s أو أعلى.", "Server version %s or lower is required." : "مطلوب إصدار الخادم %s أو أقل.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "الداخل للحساب يجب أن يكون مُشرفاً أو مشرفاً فرعيّاً أو يملك حقاً خاصاً للوصول إلى هذا الإعداد", + "Your current IP address doesn’t allow you to perform admin actions" : "عنوانك الحالي IP يمنعك من أداء مهام المشرف", "Logged in account must be an admin or sub admin" : "الداخل للحساب يجب أن يكون مُشرفاً أو مشرفاً فرعيّاً ", "Logged in account must be an admin" : "الداخل للحساب يجب أن يكون مُشرفاً ", "Wiping of device %s has started" : "بدأ مسح الجهاز %s ", @@ -78,14 +79,21 @@ "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 غير موجودة. رجاءً، فعّلها في إعدادات التطبيقات لديك، أو اتصل بمشرف نظامك.", + "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\" غير مسموح به أن يكون بادئة لاسم ملف أو مجلد.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" غير مسموح به أن يكون داخل اسم ملف أو مجلد.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" غير مسموح به كنوع لملف.", + "Filenames must not end with \"%1$s\"." : "أسماء الملفات يجب ألّا تنتهي بـ \"%1$s\".", + "Invalid parent path" : "مسار المجلد الأب غير صحيح", "File already exists" : "الملف موجود مسبقاً", "Invalid path" : "مسار غير صالح !", "Failed to create file from template" : "تعذّر إنشاء ملفٍ من قالبٍ", "Templates" : "القوالب", - "File name is a reserved word" : "اسم الملف كلمة محجوزة", - "File name contains at least one invalid character" : "اسم الملف به ، على الأقل ، حرف غير صالح", - "File name is too long" : "اسم الملف طويل جداً", - "Dot files are not allowed" : "الملفات النقطية (ملفات ذات أسماء تبدأ بنقطة) غير مسموح بها", + "Path contains invalid segments" : "يحتوي المسار على أجزاء غير صحيحة", + "Filename is a reserved word" : "اسم الملف غير مقبوله لأنه كلمة محجوزة", + "Filename contains at least one invalid character" : "اسم الملف به على الأقل حرفٌ غير صالح", + "Filename is too long" : "اسم الملف أطول مما يجب", "Empty filename is not allowed" : "لا يسمح بأسماء فارغة للملفات", "App \"%s\" cannot be installed because appinfo file cannot be read." : "لا يمكن تثبيت التطبيق \"%s\" لأنه لا يمكن قراءة ملف معلومات التطبيق.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "لا يمكن تثبيت التطبيق \"%s\" لأنه غير متوافق مع هذا الإصدار من الخادم.", @@ -137,22 +145,56 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "يجب أن تقوم الواجهة الخلفية للمشاركة (Sharing backend) %s بتطبيق الواجهة OCP\\Share_Backend", "Sharing backend %s not found" : "لم يتم العثور على الواجهة الخلفية (Sharing backend) %s", "Sharing backend for %s not found" : "مشاركة الخلفية لـ %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." : "اضغط على الزر الذي تحته ليتم فتحه.", + "Open »%s«" : "فتح »%s«", + "%1$s via %2$s" : "%1$s عبر %2$s", "%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«", - "%1$s via %2$s" : "%1$s عبر %2$s", + "Passwords are enforced for link and mail shares" : "كلمة المرور لازمة للمشاركات عن طريق الروابط و الإيميل", + "SharedWith is not a valid user" : "SharedWith غير مقبول كمستخدِم", + "SharedWith is not a valid group" : "SharedWith غير مقبول كمجموعة", + "SharedWith should be empty" : "SharedWith يجب أن يكون فارغاً", + "SharedWith should not be empty" : "SharedWith يجب ألّا يكون فارغاً", + "SharedWith is not a valid circle" : "SharedWith ليس حلقة اتصال مقبولة", + "Unknown share type" : "نوع مشاركة غير معروف", + "SharedBy should be set" : "SharedBy يجب تعيينه", + "Cannot share with yourself" : "لا يمكنك المشاركة مع نفسك", + "Path should be set" : "يجب تعيين المسار", + "Path should be either a file or a folder" : "يجب أن يكون المسار إمّا ملفاً أو مجلداً", + "You cannot share your root folder" : "لا يمكنك مشاركة مجلدك الجذر", "You are not allowed to share %s" : "أنت غير مسموح لك أن تشارك %s", + "A share requires permissions" : "مشاركة تتطلب إذونات", "Cannot increase permissions of %s" : "لا يمكن زيادة أذونات %s", + "Shares need at least read permissions" : "المشاركات تتطلب في الحد الأدنى إذناً بالقراءة", "Files cannot be shared with delete permissions" : "لا يمكن مشاركة ملفات بأذونات حذفٍ", "Files cannot be shared with create permissions" : "لا يمكن مشاركة ملفات بأذونات إنشاء", "Expiration date is in the past" : "تاريخ انتهاء الصلاحية غير صالح. التاريخ المحدد في الماضي!", + "Expiration date is enforced" : "تاريخ انتهاء الصلاحية لازم", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["لا يمكن تعيين تاريخ انتهاء الصلاحية لأكثر من %n أيام في المستقبل","لا يمكن تعيين تاريخ انتهاء الصلاحية لأكثر من %n يوم في المستقبل","لا يمكن تعيين تاريخ انتهاء الصلاحية لأكثر %n من أيام في المستقبل","لا يمكن تعيين تاريخ انتهاء الصلاحية لأكثر %n من أيام في المستقبل","لا يمكن تعيين تاريخ انتهاء الصلاحية لأكثر %n من أيام في المستقبل","لا يمكن تعيين تاريخ انتهاء الصلاحية لأكثر %n من أيام في المستقبل"], "Sharing is only allowed with group members" : "النشر مسموح فقط مع أعضاء المجموعة.", "Sharing %s failed, because this item is already shared with the account %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." : "اضغط على الزر الذي تحته ليتم فتحه.", + "Group sharing is now allowed" : "المشاركة مع المجموعات غير مسموحة", + "Sharing is only allowed within your own groups" : "المشاركة مسموحة فقط ضمن مجموعتك الخاصة", + "Path is already shared with this group" : "المسار تمّت مشاركته سلفاً مع هذه المجموعة", + "Link sharing is not allowed" : "المشاركة عبر الروابط غير مسموحة", + "Public upload is not allowed" : "الرفع من قِبَل العموم غير مسموح به", + "Path contains files shared with you" : "يحتوي المسار على ملفات تمّت مشاركتها معك", + "Sharing is disabled" : "المشاركة معطلة", + "Sharing is disabled for you" : "المشاركة معطلة بالنسبة لك", + "Cannot share with the share owner" : "لا يمكنك المشاركة مع مالك المشاركة", + "Share does not have a full ID" : "المشاركة ليس لها مُعرِّف ID كامل", + "Cannot change share type" : "لا يمكن تغيير نوع المشاركة", + "Can only update recipient on user shares" : "يمكن فقط تحديث المستلم على مشاركات المستخدم", + "Cannot enable sending the password by Talk with an empty password" : "لا يمكن تمكين إرسال كلمة المرور عن طريق برنامج \"المحادثة\" Talk بكلمة مرور فارغة", + "Cannot enable sending the password by Talk without setting a new password" : "لا يمكن تمكين إرسال كلمة المرور عن طريق برنامج \"المحادثة\" Talk بدون تعيين كلمة مرور جديدة", + "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 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." : "تعذر إنشاء المستخدم بسبب تجاوز الحد الأقصى لعدد المستخدمين المسموح به. يرجى الرجوع إلى الإشعارات لمزيد من التفاصيل.", @@ -250,7 +292,7 @@ "Your data directory must be an absolute path." : "مسار دليل بياناتك data directory يجب أن يكون مساراً مُطلقاً absolute path.", "Check the value of \"datadirectory\" in your configuration." : "راجع قيمة \"datadirectory\" في تهيئتك.", "Your data directory is invalid." : "دليل بياناتك data directory غير صحيح.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "تأكد من وجود ملفٍ باسم \".ocdata\" في جذر دليل البيانات data directory.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "تأكّد من وجود ملف باسم \"%1$s\" في جذر دليل البيانات. وهو يجب أن يحتوى على: \"%2$s\"", "Action \"%s\" not supported or implemented." : "الإجراء \"%s\" غيرُ مدعومٍ أو غيرً مُطبّقٍ.", "Authentication failed, wrong token or provider ID given" : "فشلت المصادقة بسبب خطأ في الرمز token أو في رقم المُزوّد provider ID المُعطى.", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "بارامترات لازمة لإكمال الطلب مفقودةٌ. و البارامترات هي: \"%s\"", @@ -268,7 +310,7 @@ "The audio to transcribe" : "الكلام المطلوب تحويله إلى نص", "Transcription" : "تحويل الكلام لنص", "The transcribed text" : "النص المُولّد من الكلام", - "ContextWrite" : "ContextWrite", + "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" : "قدّم نموذجاً لأسلوب الكتابة الذي ترغب في محاكاته", @@ -290,7 +332,7 @@ "Output images" : "الصِّوَر الناتجة", "The generated images" : "الصِّوَر المُولَّدة", "Free text to text prompt" : "نص حر إلى نص طلب", - "Runs an arbitrary prompt through a language model that retuns a reply" : "يُشغِّل مطالبة حرة من خلال نموذج لغوي يُعطي ردّاً", + "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" : "صِف المهمة التي تطلب العون لإنجازها أو اسأل سؤالاً", "Generated reply" : "الرَّدّ المُولَّد", "The generated text from the assistant" : "النص المُولَّد من قِبَل المُساعِد", @@ -333,15 +375,28 @@ "The original text to extract topics from" : "النص الأصلي المطوب استخلاص المواضيع منه", "Topics" : "المواضيع", "The list of extracted topics" : "قائمة المواضيع المستخلصة", + "Translate" : "ترجِم", + "Translate text from one language to another" : "ترجمة النص من لغة لأخرى", + "Origin text" : "النص الأصلي", + "The text to translate" : "النص المطلوب ترجمته", + "Origin language" : "اللغة الأصل", + "The language of the origin text" : "لغة النص الأصلي", + "Target language" : "اللغة المطلوبة", + "The desired language to translate the origin text in" : "اللغة المطلوب ترجمة النص إليها", + "Result" : "النتيجة", + "The translated text" : "النص المترجم", "Free prompt" : "مَحَثْ prompt مجاني", "Runs an arbitrary prompt through the language model." : "يقوم بتشغيل مَحَث عشوائي arbitrary prompt من خلال نموذج اللغة language model.", "Generate headline" : "توليد العنوان", "Summarizes text by reducing its length without losing key information." : "يُلَخِّص النص بتقليل طوله دون فقدان المعنى.", "Extracts topics from a text and outputs them separated by commas." : "يستخلص المواضيع من النص و إخراجها مفصولة بفواصل.", - "404" : "لم يتم العثور على الصفحة خطأ عدد 404", + "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 admin.", "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" : "المستخدم مجهول", @@ -360,9 +415,8 @@ "Username must not consist of dots only" : "اسم المستخدم يجب ألاّ يتكون من نقاطٍ dots فقط", "Username is invalid because files already exist for this user" : "اسم المستخدم غير صحيحٍ لأن هنالك ملفات موجودة سلفاً لهذا المستخدم", "User disabled" : "تم تعطيل المستخدم", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 مطلوبة.", - "Please upgrade your database version." : "رجاءً، قم بترقية إصدار قاعدة بياناتك.", "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 حتى لا يتمكن المستخدمون الآخرون من عرض محتويات المجلد." + "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 5934af02312..0140a76377a 100644 --- a/lib/l10n/ast.js +++ b/lib/l10n/ast.js @@ -19,7 +19,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete pa grupos", "Hub bundle" : "Paquete pa hubs", @@ -80,14 +79,12 @@ OC.L10N.register( "seconds ago" : "hai segundos", "Empty file" : "Ficheru baleru", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulu cola ID %s nun esiste. Actívalu na configuración de les aplicaciones o ponte en contautu cola alminsitración.", + "Dot files are not allowed" : "Nun se permiten los ficheros que comiencen per un puntu", "File already exists" : "El ficheru yá esiste", "Invalid path" : "El camín ye inválidu", "Failed to create file from template" : "Nun se pudo crear el ficheru de la plantía", "Templates" : "Plantíes", - "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", - "Dot files are not allowed" : "Nun se permiten los ficheros que comiencen per un puntu", + "Filename contains at least one invalid character" : "El nome del ficheru contién polo menos un caráuter inváldu", "Empty filename is not allowed" : "Nun se permite que'l nome del ficheru tea baleru", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Nun se pue instalar l'aplicación «%s» porque nun se pue lleer el ficheru appinfo", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Nun se pue instalar l'aplicación «%s» porque nun ye compatible con esta versión del sirvidor.", @@ -139,19 +136,20 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "El backend de compartición «%s» ha implmentar la interfaz OCP\\Share_Backend", "Sharing backend %s not found" : "Nun s'atopó'l backend de compartición «%s»", "Sharing backend for %s not found" : "Nun s'atopó'l backend de compartición pa: %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.", + "Open »%s«" : "Abrir «%s»", + "%1$s via %2$s" : "%1$s per %2$s", "%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»", - "%1$s via %2$s" : "%1$s per %2$s", + "Unknown share type" : "Tipu de compartición desconocida", "You are not allowed to share %s" : "Nun tienes permisu pa compartir «%s»", "Cannot increase permissions of %s" : "Nun se pue amentar los permisos de: %s", "Files cannot be shared with create permissions" : "Los ficheros nun se pue compartir colos permisos de creación", "Expiration date is in the past" : "La data de caducidá ta nel pasáu", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Nun se pue afitar una data de caducidá de más de %n día nel futuru","Nun se pue afitar una data de caducidá de más de %n díes nel futuru"], - "%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.", "Sunday" : "Domingu", "Monday" : "Llunes", "Tuesday" : "Martes", @@ -204,7 +202,6 @@ OC.L10N.register( "Your data directory is not writable." : "Nun se pue escribir nel to direutoriu de datos.", "Please ask your server administrator to install the module." : "Pidi a l'alministración del sirvidor qu'instale'l módulu.", "Your data directory is invalid." : "El to direutoriu de datos ye inválidu.", - "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.", "Action \"%s\" not supported or implemented." : "L'aición «%s» nun ta sofitada o implementada.", "Authentication failed, wrong token or provider ID given" : "L'autenticación falló, apurriéronse un pase o una ID de fornidor incorreutos", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Falten parámetros pa completar la solicitú. Los parámetros que falten: «%s»", @@ -216,12 +213,18 @@ OC.L10N.register( "Summarize" : "Resume", "Summary" : "Resume", "Extract topics" : "Estrayer temes", + "Translate" : "Traducir", + "Target language" : "Llingua de destín", + "Result" : "Resultáu", "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.", - "404" : "404", + "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", @@ -238,9 +241,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "Ríquese PostgreSQL >= 9.", - "Please upgrade your database version." : "Anueva la versión de la base de datos.", "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." + "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 f764f2e7fb4..3be9a51cf32 100644 --- a/lib/l10n/ast.json +++ b/lib/l10n/ast.json @@ -17,7 +17,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete pa grupos", "Hub bundle" : "Paquete pa hubs", @@ -78,14 +77,12 @@ "seconds ago" : "hai segundos", "Empty file" : "Ficheru baleru", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulu cola ID %s nun esiste. Actívalu na configuración de les aplicaciones o ponte en contautu cola alminsitración.", + "Dot files are not allowed" : "Nun se permiten los ficheros que comiencen per un puntu", "File already exists" : "El ficheru yá esiste", "Invalid path" : "El camín ye inválidu", "Failed to create file from template" : "Nun se pudo crear el ficheru de la plantía", "Templates" : "Plantíes", - "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", - "Dot files are not allowed" : "Nun se permiten los ficheros que comiencen per un puntu", + "Filename contains at least one invalid character" : "El nome del ficheru contién polo menos un caráuter inváldu", "Empty filename is not allowed" : "Nun se permite que'l nome del ficheru tea baleru", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Nun se pue instalar l'aplicación «%s» porque nun se pue lleer el ficheru appinfo", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Nun se pue instalar l'aplicación «%s» porque nun ye compatible con esta versión del sirvidor.", @@ -137,19 +134,20 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "El backend de compartición «%s» ha implmentar la interfaz OCP\\Share_Backend", "Sharing backend %s not found" : "Nun s'atopó'l backend de compartición «%s»", "Sharing backend for %s not found" : "Nun s'atopó'l backend de compartición pa: %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.", + "Open »%s«" : "Abrir «%s»", + "%1$s via %2$s" : "%1$s per %2$s", "%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»", - "%1$s via %2$s" : "%1$s per %2$s", + "Unknown share type" : "Tipu de compartición desconocida", "You are not allowed to share %s" : "Nun tienes permisu pa compartir «%s»", "Cannot increase permissions of %s" : "Nun se pue amentar los permisos de: %s", "Files cannot be shared with create permissions" : "Los ficheros nun se pue compartir colos permisos de creación", "Expiration date is in the past" : "La data de caducidá ta nel pasáu", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Nun se pue afitar una data de caducidá de más de %n día nel futuru","Nun se pue afitar una data de caducidá de más de %n díes nel futuru"], - "%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.", "Sunday" : "Domingu", "Monday" : "Llunes", "Tuesday" : "Martes", @@ -202,7 +200,6 @@ "Your data directory is not writable." : "Nun se pue escribir nel to direutoriu de datos.", "Please ask your server administrator to install the module." : "Pidi a l'alministración del sirvidor qu'instale'l módulu.", "Your data directory is invalid." : "El to direutoriu de datos ye inválidu.", - "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.", "Action \"%s\" not supported or implemented." : "L'aición «%s» nun ta sofitada o implementada.", "Authentication failed, wrong token or provider ID given" : "L'autenticación falló, apurriéronse un pase o una ID de fornidor incorreutos", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Falten parámetros pa completar la solicitú. Los parámetros que falten: «%s»", @@ -214,12 +211,18 @@ "Summarize" : "Resume", "Summary" : "Resume", "Extract topics" : "Estrayer temes", + "Translate" : "Traducir", + "Target language" : "Llingua de destín", + "Result" : "Resultáu", "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.", - "404" : "404", + "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", @@ -236,9 +239,8 @@ "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", - "PostgreSQL >= 9 required." : "Ríquese PostgreSQL >= 9.", - "Please upgrade your database version." : "Anueva la versión de la base de datos.", "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." + "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/bg.js b/lib/l10n/bg.js index 6b3475b5ebe..d09870072f9 100644 --- a/lib/l10n/bg.js +++ b/lib/l10n/bg.js @@ -18,7 +18,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s и %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s и %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s и %5$s", - "Education Edition" : "Образователно издание", "Enterprise bundle" : "Професионален пакет", "Groupware bundle" : "Софтуерен групов пакет", "Hub bundle" : "Хъб пакет", @@ -75,14 +74,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 не съществува. Моля, активирайте го в настройките на приложенията си или се свържете с администратора си.", + "Dot files are not allowed" : "Файлове с точки не са разрешени", "File already exists" : "Файлът вече съществува", "Invalid path" : "Невалиден път", "Failed to create file from template" : "Неуспешно създаване на файл от шаблон", "Templates" : "Шаблони", - "File name is a reserved word" : "Името на файла е запазена дума", - "File name contains at least one invalid character" : "Името на файла съдържа поне един невалиден символ", - "File name is too long" : "Името на файла е твърде дълго", - "Dot files are not allowed" : "Файлове с точки не са разрешени", + "Filename contains at least one invalid character" : "Името на файла съдържа поне един невалиден символ", "Empty filename is not allowed" : "Празно име на файл не е разрешено.", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Приложението „%s“ не може да бъде инсталирано, защото appinfo/информация за приложението/ файлът не може да бъде прочетен.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Приложението \"%s\" не може да бъде инсталирано, защото не е съвместимо с тази версия на сървъра.", @@ -125,11 +122,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Споделянето на сървърния %s трябва да поддържа OCP\\Share_Backend интерфейс.", "Sharing backend %s not found" : "Споделянето на сървърния %s не е открито.", "Sharing backend for %s not found" : "Споделянето на сървъра за %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." : "Щракнете върху бутона по-долу, за да го отворите.", + "Open »%s«" : "Отвори »%s«", + "%1$s via %2$s" : "%1$s чрез %2$s", "%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«", - "%1$s via %2$s" : "%1$s чрез %2$s", + "Unknown share type" : "Неизвестен тип споделяне", "You are not allowed to share %s" : "Не ти е разрешено да споделяш %s.", "Cannot increase permissions of %s" : "Не могат да се увеличат права на %s", "Files cannot be shared with delete permissions" : "Файловете не могат да се споделят с права за изтриване", @@ -137,9 +138,6 @@ OC.L10N.register( "Expiration date is in the past" : "Срокът на валидност е изтекъл", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Не може да се зададе срок на валидност повече от %n дни в бъдещето","Не може да се зададе срок на валидност повече от %n дни в бъдещето"], "Sharing is only allowed with group members" : "Споделянето е разрешено само с членове на групата", - "%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 requested share does not exist anymore" : "Исканото споделяне вече не съществува", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Потребителят не е създаден, тъй като е достигнат лимитът на потребителите. Проверете вашите известия, за да научите повече.", "Could not find category \"%s\"" : "Невъзможно откриване на категорията \"%s\".", @@ -224,7 +222,6 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Вашата директория с данни трябва да е абсолютен път.", "Check the value of \"datadirectory\" in your configuration." : "Проверете стойността на \"datadirectory\" във вашата конфигурация.", "Your data directory is invalid." : "Вашата директория с данни е невалидна.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Уверете се, че има файл, наречен \".ocdata\" в корена на директорията с данни.", "Action \"%s\" not supported or implemented." : "Действието „%s“ не се поддържа или изпълнява.", "Authentication failed, wrong token or provider ID given" : "Неуспешно удостоверяване, даден е грешен токен или идентификатор на доставчика ", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Липсват параметри, за завършване на заявката. Липсващи параметри: \"%s\"", @@ -238,10 +235,16 @@ OC.L10N.register( "Storage connection timeout. %s" : "Време за изчакване при свързването с хранилище. %s", "Prompt" : "Подкана", "Summary" : "Резюме", - "404" : "404", + "Translate" : "Превод", + "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" : "Непознат потребител", @@ -260,9 +263,8 @@ OC.L10N.register( "Username must not consist of dots only" : "Името на потребител не трябва да се състои само от точки", "Username is invalid because files already exist for this user" : "Името на потребител е невалидно, тъй като файловете вече съществуват за този потребител", "User disabled" : "Потребителят е деактивиран", - "PostgreSQL >= 9 required." : "Нужно е PostgreSQL >= 9", - "Please upgrade your database version." : "Моля, надстройте версията на вашата база данни.", "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, за да не може директорията да бъде видяна от други потребители." + "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 374e35811bc..d0d6310a7e1 100644 --- a/lib/l10n/bg.json +++ b/lib/l10n/bg.json @@ -16,7 +16,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s и %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s и %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s и %5$s", - "Education Edition" : "Образователно издание", "Enterprise bundle" : "Професионален пакет", "Groupware bundle" : "Софтуерен групов пакет", "Hub bundle" : "Хъб пакет", @@ -73,14 +72,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 не съществува. Моля, активирайте го в настройките на приложенията си или се свържете с администратора си.", + "Dot files are not allowed" : "Файлове с точки не са разрешени", "File already exists" : "Файлът вече съществува", "Invalid path" : "Невалиден път", "Failed to create file from template" : "Неуспешно създаване на файл от шаблон", "Templates" : "Шаблони", - "File name is a reserved word" : "Името на файла е запазена дума", - "File name contains at least one invalid character" : "Името на файла съдържа поне един невалиден символ", - "File name is too long" : "Името на файла е твърде дълго", - "Dot files are not allowed" : "Файлове с точки не са разрешени", + "Filename contains at least one invalid character" : "Името на файла съдържа поне един невалиден символ", "Empty filename is not allowed" : "Празно име на файл не е разрешено.", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Приложението „%s“ не може да бъде инсталирано, защото appinfo/информация за приложението/ файлът не може да бъде прочетен.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Приложението \"%s\" не може да бъде инсталирано, защото не е съвместимо с тази версия на сървъра.", @@ -123,11 +120,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Споделянето на сървърния %s трябва да поддържа OCP\\Share_Backend интерфейс.", "Sharing backend %s not found" : "Споделянето на сървърния %s не е открито.", "Sharing backend for %s not found" : "Споделянето на сървъра за %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." : "Щракнете върху бутона по-долу, за да го отворите.", + "Open »%s«" : "Отвори »%s«", + "%1$s via %2$s" : "%1$s чрез %2$s", "%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«", - "%1$s via %2$s" : "%1$s чрез %2$s", + "Unknown share type" : "Неизвестен тип споделяне", "You are not allowed to share %s" : "Не ти е разрешено да споделяш %s.", "Cannot increase permissions of %s" : "Не могат да се увеличат права на %s", "Files cannot be shared with delete permissions" : "Файловете не могат да се споделят с права за изтриване", @@ -135,9 +136,6 @@ "Expiration date is in the past" : "Срокът на валидност е изтекъл", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Не може да се зададе срок на валидност повече от %n дни в бъдещето","Не може да се зададе срок на валидност повече от %n дни в бъдещето"], "Sharing is only allowed with group members" : "Споделянето е разрешено само с членове на групата", - "%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 requested share does not exist anymore" : "Исканото споделяне вече не съществува", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Потребителят не е създаден, тъй като е достигнат лимитът на потребителите. Проверете вашите известия, за да научите повече.", "Could not find category \"%s\"" : "Невъзможно откриване на категорията \"%s\".", @@ -222,7 +220,6 @@ "Your data directory must be an absolute path." : "Вашата директория с данни трябва да е абсолютен път.", "Check the value of \"datadirectory\" in your configuration." : "Проверете стойността на \"datadirectory\" във вашата конфигурация.", "Your data directory is invalid." : "Вашата директория с данни е невалидна.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Уверете се, че има файл, наречен \".ocdata\" в корена на директорията с данни.", "Action \"%s\" not supported or implemented." : "Действието „%s“ не се поддържа или изпълнява.", "Authentication failed, wrong token or provider ID given" : "Неуспешно удостоверяване, даден е грешен токен или идентификатор на доставчика ", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Липсват параметри, за завършване на заявката. Липсващи параметри: \"%s\"", @@ -236,10 +233,16 @@ "Storage connection timeout. %s" : "Време за изчакване при свързването с хранилище. %s", "Prompt" : "Подкана", "Summary" : "Резюме", - "404" : "404", + "Translate" : "Превод", + "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" : "Непознат потребител", @@ -258,9 +261,8 @@ "Username must not consist of dots only" : "Името на потребител не трябва да се състои само от точки", "Username is invalid because files already exist for this user" : "Името на потребител е невалидно, тъй като файловете вече съществуват за този потребител", "User disabled" : "Потребителят е деактивиран", - "PostgreSQL >= 9 required." : "Нужно е PostgreSQL >= 9", - "Please upgrade your database version." : "Моля, надстройте версията на вашата база данни.", "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, за да не може директорията да бъде видяна от други потребители." + "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/br.js b/lib/l10n/br.js index 74b65c80083..9e7240231a1 100644 --- a/lib/l10n/br.js +++ b/lib/l10n/br.js @@ -21,13 +21,13 @@ OC.L10N.register( "_%n hour ago_::_%n hours ago_" : ["%n hervez zo","%n hervez zo","%n hervez zo","%n hervez zo","%n hervez zo"], "_%n minute ago_::_%n minutes ago_" : ["%n munudenn-zo","%n munudenn-zo","%n munudenn-zo","%n munudenn-zo","%n munudenn-zo"], "seconds ago" : "eilenn zo", - "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", + "Filename contains at least one invalid character" : "Bez ez eus d'an neubeutan un arouez diffenet en anv restr", "Empty filename is not allowed" : "Un anv-restr goulo n'eo ket aotreet", "__language_name__" : "Brezhoneg", "Apps" : "Meziant", "Settings" : "Arventennoù", "Log out" : "Kuitat", + "Accounts" : "Kontoù", "Email" : "Postel", "Twitter" : "Twitter", "Website" : "Lec'hien web", @@ -49,6 +49,9 @@ OC.L10N.register( "Storage connection error. %s" : "Fazi renkañ kenstag. %s", "Storage is temporarily not available" : "N'haller ket tizhout ar skor roadennoù evit ar poent", "Summary" : "Diverrañ", + "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", diff --git a/lib/l10n/br.json b/lib/l10n/br.json index 4c7e7c89929..8e11ba859a8 100644 --- a/lib/l10n/br.json +++ b/lib/l10n/br.json @@ -19,13 +19,13 @@ "_%n hour ago_::_%n hours ago_" : ["%n hervez zo","%n hervez zo","%n hervez zo","%n hervez zo","%n hervez zo"], "_%n minute ago_::_%n minutes ago_" : ["%n munudenn-zo","%n munudenn-zo","%n munudenn-zo","%n munudenn-zo","%n munudenn-zo"], "seconds ago" : "eilenn zo", - "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", + "Filename contains at least one invalid character" : "Bez ez eus d'an neubeutan un arouez diffenet en anv restr", "Empty filename is not allowed" : "Un anv-restr goulo n'eo ket aotreet", "__language_name__" : "Brezhoneg", "Apps" : "Meziant", "Settings" : "Arventennoù", "Log out" : "Kuitat", + "Accounts" : "Kontoù", "Email" : "Postel", "Twitter" : "Twitter", "Website" : "Lec'hien web", @@ -47,6 +47,9 @@ "Storage connection error. %s" : "Fazi renkañ kenstag. %s", "Storage is temporarily not available" : "N'haller ket tizhout ar skor roadennoù evit ar poent", "Summary" : "Diverrañ", + "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", diff --git a/lib/l10n/ca.js b/lib/l10n/ca.js index 1f769f8d5da..ca03f3fe2cc 100644 --- a/lib/l10n/ca.js +++ b/lib/l10n/ca.js @@ -19,7 +19,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s i %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s i %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s i %5$s", - "Education Edition" : "Edició educativa", "Enterprise bundle" : "Paquet empresarial", "Groupware bundle" : "Paquet de treball en grup", "Hub bundle" : "Paquet Hub", @@ -80,14 +79,12 @@ OC.L10N.register( "seconds ago" : "fa uns segons", "Empty file" : "Fitxer buit", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El mòdul amb l'ID %s no existeix. Habiliteu-lo els paràmetres de les aplicacions o contacteu amb l'administrador.", + "Dot files are not allowed" : "No es permeten els fitxers que comencen per un punt", "File already exists" : "El fitxer ja existeix", "Invalid path" : "El camí no és vàlid", "Failed to create file from template" : "No s'ha pogut crear el fitxer a partir de la plantilla", "Templates" : "Plantilles", - "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", - "Dot files are not allowed" : "No es permeten els fitxers que comencen per un punt", + "Filename contains at least one invalid character" : "El nom del fitxer conté com a mínim un caràcter no vàlid", "Empty filename is not allowed" : "No es permeten els noms de fitxers buits", "App \"%s\" cannot be installed because appinfo file cannot be read." : "L'aplicació «%s» no es pot instal·lar perquè no es pot llegir el fitxer appinfo.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "L'aplicació «%s» no es pot instal·lar perquè no és compatible amb aquesta versió del servidor.", @@ -139,11 +136,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "El rerefons d'ús compartit %s ha d'implementar la interfície OCP\\Share_Backend", "Sharing backend %s not found" : "No s'ha trobat el rerefons d'ús compartit %s", "Sharing backend for %s not found" : "No s'ha trobat el rerefons d'ús compartit per a %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.", + "Open »%s«" : "Obre «%s»", + "%1$s via %2$s" : "%1$s mitjançant %2$s", "%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»", - "%1$s via %2$s" : "%1$s mitjançant %2$s", + "Unknown share type" : "Tipus d'element compartit desconegut", "You are not allowed to share %s" : "No podeu compartir %s", "Cannot increase permissions of %s" : "No es poden augmentar els permisos de %s", "Files cannot be shared with delete permissions" : "No es poden compartir fitxers amb permisos de supressió", @@ -152,9 +153,6 @@ 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_" : ["No es pot establir la data de caducitat més d'%n dia en el futur","No es pot establir la data de caducitat més de %n dies en el futur"], "Sharing is only allowed with group members" : "Només es permet l'ús compartit amb membres del grup", "Sharing %s failed, because this item is already shared with the account %s" : "No s'ha pogut compartir %s perquè l'element ja està compartit amb el compte %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 requested share does not exist anymore" : "L'element compartit sol·licitat ja no existeix", "The requested share comes from a disabled user" : "L'element compartit sol·licitat prové d'un usuari inhabilitat", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "No s'ha creat l'usuari perquè s'ha assolit el límit d'usuaris. Consulteu les notificacions per a obtenir més informació.", @@ -250,7 +248,6 @@ OC.L10N.register( "Your data directory must be an absolute path." : "La carpeta de dades ha de ser un camí absolut.", "Check the value of \"datadirectory\" in your configuration." : "Comproveu el valor de «datadirectory» en la configuració.", "Your data directory is invalid." : "La carpeta de dades no és vàlida.", - "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.", "Action \"%s\" not supported or implemented." : "L'acció «%s» no està admesa o implementada.", "Authentication failed, wrong token or provider ID given" : "No s'ha pogut autenticar; s'ha proporcionat un testimoni o un ID de proveïdor incorrecte", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Falten paràmetres per a completar la sol·licitud. Els paràmetres que falten són: «%s»", @@ -266,15 +263,21 @@ OC.L10N.register( "Summarize" : "Resumeix", "Summary" : "Resum", "Extract topics" : "Extreu els temes", + "Translate" : "Tradueix", + "Target language" : "Llengua de destinació", + "Result" : "Resultat", "Free prompt" : "Sol·licitud lliure", "Runs an arbitrary prompt through the language model." : "Executa una sol·licitud arbitrària mitjançant el model de llengua.", "Generate headline" : "Genera un titular", "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.", - "404" : "404", + "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", @@ -293,9 +296,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "Cal el PostgreSQL >= 9.", - "Please upgrade your database version." : "Actualitzeu la versió de la base de dades.", "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." + "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 0fae3a52dff..b2f7ef5b4d8 100644 --- a/lib/l10n/ca.json +++ b/lib/l10n/ca.json @@ -17,7 +17,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s i %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s i %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s i %5$s", - "Education Edition" : "Edició educativa", "Enterprise bundle" : "Paquet empresarial", "Groupware bundle" : "Paquet de treball en grup", "Hub bundle" : "Paquet Hub", @@ -78,14 +77,12 @@ "seconds ago" : "fa uns segons", "Empty file" : "Fitxer buit", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El mòdul amb l'ID %s no existeix. Habiliteu-lo els paràmetres de les aplicacions o contacteu amb l'administrador.", + "Dot files are not allowed" : "No es permeten els fitxers que comencen per un punt", "File already exists" : "El fitxer ja existeix", "Invalid path" : "El camí no és vàlid", "Failed to create file from template" : "No s'ha pogut crear el fitxer a partir de la plantilla", "Templates" : "Plantilles", - "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", - "Dot files are not allowed" : "No es permeten els fitxers que comencen per un punt", + "Filename contains at least one invalid character" : "El nom del fitxer conté com a mínim un caràcter no vàlid", "Empty filename is not allowed" : "No es permeten els noms de fitxers buits", "App \"%s\" cannot be installed because appinfo file cannot be read." : "L'aplicació «%s» no es pot instal·lar perquè no es pot llegir el fitxer appinfo.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "L'aplicació «%s» no es pot instal·lar perquè no és compatible amb aquesta versió del servidor.", @@ -137,11 +134,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "El rerefons d'ús compartit %s ha d'implementar la interfície OCP\\Share_Backend", "Sharing backend %s not found" : "No s'ha trobat el rerefons d'ús compartit %s", "Sharing backend for %s not found" : "No s'ha trobat el rerefons d'ús compartit per a %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.", + "Open »%s«" : "Obre «%s»", + "%1$s via %2$s" : "%1$s mitjançant %2$s", "%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»", - "%1$s via %2$s" : "%1$s mitjançant %2$s", + "Unknown share type" : "Tipus d'element compartit desconegut", "You are not allowed to share %s" : "No podeu compartir %s", "Cannot increase permissions of %s" : "No es poden augmentar els permisos de %s", "Files cannot be shared with delete permissions" : "No es poden compartir fitxers amb permisos de supressió", @@ -150,9 +151,6 @@ "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["No es pot establir la data de caducitat més d'%n dia en el futur","No es pot establir la data de caducitat més de %n dies en el futur"], "Sharing is only allowed with group members" : "Només es permet l'ús compartit amb membres del grup", "Sharing %s failed, because this item is already shared with the account %s" : "No s'ha pogut compartir %s perquè l'element ja està compartit amb el compte %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 requested share does not exist anymore" : "L'element compartit sol·licitat ja no existeix", "The requested share comes from a disabled user" : "L'element compartit sol·licitat prové d'un usuari inhabilitat", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "No s'ha creat l'usuari perquè s'ha assolit el límit d'usuaris. Consulteu les notificacions per a obtenir més informació.", @@ -248,7 +246,6 @@ "Your data directory must be an absolute path." : "La carpeta de dades ha de ser un camí absolut.", "Check the value of \"datadirectory\" in your configuration." : "Comproveu el valor de «datadirectory» en la configuració.", "Your data directory is invalid." : "La carpeta de dades no és vàlida.", - "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.", "Action \"%s\" not supported or implemented." : "L'acció «%s» no està admesa o implementada.", "Authentication failed, wrong token or provider ID given" : "No s'ha pogut autenticar; s'ha proporcionat un testimoni o un ID de proveïdor incorrecte", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Falten paràmetres per a completar la sol·licitud. Els paràmetres que falten són: «%s»", @@ -264,15 +261,21 @@ "Summarize" : "Resumeix", "Summary" : "Resum", "Extract topics" : "Extreu els temes", + "Translate" : "Tradueix", + "Target language" : "Llengua de destinació", + "Result" : "Resultat", "Free prompt" : "Sol·licitud lliure", "Runs an arbitrary prompt through the language model." : "Executa una sol·licitud arbitrària mitjançant el model de llengua.", "Generate headline" : "Genera un titular", "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.", - "404" : "404", + "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", @@ -291,9 +294,8 @@ "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", - "PostgreSQL >= 9 required." : "Cal el PostgreSQL >= 9.", - "Please upgrade your database version." : "Actualitzeu la versió de la base de dades.", "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." + "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 5cbf3c27cca..d777b143268 100644 --- a/lib/l10n/cs.js +++ b/lib/l10n/cs.js @@ -19,10 +19,10 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s a %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s a %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s a %5$s", - "Education Edition" : "Vydání pro vzdělávací instituce", "Enterprise bundle" : "Sada pro organizace", "Groupware bundle" : "Sada pro podporu spolupráce", "Hub bundle" : "Sada pro centrum aktivity (hub)", + "Public sector bundle" : "Balíček pro veřejný sektor", "Social sharing bundle" : "Balíček pro sdílení na sociálních sítích", "PHP %s or higher is required." : "Je vyžadováno PHP %s nebo novější.", "PHP with a version lower than %s is required." : "Je vyžadováno PHP ve verzi starší než %s.", @@ -76,19 +76,19 @@ 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.", + "Dot files are not allowed" : "Názvy souborů, začínající na tečku nejsou dovolené", "File already exists" : "Soubor už existuje", "Invalid path" : "Neplatný popis umístění", "Failed to create file from template" : "Vytvoření souboru ze šablony se nezdařilo", "Templates" : "Šablony", - "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ý", - "Dot files are not allowed" : "Názvy souborů, začínající na tečku nejsou dovolené", + "Path contains invalid segments" : "Popis umístění obsahuje neplatné úseky", + "Filename contains at least one invalid character" : "Název souboru obsahuje přinejmenším jeden neplatný znak", "Empty filename is not allowed" : "Je třeba vyplnit název souboru", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Aplikace „%s“ nemůže být nainstalována protože soubor appinfo nelze přečíst.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Aplikaci „%s“ nelze nainstalovat, protože není kompatibilní s touto verzí serveru.", "__language_name__" : "Čeština", "This is an automatically sent email, please do not reply." : "Toto je automaticky odesílaný e-mail, neodpovídejte na něj.", + "Help & privacy" : "Nápověda", "Appearance and accessibility" : "Vzhled a zpřístupnění", "Apps" : "Aplikace", "Personal settings" : "Osobní nastavení", @@ -113,11 +113,17 @@ OC.L10N.register( "Headline" : "Nadpis", "Organisation" : "Organizace", "Role" : "Role", + "Unknown account" : "Neznámý účet", "Additional settings" : "Další nastavení", + "Enter the database Login and name for %s" : "Zadejte přihlašovací jméno do databáze a název pro %s", + "Enter the database Login for %s" : "Zadejte přihlašovací jméno pro %s", "Enter the database name for %s" : "Zadejte název databáze pro %s", "You cannot use dots in the database name %s" : "V názvu databáze %s není možné použít tečky", + "MySQL Login and/or password not valid" : "Neplatné přihlašovací jméno a/nebo heslo do MySQL", "You need to enter details of an existing account." : "Je třeba zadat podrobnosti existujícího účtu.", "Oracle connection could not be established" : "Spojení s Oracle nemohlo být navázáno", + "Oracle Login and/or password not valid" : "Neplatné přihlašovací jméno a/nebo heslo do Oracle", + "PostgreSQL Login and/or password not valid" : "Neplatné přihlašovací jméno a/nebo heslo do PostgreSQL", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "macOS není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!", "For the best results, please consider using a GNU/Linux server instead." : "Místo toho zvažte pro nejlepší funkčnost použití GNU/Linux serveru.", "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4 GB and is highly discouraged." : "Zdá se, že tato instance %s je provozována v 32-bitovém PHP prostředí a v php.ini je nastavena volba open_basedir. Toto povede k problémům se soubory většími než 4 GB a silně není doporučováno.", @@ -127,25 +133,40 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Je třeba, aby podpůrná vrstva pro sdílení %s implementovala rozhraní OCP\\Share_Backend", "Sharing backend %s not found" : "Podpůrná vrstva pro sdílení %s nenalezena", "Sharing backend for %s not found" : "Úložiště sdílení pro %s nenalezeno", + "%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.", + "Open »%s«" : "Otevřít „%s“", + "%1$s via %2$s" : "%1$s prostřednictvím %2$s", "%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“", - "%1$s via %2$s" : "%1$s prostřednictvím %2$s", + "Unknown share type" : "Neznámý typ sdílení", "You are not allowed to share %s" : "Nemáte povoleno sdílet %s", "Cannot increase permissions of %s" : "Nelze navýšit oprávnění u %s", + "Shares need at least read permissions" : "Sdílení potřebuje alespoň oprávnění pro čtení", "Files cannot be shared with delete permissions" : "Soubory nelze sdílet s oprávněními k odstranění", "Files cannot be shared with create permissions" : "Soubory nelze sdílet s oprávněními k vytváření", "Expiration date is in the past" : "Datum skončení platnosti je v minulosti", + "Expiration date is enforced" : "Datum skončení platnosti vynuceno", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Datum vypršení nelze nastavit na více než %n den do budoucnosti","Datum vypršení nelze nastavit na více než %n dny do budoucnosti","Datum vypršení nelze nastavit na více než %n dnů do budoucnosti","Datum vypršení nelze nastavit na více než %n dny do budoucnosti"], "Sharing is only allowed with group members" : "Je povoleno pouze sdílení s členy skupiny", - "%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.", + "Sharing is only allowed within your own groups" : "Je povoleno pouze sdílení s členy vlastní skupiny", + "Path is already shared with this group" : "Umístění je již sdíleno s touto skupinou", + "Link sharing is not allowed" : "Sdílení odkazů není povoleno", + "Public upload is not allowed" : "Veřejné nahrávání není povoleno", + "Sharing is disabled" : "Sdílení je vypnuto", + "Sharing is disabled for you" : "Máte zakázáno sdílet", + "Cannot share with the share owner" : "Nelze sdílet zpět vlastníkovi sdílení", + "Cannot change share type" : "Nelze změnit typ sdílení", + "Invalid recipient" : "Neplatný příjemce", + "Group \"%s\" does not exist" : "Skupina \"%s\" neexistuje", "The requested share does not exist anymore" : "Požadované sdílení už neexistuje", "The requested share comes from a disabled user" : "Požadované sdílení pochází od vypnutého uživatelského účtu", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Uživatel nebyl vytvořen protože bylo dosaženo limitu počtu uživatelů. Více se dozvíte v upozorněních.", "Could not find category \"%s\"" : "Nedaří se nalézt kategorii „%s“", + "Input text" : "Zadejte text", + "The input text" : "Vstupní text", "Sunday" : "neděle", "Monday" : "pondělí", "Tuesday" : "úterý", @@ -192,6 +213,13 @@ OC.L10N.register( "Nov." : "list.", "Dec." : "pro.", "A valid password must be provided" : "Je třeba zadat platné heslo", + "The Login is already being used" : "Přihlašovací jméno u je využíváno", + "Could not create account" : "Účet není možné vytvořit", + "A valid Login must be provided" : "Je třeba zadat platné přihlašovací jméno", + "Login contains whitespace at the beginning or at the end" : "Přihlašovací jméno je chybné – na jeho začátku či konci se nachází prázdný znak (mezera, tabulátor, atp.)", + "Login must not consist of dots only" : "Přihlašovací jméno se nemůže skládat pouze ze samých teček", + "Login is invalid because files already exist for this user" : "Přihlašovací jméno není platné, protože protože pro tohoto uživatele už existují soubory", + "Account disabled" : "Účet znepřístupněn", "Login canceled by app" : "Přihlášení zrušeno aplikací", "App \"%1$s\" cannot be installed because the following dependencies are not fulfilled: %2$s" : "Aplikaci „%1$s“ nelze nainstalovat, protože nejsou splněny následující závislosti: %2$s", "a safe home for all your data" : "bezpečný domov pro všechna vaše data", @@ -224,10 +252,10 @@ OC.L10N.register( "Please ask your server administrator to restart the web server." : "Požádejte správce serveru, který využíváte o restart webového serveru.", "The required %s config variable is not configured in the config.php file." : "Požadovaná proměnná nastavení %s není v souboru s nastaveními config.php nastavena.", "Please ask your server administrator to check the Nextcloud configuration." : "Požádejte správce serveru, který využíváte, aby zkontroloval nastavení serveru.", + "Your data directory is readable by other people." : "Váš adresář data je čitelný ostatním lidem.", "Your data directory must be an absolute path." : "Je třeba, aby váš adresář data byl zadán jako úplný popis umístění.", "Check the value of \"datadirectory\" in your configuration." : "Zkontrolujte hodnotu „datadirectory“ ve svém nastavení.", "Your data directory is invalid." : "Váš adresář data není platný.", - "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“.", "Action \"%s\" not supported or implemented." : "Akce „%s“ není podporována nebo implementována.", "Authentication failed, wrong token or provider ID given" : "Ověření se nezdařilo, předán chybný token nebo identifikátor poskytovatele", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Pro dokončení požadavku chybí parametry. Konkrétně: „%s“", @@ -239,20 +267,65 @@ OC.L10N.register( "Storage connection error. %s" : "Chyba připojení úložiště. %s", "Storage is temporarily not available" : "Úložiště je dočasně nedostupné", "Storage connection timeout. %s" : "Překročen časový limit připojování k úložišti. %s", + "Transcribe audio" : "Vytvořit text ze zvukové nahrávky", + "Transcribe the things said in an audio" : "Vytvořit zápis věcí řečených ve zvukovém záznamu", + "Audio input" : "Zvukový vstup", + "The audio to transcribe" : "Nahrávka k přepisu", + "Transcription" : "Přepis do textu", + "Writing style" : "Styl zápisu", + "Demonstrate a writing style that you would like to immitate" : "Předvádí styl psaní, který chcete napodobit", + "Source material" : "Zdrojový materiál", + "The content that would like to be rewritten in the new writing style" : "Obsah který by byl přepsán v novém stylu psaní", + "Generated text" : "Vytvořený text", + "Emoji generator" : "Generátor emotikon", + "Takes text and generates a representative emoji for it." : "Vezme text a vytvoří emotikonu, která ho představuje.", + "The text to generate an emoji for" : "Text pro který vytvořit emotikonu", + "Generated emoji" : "Vytvořená emotikona", + "The generated emoji based on the input text" : "Emotikona vytvořená na základě vstupního textu", + "Generate image" : "Vytvořit obrázek", + "Generate an image from a text prompt" : "Vytvoření obrázku dle textového zadání", "Prompt" : "Výzva", + "Describe the image you want to generate" : "Popište obrázek, který chcete vytvořit", + "Number of images" : "Počet obrázků", + "How many images to generate" : "Kolik obrázků vytvořit", + "Output images" : "Výstupní obrázky", + "The generated images" : "Vytvořené obrázky", + "Free text to text prompt" : "Volný text na textový prompt", + "Generated reply" : "Vygenerovaná odpověď", + "The generated text from the assistant" : "Text vytvořený pomocníkem", + "Chat" : "Chat", + "Chat with the assistant" : "Chat s pomocníkem", + "Chat message" : "Zpráva v chatu", + "Chat history" : "Historie chatu", "Generates a possible headline for a text." : "Vytvoří možný nadpis pro text.", + "Simplify text" : "Zjednodušit text", "Summarize" : "Stručný souhrn", "Summary" : "Souhrn", "Extract topics" : "Vyzískat témata", + "Topics" : "Témata", + "The list of extracted topics" : "Seznam extrahovaných témat", + "Translate" : "Překládání", + "Translate text from one language to another" : "Přeložit text z jednoho jazyka do jiného", + "Origin text" : "Původní text", + "The text to translate" : "Text k překladu", + "Origin language" : "Původní jazyk", + "The language of the origin text" : "Jazyk původního textu", + "Target language" : "Cílový jazyk", + "The desired language to translate the origin text in" : "Požadovaný jazyk do kterého přeložit původní text", + "Result" : "Výsledek", + "The translated text" : "Přeložený text", "Free prompt" : "Prompt zdarma", "Runs an arbitrary prompt through the language model." : "Spouští libovolnou výzvu skrze jazykový model.", "Generate headline" : "Vytvořit nadpis", "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.", - "404" : "404", + "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", @@ -271,9 +344,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "Je vyžadováno PostgreSQL verze 9 a novější.", - "Please upgrade your database version." : "Aktualizujte verzi vámi využívané databáze.", "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." + "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 9e92ea1f773..56be78c340f 100644 --- a/lib/l10n/cs.json +++ b/lib/l10n/cs.json @@ -17,10 +17,10 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s a %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s a %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s a %5$s", - "Education Edition" : "Vydání pro vzdělávací instituce", "Enterprise bundle" : "Sada pro organizace", "Groupware bundle" : "Sada pro podporu spolupráce", "Hub bundle" : "Sada pro centrum aktivity (hub)", + "Public sector bundle" : "Balíček pro veřejný sektor", "Social sharing bundle" : "Balíček pro sdílení na sociálních sítích", "PHP %s or higher is required." : "Je vyžadováno PHP %s nebo novější.", "PHP with a version lower than %s is required." : "Je vyžadováno PHP ve verzi starší než %s.", @@ -74,19 +74,19 @@ "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.", + "Dot files are not allowed" : "Názvy souborů, začínající na tečku nejsou dovolené", "File already exists" : "Soubor už existuje", "Invalid path" : "Neplatný popis umístění", "Failed to create file from template" : "Vytvoření souboru ze šablony se nezdařilo", "Templates" : "Šablony", - "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ý", - "Dot files are not allowed" : "Názvy souborů, začínající na tečku nejsou dovolené", + "Path contains invalid segments" : "Popis umístění obsahuje neplatné úseky", + "Filename contains at least one invalid character" : "Název souboru obsahuje přinejmenším jeden neplatný znak", "Empty filename is not allowed" : "Je třeba vyplnit název souboru", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Aplikace „%s“ nemůže být nainstalována protože soubor appinfo nelze přečíst.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Aplikaci „%s“ nelze nainstalovat, protože není kompatibilní s touto verzí serveru.", "__language_name__" : "Čeština", "This is an automatically sent email, please do not reply." : "Toto je automaticky odesílaný e-mail, neodpovídejte na něj.", + "Help & privacy" : "Nápověda", "Appearance and accessibility" : "Vzhled a zpřístupnění", "Apps" : "Aplikace", "Personal settings" : "Osobní nastavení", @@ -111,11 +111,17 @@ "Headline" : "Nadpis", "Organisation" : "Organizace", "Role" : "Role", + "Unknown account" : "Neznámý účet", "Additional settings" : "Další nastavení", + "Enter the database Login and name for %s" : "Zadejte přihlašovací jméno do databáze a název pro %s", + "Enter the database Login for %s" : "Zadejte přihlašovací jméno pro %s", "Enter the database name for %s" : "Zadejte název databáze pro %s", "You cannot use dots in the database name %s" : "V názvu databáze %s není možné použít tečky", + "MySQL Login and/or password not valid" : "Neplatné přihlašovací jméno a/nebo heslo do MySQL", "You need to enter details of an existing account." : "Je třeba zadat podrobnosti existujícího účtu.", "Oracle connection could not be established" : "Spojení s Oracle nemohlo být navázáno", + "Oracle Login and/or password not valid" : "Neplatné přihlašovací jméno a/nebo heslo do Oracle", + "PostgreSQL Login and/or password not valid" : "Neplatné přihlašovací jméno a/nebo heslo do PostgreSQL", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "macOS není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!", "For the best results, please consider using a GNU/Linux server instead." : "Místo toho zvažte pro nejlepší funkčnost použití GNU/Linux serveru.", "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4 GB and is highly discouraged." : "Zdá se, že tato instance %s je provozována v 32-bitovém PHP prostředí a v php.ini je nastavena volba open_basedir. Toto povede k problémům se soubory většími než 4 GB a silně není doporučováno.", @@ -125,25 +131,40 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Je třeba, aby podpůrná vrstva pro sdílení %s implementovala rozhraní OCP\\Share_Backend", "Sharing backend %s not found" : "Podpůrná vrstva pro sdílení %s nenalezena", "Sharing backend for %s not found" : "Úložiště sdílení pro %s nenalezeno", + "%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.", + "Open »%s«" : "Otevřít „%s“", + "%1$s via %2$s" : "%1$s prostřednictvím %2$s", "%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“", - "%1$s via %2$s" : "%1$s prostřednictvím %2$s", + "Unknown share type" : "Neznámý typ sdílení", "You are not allowed to share %s" : "Nemáte povoleno sdílet %s", "Cannot increase permissions of %s" : "Nelze navýšit oprávnění u %s", + "Shares need at least read permissions" : "Sdílení potřebuje alespoň oprávnění pro čtení", "Files cannot be shared with delete permissions" : "Soubory nelze sdílet s oprávněními k odstranění", "Files cannot be shared with create permissions" : "Soubory nelze sdílet s oprávněními k vytváření", "Expiration date is in the past" : "Datum skončení platnosti je v minulosti", + "Expiration date is enforced" : "Datum skončení platnosti vynuceno", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Datum vypršení nelze nastavit na více než %n den do budoucnosti","Datum vypršení nelze nastavit na více než %n dny do budoucnosti","Datum vypršení nelze nastavit na více než %n dnů do budoucnosti","Datum vypršení nelze nastavit na více než %n dny do budoucnosti"], "Sharing is only allowed with group members" : "Je povoleno pouze sdílení s členy skupiny", - "%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.", + "Sharing is only allowed within your own groups" : "Je povoleno pouze sdílení s členy vlastní skupiny", + "Path is already shared with this group" : "Umístění je již sdíleno s touto skupinou", + "Link sharing is not allowed" : "Sdílení odkazů není povoleno", + "Public upload is not allowed" : "Veřejné nahrávání není povoleno", + "Sharing is disabled" : "Sdílení je vypnuto", + "Sharing is disabled for you" : "Máte zakázáno sdílet", + "Cannot share with the share owner" : "Nelze sdílet zpět vlastníkovi sdílení", + "Cannot change share type" : "Nelze změnit typ sdílení", + "Invalid recipient" : "Neplatný příjemce", + "Group \"%s\" does not exist" : "Skupina \"%s\" neexistuje", "The requested share does not exist anymore" : "Požadované sdílení už neexistuje", "The requested share comes from a disabled user" : "Požadované sdílení pochází od vypnutého uživatelského účtu", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Uživatel nebyl vytvořen protože bylo dosaženo limitu počtu uživatelů. Více se dozvíte v upozorněních.", "Could not find category \"%s\"" : "Nedaří se nalézt kategorii „%s“", + "Input text" : "Zadejte text", + "The input text" : "Vstupní text", "Sunday" : "neděle", "Monday" : "pondělí", "Tuesday" : "úterý", @@ -190,6 +211,13 @@ "Nov." : "list.", "Dec." : "pro.", "A valid password must be provided" : "Je třeba zadat platné heslo", + "The Login is already being used" : "Přihlašovací jméno u je využíváno", + "Could not create account" : "Účet není možné vytvořit", + "A valid Login must be provided" : "Je třeba zadat platné přihlašovací jméno", + "Login contains whitespace at the beginning or at the end" : "Přihlašovací jméno je chybné – na jeho začátku či konci se nachází prázdný znak (mezera, tabulátor, atp.)", + "Login must not consist of dots only" : "Přihlašovací jméno se nemůže skládat pouze ze samých teček", + "Login is invalid because files already exist for this user" : "Přihlašovací jméno není platné, protože protože pro tohoto uživatele už existují soubory", + "Account disabled" : "Účet znepřístupněn", "Login canceled by app" : "Přihlášení zrušeno aplikací", "App \"%1$s\" cannot be installed because the following dependencies are not fulfilled: %2$s" : "Aplikaci „%1$s“ nelze nainstalovat, protože nejsou splněny následující závislosti: %2$s", "a safe home for all your data" : "bezpečný domov pro všechna vaše data", @@ -222,10 +250,10 @@ "Please ask your server administrator to restart the web server." : "Požádejte správce serveru, který využíváte o restart webového serveru.", "The required %s config variable is not configured in the config.php file." : "Požadovaná proměnná nastavení %s není v souboru s nastaveními config.php nastavena.", "Please ask your server administrator to check the Nextcloud configuration." : "Požádejte správce serveru, který využíváte, aby zkontroloval nastavení serveru.", + "Your data directory is readable by other people." : "Váš adresář data je čitelný ostatním lidem.", "Your data directory must be an absolute path." : "Je třeba, aby váš adresář data byl zadán jako úplný popis umístění.", "Check the value of \"datadirectory\" in your configuration." : "Zkontrolujte hodnotu „datadirectory“ ve svém nastavení.", "Your data directory is invalid." : "Váš adresář data není platný.", - "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“.", "Action \"%s\" not supported or implemented." : "Akce „%s“ není podporována nebo implementována.", "Authentication failed, wrong token or provider ID given" : "Ověření se nezdařilo, předán chybný token nebo identifikátor poskytovatele", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Pro dokončení požadavku chybí parametry. Konkrétně: „%s“", @@ -237,20 +265,65 @@ "Storage connection error. %s" : "Chyba připojení úložiště. %s", "Storage is temporarily not available" : "Úložiště je dočasně nedostupné", "Storage connection timeout. %s" : "Překročen časový limit připojování k úložišti. %s", + "Transcribe audio" : "Vytvořit text ze zvukové nahrávky", + "Transcribe the things said in an audio" : "Vytvořit zápis věcí řečených ve zvukovém záznamu", + "Audio input" : "Zvukový vstup", + "The audio to transcribe" : "Nahrávka k přepisu", + "Transcription" : "Přepis do textu", + "Writing style" : "Styl zápisu", + "Demonstrate a writing style that you would like to immitate" : "Předvádí styl psaní, který chcete napodobit", + "Source material" : "Zdrojový materiál", + "The content that would like to be rewritten in the new writing style" : "Obsah který by byl přepsán v novém stylu psaní", + "Generated text" : "Vytvořený text", + "Emoji generator" : "Generátor emotikon", + "Takes text and generates a representative emoji for it." : "Vezme text a vytvoří emotikonu, která ho představuje.", + "The text to generate an emoji for" : "Text pro který vytvořit emotikonu", + "Generated emoji" : "Vytvořená emotikona", + "The generated emoji based on the input text" : "Emotikona vytvořená na základě vstupního textu", + "Generate image" : "Vytvořit obrázek", + "Generate an image from a text prompt" : "Vytvoření obrázku dle textového zadání", "Prompt" : "Výzva", + "Describe the image you want to generate" : "Popište obrázek, který chcete vytvořit", + "Number of images" : "Počet obrázků", + "How many images to generate" : "Kolik obrázků vytvořit", + "Output images" : "Výstupní obrázky", + "The generated images" : "Vytvořené obrázky", + "Free text to text prompt" : "Volný text na textový prompt", + "Generated reply" : "Vygenerovaná odpověď", + "The generated text from the assistant" : "Text vytvořený pomocníkem", + "Chat" : "Chat", + "Chat with the assistant" : "Chat s pomocníkem", + "Chat message" : "Zpráva v chatu", + "Chat history" : "Historie chatu", "Generates a possible headline for a text." : "Vytvoří možný nadpis pro text.", + "Simplify text" : "Zjednodušit text", "Summarize" : "Stručný souhrn", "Summary" : "Souhrn", "Extract topics" : "Vyzískat témata", + "Topics" : "Témata", + "The list of extracted topics" : "Seznam extrahovaných témat", + "Translate" : "Překládání", + "Translate text from one language to another" : "Přeložit text z jednoho jazyka do jiného", + "Origin text" : "Původní text", + "The text to translate" : "Text k překladu", + "Origin language" : "Původní jazyk", + "The language of the origin text" : "Jazyk původního textu", + "Target language" : "Cílový jazyk", + "The desired language to translate the origin text in" : "Požadovaný jazyk do kterého přeložit původní text", + "Result" : "Výsledek", + "The translated text" : "Přeložený text", "Free prompt" : "Prompt zdarma", "Runs an arbitrary prompt through the language model." : "Spouští libovolnou výzvu skrze jazykový model.", "Generate headline" : "Vytvořit nadpis", "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.", - "404" : "404", + "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", @@ -269,9 +342,8 @@ "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", - "PostgreSQL >= 9 required." : "Je vyžadováno PostgreSQL verze 9 a novější.", - "Please upgrade your database version." : "Aktualizujte verzi vámi využívané databáze.", "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." + "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 e0d95f7e155..d0f7460a7e4 100644 --- a/lib/l10n/cy_GB.js +++ b/lib/l10n/cy_GB.js @@ -16,9 +16,9 @@ OC.L10N.register( "Address" : "Cyfeiriad", "About" : "Ynghylch", "Set an admin password." : "Gosod cyfrinair y gweinyddwr.", + "Click the button below to open it." : "Cliciwch ar y botwm isod i'w agor.", "Open »%s«" : "Agor »%s«", "%1$s via %2$s" : "%1$s trwy %2$s", - "Click the button below to open it." : "Cliciwch ar y botwm isod i'w agor.", "Could not find category \"%s\"" : "Methu canfod categori \"%s\"", "Sunday" : "Sul", "Monday" : "Llun", @@ -62,6 +62,7 @@ OC.L10N.register( "Authentication error" : "Gwall dilysu", "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", diff --git a/lib/l10n/cy_GB.json b/lib/l10n/cy_GB.json index d864483751d..623409d9d25 100644 --- a/lib/l10n/cy_GB.json +++ b/lib/l10n/cy_GB.json @@ -14,9 +14,9 @@ "Address" : "Cyfeiriad", "About" : "Ynghylch", "Set an admin password." : "Gosod cyfrinair y gweinyddwr.", + "Click the button below to open it." : "Cliciwch ar y botwm isod i'w agor.", "Open »%s«" : "Agor »%s«", "%1$s via %2$s" : "%1$s trwy %2$s", - "Click the button below to open it." : "Cliciwch ar y botwm isod i'w agor.", "Could not find category \"%s\"" : "Methu canfod categori \"%s\"", "Sunday" : "Sul", "Monday" : "Llun", @@ -60,6 +60,7 @@ "Authentication error" : "Gwall dilysu", "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", diff --git a/lib/l10n/da.js b/lib/l10n/da.js index bdf723587c9..3daf3dece10 100644 --- a/lib/l10n/da.js +++ b/lib/l10n/da.js @@ -19,7 +19,6 @@ 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 Edition" : "Uddanelses Version", "Enterprise bundle" : "Enterprise version", "Groupware bundle" : "Groupware version", "Hub bundle" : "Hub version", @@ -76,14 +75,12 @@ OC.L10N.register( "seconds ago" : "få sekunder siden", "Empty file" : "Tom fil", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modulet med ID: %s eksisterer ikke. Aktiver det venligst i dine indstillinger eller kontakt din administrator.", + "Dot files are not allowed" : "Filer med punktummer er ikke tilladt", "File already exists" : "Filen findes allerede", "Invalid path" : "Ugyldig sti", "Failed to create file from template" : "Fejl ved oprettelse af fil fra skabelon", "Templates" : "Skabeloner", - "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", - "Dot files are not allowed" : "Filer med punktummer er ikke tilladt", + "Filename contains at least one invalid character" : "Filnavnet indeholder mindst ét ugyldigt tegn", "Empty filename is not allowed" : "Tomme filnavne er ikke tilladt", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Appen \"%s\" kan ikke installeres fordi appinfo filen ikke kan læses.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Appen \"%s\" kan ikke installeres fordi den ikke er kompatibel med denne version af serveren.", @@ -131,11 +128,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Delingsbackend'en %s skal implementere grænsefladen OCP\\Share_Backend", "Sharing backend %s not found" : "Delingsbackend'en %s blev ikke fundet", "Sharing backend for %s not found" : "Delingsbackend'en for %s blev ikke fundet", + "%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.", + "Open »%s«" : "Åbn »%s«", + "%1$s via %2$s" : "%1$s via %2$s", "%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«", - "%1$s via %2$s" : "%1$s via %2$s", + "Unknown share type" : "Ukendt deletype", "You are not allowed to share %s" : "Du har ikke tilladelse til at dele %s", "Cannot increase permissions of %s" : "Kan give yderigere rettigheder til %s", "Files cannot be shared with delete permissions" : "Filer kan ikke deles med rettigheder til at slette", @@ -143,9 +144,6 @@ OC.L10N.register( "Expiration date is in the past" : "Udløbsdatoen ligger tilbage i tid", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Udløbsdato kan ikke sættes mere end %n dag ud i fremtiden","Udløbsdato kan ikke sættes mere end %n dage ud i fremtiden"], "Sharing is only allowed with group members" : "Deling er kun tilladt med gruppemedlemmer", - "%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 requested share does not exist anymore" : "Det delte emne eksisterer ikke længere", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Brugeren blev ikke oprettet, fordi brugergrænsen er nået. Tjek dine notifikationer for at få flere oplysninger.", "Could not find category \"%s\"" : "Kunne ikke finde kategorien \"%s\"", @@ -230,7 +228,6 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Datamappen skal have en absolut sti.", "Check the value of \"datadirectory\" in your configuration." : "Tjek værdien for \"datadictionary\" i din konfiguration.", "Your data directory is invalid." : "Datamappen er ugyldig.", - "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.", "Action \"%s\" not supported or implemented." : "Aktiviteten \"%s\" er ikke understøttet eller implementeret.", "Authentication failed, wrong token or provider ID given" : "Kunne ikke validere brugeren", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Anmodningen kunne ikke gennemføres pga. manglende parameter: \"%s\"", @@ -247,15 +244,20 @@ OC.L10N.register( "Summarize" : "Opsummer", "Summary" : "Oversigt", "Extract topics" : "Uddrag emner", + "Translate" : "Oversæt", + "Result" : "Resultat", "Free prompt" : "Gratis prompt", "Runs an arbitrary prompt through the language model." : "Kører en arbitrær prompt gennem sprogmodellen.", "Generate headline" : "Generer overskrift", "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.", - "404" : "404", + "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", @@ -274,9 +276,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 kræves.", - "Please upgrade your database version." : "Opgradér venligst din databaseversion.", "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." + "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 0bf343e50ce..992ac03801c 100644 --- a/lib/l10n/da.json +++ b/lib/l10n/da.json @@ -17,7 +17,6 @@ "%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 Edition" : "Uddanelses Version", "Enterprise bundle" : "Enterprise version", "Groupware bundle" : "Groupware version", "Hub bundle" : "Hub version", @@ -74,14 +73,12 @@ "seconds ago" : "få sekunder siden", "Empty file" : "Tom fil", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modulet med ID: %s eksisterer ikke. Aktiver det venligst i dine indstillinger eller kontakt din administrator.", + "Dot files are not allowed" : "Filer med punktummer er ikke tilladt", "File already exists" : "Filen findes allerede", "Invalid path" : "Ugyldig sti", "Failed to create file from template" : "Fejl ved oprettelse af fil fra skabelon", "Templates" : "Skabeloner", - "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", - "Dot files are not allowed" : "Filer med punktummer er ikke tilladt", + "Filename contains at least one invalid character" : "Filnavnet indeholder mindst ét ugyldigt tegn", "Empty filename is not allowed" : "Tomme filnavne er ikke tilladt", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Appen \"%s\" kan ikke installeres fordi appinfo filen ikke kan læses.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Appen \"%s\" kan ikke installeres fordi den ikke er kompatibel med denne version af serveren.", @@ -129,11 +126,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Delingsbackend'en %s skal implementere grænsefladen OCP\\Share_Backend", "Sharing backend %s not found" : "Delingsbackend'en %s blev ikke fundet", "Sharing backend for %s not found" : "Delingsbackend'en for %s blev ikke fundet", + "%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.", + "Open »%s«" : "Åbn »%s«", + "%1$s via %2$s" : "%1$s via %2$s", "%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«", - "%1$s via %2$s" : "%1$s via %2$s", + "Unknown share type" : "Ukendt deletype", "You are not allowed to share %s" : "Du har ikke tilladelse til at dele %s", "Cannot increase permissions of %s" : "Kan give yderigere rettigheder til %s", "Files cannot be shared with delete permissions" : "Filer kan ikke deles med rettigheder til at slette", @@ -141,9 +142,6 @@ "Expiration date is in the past" : "Udløbsdatoen ligger tilbage i tid", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Udløbsdato kan ikke sættes mere end %n dag ud i fremtiden","Udløbsdato kan ikke sættes mere end %n dage ud i fremtiden"], "Sharing is only allowed with group members" : "Deling er kun tilladt med gruppemedlemmer", - "%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 requested share does not exist anymore" : "Det delte emne eksisterer ikke længere", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Brugeren blev ikke oprettet, fordi brugergrænsen er nået. Tjek dine notifikationer for at få flere oplysninger.", "Could not find category \"%s\"" : "Kunne ikke finde kategorien \"%s\"", @@ -228,7 +226,6 @@ "Your data directory must be an absolute path." : "Datamappen skal have en absolut sti.", "Check the value of \"datadirectory\" in your configuration." : "Tjek værdien for \"datadictionary\" i din konfiguration.", "Your data directory is invalid." : "Datamappen er ugyldig.", - "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.", "Action \"%s\" not supported or implemented." : "Aktiviteten \"%s\" er ikke understøttet eller implementeret.", "Authentication failed, wrong token or provider ID given" : "Kunne ikke validere brugeren", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Anmodningen kunne ikke gennemføres pga. manglende parameter: \"%s\"", @@ -245,15 +242,20 @@ "Summarize" : "Opsummer", "Summary" : "Oversigt", "Extract topics" : "Uddrag emner", + "Translate" : "Oversæt", + "Result" : "Resultat", "Free prompt" : "Gratis prompt", "Runs an arbitrary prompt through the language model." : "Kører en arbitrær prompt gennem sprogmodellen.", "Generate headline" : "Generer overskrift", "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.", - "404" : "404", + "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", @@ -272,9 +274,8 @@ "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 kræves.", - "Please upgrade your database version." : "Opgradér venligst din databaseversion.", "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." + "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 b385adc26cf..651d66800af 100644 --- a/lib/l10n/de.js +++ b/lib/l10n/de.js @@ -19,7 +19,7 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s und %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s und %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s und %5$s", - "Education Edition" : "Bildungsausgabe", + "Education bundle" : "Bildungspaket", "Enterprise bundle" : "Firmen-Paket", "Groupware bundle" : "Groupware-Paket", "Hub bundle" : "Hub-Paket", @@ -38,6 +38,7 @@ OC.L10N.register( "Server version %s or higher is required." : "Server Version %s oder höher wird benötigt.", "Server version %s or lower is required." : "Server Version %s oder niedriger wird benötigt.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Das angemeldete Konto muss ein Administrator, ein Teil-Administrator sein oder ein Sonderrecht haben, um auf diese Einstellung zuzugreifen", + "Your current IP address doesn’t allow you to perform admin actions" : "Unter deiner aktuellen IP-Adresse sind keine Administrationsaktionen erlaubt", "Logged in account must be an admin or sub admin" : "Das angemeldete Konto muss ein (Sub-)Administrator sein", "Logged in account must be an admin" : "Das angemeldete Konto muss ein Administrator sein", "Wiping of device %s has started" : "Löschen von Gerät %s wurde gestartet", @@ -80,14 +81,21 @@ 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.", + "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.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" ist in einem Datei- oder Ordnernamen unzulässig.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" ist ein unzulässiger Dateityp.", + "Filenames must not end with \"%1$s\"." : "Dateinamen dürfen nicht mit \"%1$s\" enden.", + "Invalid parent path" : "Ungültiger übergeordneter Pfad", "File already exists" : "Datei bereits vorhanden", "Invalid path" : "Ungültiger Pfad", "Failed to create file from template" : "Fehler beim Erstellen der Datei aus Vorlage", "Templates" : "Vorlagen", - "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", - "Dot files are not allowed" : "Dateinamen mit einem Punkt am Anfang sind 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.", + "Filename is too long" : "Dateiname ist zu lang", "Empty filename is not allowed" : "Ein leerer Dateiname ist nicht erlaubt", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Die Anwendung \"%s\" kann nicht installiert werden, weil die Anwendungsinfodatei nicht gelesen werden kann.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Die App \"%s\" kann nicht installiert werden, da sie mit dieser Serverversion nicht kompatibel ist.", @@ -139,25 +147,62 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden", "Sharing backend %s not found" : "Freigabe-Backend %s nicht gefunden", "Sharing backend for %s not found" : "Freigabe-Backend für %s nicht gefunden", + "%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.", + "Open »%s«" : "»%s« öffnen", + "%1$s via %2$s" : "%1$s über %2$s", "%1$s shared »%2$s« with you and wants to add:" : "%1$shat » %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", - "%1$s via %2$s" : "%1$s über %2$s", + "Passwords are enforced for link and mail shares" : "Für Link- und E-Mail-Freigaben werden Passwörter erzwungen", + "SharedWith is not a valid user" : "SharedWith ist kein gültiger Benutzer", + "SharedWith is not a valid group" : "SharedWith ist keine gültige Gruppe", + "SharedWith should be empty" : "SharedWith sollte leer sein", + "SharedWith should not be empty" : "SharedWith sollte nicht leer sein", + "SharedWith is not a valid circle" : "SharedWith ist kein gültiger Kreis", + "Unknown share type" : "Unbekannter Freigabetyp", + "SharedBy should be set" : "SharedBy sollte gesetzt sein", + "Cannot share with yourself" : "Es kann nicht mit dir selbst geteilt werden", + "Path should be set" : "Pfad sollte festgelegt werden", + "Path should be either a file or a folder" : "Der Pfad muss entweder eine Datei oder ein Ordner sein", + "You cannot share your root folder" : "Du kannst deinen Stammordner nicht freigeben", "You are not allowed to share %s" : "Du bist nicht berechtigt, %s zu teilen.", + "A share requires permissions" : "Eine Freigabe erfordert Berechtigungen", "Cannot increase permissions of %s" : "Kann die Berechtigungen von %s nicht erhöhen", + "Shares need at least read permissions" : "Freigaben benötigen mindestens Leseberechtigungen", "Files cannot be shared with delete permissions" : "Dateien mit Lösch-Berechtigungen können nicht geteilt werden", "Files cannot be shared with create permissions" : "Dateien mit Erstell-Berechtigungen können nicht geteilt werden", "Expiration date is in the past" : "Das Ablaufdatum liegt in der Vergangenheit.", + "Expiration date is enforced" : "Ablaufdatum wird erzwungen", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Das Ablaufdatum kann nicht mehr als %n Tag in der Zukunft liegen","Das Ablaufdatum kann nicht mehr als %n Tage in der Zukunft liegen"], "Sharing is only allowed with group members" : "Teilen ist nur mit Gruppenmitgliedern erlaubt", - "%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.", + "Sharing %s failed, because this item is already shared with the account %s" : "Freigeben von %s ist fehlgeschlagen, da dieses Element schon mit dem Konto %s geteilt wurde", + "Group sharing is now allowed" : "Gruppenfreigabe ist jetzt erlaubt", + "Sharing is only allowed within your own groups" : "Das Teilen ist nur innerhalb deiner eigenen Gruppen erlaubt", + "Path is already shared with this group" : "Der Pfad ist bereits mit dieser Gruppe geteilt", + "Link sharing is not allowed" : "Freigabe via Link ist nicht erlaubt", + "Public upload is not allowed" : "Öffentliches Hochladen ist nicht erlaubt", + "Path contains files shared with you" : "Der Pfad enthält für dich freigegebene Dateien", + "Sharing is disabled" : "Teilen ist deaktiviert", + "Sharing is disabled for you" : "Teilen ist für dich deaktiviert", + "Cannot share with the share owner" : "Teilen mit dem Freigabeeigentümer nicht möglich", + "Share does not have a full ID" : "Die Freigabe hat keine vollständige ID", + "Cannot change share type" : "Der Freigabetyp kann nicht geändert werden", + "Can only update recipient on user shares" : "Empfänger können nur bei Benutzerfreigaben aktualisiert werden", + "Cannot enable sending the password by Talk with an empty password" : "Das Senden des Passworts über Talk kann mit einem leeren Passwort nicht aktiviert werden", + "Cannot enable sending the password by Talk without setting a new password" : "Das Senden des Passworts über Talk kann nicht aktiviert werden, ohne ein neues Passwort festzulegen", + "Cannot disable sending the password by Talk without setting a new password" : "Das Senden des Passworts durch Talk kann nicht deaktiviert werden, ohne ein neues Passwort festzulegen", + "Share provider does not support accepting" : "Der Teilen-Anbieter unterstützt das Akzeptieren nicht", + "Cannot change target of link share" : "Das Ziel der Linkfreigabe kann nicht geändert werden", + "Invalid recipient" : "Ungültiger Empfänger", + "Group \"%s\" does not exist" : "Gruppe \"%s\" existiert nicht", "The requested share does not exist anymore" : "Die angeforderte Freigabe existiert nicht mehr", "The requested share comes from a disabled user" : "Die angeforderte Freigabe stammt von einem deaktivierten Benutzer", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Der Benutzer wurde nicht erstellt, da das Benutzerlimit erreicht wurde. Überprüfe deine Benachrichtigungen, um mehr zu erfahren.", "Could not find category \"%s\"" : "Die Kategorie \"%s“ konnte nicht gefunden werden", + "Input text" : "Texteingabe", + "The input text" : "Der Eingabetext", "Sunday" : "Sonntag", "Monday" : "Montag", "Tuesday" : "Dienstag", @@ -204,6 +249,14 @@ OC.L10N.register( "Nov." : "Nov.", "Dec." : "Dez.", "A valid password must be provided" : "Es muss ein gültiges Passwort eingegeben werden", + "The Login is already being used" : "Dieser Anmeldename wird bereits verwendet", + "Could not create account" : "Konto konnte nicht erstellt werden", + "Only the following characters are allowed in an Login: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Nur die folgenden Zeichen sind in einem Anmeldenamen erlaubt: \"a-z\", \"A-Z\", \"0-9\", Leerzeichen und \"_.@-'\"", + "A valid Login must be provided" : "Ein gültiger Anmeldename muss angegeben werden.", + "Login contains whitespace at the beginning or at the end" : "Anmeldename enthält Leerzeichen am Anfang oder am Ende", + "Login must not consist of dots only" : "Der Anmeldename darf nicht nur aus Punkten bestehen", + "Login is invalid because files already exist for this user" : "Der Anmeldename ist ungültig, da bereits Dateien von diesem Benutzer existieren", + "Account disabled" : "Konto deaktiviert", "Login canceled by app" : "Anmeldung durch die App abgebrochen", "App \"%1$s\" cannot be installed because the following dependencies are not fulfilled: %2$s" : "Die App „%1$s“ kann nicht installiert werden, da die folgenden Abhängigkeiten nicht erfüllt sind: %2$s", "a safe home for all your data" : "ein sicherer Ort für all deine Daten", @@ -237,10 +290,11 @@ OC.L10N.register( "The required %s config variable is not configured in the config.php file." : "Die erforderliche %s Konfigurationsvariable ist in der config.php nicht konfiguriert.", "Please ask your server administrator to check the Nextcloud configuration." : "Bitte deinen Server-Administrator, die Nextcloud-Konfiguration zu überprüfen.", "Your data directory is readable by other people." : "Dein Datenverzeichnis kann von anderen Benutzern gelesen werden", + "Please change the permissions to 0770 so that the directory cannot be listed by other people." : "Bitte ändere die Berechtigungen auf 0770, so dass das Verzeichnis nicht von Anderen angezeigt werden kann.", "Your data directory must be an absolute path." : "Dein Datenverzeichnis muss einen eindeutigen Pfad haben", "Check the value of \"datadirectory\" in your configuration." : "Überprüfe bitte die Angabe unter „datadirectory“ in deiner Konfiguration", "Your data directory is invalid." : "Dein Datenverzeichnis ist ungültig", - "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.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Stelle sicher, dass eine Datei \"%1$s\" im Wurzelverzeichnis des Datenverzeichnisses existiert. Sie sollte folgenden Inhalt haben: \"%2$s\"", "Action \"%s\" not supported or implemented." : "Aktion \"%s\" wird nicht unterstützt oder ist nicht implementiert.", "Authentication failed, wrong token or provider ID given" : "Authentifizierung ist fehlgeschlagen. Falsches Token oder falsche Provider-ID wurde übertragen.", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Es fehlen Parameter, um die Anfrage zu bearbeiten. Fehlende Parameter: \"%s\"", @@ -252,22 +306,99 @@ OC.L10N.register( "Storage connection error. %s" : "Verbindungsfehler zum Speicherplatz. %s", "Storage is temporarily not available" : "Speicher ist vorübergehend nicht verfügbar", "Storage connection timeout. %s" : "Zeitüberschreitung der Verbindung zum Speicherplatz. %s", + "Transcribe audio" : "Audio transkribieren", + "Transcribe the things said in an audio" : "Inhalt der Audiodatei transkribieren", + "Audio input" : "Audioeingang", + "The audio to transcribe" : "Die Audio-Datei zum Transkribieren", + "Transcription" : "Transkription", + "The transcribed text" : "Der transkribierte Text", + "Context write" : "Kontext schreiben", + "Writes text in a given style based on the provided source material." : "Schreibt Text in einem vorgegebenen Stil auf Basis des bereitgestellten Quellmaterials.", "Writing style" : "Schreibstil", "Demonstrate a writing style that you would like to immitate" : "Zeigen Sie einen Schreibstil, den Sie gerne nachahmen würden", "Source material" : "Quellmaterial", + "The content that would like to be rewritten in the new writing style" : "Der Inhalt, der in den neuen Schreibstil umgeschrieben werden soll", + "Generated text" : "Erstellter Text", + "The generated text with content from the source material in the given style" : "Der erstellte Text mit Inhalten aus dem Quellmaterial im angegebenen Stil", + "Emoji generator" : "Emoji-Generator", + "Takes text and generates a representative emoji for it." : "Erstellt aus eingegebenem Text ein repräsentatives Emoji.", + "The text to generate an emoji for" : "Der Text aus dem ein Emoji erstellt werden soll", + "Generated emoji" : "Erstelltes Emoji", + "The generated emoji based on the input text" : "Das aus dem eingegebenen Text erstelltes Emoji", + "Generate image" : "Bild erstellen", + "Generate an image from a text prompt" : "Bild aus einer Texteingabe erstellen", + "Prompt" : "Prompt", + "Describe the image you want to generate" : "Beschreibe das Bild, das du erstellen möchtest", + "Number of images" : "Anzahl der Bilder", + "How many images to generate" : "Wie viele Bilder erstellt werden sollen", + "Output images" : "Ausgegebene Bilder", + "The generated images" : "Die erstellten Bilder", + "Free text to text prompt" : "Freie Text-zu-Text-Eingabeaufforderung", + "Runs an arbitrary prompt through a language model that returns a reply" : "Führt eine beliebige Eingabeaufforderung mit einem Sprachmodell aus, das eine Antwort zurückgibt", + "Describe a task that you want the assistant to do or ask a question" : "Beschreibe eine Aufgabe, die der Assistent erledigen soll, oder stelle eine Frage", + "Generated reply" : "Erstellte Antwort", + "The generated text from the assistant" : "Der vom Assistenten erstellte Text", + "Chat" : "Chat", + "Chat with the assistant" : "Mit dem Assistenten chatten", + "System prompt" : "Systemaufforderung", + "Define rules and assumptions that the assistant should follow during the conversation." : "Regeln und Annahmen definieren, die der Assistent während des Gesprächs befolgen soll.", + "Chat message" : "Chatnachricht", + "Chat history" : "Chatverlauf", + "The history of chat messages before the current message, starting with a message by the user" : "Chatverlauf vor der aktuellen Nachricht, beginnend mit einer Nachricht des Benutzers", + "Response message" : "Antwortnachricht", + "The generated response as part of the conversation" : "Die erstellte Antwort als Teil der Unterhaltung", + "Formalize text" : "Förmlicher Text", + "Takes a text and makes it sound more formal" : "Verleiht einem Text mehr Förmlichkeit", + "Write a text that you want the assistant to formalize" : "Text schreiben, den der Assistent förmlich umschreiben soll", + "Formalized text" : "Förmlicher Text", + "The formalized text" : "Der förmliche Text", + "Generate a headline" : "Eine Überschrift erstellen", "Generates a possible headline for a text." : "Erzeugt eine mögliche Überschrift für einen Text.", + "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", + "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", + "Reformulated text" : "Umformulierter Text", + "The reformulated text, written by the assistant" : "Der vom Assistenten erstellte umfomulierte Text", + "Simplify text" : "Text vereinfachen", + "Takes a text and simplifies it" : "Vereinfacht einen Text", + "Write a text that you want the assistant to simplify" : "Text schreiben, den der Assistent vereinfachen soll", + "Simplified text" : "Vereinfachter Text", + "The simplified text" : "Der vereinfachte Text", "Summarize" : "Zusammenfassen", + "Summarizes a text" : "Fasst einen Text zusammen", + "The original text to summarize" : "Der Originaltext zum Zusammenfassen", "Summary" : "Zusammenfassung", + "The generated summary" : "Die erstellte Zusammenfassung", "Extract topics" : "Themen extrahieren", + "Extracts topics from a text and outputs them separated by commas" : "Extrahiert Themen aus einem Text und gibt diese durch Kommas getrennt aus", + "The original text to extract topics from" : "Der Originaltext, aus dem Themen extrahiert werden sollen", + "Topics" : "Themen", + "The list of extracted topics" : "Liste der extrahierten Themen", + "Translate" : "Übersetzen", + "Translate text from one language to another" : "Text von einer Sprache in eine andere übersetzen", + "Origin text" : "Ausgangstext", + "The text to translate" : "Der zu übersetzende Text", + "Origin language" : "Ausgangssprache", + "The language of the origin text" : "Die Sprache des Ausgangstextes", + "Target language" : "Zielsprache", + "The desired language to translate the origin text in" : "Die gewünschte Sprache, in die der Ausgangstext übersetzt werden soll", + "Result" : "Ergebnis", + "The translated text" : "Der übersetzte Text", "Free prompt" : "Freie Eingabeaufforderung", "Runs an arbitrary prompt through the language model." : "Führt eine beliebige Eingabeaufforderung über das Sprachmodell aus.", "Generate headline" : "Überschrift erzeugen", "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.", - "404" : "404", + "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", @@ -286,9 +417,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 benötigt", - "Please upgrade your database version." : "Bitte aktualisiere deine Datenbankversion", "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." + "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 49ed179a13a..49030ec45cc 100644 --- a/lib/l10n/de.json +++ b/lib/l10n/de.json @@ -17,7 +17,7 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s und %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s und %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s und %5$s", - "Education Edition" : "Bildungsausgabe", + "Education bundle" : "Bildungspaket", "Enterprise bundle" : "Firmen-Paket", "Groupware bundle" : "Groupware-Paket", "Hub bundle" : "Hub-Paket", @@ -36,6 +36,7 @@ "Server version %s or higher is required." : "Server Version %s oder höher wird benötigt.", "Server version %s or lower is required." : "Server Version %s oder niedriger wird benötigt.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Das angemeldete Konto muss ein Administrator, ein Teil-Administrator sein oder ein Sonderrecht haben, um auf diese Einstellung zuzugreifen", + "Your current IP address doesn’t allow you to perform admin actions" : "Unter deiner aktuellen IP-Adresse sind keine Administrationsaktionen erlaubt", "Logged in account must be an admin or sub admin" : "Das angemeldete Konto muss ein (Sub-)Administrator sein", "Logged in account must be an admin" : "Das angemeldete Konto muss ein Administrator sein", "Wiping of device %s has started" : "Löschen von Gerät %s wurde gestartet", @@ -78,14 +79,21 @@ "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.", + "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.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" ist in einem Datei- oder Ordnernamen unzulässig.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" ist ein unzulässiger Dateityp.", + "Filenames must not end with \"%1$s\"." : "Dateinamen dürfen nicht mit \"%1$s\" enden.", + "Invalid parent path" : "Ungültiger übergeordneter Pfad", "File already exists" : "Datei bereits vorhanden", "Invalid path" : "Ungültiger Pfad", "Failed to create file from template" : "Fehler beim Erstellen der Datei aus Vorlage", "Templates" : "Vorlagen", - "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", - "Dot files are not allowed" : "Dateinamen mit einem Punkt am Anfang sind 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.", + "Filename is too long" : "Dateiname ist zu lang", "Empty filename is not allowed" : "Ein leerer Dateiname ist nicht erlaubt", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Die Anwendung \"%s\" kann nicht installiert werden, weil die Anwendungsinfodatei nicht gelesen werden kann.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Die App \"%s\" kann nicht installiert werden, da sie mit dieser Serverversion nicht kompatibel ist.", @@ -137,25 +145,62 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden", "Sharing backend %s not found" : "Freigabe-Backend %s nicht gefunden", "Sharing backend for %s not found" : "Freigabe-Backend für %s nicht gefunden", + "%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.", + "Open »%s«" : "»%s« öffnen", + "%1$s via %2$s" : "%1$s über %2$s", "%1$s shared »%2$s« with you and wants to add:" : "%1$shat » %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", - "%1$s via %2$s" : "%1$s über %2$s", + "Passwords are enforced for link and mail shares" : "Für Link- und E-Mail-Freigaben werden Passwörter erzwungen", + "SharedWith is not a valid user" : "SharedWith ist kein gültiger Benutzer", + "SharedWith is not a valid group" : "SharedWith ist keine gültige Gruppe", + "SharedWith should be empty" : "SharedWith sollte leer sein", + "SharedWith should not be empty" : "SharedWith sollte nicht leer sein", + "SharedWith is not a valid circle" : "SharedWith ist kein gültiger Kreis", + "Unknown share type" : "Unbekannter Freigabetyp", + "SharedBy should be set" : "SharedBy sollte gesetzt sein", + "Cannot share with yourself" : "Es kann nicht mit dir selbst geteilt werden", + "Path should be set" : "Pfad sollte festgelegt werden", + "Path should be either a file or a folder" : "Der Pfad muss entweder eine Datei oder ein Ordner sein", + "You cannot share your root folder" : "Du kannst deinen Stammordner nicht freigeben", "You are not allowed to share %s" : "Du bist nicht berechtigt, %s zu teilen.", + "A share requires permissions" : "Eine Freigabe erfordert Berechtigungen", "Cannot increase permissions of %s" : "Kann die Berechtigungen von %s nicht erhöhen", + "Shares need at least read permissions" : "Freigaben benötigen mindestens Leseberechtigungen", "Files cannot be shared with delete permissions" : "Dateien mit Lösch-Berechtigungen können nicht geteilt werden", "Files cannot be shared with create permissions" : "Dateien mit Erstell-Berechtigungen können nicht geteilt werden", "Expiration date is in the past" : "Das Ablaufdatum liegt in der Vergangenheit.", + "Expiration date is enforced" : "Ablaufdatum wird erzwungen", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Das Ablaufdatum kann nicht mehr als %n Tag in der Zukunft liegen","Das Ablaufdatum kann nicht mehr als %n Tage in der Zukunft liegen"], "Sharing is only allowed with group members" : "Teilen ist nur mit Gruppenmitgliedern erlaubt", - "%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.", + "Sharing %s failed, because this item is already shared with the account %s" : "Freigeben von %s ist fehlgeschlagen, da dieses Element schon mit dem Konto %s geteilt wurde", + "Group sharing is now allowed" : "Gruppenfreigabe ist jetzt erlaubt", + "Sharing is only allowed within your own groups" : "Das Teilen ist nur innerhalb deiner eigenen Gruppen erlaubt", + "Path is already shared with this group" : "Der Pfad ist bereits mit dieser Gruppe geteilt", + "Link sharing is not allowed" : "Freigabe via Link ist nicht erlaubt", + "Public upload is not allowed" : "Öffentliches Hochladen ist nicht erlaubt", + "Path contains files shared with you" : "Der Pfad enthält für dich freigegebene Dateien", + "Sharing is disabled" : "Teilen ist deaktiviert", + "Sharing is disabled for you" : "Teilen ist für dich deaktiviert", + "Cannot share with the share owner" : "Teilen mit dem Freigabeeigentümer nicht möglich", + "Share does not have a full ID" : "Die Freigabe hat keine vollständige ID", + "Cannot change share type" : "Der Freigabetyp kann nicht geändert werden", + "Can only update recipient on user shares" : "Empfänger können nur bei Benutzerfreigaben aktualisiert werden", + "Cannot enable sending the password by Talk with an empty password" : "Das Senden des Passworts über Talk kann mit einem leeren Passwort nicht aktiviert werden", + "Cannot enable sending the password by Talk without setting a new password" : "Das Senden des Passworts über Talk kann nicht aktiviert werden, ohne ein neues Passwort festzulegen", + "Cannot disable sending the password by Talk without setting a new password" : "Das Senden des Passworts durch Talk kann nicht deaktiviert werden, ohne ein neues Passwort festzulegen", + "Share provider does not support accepting" : "Der Teilen-Anbieter unterstützt das Akzeptieren nicht", + "Cannot change target of link share" : "Das Ziel der Linkfreigabe kann nicht geändert werden", + "Invalid recipient" : "Ungültiger Empfänger", + "Group \"%s\" does not exist" : "Gruppe \"%s\" existiert nicht", "The requested share does not exist anymore" : "Die angeforderte Freigabe existiert nicht mehr", "The requested share comes from a disabled user" : "Die angeforderte Freigabe stammt von einem deaktivierten Benutzer", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Der Benutzer wurde nicht erstellt, da das Benutzerlimit erreicht wurde. Überprüfe deine Benachrichtigungen, um mehr zu erfahren.", "Could not find category \"%s\"" : "Die Kategorie \"%s“ konnte nicht gefunden werden", + "Input text" : "Texteingabe", + "The input text" : "Der Eingabetext", "Sunday" : "Sonntag", "Monday" : "Montag", "Tuesday" : "Dienstag", @@ -202,6 +247,14 @@ "Nov." : "Nov.", "Dec." : "Dez.", "A valid password must be provided" : "Es muss ein gültiges Passwort eingegeben werden", + "The Login is already being used" : "Dieser Anmeldename wird bereits verwendet", + "Could not create account" : "Konto konnte nicht erstellt werden", + "Only the following characters are allowed in an Login: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "Nur die folgenden Zeichen sind in einem Anmeldenamen erlaubt: \"a-z\", \"A-Z\", \"0-9\", Leerzeichen und \"_.@-'\"", + "A valid Login must be provided" : "Ein gültiger Anmeldename muss angegeben werden.", + "Login contains whitespace at the beginning or at the end" : "Anmeldename enthält Leerzeichen am Anfang oder am Ende", + "Login must not consist of dots only" : "Der Anmeldename darf nicht nur aus Punkten bestehen", + "Login is invalid because files already exist for this user" : "Der Anmeldename ist ungültig, da bereits Dateien von diesem Benutzer existieren", + "Account disabled" : "Konto deaktiviert", "Login canceled by app" : "Anmeldung durch die App abgebrochen", "App \"%1$s\" cannot be installed because the following dependencies are not fulfilled: %2$s" : "Die App „%1$s“ kann nicht installiert werden, da die folgenden Abhängigkeiten nicht erfüllt sind: %2$s", "a safe home for all your data" : "ein sicherer Ort für all deine Daten", @@ -235,10 +288,11 @@ "The required %s config variable is not configured in the config.php file." : "Die erforderliche %s Konfigurationsvariable ist in der config.php nicht konfiguriert.", "Please ask your server administrator to check the Nextcloud configuration." : "Bitte deinen Server-Administrator, die Nextcloud-Konfiguration zu überprüfen.", "Your data directory is readable by other people." : "Dein Datenverzeichnis kann von anderen Benutzern gelesen werden", + "Please change the permissions to 0770 so that the directory cannot be listed by other people." : "Bitte ändere die Berechtigungen auf 0770, so dass das Verzeichnis nicht von Anderen angezeigt werden kann.", "Your data directory must be an absolute path." : "Dein Datenverzeichnis muss einen eindeutigen Pfad haben", "Check the value of \"datadirectory\" in your configuration." : "Überprüfe bitte die Angabe unter „datadirectory“ in deiner Konfiguration", "Your data directory is invalid." : "Dein Datenverzeichnis ist ungültig", - "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.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Stelle sicher, dass eine Datei \"%1$s\" im Wurzelverzeichnis des Datenverzeichnisses existiert. Sie sollte folgenden Inhalt haben: \"%2$s\"", "Action \"%s\" not supported or implemented." : "Aktion \"%s\" wird nicht unterstützt oder ist nicht implementiert.", "Authentication failed, wrong token or provider ID given" : "Authentifizierung ist fehlgeschlagen. Falsches Token oder falsche Provider-ID wurde übertragen.", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Es fehlen Parameter, um die Anfrage zu bearbeiten. Fehlende Parameter: \"%s\"", @@ -250,22 +304,99 @@ "Storage connection error. %s" : "Verbindungsfehler zum Speicherplatz. %s", "Storage is temporarily not available" : "Speicher ist vorübergehend nicht verfügbar", "Storage connection timeout. %s" : "Zeitüberschreitung der Verbindung zum Speicherplatz. %s", + "Transcribe audio" : "Audio transkribieren", + "Transcribe the things said in an audio" : "Inhalt der Audiodatei transkribieren", + "Audio input" : "Audioeingang", + "The audio to transcribe" : "Die Audio-Datei zum Transkribieren", + "Transcription" : "Transkription", + "The transcribed text" : "Der transkribierte Text", + "Context write" : "Kontext schreiben", + "Writes text in a given style based on the provided source material." : "Schreibt Text in einem vorgegebenen Stil auf Basis des bereitgestellten Quellmaterials.", "Writing style" : "Schreibstil", "Demonstrate a writing style that you would like to immitate" : "Zeigen Sie einen Schreibstil, den Sie gerne nachahmen würden", "Source material" : "Quellmaterial", + "The content that would like to be rewritten in the new writing style" : "Der Inhalt, der in den neuen Schreibstil umgeschrieben werden soll", + "Generated text" : "Erstellter Text", + "The generated text with content from the source material in the given style" : "Der erstellte Text mit Inhalten aus dem Quellmaterial im angegebenen Stil", + "Emoji generator" : "Emoji-Generator", + "Takes text and generates a representative emoji for it." : "Erstellt aus eingegebenem Text ein repräsentatives Emoji.", + "The text to generate an emoji for" : "Der Text aus dem ein Emoji erstellt werden soll", + "Generated emoji" : "Erstelltes Emoji", + "The generated emoji based on the input text" : "Das aus dem eingegebenen Text erstelltes Emoji", + "Generate image" : "Bild erstellen", + "Generate an image from a text prompt" : "Bild aus einer Texteingabe erstellen", + "Prompt" : "Prompt", + "Describe the image you want to generate" : "Beschreibe das Bild, das du erstellen möchtest", + "Number of images" : "Anzahl der Bilder", + "How many images to generate" : "Wie viele Bilder erstellt werden sollen", + "Output images" : "Ausgegebene Bilder", + "The generated images" : "Die erstellten Bilder", + "Free text to text prompt" : "Freie Text-zu-Text-Eingabeaufforderung", + "Runs an arbitrary prompt through a language model that returns a reply" : "Führt eine beliebige Eingabeaufforderung mit einem Sprachmodell aus, das eine Antwort zurückgibt", + "Describe a task that you want the assistant to do or ask a question" : "Beschreibe eine Aufgabe, die der Assistent erledigen soll, oder stelle eine Frage", + "Generated reply" : "Erstellte Antwort", + "The generated text from the assistant" : "Der vom Assistenten erstellte Text", + "Chat" : "Chat", + "Chat with the assistant" : "Mit dem Assistenten chatten", + "System prompt" : "Systemaufforderung", + "Define rules and assumptions that the assistant should follow during the conversation." : "Regeln und Annahmen definieren, die der Assistent während des Gesprächs befolgen soll.", + "Chat message" : "Chatnachricht", + "Chat history" : "Chatverlauf", + "The history of chat messages before the current message, starting with a message by the user" : "Chatverlauf vor der aktuellen Nachricht, beginnend mit einer Nachricht des Benutzers", + "Response message" : "Antwortnachricht", + "The generated response as part of the conversation" : "Die erstellte Antwort als Teil der Unterhaltung", + "Formalize text" : "Förmlicher Text", + "Takes a text and makes it sound more formal" : "Verleiht einem Text mehr Förmlichkeit", + "Write a text that you want the assistant to formalize" : "Text schreiben, den der Assistent förmlich umschreiben soll", + "Formalized text" : "Förmlicher Text", + "The formalized text" : "Der förmliche Text", + "Generate a headline" : "Eine Überschrift erstellen", "Generates a possible headline for a text." : "Erzeugt eine mögliche Überschrift für einen Text.", + "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", + "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", + "Reformulated text" : "Umformulierter Text", + "The reformulated text, written by the assistant" : "Der vom Assistenten erstellte umfomulierte Text", + "Simplify text" : "Text vereinfachen", + "Takes a text and simplifies it" : "Vereinfacht einen Text", + "Write a text that you want the assistant to simplify" : "Text schreiben, den der Assistent vereinfachen soll", + "Simplified text" : "Vereinfachter Text", + "The simplified text" : "Der vereinfachte Text", "Summarize" : "Zusammenfassen", + "Summarizes a text" : "Fasst einen Text zusammen", + "The original text to summarize" : "Der Originaltext zum Zusammenfassen", "Summary" : "Zusammenfassung", + "The generated summary" : "Die erstellte Zusammenfassung", "Extract topics" : "Themen extrahieren", + "Extracts topics from a text and outputs them separated by commas" : "Extrahiert Themen aus einem Text und gibt diese durch Kommas getrennt aus", + "The original text to extract topics from" : "Der Originaltext, aus dem Themen extrahiert werden sollen", + "Topics" : "Themen", + "The list of extracted topics" : "Liste der extrahierten Themen", + "Translate" : "Übersetzen", + "Translate text from one language to another" : "Text von einer Sprache in eine andere übersetzen", + "Origin text" : "Ausgangstext", + "The text to translate" : "Der zu übersetzende Text", + "Origin language" : "Ausgangssprache", + "The language of the origin text" : "Die Sprache des Ausgangstextes", + "Target language" : "Zielsprache", + "The desired language to translate the origin text in" : "Die gewünschte Sprache, in die der Ausgangstext übersetzt werden soll", + "Result" : "Ergebnis", + "The translated text" : "Der übersetzte Text", "Free prompt" : "Freie Eingabeaufforderung", "Runs an arbitrary prompt through the language model." : "Führt eine beliebige Eingabeaufforderung über das Sprachmodell aus.", "Generate headline" : "Überschrift erzeugen", "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.", - "404" : "404", + "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", @@ -284,9 +415,8 @@ "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 benötigt", - "Please upgrade your database version." : "Bitte aktualisiere deine Datenbankversion", "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." + "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 63c2cff391f..ed39aa48dc1 100644 --- a/lib/l10n/de_DE.js +++ b/lib/l10n/de_DE.js @@ -19,7 +19,7 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s und %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s und %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s und %5$s", - "Education Edition" : "Bildungsausgabe", + "Education bundle" : "Bildungspaket", "Enterprise bundle" : "Firmen-Paket", "Groupware bundle" : "Groupware-Paket", "Hub bundle" : "Hub-Paket", @@ -38,6 +38,7 @@ OC.L10N.register( "Server version %s or higher is required." : "Server Version %s oder höher wird benötigt.", "Server version %s or lower is required." : "Server Version %s oder niedriger wird benötigt.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Das angemeldete Konto muss ein Administrator, ein Teil-Administrator sein oder ein Sonderrecht haben, um auf diese Einstellung zuzugreifen", + "Your current IP address doesn’t allow you to perform admin actions" : "Unter Ihrer aktuellen IP-Adresse sind keine Administrationsaktionen erlaubt", "Logged in account must be an admin or sub admin" : "Das angemeldete Konto muss ein (Sub-)Administrator sein", "Logged in account must be an admin" : "Das angemeldete Konto muss ein Administrator sein", "Wiping of device %s has started" : "Löschen von Gerät %s wurde gestartet", @@ -80,14 +81,21 @@ 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.", + "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.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" ist in einem Datei- oder Ordnernamen unzulässig.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" ist ein unzulässiger Dateityp.", + "Filenames must not end with \"%1$s\"." : "Dateinamen dürfen nicht mit \"%1$s\" enden.", + "Invalid parent path" : "Ungültiger übergeordneter Pfad", "File already exists" : "Datei bereits vorhanden", "Invalid path" : "Ungültiger Pfad", "Failed to create file from template" : "Fehler beim Erstellen der Datei aus Vorlage", "Templates" : "Vorlagen", - "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", - "Dot files are not allowed" : "Dateinamen mit einem Punkt am Anfang sind 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", + "Filename is too long" : "Dateiname ist zu lang", "Empty filename is not allowed" : "Ein leerer Dateiname ist nicht erlaubt", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Die Anwendung \"%s\" kann nicht installiert werden, weil die Anwendungsinfodatei nicht gelesen werden kann.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Die App \"%s\" kann nicht installiert werden, da sie mit dieser Serverversion nicht kompatibel ist.", @@ -139,22 +147,56 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden", "Sharing backend %s not found" : "Freigabe-Backend %s nicht gefunden", "Sharing backend for %s not found" : "Freigabe-Backend für %s nicht gefunden", + "%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.", + "Open »%s«" : "»%s« öffnen", + "%1$s via %2$s" : "%1$s über %2$s", "%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", - "%1$s via %2$s" : "%1$s über %2$s", + "Passwords are enforced for link and mail shares" : "Für Link- und E-Mail-Freigaben werden Passwörter erzwungen", + "SharedWith is not a valid user" : "SharedWith ist kein gültiger Benutzer", + "SharedWith is not a valid group" : "SharedWith ist keine gültige Gruppe", + "SharedWith should be empty" : "SharedWith sollte leer sein", + "SharedWith should not be empty" : "SharedWith sollte nicht leer sein", + "SharedWith is not a valid circle" : "SharedWith ist kein gültiger Kreis", + "Unknown share type" : "Unbekannter Freigabetyp", + "SharedBy should be set" : "SharedBy sollte gesetzt sein", + "Cannot share with yourself" : "Es kann nicht mit Ihnen selbst geteilt werden", + "Path should be set" : "Pfad sollte festgelegt werden", + "Path should be either a file or a folder" : "Der Pfad muss entweder eine Datei oder ein Ordner sein", + "You cannot share your root folder" : "Sie können Ihren Stammordner nicht freigeben", "You are not allowed to share %s" : "Die Freigabe von %s ist Ihnen nicht erlaubt", + "A share requires permissions" : "Eine Freigabe erfordert Berechtigungen", "Cannot increase permissions of %s" : "Kann die Berechtigungen von %s nicht erhöhen", + "Shares need at least read permissions" : "Freigaben benötigen mindestens Leseberechtigungen", "Files cannot be shared with delete permissions" : "Dateien mit Lösch-Berechtigungen können nicht geteilt werden", "Files cannot be shared with create permissions" : "Dateien mit Erstell-Berechtigungen können nicht geteilt werden", "Expiration date is in the past" : "Das Ablaufdatum liegt in der Vergangenheit.", + "Expiration date is enforced" : "Ablaufdatum wird erzwungen", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Das Ablaufdatum kann nicht mehr als %n Tag in der Zukunft liegen","Das Ablaufdatum kann nicht mehr als %n Tage in der Zukunft liegen"], "Sharing is only allowed with group members" : "Teilen ist nur mit Gruppenmitgliedern erlaubt", "Sharing %s failed, because this item is already shared with the account %s" : "Freigeben von %s ist fehlgeschlagen, da dieses Element schon mit dem Konto %s geteilt wurde", - "%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.", + "Group sharing is now allowed" : "Gruppenfreigabe ist jetzt erlaubt", + "Sharing is only allowed within your own groups" : "Das Teilen ist nur innerhalb ihrer eigenen Gruppen erlaubt", + "Path is already shared with this group" : "Der Pfad ist bereits mit dieser Gruppe geteilt", + "Link sharing is not allowed" : "Freigabe via Link ist nicht erlaubt", + "Public upload is not allowed" : "Öffentliches Hochladen ist nicht erlaubt", + "Path contains files shared with you" : "Der Pfad enthält für Sie freigegebene Dateien", + "Sharing is disabled" : "Teilen ist deaktiviert", + "Sharing is disabled for you" : "Teilen ist für Sie deaktiviert", + "Cannot share with the share owner" : "Teilen mit dem Freigabeeigentümer nicht möglich", + "Share does not have a full ID" : "Die Freigabe hat keine vollständige ID", + "Cannot change share type" : "Der Freigabetyp kann nicht geändert werden", + "Can only update recipient on user shares" : "Empfänger können nur bei Benutzerfreigaben aktualisiert werden", + "Cannot enable sending the password by Talk with an empty password" : "Das Senden des Passworts über Talk kann mit einem leeren Passwort nicht aktiviert werden", + "Cannot enable sending the password by Talk without setting a new password" : "Das Senden des Passworts über Talk kann nicht aktiviert werden, ohne ein neues Passwort festzulegen", + "Cannot disable sending the password by Talk without setting a new password" : "Das Senden des Passworts durch Talk kann nicht deaktiviert werden, ohne ein neues Passwort festzulegen", + "Share provider does not support accepting" : "Der Teilen-Anbieter unterstützt das Akzeptieren nicht", + "Cannot change target of link share" : "Das Ziel der Linkfreigabe kann nicht geändert werden", + "Invalid recipient" : "Ungültiger Empfänger", + "Group \"%s\" does not exist" : "Gruppe \"%s\" existiert nicht", "The requested share does not exist anymore" : "Die angeforderte Freigabe existiert nicht mehr", "The requested share comes from a disabled user" : "Die angeforderte Freigabe stammt von einem deaktivierten Benutzer", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Der Benutzer wurde nicht erstellt, da das Benutzerlimit erreicht wurde. Überprüfen Sie Ihre Benachrichtigungen, um mehr zu erfahren.", @@ -252,7 +294,7 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Ihr Datenverzeichnis muss einen absoluten Pfad haben.", "Check the value of \"datadirectory\" in your configuration." : "Überprüfen Sie den Wert von „datadirectory“ in Ihrer Konfiguration.", "Your data directory is invalid." : "Ihr Datenverzeichnis ist ungültig.", - "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.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Stellen Sie sicher, dass eine Datei \"%1$s\" im Wurzelverzeichnis des Datenverzeichnisses existiert. Sie sollte folgenden Inhalt haben: \"%2$s\"", "Action \"%s\" not supported or implemented." : "Aktion \"%s\" wird nicht unterstützt oder ist nicht implementiert.", "Authentication failed, wrong token or provider ID given" : "Authentifizierung ist fehlgeschlagen. Falsches Token oder Provider-ID wurde übertragen.", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Es fehlen Parameter um die Anfrage zu bearbeiten. Fehlende Parameter: \"%s\"", @@ -270,7 +312,7 @@ OC.L10N.register( "The audio to transcribe" : "Die Audio-Datei zum Transkribieren", "Transcription" : "Transkription", "The transcribed text" : "Der transkribierte Text", - "ContextWrite" : "ContextWrite", + "Context write" : "Im Kontext schreiben", "Writes text in a given style based on the provided source material." : "Schreibt Text in einem vorgegebenen Stil auf Basis des bereitgestellten Quellmaterials.", "Writing style" : "Schreibstil", "Demonstrate a writing style that you would like to immitate" : "Zeigen Sie einen Schreibstil, den Sie gerne nachahmen würden", @@ -292,7 +334,7 @@ OC.L10N.register( "Output images" : "Ausgegebene Bilder", "The generated images" : "Die erstellten Bilder", "Free text to text prompt" : "Freie Text-zu-Text-Eingabeaufforderung", - "Runs an arbitrary prompt through a language model that retuns a reply" : "Führt eine beliebige Eingabeaufforderung mit einem Sprachmodell aus, das eine Antwort zurückgibt", + "Runs an arbitrary prompt through a language model that returns a reply" : "Führt eine beliebige Eingabeaufforderung mit einem Sprachmodell aus, das eine Antwort zurückgibt", "Describe a task that you want the assistant to do or ask a question" : "Beschreiben Sie eine Aufgabe, die der Assistent erledigen soll, oder stellen Sie eine Frage", "Generated reply" : "Erstellte Antwort", "The generated text from the assistant" : "Der vom Assistenten erstellte Text", @@ -335,15 +377,28 @@ OC.L10N.register( "The original text to extract topics from" : "Der Originaltext, aus dem Themen extrahiert werden sollen", "Topics" : "Themen", "The list of extracted topics" : "Liste der extrahierten Themen", + "Translate" : "Übersetzen", + "Translate text from one language to another" : "Text von einer Sprache in eine andere übersetzen", + "Origin text" : "Ausgangstext", + "The text to translate" : "Der zu übersetzende Text", + "Origin language" : "Ausgangssprache", + "The language of the origin text" : "Die Sprache des Ausgangstextes", + "Target language" : "Zielsprache", + "The desired language to translate the origin text in" : "Die gewünschte Sprache, in die der Ausgangstext übersetzt werden soll", + "Result" : "Ergebnis", + "The translated text" : "Der übersetzte Text", "Free prompt" : "Freie Eingabeaufforderung", "Runs an arbitrary prompt through the language model." : "Führt eine beliebige Eingabeaufforderung über das Sprachmodell aus.", "Generate headline" : "Kopfzeile erzeugen", "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.", - "404" : "404", + "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", @@ -362,9 +417,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 benötigt.", - "Please upgrade your database version." : "Bitte aktualisieren Sie Ihre Datenbankversion.", "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." + "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 91b10374938..0e3264afc52 100644 --- a/lib/l10n/de_DE.json +++ b/lib/l10n/de_DE.json @@ -17,7 +17,7 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s und %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s und %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s und %5$s", - "Education Edition" : "Bildungsausgabe", + "Education bundle" : "Bildungspaket", "Enterprise bundle" : "Firmen-Paket", "Groupware bundle" : "Groupware-Paket", "Hub bundle" : "Hub-Paket", @@ -36,6 +36,7 @@ "Server version %s or higher is required." : "Server Version %s oder höher wird benötigt.", "Server version %s or lower is required." : "Server Version %s oder niedriger wird benötigt.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Das angemeldete Konto muss ein Administrator, ein Teil-Administrator sein oder ein Sonderrecht haben, um auf diese Einstellung zuzugreifen", + "Your current IP address doesn’t allow you to perform admin actions" : "Unter Ihrer aktuellen IP-Adresse sind keine Administrationsaktionen erlaubt", "Logged in account must be an admin or sub admin" : "Das angemeldete Konto muss ein (Sub-)Administrator sein", "Logged in account must be an admin" : "Das angemeldete Konto muss ein Administrator sein", "Wiping of device %s has started" : "Löschen von Gerät %s wurde gestartet", @@ -78,14 +79,21 @@ "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.", + "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.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" ist in einem Datei- oder Ordnernamen unzulässig.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" ist ein unzulässiger Dateityp.", + "Filenames must not end with \"%1$s\"." : "Dateinamen dürfen nicht mit \"%1$s\" enden.", + "Invalid parent path" : "Ungültiger übergeordneter Pfad", "File already exists" : "Datei bereits vorhanden", "Invalid path" : "Ungültiger Pfad", "Failed to create file from template" : "Fehler beim Erstellen der Datei aus Vorlage", "Templates" : "Vorlagen", - "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", - "Dot files are not allowed" : "Dateinamen mit einem Punkt am Anfang sind 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", + "Filename is too long" : "Dateiname ist zu lang", "Empty filename is not allowed" : "Ein leerer Dateiname ist nicht erlaubt", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Die Anwendung \"%s\" kann nicht installiert werden, weil die Anwendungsinfodatei nicht gelesen werden kann.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Die App \"%s\" kann nicht installiert werden, da sie mit dieser Serverversion nicht kompatibel ist.", @@ -137,22 +145,56 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden", "Sharing backend %s not found" : "Freigabe-Backend %s nicht gefunden", "Sharing backend for %s not found" : "Freigabe-Backend für %s nicht gefunden", + "%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.", + "Open »%s«" : "»%s« öffnen", + "%1$s via %2$s" : "%1$s über %2$s", "%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", - "%1$s via %2$s" : "%1$s über %2$s", + "Passwords are enforced for link and mail shares" : "Für Link- und E-Mail-Freigaben werden Passwörter erzwungen", + "SharedWith is not a valid user" : "SharedWith ist kein gültiger Benutzer", + "SharedWith is not a valid group" : "SharedWith ist keine gültige Gruppe", + "SharedWith should be empty" : "SharedWith sollte leer sein", + "SharedWith should not be empty" : "SharedWith sollte nicht leer sein", + "SharedWith is not a valid circle" : "SharedWith ist kein gültiger Kreis", + "Unknown share type" : "Unbekannter Freigabetyp", + "SharedBy should be set" : "SharedBy sollte gesetzt sein", + "Cannot share with yourself" : "Es kann nicht mit Ihnen selbst geteilt werden", + "Path should be set" : "Pfad sollte festgelegt werden", + "Path should be either a file or a folder" : "Der Pfad muss entweder eine Datei oder ein Ordner sein", + "You cannot share your root folder" : "Sie können Ihren Stammordner nicht freigeben", "You are not allowed to share %s" : "Die Freigabe von %s ist Ihnen nicht erlaubt", + "A share requires permissions" : "Eine Freigabe erfordert Berechtigungen", "Cannot increase permissions of %s" : "Kann die Berechtigungen von %s nicht erhöhen", + "Shares need at least read permissions" : "Freigaben benötigen mindestens Leseberechtigungen", "Files cannot be shared with delete permissions" : "Dateien mit Lösch-Berechtigungen können nicht geteilt werden", "Files cannot be shared with create permissions" : "Dateien mit Erstell-Berechtigungen können nicht geteilt werden", "Expiration date is in the past" : "Das Ablaufdatum liegt in der Vergangenheit.", + "Expiration date is enforced" : "Ablaufdatum wird erzwungen", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Das Ablaufdatum kann nicht mehr als %n Tag in der Zukunft liegen","Das Ablaufdatum kann nicht mehr als %n Tage in der Zukunft liegen"], "Sharing is only allowed with group members" : "Teilen ist nur mit Gruppenmitgliedern erlaubt", "Sharing %s failed, because this item is already shared with the account %s" : "Freigeben von %s ist fehlgeschlagen, da dieses Element schon mit dem Konto %s geteilt wurde", - "%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.", + "Group sharing is now allowed" : "Gruppenfreigabe ist jetzt erlaubt", + "Sharing is only allowed within your own groups" : "Das Teilen ist nur innerhalb ihrer eigenen Gruppen erlaubt", + "Path is already shared with this group" : "Der Pfad ist bereits mit dieser Gruppe geteilt", + "Link sharing is not allowed" : "Freigabe via Link ist nicht erlaubt", + "Public upload is not allowed" : "Öffentliches Hochladen ist nicht erlaubt", + "Path contains files shared with you" : "Der Pfad enthält für Sie freigegebene Dateien", + "Sharing is disabled" : "Teilen ist deaktiviert", + "Sharing is disabled for you" : "Teilen ist für Sie deaktiviert", + "Cannot share with the share owner" : "Teilen mit dem Freigabeeigentümer nicht möglich", + "Share does not have a full ID" : "Die Freigabe hat keine vollständige ID", + "Cannot change share type" : "Der Freigabetyp kann nicht geändert werden", + "Can only update recipient on user shares" : "Empfänger können nur bei Benutzerfreigaben aktualisiert werden", + "Cannot enable sending the password by Talk with an empty password" : "Das Senden des Passworts über Talk kann mit einem leeren Passwort nicht aktiviert werden", + "Cannot enable sending the password by Talk without setting a new password" : "Das Senden des Passworts über Talk kann nicht aktiviert werden, ohne ein neues Passwort festzulegen", + "Cannot disable sending the password by Talk without setting a new password" : "Das Senden des Passworts durch Talk kann nicht deaktiviert werden, ohne ein neues Passwort festzulegen", + "Share provider does not support accepting" : "Der Teilen-Anbieter unterstützt das Akzeptieren nicht", + "Cannot change target of link share" : "Das Ziel der Linkfreigabe kann nicht geändert werden", + "Invalid recipient" : "Ungültiger Empfänger", + "Group \"%s\" does not exist" : "Gruppe \"%s\" existiert nicht", "The requested share does not exist anymore" : "Die angeforderte Freigabe existiert nicht mehr", "The requested share comes from a disabled user" : "Die angeforderte Freigabe stammt von einem deaktivierten Benutzer", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Der Benutzer wurde nicht erstellt, da das Benutzerlimit erreicht wurde. Überprüfen Sie Ihre Benachrichtigungen, um mehr zu erfahren.", @@ -250,7 +292,7 @@ "Your data directory must be an absolute path." : "Ihr Datenverzeichnis muss einen absoluten Pfad haben.", "Check the value of \"datadirectory\" in your configuration." : "Überprüfen Sie den Wert von „datadirectory“ in Ihrer Konfiguration.", "Your data directory is invalid." : "Ihr Datenverzeichnis ist ungültig.", - "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.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Stellen Sie sicher, dass eine Datei \"%1$s\" im Wurzelverzeichnis des Datenverzeichnisses existiert. Sie sollte folgenden Inhalt haben: \"%2$s\"", "Action \"%s\" not supported or implemented." : "Aktion \"%s\" wird nicht unterstützt oder ist nicht implementiert.", "Authentication failed, wrong token or provider ID given" : "Authentifizierung ist fehlgeschlagen. Falsches Token oder Provider-ID wurde übertragen.", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Es fehlen Parameter um die Anfrage zu bearbeiten. Fehlende Parameter: \"%s\"", @@ -268,7 +310,7 @@ "The audio to transcribe" : "Die Audio-Datei zum Transkribieren", "Transcription" : "Transkription", "The transcribed text" : "Der transkribierte Text", - "ContextWrite" : "ContextWrite", + "Context write" : "Im Kontext schreiben", "Writes text in a given style based on the provided source material." : "Schreibt Text in einem vorgegebenen Stil auf Basis des bereitgestellten Quellmaterials.", "Writing style" : "Schreibstil", "Demonstrate a writing style that you would like to immitate" : "Zeigen Sie einen Schreibstil, den Sie gerne nachahmen würden", @@ -290,7 +332,7 @@ "Output images" : "Ausgegebene Bilder", "The generated images" : "Die erstellten Bilder", "Free text to text prompt" : "Freie Text-zu-Text-Eingabeaufforderung", - "Runs an arbitrary prompt through a language model that retuns a reply" : "Führt eine beliebige Eingabeaufforderung mit einem Sprachmodell aus, das eine Antwort zurückgibt", + "Runs an arbitrary prompt through a language model that returns a reply" : "Führt eine beliebige Eingabeaufforderung mit einem Sprachmodell aus, das eine Antwort zurückgibt", "Describe a task that you want the assistant to do or ask a question" : "Beschreiben Sie eine Aufgabe, die der Assistent erledigen soll, oder stellen Sie eine Frage", "Generated reply" : "Erstellte Antwort", "The generated text from the assistant" : "Der vom Assistenten erstellte Text", @@ -333,15 +375,28 @@ "The original text to extract topics from" : "Der Originaltext, aus dem Themen extrahiert werden sollen", "Topics" : "Themen", "The list of extracted topics" : "Liste der extrahierten Themen", + "Translate" : "Übersetzen", + "Translate text from one language to another" : "Text von einer Sprache in eine andere übersetzen", + "Origin text" : "Ausgangstext", + "The text to translate" : "Der zu übersetzende Text", + "Origin language" : "Ausgangssprache", + "The language of the origin text" : "Die Sprache des Ausgangstextes", + "Target language" : "Zielsprache", + "The desired language to translate the origin text in" : "Die gewünschte Sprache, in die der Ausgangstext übersetzt werden soll", + "Result" : "Ergebnis", + "The translated text" : "Der übersetzte Text", "Free prompt" : "Freie Eingabeaufforderung", "Runs an arbitrary prompt through the language model." : "Führt eine beliebige Eingabeaufforderung über das Sprachmodell aus.", "Generate headline" : "Kopfzeile erzeugen", "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.", - "404" : "404", + "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", @@ -360,9 +415,8 @@ "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 benötigt.", - "Please upgrade your database version." : "Bitte aktualisieren Sie Ihre Datenbankversion.", "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." + "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 4f1563acfe3..cad69ae3774 100644 --- a/lib/l10n/el.js +++ b/lib/l10n/el.js @@ -18,7 +18,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s και %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s και %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s και %5$s", - "Education Edition" : "Εκπαιδευτική Έκδοση", "Enterprise bundle" : "Πακέτο επιχειρήσεων", "Groupware bundle" : "Πακέτο Groupware", "Hub bundle" : "Hub bundle", @@ -75,14 +74,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δεν υπάρχει. Παρακαλούμε ενεργοποιήστε το στις ρυθμίσεις των εφαρμογών σας ή επικοινωνήστε με τον διαχειριστή.", + "Dot files are not allowed" : "Δεν επιτρέπονται αρχεία που ξεκινούν με τελεία", "File already exists" : "Το αρχείο υπάρχει ήδη", "Invalid path" : "Μη έγκυρη διαδρομή", "Failed to create file from template" : "Η δημιουργία αρχείου από το πρότυπο απέτυχε", "Templates" : "Πρότυπα", - "File name is a reserved word" : "Το όνομα αρχείου είναι λέξη που έχει δεσμευτεί", - "File name contains at least one invalid character" : "Το όνομα αρχείου περιέχει έναν τουλάχιστον μη έγκυρο χαρακτήρα", - "File name is too long" : "Το όνομα αρχείου είναι πολύ μεγάλο", - "Dot files are not allowed" : "Δεν επιτρέπονται αρχεία που ξεκινούν με τελεία", + "Filename contains at least one invalid character" : "Το όνομα αρχείου κατέχει τουλάχιστο ένα μη έγκυρο χαρακτήρα", "Empty filename is not allowed" : "Δεν επιτρέπεται άδειο όνομα αρχείου", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Η εφαρμογή \"%s\" δεν μπορεί να εγκατασταθεί διότι δεν είναι δυνατή η ανάγνωση του αρχείου appinfo.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Η εφαρμογή \"%s\" δεν μπορεί να εγκατασταθεί διότι δεν είναι συμβατή με την έκδοση του διακομιστή.", @@ -94,6 +91,7 @@ OC.L10N.register( "Administration settings" : "Ρυθμίσεις διαχείρισης", "Settings" : "Ρυθμίσεις", "Log out" : "Έξοδος", + "Accounts" : "Λογαριασμοί", "Email" : "Email", "Mail %s" : "Mail στο %s", "Phone" : "Τηλέφωνο", @@ -120,11 +118,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Το σύστημα διαμοιρασμού %s πρέπει να υλοποιεί την διεπαφή OCP\\Share_Backend", "Sharing backend %s not found" : "Το σύστημα διαμοιρασμού %s δεν βρέθηκε", "Sharing backend for %s not found" : "Το σύστημα διαμοιρασμού για το %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." : "Κάντε κλικ στο παρακάτω κουμπί για να το ανοίξετε.", + "Open »%s«" : "Άνοιγμα »%s«", + "%1$s via %2$s" : "%1$s μέσω %2$s", "%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«", - "%1$s via %2$s" : "%1$s μέσω %2$s", + "Unknown share type" : "Άγνωστος τύπος διαμοιρασμού", "You are not allowed to share %s" : "Δεν σας επιτρέπεται ο διαμοιρασμός %s", "Cannot increase permissions of %s" : "Αδυναμία αύξησης των δικαιωμάτων του/της %s", "Files cannot be shared with delete permissions" : "Δεν είναι δυνατή η κοινή χρήση αρχείων με δικαιώματα διαγραφής", @@ -132,9 +134,6 @@ OC.L10N.register( "Expiration date is in the past" : "Η ημερομηνία λήξης είναι στο παρελθόν", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Δεν είναι δυνατός ο ορισμός ημερομηνίας λήξης για περισσότερο από %n ημέρα στο μέλλον","Δεν είναι δυνατός ο ορισμός ημερομηνίας λήξης για περισσότερες από %n ημέρες στο μέλλον"], "Sharing is only allowed with group members" : "Η κοινή χρήση επιτρέπεται μόνο με μέλη της ομάδας", - "%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 requested share does not exist anymore" : "Το διαμοιρασμένο που ζητήθηκε δεν υπάρχει πλέον", "Could not find category \"%s\"" : "Αδυναμία εύρεσης κατηγορίας \"%s\"", "Sunday" : "Κυριακή", @@ -217,7 +216,6 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Ο κατάλογος δεδομένων σας πρέπει να είναι μια απόλυτη διαδρομή.", "Check the value of \"datadirectory\" in your configuration." : "Ελέγξτε την τιμή του \"datadirectory\" στις ρυθμίσεις σας.", "Your data directory is invalid." : "Ο κατάλογος δεδομένων σας δεν είναι έγκυρος.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Εξασφαλίστε ότι υπάρχει ένα αρχείο με όνομα \".ocdata\" στον βασικό κατάλογο του καταλόγου δεδομένων.", "Action \"%s\" not supported or implemented." : "Η ενέργεια \"%s\" δεν υποστηρίζεται ή δεν μπορεί να υλοποιηθεί.", "Authentication failed, wrong token or provider ID given" : "Ο έλεγχος ταυτότητας απέτυχε, δόθηκε λανθασμένο αναγνωριστικό ή αναγνωριστικό παρόχου", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Απουσιάζουν παράμετροι για την ολοκλήρωση του αιτήματος. Ελλιπείς παράμετροι: \"%s\"", @@ -230,9 +228,15 @@ OC.L10N.register( "Storage is temporarily not available" : "Ο χώρος αποθήκευσης δεν είναι διαθέσιμος προσωρινά", "Storage connection timeout. %s" : "Λήξη χρονικού ορίου σύνδεσης με αποθηκευτικό χώρο.%s", "Summary" : "Σύνοψη", + "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" : "Άγνωστος χρήστης", @@ -248,9 +252,8 @@ OC.L10N.register( "Username must not consist of dots only" : "Το όνομα χρήστη δεν πρέπει να περιέχει μόνο τελείες", "Username is invalid because files already exist for this user" : "Το όνομα χρήστη δεν είναι έγκυρο, επειδή υπάρχουν ήδη αρχεία για αυτόν τον χρήστη", "User disabled" : "Ο χρήστης απενεργοποιήθηκε", - "PostgreSQL >= 9 required." : "Απαιτείται PostgreSQL >= 9.", - "Please upgrade your database version." : "Παρακαλούμε αναβαθμίστε την έκδοση της βάσης δεδομένων σας.", "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 έτσι ώστε ο κατάλογος να μην μπορεί να προβάλλεται από άλλους χρήστες." + "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 3740c86af9c..e52c5219308 100644 --- a/lib/l10n/el.json +++ b/lib/l10n/el.json @@ -16,7 +16,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s και %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s και %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s και %5$s", - "Education Edition" : "Εκπαιδευτική Έκδοση", "Enterprise bundle" : "Πακέτο επιχειρήσεων", "Groupware bundle" : "Πακέτο Groupware", "Hub bundle" : "Hub bundle", @@ -73,14 +72,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δεν υπάρχει. Παρακαλούμε ενεργοποιήστε το στις ρυθμίσεις των εφαρμογών σας ή επικοινωνήστε με τον διαχειριστή.", + "Dot files are not allowed" : "Δεν επιτρέπονται αρχεία που ξεκινούν με τελεία", "File already exists" : "Το αρχείο υπάρχει ήδη", "Invalid path" : "Μη έγκυρη διαδρομή", "Failed to create file from template" : "Η δημιουργία αρχείου από το πρότυπο απέτυχε", "Templates" : "Πρότυπα", - "File name is a reserved word" : "Το όνομα αρχείου είναι λέξη που έχει δεσμευτεί", - "File name contains at least one invalid character" : "Το όνομα αρχείου περιέχει έναν τουλάχιστον μη έγκυρο χαρακτήρα", - "File name is too long" : "Το όνομα αρχείου είναι πολύ μεγάλο", - "Dot files are not allowed" : "Δεν επιτρέπονται αρχεία που ξεκινούν με τελεία", + "Filename contains at least one invalid character" : "Το όνομα αρχείου κατέχει τουλάχιστο ένα μη έγκυρο χαρακτήρα", "Empty filename is not allowed" : "Δεν επιτρέπεται άδειο όνομα αρχείου", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Η εφαρμογή \"%s\" δεν μπορεί να εγκατασταθεί διότι δεν είναι δυνατή η ανάγνωση του αρχείου appinfo.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Η εφαρμογή \"%s\" δεν μπορεί να εγκατασταθεί διότι δεν είναι συμβατή με την έκδοση του διακομιστή.", @@ -92,6 +89,7 @@ "Administration settings" : "Ρυθμίσεις διαχείρισης", "Settings" : "Ρυθμίσεις", "Log out" : "Έξοδος", + "Accounts" : "Λογαριασμοί", "Email" : "Email", "Mail %s" : "Mail στο %s", "Phone" : "Τηλέφωνο", @@ -118,11 +116,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Το σύστημα διαμοιρασμού %s πρέπει να υλοποιεί την διεπαφή OCP\\Share_Backend", "Sharing backend %s not found" : "Το σύστημα διαμοιρασμού %s δεν βρέθηκε", "Sharing backend for %s not found" : "Το σύστημα διαμοιρασμού για το %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." : "Κάντε κλικ στο παρακάτω κουμπί για να το ανοίξετε.", + "Open »%s«" : "Άνοιγμα »%s«", + "%1$s via %2$s" : "%1$s μέσω %2$s", "%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«", - "%1$s via %2$s" : "%1$s μέσω %2$s", + "Unknown share type" : "Άγνωστος τύπος διαμοιρασμού", "You are not allowed to share %s" : "Δεν σας επιτρέπεται ο διαμοιρασμός %s", "Cannot increase permissions of %s" : "Αδυναμία αύξησης των δικαιωμάτων του/της %s", "Files cannot be shared with delete permissions" : "Δεν είναι δυνατή η κοινή χρήση αρχείων με δικαιώματα διαγραφής", @@ -130,9 +132,6 @@ "Expiration date is in the past" : "Η ημερομηνία λήξης είναι στο παρελθόν", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Δεν είναι δυνατός ο ορισμός ημερομηνίας λήξης για περισσότερο από %n ημέρα στο μέλλον","Δεν είναι δυνατός ο ορισμός ημερομηνίας λήξης για περισσότερες από %n ημέρες στο μέλλον"], "Sharing is only allowed with group members" : "Η κοινή χρήση επιτρέπεται μόνο με μέλη της ομάδας", - "%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 requested share does not exist anymore" : "Το διαμοιρασμένο που ζητήθηκε δεν υπάρχει πλέον", "Could not find category \"%s\"" : "Αδυναμία εύρεσης κατηγορίας \"%s\"", "Sunday" : "Κυριακή", @@ -215,7 +214,6 @@ "Your data directory must be an absolute path." : "Ο κατάλογος δεδομένων σας πρέπει να είναι μια απόλυτη διαδρομή.", "Check the value of \"datadirectory\" in your configuration." : "Ελέγξτε την τιμή του \"datadirectory\" στις ρυθμίσεις σας.", "Your data directory is invalid." : "Ο κατάλογος δεδομένων σας δεν είναι έγκυρος.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Εξασφαλίστε ότι υπάρχει ένα αρχείο με όνομα \".ocdata\" στον βασικό κατάλογο του καταλόγου δεδομένων.", "Action \"%s\" not supported or implemented." : "Η ενέργεια \"%s\" δεν υποστηρίζεται ή δεν μπορεί να υλοποιηθεί.", "Authentication failed, wrong token or provider ID given" : "Ο έλεγχος ταυτότητας απέτυχε, δόθηκε λανθασμένο αναγνωριστικό ή αναγνωριστικό παρόχου", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Απουσιάζουν παράμετροι για την ολοκλήρωση του αιτήματος. Ελλιπείς παράμετροι: \"%s\"", @@ -228,9 +226,15 @@ "Storage is temporarily not available" : "Ο χώρος αποθήκευσης δεν είναι διαθέσιμος προσωρινά", "Storage connection timeout. %s" : "Λήξη χρονικού ορίου σύνδεσης με αποθηκευτικό χώρο.%s", "Summary" : "Σύνοψη", + "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" : "Άγνωστος χρήστης", @@ -246,9 +250,8 @@ "Username must not consist of dots only" : "Το όνομα χρήστη δεν πρέπει να περιέχει μόνο τελείες", "Username is invalid because files already exist for this user" : "Το όνομα χρήστη δεν είναι έγκυρο, επειδή υπάρχουν ήδη αρχεία για αυτόν τον χρήστη", "User disabled" : "Ο χρήστης απενεργοποιήθηκε", - "PostgreSQL >= 9 required." : "Απαιτείται PostgreSQL >= 9.", - "Please upgrade your database version." : "Παρακαλούμε αναβαθμίστε την έκδοση της βάσης δεδομένων σας.", "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 έτσι ώστε ο κατάλογος να μην μπορεί να προβάλλεται από άλλους χρήστες." + "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 1c9b84880d2..92810367d14 100644 --- a/lib/l10n/en_GB.js +++ b/lib/l10n/en_GB.js @@ -19,7 +19,7 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s and %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s and %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s and %5$s", - "Education Edition" : "Education Edition", + "Education bundle" : "Education bundle", "Enterprise bundle" : "Enterprise bundle", "Groupware bundle" : "Groupware bundle", "Hub bundle" : "Hub bundle", @@ -38,6 +38,7 @@ OC.L10N.register( "Server version %s or higher is required." : "Server version %s or higher is required.", "Server version %s or lower is required." : "Server version %s or lower is required.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Logged in account must be an admin, a sub admin or gotten special right to access this setting", + "Your current IP address doesn’t allow you to perform admin actions" : "Your current IP address doesn’t allow you to perform admin actions", "Logged in account must be an admin or sub admin" : "Logged in account must be an admin or sub admin", "Logged in account must be an admin" : "Logged in account must be an admin", "Wiping of device %s has started" : "Wiping of device %s has started", @@ -80,14 +81,21 @@ 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.", + "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.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" is not allowed inside a file or folder name.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" is a forbidden file type.", + "Filenames must not end with \"%1$s\"." : "Filenames must not end with \"%1$s\".", + "Invalid parent path" : "Invalid parent path", "File already exists" : "File already exists", "Invalid path" : "Invalid path", "Failed to create file from template" : "Failed to create file from template", "Templates" : "Templates", - "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", - "Dot files are not allowed" : "Dot files are 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", + "Filename is too long" : "Filename is too long", "Empty filename is not allowed" : "Empty filename is not allowed", "App \"%s\" cannot be installed because appinfo file cannot be read." : "App \"%s\" cannot be installed because appinfo file cannot be read.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "App \"%s\" cannot be installed. It is not compatible with this version of the server.", @@ -139,22 +147,56 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Sharing backend %s must implement the interface OCP\\Share_Backend", "Sharing backend %s not found" : "Sharing backend %s not found", "Sharing backend for %s not found" : "Sharing backend for %s not found", + "%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.", + "Open »%s«" : "Open »%s«", + "%1$s via %2$s" : "%1$s via %2$s", "%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«", - "%1$s via %2$s" : "%1$s via %2$s", + "Passwords are enforced for link and mail shares" : "Passwords are enforced for link and mail shares", + "SharedWith is not a valid user" : "SharedWith is not a valid user", + "SharedWith is not a valid group" : "SharedWith is not a valid group", + "SharedWith should be empty" : "SharedWith should be empty", + "SharedWith should not be empty" : "SharedWith should not be empty", + "SharedWith is not a valid circle" : "SharedWith is not a valid circle", + "Unknown share type" : "Unknown share type", + "SharedBy should be set" : "SharedBy should be set", + "Cannot share with yourself" : "Cannot share with yourself", + "Path should be set" : "Path should be set", + "Path should be either a file or a folder" : "Path should be either a file or a folder", + "You cannot share your root folder" : "You cannot share your root folder", "You are not allowed to share %s" : "You are not allowed to share %s", + "A share requires permissions" : "A share requires permissions", "Cannot increase permissions of %s" : "Cannot increase permissions of %s", + "Shares need at least read permissions" : "Shares need at least read permissions", "Files cannot be shared with delete permissions" : "Files cannot be shared with delete permissions", "Files cannot be shared with create permissions" : "Files cannot be shared with create permissions", "Expiration date is in the past" : "Expiration date is in the past", + "Expiration date is enforced" : "Expiration date is enforced", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Cannot set expiration date more than %n day in the future","Cannot set expiration date more than %n days in the future"], "Sharing is only allowed with group members" : "Sharing is only allowed with group members", "Sharing %s failed, because this item is already shared with the account %s" : "Sharing %s failed, because this item is already shared with the account %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.", + "Group sharing is now allowed" : "Group sharing is now allowed", + "Sharing is only allowed within your own groups" : "Sharing is only allowed within your own groups", + "Path is already shared with this group" : "Path is already shared with this group", + "Link sharing is not allowed" : "Link sharing is not allowed", + "Public upload is not allowed" : "Public upload is not allowed", + "Path contains files shared with you" : "Path contains files shared with you", + "Sharing is disabled" : "Sharing is disabled", + "Sharing is disabled for you" : "Sharing is disabled for you", + "Cannot share with the share owner" : "Cannot share with the share owner", + "Share does not have a full ID" : "Share does not have a full ID", + "Cannot change share type" : "Cannot change share type", + "Can only update recipient on user shares" : "Can only update recipient on user shares", + "Cannot enable sending the password by Talk with an empty password" : "Cannot enable sending the password by Talk with an empty password", + "Cannot enable sending the password by Talk without setting a new password" : "Cannot enable sending the password by Talk without setting a new password", + "Cannot disable sending the password by Talk without setting a new password" : "Cannot disable sending the password by Talk without setting a new password", + "Share provider does not support accepting" : "Share provider does not support accepting", + "Cannot change target of link share" : "Cannot change target of link share", + "Invalid recipient" : "Invalid recipient", + "Group \"%s\" does not exist" : "Group \"%s\" does not exist", "The requested share does not exist anymore" : "The requested share does not exist any more", "The requested share comes from a disabled user" : "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." : "The user was not created because the user limit has been reached. Check your notifications to learn more.", @@ -252,7 +294,7 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Your data directory must be an absolute path.", "Check the value of \"datadirectory\" in your configuration." : "Check the value of \"datadirectory\" in your configuration.", "Your data directory is invalid." : "Your data directory is invalid.", - "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.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"", "Action \"%s\" not supported or implemented." : "Action \"%s\" not supported or implemented.", "Authentication failed, wrong token or provider ID given" : "Authentication failed, wrong token or provider ID given", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Parameters missing in order to complete the request. Missing Parameters: \"%s\"", @@ -270,7 +312,7 @@ OC.L10N.register( "The audio to transcribe" : "The audio to transcribe", "Transcription" : "Transcription", "The transcribed text" : "The transcribed text", - "ContextWrite" : "ContextWrite", + "Context write" : "Context write", "Writes text in a given style based on the provided source material." : "Writes text in a given style based on the provided source material.", "Writing style" : "Writing style", "Demonstrate a writing style that you would like to immitate" : "Demonstrate a writing style that you would like to immitate", @@ -292,7 +334,7 @@ OC.L10N.register( "Output images" : "Output images", "The generated images" : "The generated images", "Free text to text prompt" : "Free text to text prompt", - "Runs an arbitrary prompt through a language model that retuns a reply" : "Runs an arbitrary prompt through a language model that retuns a reply", + "Runs an arbitrary prompt through a language model that returns a reply" : "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" : "Describe a task that you want the assistant to do or ask a question", "Generated reply" : "Generated reply", "The generated text from the assistant" : "The generated text from the assistant", @@ -335,15 +377,28 @@ OC.L10N.register( "The original text to extract topics from" : "The original text to extract topics from", "Topics" : "Topics", "The list of extracted topics" : "The list of extracted topics", + "Translate" : "Translate", + "Translate text from one language to another" : "Translate text from one language to another", + "Origin text" : "Origin text", + "The text to translate" : "The text to translate", + "Origin language" : "Origin language", + "The language of the origin text" : "The language of the origin text", + "Target language" : "Target language", + "The desired language to translate the origin text in" : "The desired language to translate the origin text in", + "Result" : "Result", + "The translated text" : "The translated text", "Free prompt" : "Free prompt", "Runs an arbitrary prompt through the language model." : "Runs an arbitrary prompt through the language model.", "Generate headline" : "Generate headline", "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.", - "404" : "404", + "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", @@ -362,9 +417,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 required.", - "Please upgrade your database version." : "Please upgrade your database version.", "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." + "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 ae2c93ee350..9516dcd7709 100644 --- a/lib/l10n/en_GB.json +++ b/lib/l10n/en_GB.json @@ -17,7 +17,7 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s and %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s and %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s and %5$s", - "Education Edition" : "Education Edition", + "Education bundle" : "Education bundle", "Enterprise bundle" : "Enterprise bundle", "Groupware bundle" : "Groupware bundle", "Hub bundle" : "Hub bundle", @@ -36,6 +36,7 @@ "Server version %s or higher is required." : "Server version %s or higher is required.", "Server version %s or lower is required." : "Server version %s or lower is required.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Logged in account must be an admin, a sub admin or gotten special right to access this setting", + "Your current IP address doesn’t allow you to perform admin actions" : "Your current IP address doesn’t allow you to perform admin actions", "Logged in account must be an admin or sub admin" : "Logged in account must be an admin or sub admin", "Logged in account must be an admin" : "Logged in account must be an admin", "Wiping of device %s has started" : "Wiping of device %s has started", @@ -78,14 +79,21 @@ "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.", + "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.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" is not allowed inside a file or folder name.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" is a forbidden file type.", + "Filenames must not end with \"%1$s\"." : "Filenames must not end with \"%1$s\".", + "Invalid parent path" : "Invalid parent path", "File already exists" : "File already exists", "Invalid path" : "Invalid path", "Failed to create file from template" : "Failed to create file from template", "Templates" : "Templates", - "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", - "Dot files are not allowed" : "Dot files are 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", + "Filename is too long" : "Filename is too long", "Empty filename is not allowed" : "Empty filename is not allowed", "App \"%s\" cannot be installed because appinfo file cannot be read." : "App \"%s\" cannot be installed because appinfo file cannot be read.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "App \"%s\" cannot be installed. It is not compatible with this version of the server.", @@ -137,22 +145,56 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Sharing backend %s must implement the interface OCP\\Share_Backend", "Sharing backend %s not found" : "Sharing backend %s not found", "Sharing backend for %s not found" : "Sharing backend for %s not found", + "%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.", + "Open »%s«" : "Open »%s«", + "%1$s via %2$s" : "%1$s via %2$s", "%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«", - "%1$s via %2$s" : "%1$s via %2$s", + "Passwords are enforced for link and mail shares" : "Passwords are enforced for link and mail shares", + "SharedWith is not a valid user" : "SharedWith is not a valid user", + "SharedWith is not a valid group" : "SharedWith is not a valid group", + "SharedWith should be empty" : "SharedWith should be empty", + "SharedWith should not be empty" : "SharedWith should not be empty", + "SharedWith is not a valid circle" : "SharedWith is not a valid circle", + "Unknown share type" : "Unknown share type", + "SharedBy should be set" : "SharedBy should be set", + "Cannot share with yourself" : "Cannot share with yourself", + "Path should be set" : "Path should be set", + "Path should be either a file or a folder" : "Path should be either a file or a folder", + "You cannot share your root folder" : "You cannot share your root folder", "You are not allowed to share %s" : "You are not allowed to share %s", + "A share requires permissions" : "A share requires permissions", "Cannot increase permissions of %s" : "Cannot increase permissions of %s", + "Shares need at least read permissions" : "Shares need at least read permissions", "Files cannot be shared with delete permissions" : "Files cannot be shared with delete permissions", "Files cannot be shared with create permissions" : "Files cannot be shared with create permissions", "Expiration date is in the past" : "Expiration date is in the past", + "Expiration date is enforced" : "Expiration date is enforced", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Cannot set expiration date more than %n day in the future","Cannot set expiration date more than %n days in the future"], "Sharing is only allowed with group members" : "Sharing is only allowed with group members", "Sharing %s failed, because this item is already shared with the account %s" : "Sharing %s failed, because this item is already shared with the account %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.", + "Group sharing is now allowed" : "Group sharing is now allowed", + "Sharing is only allowed within your own groups" : "Sharing is only allowed within your own groups", + "Path is already shared with this group" : "Path is already shared with this group", + "Link sharing is not allowed" : "Link sharing is not allowed", + "Public upload is not allowed" : "Public upload is not allowed", + "Path contains files shared with you" : "Path contains files shared with you", + "Sharing is disabled" : "Sharing is disabled", + "Sharing is disabled for you" : "Sharing is disabled for you", + "Cannot share with the share owner" : "Cannot share with the share owner", + "Share does not have a full ID" : "Share does not have a full ID", + "Cannot change share type" : "Cannot change share type", + "Can only update recipient on user shares" : "Can only update recipient on user shares", + "Cannot enable sending the password by Talk with an empty password" : "Cannot enable sending the password by Talk with an empty password", + "Cannot enable sending the password by Talk without setting a new password" : "Cannot enable sending the password by Talk without setting a new password", + "Cannot disable sending the password by Talk without setting a new password" : "Cannot disable sending the password by Talk without setting a new password", + "Share provider does not support accepting" : "Share provider does not support accepting", + "Cannot change target of link share" : "Cannot change target of link share", + "Invalid recipient" : "Invalid recipient", + "Group \"%s\" does not exist" : "Group \"%s\" does not exist", "The requested share does not exist anymore" : "The requested share does not exist any more", "The requested share comes from a disabled user" : "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." : "The user was not created because the user limit has been reached. Check your notifications to learn more.", @@ -250,7 +292,7 @@ "Your data directory must be an absolute path." : "Your data directory must be an absolute path.", "Check the value of \"datadirectory\" in your configuration." : "Check the value of \"datadirectory\" in your configuration.", "Your data directory is invalid." : "Your data directory is invalid.", - "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.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"", "Action \"%s\" not supported or implemented." : "Action \"%s\" not supported or implemented.", "Authentication failed, wrong token or provider ID given" : "Authentication failed, wrong token or provider ID given", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Parameters missing in order to complete the request. Missing Parameters: \"%s\"", @@ -268,7 +310,7 @@ "The audio to transcribe" : "The audio to transcribe", "Transcription" : "Transcription", "The transcribed text" : "The transcribed text", - "ContextWrite" : "ContextWrite", + "Context write" : "Context write", "Writes text in a given style based on the provided source material." : "Writes text in a given style based on the provided source material.", "Writing style" : "Writing style", "Demonstrate a writing style that you would like to immitate" : "Demonstrate a writing style that you would like to immitate", @@ -290,7 +332,7 @@ "Output images" : "Output images", "The generated images" : "The generated images", "Free text to text prompt" : "Free text to text prompt", - "Runs an arbitrary prompt through a language model that retuns a reply" : "Runs an arbitrary prompt through a language model that retuns a reply", + "Runs an arbitrary prompt through a language model that returns a reply" : "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" : "Describe a task that you want the assistant to do or ask a question", "Generated reply" : "Generated reply", "The generated text from the assistant" : "The generated text from the assistant", @@ -333,15 +375,28 @@ "The original text to extract topics from" : "The original text to extract topics from", "Topics" : "Topics", "The list of extracted topics" : "The list of extracted topics", + "Translate" : "Translate", + "Translate text from one language to another" : "Translate text from one language to another", + "Origin text" : "Origin text", + "The text to translate" : "The text to translate", + "Origin language" : "Origin language", + "The language of the origin text" : "The language of the origin text", + "Target language" : "Target language", + "The desired language to translate the origin text in" : "The desired language to translate the origin text in", + "Result" : "Result", + "The translated text" : "The translated text", "Free prompt" : "Free prompt", "Runs an arbitrary prompt through the language model." : "Runs an arbitrary prompt through the language model.", "Generate headline" : "Generate headline", "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.", - "404" : "404", + "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", @@ -360,9 +415,8 @@ "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 required.", - "Please upgrade your database version." : "Please upgrade your database version.", "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." + "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 08f27c21544..7cacc3d711b 100644 --- a/lib/l10n/eo.js +++ b/lib/l10n/eo.js @@ -11,7 +11,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s kaj %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s kaj %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s kaj %5$s", - "Education Edition" : "Eldono por edukado", "Enterprise bundle" : "Aplikaĵa kuniĝo por firmao", "Groupware bundle" : "Aplikaĵa kuniĝo por grupa kunlaborado", "Hub bundle" : "Koncentrita pakaĵo", @@ -67,12 +66,10 @@ OC.L10N.register( "seconds ago" : "antaŭ kelkaj sekundoj", "Empty file" : "Malplena dosiero", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modulo kun identigilo %s ne ekzistas. Bv. ŝalti ĝin en la aplikaĵa agordo aŭ kontakti vian administranton.", + "Dot files are not allowed" : "Dosiernomo, kiu komenciĝas per punkto, ne estas permesata", "File already exists" : "La dosiero jam ekzistas", "Templates" : "Ŝablonoj", - "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", - "Dot files are not allowed" : "Dosiernomo, kiu komenciĝas per punkto, ne estas permesata", + "Filename contains at least one invalid character" : "Dosiernomo enhavas almenaŭ unu nevalidan signon", "Empty filename is not allowed" : "Malplena dosiernomo ne estas permesata", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplikaĵo „%s“ ne instaleblas, ĉar ties dosiero „appinfo“ ne legeblis.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplikaĵo „%s“ ne instaleblas, ĉar ĝi ne kongruas kun tiu servila versio.", @@ -101,17 +98,18 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Kunhava interna servo %s devas realigi la interfacon „OCP\\Share_Backend“", "Sharing backend %s not found" : "Kunhava interna servo %s ne troviĝas", "Sharing backend for %s not found" : "Kunhava interna servo por %s ne troviĝas", + "%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.", + "Open »%s«" : "Malfermi „%s“", + "%1$s via %2$s" : "%1$s pere de %2$s", "%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“", - "%1$s via %2$s" : "%1$s pere de %2$s", + "Unknown share type" : "Nekonata kunhava tipo", "You are not allowed to share %s" : "Vi ne permesatas kunhavigi %s", "Cannot increase permissions of %s" : "Ne eblas pliigi permesojn de %s", "Expiration date is in the past" : "Limdato troviĝas en la estinteco", - "%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 requested share does not exist anymore" : "La petita kunhavo ne plu ekzistas", "Could not find category \"%s\"" : "Ne troviĝis kategorio „%s“", "Sunday" : "dimanĉo", @@ -177,7 +175,6 @@ OC.L10N.register( "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Tion kaŭzas probable kaŝilo aŭ plirapidigilo kiel „Zend OPcache“ aŭ „eAccelerator“.", "PHP modules have been installed, but they are still listed as missing?" : "Ĉu PHP-moduloj estas instalitaj, sed ĉiam montritaj kiel mankantaj?", "Please ask your server administrator to restart the web server." : "Bonvolu peti vian serviladministranton, ke ŝi aŭ li restartigu la TTT-servilon.", - "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.", "Action \"%s\" not supported or implemented." : "Ago „%s“ ne estas subtenata aŭ realigita.", "Authentication failed, wrong token or provider ID given" : "Aŭtentigo malsukcesis: neĝusta ĵetono aŭ provizanto-identigilo specifita", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Parametroj mankas por realigi la peton. Mankantaj parametroj: „%s“", @@ -190,8 +187,13 @@ OC.L10N.register( "Storage is temporarily not available" : "Konservejo provizore ne disponeblas", "Storage connection timeout. %s" : "Konekto al konservejo eltempiĝis. %s", "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", @@ -207,6 +209,7 @@ OC.L10N.register( "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", - "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." + "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 ac09fd8f60c..ff7bdd223eb 100644 --- a/lib/l10n/eo.json +++ b/lib/l10n/eo.json @@ -9,7 +9,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s kaj %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s kaj %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s kaj %5$s", - "Education Edition" : "Eldono por edukado", "Enterprise bundle" : "Aplikaĵa kuniĝo por firmao", "Groupware bundle" : "Aplikaĵa kuniĝo por grupa kunlaborado", "Hub bundle" : "Koncentrita pakaĵo", @@ -65,12 +64,10 @@ "seconds ago" : "antaŭ kelkaj sekundoj", "Empty file" : "Malplena dosiero", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modulo kun identigilo %s ne ekzistas. Bv. ŝalti ĝin en la aplikaĵa agordo aŭ kontakti vian administranton.", + "Dot files are not allowed" : "Dosiernomo, kiu komenciĝas per punkto, ne estas permesata", "File already exists" : "La dosiero jam ekzistas", "Templates" : "Ŝablonoj", - "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", - "Dot files are not allowed" : "Dosiernomo, kiu komenciĝas per punkto, ne estas permesata", + "Filename contains at least one invalid character" : "Dosiernomo enhavas almenaŭ unu nevalidan signon", "Empty filename is not allowed" : "Malplena dosiernomo ne estas permesata", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplikaĵo „%s“ ne instaleblas, ĉar ties dosiero „appinfo“ ne legeblis.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplikaĵo „%s“ ne instaleblas, ĉar ĝi ne kongruas kun tiu servila versio.", @@ -99,17 +96,18 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Kunhava interna servo %s devas realigi la interfacon „OCP\\Share_Backend“", "Sharing backend %s not found" : "Kunhava interna servo %s ne troviĝas", "Sharing backend for %s not found" : "Kunhava interna servo por %s ne troviĝas", + "%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.", + "Open »%s«" : "Malfermi „%s“", + "%1$s via %2$s" : "%1$s pere de %2$s", "%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“", - "%1$s via %2$s" : "%1$s pere de %2$s", + "Unknown share type" : "Nekonata kunhava tipo", "You are not allowed to share %s" : "Vi ne permesatas kunhavigi %s", "Cannot increase permissions of %s" : "Ne eblas pliigi permesojn de %s", "Expiration date is in the past" : "Limdato troviĝas en la estinteco", - "%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 requested share does not exist anymore" : "La petita kunhavo ne plu ekzistas", "Could not find category \"%s\"" : "Ne troviĝis kategorio „%s“", "Sunday" : "dimanĉo", @@ -175,7 +173,6 @@ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Tion kaŭzas probable kaŝilo aŭ plirapidigilo kiel „Zend OPcache“ aŭ „eAccelerator“.", "PHP modules have been installed, but they are still listed as missing?" : "Ĉu PHP-moduloj estas instalitaj, sed ĉiam montritaj kiel mankantaj?", "Please ask your server administrator to restart the web server." : "Bonvolu peti vian serviladministranton, ke ŝi aŭ li restartigu la TTT-servilon.", - "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.", "Action \"%s\" not supported or implemented." : "Ago „%s“ ne estas subtenata aŭ realigita.", "Authentication failed, wrong token or provider ID given" : "Aŭtentigo malsukcesis: neĝusta ĵetono aŭ provizanto-identigilo specifita", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Parametroj mankas por realigi la peton. Mankantaj parametroj: „%s“", @@ -188,8 +185,13 @@ "Storage is temporarily not available" : "Konservejo provizore ne disponeblas", "Storage connection timeout. %s" : "Konekto al konservejo eltempiĝis. %s", "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", @@ -205,6 +207,7 @@ "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", - "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." + "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 694c2fbba1b..1e361819686 100644 --- a/lib/l10n/es.js +++ b/lib/l10n/es.js @@ -19,7 +19,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s, y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educación", "Enterprise bundle" : "Pack para empresas", "Groupware bundle" : "Pack groupware", "Hub bundle" : "Pack para Hub", @@ -80,14 +79,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.", + "Dot files are not allowed" : "Los archivos Dot no están permitidos", "File already exists" : "El archivo ya existe", "Invalid path" : "Ruta no válida", "Failed to create file from template" : "Fallo al crear el archivo desde plantilla", "Templates" : "Plantillas", - "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", - "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "Filename contains at least one invalid character" : "El nombre de archivo contiene al menos un carácter no válido", "Empty filename is not allowed" : "No se puede dejar el nombre en blanco.", "App \"%s\" cannot be installed because appinfo file cannot be read." : "No se puede instalar la app \"%s\" debido a que no se puede leer la información de la app.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "No se puede instalar la aplicación \"%s\" porque no es compatible con esta versión del servidor.", @@ -139,11 +136,15 @@ 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", + "%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.", + "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", - "Open »%s«" : "Abrir »%s« ", - "%1$s via %2$s" : "%1$s vía %2$s", + "Unknown share type" : "Tipo de recurso compartido desconocido", "You are not allowed to share %s" : "Usted no está autorizado para compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Files cannot be shared with delete permissions" : "Los archivos no se pueden compartir con permisos de borrado", @@ -152,9 +153,6 @@ 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_" : ["No se puede fijar la fecha de caducidad más de %n día en el futuro.","No se puede fijar la fecha de caducidad más de %n días en el futuro.","No se puede fijar la fecha de caducidad más de %n días en el futuro."], "Sharing is only allowed with group members" : "Sólo está permitido compartir a los integrantes del grupo", "Sharing %s failed, because this item is already shared with the account %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 requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "The requested share comes from a disabled user" : "El recurso compartido solicitado proviene de un usuario deshabilitado", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "El usuario no fue creado ya que el límite de usuarios fue alcanzado. Compruebe sus notificaciones para aprender más.", @@ -250,9 +248,8 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Tu carpeta de datos debe ser una ruta absoluta.", "Check the value of \"datadirectory\" in your configuration." : "Comprueba el valor de «datadirectory» en tu configuración.", "Your data directory is invalid." : "Tu carpeta de datos es inválida.", - "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.", "Action \"%s\" not supported or implemented." : "La acción \"%s\" no está soportada o implementada.", - "Authentication failed, wrong token or provider ID given" : "La autentificación ha fallado. Se ha dado un token o una ID de proveedor erróneos.", + "Authentication failed, wrong token or provider ID given" : "La autentificación ha fallado. Se ha proporcionado un token o una ID de proveedor erróneos.", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Faltan parámetros para completar la petición. Parámetros que faltan: \"%s\"", "ID \"%1$s\" already used by cloud federation provider \"%2$s\"" : "La ID «%1$s» ya está siendo usada por el proveedor de federación en la nube «%2$s»", "Cloud Federation Provider with ID: \"%s\" does not exist." : "El proveedor de nube federada con ID \"%s\" no existe.", @@ -263,24 +260,32 @@ OC.L10N.register( "Storage is temporarily not available" : "El almacenamiento no esta disponible temporalmente", "Storage connection timeout. %s" : "Tiempo de conexión de almacenamiento agotado. %s", "Audio input" : "Entrada de audio", + "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", "Source material" : "Material fuente", + "The generated text with content from the source material in the given style" : "El texto generado con el contenido del material fuente en el estilo dado", "Generate image" : "Generar imagen", "Prompt" : "Prompt", "Generates a possible headline for a text." : "Genera un posible titular para un texto.", "Summarize" : "Resumir", "Summary" : "Resumen", "Extract topics" : "Extraer tópicos", + "Translate" : "Traducir", + "Target language" : "Idioma destino", + "Result" : "Resultado", "Free prompt" : "Prompt libre", "Runs an arbitrary prompt through the language model." : "Ejecuta un prompt arbitrario mediante el modelo de lenguaje integrado.", "Generate headline" : "Generar titular", "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. ", - "404" : "404", + "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", @@ -299,9 +304,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "Se requiere PostgreSQL >= 9.", - "Please upgrade your database version." : "Por favor, actualice la versión de su base de datos.", "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." + "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 0342379063c..7922cd73598 100644 --- a/lib/l10n/es.json +++ b/lib/l10n/es.json @@ -17,7 +17,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s, y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educación", "Enterprise bundle" : "Pack para empresas", "Groupware bundle" : "Pack groupware", "Hub bundle" : "Pack para Hub", @@ -78,14 +77,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.", + "Dot files are not allowed" : "Los archivos Dot no están permitidos", "File already exists" : "El archivo ya existe", "Invalid path" : "Ruta no válida", "Failed to create file from template" : "Fallo al crear el archivo desde plantilla", "Templates" : "Plantillas", - "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", - "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "Filename contains at least one invalid character" : "El nombre de archivo contiene al menos un carácter no válido", "Empty filename is not allowed" : "No se puede dejar el nombre en blanco.", "App \"%s\" cannot be installed because appinfo file cannot be read." : "No se puede instalar la app \"%s\" debido a que no se puede leer la información de la app.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "No se puede instalar la aplicación \"%s\" porque no es compatible con esta versión del servidor.", @@ -137,11 +134,15 @@ "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", + "%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.", + "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", - "Open »%s«" : "Abrir »%s« ", - "%1$s via %2$s" : "%1$s vía %2$s", + "Unknown share type" : "Tipo de recurso compartido desconocido", "You are not allowed to share %s" : "Usted no está autorizado para compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Files cannot be shared with delete permissions" : "Los archivos no se pueden compartir con permisos de borrado", @@ -150,9 +151,6 @@ "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["No se puede fijar la fecha de caducidad más de %n día en el futuro.","No se puede fijar la fecha de caducidad más de %n días en el futuro.","No se puede fijar la fecha de caducidad más de %n días en el futuro."], "Sharing is only allowed with group members" : "Sólo está permitido compartir a los integrantes del grupo", "Sharing %s failed, because this item is already shared with the account %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 requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "The requested share comes from a disabled user" : "El recurso compartido solicitado proviene de un usuario deshabilitado", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "El usuario no fue creado ya que el límite de usuarios fue alcanzado. Compruebe sus notificaciones para aprender más.", @@ -248,9 +246,8 @@ "Your data directory must be an absolute path." : "Tu carpeta de datos debe ser una ruta absoluta.", "Check the value of \"datadirectory\" in your configuration." : "Comprueba el valor de «datadirectory» en tu configuración.", "Your data directory is invalid." : "Tu carpeta de datos es inválida.", - "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.", "Action \"%s\" not supported or implemented." : "La acción \"%s\" no está soportada o implementada.", - "Authentication failed, wrong token or provider ID given" : "La autentificación ha fallado. Se ha dado un token o una ID de proveedor erróneos.", + "Authentication failed, wrong token or provider ID given" : "La autentificación ha fallado. Se ha proporcionado un token o una ID de proveedor erróneos.", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Faltan parámetros para completar la petición. Parámetros que faltan: \"%s\"", "ID \"%1$s\" already used by cloud federation provider \"%2$s\"" : "La ID «%1$s» ya está siendo usada por el proveedor de federación en la nube «%2$s»", "Cloud Federation Provider with ID: \"%s\" does not exist." : "El proveedor de nube federada con ID \"%s\" no existe.", @@ -261,24 +258,32 @@ "Storage is temporarily not available" : "El almacenamiento no esta disponible temporalmente", "Storage connection timeout. %s" : "Tiempo de conexión de almacenamiento agotado. %s", "Audio input" : "Entrada de audio", + "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", "Source material" : "Material fuente", + "The generated text with content from the source material in the given style" : "El texto generado con el contenido del material fuente en el estilo dado", "Generate image" : "Generar imagen", "Prompt" : "Prompt", "Generates a possible headline for a text." : "Genera un posible titular para un texto.", "Summarize" : "Resumir", "Summary" : "Resumen", "Extract topics" : "Extraer tópicos", + "Translate" : "Traducir", + "Target language" : "Idioma destino", + "Result" : "Resultado", "Free prompt" : "Prompt libre", "Runs an arbitrary prompt through the language model." : "Ejecuta un prompt arbitrario mediante el modelo de lenguaje integrado.", "Generate headline" : "Generar titular", "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. ", - "404" : "404", + "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", @@ -297,9 +302,8 @@ "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", - "PostgreSQL >= 9 required." : "Se requiere PostgreSQL >= 9.", - "Please upgrade your database version." : "Por favor, actualice la versión de su base de datos.", "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." + "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 7893a4e8cbf..9062c8938c1 100644 --- a/lib/l10n/es_419.js +++ b/lib/l10n/es_419.js @@ -9,7 +9,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -45,11 +44,8 @@ OC.L10N.register( "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -76,11 +72,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -144,7 +141,6 @@ OC.L10N.register( "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -152,6 +148,12 @@ OC.L10N.register( "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "Translate" : "Traducir", + "Result" : "Resultado", + "Education Edition" : "Edición Educativa", + "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", @@ -165,6 +167,7 @@ OC.L10N.register( "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", - "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. " + "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 acdf3cc2912..12087c162de 100644 --- a/lib/l10n/es_419.json +++ b/lib/l10n/es_419.json @@ -7,7 +7,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -43,11 +42,8 @@ "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -74,11 +70,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -142,7 +139,6 @@ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -150,6 +146,12 @@ "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "Translate" : "Traducir", + "Result" : "Resultado", + "Education Edition" : "Edición Educativa", + "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", @@ -163,6 +165,7 @@ "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", - "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. " + "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 8ce89ae0b30..51980a990e9 100644 --- a/lib/l10n/es_AR.js +++ b/lib/l10n/es_AR.js @@ -35,10 +35,8 @@ OC.L10N.register( "_%n minute ago_::_%n minutes ago_" : ["Hace %n minuto","Hace %n minutos","Hace %n minutos"], "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Favor de habilitarlo en sus configuraciones de aplicación o contacte a su 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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "Filename contains at least one invalid character" : "Nombre de archivo contiene al menos un carácter no válido", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -65,11 +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", + "Click the button below to open it." : "Haga click en el botón de abajo para abrirlo.", "Open »%s«" : "Abrir »%s«", + "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", "Expiration date is in the past" : "La fecha de expiración ya ha pasado", - "Click the button below to open it." : "Haga click en el botón de abajo para abrirlo.", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", "Monday" : "Lunes", @@ -139,6 +138,11 @@ OC.L10N.register( "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "Se agotó el tiempo de conexión del almacenamiento. %s", "Summary" : "Resumen", + "Translate" : "Traducir", + "Result" : "Resultado", + "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", diff --git a/lib/l10n/es_AR.json b/lib/l10n/es_AR.json index 29230048ce2..5b75263538e 100644 --- a/lib/l10n/es_AR.json +++ b/lib/l10n/es_AR.json @@ -33,10 +33,8 @@ "_%n minute ago_::_%n minutes ago_" : ["Hace %n minuto","Hace %n minutos","Hace %n minutos"], "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Favor de habilitarlo en sus configuraciones de aplicación o contacte a su 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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "Filename contains at least one invalid character" : "Nombre de archivo contiene al menos un carácter no válido", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -63,11 +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", + "Click the button below to open it." : "Haga click en el botón de abajo para abrirlo.", "Open »%s«" : "Abrir »%s«", + "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", "Expiration date is in the past" : "La fecha de expiración ya ha pasado", - "Click the button below to open it." : "Haga click en el botón de abajo para abrirlo.", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", "Monday" : "Lunes", @@ -137,6 +136,11 @@ "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "Se agotó el tiempo de conexión del almacenamiento. %s", "Summary" : "Resumen", + "Translate" : "Traducir", + "Result" : "Resultado", + "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", diff --git a/lib/l10n/es_CL.js b/lib/l10n/es_CL.js index 2c9154891ba..a0f038ea4fb 100644 --- a/lib/l10n/es_CL.js +++ b/lib/l10n/es_CL.js @@ -9,7 +9,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -45,11 +44,9 @@ OC.L10N.register( "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", + "Filename contains at least one invalid character" : "El nombre del archivo contiene al menos un carácter inválido", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -76,11 +73,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -144,7 +142,6 @@ OC.L10N.register( "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -152,7 +149,13 @@ OC.L10N.register( "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "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", @@ -166,6 +169,7 @@ OC.L10N.register( "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", - "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. " + "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 971af5dcaca..396a80a5471 100644 --- a/lib/l10n/es_CL.json +++ b/lib/l10n/es_CL.json @@ -7,7 +7,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -43,11 +42,9 @@ "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", + "Filename contains at least one invalid character" : "El nombre del archivo contiene al menos un carácter inválido", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -74,11 +71,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -142,7 +140,6 @@ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -150,7 +147,13 @@ "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "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", @@ -164,6 +167,7 @@ "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", - "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. " + "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 ff14f116080..e90eefabe56 100644 --- a/lib/l10n/es_CO.js +++ b/lib/l10n/es_CO.js @@ -9,7 +9,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -45,11 +44,9 @@ OC.L10N.register( "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", + "Filename contains at least one invalid character" : "El nombre del archivo contiene al menos un carácter inválido", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -76,11 +73,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -144,7 +142,6 @@ OC.L10N.register( "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -152,7 +149,13 @@ OC.L10N.register( "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "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", @@ -166,6 +169,7 @@ OC.L10N.register( "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", - "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. " + "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 95abef41e28..7461bf437a8 100644 --- a/lib/l10n/es_CO.json +++ b/lib/l10n/es_CO.json @@ -7,7 +7,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -43,11 +42,9 @@ "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", + "Filename contains at least one invalid character" : "El nombre del archivo contiene al menos un carácter inválido", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -74,11 +71,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -142,7 +140,6 @@ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -150,7 +147,13 @@ "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "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", @@ -164,6 +167,7 @@ "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", - "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. " + "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 e8e718f8075..f4f356269f3 100644 --- a/lib/l10n/es_CR.js +++ b/lib/l10n/es_CR.js @@ -9,7 +9,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -45,11 +44,9 @@ OC.L10N.register( "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", + "Filename contains at least one invalid character" : "El nombre del archivo contiene al menos un carácter inválido", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -76,11 +73,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -144,7 +142,6 @@ OC.L10N.register( "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -152,7 +149,13 @@ OC.L10N.register( "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "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", @@ -166,6 +169,7 @@ OC.L10N.register( "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", - "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. " + "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 e57214530c3..c08d78c3d17 100644 --- a/lib/l10n/es_CR.json +++ b/lib/l10n/es_CR.json @@ -7,7 +7,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -43,11 +42,9 @@ "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", + "Filename contains at least one invalid character" : "El nombre del archivo contiene al menos un carácter inválido", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -74,11 +71,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -142,7 +140,6 @@ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -150,7 +147,13 @@ "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "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", @@ -164,6 +167,7 @@ "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", - "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. " + "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 65148359502..f5a8ed33401 100644 --- a/lib/l10n/es_DO.js +++ b/lib/l10n/es_DO.js @@ -9,7 +9,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -45,11 +44,9 @@ OC.L10N.register( "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", + "Filename contains at least one invalid character" : "El nombre del archivo contiene al menos un carácter inválido", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -76,11 +73,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -144,7 +142,6 @@ OC.L10N.register( "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -152,7 +149,13 @@ OC.L10N.register( "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "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", @@ -166,6 +169,7 @@ OC.L10N.register( "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", - "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. " + "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 4e59308ed19..a9dff2725d1 100644 --- a/lib/l10n/es_DO.json +++ b/lib/l10n/es_DO.json @@ -7,7 +7,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -43,11 +42,9 @@ "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", + "Filename contains at least one invalid character" : "El nombre del archivo contiene al menos un carácter inválido", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -74,11 +71,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -142,7 +140,6 @@ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -150,7 +147,13 @@ "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "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", @@ -164,6 +167,7 @@ "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", - "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. " + "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 2ab0a9ab900..4f3ed4d3615 100644 --- a/lib/l10n/es_EC.js +++ b/lib/l10n/es_EC.js @@ -19,7 +19,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Hub bundle" : "Paquete Hub", @@ -76,14 +75,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: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", + "Dot files are not allowed" : "Los archivos Dot no están permitidos", "File already exists" : "El archivo ya existe", "Invalid path" : "Ruta no válida", "Failed to create file from template" : "Error al crear el archivo a partir de la plantilla", "Templates" : "Plantillas", - "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", - "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "Filename contains at least one invalid character" : "El nombre del archivo contiene al menos un carácter inválido", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -127,11 +124,15 @@ 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 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. ", + "Open »%s«" : "Abrir »%s«", + "%1$s via %2$s" : "%1$s a través de %2$s", "%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«", - "%1$s via %2$s" : "%1$s a través de %2$s", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Files cannot be shared with delete permissions" : "No se pueden compartir archivos con permisos de eliminación", @@ -139,9 +140,6 @@ OC.L10N.register( "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["No se puede establecer una fecha de caducidad más de %n día en el futuro","No se puede establecer una fecha de caducidad más de %n días en el futuro","No se puede establecer una fecha de caducidad más de %n días en el futuro"], "Sharing is only allowed with group members" : "Solo se permite compartir con miembros del grupo", - "%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 requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "No se creó el usuario porque se ha alcanzado el límite de usuarios. Consulta tus notificaciones para obtener más información.", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", @@ -226,7 +224,6 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Tu directorio de datos debe ser una ruta absoluta.", "Check the value of \"datadirectory\" in your configuration." : "Verifica el valor de \"datadirectory\" en tu configuración.", "Your data directory is invalid." : "Tu directorio de datos no es válido.", - "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. ", "Action \"%s\" not supported or implemented." : "La acción \"%s\" no está soportada o no está implementada.", "Authentication failed, wrong token or provider ID given" : "Falló la autenticación, se proporcionó un token o un ID de proveedor incorrecto", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Faltan parámetros para completar la solicitud. Parámetros faltantes: \"%s\"", @@ -240,10 +237,16 @@ OC.L10N.register( "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Prompt" : "Promoción", "Summary" : "Resumen", - "404" : "404", + "Translate" : "Traducir", + "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", @@ -262,9 +265,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "Se requiere PostgreSQL >= 9.", - "Please upgrade your database version." : "Actualiza la versión de tu base de datos.", "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. " + "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 3786cca60f3..32640ff4632 100644 --- a/lib/l10n/es_EC.json +++ b/lib/l10n/es_EC.json @@ -17,7 +17,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Hub bundle" : "Paquete Hub", @@ -74,14 +73,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: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", + "Dot files are not allowed" : "Los archivos Dot no están permitidos", "File already exists" : "El archivo ya existe", "Invalid path" : "Ruta no válida", "Failed to create file from template" : "Error al crear el archivo a partir de la plantilla", "Templates" : "Plantillas", - "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", - "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "Filename contains at least one invalid character" : "El nombre del archivo contiene al menos un carácter inválido", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -125,11 +122,15 @@ "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 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. ", + "Open »%s«" : "Abrir »%s«", + "%1$s via %2$s" : "%1$s a través de %2$s", "%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«", - "%1$s via %2$s" : "%1$s a través de %2$s", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Files cannot be shared with delete permissions" : "No se pueden compartir archivos con permisos de eliminación", @@ -137,9 +138,6 @@ "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["No se puede establecer una fecha de caducidad más de %n día en el futuro","No se puede establecer una fecha de caducidad más de %n días en el futuro","No se puede establecer una fecha de caducidad más de %n días en el futuro"], "Sharing is only allowed with group members" : "Solo se permite compartir con miembros del grupo", - "%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 requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "No se creó el usuario porque se ha alcanzado el límite de usuarios. Consulta tus notificaciones para obtener más información.", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", @@ -224,7 +222,6 @@ "Your data directory must be an absolute path." : "Tu directorio de datos debe ser una ruta absoluta.", "Check the value of \"datadirectory\" in your configuration." : "Verifica el valor de \"datadirectory\" en tu configuración.", "Your data directory is invalid." : "Tu directorio de datos no es válido.", - "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. ", "Action \"%s\" not supported or implemented." : "La acción \"%s\" no está soportada o no está implementada.", "Authentication failed, wrong token or provider ID given" : "Falló la autenticación, se proporcionó un token o un ID de proveedor incorrecto", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Faltan parámetros para completar la solicitud. Parámetros faltantes: \"%s\"", @@ -238,10 +235,16 @@ "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Prompt" : "Promoción", "Summary" : "Resumen", - "404" : "404", + "Translate" : "Traducir", + "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", @@ -260,9 +263,8 @@ "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", - "PostgreSQL >= 9 required." : "Se requiere PostgreSQL >= 9.", - "Please upgrade your database version." : "Actualiza la versión de tu base de datos.", "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. " + "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 0e0a08c7b68..f85ad7d395a 100644 --- a/lib/l10n/es_GT.js +++ b/lib/l10n/es_GT.js @@ -9,7 +9,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -45,11 +44,9 @@ OC.L10N.register( "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", + "Filename contains at least one invalid character" : "El nombre del archivo contiene al menos un carácter inválido", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -76,11 +73,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -144,7 +142,6 @@ OC.L10N.register( "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -152,7 +149,13 @@ OC.L10N.register( "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "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", @@ -166,6 +169,7 @@ OC.L10N.register( "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", - "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. " + "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 01dd1bc0325..42b2c402bc6 100644 --- a/lib/l10n/es_GT.json +++ b/lib/l10n/es_GT.json @@ -7,7 +7,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -43,11 +42,9 @@ "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", + "Filename contains at least one invalid character" : "El nombre del archivo contiene al menos un carácter inválido", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -74,11 +71,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -142,7 +140,6 @@ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -150,7 +147,13 @@ "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "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", @@ -164,6 +167,7 @@ "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", - "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. " + "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 8588f1d6c06..b7a6224d3af 100644 --- a/lib/l10n/es_HN.js +++ b/lib/l10n/es_HN.js @@ -9,7 +9,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -45,11 +44,8 @@ OC.L10N.register( "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -76,11 +72,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -144,7 +141,6 @@ OC.L10N.register( "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -152,6 +148,12 @@ OC.L10N.register( "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "Translate" : "Traducir", + "Result" : "Resultado", + "Education Edition" : "Edición Educativa", + "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", @@ -165,6 +167,7 @@ OC.L10N.register( "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", - "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. " + "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 1c366c42cdd..df215213bf3 100644 --- a/lib/l10n/es_HN.json +++ b/lib/l10n/es_HN.json @@ -7,7 +7,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -43,11 +42,8 @@ "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -74,11 +70,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -142,7 +139,6 @@ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -150,6 +146,12 @@ "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "Translate" : "Traducir", + "Result" : "Resultado", + "Education Edition" : "Edición Educativa", + "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", @@ -163,6 +165,7 @@ "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", - "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. " + "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 0ec8bb368df..ab3a328fcf8 100644 --- a/lib/l10n/es_MX.js +++ b/lib/l10n/es_MX.js @@ -19,7 +19,7 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", + "Education bundle" : "Paquete de educación", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Hub bundle" : "Paquete Hub", @@ -38,6 +38,7 @@ OC.L10N.register( "Server version %s or higher is required." : "Se requiere la versión del servidor %s o superior. ", "Server version %s or lower is required." : "La versión del servidor %s o inferior es requerdia. ", "Logged in account 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", + "Your current IP address doesn’t allow you to perform admin actions" : "Su dirección IP actual no le permite realizar acciones de administración", "Logged in account must be an admin or sub admin" : "El usuario conectado debe ser un administrador o un subadministrador", "Logged in account must be an admin" : "El usuario conectado debe ser un administrador", "Wiping of device %s has started" : "La limpieza del dispositivo %s ha comenzado", @@ -80,14 +81,13 @@ 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: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", + "Dot files are not allowed" : "Los archivos Dot no están permitidos", "File already exists" : "El archivo ya existe", "Invalid path" : "Ruta inválida", "Failed to create file from template" : "No se pudo crear un archivo desde la plantilla", "Templates" : "Plantillas", - "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", - "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "Path contains invalid segments" : "La ruta contiene segmentos inválidos", + "Filename contains at least one invalid character" : "El nombre del archivo contiene al menos un carácter inválido", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -139,11 +139,15 @@ 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 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. ", + "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 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«", - "%1$s via %2$s" : "%1$s vía %2$s", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Files cannot be shared with delete permissions" : "No se pueden compartir archivos con permisos de eliminación", @@ -152,9 +156,6 @@ 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_" : ["No se puede fijar la fecha de caducidad más de %n día en el futuro","No se puede fijar la fecha de caducidad más de %n días en el futuro","No se puede fijar la fecha de caducidad más de %n días en el futuro"], "Sharing is only allowed with group members" : "Sólo está permitido compartir a los miembros del grupo", "Sharing %s failed, because this item is already shared with the account %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 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 requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "The requested share comes from a disabled user" : "El recurso compartido solicitado proviene de un usuario deshabilitado", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "No se creó el usuario porque se ha alcanzado el límite de usuarios. Consulta tus notificaciones para obtener más información.", @@ -252,7 +253,7 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Su directorio de datos debe ser una ruta absoluta.", "Check the value of \"datadirectory\" in your configuration." : "Revise el valor de \"datadirectory\" en su configuración.", "Your data directory is invalid." : "Su directorio de datos es inválido.", - "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. ", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Asegúrese que exista un archivo llamado \"%1$s\" en la raíz del directorio de datos. Debería contener: \"%2$s\"", "Action \"%s\" not supported or implemented." : "La acción \"%s\" no está soportada o no está implementada.", "Authentication failed, wrong token or provider ID given" : "Falló la autentificación, se proporcionó un token o un identificador de proveedor incorrecto", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Faltan parámetros para completar la solicitud. Parámetros faltantes: \"%s\"", @@ -270,7 +271,6 @@ OC.L10N.register( "The audio to transcribe" : "El audio a transcribir", "Transcription" : "Transcripción", "The transcribed text" : "El texto transcrito", - "ContextWrite" : "ContextWrite", "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", "Demonstrate a writing style that you would like to immitate" : "Demostrar un estilo de escritura que le gustaría imitar", @@ -292,7 +292,7 @@ OC.L10N.register( "Output images" : "Salida de imágenes", "The generated images" : "Las imágenes generadas", "Free text to text prompt" : "Texto libre a prompt de texto", - "Runs an arbitrary prompt through a language model that retuns a reply" : "Ejecuta un prompt arbitrario a través de un modelo de lenguaje que regresa una respuesta.", + "Runs an arbitrary prompt through a language model that returns a reply" : "Ejecuta un prompt arbitrario a través de un modelo de lenguaje que regresa una respuesta", "Describe a task that you want the assistant to do or ask a question" : "Describa una tarea que quiere que haga el asistente o haga una pregunta", "Generated reply" : "Respuesta generada", "The generated text from the assistant" : "El texto generado por el asistente", @@ -335,15 +335,28 @@ OC.L10N.register( "The original text to extract topics from" : "El texto original desde donde extraer los temas", "Topics" : "Temas", "The list of extracted topics" : "La lista de temas extraídos", + "Translate" : "Traducir", + "Translate text from one language to another" : "Traducir texto de un idioma a otro", + "Origin text" : "Texto de origen", + "The text to translate" : "El texto a traducir", + "Origin language" : "Idioma de origen", + "The language of the origin text" : "El idioma del texto de origen", + "Target language" : "Idioma destino", + "The desired language to translate the origin text in" : "El idioma deseado a traducir el texto de origen", + "Result" : "Resultado", + "The translated text" : "El texto traducido", "Free prompt" : "Liberar prompt", "Runs an arbitrary prompt through the language model." : "Ejecuta un prompt arbitrario a través del modelo de lenguaje.", "Generate headline" : "Generar titular", "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. ", - "404" : "404", + "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", @@ -362,9 +375,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "Se requiere PostgreSQL >= 9.", - "Please upgrade your database version." : "Por favor, actualice la versión de la base de datos.", "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. " + "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 cfc14d941d6..bddf177b65e 100644 --- a/lib/l10n/es_MX.json +++ b/lib/l10n/es_MX.json @@ -17,7 +17,7 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", + "Education bundle" : "Paquete de educación", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Hub bundle" : "Paquete Hub", @@ -36,6 +36,7 @@ "Server version %s or higher is required." : "Se requiere la versión del servidor %s o superior. ", "Server version %s or lower is required." : "La versión del servidor %s o inferior es requerdia. ", "Logged in account 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", + "Your current IP address doesn’t allow you to perform admin actions" : "Su dirección IP actual no le permite realizar acciones de administración", "Logged in account must be an admin or sub admin" : "El usuario conectado debe ser un administrador o un subadministrador", "Logged in account must be an admin" : "El usuario conectado debe ser un administrador", "Wiping of device %s has started" : "La limpieza del dispositivo %s ha comenzado", @@ -78,14 +79,13 @@ "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: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", + "Dot files are not allowed" : "Los archivos Dot no están permitidos", "File already exists" : "El archivo ya existe", "Invalid path" : "Ruta inválida", "Failed to create file from template" : "No se pudo crear un archivo desde la plantilla", "Templates" : "Plantillas", - "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", - "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "Path contains invalid segments" : "La ruta contiene segmentos inválidos", + "Filename contains at least one invalid character" : "El nombre del archivo contiene al menos un carácter inválido", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -137,11 +137,15 @@ "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 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. ", + "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 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«", - "%1$s via %2$s" : "%1$s vía %2$s", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Files cannot be shared with delete permissions" : "No se pueden compartir archivos con permisos de eliminación", @@ -150,9 +154,6 @@ "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["No se puede fijar la fecha de caducidad más de %n día en el futuro","No se puede fijar la fecha de caducidad más de %n días en el futuro","No se puede fijar la fecha de caducidad más de %n días en el futuro"], "Sharing is only allowed with group members" : "Sólo está permitido compartir a los miembros del grupo", "Sharing %s failed, because this item is already shared with the account %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 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 requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "The requested share comes from a disabled user" : "El recurso compartido solicitado proviene de un usuario deshabilitado", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "No se creó el usuario porque se ha alcanzado el límite de usuarios. Consulta tus notificaciones para obtener más información.", @@ -250,7 +251,7 @@ "Your data directory must be an absolute path." : "Su directorio de datos debe ser una ruta absoluta.", "Check the value of \"datadirectory\" in your configuration." : "Revise el valor de \"datadirectory\" en su configuración.", "Your data directory is invalid." : "Su directorio de datos es inválido.", - "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. ", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Asegúrese que exista un archivo llamado \"%1$s\" en la raíz del directorio de datos. Debería contener: \"%2$s\"", "Action \"%s\" not supported or implemented." : "La acción \"%s\" no está soportada o no está implementada.", "Authentication failed, wrong token or provider ID given" : "Falló la autentificación, se proporcionó un token o un identificador de proveedor incorrecto", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Faltan parámetros para completar la solicitud. Parámetros faltantes: \"%s\"", @@ -268,7 +269,6 @@ "The audio to transcribe" : "El audio a transcribir", "Transcription" : "Transcripción", "The transcribed text" : "El texto transcrito", - "ContextWrite" : "ContextWrite", "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", "Demonstrate a writing style that you would like to immitate" : "Demostrar un estilo de escritura que le gustaría imitar", @@ -290,7 +290,7 @@ "Output images" : "Salida de imágenes", "The generated images" : "Las imágenes generadas", "Free text to text prompt" : "Texto libre a prompt de texto", - "Runs an arbitrary prompt through a language model that retuns a reply" : "Ejecuta un prompt arbitrario a través de un modelo de lenguaje que regresa una respuesta.", + "Runs an arbitrary prompt through a language model that returns a reply" : "Ejecuta un prompt arbitrario a través de un modelo de lenguaje que regresa una respuesta", "Describe a task that you want the assistant to do or ask a question" : "Describa una tarea que quiere que haga el asistente o haga una pregunta", "Generated reply" : "Respuesta generada", "The generated text from the assistant" : "El texto generado por el asistente", @@ -333,15 +333,28 @@ "The original text to extract topics from" : "El texto original desde donde extraer los temas", "Topics" : "Temas", "The list of extracted topics" : "La lista de temas extraídos", + "Translate" : "Traducir", + "Translate text from one language to another" : "Traducir texto de un idioma a otro", + "Origin text" : "Texto de origen", + "The text to translate" : "El texto a traducir", + "Origin language" : "Idioma de origen", + "The language of the origin text" : "El idioma del texto de origen", + "Target language" : "Idioma destino", + "The desired language to translate the origin text in" : "El idioma deseado a traducir el texto de origen", + "Result" : "Resultado", + "The translated text" : "El texto traducido", "Free prompt" : "Liberar prompt", "Runs an arbitrary prompt through the language model." : "Ejecuta un prompt arbitrario a través del modelo de lenguaje.", "Generate headline" : "Generar titular", "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. ", - "404" : "404", + "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", @@ -360,9 +373,8 @@ "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", - "PostgreSQL >= 9 required." : "Se requiere PostgreSQL >= 9.", - "Please upgrade your database version." : "Por favor, actualice la versión de la base de datos.", "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. " + "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 a80facf727e..fab9eff7cb0 100644 --- a/lib/l10n/es_NI.js +++ b/lib/l10n/es_NI.js @@ -9,7 +9,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -45,11 +44,8 @@ OC.L10N.register( "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -76,11 +72,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -144,7 +141,6 @@ OC.L10N.register( "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -152,6 +148,12 @@ OC.L10N.register( "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "Translate" : "Traducir", + "Result" : "Resultado", + "Education Edition" : "Edición Educativa", + "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", @@ -165,6 +167,7 @@ OC.L10N.register( "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", - "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. " + "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 d65402fe4c7..07df71cc9d2 100644 --- a/lib/l10n/es_NI.json +++ b/lib/l10n/es_NI.json @@ -7,7 +7,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -43,11 +42,8 @@ "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -74,11 +70,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -142,7 +139,6 @@ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -150,6 +146,12 @@ "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "Translate" : "Traducir", + "Result" : "Resultado", + "Education Edition" : "Edición Educativa", + "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", @@ -163,6 +165,7 @@ "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", - "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. " + "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 6e39b9a214c..1ced91ea51c 100644 --- a/lib/l10n/es_PA.js +++ b/lib/l10n/es_PA.js @@ -9,7 +9,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -45,11 +44,8 @@ OC.L10N.register( "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -76,11 +72,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -144,7 +141,6 @@ OC.L10N.register( "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -152,6 +148,12 @@ OC.L10N.register( "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "Translate" : "Traducir", + "Result" : "Resultado", + "Education Edition" : "Edición Educativa", + "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", @@ -165,6 +167,7 @@ OC.L10N.register( "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", - "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. " + "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 36e2259537b..9670546184a 100644 --- a/lib/l10n/es_PA.json +++ b/lib/l10n/es_PA.json @@ -7,7 +7,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -43,11 +42,8 @@ "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -74,11 +70,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -142,7 +139,6 @@ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -150,6 +146,12 @@ "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "Translate" : "Traducir", + "Result" : "Resultado", + "Education Edition" : "Edición Educativa", + "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", @@ -163,6 +165,7 @@ "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", - "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. " + "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 f7ffd1c3f41..45fc3f5b9f1 100644 --- a/lib/l10n/es_PE.js +++ b/lib/l10n/es_PE.js @@ -9,7 +9,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -45,11 +44,8 @@ OC.L10N.register( "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -76,11 +72,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -144,7 +141,6 @@ OC.L10N.register( "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -152,6 +148,12 @@ OC.L10N.register( "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "Translate" : "Traducir", + "Result" : "Resultado", + "Education Edition" : "Edición Educativa", + "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", @@ -165,6 +167,7 @@ OC.L10N.register( "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", - "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. " + "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 fcd935d5056..0a23fe69df8 100644 --- a/lib/l10n/es_PE.json +++ b/lib/l10n/es_PE.json @@ -7,7 +7,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -43,11 +42,8 @@ "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -74,11 +70,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -142,7 +139,6 @@ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -150,6 +146,12 @@ "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "Translate" : "Traducir", + "Result" : "Resultado", + "Education Edition" : "Edición Educativa", + "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", @@ -163,6 +165,7 @@ "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", - "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. " + "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 f15c4f330f6..a77757846c1 100644 --- a/lib/l10n/es_PR.js +++ b/lib/l10n/es_PR.js @@ -9,7 +9,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -45,11 +44,8 @@ OC.L10N.register( "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -76,11 +72,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -144,7 +141,6 @@ OC.L10N.register( "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -152,6 +148,12 @@ OC.L10N.register( "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "Translate" : "Traducir", + "Result" : "Resultado", + "Education Edition" : "Edición Educativa", + "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", @@ -165,6 +167,7 @@ OC.L10N.register( "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", - "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. " + "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 a1bfdf46421..e3a5d50656c 100644 --- a/lib/l10n/es_PR.json +++ b/lib/l10n/es_PR.json @@ -7,7 +7,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -43,11 +42,8 @@ "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -74,11 +70,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -142,7 +139,6 @@ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -150,6 +146,12 @@ "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "Translate" : "Traducir", + "Result" : "Resultado", + "Education Edition" : "Edición Educativa", + "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", @@ -163,6 +165,7 @@ "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", - "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. " + "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 45e55c94842..c1b6545bca3 100644 --- a/lib/l10n/es_PY.js +++ b/lib/l10n/es_PY.js @@ -9,7 +9,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -45,11 +44,8 @@ OC.L10N.register( "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -76,11 +72,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -144,7 +141,6 @@ OC.L10N.register( "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -152,6 +148,12 @@ OC.L10N.register( "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "Translate" : "Traducir", + "Result" : "Resultado", + "Education Edition" : "Edición Educativa", + "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", @@ -165,6 +167,7 @@ OC.L10N.register( "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", - "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. " + "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 7b7be7c2c0c..5604fc14be9 100644 --- a/lib/l10n/es_PY.json +++ b/lib/l10n/es_PY.json @@ -7,7 +7,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -43,11 +42,8 @@ "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -74,11 +70,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -142,7 +139,6 @@ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -150,6 +146,12 @@ "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "Translate" : "Traducir", + "Result" : "Resultado", + "Education Edition" : "Edición Educativa", + "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", @@ -163,6 +165,7 @@ "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", - "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. " + "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 c2be2e33b1f..75d6dc2e640 100644 --- a/lib/l10n/es_SV.js +++ b/lib/l10n/es_SV.js @@ -9,7 +9,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -45,11 +44,9 @@ OC.L10N.register( "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", + "Filename contains at least one invalid character" : "El nombre del archivo contiene al menos un carácter inválido", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -76,11 +73,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -144,7 +142,6 @@ OC.L10N.register( "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -152,7 +149,13 @@ OC.L10N.register( "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "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", @@ -166,6 +169,7 @@ OC.L10N.register( "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", - "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. " + "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 cc04eb09ed1..b18e28912fe 100644 --- a/lib/l10n/es_SV.json +++ b/lib/l10n/es_SV.json @@ -7,7 +7,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -43,11 +42,9 @@ "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", + "Filename contains at least one invalid character" : "El nombre del archivo contiene al menos un carácter inválido", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -74,11 +71,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -142,7 +140,6 @@ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -150,7 +147,13 @@ "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "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", @@ -164,6 +167,7 @@ "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", - "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. " + "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 69e5fbdb88a..f26d3e1fb99 100644 --- a/lib/l10n/es_UY.js +++ b/lib/l10n/es_UY.js @@ -9,7 +9,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -45,11 +44,8 @@ OC.L10N.register( "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -76,11 +72,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -144,7 +141,6 @@ OC.L10N.register( "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -152,6 +148,12 @@ OC.L10N.register( "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "Translate" : "Traducir", + "Result" : "Resultado", + "Education Edition" : "Edición Educativa", + "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", @@ -165,6 +167,7 @@ OC.L10N.register( "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", - "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. " + "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 04ab10474e4..996a0b2b510 100644 --- a/lib/l10n/es_UY.json +++ b/lib/l10n/es_UY.json @@ -7,7 +7,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s y %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s y %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s y %5$s", - "Education Edition" : "Edición Educativa", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de Groupware", "Social sharing bundle" : "Paquete para compartir en redes sociales", @@ -43,11 +42,8 @@ "in a few seconds" : "en algunos segundos", "seconds ago" : "hace segundos", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "El módulo con ID: %sno existe. Por favor hablíitalo en tus configuraciones de aplicación o contacta a tu administrador. ", - "File already exists" : "El archivo ya existe", - "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", "Dot files are not allowed" : "Los archivos Dot no están permitidos", + "File already exists" : "El archivo ya existe", "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", @@ -74,11 +70,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", + "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "Open »%s«" : "Abrir »%s«", + "Unknown share type" : "Tipo de elemento compartido desconocido", "You are not allowed to share %s" : "No tienes permitido compartir %s", "Cannot increase permissions of %s" : "No se pueden incrementar los permisos de %s", "Expiration date is in the past" : "La fecha de expiración se encuentra en el pasado", - "Click the button below to open it." : "Haz click en el botón inferior para abrirlo. ", "The requested share does not exist anymore" : "El recurso compartido solicitado ya no existe", "Could not find category \"%s\"" : "No fue posible encontrar la categoria \"%s\"", "Sunday" : "Domingo", @@ -142,7 +139,6 @@ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Esto ha sido causado probablemente por un acelerador de caché como Zend OPcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "¿Los módulos de PHP han sido instalados, pero se siguen enlistando como faltantes?", "Please ask your server administrator to restart the web server." : "Por favor solicita al administrador reiniciar el servidor web. ", - "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. ", "Could not obtain lock type %d on \"%s\"." : "No fue posible obtener el tipo de bloqueo %d en \"%s\". ", "Storage unauthorized. %s" : "Almacenamiento no autorizado. %s", "Storage incomplete configuration. %s" : "Configuración incompleta del almacenamiento. %s", @@ -150,6 +146,12 @@ "Storage is temporarily not available" : "El almacenamieto se encuentra temporalmente no disponible", "Storage connection timeout. %s" : "El tiempo de la conexión del almacenamiento se agotó. %s", "Summary" : "Resumen", + "Translate" : "Traducir", + "Result" : "Resultado", + "Education Edition" : "Edición Educativa", + "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", @@ -163,6 +165,7 @@ "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", - "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. " + "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 6dd8f28688d..6133717db9e 100644 --- a/lib/l10n/et_EE.js +++ b/lib/l10n/et_EE.js @@ -34,14 +34,12 @@ OC.L10N.register( "in a few seconds" : "mõne sekundi jooksul", "seconds ago" : "sekundit tagasi", "Empty file" : "Tühi fail", + "Dot files are not allowed" : "Punktiga failid pole lubatud", "File already exists" : "Fail on juba olemas", "Invalid path" : "Vigane kataloogirada", "Failed to create file from template" : "Ei saa luua mallist faili", "Templates" : "Mallid", - "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", - "Dot files are not allowed" : "Punktiga failid pole lubatud", + "Filename contains at least one invalid character" : "Faili nimes on vähemalt üks keelatud märk", "Empty filename is not allowed" : "Tühi failinimi pole lubatud", "__language_name__" : "Eesti", "This is an automatically sent email, please do not reply." : "See on automaatselt saadetud e-kiri, palun ära vasta.", @@ -69,11 +67,12 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Jagamise tagarakend %s peab kasutusele võtma OCP\\Share_Backend liidese", "Sharing backend %s not found" : "Jagamise tagarakendit %s ei leitud", "Sharing backend for %s not found" : "Jagamise tagarakendit %s jaoks ei leitud", + "Click the button below to open it." : "Vajuta allolevat nuppu, et see avada.", "Open »%s«" : "Ava »%s«", + "Unknown share type" : "Tundmatu jagamise tüüp", "You are not allowed to share %s" : "Sul pole lubatud %s jagada", "Cannot increase permissions of %s" : "Ei saa %s õigusi suurendada", "Expiration date is in the past" : "Aegumise kuupäev on minevikus", - "Click the button below to open it." : "Vajuta allolevat nuppu, et see avada.", "The requested share does not exist anymore" : "Soovitud jagamist enam ei eksisteeri", "Could not find category \"%s\"" : "Ei leia kategooriat \"%s\"", "Sunday" : "Pühapäev", @@ -138,6 +137,10 @@ OC.L10N.register( "Could not obtain lock type %d on \"%s\"." : "Ei suutnud hankida %d tüüpi lukustust \"%s\".", "Storage is temporarily not available" : "Salvestusruum pole ajutiselt kättesaadav", "Summary" : "Kokkuvõte", + "Translate" : "Tõlgi", + "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", @@ -151,7 +154,6 @@ OC.L10N.register( "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", - "Please upgrade your database version." : "Palun uuenda oma andmebaasi versioon", "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" }, "nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/et_EE.json b/lib/l10n/et_EE.json index fd09305df0c..1651c422701 100644 --- a/lib/l10n/et_EE.json +++ b/lib/l10n/et_EE.json @@ -32,14 +32,12 @@ "in a few seconds" : "mõne sekundi jooksul", "seconds ago" : "sekundit tagasi", "Empty file" : "Tühi fail", + "Dot files are not allowed" : "Punktiga failid pole lubatud", "File already exists" : "Fail on juba olemas", "Invalid path" : "Vigane kataloogirada", "Failed to create file from template" : "Ei saa luua mallist faili", "Templates" : "Mallid", - "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", - "Dot files are not allowed" : "Punktiga failid pole lubatud", + "Filename contains at least one invalid character" : "Faili nimes on vähemalt üks keelatud märk", "Empty filename is not allowed" : "Tühi failinimi pole lubatud", "__language_name__" : "Eesti", "This is an automatically sent email, please do not reply." : "See on automaatselt saadetud e-kiri, palun ära vasta.", @@ -67,11 +65,12 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Jagamise tagarakend %s peab kasutusele võtma OCP\\Share_Backend liidese", "Sharing backend %s not found" : "Jagamise tagarakendit %s ei leitud", "Sharing backend for %s not found" : "Jagamise tagarakendit %s jaoks ei leitud", + "Click the button below to open it." : "Vajuta allolevat nuppu, et see avada.", "Open »%s«" : "Ava »%s«", + "Unknown share type" : "Tundmatu jagamise tüüp", "You are not allowed to share %s" : "Sul pole lubatud %s jagada", "Cannot increase permissions of %s" : "Ei saa %s õigusi suurendada", "Expiration date is in the past" : "Aegumise kuupäev on minevikus", - "Click the button below to open it." : "Vajuta allolevat nuppu, et see avada.", "The requested share does not exist anymore" : "Soovitud jagamist enam ei eksisteeri", "Could not find category \"%s\"" : "Ei leia kategooriat \"%s\"", "Sunday" : "Pühapäev", @@ -136,6 +135,10 @@ "Could not obtain lock type %d on \"%s\"." : "Ei suutnud hankida %d tüüpi lukustust \"%s\".", "Storage is temporarily not available" : "Salvestusruum pole ajutiselt kättesaadav", "Summary" : "Kokkuvõte", + "Translate" : "Tõlgi", + "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", @@ -149,7 +152,6 @@ "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", - "Please upgrade your database version." : "Palun uuenda oma andmebaasi versioon", "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" },"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 c2c246335e6..5eae9133d2e 100644 --- a/lib/l10n/eu.js +++ b/lib/l10n/eu.js @@ -19,7 +19,7 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s eta %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s eta %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s eta %5$s", - "Education Edition" : "Hezkuntza edizioa", + "Education bundle" : "Hezkuntza bilduma", "Enterprise bundle" : "Enpresa multzoa", "Groupware bundle" : "Talderanerako multzoa", "Hub bundle" : "Hub sorta", @@ -38,6 +38,7 @@ OC.L10N.register( "Server version %s or higher is required." : "Zerbitzariaren %s bertsioa edo berriagoa behar da.", "Server version %s or lower is required." : "Zerbitzariaren %s bertsioa edo zaharragoa behar da.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Saioa hasitako kontua administratzailea, azpi-administratzailea edo baimen berezi bat duena izan behar da ezarpen hau aldatzeko.", + "Your current IP address doesn’t allow you to perform admin actions" : "Zure uneko IP helbideak ez dizu administratzaile-ekintzak egiten uzten", "Logged in account must be an admin or sub admin" : "Saioa hasitako kontua administratzaile edo azpi-administratzailea izan behar du", "Logged in account must be an admin" : "Saioa hasitako kontua administratzailea izan behar du", "Wiping of device %s has started" : "%s gailuaren garbiketa hasi da", @@ -80,14 +81,18 @@ OC.L10N.register( "seconds ago" : "duela segundo batzuk", "Empty file" : "Fitxategi hutsa", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "%s IDa duen modulua ez da existitzen. Gaitu zure aplikazioen ezarpenetan edo jarri harremanetan administratzailearekin.", + "Dot files are not allowed" : "Dot fitxategiak ez dira onartzen", + "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" debekatutako fitxategi edo karpeta-izen bat da.", + "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" debekatutako aurrizkia da fitxategi edo karpeten izenetarako.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" ez da onartzen fitxategi edo karpeta-izen baten barruan.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" debekatutako fitxategi mota bat da.", + "Filenames must not end with \"%1$s\"." : "Fitxategi-izenak ez dira \"%1$s\"rekin amaitu behar.", "File already exists" : "Badago izen bereko fitxategi bat", "Invalid path" : "Bide-izen baliogabea", "Failed to create file from template" : "Fitxategi berria txantiloitik sortzeak huts egin du", "Templates" : "Txantiloiak", - "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", - "Dot files are not allowed" : "Dot fitxategiak ez dira onartzen", + "Path contains invalid segments" : "Bideak segmentu baliogabeak ditu", + "Filename contains at least one invalid character" : "Fitxategi-izenak karaktere baliogabe bat du gutxienez", "Empty filename is not allowed" : "Fitxategiaren izena ezin da hutsa izan", "App \"%s\" cannot be installed because appinfo file cannot be read." : "«%s» aplikazioa ezin da instalatu appinfo fitxategia ezin delako irakurri.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "\"%s\" aplikazioa ezin da instalatu ez delako zerbitzariaren bertsio honekin bateragarria.", @@ -139,11 +144,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "%s partekatze motorrak OCP\\Share_Backend interfazea inplementatu behar du ", "Sharing backend %s not found" : "Ez da %s partekatze motorra aurkitu", "Sharing backend for %s not found" : "Ez da %s(e)rako partekatze motorrik aurkitu", + "%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.", + "Open »%s«" : "Ireki »%s«", + "%1$s via %2$s" : "%2$s bidez, %1$s", "%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«", - "%1$s via %2$s" : "%2$s bidez, %1$s", + "Unknown share type" : "Partekatze mota ezezaguna", "You are not allowed to share %s" : "Ez duzu %s partekatzeko baimenik", "Cannot increase permissions of %s" : "Ezin dira %s(r)en baimenak handitu", "Files cannot be shared with delete permissions" : "Fitxategiak ezin dira ezabatze baimenarekin partekatu", @@ -152,9 +161,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_" : ["Ezin da iraungitze-data etorkizunean %n egun baino gehiagora jarri","Ezin da iraungitze-data etorkizunean %n egun baino gehiagora jarri"], "Sharing is only allowed with group members" : "Taldeko kideekin bakarrik parteka daiteke", "Sharing %s failed, because this item is already shared with the account %s" : "%s partekatzeak huts egin du, dagoeneko %s kontuarekin 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.", + "Sharing is disabled" : "Partekatzea desgaituta dago", "The requested share does not exist anymore" : "Eskatutako partekatzea ez da existitzen dagoeneko", "The requested share comes from a disabled user" : "Eskatutako partekatzea desgaitutako erabiltzaile batengatik dator", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Ezin izan da erabiltzailea sortu, erabiltzaile muga gainditu delako. Egiaztatu zure jakinarazpenak gehiago jakiteko.", @@ -252,7 +259,7 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Zure datuen karpeta bide-izen absolutua izan behar da.", "Check the value of \"datadirectory\" in your configuration." : "Egiaztatu \"datadirectory\"-ren balioa zure konfigurazioan.", "Your data directory is invalid." : "Zure datuen karpeta baliogabea da.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Ziurtatu datu direktorioaren erroan \".ocdata\" izeneko fitxategia dagoela.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Ziurtatu datu-direktorioaren erroan \"%1$s\" izeneko fitxategi bat dagoela. \"%2$s\" edukia izan behar du.", "Action \"%s\" not supported or implemented." : "\"%s\" ekintza ez da onartzen edo ez dago inplementaturik.", "Authentication failed, wrong token or provider ID given" : "Autentifikazioak huts egin du, token edo hornitzaile ID okerra eman da", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Eskaera osatzeko parametroak falta dira. Falta diren parametroak: \"%s\"", @@ -270,7 +277,7 @@ OC.L10N.register( "The audio to transcribe" : "Transkribatzeko audioa", "Transcription" : "Transkripzioa", "The transcribed text" : "Transkribatutako testua", - "ContextWrite" : "ContextWrite", + "Context write" : "Testuingurua idaztea", "Writes text in a given style based on the provided source material." : "Testua estilo jakin batean idazten du, emandako iturri-materialean oinarrituta.", "Writing style" : "Idazteko estiloa", "Demonstrate a writing style that you would like to immitate" : "Erakutsi imitatu nahiko zenukeen idazteko estiloa", @@ -292,16 +299,39 @@ OC.L10N.register( "Output images" : "Irteera irudiak", "The generated images" : "Sortutako irudiak", "Free text to text prompt" : "Testu librea mezuaren testura", - "Runs an arbitrary prompt through a language model that retuns a reply" : "Erantzun bat bueltatzen duen hizkuntza ereduaren zehar esaldi arbitrario bat exekutatzen du.", + "Runs an arbitrary prompt through a language model that returns a reply" : "Abisu arbitrario bat exekutatzen du erantzuna itzultzen duen hizkuntza-eredu baten bidez", "Describe a task that you want the assistant to do or ask a question" : "Deskribatu laguntzaileak egitea nahi duzun zeregina edo galdera bat egin", "Generated reply" : "Sortutako erantzuna", "The generated text from the assistant" : "Laguntzaileak sortutako testua", "Chat" : "Chat", + "Chat with the assistant" : "Hitz egin txat bidez laguntzailarekin", + "System prompt" : "Sistemaren gonbita", + "Define rules and assumptions that the assistant should follow during the conversation." : "Definitu elkarrizketan zehar txat laguntzaileak jarraitu beharko lituzkeen arau eta suposizioak.", + "Chat message" : "Txat mezua", + "Chat history" : "Txat historia", + "The history of chat messages before the current message, starting with a message by the user" : "Uneko mezuaren aurreko txat mezuen historia, erabiltzailearen mezu batetik hasita", + "Response message" : "Erantzun mezua", + "The generated response as part of the conversation" : "Sorturiko erantzuna, elkarrizketaren zati gisa", + "Formalize text" : "Formaldu testua", + "Takes a text and makes it sound more formal" : "Testu bat hartzen du eta doinu formalagoa ematen dio.", + "Write a text that you want the assistant to formalize" : "Idatz ezazu laguntzaileak formaltzea nahi duzun testu bat", + "Formalized text" : "Formaldutako testua", + "The formalized text" : "Formaldutako testua", "Generate a headline" : "Sortu izenburu bat", "Generates a possible headline for a text." : "Testu baten izenburu posiblea sortzen du.", "Original text" : "Jatorrizko testua", "The original text to generate a headline for" : "Izenburu bat sortzeko jatorrizko testua", "The generated headline" : "Sortutako izenburua", + "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", + "Reformulated text" : "Birformulatutako testua", + "The reformulated text, written by the assistant" : "Birformulaturiko testua, laguntzaileak idatzia", + "Simplify text" : "Sinpletu testua", + "Takes a text and simplifies it" : "Testu bat hartu eta sinpletu egiten du", + "Write a text that you want the assistant to simplify" : "Idatz ezazu laguntzaileak sinpletzea nahi duzun testu bat", + "Simplified text" : "Sinpletutako testua", + "The simplified text" : "Sinpletutako testua", "Summarize" : "Laburtu", "Summarizes a text" : "Laburtu testu bat", "The original text to summarize" : "Laburtu beharreko jatorrizko testua", @@ -312,15 +342,28 @@ OC.L10N.register( "The original text to extract topics from" : "Gaiak ateratzeko jatorrizko testua", "Topics" : "Gaiak", "The list of extracted topics" : "Ateratako gaien zerrenda", + "Translate" : "Itzuli", + "Translate text from one language to another" : "Itzuli testua hizkuntza batetik bestera", + "Origin text" : "Jatorrizko testua", + "The text to translate" : "Itzuli beharreko testua", + "Origin language" : "Jatorrizko hizkuntza", + "The language of the origin text" : "Jatorrizko testuaren hizkuntza", + "Target language" : "Helburuko hizkuntza", + "The desired language to translate the origin text in" : "Jatorrizko testua itzultzeko nahi den hizkuntza", + "Result" : "Emaitza", + "The translated text" : "Itzulitako testua", "Free prompt" : "Gonbita librea", "Runs an arbitrary prompt through the language model." : "Hizkuntza ereduaren zehar esaldi arbitrario bat exekutatzen du.", "Generate headline" : "Sortu izenburua", "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.", - "404" : "404", + "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", @@ -339,9 +382,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 behar da", - "Please upgrade your database version." : "Mesedez eguneratu zure datu-basearen bertsioa.", "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." + "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 4073f422450..af74d6d39c4 100644 --- a/lib/l10n/eu.json +++ b/lib/l10n/eu.json @@ -17,7 +17,7 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s eta %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s eta %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s eta %5$s", - "Education Edition" : "Hezkuntza edizioa", + "Education bundle" : "Hezkuntza bilduma", "Enterprise bundle" : "Enpresa multzoa", "Groupware bundle" : "Talderanerako multzoa", "Hub bundle" : "Hub sorta", @@ -36,6 +36,7 @@ "Server version %s or higher is required." : "Zerbitzariaren %s bertsioa edo berriagoa behar da.", "Server version %s or lower is required." : "Zerbitzariaren %s bertsioa edo zaharragoa behar da.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Saioa hasitako kontua administratzailea, azpi-administratzailea edo baimen berezi bat duena izan behar da ezarpen hau aldatzeko.", + "Your current IP address doesn’t allow you to perform admin actions" : "Zure uneko IP helbideak ez dizu administratzaile-ekintzak egiten uzten", "Logged in account must be an admin or sub admin" : "Saioa hasitako kontua administratzaile edo azpi-administratzailea izan behar du", "Logged in account must be an admin" : "Saioa hasitako kontua administratzailea izan behar du", "Wiping of device %s has started" : "%s gailuaren garbiketa hasi da", @@ -78,14 +79,18 @@ "seconds ago" : "duela segundo batzuk", "Empty file" : "Fitxategi hutsa", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "%s IDa duen modulua ez da existitzen. Gaitu zure aplikazioen ezarpenetan edo jarri harremanetan administratzailearekin.", + "Dot files are not allowed" : "Dot fitxategiak ez dira onartzen", + "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" debekatutako fitxategi edo karpeta-izen bat da.", + "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" debekatutako aurrizkia da fitxategi edo karpeten izenetarako.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" ez da onartzen fitxategi edo karpeta-izen baten barruan.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" debekatutako fitxategi mota bat da.", + "Filenames must not end with \"%1$s\"." : "Fitxategi-izenak ez dira \"%1$s\"rekin amaitu behar.", "File already exists" : "Badago izen bereko fitxategi bat", "Invalid path" : "Bide-izen baliogabea", "Failed to create file from template" : "Fitxategi berria txantiloitik sortzeak huts egin du", "Templates" : "Txantiloiak", - "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", - "Dot files are not allowed" : "Dot fitxategiak ez dira onartzen", + "Path contains invalid segments" : "Bideak segmentu baliogabeak ditu", + "Filename contains at least one invalid character" : "Fitxategi-izenak karaktere baliogabe bat du gutxienez", "Empty filename is not allowed" : "Fitxategiaren izena ezin da hutsa izan", "App \"%s\" cannot be installed because appinfo file cannot be read." : "«%s» aplikazioa ezin da instalatu appinfo fitxategia ezin delako irakurri.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "\"%s\" aplikazioa ezin da instalatu ez delako zerbitzariaren bertsio honekin bateragarria.", @@ -137,11 +142,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "%s partekatze motorrak OCP\\Share_Backend interfazea inplementatu behar du ", "Sharing backend %s not found" : "Ez da %s partekatze motorra aurkitu", "Sharing backend for %s not found" : "Ez da %s(e)rako partekatze motorrik aurkitu", + "%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.", + "Open »%s«" : "Ireki »%s«", + "%1$s via %2$s" : "%2$s bidez, %1$s", "%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«", - "%1$s via %2$s" : "%2$s bidez, %1$s", + "Unknown share type" : "Partekatze mota ezezaguna", "You are not allowed to share %s" : "Ez duzu %s partekatzeko baimenik", "Cannot increase permissions of %s" : "Ezin dira %s(r)en baimenak handitu", "Files cannot be shared with delete permissions" : "Fitxategiak ezin dira ezabatze baimenarekin partekatu", @@ -150,9 +159,7 @@ "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Ezin da iraungitze-data etorkizunean %n egun baino gehiagora jarri","Ezin da iraungitze-data etorkizunean %n egun baino gehiagora jarri"], "Sharing is only allowed with group members" : "Taldeko kideekin bakarrik parteka daiteke", "Sharing %s failed, because this item is already shared with the account %s" : "%s partekatzeak huts egin du, dagoeneko %s kontuarekin 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.", + "Sharing is disabled" : "Partekatzea desgaituta dago", "The requested share does not exist anymore" : "Eskatutako partekatzea ez da existitzen dagoeneko", "The requested share comes from a disabled user" : "Eskatutako partekatzea desgaitutako erabiltzaile batengatik dator", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Ezin izan da erabiltzailea sortu, erabiltzaile muga gainditu delako. Egiaztatu zure jakinarazpenak gehiago jakiteko.", @@ -250,7 +257,7 @@ "Your data directory must be an absolute path." : "Zure datuen karpeta bide-izen absolutua izan behar da.", "Check the value of \"datadirectory\" in your configuration." : "Egiaztatu \"datadirectory\"-ren balioa zure konfigurazioan.", "Your data directory is invalid." : "Zure datuen karpeta baliogabea da.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Ziurtatu datu direktorioaren erroan \".ocdata\" izeneko fitxategia dagoela.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Ziurtatu datu-direktorioaren erroan \"%1$s\" izeneko fitxategi bat dagoela. \"%2$s\" edukia izan behar du.", "Action \"%s\" not supported or implemented." : "\"%s\" ekintza ez da onartzen edo ez dago inplementaturik.", "Authentication failed, wrong token or provider ID given" : "Autentifikazioak huts egin du, token edo hornitzaile ID okerra eman da", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Eskaera osatzeko parametroak falta dira. Falta diren parametroak: \"%s\"", @@ -268,7 +275,7 @@ "The audio to transcribe" : "Transkribatzeko audioa", "Transcription" : "Transkripzioa", "The transcribed text" : "Transkribatutako testua", - "ContextWrite" : "ContextWrite", + "Context write" : "Testuingurua idaztea", "Writes text in a given style based on the provided source material." : "Testua estilo jakin batean idazten du, emandako iturri-materialean oinarrituta.", "Writing style" : "Idazteko estiloa", "Demonstrate a writing style that you would like to immitate" : "Erakutsi imitatu nahiko zenukeen idazteko estiloa", @@ -290,16 +297,39 @@ "Output images" : "Irteera irudiak", "The generated images" : "Sortutako irudiak", "Free text to text prompt" : "Testu librea mezuaren testura", - "Runs an arbitrary prompt through a language model that retuns a reply" : "Erantzun bat bueltatzen duen hizkuntza ereduaren zehar esaldi arbitrario bat exekutatzen du.", + "Runs an arbitrary prompt through a language model that returns a reply" : "Abisu arbitrario bat exekutatzen du erantzuna itzultzen duen hizkuntza-eredu baten bidez", "Describe a task that you want the assistant to do or ask a question" : "Deskribatu laguntzaileak egitea nahi duzun zeregina edo galdera bat egin", "Generated reply" : "Sortutako erantzuna", "The generated text from the assistant" : "Laguntzaileak sortutako testua", "Chat" : "Chat", + "Chat with the assistant" : "Hitz egin txat bidez laguntzailarekin", + "System prompt" : "Sistemaren gonbita", + "Define rules and assumptions that the assistant should follow during the conversation." : "Definitu elkarrizketan zehar txat laguntzaileak jarraitu beharko lituzkeen arau eta suposizioak.", + "Chat message" : "Txat mezua", + "Chat history" : "Txat historia", + "The history of chat messages before the current message, starting with a message by the user" : "Uneko mezuaren aurreko txat mezuen historia, erabiltzailearen mezu batetik hasita", + "Response message" : "Erantzun mezua", + "The generated response as part of the conversation" : "Sorturiko erantzuna, elkarrizketaren zati gisa", + "Formalize text" : "Formaldu testua", + "Takes a text and makes it sound more formal" : "Testu bat hartzen du eta doinu formalagoa ematen dio.", + "Write a text that you want the assistant to formalize" : "Idatz ezazu laguntzaileak formaltzea nahi duzun testu bat", + "Formalized text" : "Formaldutako testua", + "The formalized text" : "Formaldutako testua", "Generate a headline" : "Sortu izenburu bat", "Generates a possible headline for a text." : "Testu baten izenburu posiblea sortzen du.", "Original text" : "Jatorrizko testua", "The original text to generate a headline for" : "Izenburu bat sortzeko jatorrizko testua", "The generated headline" : "Sortutako izenburua", + "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", + "Reformulated text" : "Birformulatutako testua", + "The reformulated text, written by the assistant" : "Birformulaturiko testua, laguntzaileak idatzia", + "Simplify text" : "Sinpletu testua", + "Takes a text and simplifies it" : "Testu bat hartu eta sinpletu egiten du", + "Write a text that you want the assistant to simplify" : "Idatz ezazu laguntzaileak sinpletzea nahi duzun testu bat", + "Simplified text" : "Sinpletutako testua", + "The simplified text" : "Sinpletutako testua", "Summarize" : "Laburtu", "Summarizes a text" : "Laburtu testu bat", "The original text to summarize" : "Laburtu beharreko jatorrizko testua", @@ -310,15 +340,28 @@ "The original text to extract topics from" : "Gaiak ateratzeko jatorrizko testua", "Topics" : "Gaiak", "The list of extracted topics" : "Ateratako gaien zerrenda", + "Translate" : "Itzuli", + "Translate text from one language to another" : "Itzuli testua hizkuntza batetik bestera", + "Origin text" : "Jatorrizko testua", + "The text to translate" : "Itzuli beharreko testua", + "Origin language" : "Jatorrizko hizkuntza", + "The language of the origin text" : "Jatorrizko testuaren hizkuntza", + "Target language" : "Helburuko hizkuntza", + "The desired language to translate the origin text in" : "Jatorrizko testua itzultzeko nahi den hizkuntza", + "Result" : "Emaitza", + "The translated text" : "Itzulitako testua", "Free prompt" : "Gonbita librea", "Runs an arbitrary prompt through the language model." : "Hizkuntza ereduaren zehar esaldi arbitrario bat exekutatzen du.", "Generate headline" : "Sortu izenburua", "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.", - "404" : "404", + "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", @@ -337,9 +380,8 @@ "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 behar da", - "Please upgrade your database version." : "Mesedez eguneratu zure datu-basearen bertsioa.", "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." + "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 542c6586c45..86953fef295 100644 --- a/lib/l10n/fa.js +++ b/lib/l10n/fa.js @@ -19,7 +19,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s،%2$sو%3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s،%2$s،%3$sو%4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s،%2$s،%3$s،%4$sو%5$s", - "Education Edition" : "نگارش آموزشی", "Enterprise bundle" : "بستهٔ سازمانی", "Groupware bundle" : "بستهٔ کار گروهی", "Hub bundle" : "بستهٔ هستهای", @@ -76,26 +75,25 @@ 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 وجود ندارد. لطفاً آن را در تنظیمات برنامه خود فعال کنید یا با سرپرست خود تماس بگیرید", + "Dot files are not allowed" : "پروندههای نقطهدار مجاز نیستند", "File already exists" : "پرونده از پیش موجود است", "Invalid path" : "مسیر نامعتبر", "Failed to create file from template" : "شکست در ایجاد پرونده از قالب", "Templates" : "قالبها", - "File name is a reserved word" : "این نام فایل جزو کلمات رزرو میباشد", - "File name contains at least one invalid character" : "نام فایل دارای حداقل یک کاراکتر نامعتبر است", - "File name is too long" : "نام فایل خیلی بزرگ است", - "Dot files are not allowed" : "پروندههای نقطهدار مجاز نیستند", + "Filename contains at least one invalid character" : "نام فایل حداقل دارای یک کاراکتر نامعتبر است", "Empty filename is not allowed" : "نام فایل نمیتواند خالی باشد", "App \"%s\" cannot be installed because appinfo file cannot be read." : "کارهٔ «%s» به دلیل ناتوانی در خواندن پروندهٔ appinfo نمیتواند نصب شود.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "کارهٔ «%s» به دلیل سازگار نبودن با این نگارش از کارساز نمیتواند نصب شود.", "__language_name__" : "فارسى", "This is an automatically sent email, please do not reply." : "این یک رایانامهٔ خودکار است. لطفاً پاسخ ندهید.", + "Help & privacy" : "راهنما و حریم شخصی", "Appearance and accessibility" : "ظاهر و دسترسیپذیری", "Apps" : " برنامه ها", "Personal settings" : "تنظیمات شخصی", "Administration settings" : "تنظمیات مدیریتی", "Settings" : "تنظیمات", "Log out" : "خروج", - "Accounts" : "Accounts", + "Accounts" : "حسابها", "Email" : "رایانامه", "Mail %s" : "نامه به %s", "Fediverse" : "Fediverse", @@ -127,11 +125,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "به اشتراک گذاشتن باطن باید رابط OCP \\ Share_Backend %sرا پیاده سازی کند", "Sharing backend %s not found" : "به اشتراک گذاشتن باطن%s یافت نشد", "Sharing backend for %s not found" : "به اشتراک گذاشتن باطن برای%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." : "برای باز کردن آن روی دکمه زیر کلیک کنید.", + "Open »%s«" : "باز کن »%s«", + "%1$s via %2$s" : "%1$s از طریق %2$s", "%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«", - "%1$s via %2$s" : "%1$s از طریق %2$s", + "Unknown share type" : "نوع اشتراک ناشناخته", "You are not allowed to share %s" : "شما مجاز به اشتراک گذاری نیستید%s", "Cannot increase permissions of %s" : "Cannot increase permissions of %s", "Files cannot be shared with delete permissions" : "Files cannot be shared with delete permissions", @@ -139,9 +141,6 @@ OC.L10N.register( "Expiration date is in the past" : "تاریخ انقضا در گذشته است", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Cannot set expiration date more than %n day in the future","Cannot set expiration date more than %n days in the future"], "Sharing is only allowed with group members" : "Sharing is only allowed with group members", - "%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 requested share does not exist anymore" : "سهم درخواست شده دیگر وجود ندارد", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "The user was not created because the user limit has been reached. Check your notifications to learn more.", "Could not find category \"%s\"" : "دسته بندی %s یافت نشد", @@ -226,7 +225,6 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Your data directory must be an absolute path.", "Check the value of \"datadirectory\" in your configuration." : "Check the value of \"datadirectory\" in your configuration.", "Your data directory is invalid." : "Your data directory is invalid.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "اطمینان حاصل کنید که فایلی به نام \".ocdata\" در ریشه دایرکتوری داده وجود دارد.", "Action \"%s\" not supported or implemented." : "عملی%s پشتیبانی یا اجرا نشده است.", "Authentication failed, wrong token or provider ID given" : "تأیید اعتبار انجام نشد ، نشانه اشتباه یا شناسه ارائه دهنده داده شد", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "پارامترهای موجود برای تکمیل درخواست. پارامترهای موجود نیست%s", @@ -244,16 +242,22 @@ OC.L10N.register( "Summarize" : "Summarize", "Summary" : "چکیده", "Extract topics" : "Extract topics", + "Translate" : "ترجمه", + "Target language" : "Target language", + "Result" : "شروع به اسکنیک", "Free prompt" : "Free prompt", "Runs an arbitrary prompt through the language model." : "Runs an arbitrary prompt through the language model.", "Generate headline" : "Generate headline", "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.", - "404" : "۴۰۴", + "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" : "ورود به سیستم کاربر باید مدیر سایت باشد", - "Help" : "راهنما", + "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", @@ -271,9 +275,8 @@ OC.L10N.register( "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" : "کاربر از کار افتاده", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 required.", - "Please upgrade your database version." : "Please upgrade your database version.", "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 تغییر دهید تا فهرست توسط سایر کاربران فهرست نشود." + "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 dbe6e2d586c..45ddbf698fd 100644 --- a/lib/l10n/fa.json +++ b/lib/l10n/fa.json @@ -17,7 +17,6 @@ "%1$s, %2$s and %3$s" : "%1$s،%2$sو%3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s،%2$s،%3$sو%4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s،%2$s،%3$s،%4$sو%5$s", - "Education Edition" : "نگارش آموزشی", "Enterprise bundle" : "بستهٔ سازمانی", "Groupware bundle" : "بستهٔ کار گروهی", "Hub bundle" : "بستهٔ هستهای", @@ -74,26 +73,25 @@ "seconds ago" : "ثانیهها پیش", "Empty file" : "پروندهٔ خالی", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "ماژول با شناسه:%s وجود ندارد. لطفاً آن را در تنظیمات برنامه خود فعال کنید یا با سرپرست خود تماس بگیرید", + "Dot files are not allowed" : "پروندههای نقطهدار مجاز نیستند", "File already exists" : "پرونده از پیش موجود است", "Invalid path" : "مسیر نامعتبر", "Failed to create file from template" : "شکست در ایجاد پرونده از قالب", "Templates" : "قالبها", - "File name is a reserved word" : "این نام فایل جزو کلمات رزرو میباشد", - "File name contains at least one invalid character" : "نام فایل دارای حداقل یک کاراکتر نامعتبر است", - "File name is too long" : "نام فایل خیلی بزرگ است", - "Dot files are not allowed" : "پروندههای نقطهدار مجاز نیستند", + "Filename contains at least one invalid character" : "نام فایل حداقل دارای یک کاراکتر نامعتبر است", "Empty filename is not allowed" : "نام فایل نمیتواند خالی باشد", "App \"%s\" cannot be installed because appinfo file cannot be read." : "کارهٔ «%s» به دلیل ناتوانی در خواندن پروندهٔ appinfo نمیتواند نصب شود.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "کارهٔ «%s» به دلیل سازگار نبودن با این نگارش از کارساز نمیتواند نصب شود.", "__language_name__" : "فارسى", "This is an automatically sent email, please do not reply." : "این یک رایانامهٔ خودکار است. لطفاً پاسخ ندهید.", + "Help & privacy" : "راهنما و حریم شخصی", "Appearance and accessibility" : "ظاهر و دسترسیپذیری", "Apps" : " برنامه ها", "Personal settings" : "تنظیمات شخصی", "Administration settings" : "تنظمیات مدیریتی", "Settings" : "تنظیمات", "Log out" : "خروج", - "Accounts" : "Accounts", + "Accounts" : "حسابها", "Email" : "رایانامه", "Mail %s" : "نامه به %s", "Fediverse" : "Fediverse", @@ -125,11 +123,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "به اشتراک گذاشتن باطن باید رابط OCP \\ Share_Backend %sرا پیاده سازی کند", "Sharing backend %s not found" : "به اشتراک گذاشتن باطن%s یافت نشد", "Sharing backend for %s not found" : "به اشتراک گذاشتن باطن برای%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." : "برای باز کردن آن روی دکمه زیر کلیک کنید.", + "Open »%s«" : "باز کن »%s«", + "%1$s via %2$s" : "%1$s از طریق %2$s", "%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«", - "%1$s via %2$s" : "%1$s از طریق %2$s", + "Unknown share type" : "نوع اشتراک ناشناخته", "You are not allowed to share %s" : "شما مجاز به اشتراک گذاری نیستید%s", "Cannot increase permissions of %s" : "Cannot increase permissions of %s", "Files cannot be shared with delete permissions" : "Files cannot be shared with delete permissions", @@ -137,9 +139,6 @@ "Expiration date is in the past" : "تاریخ انقضا در گذشته است", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Cannot set expiration date more than %n day in the future","Cannot set expiration date more than %n days in the future"], "Sharing is only allowed with group members" : "Sharing is only allowed with group members", - "%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 requested share does not exist anymore" : "سهم درخواست شده دیگر وجود ندارد", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "The user was not created because the user limit has been reached. Check your notifications to learn more.", "Could not find category \"%s\"" : "دسته بندی %s یافت نشد", @@ -224,7 +223,6 @@ "Your data directory must be an absolute path." : "Your data directory must be an absolute path.", "Check the value of \"datadirectory\" in your configuration." : "Check the value of \"datadirectory\" in your configuration.", "Your data directory is invalid." : "Your data directory is invalid.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "اطمینان حاصل کنید که فایلی به نام \".ocdata\" در ریشه دایرکتوری داده وجود دارد.", "Action \"%s\" not supported or implemented." : "عملی%s پشتیبانی یا اجرا نشده است.", "Authentication failed, wrong token or provider ID given" : "تأیید اعتبار انجام نشد ، نشانه اشتباه یا شناسه ارائه دهنده داده شد", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "پارامترهای موجود برای تکمیل درخواست. پارامترهای موجود نیست%s", @@ -242,16 +240,22 @@ "Summarize" : "Summarize", "Summary" : "چکیده", "Extract topics" : "Extract topics", + "Translate" : "ترجمه", + "Target language" : "Target language", + "Result" : "شروع به اسکنیک", "Free prompt" : "Free prompt", "Runs an arbitrary prompt through the language model." : "Runs an arbitrary prompt through the language model.", "Generate headline" : "Generate headline", "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.", - "404" : "۴۰۴", + "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" : "ورود به سیستم کاربر باید مدیر سایت باشد", - "Help" : "راهنما", + "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", @@ -269,9 +273,8 @@ "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" : "کاربر از کار افتاده", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 required.", - "Please upgrade your database version." : "Please upgrade your database version.", "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 تغییر دهید تا فهرست توسط سایر کاربران فهرست نشود." + "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 b785e91b3cf..50d0b860bb4 100644 --- a/lib/l10n/fi.js +++ b/lib/l10n/fi.js @@ -65,14 +65,12 @@ OC.L10N.register( "in a few seconds" : "muutaman sekunnin päästä", "seconds ago" : "sekunteja sitten", "Empty file" : "Tyhjä tiedosto", + "Dot files are not allowed" : "Pistetiedostot eivät ole sallittuja", "File already exists" : "Tiedosto on jo olemassa", "Invalid path" : "Virheellinen polku", "Failed to create file from template" : "Tiedoston luominen mallipohjasta epäonnistui", "Templates" : "Mallipohjat", - "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ä", - "Dot files are not allowed" : "Pistetiedostot eivät ole sallittuja", + "Filename contains at least one invalid character" : "Tiedoston nimi sisältää ainakin yhden virheellisen merkin", "Empty filename is not allowed" : "Tiedostonimi ei voi olla tyhjä", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Sovellusta \"%s\" ei voi asentaa, koska appinfo-tiedostoa ei voi loi lukea.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Sovellusta \"%s\" ei voi asentaa, koska se ei ole yhteensopiva tämän palvelinversion kanssa.", @@ -112,11 +110,15 @@ OC.L10N.register( "Set an admin password." : "Aseta ylläpitäjän salasana.", "Sharing backend %s not found" : "Jakamisen taustaosaa %s ei löytynyt", "Sharing backend for %s not found" : "Jakamisen taustaosaa kohteelle %s ei löytynyt", + "%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.", + "Open »%s«" : "Avaa »%s«", + "%1$s via %2$s" : "%1$s palvelun %2$s kautta", "%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«", - "%1$s via %2$s" : "%1$s palvelun %2$s kautta", + "Unknown share type" : "Tuntematon jaon tyyppi", "You are not allowed to share %s" : "Oikeutesi eivät riitä kohteen %s jakamiseen.", "Cannot increase permissions of %s" : "Kohteen %s käyttöoikeuksien lisääminen ei onnistu", "Files cannot be shared with delete permissions" : "Tiedostoja ei voi jakaa poistamisoikeuksilla", @@ -124,9 +126,6 @@ OC.L10N.register( "Expiration date is in the past" : "Vanhenemispäivä on menneisyydessä", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Vanhenemispäivän voi asettaa korkeintaan %n päivään tulevaisuuteen","Vanhenemispäivän voi asettaa korkeintaan %n päivään tulevaisuuteen"], "Sharing is only allowed with group members" : "Jakaminen on sallittu vain ryhmäjäsenten kesken", - "%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 requested share does not exist anymore" : "Pyydettyä jakoa ei ole enää olemassa", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Käyttäjää ei luotu, koska käyttäjäraja on tullut täyteen. Tarkista ilmoitukset saadaksesi lisätietoja.", "Could not find category \"%s\"" : "Luokkaa \"%s\" ei löytynyt", @@ -203,7 +202,6 @@ OC.L10N.register( "Please ask your server administrator to restart the web server." : "Pyydä palvelimen ylläpitäjää käynnistämään web-palvelin uudelleen.", "Please ask your server administrator to check the Nextcloud configuration." : "Pyydä palvelimen ylläpitäjää tarkastamaan Nextcloudin määritykset.", "Your data directory must be an absolute path." : "Datahakemiston tulee olla absoluuttinen polku.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Varmista että datahakemiston juuressa on tiedosto nimeltä \".ocdata\".", "Action \"%s\" not supported or implemented." : "Toiminto \"%s\" ei ole tuettu tai sitä ei ole toteutettu.", "Could not obtain lock type %d on \"%s\"." : "Lukitustapaa %d ei saatu kohteelle \"%s\".", "Storage unauthorized. %s" : "Tallennustila ei ole valtuutettu. %s", @@ -224,8 +222,13 @@ OC.L10N.register( "The original text to summarize" : "Alkuperäinen teksti, josta yhteenveto muodostetaan", "Summary" : "Yhteenveto", "The generated summary" : "Luotu yhteenveto", - "404" : "404", + "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ä", @@ -242,8 +245,7 @@ OC.L10N.register( "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ä", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 vaaditaan.", - "Please upgrade your database version." : "Päivitä tietokannan versio.", - "Your data directory is readable by other users." : "Datahakemistosi on muiden käyttäjien luettavissa." + "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 7786c7b3be2..2c3586d1678 100644 --- a/lib/l10n/fi.json +++ b/lib/l10n/fi.json @@ -63,14 +63,12 @@ "in a few seconds" : "muutaman sekunnin päästä", "seconds ago" : "sekunteja sitten", "Empty file" : "Tyhjä tiedosto", + "Dot files are not allowed" : "Pistetiedostot eivät ole sallittuja", "File already exists" : "Tiedosto on jo olemassa", "Invalid path" : "Virheellinen polku", "Failed to create file from template" : "Tiedoston luominen mallipohjasta epäonnistui", "Templates" : "Mallipohjat", - "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ä", - "Dot files are not allowed" : "Pistetiedostot eivät ole sallittuja", + "Filename contains at least one invalid character" : "Tiedoston nimi sisältää ainakin yhden virheellisen merkin", "Empty filename is not allowed" : "Tiedostonimi ei voi olla tyhjä", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Sovellusta \"%s\" ei voi asentaa, koska appinfo-tiedostoa ei voi loi lukea.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Sovellusta \"%s\" ei voi asentaa, koska se ei ole yhteensopiva tämän palvelinversion kanssa.", @@ -110,11 +108,15 @@ "Set an admin password." : "Aseta ylläpitäjän salasana.", "Sharing backend %s not found" : "Jakamisen taustaosaa %s ei löytynyt", "Sharing backend for %s not found" : "Jakamisen taustaosaa kohteelle %s ei löytynyt", + "%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.", + "Open »%s«" : "Avaa »%s«", + "%1$s via %2$s" : "%1$s palvelun %2$s kautta", "%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«", - "%1$s via %2$s" : "%1$s palvelun %2$s kautta", + "Unknown share type" : "Tuntematon jaon tyyppi", "You are not allowed to share %s" : "Oikeutesi eivät riitä kohteen %s jakamiseen.", "Cannot increase permissions of %s" : "Kohteen %s käyttöoikeuksien lisääminen ei onnistu", "Files cannot be shared with delete permissions" : "Tiedostoja ei voi jakaa poistamisoikeuksilla", @@ -122,9 +124,6 @@ "Expiration date is in the past" : "Vanhenemispäivä on menneisyydessä", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Vanhenemispäivän voi asettaa korkeintaan %n päivään tulevaisuuteen","Vanhenemispäivän voi asettaa korkeintaan %n päivään tulevaisuuteen"], "Sharing is only allowed with group members" : "Jakaminen on sallittu vain ryhmäjäsenten kesken", - "%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 requested share does not exist anymore" : "Pyydettyä jakoa ei ole enää olemassa", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Käyttäjää ei luotu, koska käyttäjäraja on tullut täyteen. Tarkista ilmoitukset saadaksesi lisätietoja.", "Could not find category \"%s\"" : "Luokkaa \"%s\" ei löytynyt", @@ -201,7 +200,6 @@ "Please ask your server administrator to restart the web server." : "Pyydä palvelimen ylläpitäjää käynnistämään web-palvelin uudelleen.", "Please ask your server administrator to check the Nextcloud configuration." : "Pyydä palvelimen ylläpitäjää tarkastamaan Nextcloudin määritykset.", "Your data directory must be an absolute path." : "Datahakemiston tulee olla absoluuttinen polku.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Varmista että datahakemiston juuressa on tiedosto nimeltä \".ocdata\".", "Action \"%s\" not supported or implemented." : "Toiminto \"%s\" ei ole tuettu tai sitä ei ole toteutettu.", "Could not obtain lock type %d on \"%s\"." : "Lukitustapaa %d ei saatu kohteelle \"%s\".", "Storage unauthorized. %s" : "Tallennustila ei ole valtuutettu. %s", @@ -222,8 +220,13 @@ "The original text to summarize" : "Alkuperäinen teksti, josta yhteenveto muodostetaan", "Summary" : "Yhteenveto", "The generated summary" : "Luotu yhteenveto", - "404" : "404", + "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ä", @@ -240,8 +243,7 @@ "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ä", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 vaaditaan.", - "Please upgrade your database version." : "Päivitä tietokannan versio.", - "Your data directory is readable by other users." : "Datahakemistosi on muiden käyttäjien luettavissa." + "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 b68be80d289..a01dcd43ed9 100644 --- a/lib/l10n/fr.js +++ b/lib/l10n/fr.js @@ -19,7 +19,7 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s et %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s et %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s et %5$s", - "Education Edition" : "Édition pour l'éducation ", + "Education bundle" : "Pack pour éducation", "Enterprise bundle" : "Pack pour entreprise", "Groupware bundle" : "Pack Groupware", "Hub bundle" : "Pack Nextcloud Hub", @@ -38,6 +38,7 @@ OC.L10N.register( "Server version %s or higher is required." : "Un serveur de version %s ou supérieure est requis.", "Server version %s or lower is required." : "Un serveur de version %s ou inférieure est requis.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Le compte connecté doit être un administrateur, un sous-administrateur ou se voir accorder des droits spéciaux pour accéder à ce réglage", + "Your current IP address doesn’t allow you to perform admin actions" : "Votre adresse IP actuelle ne vous permet pas d'effectuer des actions d'administration", "Logged in account must be an admin or sub admin" : "Le compte connecté doit être administrateur ou sous-administrateur", "Logged in account must be an admin" : "Le compte connecté doit être un administrateur", "Wiping of device %s has started" : "L'effaçage de l'appareil %s a démarré", @@ -80,14 +81,21 @@ OC.L10N.register( "seconds ago" : "il y a quelques secondes", "Empty file" : "Fichier vide", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Le module avec l'ID: %s n'existe pas. Merci de l'activer dans les paramètres d'applications ou de contacter votre administrateur.", + "Dot files are not allowed" : "Le nom de fichier ne peut pas commencer par un point", + "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" est un nom de fichier ou de dossier interdit.", + "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" est un préfixe interdit pour les noms de fichiers ou de dossiers.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" n'est pas autorisé dans un nom de fichier ou de dossier.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" est un type de fichier interdit.", + "Filenames must not end with \"%1$s\"." : "Les noms de fichiers ne doivent pas se terminer par \"%1$s\".", + "Invalid parent path" : "Chemin parent invalide", "File already exists" : "Le fichier existe déjà", "Invalid path" : "Chemin incorrect", "Failed to create file from template" : "Impossible de créer le fichier à partir du modèle", "Templates" : "Modèles", - "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", - "Dot files are not allowed" : "Le nom de fichier ne peut pas commencer par un point", + "Path contains invalid segments" : "Le chemin contient des segments invalides", + "Filename is a reserved word" : "Le nom de fichier est un mot réservé", + "Filename contains at least one invalid character" : "Le nom du fichier contient au moins un caractère invalide", + "Filename is too long" : "Le nom de fichier est trop long", "Empty filename is not allowed" : "Le nom de fichier n'est pas autorisé", "App \"%s\" cannot be installed because appinfo file cannot be read." : "L'application « %s » ne peut pas être installée car le fichier appinfo ne peut pas être lu.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "L'application « %s » ne peut être installée car elle n'est pas compatible avec cette version du serveur.", @@ -102,7 +110,7 @@ OC.L10N.register( "Log out" : "Se déconnecter", "Accounts" : "Comptes", "Email" : "E-mail", - "Mail %s" : "Courrier %s", + "Mail %s" : "E-mail %s", "Fediverse" : "Fediverse", "View %s on the fediverse" : "Voir %s sur le Fediverse", "Phone" : "Téléphone", @@ -139,11 +147,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Le service de partage %s doit implémenter l'interface OCP\\Share_Backend", "Sharing backend %s not found" : "Service de partage %s non trouvé", "Sharing backend for %s not found" : "Le service de partage pour %s est introuvable", + "%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", + "Open »%s«" : "Ouvrir « %s »", + "%1$s via %2$s" : "%1$s via %2$s", "%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 »", - "%1$s via %2$s" : "%1$s via %2$s", + "Unknown share type" : "Type de partage inconnu", "You are not allowed to share %s" : "Vous n’êtes pas autorisé à partager %s", "Cannot increase permissions of %s" : "Impossible d'augmenter les permissions de %s", "Files cannot be shared with delete permissions" : "Les fichiers ne peuvent pas être partagés avec les autorisations de suppression", @@ -152,13 +164,12 @@ 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_" : ["Impossible de définir la date d'expiration à dans plus de %n jour","Impossible de définir la date d'expiration à dans plus de %n jours","Impossible de définir la date d'expiration à dans plus de %n jours"], "Sharing is only allowed with group members" : "Le partage n'est que possible qu'avec les membres du groupe", "Sharing %s failed, because this item is already shared with the account %s" : "Impossible de partager %s car il est déjà partagé avec le compte %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 requested share does not exist anymore" : "Le partage demandé n'existe plus", "The requested share comes from a disabled user" : "Le partage demandé provient d'un utilisateur désactivé", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "L'utilisateur n'a pas été créé car la limite du nombre d'utilisateurs a été atteinte. Consultez vos notifications pour en savoir plus.", "Could not find category \"%s\"" : "Impossible de trouver la catégorie « %s »", + "Input text" : "Texte d'entrée", + "The input text" : "Le texte d'entrée", "Sunday" : "Dimanche", "Monday" : "Lundi", "Tuesday" : "Mardi", @@ -250,7 +261,7 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Le chemin de votre répertoire doit être un chemin absolu.", "Check the value of \"datadirectory\" in your configuration." : "Verifiez la valeur de \"datadirectory\" dans votre configuration.", "Your data directory is invalid." : "Votre répertoire des données n'est pas valide.", - "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.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Assurez-vous qu'il existe un fichier appelé \"%1$s\" à la racine du répertoire de données. Il doit avoir le contenu suivant : \"%2$s\"", "Action \"%s\" not supported or implemented." : "Action \"%s\" non supportée ou implémentée.", "Authentication failed, wrong token or provider ID given" : "Échec de l'authentification, jeton erroné ou identification du fournisseur donnée", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Paramètres manquants pour compléter la requête. Paramètres manquants : \"%s\"", @@ -262,26 +273,99 @@ OC.L10N.register( "Storage connection error. %s" : "Erreur de connexion à l’espace stockage. %s", "Storage is temporarily not available" : "Le support de stockage est temporairement indisponible", "Storage connection timeout. %s" : "Le délai d'attente pour la connexion à l'espace de stockage a été dépassé. %s", + "Transcribe audio" : "Transcrire l'audio", + "Transcribe the things said in an audio" : "Transcrire les propos exprimés dans un fichier audio", "Audio input" : "Entrée audio", + "The audio to transcribe" : "Audio à retranscrire", + "Transcription" : "Transcription", + "The transcribed text" : "Le texte transcrit", + "Context write" : "Écrire contextuellement", "Writes text in a given style based on the provided source material." : "Écrit un texte dans un style donné, basé sur des données initiales préalablement fournies.", "Writing style" : "Style rédactionnel", + "Demonstrate a writing style that you would like to immitate" : "Montrez un style d'écriture que vous aimeriez imiter", "Source material" : "Données initiales", + "The content that would like to be rewritten in the new writing style" : "Contenu qui doit être réécrit dans le nouveau style de rédaction", + "Generated text" : "Texte généré", + "The generated text with content from the source material in the given style" : "Le texte généré reprend le contenu du document source dans le style donné", + "Emoji generator" : "Générateur d'emoji", + "Takes text and generates a representative emoji for it." : "Prend un texte et génère un émoji représentatif.", + "The text to generate an emoji for" : "Texte pour lequel générer un émoji", + "Generated emoji" : "Émoji généré", + "The generated emoji based on the input text" : "Émoji généré en fonction du texte saisi", "Generate image" : "Générer l'image", + "Generate an image from a text prompt" : "Générer une image à partir d'un texte", "Prompt" : "Invite de commande", + "Describe the image you want to generate" : "Décrivez l'image que vous souhaitez générer", + "Number of images" : "Nombre d'images", + "How many images to generate" : "Nombre d'images à générer", + "Output images" : "Images de sortie", + "The generated images" : "Les images générées", + "Free text to text prompt" : "Texte libre à texte libre", + "Runs an arbitrary prompt through a language model that returns a reply" : "Exécute une commande arbitraire à l'aide d'un modèle linguistique qui génère une réponse", + "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", "Chat" : "Discussion instantanée ", + "Chat with the assistant" : "Discuter avec l'assistant", + "System prompt" : "Invite du système", + "Define rules and assumptions that the assistant should follow during the conversation." : "Définir les règles et les hypothèses que l'assistant doit suivre pendant la conversation.", + "Chat message" : "Message de discussion", + "Chat history" : "Historique de la discussion", + "The history of chat messages before the current message, starting with a message by the user" : "Historique des messages de discussion avant le message actuel, commençant par un message de l'utilisateur", + "Response message" : "Message de réponse", + "The generated response as part of the conversation" : "Réponse générée comme partie de la conversation", + "Formalize text" : "Formaliser un texte", + "Takes a text and makes it sound more formal" : "Prend un texte et le rend plus formel", + "Write a text that you want the assistant to formalize" : "Rédigez un texte que vous souhaitez que l'assistant formalise", + "Formalized text" : "Texte formalisé", + "The formalized text" : "Texte formalisé", + "Generate a headline" : "Générer un titre", "Generates a possible headline for a text." : "Génère un titre possible pour un texte.", + "Original text" : "Texte original", + "The original text to generate a headline for" : "Texte original pour lequel générer un titre", + "The generated headline" : "Titre généré", + "Reformulate text" : "Reformuler un texte", + "Takes a text and reformulates it" : "Prend un texte et le reformule", + "Write a text that you want the assistant to reformulate" : "Rédigez un texte que vous souhaitez que l'assistant reformule", + "Reformulated text" : "Texte reformulé", + "The reformulated text, written by the assistant" : "Texte reformulé, rédigé par l'assistant", + "Simplify text" : "Simplifier le texte", + "Takes a text and simplifies it" : "Prend un texte et le simplifie", + "Write a text that you want the assistant to simplify" : "Rédigez un texte que vous souhaitez que l'assistant simplifie", + "Simplified text" : "Texte simplifié", + "The simplified text" : "Le texte simplifié", "Summarize" : "Résumer", + "Summarizes a text" : "Résumer un texte", + "The original text to summarize" : "Le texte original à résumer", "Summary" : "Résumé", + "The generated summary" : "Le résumé généré", "Extract topics" : "Extraire des thèmes", + "Extracts topics from a text and outputs them separated by commas" : "Extrait les sujets d'un texte et les affiche en les séparant par des virgules.", + "The original text to extract topics from" : "Texte original à partir duquel les thèmes sont extraits", + "Topics" : "Sujets", + "The list of extracted topics" : "La liste des sujets extraits", + "Translate" : "Traduire", + "Translate text from one language to another" : "Traduire un texte d'une langue à une autre", + "Origin text" : "Texte d'origine", + "The text to translate" : "Texte à traduire", + "Origin language" : "Langue d'origine", + "The language of the origin text" : "Langue du texte d'origine", + "Target language" : "Langue cible", + "The desired language to translate the origin text in" : "Langue souhaitée pour la traduction du texte d'origine", + "Result" : "Résultat", + "The translated text" : "Le texte traduit", "Free prompt" : "Prompt", "Runs an arbitrary prompt through the language model." : "Exécute une commande arbitraire via le modèle de langage.", "Generate headline" : "Générer un titre", "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.", - "404" : "404", + "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", @@ -300,9 +384,8 @@ OC.L10N.register( "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é", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 requis.", - "Please upgrade your database version." : "Veuillez mettre à jour votre gestionnaire de base de données.", "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." + "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 e95c602e29d..b81e3f901eb 100644 --- a/lib/l10n/fr.json +++ b/lib/l10n/fr.json @@ -17,7 +17,7 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s et %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s et %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s et %5$s", - "Education Edition" : "Édition pour l'éducation ", + "Education bundle" : "Pack pour éducation", "Enterprise bundle" : "Pack pour entreprise", "Groupware bundle" : "Pack Groupware", "Hub bundle" : "Pack Nextcloud Hub", @@ -36,6 +36,7 @@ "Server version %s or higher is required." : "Un serveur de version %s ou supérieure est requis.", "Server version %s or lower is required." : "Un serveur de version %s ou inférieure est requis.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Le compte connecté doit être un administrateur, un sous-administrateur ou se voir accorder des droits spéciaux pour accéder à ce réglage", + "Your current IP address doesn’t allow you to perform admin actions" : "Votre adresse IP actuelle ne vous permet pas d'effectuer des actions d'administration", "Logged in account must be an admin or sub admin" : "Le compte connecté doit être administrateur ou sous-administrateur", "Logged in account must be an admin" : "Le compte connecté doit être un administrateur", "Wiping of device %s has started" : "L'effaçage de l'appareil %s a démarré", @@ -78,14 +79,21 @@ "seconds ago" : "il y a quelques secondes", "Empty file" : "Fichier vide", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Le module avec l'ID: %s n'existe pas. Merci de l'activer dans les paramètres d'applications ou de contacter votre administrateur.", + "Dot files are not allowed" : "Le nom de fichier ne peut pas commencer par un point", + "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" est un nom de fichier ou de dossier interdit.", + "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" est un préfixe interdit pour les noms de fichiers ou de dossiers.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" n'est pas autorisé dans un nom de fichier ou de dossier.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" est un type de fichier interdit.", + "Filenames must not end with \"%1$s\"." : "Les noms de fichiers ne doivent pas se terminer par \"%1$s\".", + "Invalid parent path" : "Chemin parent invalide", "File already exists" : "Le fichier existe déjà", "Invalid path" : "Chemin incorrect", "Failed to create file from template" : "Impossible de créer le fichier à partir du modèle", "Templates" : "Modèles", - "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", - "Dot files are not allowed" : "Le nom de fichier ne peut pas commencer par un point", + "Path contains invalid segments" : "Le chemin contient des segments invalides", + "Filename is a reserved word" : "Le nom de fichier est un mot réservé", + "Filename contains at least one invalid character" : "Le nom du fichier contient au moins un caractère invalide", + "Filename is too long" : "Le nom de fichier est trop long", "Empty filename is not allowed" : "Le nom de fichier n'est pas autorisé", "App \"%s\" cannot be installed because appinfo file cannot be read." : "L'application « %s » ne peut pas être installée car le fichier appinfo ne peut pas être lu.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "L'application « %s » ne peut être installée car elle n'est pas compatible avec cette version du serveur.", @@ -100,7 +108,7 @@ "Log out" : "Se déconnecter", "Accounts" : "Comptes", "Email" : "E-mail", - "Mail %s" : "Courrier %s", + "Mail %s" : "E-mail %s", "Fediverse" : "Fediverse", "View %s on the fediverse" : "Voir %s sur le Fediverse", "Phone" : "Téléphone", @@ -137,11 +145,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Le service de partage %s doit implémenter l'interface OCP\\Share_Backend", "Sharing backend %s not found" : "Service de partage %s non trouvé", "Sharing backend for %s not found" : "Le service de partage pour %s est introuvable", + "%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", + "Open »%s«" : "Ouvrir « %s »", + "%1$s via %2$s" : "%1$s via %2$s", "%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 »", - "%1$s via %2$s" : "%1$s via %2$s", + "Unknown share type" : "Type de partage inconnu", "You are not allowed to share %s" : "Vous n’êtes pas autorisé à partager %s", "Cannot increase permissions of %s" : "Impossible d'augmenter les permissions de %s", "Files cannot be shared with delete permissions" : "Les fichiers ne peuvent pas être partagés avec les autorisations de suppression", @@ -150,13 +162,12 @@ "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Impossible de définir la date d'expiration à dans plus de %n jour","Impossible de définir la date d'expiration à dans plus de %n jours","Impossible de définir la date d'expiration à dans plus de %n jours"], "Sharing is only allowed with group members" : "Le partage n'est que possible qu'avec les membres du groupe", "Sharing %s failed, because this item is already shared with the account %s" : "Impossible de partager %s car il est déjà partagé avec le compte %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 requested share does not exist anymore" : "Le partage demandé n'existe plus", "The requested share comes from a disabled user" : "Le partage demandé provient d'un utilisateur désactivé", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "L'utilisateur n'a pas été créé car la limite du nombre d'utilisateurs a été atteinte. Consultez vos notifications pour en savoir plus.", "Could not find category \"%s\"" : "Impossible de trouver la catégorie « %s »", + "Input text" : "Texte d'entrée", + "The input text" : "Le texte d'entrée", "Sunday" : "Dimanche", "Monday" : "Lundi", "Tuesday" : "Mardi", @@ -248,7 +259,7 @@ "Your data directory must be an absolute path." : "Le chemin de votre répertoire doit être un chemin absolu.", "Check the value of \"datadirectory\" in your configuration." : "Verifiez la valeur de \"datadirectory\" dans votre configuration.", "Your data directory is invalid." : "Votre répertoire des données n'est pas valide.", - "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.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Assurez-vous qu'il existe un fichier appelé \"%1$s\" à la racine du répertoire de données. Il doit avoir le contenu suivant : \"%2$s\"", "Action \"%s\" not supported or implemented." : "Action \"%s\" non supportée ou implémentée.", "Authentication failed, wrong token or provider ID given" : "Échec de l'authentification, jeton erroné ou identification du fournisseur donnée", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Paramètres manquants pour compléter la requête. Paramètres manquants : \"%s\"", @@ -260,26 +271,99 @@ "Storage connection error. %s" : "Erreur de connexion à l’espace stockage. %s", "Storage is temporarily not available" : "Le support de stockage est temporairement indisponible", "Storage connection timeout. %s" : "Le délai d'attente pour la connexion à l'espace de stockage a été dépassé. %s", + "Transcribe audio" : "Transcrire l'audio", + "Transcribe the things said in an audio" : "Transcrire les propos exprimés dans un fichier audio", "Audio input" : "Entrée audio", + "The audio to transcribe" : "Audio à retranscrire", + "Transcription" : "Transcription", + "The transcribed text" : "Le texte transcrit", + "Context write" : "Écrire contextuellement", "Writes text in a given style based on the provided source material." : "Écrit un texte dans un style donné, basé sur des données initiales préalablement fournies.", "Writing style" : "Style rédactionnel", + "Demonstrate a writing style that you would like to immitate" : "Montrez un style d'écriture que vous aimeriez imiter", "Source material" : "Données initiales", + "The content that would like to be rewritten in the new writing style" : "Contenu qui doit être réécrit dans le nouveau style de rédaction", + "Generated text" : "Texte généré", + "The generated text with content from the source material in the given style" : "Le texte généré reprend le contenu du document source dans le style donné", + "Emoji generator" : "Générateur d'emoji", + "Takes text and generates a representative emoji for it." : "Prend un texte et génère un émoji représentatif.", + "The text to generate an emoji for" : "Texte pour lequel générer un émoji", + "Generated emoji" : "Émoji généré", + "The generated emoji based on the input text" : "Émoji généré en fonction du texte saisi", "Generate image" : "Générer l'image", + "Generate an image from a text prompt" : "Générer une image à partir d'un texte", "Prompt" : "Invite de commande", + "Describe the image you want to generate" : "Décrivez l'image que vous souhaitez générer", + "Number of images" : "Nombre d'images", + "How many images to generate" : "Nombre d'images à générer", + "Output images" : "Images de sortie", + "The generated images" : "Les images générées", + "Free text to text prompt" : "Texte libre à texte libre", + "Runs an arbitrary prompt through a language model that returns a reply" : "Exécute une commande arbitraire à l'aide d'un modèle linguistique qui génère une réponse", + "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", "Chat" : "Discussion instantanée ", + "Chat with the assistant" : "Discuter avec l'assistant", + "System prompt" : "Invite du système", + "Define rules and assumptions that the assistant should follow during the conversation." : "Définir les règles et les hypothèses que l'assistant doit suivre pendant la conversation.", + "Chat message" : "Message de discussion", + "Chat history" : "Historique de la discussion", + "The history of chat messages before the current message, starting with a message by the user" : "Historique des messages de discussion avant le message actuel, commençant par un message de l'utilisateur", + "Response message" : "Message de réponse", + "The generated response as part of the conversation" : "Réponse générée comme partie de la conversation", + "Formalize text" : "Formaliser un texte", + "Takes a text and makes it sound more formal" : "Prend un texte et le rend plus formel", + "Write a text that you want the assistant to formalize" : "Rédigez un texte que vous souhaitez que l'assistant formalise", + "Formalized text" : "Texte formalisé", + "The formalized text" : "Texte formalisé", + "Generate a headline" : "Générer un titre", "Generates a possible headline for a text." : "Génère un titre possible pour un texte.", + "Original text" : "Texte original", + "The original text to generate a headline for" : "Texte original pour lequel générer un titre", + "The generated headline" : "Titre généré", + "Reformulate text" : "Reformuler un texte", + "Takes a text and reformulates it" : "Prend un texte et le reformule", + "Write a text that you want the assistant to reformulate" : "Rédigez un texte que vous souhaitez que l'assistant reformule", + "Reformulated text" : "Texte reformulé", + "The reformulated text, written by the assistant" : "Texte reformulé, rédigé par l'assistant", + "Simplify text" : "Simplifier le texte", + "Takes a text and simplifies it" : "Prend un texte et le simplifie", + "Write a text that you want the assistant to simplify" : "Rédigez un texte que vous souhaitez que l'assistant simplifie", + "Simplified text" : "Texte simplifié", + "The simplified text" : "Le texte simplifié", "Summarize" : "Résumer", + "Summarizes a text" : "Résumer un texte", + "The original text to summarize" : "Le texte original à résumer", "Summary" : "Résumé", + "The generated summary" : "Le résumé généré", "Extract topics" : "Extraire des thèmes", + "Extracts topics from a text and outputs them separated by commas" : "Extrait les sujets d'un texte et les affiche en les séparant par des virgules.", + "The original text to extract topics from" : "Texte original à partir duquel les thèmes sont extraits", + "Topics" : "Sujets", + "The list of extracted topics" : "La liste des sujets extraits", + "Translate" : "Traduire", + "Translate text from one language to another" : "Traduire un texte d'une langue à une autre", + "Origin text" : "Texte d'origine", + "The text to translate" : "Texte à traduire", + "Origin language" : "Langue d'origine", + "The language of the origin text" : "Langue du texte d'origine", + "Target language" : "Langue cible", + "The desired language to translate the origin text in" : "Langue souhaitée pour la traduction du texte d'origine", + "Result" : "Résultat", + "The translated text" : "Le texte traduit", "Free prompt" : "Prompt", "Runs an arbitrary prompt through the language model." : "Exécute une commande arbitraire via le modèle de langage.", "Generate headline" : "Générer un titre", "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.", - "404" : "404", + "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", @@ -298,9 +382,8 @@ "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é", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 requis.", - "Please upgrade your database version." : "Veuillez mettre à jour votre gestionnaire de base de données.", "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." + "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 db1627b0c93..223823d0030 100644 --- a/lib/l10n/ga.js +++ b/lib/l10n/ga.js @@ -19,7 +19,7 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s agus %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s agus %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s agus %5$s", - "Education Edition" : "Eagrán Oideachais", + "Education bundle" : "Beart oideachais", "Enterprise bundle" : "Pacáiste fiontraíochta", "Groupware bundle" : "Pacáiste earraí grúpa", "Hub bundle" : "Mol bundle", @@ -38,6 +38,7 @@ OC.L10N.register( "Server version %s or higher is required." : "Tá leagan freastalaí %s nó níos airde ag teastáil.", "Server version %s or lower is required." : "Tá leagan freastalaí %s nó níos ísle ag teastáil.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Ní mór gur riarthóir, fo-riarthóir é cuntas logáilte isteach nó go bhfuil ceart speisialta faighte aige chun an socrú seo a rochtain", + "Your current IP address doesn’t allow you to perform admin actions" : "Ní cheadaíonn do sheoladh IP reatha duit gníomhartha riaracháin a dhéanamh", "Logged in account must be an admin or sub admin" : "Ní mór gur riarthóir nó fo-riarthóir é cuntas logáilte isteach", "Logged in account must be an admin" : "Ní mór gur riarthóir é cuntas logáilte isteach", "Wiping of device %s has started" : "Tá tús curtha le glanadh an ghléis %s", @@ -80,14 +81,21 @@ 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.", + "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.", + "\"%1$s\" is not allowed inside a file or folder name." : "Ní cheadaítear \"%1$s\" taobh istigh d'ainm comhaid nó fillteáin.", + "\"%1$s\" is a forbidden file type." : "Is cineál comhaid toirmiscthe é \"%1$s\".", + "Filenames must not end with \"%1$s\"." : "Ní cheadaítear \"%1$s\" a bheith mar chríoch ar chomhainmneacha.", + "Invalid parent path" : "Conair tuismitheora neamhbhailí", "File already exists" : "Tá an comhad ann cheana féin", "Invalid path" : "Conair neamhbhailí", "Failed to create file from template" : "Theip ar chruthú comhad ón teimpléad", "Templates" : "Teimpléid", - "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", - "Dot files are not allowed" : "Ní cheadaítear comhaid ponc", + "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", + "Filename is too long" : "Tá an t-ainm comhaid ró-fhada", "Empty filename is not allowed" : "Ní cheadaítear ainm comhaid folamh", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Ní féidir aip \"%s\" a shuiteáil toisc nach féidir an comhad appinfo a léamh.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Ní féidir aip \"%s\" a shuiteáil toisc nach bhfuil sé comhoiriúnach leis an leagan seo den fhreastalaí.", @@ -139,22 +147,56 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Má tá inneall %s á roinnt ní mór an comhéadan OCP\\Share_Backend a chur i bhfeidhm", "Sharing backend %s not found" : "Ní bhfuarthas inneall comhroinnte %s", "Sharing backend for %s not found" : "Ní bhfuarthas inneall roinnte le haghaidh %s", + "%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.", + "Open »%s«" : "Oscail »%s«", + "%1$s via %2$s" : "%1$s trí %2$s", "%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«", - "%1$s via %2$s" : "%1$s trí %2$s", + "Passwords are enforced for link and mail shares" : "Cuirtear pasfhocail i bhfeidhm le haghaidh naisc agus scaireanna ríomhphoist", + "SharedWith is not a valid user" : "Ní úsáideoir bailí é SharedWith", + "SharedWith is not a valid group" : "Ní grúpa bailí é SharedW", + "SharedWith should be empty" : "Ba chóir go mbeadh SharedWith folamh", + "SharedWith should not be empty" : "Níor cheart go mbeadh SharedWith folamh", + "SharedWith is not a valid circle" : "Ní ciorcal bailí é SharedW", + "Unknown share type" : "Cineál scaire anaithnid", + "SharedBy should be set" : "Ba cheart SharedBy a shocrú", + "Cannot share with yourself" : "Ní féidir a roinnt leat féin", + "Path should be set" : "Ba chóir cosán a shocrú", + "Path should be either a file or a folder" : "Ba chóir go mbeadh an cosán ina chomhad nó ina fhillteán", + "You cannot share your root folder" : "Ní féidir leat do fhréamhfhillteán a roinnt", "You are not allowed to share %s" : "Níl cead agat %s a roinnt", + "A share requires permissions" : "Teastaíonn ceadanna le scair", "Cannot increase permissions of %s" : "Ní féidir ceadanna %s a mhéadú", + "Shares need at least read permissions" : "Teastaíonn ceadanna léite ar a laghad ó scaireanna", "Files cannot be shared with delete permissions" : "Ní féidir comhaid a roinnt le ceadanna scriosta", "Files cannot be shared with create permissions" : "Ní féidir comhaid a roinnt le ceadanna cruthaithe", "Expiration date is in the past" : "Tá an dáta éaga san am atá caite", + "Expiration date is enforced" : "Cuirtear an dáta éaga i bhfeidhm", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Cannot set expiration date more than %n day in the future","Ní féidir dáta éaga níos mó ná %n lá a shocrú amach anseo","Ní féidir dáta éaga níos mó ná %n lá a shocrú amach anseo","Ní féidir dáta éaga níos mó ná %n lá a shocrú amach anseo","Ní féidir dáta éaga níos mó ná %n lá a shocrú amach anseo"], "Sharing is only allowed with group members" : "Ní cheadaítear comhroinnt ach le baill an ghrúpa", "Sharing %s failed, because this item is already shared with the account %s" : "Theip ar chomhroinnt %s, toisc go bhfuil an mhír seo roinnte cheana féin leis an gcuntas %s", - "%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.", + "Group sharing is now allowed" : "Ceadaítear comhroinnt grúpa anois", + "Sharing is only allowed within your own groups" : "Ní cheadaítear comhroinnt ach amháin laistigh de do ghrúpaí féin", + "Path is already shared with this group" : "Tá an chonair roinnte leis an ngrúpa seo cheana féin", + "Link sharing is not allowed" : "Ní cheadaítear nasc a roinnt", + "Public upload is not allowed" : "Ní cheadaítear uaslódáil phoiblí", + "Path contains files shared with you" : "Tá comhaid a roinntear leat sa chonair", + "Sharing is disabled" : "Tá roinnt díchumasaithe", + "Sharing is disabled for you" : "Tá comhroinnt díchumasaithe duit", + "Cannot share with the share owner" : "Ní féidir a roinnt leis an úinéir na scaireanna", + "Share does not have a full ID" : "Níl aitheantas iomlán ag scair", + "Cannot change share type" : "Ní féidir cineál na scaire a athrú", + "Can only update recipient on user shares" : "Ní féidir ach faighteoir a nuashonrú ar scaireanna úsáideora", + "Cannot enable sending the password by Talk with an empty password" : "Ní féidir an pasfhocal a sheoladh trí Talk a chumasú le pasfhocal folamh", + "Cannot enable sending the password by Talk without setting a new password" : "Ní féidir an pasfhocal a sheoladh le Talk a chumasú gan pasfhocal nua a shocrú", + "Cannot disable sending the password by Talk without setting a new password" : "Ní féidir seoladh an fhocail faire le Talk a dhíchumasú gan focal faire nua a shocrú", + "Share provider does not support accepting" : "Ní thacaíonn soláthraí scaireanna le glacadh", + "Cannot change target of link share" : "Ní féidir an sprioc maidir le comhroinnt naisc a athrú", + "Invalid recipient" : "Faighteoir neamhbhailí", + "Group \"%s\" does not exist" : "Níl grúpa \"%s\" ann", "The requested share does not exist anymore" : "Níl an sciar iarrtha ann a thuilleadh", "The requested share comes from a disabled user" : "Tagann an sciar iarrtha ó úsáideoir díchumasaithe", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Níor cruthaíodh an t-úsáideoir toisc go bhfuil an teorainn úsáideora bainte amach. Seiceáil d'fhógraí chun tuilleadh a fhoghlaim.", @@ -252,7 +294,7 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Ní mór gur cosán iomlán é d'eolaire sonraí.", "Check the value of \"datadirectory\" in your configuration." : "Seiceáil an luach \"datadirectory\" i do chumraíocht.", "Your data directory is invalid." : "Tá d'eolaire sonraí neamhbhailí.", - "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í.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Cinntigh go bhfuil comhad dar teideal \"%1$s\" i bhfréamh an eolaire sonraí. Ba cheart go mbeadh an t-ábhar ann: \"%2$s\"", "Action \"%s\" not supported or implemented." : "Ní thacaítear le gníomh \"%s\" nó ní chuirtear i bhfeidhm é.", "Authentication failed, wrong token or provider ID given" : "Theip ar fhíordheimhniú, comhartha mícheart nó aitheantas soláthraí tugtha", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Paraiméadair in easnamh chun an t-iarratas a chomhlánú. Paraiméadair ar Iarraidh: \"%s\"", @@ -270,7 +312,7 @@ OC.L10N.register( "The audio to transcribe" : "Fuaime le tras-scríobh", "Transcription" : "Trascríobh", "The transcribed text" : "An téacs tras-scríofa", - "ContextWrite" : "ContextWrite", + "Context write" : "Comhthéacs scríobh", "Writes text in a given style based on the provided source material." : "Scríobhann sé téacs i stíl ar leith bunaithe ar an mbunábhar a cuireadh ar fáil.", "Writing style" : "Stíl scríbhneoireachta", "Demonstrate a writing style that you would like to immitate" : "Taispeáin stíl scríbhneoireachta ar mhaith leat aithris a dhéanamh uirthi", @@ -292,7 +334,7 @@ OC.L10N.register( "Output images" : "Íomhánna aschuir", "The generated images" : "Na híomhánna a ghintear", "Free text to text prompt" : "Teimpléad téacs go téacs saor in aisce,", - "Runs an arbitrary prompt through a language model that retuns a reply" : "Ritheann leid treallach trí mhúnla teanga a sheolann freagra ar ais", + "Runs an arbitrary prompt through a language model that returns a reply" : "Ritheann leid treallach trí mhúnla teanga a sheolann freagra ar ais", "Describe a task that you want the assistant to do or ask a question" : "Déan cur síos ar thasc a theastaíonn uait don chúntóir a dhéanamh nó ceist a chur", "Generated reply" : "Gineadh freagra", "The generated text from the assistant" : "An téacs a ghintear ón gcúntóir", @@ -335,15 +377,28 @@ OC.L10N.register( "The original text to extract topics from" : "An buntéacs chun topaicí a bhaint astu", "Topics" : "Ábhair", "The list of extracted topics" : "An liosta de na hábhair a bhaintear", + "Translate" : "Aistrigh", + "Translate text from one language to another" : "Aistrigh téacs ó theanga amháin go teanga eile", + "Origin text" : "Téacs tionscnaimh", + "The text to translate" : "An téacs a aistriú", + "Origin language" : "Teanga tionscnaimh", + "The language of the origin text" : "Teanga an bhuntéacs", + "Target language" : "Sprioctheanga", + "The desired language to translate the origin text in" : "An teanga atá ag teastáil chun an buntéacs a aistriú in", + "Result" : "Toradh", + "The translated text" : "An téacs aistrithe", "Free prompt" : "Saor in aisce leideanna", "Runs an arbitrary prompt through the language model." : "Ritheann leid treallach tríd an múnla teanga.", "Generate headline" : "Gin ceannlíne", "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.", - "404" : "404", + "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", @@ -362,9 +417,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 ag teastáil.", - "Please upgrade your database version." : "Uasghrádaigh leagan do bhunachar sonraí le do thoil.", "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ú." + "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 a25b1143d45..80cf1916fce 100644 --- a/lib/l10n/ga.json +++ b/lib/l10n/ga.json @@ -17,7 +17,7 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s agus %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s agus %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s agus %5$s", - "Education Edition" : "Eagrán Oideachais", + "Education bundle" : "Beart oideachais", "Enterprise bundle" : "Pacáiste fiontraíochta", "Groupware bundle" : "Pacáiste earraí grúpa", "Hub bundle" : "Mol bundle", @@ -36,6 +36,7 @@ "Server version %s or higher is required." : "Tá leagan freastalaí %s nó níos airde ag teastáil.", "Server version %s or lower is required." : "Tá leagan freastalaí %s nó níos ísle ag teastáil.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Ní mór gur riarthóir, fo-riarthóir é cuntas logáilte isteach nó go bhfuil ceart speisialta faighte aige chun an socrú seo a rochtain", + "Your current IP address doesn’t allow you to perform admin actions" : "Ní cheadaíonn do sheoladh IP reatha duit gníomhartha riaracháin a dhéanamh", "Logged in account must be an admin or sub admin" : "Ní mór gur riarthóir nó fo-riarthóir é cuntas logáilte isteach", "Logged in account must be an admin" : "Ní mór gur riarthóir é cuntas logáilte isteach", "Wiping of device %s has started" : "Tá tús curtha le glanadh an ghléis %s", @@ -78,14 +79,21 @@ "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.", + "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.", + "\"%1$s\" is not allowed inside a file or folder name." : "Ní cheadaítear \"%1$s\" taobh istigh d'ainm comhaid nó fillteáin.", + "\"%1$s\" is a forbidden file type." : "Is cineál comhaid toirmiscthe é \"%1$s\".", + "Filenames must not end with \"%1$s\"." : "Ní cheadaítear \"%1$s\" a bheith mar chríoch ar chomhainmneacha.", + "Invalid parent path" : "Conair tuismitheora neamhbhailí", "File already exists" : "Tá an comhad ann cheana féin", "Invalid path" : "Conair neamhbhailí", "Failed to create file from template" : "Theip ar chruthú comhad ón teimpléad", "Templates" : "Teimpléid", - "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", - "Dot files are not allowed" : "Ní cheadaítear comhaid ponc", + "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", + "Filename is too long" : "Tá an t-ainm comhaid ró-fhada", "Empty filename is not allowed" : "Ní cheadaítear ainm comhaid folamh", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Ní féidir aip \"%s\" a shuiteáil toisc nach féidir an comhad appinfo a léamh.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Ní féidir aip \"%s\" a shuiteáil toisc nach bhfuil sé comhoiriúnach leis an leagan seo den fhreastalaí.", @@ -137,22 +145,56 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Má tá inneall %s á roinnt ní mór an comhéadan OCP\\Share_Backend a chur i bhfeidhm", "Sharing backend %s not found" : "Ní bhfuarthas inneall comhroinnte %s", "Sharing backend for %s not found" : "Ní bhfuarthas inneall roinnte le haghaidh %s", + "%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.", + "Open »%s«" : "Oscail »%s«", + "%1$s via %2$s" : "%1$s trí %2$s", "%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«", - "%1$s via %2$s" : "%1$s trí %2$s", + "Passwords are enforced for link and mail shares" : "Cuirtear pasfhocail i bhfeidhm le haghaidh naisc agus scaireanna ríomhphoist", + "SharedWith is not a valid user" : "Ní úsáideoir bailí é SharedWith", + "SharedWith is not a valid group" : "Ní grúpa bailí é SharedW", + "SharedWith should be empty" : "Ba chóir go mbeadh SharedWith folamh", + "SharedWith should not be empty" : "Níor cheart go mbeadh SharedWith folamh", + "SharedWith is not a valid circle" : "Ní ciorcal bailí é SharedW", + "Unknown share type" : "Cineál scaire anaithnid", + "SharedBy should be set" : "Ba cheart SharedBy a shocrú", + "Cannot share with yourself" : "Ní féidir a roinnt leat féin", + "Path should be set" : "Ba chóir cosán a shocrú", + "Path should be either a file or a folder" : "Ba chóir go mbeadh an cosán ina chomhad nó ina fhillteán", + "You cannot share your root folder" : "Ní féidir leat do fhréamhfhillteán a roinnt", "You are not allowed to share %s" : "Níl cead agat %s a roinnt", + "A share requires permissions" : "Teastaíonn ceadanna le scair", "Cannot increase permissions of %s" : "Ní féidir ceadanna %s a mhéadú", + "Shares need at least read permissions" : "Teastaíonn ceadanna léite ar a laghad ó scaireanna", "Files cannot be shared with delete permissions" : "Ní féidir comhaid a roinnt le ceadanna scriosta", "Files cannot be shared with create permissions" : "Ní féidir comhaid a roinnt le ceadanna cruthaithe", "Expiration date is in the past" : "Tá an dáta éaga san am atá caite", + "Expiration date is enforced" : "Cuirtear an dáta éaga i bhfeidhm", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Cannot set expiration date more than %n day in the future","Ní féidir dáta éaga níos mó ná %n lá a shocrú amach anseo","Ní féidir dáta éaga níos mó ná %n lá a shocrú amach anseo","Ní féidir dáta éaga níos mó ná %n lá a shocrú amach anseo","Ní féidir dáta éaga níos mó ná %n lá a shocrú amach anseo"], "Sharing is only allowed with group members" : "Ní cheadaítear comhroinnt ach le baill an ghrúpa", "Sharing %s failed, because this item is already shared with the account %s" : "Theip ar chomhroinnt %s, toisc go bhfuil an mhír seo roinnte cheana féin leis an gcuntas %s", - "%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.", + "Group sharing is now allowed" : "Ceadaítear comhroinnt grúpa anois", + "Sharing is only allowed within your own groups" : "Ní cheadaítear comhroinnt ach amháin laistigh de do ghrúpaí féin", + "Path is already shared with this group" : "Tá an chonair roinnte leis an ngrúpa seo cheana féin", + "Link sharing is not allowed" : "Ní cheadaítear nasc a roinnt", + "Public upload is not allowed" : "Ní cheadaítear uaslódáil phoiblí", + "Path contains files shared with you" : "Tá comhaid a roinntear leat sa chonair", + "Sharing is disabled" : "Tá roinnt díchumasaithe", + "Sharing is disabled for you" : "Tá comhroinnt díchumasaithe duit", + "Cannot share with the share owner" : "Ní féidir a roinnt leis an úinéir na scaireanna", + "Share does not have a full ID" : "Níl aitheantas iomlán ag scair", + "Cannot change share type" : "Ní féidir cineál na scaire a athrú", + "Can only update recipient on user shares" : "Ní féidir ach faighteoir a nuashonrú ar scaireanna úsáideora", + "Cannot enable sending the password by Talk with an empty password" : "Ní féidir an pasfhocal a sheoladh trí Talk a chumasú le pasfhocal folamh", + "Cannot enable sending the password by Talk without setting a new password" : "Ní féidir an pasfhocal a sheoladh le Talk a chumasú gan pasfhocal nua a shocrú", + "Cannot disable sending the password by Talk without setting a new password" : "Ní féidir seoladh an fhocail faire le Talk a dhíchumasú gan focal faire nua a shocrú", + "Share provider does not support accepting" : "Ní thacaíonn soláthraí scaireanna le glacadh", + "Cannot change target of link share" : "Ní féidir an sprioc maidir le comhroinnt naisc a athrú", + "Invalid recipient" : "Faighteoir neamhbhailí", + "Group \"%s\" does not exist" : "Níl grúpa \"%s\" ann", "The requested share does not exist anymore" : "Níl an sciar iarrtha ann a thuilleadh", "The requested share comes from a disabled user" : "Tagann an sciar iarrtha ó úsáideoir díchumasaithe", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Níor cruthaíodh an t-úsáideoir toisc go bhfuil an teorainn úsáideora bainte amach. Seiceáil d'fhógraí chun tuilleadh a fhoghlaim.", @@ -250,7 +292,7 @@ "Your data directory must be an absolute path." : "Ní mór gur cosán iomlán é d'eolaire sonraí.", "Check the value of \"datadirectory\" in your configuration." : "Seiceáil an luach \"datadirectory\" i do chumraíocht.", "Your data directory is invalid." : "Tá d'eolaire sonraí neamhbhailí.", - "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í.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Cinntigh go bhfuil comhad dar teideal \"%1$s\" i bhfréamh an eolaire sonraí. Ba cheart go mbeadh an t-ábhar ann: \"%2$s\"", "Action \"%s\" not supported or implemented." : "Ní thacaítear le gníomh \"%s\" nó ní chuirtear i bhfeidhm é.", "Authentication failed, wrong token or provider ID given" : "Theip ar fhíordheimhniú, comhartha mícheart nó aitheantas soláthraí tugtha", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Paraiméadair in easnamh chun an t-iarratas a chomhlánú. Paraiméadair ar Iarraidh: \"%s\"", @@ -268,7 +310,7 @@ "The audio to transcribe" : "Fuaime le tras-scríobh", "Transcription" : "Trascríobh", "The transcribed text" : "An téacs tras-scríofa", - "ContextWrite" : "ContextWrite", + "Context write" : "Comhthéacs scríobh", "Writes text in a given style based on the provided source material." : "Scríobhann sé téacs i stíl ar leith bunaithe ar an mbunábhar a cuireadh ar fáil.", "Writing style" : "Stíl scríbhneoireachta", "Demonstrate a writing style that you would like to immitate" : "Taispeáin stíl scríbhneoireachta ar mhaith leat aithris a dhéanamh uirthi", @@ -290,7 +332,7 @@ "Output images" : "Íomhánna aschuir", "The generated images" : "Na híomhánna a ghintear", "Free text to text prompt" : "Teimpléad téacs go téacs saor in aisce,", - "Runs an arbitrary prompt through a language model that retuns a reply" : "Ritheann leid treallach trí mhúnla teanga a sheolann freagra ar ais", + "Runs an arbitrary prompt through a language model that returns a reply" : "Ritheann leid treallach trí mhúnla teanga a sheolann freagra ar ais", "Describe a task that you want the assistant to do or ask a question" : "Déan cur síos ar thasc a theastaíonn uait don chúntóir a dhéanamh nó ceist a chur", "Generated reply" : "Gineadh freagra", "The generated text from the assistant" : "An téacs a ghintear ón gcúntóir", @@ -333,15 +375,28 @@ "The original text to extract topics from" : "An buntéacs chun topaicí a bhaint astu", "Topics" : "Ábhair", "The list of extracted topics" : "An liosta de na hábhair a bhaintear", + "Translate" : "Aistrigh", + "Translate text from one language to another" : "Aistrigh téacs ó theanga amháin go teanga eile", + "Origin text" : "Téacs tionscnaimh", + "The text to translate" : "An téacs a aistriú", + "Origin language" : "Teanga tionscnaimh", + "The language of the origin text" : "Teanga an bhuntéacs", + "Target language" : "Sprioctheanga", + "The desired language to translate the origin text in" : "An teanga atá ag teastáil chun an buntéacs a aistriú in", + "Result" : "Toradh", + "The translated text" : "An téacs aistrithe", "Free prompt" : "Saor in aisce leideanna", "Runs an arbitrary prompt through the language model." : "Ritheann leid treallach tríd an múnla teanga.", "Generate headline" : "Gin ceannlíne", "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.", - "404" : "404", + "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", @@ -360,9 +415,8 @@ "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 ag teastáil.", - "Please upgrade your database version." : "Uasghrádaigh leagan do bhunachar sonraí le do thoil.", "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ú." + "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 053aa27bcb0..c27a6bab48e 100644 --- a/lib/l10n/gd.js +++ b/lib/l10n/gd.js @@ -5,6 +5,7 @@ OC.L10N.register( "Invalid image" : "Dealbh mì-dhligheach", "Files" : "Faidhlichean", "seconds ago" : "diog air ais", + "Filename contains at least one invalid character" : "Tha caractar mì-dhligheach no dhà ann an ainm an fhaidhle", "Settings" : "Roghainnean", "Log out" : "Clàraich a-mach", "Accounts" : "Cunntasan", @@ -13,6 +14,7 @@ OC.L10N.register( "Website" : "Làrach-lìn", "Address" : "Seòladh", "About" : "Mu dhèidhinn", + "Translate" : "Eadar-theangaich", "Help" : "Cobhair" }, "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 8e05df98074..74dddce2e08 100644 --- a/lib/l10n/gd.json +++ b/lib/l10n/gd.json @@ -3,6 +3,7 @@ "Invalid image" : "Dealbh mì-dhligheach", "Files" : "Faidhlichean", "seconds ago" : "diog air ais", + "Filename contains at least one invalid character" : "Tha caractar mì-dhligheach no dhà ann an ainm an fhaidhle", "Settings" : "Roghainnean", "Log out" : "Clàraich a-mach", "Accounts" : "Cunntasan", @@ -11,6 +12,7 @@ "Website" : "Làrach-lìn", "Address" : "Seòladh", "About" : "Mu dhèidhinn", + "Translate" : "Eadar-theangaich", "Help" : "Cobhair" },"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 f931d6a77c2..fe718f37cac 100644 --- a/lib/l10n/gl.js +++ b/lib/l10n/gl.js @@ -19,7 +19,7 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s e %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s e %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s e %5$s", - "Education Edition" : "Edición para educación", + "Education bundle" : "Paquete de educación", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de software colaborativo", "Hub bundle" : "Paquete de concentradores", @@ -38,6 +38,7 @@ OC.L10N.register( "Server version %s or higher is required." : "Precísase da versión %s ou superior do servidor.", "Server version %s or lower is required." : "Precísase da versión %s ou inferior do servidor.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "A conta que accede debe ser de administración, de subadministración ou ter dereitos especiais para acceder a este axuste", + "Your current IP address doesn’t allow you to perform admin actions" : "O seu enderezo IP actual non lle permite realizar accións de administración", "Logged in account must be an admin or sub admin" : "A conta que accede debe ser de administración ou de subadministración", "Logged in account must be an admin" : "A conta que accede debe ser de administración", "Wiping of device %s has started" : "Iniciouse a limpeza do dispositivo %s", @@ -55,7 +56,7 @@ OC.L10N.register( "Authentication" : "Autenticación", "Unknown filetype" : "Tipo de ficheiro descoñecido", "Invalid image" : "Imaxe incorrecta", - "Avatar image is not square" : "A imaxe do avatar non é un cadrado", + "Avatar image is not square" : "A imaxe do avatar non é cadrada", "Files" : "Ficheiros", "View profile" : "Ver o perfil", "Local time: %s" : "Hora local: %s", @@ -80,14 +81,21 @@ 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.", + "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.", + "\"%1$s\" is not allowed inside a file or folder name." : "«%1$s» non está permitido nun nome de ficheiro ou cartafol.", + "\"%1$s\" is a forbidden file type." : "«%1$s» é un tipo de ficheiro prohibido.", + "Filenames must not end with \"%1$s\"." : "Os nomes de ficheiros non deben rematar con «%1$s».", + "Invalid parent path" : "A ruta principal non é correcta", "File already exists" : "O ficheiro xa existe", - "Invalid path" : "Ruta incorrecta.", + "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", - "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", - "Dot files are not allowed" : "Non se admiten os ficheiros con punto", + "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", + "Filename is too long" : "O nome de ficheiro é longo de máis", "Empty filename is not allowed" : "Non está permitido deixar baleiro o nome de ficheiro", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Non é posíbel instalar a aplicación «%s» por mor de non poder ler o ficheiro appinfo.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Non é posíbel instalar a aplicación «%s» por mor de non ser compatíbel con esta versión do servidor.", @@ -139,22 +147,56 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "A infraestrutura de compartición %s ten que implementar a interface OCP\\Share_Backend", "Sharing backend %s not found" : "Non se atopou a infraestrutura de compartición %s", "Sharing backend for %s not found" : "Non se atopou a infraestrutura de compartición para %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.", + "Open »%s«" : "Abrir «%s»", + "%1$s via %2$s" : "%1$s mediante %2$s", "%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»", - "%1$s via %2$s" : "%1$s mediante %2$s", + "Passwords are enforced for link and mail shares" : "É obrigatorio o emprego de contrasinais para compartir por ligazón e por correo", + "SharedWith is not a valid user" : "O destinatario da compartición non é un usuario válido", + "SharedWith is not a valid group" : "O destinatario da compartición non é un grupo válido", + "SharedWith should be empty" : "O destinatario da compartición debe estar baleiro", + "SharedWith should not be empty" : "O destinatario da compartición non debe estar baleiro", + "SharedWith is not a valid circle" : "O destinatario da compartición non é un círculo válido", + "Unknown share type" : "Tipo descoñecido de compartición", + "SharedBy should be set" : "Debe estar definido quen inicia a compartición", + "Cannot share with yourself" : "Non é posíbel compartir con un mesmo.", + "Path should be set" : "A ruta compartida debe estar definida", + "Path should be either a file or a folder" : "A ruta compartida debe ser a un ficheiro ou un cartafol", + "You cannot share your root folder" : "Non pode compartir o seu cartafol raíz", "You are not allowed to share %s" : "Non ten permiso para compartir %s", + "A share requires permissions" : "Requírense permisos válidos para compartir", "Cannot increase permissions of %s" : "Non é posíbel incrementar os permisos de %s", + "Shares need at least read permissions" : "As comparticións necesitan polo menos permisos de lectura", "Files cannot be shared with delete permissions" : "Non é posíbel compartir ficheiros con permisos de eliminación", "Files cannot be shared with create permissions" : "Non é posíbel compartir ficheiros con permisos de creación", "Expiration date is in the past" : "Xa pasou a data de caducidade", - "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Non é posíbel estabelecer a data de caducidade máis alo de %n día no futuro","Non é posíbel estabelecer a data de caducidade máis alo de %n días no futuro"], + "Expiration date is enforced" : "A data de caducidade é obrigatoria", + "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Non é posíbel definir a data de caducidade máis alo de %n día no futuro","Non é posíbel definir a data de caducidade máis alo de %n días no futuro"], "Sharing is only allowed with group members" : "Só se permite compartir cos membros do grupo", "Sharing %s failed, because this item is already shared with the account %s" : "Produciuse un fallo ao compartir %s, porque este elemento xa se comparte coa conta %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.", + "Group sharing is now allowed" : "Agora está permitida a compartición en grupo", + "Sharing is only allowed within your own groups" : "Só se permite compartir dentro dos seus propios grupos", + "Path is already shared with this group" : "A ruta xa está compartida con este grupo", + "Link sharing is not allowed" : "Non se permite compartir ligazóns", + "Public upload is not allowed" : "Non se permite o envío público", + "Path contains files shared with you" : "A ruta contén ficheiros compartidos con Vde.", + "Sharing is disabled" : "A compartición está desactivada", + "Sharing is disabled for you" : "A compartición está desactivada para Vde.", + "Cannot share with the share owner" : "Non é posíbel compartir co propietario do compartido", + "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", + "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 recipient" : "Destinatario de compartición incorrecto", + "Group \"%s\" does not exist" : "O grupo «%s» non existe", "The requested share does not exist anymore" : "A compartición solicitada xa non existe", "The requested share comes from a disabled user" : "A compartición solicitada procede dun usuario desactivado", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Non se creou o usuario porque acadouse o límite de usuarios. Consulte as súas notificacións para obter máis información.", @@ -252,7 +294,7 @@ OC.L10N.register( "Your data directory must be an absolute path." : "O seu directorio de datos debe ser unha ruta absoluta.", "Check the value of \"datadirectory\" in your configuration." : "Comprobe o valor de «datadirectory» na súa configuración-", "Your data directory is invalid." : "O seu directorio de datos non é válido.", - "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.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Asegúrese de que existe un ficheiro chamado «%1$s» na raíz do directorio de datos. Debería ter o contido: «%2$s»", "Action \"%s\" not supported or implemented." : "A acción «%s» non está admitida ou implementada.", "Authentication failed, wrong token or provider ID given" : "Produciuse un fallo de autenticación. Deuse un testemuño ou un ID de provedor erróneos.", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Faltan parámetros para completar a solicitude. Parámetros que faltan: «%s»", @@ -270,14 +312,14 @@ OC.L10N.register( "The audio to transcribe" : "O audio para transcribir", "Transcription" : "Transcrición", "The transcribed text" : "O texto transcrito", - "ContextWrite" : "RedacciónPorContexto", - "Writes text in a given style based on the provided source material." : "Escribe texto nun estilo determinado baseándose no material de orixe fornecido.", + "Context write" : "Redacción por contexto", + "Writes text in a given style based on the provided source material." : "Escribe texto nun estilo determinado baseándose no material orixinal fornecido.", "Writing style" : "Estilo de escritura", "Demonstrate a writing style that you would like to immitate" : "Demostre un estilo de escritura que lle gustaría imitar", - "Source material" : "Material de orixe", + "Source material" : "Material orixinal", "The content that would like to be rewritten in the new writing style" : "O contido que quere que sexa reescrito no novo estilo de escritura", "Generated text" : "Texto xerado", - "The generated text with content from the source material in the given style" : "O texto xerado con contido do material de orixe no estilo indicado", + "The generated text with content from the source material in the given style" : "O texto xerado con contido do material orixinal no estilo indicado", "Emoji generator" : "Xerador de «emojis»", "Takes text and generates a representative emoji for it." : "Toma texto e xera un «emoji» representativo para el.", "The text to generate an emoji for" : "O texto para xerar un «emoji»", @@ -292,7 +334,7 @@ OC.L10N.register( "Output images" : "Imaxes de saída", "The generated images" : "As imaxes xeradas", "Free text to text prompt" : "Texto libre para indicación de texto", - "Runs an arbitrary prompt through a language model that retuns a reply" : "Procesa unha indicación arbitraria a través dun modelo de linguaxe que devolve unha resposta", + "Runs an arbitrary prompt through a language model that returns a reply" : "Procesa unha indicación arbitraria a través dun modelo de linguaxe que devolve unha resposta", "Describe a task that you want the assistant to do or ask a question" : "Describa unha tarefa que quere que realice o asistente ou formule unha pregunta", "Generated reply" : "Resposta xerada", "The generated text from the assistant" : "O texto xerado polo asistente", @@ -335,15 +377,28 @@ OC.L10N.register( "The original text to extract topics from" : "O texto orixinal para extraer temas", "Topics" : "Temas", "The list of extracted topics" : "A lista de temas extraídos", + "Translate" : "Traducir", + "Translate text from one language to another" : "Traducir texto dun idioma a outro", + "Origin text" : "Texto orixinal", + "The text to translate" : "O texto a traducir", + "Origin language" : "Idioma do orixinal", + "The language of the origin text" : "O idioma do texto orixinal", + "Target language" : "Idioma de destino", + "The desired language to translate the origin text in" : "O idioma desexado para traducir o texto orixinal", + "Result" : "Resultado", + "The translated text" : "O texto traducido", "Free prompt" : "Indicación libre", "Runs an arbitrary prompt through the language model." : "Procesa unha indicación arbitraria a través do modelo de linguaxe.", "Generate headline" : "Xerar titular", "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.", - "404" : "404", + "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", @@ -362,9 +417,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "Precísase de PostgreSQL >= 9.", - "Please upgrade your database version." : "Anove a versión da súa base de datos", "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." + "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 4236a4fa4b6..4c74a5fb946 100644 --- a/lib/l10n/gl.json +++ b/lib/l10n/gl.json @@ -17,7 +17,7 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s e %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s e %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s e %5$s", - "Education Edition" : "Edición para educación", + "Education bundle" : "Paquete de educación", "Enterprise bundle" : "Paquete empresarial", "Groupware bundle" : "Paquete de software colaborativo", "Hub bundle" : "Paquete de concentradores", @@ -36,6 +36,7 @@ "Server version %s or higher is required." : "Precísase da versión %s ou superior do servidor.", "Server version %s or lower is required." : "Precísase da versión %s ou inferior do servidor.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "A conta que accede debe ser de administración, de subadministración ou ter dereitos especiais para acceder a este axuste", + "Your current IP address doesn’t allow you to perform admin actions" : "O seu enderezo IP actual non lle permite realizar accións de administración", "Logged in account must be an admin or sub admin" : "A conta que accede debe ser de administración ou de subadministración", "Logged in account must be an admin" : "A conta que accede debe ser de administración", "Wiping of device %s has started" : "Iniciouse a limpeza do dispositivo %s", @@ -53,7 +54,7 @@ "Authentication" : "Autenticación", "Unknown filetype" : "Tipo de ficheiro descoñecido", "Invalid image" : "Imaxe incorrecta", - "Avatar image is not square" : "A imaxe do avatar non é un cadrado", + "Avatar image is not square" : "A imaxe do avatar non é cadrada", "Files" : "Ficheiros", "View profile" : "Ver o perfil", "Local time: %s" : "Hora local: %s", @@ -78,14 +79,21 @@ "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.", + "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.", + "\"%1$s\" is not allowed inside a file or folder name." : "«%1$s» non está permitido nun nome de ficheiro ou cartafol.", + "\"%1$s\" is a forbidden file type." : "«%1$s» é un tipo de ficheiro prohibido.", + "Filenames must not end with \"%1$s\"." : "Os nomes de ficheiros non deben rematar con «%1$s».", + "Invalid parent path" : "A ruta principal non é correcta", "File already exists" : "O ficheiro xa existe", - "Invalid path" : "Ruta incorrecta.", + "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", - "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", - "Dot files are not allowed" : "Non se admiten os ficheiros con punto", + "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", + "Filename is too long" : "O nome de ficheiro é longo de máis", "Empty filename is not allowed" : "Non está permitido deixar baleiro o nome de ficheiro", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Non é posíbel instalar a aplicación «%s» por mor de non poder ler o ficheiro appinfo.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Non é posíbel instalar a aplicación «%s» por mor de non ser compatíbel con esta versión do servidor.", @@ -137,22 +145,56 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "A infraestrutura de compartición %s ten que implementar a interface OCP\\Share_Backend", "Sharing backend %s not found" : "Non se atopou a infraestrutura de compartición %s", "Sharing backend for %s not found" : "Non se atopou a infraestrutura de compartición para %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.", + "Open »%s«" : "Abrir «%s»", + "%1$s via %2$s" : "%1$s mediante %2$s", "%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»", - "%1$s via %2$s" : "%1$s mediante %2$s", + "Passwords are enforced for link and mail shares" : "É obrigatorio o emprego de contrasinais para compartir por ligazón e por correo", + "SharedWith is not a valid user" : "O destinatario da compartición non é un usuario válido", + "SharedWith is not a valid group" : "O destinatario da compartición non é un grupo válido", + "SharedWith should be empty" : "O destinatario da compartición debe estar baleiro", + "SharedWith should not be empty" : "O destinatario da compartición non debe estar baleiro", + "SharedWith is not a valid circle" : "O destinatario da compartición non é un círculo válido", + "Unknown share type" : "Tipo descoñecido de compartición", + "SharedBy should be set" : "Debe estar definido quen inicia a compartición", + "Cannot share with yourself" : "Non é posíbel compartir con un mesmo.", + "Path should be set" : "A ruta compartida debe estar definida", + "Path should be either a file or a folder" : "A ruta compartida debe ser a un ficheiro ou un cartafol", + "You cannot share your root folder" : "Non pode compartir o seu cartafol raíz", "You are not allowed to share %s" : "Non ten permiso para compartir %s", + "A share requires permissions" : "Requírense permisos válidos para compartir", "Cannot increase permissions of %s" : "Non é posíbel incrementar os permisos de %s", + "Shares need at least read permissions" : "As comparticións necesitan polo menos permisos de lectura", "Files cannot be shared with delete permissions" : "Non é posíbel compartir ficheiros con permisos de eliminación", "Files cannot be shared with create permissions" : "Non é posíbel compartir ficheiros con permisos de creación", "Expiration date is in the past" : "Xa pasou a data de caducidade", - "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Non é posíbel estabelecer a data de caducidade máis alo de %n día no futuro","Non é posíbel estabelecer a data de caducidade máis alo de %n días no futuro"], + "Expiration date is enforced" : "A data de caducidade é obrigatoria", + "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Non é posíbel definir a data de caducidade máis alo de %n día no futuro","Non é posíbel definir a data de caducidade máis alo de %n días no futuro"], "Sharing is only allowed with group members" : "Só se permite compartir cos membros do grupo", "Sharing %s failed, because this item is already shared with the account %s" : "Produciuse un fallo ao compartir %s, porque este elemento xa se comparte coa conta %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.", + "Group sharing is now allowed" : "Agora está permitida a compartición en grupo", + "Sharing is only allowed within your own groups" : "Só se permite compartir dentro dos seus propios grupos", + "Path is already shared with this group" : "A ruta xa está compartida con este grupo", + "Link sharing is not allowed" : "Non se permite compartir ligazóns", + "Public upload is not allowed" : "Non se permite o envío público", + "Path contains files shared with you" : "A ruta contén ficheiros compartidos con Vde.", + "Sharing is disabled" : "A compartición está desactivada", + "Sharing is disabled for you" : "A compartición está desactivada para Vde.", + "Cannot share with the share owner" : "Non é posíbel compartir co propietario do compartido", + "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", + "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 recipient" : "Destinatario de compartición incorrecto", + "Group \"%s\" does not exist" : "O grupo «%s» non existe", "The requested share does not exist anymore" : "A compartición solicitada xa non existe", "The requested share comes from a disabled user" : "A compartición solicitada procede dun usuario desactivado", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Non se creou o usuario porque acadouse o límite de usuarios. Consulte as súas notificacións para obter máis información.", @@ -250,7 +292,7 @@ "Your data directory must be an absolute path." : "O seu directorio de datos debe ser unha ruta absoluta.", "Check the value of \"datadirectory\" in your configuration." : "Comprobe o valor de «datadirectory» na súa configuración-", "Your data directory is invalid." : "O seu directorio de datos non é válido.", - "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.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Asegúrese de que existe un ficheiro chamado «%1$s» na raíz do directorio de datos. Debería ter o contido: «%2$s»", "Action \"%s\" not supported or implemented." : "A acción «%s» non está admitida ou implementada.", "Authentication failed, wrong token or provider ID given" : "Produciuse un fallo de autenticación. Deuse un testemuño ou un ID de provedor erróneos.", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Faltan parámetros para completar a solicitude. Parámetros que faltan: «%s»", @@ -268,14 +310,14 @@ "The audio to transcribe" : "O audio para transcribir", "Transcription" : "Transcrición", "The transcribed text" : "O texto transcrito", - "ContextWrite" : "RedacciónPorContexto", - "Writes text in a given style based on the provided source material." : "Escribe texto nun estilo determinado baseándose no material de orixe fornecido.", + "Context write" : "Redacción por contexto", + "Writes text in a given style based on the provided source material." : "Escribe texto nun estilo determinado baseándose no material orixinal fornecido.", "Writing style" : "Estilo de escritura", "Demonstrate a writing style that you would like to immitate" : "Demostre un estilo de escritura que lle gustaría imitar", - "Source material" : "Material de orixe", + "Source material" : "Material orixinal", "The content that would like to be rewritten in the new writing style" : "O contido que quere que sexa reescrito no novo estilo de escritura", "Generated text" : "Texto xerado", - "The generated text with content from the source material in the given style" : "O texto xerado con contido do material de orixe no estilo indicado", + "The generated text with content from the source material in the given style" : "O texto xerado con contido do material orixinal no estilo indicado", "Emoji generator" : "Xerador de «emojis»", "Takes text and generates a representative emoji for it." : "Toma texto e xera un «emoji» representativo para el.", "The text to generate an emoji for" : "O texto para xerar un «emoji»", @@ -290,7 +332,7 @@ "Output images" : "Imaxes de saída", "The generated images" : "As imaxes xeradas", "Free text to text prompt" : "Texto libre para indicación de texto", - "Runs an arbitrary prompt through a language model that retuns a reply" : "Procesa unha indicación arbitraria a través dun modelo de linguaxe que devolve unha resposta", + "Runs an arbitrary prompt through a language model that returns a reply" : "Procesa unha indicación arbitraria a través dun modelo de linguaxe que devolve unha resposta", "Describe a task that you want the assistant to do or ask a question" : "Describa unha tarefa que quere que realice o asistente ou formule unha pregunta", "Generated reply" : "Resposta xerada", "The generated text from the assistant" : "O texto xerado polo asistente", @@ -333,15 +375,28 @@ "The original text to extract topics from" : "O texto orixinal para extraer temas", "Topics" : "Temas", "The list of extracted topics" : "A lista de temas extraídos", + "Translate" : "Traducir", + "Translate text from one language to another" : "Traducir texto dun idioma a outro", + "Origin text" : "Texto orixinal", + "The text to translate" : "O texto a traducir", + "Origin language" : "Idioma do orixinal", + "The language of the origin text" : "O idioma do texto orixinal", + "Target language" : "Idioma de destino", + "The desired language to translate the origin text in" : "O idioma desexado para traducir o texto orixinal", + "Result" : "Resultado", + "The translated text" : "O texto traducido", "Free prompt" : "Indicación libre", "Runs an arbitrary prompt through the language model." : "Procesa unha indicación arbitraria a través do modelo de linguaxe.", "Generate headline" : "Xerar titular", "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.", - "404" : "404", + "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", @@ -360,9 +415,8 @@ "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", - "PostgreSQL >= 9 required." : "Precísase de PostgreSQL >= 9.", - "Please upgrade your database version." : "Anove a versión da súa base de datos", "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." + "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 638133a4cb7..7311f997695 100644 --- a/lib/l10n/he.js +++ b/lib/l10n/he.js @@ -6,7 +6,6 @@ OC.L10N.register( "Sample configuration detected" : "התגלתה דוגמת תצורה", "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "התגלה שדוגמת התצורה הועתקה. דבר זה עלול לשבור את ההתקנה ולא נתמך.יש לקרוא את מסמכי התיעוד לפני שמבצעים שינויים ב- config.php", "Other activities" : "פעילויות אחרות", - "Education Edition" : "מהדורה חינוכית", "Enterprise bundle" : "מהדורה מסחרית", "Groupware bundle" : "מהדורה קבוצתית", "Social sharing bundle" : "מאגד שיתוף חברתי", @@ -46,11 +45,9 @@ OC.L10N.register( "in a few seconds" : "בעוד מספר שניות", "seconds ago" : "לפני מספר שניות", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "המודול עם המזהה: %s לא קיים. נא להפעיל אותו בהגדרות היישומונים שלך או ליצור קשר עם מנהל המערכת.", - "File already exists" : "הקובץ כבר קיים", - "File name is a reserved word" : "שם קובץ הוא מילה שמורה", - "File name contains at least one invalid character" : "שם הקובץ כולל לפחות תו אחד לא חוקי", - "File name is too long" : "שם קובץ ארוך מדי", "Dot files are not allowed" : "אסור ששמות קבצים יתחילו בנקודה", + "File already exists" : "הקובץ כבר קיים", + "Filename contains at least one invalid character" : "שם הקובץ מכיל לפחות תו אחד שגוי", "Empty filename is not allowed" : "שם קובץ ריק אינו מאושר", "App \"%s\" cannot be installed because appinfo file cannot be read." : "יישום \"%s\" לא ניתן להתקנה כיוון שקובץ appinfo לא ניתן לקריאה.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "לא ניתן להתקין את היישומון „%s” כיוון שאין לו תמיכה בגרסה זו של השרת.", @@ -78,17 +75,18 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "צד אחורי לשיתוף %s חייב ליישם את ממשק OCP\\Share_Backend", "Sharing backend %s not found" : "צד אחורי לשיתוף %s לא נמצא", "Sharing backend for %s not found" : "צד אחורי לשיתוף של %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." : "יש ללחוץ על הכפתור להלן כדי לפתוח אותו.", + "Open »%s«" : "פתיחת „%s”", + "%1$s via %2$s" : "%1$s דרך %2$s", "%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”", - "%1$s via %2$s" : "%1$s דרך %2$s", + "Unknown share type" : "סוג שיתוף אינו מוכר", "You are not allowed to share %s" : "אינך רשאי/ת לשתף %s", "Cannot increase permissions of %s" : "לא ניתן להוסיף על ההרשאות של %s", "Expiration date is in the past" : "תאריך תפוגה הנו בעבר", - "%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 requested share does not exist anymore" : "השיתוף המבוקש אינו קיים עוד", "Could not find category \"%s\"" : "לא ניתן למצוא את הקטגוריה „%s“", "Sunday" : "יום ראשון", @@ -153,7 +151,6 @@ OC.L10N.register( "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "זה ככל הנראה נגרם על ידי מאיץ/מטמון כמו Zend OPcache או eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "מודולי PHP הותקנו, אך עדיין רשומים כחסרים?", "Please ask your server administrator to restart the web server." : "יש לבקש ממנהל השרת שלך להפעיל מחדש את שרת האינטרנט.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "נא לוודא שיש קובץ בשם „.ocdata” בבסיס תיקיית הנתונים שלך.", "Action \"%s\" not supported or implemented." : "הפעולה „%s” אינה נתמכת או שאינה מוטמעת.", "Authentication failed, wrong token or provider ID given" : "האימות נכשל, האסימון או מזהה הספק שסופקו שגויים", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "חסרים משתנים להשלמת הבקשה. המשתנים החסרים: „%s”", @@ -164,7 +161,13 @@ OC.L10N.register( "Storage is temporarily not available" : "האחסון אינו זמין כרגע", "Storage connection timeout. %s" : "פסק זמן חיבור אחסון. %s", "Summary" : "תקציר", + "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" : "משתמש לא ידוע", @@ -180,6 +183,7 @@ OC.L10N.register( "Username must not consist of dots only" : "שם המשתמש לא יכול להיות מורכב מנקודות בלבד", "Username is invalid because files already exist for this user" : "שם המשתמש שגוי כיוון שכבר קיימים קבצים למשתמש הזה", "User disabled" : "משתמש מנוטרל", - "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "יש לשנות את ההרשאות ל- 0770 כך שהתיקייה לא תרשם על ידי משתמשים אחרים." + "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 835495c69da..26b1615b0d7 100644 --- a/lib/l10n/he.json +++ b/lib/l10n/he.json @@ -4,7 +4,6 @@ "Sample configuration detected" : "התגלתה דוגמת תצורה", "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "התגלה שדוגמת התצורה הועתקה. דבר זה עלול לשבור את ההתקנה ולא נתמך.יש לקרוא את מסמכי התיעוד לפני שמבצעים שינויים ב- config.php", "Other activities" : "פעילויות אחרות", - "Education Edition" : "מהדורה חינוכית", "Enterprise bundle" : "מהדורה מסחרית", "Groupware bundle" : "מהדורה קבוצתית", "Social sharing bundle" : "מאגד שיתוף חברתי", @@ -44,11 +43,9 @@ "in a few seconds" : "בעוד מספר שניות", "seconds ago" : "לפני מספר שניות", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "המודול עם המזהה: %s לא קיים. נא להפעיל אותו בהגדרות היישומונים שלך או ליצור קשר עם מנהל המערכת.", - "File already exists" : "הקובץ כבר קיים", - "File name is a reserved word" : "שם קובץ הוא מילה שמורה", - "File name contains at least one invalid character" : "שם הקובץ כולל לפחות תו אחד לא חוקי", - "File name is too long" : "שם קובץ ארוך מדי", "Dot files are not allowed" : "אסור ששמות קבצים יתחילו בנקודה", + "File already exists" : "הקובץ כבר קיים", + "Filename contains at least one invalid character" : "שם הקובץ מכיל לפחות תו אחד שגוי", "Empty filename is not allowed" : "שם קובץ ריק אינו מאושר", "App \"%s\" cannot be installed because appinfo file cannot be read." : "יישום \"%s\" לא ניתן להתקנה כיוון שקובץ appinfo לא ניתן לקריאה.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "לא ניתן להתקין את היישומון „%s” כיוון שאין לו תמיכה בגרסה זו של השרת.", @@ -76,17 +73,18 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "צד אחורי לשיתוף %s חייב ליישם את ממשק OCP\\Share_Backend", "Sharing backend %s not found" : "צד אחורי לשיתוף %s לא נמצא", "Sharing backend for %s not found" : "צד אחורי לשיתוף של %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." : "יש ללחוץ על הכפתור להלן כדי לפתוח אותו.", + "Open »%s«" : "פתיחת „%s”", + "%1$s via %2$s" : "%1$s דרך %2$s", "%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”", - "%1$s via %2$s" : "%1$s דרך %2$s", + "Unknown share type" : "סוג שיתוף אינו מוכר", "You are not allowed to share %s" : "אינך רשאי/ת לשתף %s", "Cannot increase permissions of %s" : "לא ניתן להוסיף על ההרשאות של %s", "Expiration date is in the past" : "תאריך תפוגה הנו בעבר", - "%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 requested share does not exist anymore" : "השיתוף המבוקש אינו קיים עוד", "Could not find category \"%s\"" : "לא ניתן למצוא את הקטגוריה „%s“", "Sunday" : "יום ראשון", @@ -151,7 +149,6 @@ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "זה ככל הנראה נגרם על ידי מאיץ/מטמון כמו Zend OPcache או eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "מודולי PHP הותקנו, אך עדיין רשומים כחסרים?", "Please ask your server administrator to restart the web server." : "יש לבקש ממנהל השרת שלך להפעיל מחדש את שרת האינטרנט.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "נא לוודא שיש קובץ בשם „.ocdata” בבסיס תיקיית הנתונים שלך.", "Action \"%s\" not supported or implemented." : "הפעולה „%s” אינה נתמכת או שאינה מוטמעת.", "Authentication failed, wrong token or provider ID given" : "האימות נכשל, האסימון או מזהה הספק שסופקו שגויים", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "חסרים משתנים להשלמת הבקשה. המשתנים החסרים: „%s”", @@ -162,7 +159,13 @@ "Storage is temporarily not available" : "האחסון אינו זמין כרגע", "Storage connection timeout. %s" : "פסק זמן חיבור אחסון. %s", "Summary" : "תקציר", + "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" : "משתמש לא ידוע", @@ -178,6 +181,7 @@ "Username must not consist of dots only" : "שם המשתמש לא יכול להיות מורכב מנקודות בלבד", "Username is invalid because files already exist for this user" : "שם המשתמש שגוי כיוון שכבר קיימים קבצים למשתמש הזה", "User disabled" : "משתמש מנוטרל", - "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "יש לשנות את ההרשאות ל- 0770 כך שהתיקייה לא תרשם על ידי משתמשים אחרים." + "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 41eb551ff3a..a07c52ff779 100644 --- a/lib/l10n/hr.js +++ b/lib/l10n/hr.js @@ -16,7 +16,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s i %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s i %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s i %5$s", - "Education Edition" : "Obrazovno izdanje", "Enterprise bundle" : "Enterprise paket", "Groupware bundle" : "Paket grupnog softvera", "Hub bundle" : "Paket alata", @@ -72,14 +71,12 @@ OC.L10N.register( "seconds ago" : "prije nekoliko sekundi", "Empty file" : "Prazna datoteka", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modul s ID-om: %s ne postoji. Omogućite ga u postavkama svojih aplikacija ili se obratite administratoru.", + "Dot files are not allowed" : "Datoteke s točkama nisu dopuštene", "File already exists" : "Datoteka već postoji", "Invalid path" : "Nevažeći put", "Failed to create file from template" : "Stvaranje datoteke iz predloška nije uspjelo", "Templates" : "Predlošci", - "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", - "Dot files are not allowed" : "Datoteke s točkama nisu dopuštene", + "Filename contains at least one invalid character" : "Naziv datoteke sadrži barem jedan nevažeći znak", "Empty filename is not allowed" : "Datoteke bez naziva nisu dopuštene", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Aplikaciju „%s” nije moguće instalirati jer se ne može pročitati datoteka s podacima o aplikaciji.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Aplikaciju „%s” nije moguće instalirati jer nije kompatibilna s ovom inačicom poslužitelja.", @@ -115,11 +112,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Pozadina za dijeljenje %s mora implementirati sučelje OCP\\Share_Backend", "Sharing backend %s not found" : "Pozadina za dijeljenje %s nije pronađena", "Sharing backend for %s not found" : "Pozadina za dijeljenje za %s nije pronađena", + "%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.", + "Open »%s«" : "Otvori »%s«", + "%1$s via %2$s" : "%1$s putem %2$s", "%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«", - "%1$s via %2$s" : "%1$s putem %2$s", + "Unknown share type" : "Nepoznata vrsta dijeljenja", "You are not allowed to share %s" : "Nije vam dopušteno dijeliti %s", "Cannot increase permissions of %s" : "Nije moguće povećati dopuštenja za %s", "Files cannot be shared with delete permissions" : "Datoteke se ne mogu dijeliti s dopuštenjima za brisanje", @@ -127,9 +128,6 @@ OC.L10N.register( "Expiration date is in the past" : "Datum isteka je u prošlosti", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Ne može se postaviti datum isteka više od %n dan u budućnosti","Ne može se postaviti datum isteka više od %n dana u budućnosti","Ne može se postaviti datum isteka više od %n dana u budućnosti"], "Sharing is only allowed with group members" : "Dijeljenje je dopušteno samo članovima grupe", - "%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 requested share does not exist anymore" : "Zatraženo dijeljenje više ne postoji", "Could not find category \"%s\"" : "Kategorija „%s” nije pronađena", "Sunday" : "Nedjelja", @@ -195,7 +193,6 @@ OC.L10N.register( "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemoriranja kao što je Zend OPcache ili eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP moduli su instalirani, ali još uvijek su na popisu onih koji nedostaju?", "Please ask your server administrator to restart the web server." : "Molimo zamolite svog administratora poslužitelja da ponovno pokrene web poslužitelj.", - "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.", "Action \"%s\" not supported or implemented." : "Radnja „%s” nije podržana ili provedena.", "Authentication failed, wrong token or provider ID given" : "Autentifikacija nije uspjela, dan je pogrešan token ili ID davatelja usluge", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Nedostaju parametri za ispunjavanje zahtjeva. Nedostaju parametri: „%s”", @@ -208,9 +205,15 @@ OC.L10N.register( "Storage is temporarily not available" : "Pohrana privremeno nije dostupna", "Storage connection timeout. %s" : "Istek veze pohrane. %s", "Summary" : "Sažetak", + "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", @@ -226,6 +229,7 @@ OC.L10N.register( "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", - "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." + "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 68bd254549a..5c0c7851804 100644 --- a/lib/l10n/hr.json +++ b/lib/l10n/hr.json @@ -14,7 +14,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s i %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s i %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s i %5$s", - "Education Edition" : "Obrazovno izdanje", "Enterprise bundle" : "Enterprise paket", "Groupware bundle" : "Paket grupnog softvera", "Hub bundle" : "Paket alata", @@ -70,14 +69,12 @@ "seconds ago" : "prije nekoliko sekundi", "Empty file" : "Prazna datoteka", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modul s ID-om: %s ne postoji. Omogućite ga u postavkama svojih aplikacija ili se obratite administratoru.", + "Dot files are not allowed" : "Datoteke s točkama nisu dopuštene", "File already exists" : "Datoteka već postoji", "Invalid path" : "Nevažeći put", "Failed to create file from template" : "Stvaranje datoteke iz predloška nije uspjelo", "Templates" : "Predlošci", - "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", - "Dot files are not allowed" : "Datoteke s točkama nisu dopuštene", + "Filename contains at least one invalid character" : "Naziv datoteke sadrži barem jedan nevažeći znak", "Empty filename is not allowed" : "Datoteke bez naziva nisu dopuštene", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Aplikaciju „%s” nije moguće instalirati jer se ne može pročitati datoteka s podacima o aplikaciji.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Aplikaciju „%s” nije moguće instalirati jer nije kompatibilna s ovom inačicom poslužitelja.", @@ -113,11 +110,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Pozadina za dijeljenje %s mora implementirati sučelje OCP\\Share_Backend", "Sharing backend %s not found" : "Pozadina za dijeljenje %s nije pronađena", "Sharing backend for %s not found" : "Pozadina za dijeljenje za %s nije pronađena", + "%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.", + "Open »%s«" : "Otvori »%s«", + "%1$s via %2$s" : "%1$s putem %2$s", "%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«", - "%1$s via %2$s" : "%1$s putem %2$s", + "Unknown share type" : "Nepoznata vrsta dijeljenja", "You are not allowed to share %s" : "Nije vam dopušteno dijeliti %s", "Cannot increase permissions of %s" : "Nije moguće povećati dopuštenja za %s", "Files cannot be shared with delete permissions" : "Datoteke se ne mogu dijeliti s dopuštenjima za brisanje", @@ -125,9 +126,6 @@ "Expiration date is in the past" : "Datum isteka je u prošlosti", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Ne može se postaviti datum isteka više od %n dan u budućnosti","Ne može se postaviti datum isteka više od %n dana u budućnosti","Ne može se postaviti datum isteka više od %n dana u budućnosti"], "Sharing is only allowed with group members" : "Dijeljenje je dopušteno samo članovima grupe", - "%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 requested share does not exist anymore" : "Zatraženo dijeljenje više ne postoji", "Could not find category \"%s\"" : "Kategorija „%s” nije pronađena", "Sunday" : "Nedjelja", @@ -193,7 +191,6 @@ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemoriranja kao što je Zend OPcache ili eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP moduli su instalirani, ali još uvijek su na popisu onih koji nedostaju?", "Please ask your server administrator to restart the web server." : "Molimo zamolite svog administratora poslužitelja da ponovno pokrene web poslužitelj.", - "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.", "Action \"%s\" not supported or implemented." : "Radnja „%s” nije podržana ili provedena.", "Authentication failed, wrong token or provider ID given" : "Autentifikacija nije uspjela, dan je pogrešan token ili ID davatelja usluge", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Nedostaju parametri za ispunjavanje zahtjeva. Nedostaju parametri: „%s”", @@ -206,9 +203,15 @@ "Storage is temporarily not available" : "Pohrana privremeno nije dostupna", "Storage connection timeout. %s" : "Istek veze pohrane. %s", "Summary" : "Sažetak", + "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", @@ -224,6 +227,7 @@ "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", - "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." + "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 2a2c5ad2e46..d7a54a3407f 100644 --- a/lib/l10n/hu.js +++ b/lib/l10n/hu.js @@ -19,7 +19,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s és %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s és %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s és %5$s", - "Education Edition" : "Oktatási kiadás", "Enterprise bundle" : "Vállalati csomag", "Groupware bundle" : "Csoportmunka csomag", "Hub bundle" : "Központi csomag", @@ -76,19 +75,18 @@ OC.L10N.register( "seconds ago" : "pár másodperce", "Empty file" : "Üres fájl", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "A(z) %s azonosítójú modul nem létezik. Engedélyezze az alkalmazásbeállításokban, vagy lépjen kapcsolatba a rendszergazdával.", + "Dot files are not allowed" : "A ponttal kezdődő fájlok nem engedélyezettek", "File already exists" : "A fájl már létezik", "Invalid path" : "Érvénytelen útvonal", "Failed to create file from template" : "Nem sikerült létrehozni a fájlt a sablonból", "Templates" : "Sablonok", - "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ú", - "Dot files are not allowed" : "A ponttal kezdődő fájlok nem engedélyezettek", + "Filename contains at least one invalid character" : "A fájlnév legalább egy érvénytelen karaktert tartalmaz", "Empty filename is not allowed" : "Az üres fájlnév nem engedélyezett", "App \"%s\" cannot be installed because appinfo file cannot be read." : "A(z) „%s” alkalmazást nem lehet telepíteni, mert az appinfo fájl nem olvasható.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "A(z) „%s” alkalmazást nem lehet telepíteni, mert nem kompatibilis ezzel a kiszolgálóverzióval.", "__language_name__" : "Magyar", "This is an automatically sent email, please do not reply." : "Ez egy automatikusan küldött levél, ne válaszoljon rá.", + "Help & privacy" : "Súgó és adatvédelem", "Appearance and accessibility" : "Megjelenés és akadálymentesítés", "Apps" : "Alkalmazások", "Personal settings" : "Személyes beállítások", @@ -127,11 +125,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "A(z) %s megosztási alrendszernek meg kell valósítania az OCP\\Share_Backend interfészt", "Sharing backend %s not found" : "A(z) %s megosztási alrendszer nem található", "Sharing backend for %s not found" : "A(z) %s megosztási alrendszere nem található", + "%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.", + "Open »%s«" : "A(z) „%s” megnyitása", + "%1$s via %2$s" : "%1$s – %2$s", "%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", - "%1$s via %2$s" : "%1$s – %2$s", + "Unknown share type" : "Ismeretlen megosztástípus", "You are not allowed to share %s" : "Nincs jogosultsága a(z) %s megosztásához", "Cannot increase permissions of %s" : "A(z) %s engedélyei nem bővíthetők", "Files cannot be shared with delete permissions" : "A fájlok nem oszthatók meg törlési jogosultsággal", @@ -139,9 +141,6 @@ OC.L10N.register( "Expiration date is in the past" : "A lejárati dátum már elmúlt", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Nem állítható be %n napnál távolabbi lejárati dátum","Nem állítható be %n napnál távolabbi lejárati dátum"], "Sharing is only allowed with group members" : "A megosztás csak a csoport tagjaival engedélyezett", - "%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 requested share does not exist anymore" : "A kért megosztás már nem létezik", "The requested share comes from a disabled user" : "A kért megosztás letiltott felhasználótól származik", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "A felhasználó nem jött létre, mert elérte a felhasználókorlátot. Nézze meg az értesítéseit, hogy többet tudjon meg.", @@ -227,7 +226,6 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Az adatkönyvtárnak abszolút útvonalnak kell lennie", "Check the value of \"datadirectory\" in your configuration." : "Ellenőrizze a „datadirectory” értékét a konfigurációban.", "Your data directory is invalid." : "Az adatkönyvtár érvénytelen.", - "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.", "Action \"%s\" not supported or implemented." : "A(z) „%s” művelet nem támogatott vagy nem ismert.", "Authentication failed, wrong token or provider ID given" : "Hitelesítés sikertelen, hibás token vagy szolgáltatóazonosító lett megadva", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "A következő paraméterek hiányoznak, hogy végrehajtható legyen a kérés. Paraméterek: \"%s\"", @@ -244,15 +242,21 @@ OC.L10N.register( "Summarize" : "Összesítés", "Summary" : "Összefoglalás", "Extract topics" : "Témák kinyerése", + "Translate" : "Lefordítás", + "Target language" : "Célnyelv", + "Result" : "Eredmény", "Free prompt" : "Szabad prompt", "Runs an arbitrary prompt through the language model." : "Tetszőleges promptot futtat a nyelvi modellen.", "Generate headline" : "Címsor előállítása", "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.", - "404" : "404", + "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ó", @@ -271,9 +275,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 szükséges.", - "Please upgrade your database version." : "Frissítse az adatbázis verzióját.", "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." + "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 3d093e8f44e..dd278d57f7e 100644 --- a/lib/l10n/hu.json +++ b/lib/l10n/hu.json @@ -17,7 +17,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s és %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s és %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s és %5$s", - "Education Edition" : "Oktatási kiadás", "Enterprise bundle" : "Vállalati csomag", "Groupware bundle" : "Csoportmunka csomag", "Hub bundle" : "Központi csomag", @@ -74,19 +73,18 @@ "seconds ago" : "pár másodperce", "Empty file" : "Üres fájl", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "A(z) %s azonosítójú modul nem létezik. Engedélyezze az alkalmazásbeállításokban, vagy lépjen kapcsolatba a rendszergazdával.", + "Dot files are not allowed" : "A ponttal kezdődő fájlok nem engedélyezettek", "File already exists" : "A fájl már létezik", "Invalid path" : "Érvénytelen útvonal", "Failed to create file from template" : "Nem sikerült létrehozni a fájlt a sablonból", "Templates" : "Sablonok", - "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ú", - "Dot files are not allowed" : "A ponttal kezdődő fájlok nem engedélyezettek", + "Filename contains at least one invalid character" : "A fájlnév legalább egy érvénytelen karaktert tartalmaz", "Empty filename is not allowed" : "Az üres fájlnév nem engedélyezett", "App \"%s\" cannot be installed because appinfo file cannot be read." : "A(z) „%s” alkalmazást nem lehet telepíteni, mert az appinfo fájl nem olvasható.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "A(z) „%s” alkalmazást nem lehet telepíteni, mert nem kompatibilis ezzel a kiszolgálóverzióval.", "__language_name__" : "Magyar", "This is an automatically sent email, please do not reply." : "Ez egy automatikusan küldött levél, ne válaszoljon rá.", + "Help & privacy" : "Súgó és adatvédelem", "Appearance and accessibility" : "Megjelenés és akadálymentesítés", "Apps" : "Alkalmazások", "Personal settings" : "Személyes beállítások", @@ -125,11 +123,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "A(z) %s megosztási alrendszernek meg kell valósítania az OCP\\Share_Backend interfészt", "Sharing backend %s not found" : "A(z) %s megosztási alrendszer nem található", "Sharing backend for %s not found" : "A(z) %s megosztási alrendszere nem található", + "%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.", + "Open »%s«" : "A(z) „%s” megnyitása", + "%1$s via %2$s" : "%1$s – %2$s", "%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", - "%1$s via %2$s" : "%1$s – %2$s", + "Unknown share type" : "Ismeretlen megosztástípus", "You are not allowed to share %s" : "Nincs jogosultsága a(z) %s megosztásához", "Cannot increase permissions of %s" : "A(z) %s engedélyei nem bővíthetők", "Files cannot be shared with delete permissions" : "A fájlok nem oszthatók meg törlési jogosultsággal", @@ -137,9 +139,6 @@ "Expiration date is in the past" : "A lejárati dátum már elmúlt", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Nem állítható be %n napnál távolabbi lejárati dátum","Nem állítható be %n napnál távolabbi lejárati dátum"], "Sharing is only allowed with group members" : "A megosztás csak a csoport tagjaival engedélyezett", - "%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 requested share does not exist anymore" : "A kért megosztás már nem létezik", "The requested share comes from a disabled user" : "A kért megosztás letiltott felhasználótól származik", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "A felhasználó nem jött létre, mert elérte a felhasználókorlátot. Nézze meg az értesítéseit, hogy többet tudjon meg.", @@ -225,7 +224,6 @@ "Your data directory must be an absolute path." : "Az adatkönyvtárnak abszolút útvonalnak kell lennie", "Check the value of \"datadirectory\" in your configuration." : "Ellenőrizze a „datadirectory” értékét a konfigurációban.", "Your data directory is invalid." : "Az adatkönyvtár érvénytelen.", - "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.", "Action \"%s\" not supported or implemented." : "A(z) „%s” művelet nem támogatott vagy nem ismert.", "Authentication failed, wrong token or provider ID given" : "Hitelesítés sikertelen, hibás token vagy szolgáltatóazonosító lett megadva", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "A következő paraméterek hiányoznak, hogy végrehajtható legyen a kérés. Paraméterek: \"%s\"", @@ -242,15 +240,21 @@ "Summarize" : "Összesítés", "Summary" : "Összefoglalás", "Extract topics" : "Témák kinyerése", + "Translate" : "Lefordítás", + "Target language" : "Célnyelv", + "Result" : "Eredmény", "Free prompt" : "Szabad prompt", "Runs an arbitrary prompt through the language model." : "Tetszőleges promptot futtat a nyelvi modellen.", "Generate headline" : "Címsor előállítása", "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.", - "404" : "404", + "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ó", @@ -269,9 +273,8 @@ "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 szükséges.", - "Please upgrade your database version." : "Frissítse az adatbázis verzióját.", "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." + "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 073980b60d0..6ec5f1da3d8 100644 --- a/lib/l10n/hy.js +++ b/lib/l10n/hy.js @@ -6,7 +6,6 @@ OC.L10N.register( "Files" : "Ֆայլեր", "today" : "այսօր", "seconds ago" : "վրկ. առաջ", - "File name contains at least one invalid character" : "Ֆայլի անունը առնվազն մի անվավեր նիշ է պարունակում", "__language_name__" : "Հայերեն", "Settings" : "կարգավորումներ", "Log out" : "Դուրս գալ", @@ -58,6 +57,8 @@ OC.L10N.register( "Oct." : "Հոկ.", "Nov." : "Նոյ.", "Dec." : "Դեկ.", + "Translate" : "Թարգմանել", + "File name contains at least one invalid character" : "Ֆայլի անունը առնվազն մի անվավեր նիշ է պարունակում", "Help" : "Օգնություն" }, "nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/hy.json b/lib/l10n/hy.json index 2b2bde9aa72..4ac64665170 100644 --- a/lib/l10n/hy.json +++ b/lib/l10n/hy.json @@ -4,7 +4,6 @@ "Files" : "Ֆայլեր", "today" : "այսօր", "seconds ago" : "վրկ. առաջ", - "File name contains at least one invalid character" : "Ֆայլի անունը առնվազն մի անվավեր նիշ է պարունակում", "__language_name__" : "Հայերեն", "Settings" : "կարգավորումներ", "Log out" : "Դուրս գալ", @@ -56,6 +55,8 @@ "Oct." : "Հոկ.", "Nov." : "Նոյ.", "Dec." : "Դեկ.", + "Translate" : "Թարգմանել", + "File name contains at least one invalid character" : "Ֆայլի անունը առնվազն մի անվավեր նիշ է պարունակում", "Help" : "Օգնություն" },"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 85f3f7ce1d8..8266287ba87 100644 --- a/lib/l10n/id.js +++ b/lib/l10n/id.js @@ -28,12 +28,10 @@ OC.L10N.register( "_%n hour ago_::_%n hours ago_" : ["%n jam yang lalu"], "_%n minute ago_::_%n minutes ago_" : ["%n menit yang lalu"], "seconds ago" : "beberapa detik yang lalu", + "Dot files are not allowed" : "Berkas titik tidak diperbolehkan", "File already exists" : "Berkas sudah ada", "Templates" : "Templat", - "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", - "Dot files are not allowed" : "Berkas titik tidak diperbolehkan", + "Filename contains at least one invalid character" : "Nama berkas mengandung setidaknya satu karakter yang tidak sah", "Empty filename is not allowed" : "Nama berkas kosong tidak diperbolehkan", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Aplikasi \"%s\" tidak dapat dipasang karena berkas appinfo tidak dapat dibaca.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Aplikasi \"%s\" tidak dapat dipasang karena tidak kompatibel dengan versi server ini", @@ -60,6 +58,7 @@ OC.L10N.register( "Sharing backend %s not found" : "Backend berbagi %s tidak ditemukan", "Sharing backend for %s not found" : "Backend berbagi untuk %s tidak ditemukan", "Open »%s«" : "Buka »%s«", + "Unknown share type" : "Tipe berbagi tidak diketahui", "You are not allowed to share %s" : "Anda tidak diizinkan untuk membagikan %s", "Cannot increase permissions of %s" : "Tidak dapat menambah izin %s", "Expiration date is in the past" : "Tanggal kedaluwarsa sudah lewat", @@ -132,6 +131,10 @@ OC.L10N.register( "Storage is temporarily not available" : "Penyimpanan sementara tidak tersedia", "Storage connection timeout. %s" : "Koneksi penyimpanan waktu-habis. %s", "Summary" : "Kesimpulan", + "Translate" : "Terjemahkan", + "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", diff --git a/lib/l10n/id.json b/lib/l10n/id.json index 457edc7fc4a..67c478b4ac4 100644 --- a/lib/l10n/id.json +++ b/lib/l10n/id.json @@ -26,12 +26,10 @@ "_%n hour ago_::_%n hours ago_" : ["%n jam yang lalu"], "_%n minute ago_::_%n minutes ago_" : ["%n menit yang lalu"], "seconds ago" : "beberapa detik yang lalu", + "Dot files are not allowed" : "Berkas titik tidak diperbolehkan", "File already exists" : "Berkas sudah ada", "Templates" : "Templat", - "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", - "Dot files are not allowed" : "Berkas titik tidak diperbolehkan", + "Filename contains at least one invalid character" : "Nama berkas mengandung setidaknya satu karakter yang tidak sah", "Empty filename is not allowed" : "Nama berkas kosong tidak diperbolehkan", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Aplikasi \"%s\" tidak dapat dipasang karena berkas appinfo tidak dapat dibaca.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Aplikasi \"%s\" tidak dapat dipasang karena tidak kompatibel dengan versi server ini", @@ -58,6 +56,7 @@ "Sharing backend %s not found" : "Backend berbagi %s tidak ditemukan", "Sharing backend for %s not found" : "Backend berbagi untuk %s tidak ditemukan", "Open »%s«" : "Buka »%s«", + "Unknown share type" : "Tipe berbagi tidak diketahui", "You are not allowed to share %s" : "Anda tidak diizinkan untuk membagikan %s", "Cannot increase permissions of %s" : "Tidak dapat menambah izin %s", "Expiration date is in the past" : "Tanggal kedaluwarsa sudah lewat", @@ -130,6 +129,10 @@ "Storage is temporarily not available" : "Penyimpanan sementara tidak tersedia", "Storage connection timeout. %s" : "Koneksi penyimpanan waktu-habis. %s", "Summary" : "Kesimpulan", + "Translate" : "Terjemahkan", + "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", diff --git a/lib/l10n/is.js b/lib/l10n/is.js index 9aaca441e53..0bc56128fb6 100644 --- a/lib/l10n/is.js +++ b/lib/l10n/is.js @@ -19,7 +19,6 @@ 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 Edition" : "Kennsluútgáfa", "Enterprise bundle" : "Fyrirtækjavöndull", "Groupware bundle" : "Hópvinnsluvöndull", "Hub bundle" : "Tengivöndull", @@ -76,14 +75,12 @@ OC.L10N.register( "seconds ago" : "sekúndum síðan", "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", "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", - "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", - "Dot files are not allowed" : "Skrár með punkti eru ekki leyfðar", + "Filename contains at least one invalid character" : "Skráarheitið inniheldur að minnsta kosti einn ógildan staf", "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.", @@ -127,11 +124,15 @@ 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", + "%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ð.", + "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", - "Open »%s«" : "Opna »%s«", - "%1$s via %2$s" : "%1$s með %2$s", + "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", "Files cannot be shared with delete permissions" : "Ekki er hægt að deila skrá með eyða-heimildum", @@ -139,9 +140,6 @@ 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", - "%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 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,7 +225,6 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Gagnamappan þín verður að vera með algilda slóð.", "Check the value of \"datadirectory\" in your configuration." : "Athugaðu gildi \"datadirectory\" í uppsetningunni þinni.", "Your data directory is invalid." : "Gagnamappan þín er ógild.", - "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.", "Action \"%s\" not supported or implemented." : "Aðgerðin \"%s\" er ekki studd eða útfærð.", "Authentication failed, wrong token or provider ID given" : "Auðkenning mistókst, uppgefið rangt teikn eða auðkenni þjónustuveitu", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Breytur vantar til að geta lokið beiðninni. Breytur sem vantar: \"%s\"", @@ -243,15 +240,21 @@ OC.L10N.register( "Summarize" : "Gera samantekt", "Summary" : "Samantekt", "Extract topics" : "Taka út efnisflokka", + "Translate" : "Þýða", + "Target language" : "Marktungumál:", + "Result" : "Niðurstöður", "Free prompt" : "Frjáls kvaðning", "Runs an arbitrary prompt through the language model." : "Keyrir óreglulega kvaðningu (prompt) í gegnum tungumálslíkanið.", "Generate headline" : "Útbúa fyrirsögn", "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.", - "404" : "404", + "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", @@ -270,9 +273,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "Krefst PostgreSQL >= 9.", - "Please upgrade your database version." : "Uppfærðu útgáfu gagnagrunnsins.", "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." + "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 863bd801d7a..6c52f7f4683 100644 --- a/lib/l10n/is.json +++ b/lib/l10n/is.json @@ -17,7 +17,6 @@ "%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 Edition" : "Kennsluútgáfa", "Enterprise bundle" : "Fyrirtækjavöndull", "Groupware bundle" : "Hópvinnsluvöndull", "Hub bundle" : "Tengivöndull", @@ -74,14 +73,12 @@ "seconds ago" : "sekúndum síðan", "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", "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", - "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", - "Dot files are not allowed" : "Skrár með punkti eru ekki leyfðar", + "Filename contains at least one invalid character" : "Skráarheitið inniheldur að minnsta kosti einn ógildan staf", "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.", @@ -125,11 +122,15 @@ "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", + "%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ð.", + "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", - "Open »%s«" : "Opna »%s«", - "%1$s via %2$s" : "%1$s með %2$s", + "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", "Files cannot be shared with delete permissions" : "Ekki er hægt að deila skrá með eyða-heimildum", @@ -137,9 +138,6 @@ "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", - "%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 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,7 +223,6 @@ "Your data directory must be an absolute path." : "Gagnamappan þín verður að vera með algilda slóð.", "Check the value of \"datadirectory\" in your configuration." : "Athugaðu gildi \"datadirectory\" í uppsetningunni þinni.", "Your data directory is invalid." : "Gagnamappan þín er ógild.", - "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.", "Action \"%s\" not supported or implemented." : "Aðgerðin \"%s\" er ekki studd eða útfærð.", "Authentication failed, wrong token or provider ID given" : "Auðkenning mistókst, uppgefið rangt teikn eða auðkenni þjónustuveitu", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Breytur vantar til að geta lokið beiðninni. Breytur sem vantar: \"%s\"", @@ -241,15 +238,21 @@ "Summarize" : "Gera samantekt", "Summary" : "Samantekt", "Extract topics" : "Taka út efnisflokka", + "Translate" : "Þýða", + "Target language" : "Marktungumál:", + "Result" : "Niðurstöður", "Free prompt" : "Frjáls kvaðning", "Runs an arbitrary prompt through the language model." : "Keyrir óreglulega kvaðningu (prompt) í gegnum tungumálslíkanið.", "Generate headline" : "Útbúa fyrirsögn", "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.", - "404" : "404", + "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", @@ -268,9 +271,8 @@ "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", - "PostgreSQL >= 9 required." : "Krefst PostgreSQL >= 9.", - "Please upgrade your database version." : "Uppfærðu útgáfu gagnagrunnsins.", "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." + "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 9a9727cee20..6403f8ab014 100644 --- a/lib/l10n/it.js +++ b/lib/l10n/it.js @@ -19,7 +19,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s e %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s e %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s e %5$s", - "Education Edition" : "Edizione didattica", "Enterprise bundle" : "Pacchetto Enterprise", "Groupware bundle" : "Pacchetto Groupware", "Hub bundle" : "Pacchetto Hub", @@ -76,14 +75,12 @@ OC.L10N.register( "seconds ago" : "secondi fa", "Empty file" : "File vuoto", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Il modulo con ID: %s non esiste. Abilitalo nelle impostazioni delle applicazioni o contatta il tuo amministratore.", + "Dot files are not allowed" : "I file con un punto iniziale non sono consentiti", "File already exists" : "Il file esiste già", "Invalid path" : "Percorso non valido", "Failed to create file from template" : "Impossibile creare un file dal modello", "Templates" : "Modelli", - "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", - "Dot files are not allowed" : "I file con un punto iniziale non sono consentiti", + "Filename contains at least one invalid character" : "Il nome del file contiene almeno un carattere non valido", "Empty filename is not allowed" : "Un nome di file vuoto non è consentito", "App \"%s\" cannot be installed because appinfo file cannot be read." : "L'applicazione \"%s\" non può essere installata poiché il file appinfo non può essere letto.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "L'applicazione \"%s\" non può essere installata perché non è compatibile con questa versione del server.", @@ -128,11 +125,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Il motore di condivisione %s deve implementare l'interfaccia OCP\\Share_Backend", "Sharing backend %s not found" : "Motore di condivisione %s non trovato", "Sharing backend for %s not found" : "Motore di condivisione di %s non trovato", + "%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.", + "Open »%s«" : "Apri «%s»", + "%1$s via %2$s" : "%1$s tramite %2$s", "%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»", - "%1$s via %2$s" : "%1$s tramite %2$s", + "Unknown share type" : "Tipo di condivisione sconosciuto", "You are not allowed to share %s" : "Non ti è consentito condividere %s", "Cannot increase permissions of %s" : "Impossibile aumentare i permessi di %s", "Files cannot be shared with delete permissions" : "I file non possono essere condivisi con permessi di eliminazione", @@ -140,9 +141,6 @@ OC.L10N.register( "Expiration date is in the past" : "La data di scadenza è nel passato", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Impossibile impostare la data di scadenza a più di %n giorni nel futuro","Impossibile impostare la data di scadenza a più di %n giorni nel futuro","Impossibile impostare la data di scadenza a più di %n giorni nel futuro"], "Sharing is only allowed with group members" : "La condivisione è consentita solo con i membri del gruppo", - "%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 requested share does not exist anymore" : "La condivisione richiesta non esiste più", "The requested share comes from a disabled user" : "La condivisione richiesta proviene da un utente disabilitato", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "L'utente non è stato creato perché il limite è stato raggiunto. Controlla le notifiche per maggiori informazioni.", @@ -229,7 +227,6 @@ OC.L10N.register( "Your data directory must be an absolute path." : "La cartella dei dati deve essere un percorso assoluto.", "Check the value of \"datadirectory\" in your configuration." : "Controlla il valore di \"datadirectory\" nella tua configurazione.", "Your data directory is invalid." : "La cartella dei dati non è valida.", - "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.", "Action \"%s\" not supported or implemented." : "Azione \"%s\" non supportata o implementata.", "Authentication failed, wrong token or provider ID given" : "Autenticazione non riuscita, token o ID fornitore errato ", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Parametri mancanti per completare la richiesta. Parametri mancanti: \"%s\"", @@ -245,15 +242,21 @@ OC.L10N.register( "Summarize" : "Riassumi", "Summary" : "Riepilogo", "Extract topics" : "Estrai argomenti", + "Translate" : "Traduci", + "Target language" : "Lingua di destinazione", + "Result" : "Risultato", "Free prompt" : "Prompt libero", "Runs an arbitrary prompt through the language model." : "Esegue un prompt arbitrario attraverso il modello di lingua.", "Generate headline" : "Genera titolo", "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.", - "404" : "404", + "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", @@ -272,9 +275,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "Richiesto PostgreSQL >= 9.", - "Please upgrade your database version." : "Aggiorna la versione del tuo database.", "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." + "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 b17cc0afe92..564c97c9c54 100644 --- a/lib/l10n/it.json +++ b/lib/l10n/it.json @@ -17,7 +17,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s e %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s e %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s e %5$s", - "Education Edition" : "Edizione didattica", "Enterprise bundle" : "Pacchetto Enterprise", "Groupware bundle" : "Pacchetto Groupware", "Hub bundle" : "Pacchetto Hub", @@ -74,14 +73,12 @@ "seconds ago" : "secondi fa", "Empty file" : "File vuoto", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Il modulo con ID: %s non esiste. Abilitalo nelle impostazioni delle applicazioni o contatta il tuo amministratore.", + "Dot files are not allowed" : "I file con un punto iniziale non sono consentiti", "File already exists" : "Il file esiste già", "Invalid path" : "Percorso non valido", "Failed to create file from template" : "Impossibile creare un file dal modello", "Templates" : "Modelli", - "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", - "Dot files are not allowed" : "I file con un punto iniziale non sono consentiti", + "Filename contains at least one invalid character" : "Il nome del file contiene almeno un carattere non valido", "Empty filename is not allowed" : "Un nome di file vuoto non è consentito", "App \"%s\" cannot be installed because appinfo file cannot be read." : "L'applicazione \"%s\" non può essere installata poiché il file appinfo non può essere letto.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "L'applicazione \"%s\" non può essere installata perché non è compatibile con questa versione del server.", @@ -126,11 +123,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Il motore di condivisione %s deve implementare l'interfaccia OCP\\Share_Backend", "Sharing backend %s not found" : "Motore di condivisione %s non trovato", "Sharing backend for %s not found" : "Motore di condivisione di %s non trovato", + "%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.", + "Open »%s«" : "Apri «%s»", + "%1$s via %2$s" : "%1$s tramite %2$s", "%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»", - "%1$s via %2$s" : "%1$s tramite %2$s", + "Unknown share type" : "Tipo di condivisione sconosciuto", "You are not allowed to share %s" : "Non ti è consentito condividere %s", "Cannot increase permissions of %s" : "Impossibile aumentare i permessi di %s", "Files cannot be shared with delete permissions" : "I file non possono essere condivisi con permessi di eliminazione", @@ -138,9 +139,6 @@ "Expiration date is in the past" : "La data di scadenza è nel passato", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Impossibile impostare la data di scadenza a più di %n giorni nel futuro","Impossibile impostare la data di scadenza a più di %n giorni nel futuro","Impossibile impostare la data di scadenza a più di %n giorni nel futuro"], "Sharing is only allowed with group members" : "La condivisione è consentita solo con i membri del gruppo", - "%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 requested share does not exist anymore" : "La condivisione richiesta non esiste più", "The requested share comes from a disabled user" : "La condivisione richiesta proviene da un utente disabilitato", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "L'utente non è stato creato perché il limite è stato raggiunto. Controlla le notifiche per maggiori informazioni.", @@ -227,7 +225,6 @@ "Your data directory must be an absolute path." : "La cartella dei dati deve essere un percorso assoluto.", "Check the value of \"datadirectory\" in your configuration." : "Controlla il valore di \"datadirectory\" nella tua configurazione.", "Your data directory is invalid." : "La cartella dei dati non è valida.", - "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.", "Action \"%s\" not supported or implemented." : "Azione \"%s\" non supportata o implementata.", "Authentication failed, wrong token or provider ID given" : "Autenticazione non riuscita, token o ID fornitore errato ", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Parametri mancanti per completare la richiesta. Parametri mancanti: \"%s\"", @@ -243,15 +240,21 @@ "Summarize" : "Riassumi", "Summary" : "Riepilogo", "Extract topics" : "Estrai argomenti", + "Translate" : "Traduci", + "Target language" : "Lingua di destinazione", + "Result" : "Risultato", "Free prompt" : "Prompt libero", "Runs an arbitrary prompt through the language model." : "Esegue un prompt arbitrario attraverso il modello di lingua.", "Generate headline" : "Genera titolo", "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.", - "404" : "404", + "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", @@ -270,9 +273,8 @@ "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", - "PostgreSQL >= 9 required." : "Richiesto PostgreSQL >= 9.", - "Please upgrade your database version." : "Aggiorna la versione del tuo database.", "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." + "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 e8f20292401..805d2b29559 100644 --- a/lib/l10n/ja.js +++ b/lib/l10n/ja.js @@ -19,7 +19,7 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s と %2$s、%3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s と %2$s、%3$s、%4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s と %2$s、%3$s、%4$s、%5$s", - "Education Edition" : "教育向けエディション", + "Education bundle" : "教育向けバンドル", "Enterprise bundle" : "エンタープライズ バンドル", "Groupware bundle" : "グループウェア バンドル", "Hub bundle" : "Hubバンドル", @@ -38,6 +38,7 @@ OC.L10N.register( "Server version %s or higher is required." : "サーバーの %s よりも高いバージョンが必要です。", "Server version %s or lower is required." : "サーバーの %s よりも低いバージョンが必要です。", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "この設定にアクセスするには、ログインしたアカウントが管理者、サブ管理者、または特別な権利を持っている必要があります。", + "Your current IP address doesn’t allow you to perform admin actions" : "現在のIPアドレスでは管理アクションを実行できません", "Logged in account must be an admin or sub admin" : "ログインアカウントは管理者またはサブ管理者である必要があります", "Logged in account must be an admin" : "ログインアカウントは管理者である必要があります", "Wiping of device %s has started" : "端末%sのワイプを開始しました。", @@ -80,14 +81,21 @@ 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のモジュールは存在しません。アプリ設定で有効にするか、管理者に問い合わせてください。", + "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\"は、ファイル名やフォルダー名には使用できない接頭辞です。", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\"はファイル名やフォルダー名の中に入れることはできません。", + "\"%1$s\" is a forbidden file type." : "\"%1$s\"は禁止されているファイルタイプです。", + "Filenames must not end with \"%1$s\"." : "ファイル名は \"%1$s\"で終了できません。", + "Invalid parent path" : "無効な親パス", "File already exists" : "ファイルが既に存在します", "Invalid path" : "パスが無効", "Failed to create file from template" : "テンプレートからファイルを作成できませんでした", "Templates" : "テンプレート", - "File name is a reserved word" : "ファイル名が予約された単語です", - "File name contains at least one invalid character" : "ファイル名に1文字以上の無効な文字が含まれています", - "File name is too long" : "ファイル名が長すぎます", - "Dot files are not allowed" : "隠しファイルは許可されていません", + "Path contains invalid segments" : "パスに無効なセグメントが含まれています", + "Filename is a reserved word" : "ファイル名が予約された単語です", + "Filename contains at least one invalid character" : "ファイル名に使用できない文字が含まれています", + "Filename is too long" : "ファイル名が長すぎます", "Empty filename is not allowed" : "空のファイル名は許可されていません", "App \"%s\" cannot be installed because appinfo file cannot be read." : "appinfoファイルが読み込めないため、アプリ名 \"%s\" がインストールできません。", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "\"%s\" アプリは、このバージョンのサーバーと互換性がないためインストールされませんでした。", @@ -139,22 +147,56 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "%s のバックエンドの共有には、OCP\\Share_Backend インターフェースを実装しなければなりません。", "Sharing backend %s not found" : "共有バックエンド %s が見つかりません", "Sharing backend for %s not found" : "%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." : "開くには下のボタンをクリック", + "Open »%s«" : "»%s«を開く", + "%1$s via %2$s" : "%1$s via %2$s", "%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«を開く", - "%1$s via %2$s" : "%1$s via %2$s", + "Passwords are enforced for link and mail shares" : "リンクとメールの共有にパスワードが強制されます", + "SharedWith is not a valid user" : "SharedWithは有効なユーザーではありません", + "SharedWith is not a valid group" : "SharedWithは有効なグループではありません", + "SharedWith should be empty" : "SharedWithは空でなければなりません", + "SharedWith should not be empty" : "SharedWithは空にできません", + "SharedWith is not a valid circle" : "SharedWithは有効なサークルではありません", + "Unknown share type" : "不明な共有タイプ", + "SharedBy should be set" : "SharedByを設定する必要があります", + "Cannot share with yourself" : "自分自身とは共有できません", + "Path should be set" : "パスを設定する必要があります", + "Path should be either a file or a folder" : "パスは、ファイルまたはフォルダーのいずれかでなければなりません", + "You cannot share your root folder" : "ルートルートフォルダーを共有することはできません", "You are not allowed to share %s" : "%s を共有することを許可されていません。", + "A share requires permissions" : "共有には権限が必要です", "Cannot increase permissions of %s" : "%sの権限を追加できません ", + "Shares need at least read permissions" : "共有には少なくとも読み取り権限が必要です", "Files cannot be shared with delete permissions" : "削除権限付きでファイルを共有できません", "Files cannot be shared with create permissions" : "作成権限付きでファイルを共有できません", "Expiration date is in the past" : "有効期限が切れています", + "Expiration date is enforced" : "有効期限は強制されています", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["%n 日以上先の有効期限は設定できません "], "Sharing is only allowed with group members" : "共有はグループメンバーにのみ許可されます", "Sharing %s failed, because this item is already shared with the account %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." : "開くには下のボタンをクリック", + "Group sharing is now allowed" : "グループ共有が許可されました", + "Sharing is only allowed within your own groups" : "共有は自分のグループ内でのみ許可されています", + "Path is already shared with this group" : "パスはすでにこのグループで共有されています", + "Link sharing is not allowed" : "リンクの共有は許可されていません", + "Public upload is not allowed" : "公開アップロードは許可されていません", + "Path contains files shared with you" : "パスにはあなたと共有するファイルが含まれています", + "Sharing is disabled" : "共有は無効になっています", + "Sharing is disabled for you" : "共有は無効になっています", + "Cannot share with the share owner" : "共有所有者と共有できません", + "Share does not have a full ID" : "共有に完全なIDがありません", + "Cannot change share type" : "共有タイプを変更できません", + "Can only update recipient on user shares" : "ユーザー共有の受信者のみ更新可能", + "Cannot enable sending the password by Talk with an empty password" : "空のパスワードでTalkによるパスワード送信を有効にできません", + "Cannot enable sending the password by Talk without setting a new password" : "新しいパスワードを設定しないとTalkでパスワードを送信できません", + "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 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." : "登録可能なユーザー数の上限に達したため、ユーザーは作成されませんでした。詳細については通知をご確認ください。", @@ -252,7 +294,7 @@ OC.L10N.register( "Your data directory must be an absolute path." : "データディレクトリは、絶対パスにする必要があります", "Check the value of \"datadirectory\" in your configuration." : "設定ファイル内の \"datadirectory\" の値を確認してください。", "Your data directory is invalid." : "データディレクトリが無効です", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "データディレクトリの直下に \".ocdata\" ファイルがあるのを確認してください。", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "データディレクトリのルートに\"%1$s\"というファイルがあることを確認します。内容は次のようになります:\"%2$s\"", "Action \"%s\" not supported or implemented." : "アクション「%s」は対応していないか、実装されていません。", "Authentication failed, wrong token or provider ID given" : "認証できませんでした。トークンまたはプロバイダーIDが間違っています", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "要求を完了するためのパラメータがありません。欠落したパラメータ:「%s」", @@ -270,7 +312,7 @@ OC.L10N.register( "The audio to transcribe" : "文字起こしする音声", "Transcription" : "書き起こし", "The transcribed text" : "書き起こされたテキスト", - "ContextWrite" : "コンテキスト書き込み", + "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" : "真似したい文章の書き方を示す", @@ -292,7 +334,7 @@ OC.L10N.register( "Output images" : "出力画像", "The generated images" : "生成された画像", "Free text to text prompt" : "フリーテキストからテキストへのプロンプト", - "Runs an arbitrary prompt through a language model that retuns a reply" : "応答を返す言語モデルを通じて任意のプロンプトを実行します", + "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" : "アシスタントに実行してほしいタスクまたは質問を記述します", "Generated reply" : "生成された返信", "The generated text from the assistant" : "アシスタントから生成されたテキスト", @@ -335,15 +377,28 @@ OC.L10N.register( "The original text to extract topics from" : "トピックを抽出する元のテキスト", "Topics" : "トピック", "The list of extracted topics" : "抽出されたトピックのリスト", + "Translate" : "翻訳", + "Translate text from one language to another" : "テキストをある言語から別の言語に翻訳する", + "Origin text" : "原文", + "The text to translate" : "翻訳するテキスト", + "Origin language" : "元の言語", + "The language of the origin text" : "元のテキストの言語", + "Target language" : "訳文の言語", + "The desired language to translate the origin text in" : "元のテキストを翻訳する言語", + "Result" : "結果", + "The translated text" : "翻訳されたテキスト", "Free prompt" : "任意のプロンプト", "Runs an arbitrary prompt through the language model." : "言語モデルを通じて任意のプロンプトを実行", "Generate headline" : "見出しの生成", "Summarizes text by reducing its length without losing key information." : "重要な情報を失わずにテキストの長さを要約して短縮する。", "Extracts topics from a text and outputs them separated by commas." : "テキストからトピックを抽出し、カンマ区切りで出力します。", - "404" : "404", + "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" : "不明なユーザー", @@ -362,9 +417,8 @@ OC.L10N.register( "Username must not consist of dots only" : "ユーザー名に、ドットのみはつけられません", "Username is invalid because files already exist for this user" : "このユーザーのファイルが既に存在するため、このユーザー名は使用できません", "User disabled" : "ユーザーは無効です", - "PostgreSQL >= 9 required." : "PostgreSQL 9以上が必要です", - "Please upgrade your database version." : "新しいバージョンのデータベースにアップグレードしてください。", "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 に変更してください。" + "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 52b388c1f24..a1e56860774 100644 --- a/lib/l10n/ja.json +++ b/lib/l10n/ja.json @@ -17,7 +17,7 @@ "%1$s, %2$s and %3$s" : "%1$s と %2$s、%3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s と %2$s、%3$s、%4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s と %2$s、%3$s、%4$s、%5$s", - "Education Edition" : "教育向けエディション", + "Education bundle" : "教育向けバンドル", "Enterprise bundle" : "エンタープライズ バンドル", "Groupware bundle" : "グループウェア バンドル", "Hub bundle" : "Hubバンドル", @@ -36,6 +36,7 @@ "Server version %s or higher is required." : "サーバーの %s よりも高いバージョンが必要です。", "Server version %s or lower is required." : "サーバーの %s よりも低いバージョンが必要です。", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "この設定にアクセスするには、ログインしたアカウントが管理者、サブ管理者、または特別な権利を持っている必要があります。", + "Your current IP address doesn’t allow you to perform admin actions" : "現在のIPアドレスでは管理アクションを実行できません", "Logged in account must be an admin or sub admin" : "ログインアカウントは管理者またはサブ管理者である必要があります", "Logged in account must be an admin" : "ログインアカウントは管理者である必要があります", "Wiping of device %s has started" : "端末%sのワイプを開始しました。", @@ -78,14 +79,21 @@ "seconds ago" : "数秒前", "Empty file" : "空白のファイル", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "ID: %sのモジュールは存在しません。アプリ設定で有効にするか、管理者に問い合わせてください。", + "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\"は、ファイル名やフォルダー名には使用できない接頭辞です。", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\"はファイル名やフォルダー名の中に入れることはできません。", + "\"%1$s\" is a forbidden file type." : "\"%1$s\"は禁止されているファイルタイプです。", + "Filenames must not end with \"%1$s\"." : "ファイル名は \"%1$s\"で終了できません。", + "Invalid parent path" : "無効な親パス", "File already exists" : "ファイルが既に存在します", "Invalid path" : "パスが無効", "Failed to create file from template" : "テンプレートからファイルを作成できませんでした", "Templates" : "テンプレート", - "File name is a reserved word" : "ファイル名が予約された単語です", - "File name contains at least one invalid character" : "ファイル名に1文字以上の無効な文字が含まれています", - "File name is too long" : "ファイル名が長すぎます", - "Dot files are not allowed" : "隠しファイルは許可されていません", + "Path contains invalid segments" : "パスに無効なセグメントが含まれています", + "Filename is a reserved word" : "ファイル名が予約された単語です", + "Filename contains at least one invalid character" : "ファイル名に使用できない文字が含まれています", + "Filename is too long" : "ファイル名が長すぎます", "Empty filename is not allowed" : "空のファイル名は許可されていません", "App \"%s\" cannot be installed because appinfo file cannot be read." : "appinfoファイルが読み込めないため、アプリ名 \"%s\" がインストールできません。", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "\"%s\" アプリは、このバージョンのサーバーと互換性がないためインストールされませんでした。", @@ -137,22 +145,56 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "%s のバックエンドの共有には、OCP\\Share_Backend インターフェースを実装しなければなりません。", "Sharing backend %s not found" : "共有バックエンド %s が見つかりません", "Sharing backend for %s not found" : "%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." : "開くには下のボタンをクリック", + "Open »%s«" : "»%s«を開く", + "%1$s via %2$s" : "%1$s via %2$s", "%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«を開く", - "%1$s via %2$s" : "%1$s via %2$s", + "Passwords are enforced for link and mail shares" : "リンクとメールの共有にパスワードが強制されます", + "SharedWith is not a valid user" : "SharedWithは有効なユーザーではありません", + "SharedWith is not a valid group" : "SharedWithは有効なグループではありません", + "SharedWith should be empty" : "SharedWithは空でなければなりません", + "SharedWith should not be empty" : "SharedWithは空にできません", + "SharedWith is not a valid circle" : "SharedWithは有効なサークルではありません", + "Unknown share type" : "不明な共有タイプ", + "SharedBy should be set" : "SharedByを設定する必要があります", + "Cannot share with yourself" : "自分自身とは共有できません", + "Path should be set" : "パスを設定する必要があります", + "Path should be either a file or a folder" : "パスは、ファイルまたはフォルダーのいずれかでなければなりません", + "You cannot share your root folder" : "ルートルートフォルダーを共有することはできません", "You are not allowed to share %s" : "%s を共有することを許可されていません。", + "A share requires permissions" : "共有には権限が必要です", "Cannot increase permissions of %s" : "%sの権限を追加できません ", + "Shares need at least read permissions" : "共有には少なくとも読み取り権限が必要です", "Files cannot be shared with delete permissions" : "削除権限付きでファイルを共有できません", "Files cannot be shared with create permissions" : "作成権限付きでファイルを共有できません", "Expiration date is in the past" : "有効期限が切れています", + "Expiration date is enforced" : "有効期限は強制されています", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["%n 日以上先の有効期限は設定できません "], "Sharing is only allowed with group members" : "共有はグループメンバーにのみ許可されます", "Sharing %s failed, because this item is already shared with the account %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." : "開くには下のボタンをクリック", + "Group sharing is now allowed" : "グループ共有が許可されました", + "Sharing is only allowed within your own groups" : "共有は自分のグループ内でのみ許可されています", + "Path is already shared with this group" : "パスはすでにこのグループで共有されています", + "Link sharing is not allowed" : "リンクの共有は許可されていません", + "Public upload is not allowed" : "公開アップロードは許可されていません", + "Path contains files shared with you" : "パスにはあなたと共有するファイルが含まれています", + "Sharing is disabled" : "共有は無効になっています", + "Sharing is disabled for you" : "共有は無効になっています", + "Cannot share with the share owner" : "共有所有者と共有できません", + "Share does not have a full ID" : "共有に完全なIDがありません", + "Cannot change share type" : "共有タイプを変更できません", + "Can only update recipient on user shares" : "ユーザー共有の受信者のみ更新可能", + "Cannot enable sending the password by Talk with an empty password" : "空のパスワードでTalkによるパスワード送信を有効にできません", + "Cannot enable sending the password by Talk without setting a new password" : "新しいパスワードを設定しないとTalkでパスワードを送信できません", + "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 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." : "登録可能なユーザー数の上限に達したため、ユーザーは作成されませんでした。詳細については通知をご確認ください。", @@ -250,7 +292,7 @@ "Your data directory must be an absolute path." : "データディレクトリは、絶対パスにする必要があります", "Check the value of \"datadirectory\" in your configuration." : "設定ファイル内の \"datadirectory\" の値を確認してください。", "Your data directory is invalid." : "データディレクトリが無効です", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "データディレクトリの直下に \".ocdata\" ファイルがあるのを確認してください。", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "データディレクトリのルートに\"%1$s\"というファイルがあることを確認します。内容は次のようになります:\"%2$s\"", "Action \"%s\" not supported or implemented." : "アクション「%s」は対応していないか、実装されていません。", "Authentication failed, wrong token or provider ID given" : "認証できませんでした。トークンまたはプロバイダーIDが間違っています", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "要求を完了するためのパラメータがありません。欠落したパラメータ:「%s」", @@ -268,7 +310,7 @@ "The audio to transcribe" : "文字起こしする音声", "Transcription" : "書き起こし", "The transcribed text" : "書き起こされたテキスト", - "ContextWrite" : "コンテキスト書き込み", + "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" : "真似したい文章の書き方を示す", @@ -290,7 +332,7 @@ "Output images" : "出力画像", "The generated images" : "生成された画像", "Free text to text prompt" : "フリーテキストからテキストへのプロンプト", - "Runs an arbitrary prompt through a language model that retuns a reply" : "応答を返す言語モデルを通じて任意のプロンプトを実行します", + "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" : "アシスタントに実行してほしいタスクまたは質問を記述します", "Generated reply" : "生成された返信", "The generated text from the assistant" : "アシスタントから生成されたテキスト", @@ -333,15 +375,28 @@ "The original text to extract topics from" : "トピックを抽出する元のテキスト", "Topics" : "トピック", "The list of extracted topics" : "抽出されたトピックのリスト", + "Translate" : "翻訳", + "Translate text from one language to another" : "テキストをある言語から別の言語に翻訳する", + "Origin text" : "原文", + "The text to translate" : "翻訳するテキスト", + "Origin language" : "元の言語", + "The language of the origin text" : "元のテキストの言語", + "Target language" : "訳文の言語", + "The desired language to translate the origin text in" : "元のテキストを翻訳する言語", + "Result" : "結果", + "The translated text" : "翻訳されたテキスト", "Free prompt" : "任意のプロンプト", "Runs an arbitrary prompt through the language model." : "言語モデルを通じて任意のプロンプトを実行", "Generate headline" : "見出しの生成", "Summarizes text by reducing its length without losing key information." : "重要な情報を失わずにテキストの長さを要約して短縮する。", "Extracts topics from a text and outputs them separated by commas." : "テキストからトピックを抽出し、カンマ区切りで出力します。", - "404" : "404", + "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" : "不明なユーザー", @@ -360,9 +415,8 @@ "Username must not consist of dots only" : "ユーザー名に、ドットのみはつけられません", "Username is invalid because files already exist for this user" : "このユーザーのファイルが既に存在するため、このユーザー名は使用できません", "User disabled" : "ユーザーは無効です", - "PostgreSQL >= 9 required." : "PostgreSQL 9以上が必要です", - "Please upgrade your database version." : "新しいバージョンのデータベースにアップグレードしてください。", "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 に変更してください。" + "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 e70b0ba4aaf..1bbff9f6cec 100644 --- a/lib/l10n/ka.js +++ b/lib/l10n/ka.js @@ -19,7 +19,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s and %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s and %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s and %5$s", - "Education Edition" : "Education Edition", "Enterprise bundle" : "Enterprise bundle", "Groupware bundle" : "Groupware bundle", "Hub bundle" : "Hub bundle", @@ -76,14 +75,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.", + "Dot files are not allowed" : "Dot files are not allowed", "File already exists" : "File already exists", "Invalid path" : "Invalid path", "Failed to create file from template" : "Failed to create file from template", "Templates" : "Templates", - "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", - "Dot files are not allowed" : "Dot files are not allowed", + "Filename contains at least one invalid character" : "Filename contains at least one invalid character", "Empty filename is not allowed" : "Empty filename is not allowed", "App \"%s\" cannot be installed because appinfo file cannot be read." : "App \"%s\" cannot be installed because appinfo file cannot be read.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "App \"%s\" cannot be installed because it is not compatible with this version of the server.", @@ -127,11 +124,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Sharing backend %s must implement the interface OCP\\Share_Backend", "Sharing backend %s not found" : "Sharing backend %s not found", "Sharing backend for %s not found" : "Sharing backend for %s not found", + "%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.", + "Open »%s«" : "Open »%s«", + "%1$s via %2$s" : "%1$s via %2$s", "%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«", - "%1$s via %2$s" : "%1$s via %2$s", + "Unknown share type" : "Unknown share type", "You are not allowed to share %s" : "You are not allowed to share %s", "Cannot increase permissions of %s" : "Cannot increase permissions of %s", "Files cannot be shared with delete permissions" : "Files cannot be shared with delete permissions", @@ -139,9 +140,6 @@ OC.L10N.register( "Expiration date is in the past" : "Expiration date is in the past", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Cannot set expiration date more than %n day in the future","Cannot set expiration date more than %n days in the future"], "Sharing is only allowed with group members" : "Sharing is only allowed with group members", - "%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 requested share does not exist anymore" : "The requested share does not exist anymore", "The requested share comes from a disabled user" : "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." : "The user was not created because the user limit has been reached. Check your notifications to learn more.", @@ -227,7 +225,6 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Your data directory must be an absolute path.", "Check the value of \"datadirectory\" in your configuration." : "Check the value of \"datadirectory\" in your configuration.", "Your data directory is invalid." : "Your data directory is invalid.", - "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.", "Action \"%s\" not supported or implemented." : "Action \"%s\" not supported or implemented.", "Authentication failed, wrong token or provider ID given" : "Authentication failed, wrong token or provider ID given", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Parameters missing in order to complete the request. Missing Parameters: \"%s\"", @@ -244,15 +241,20 @@ OC.L10N.register( "Summarize" : "Summarize", "Summary" : "Summary", "Extract topics" : "Extract topics", + "Translate" : "Translate", + "Result" : "Result", "Free prompt" : "Free prompt", "Runs an arbitrary prompt through the language model." : "Runs an arbitrary prompt through the language model.", "Generate headline" : "Generate headline", "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.", - "404" : "404", + "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", @@ -271,9 +273,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 required.", - "Please upgrade your database version." : "Please upgrade your database version.", "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." + "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 8c21f0716f9..f8d87ba5b06 100644 --- a/lib/l10n/ka.json +++ b/lib/l10n/ka.json @@ -17,7 +17,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s and %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s and %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s and %5$s", - "Education Edition" : "Education Edition", "Enterprise bundle" : "Enterprise bundle", "Groupware bundle" : "Groupware bundle", "Hub bundle" : "Hub bundle", @@ -74,14 +73,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.", + "Dot files are not allowed" : "Dot files are not allowed", "File already exists" : "File already exists", "Invalid path" : "Invalid path", "Failed to create file from template" : "Failed to create file from template", "Templates" : "Templates", - "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", - "Dot files are not allowed" : "Dot files are not allowed", + "Filename contains at least one invalid character" : "Filename contains at least one invalid character", "Empty filename is not allowed" : "Empty filename is not allowed", "App \"%s\" cannot be installed because appinfo file cannot be read." : "App \"%s\" cannot be installed because appinfo file cannot be read.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "App \"%s\" cannot be installed because it is not compatible with this version of the server.", @@ -125,11 +122,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Sharing backend %s must implement the interface OCP\\Share_Backend", "Sharing backend %s not found" : "Sharing backend %s not found", "Sharing backend for %s not found" : "Sharing backend for %s not found", + "%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.", + "Open »%s«" : "Open »%s«", + "%1$s via %2$s" : "%1$s via %2$s", "%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«", - "%1$s via %2$s" : "%1$s via %2$s", + "Unknown share type" : "Unknown share type", "You are not allowed to share %s" : "You are not allowed to share %s", "Cannot increase permissions of %s" : "Cannot increase permissions of %s", "Files cannot be shared with delete permissions" : "Files cannot be shared with delete permissions", @@ -137,9 +138,6 @@ "Expiration date is in the past" : "Expiration date is in the past", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Cannot set expiration date more than %n day in the future","Cannot set expiration date more than %n days in the future"], "Sharing is only allowed with group members" : "Sharing is only allowed with group members", - "%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 requested share does not exist anymore" : "The requested share does not exist anymore", "The requested share comes from a disabled user" : "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." : "The user was not created because the user limit has been reached. Check your notifications to learn more.", @@ -225,7 +223,6 @@ "Your data directory must be an absolute path." : "Your data directory must be an absolute path.", "Check the value of \"datadirectory\" in your configuration." : "Check the value of \"datadirectory\" in your configuration.", "Your data directory is invalid." : "Your data directory is invalid.", - "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.", "Action \"%s\" not supported or implemented." : "Action \"%s\" not supported or implemented.", "Authentication failed, wrong token or provider ID given" : "Authentication failed, wrong token or provider ID given", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Parameters missing in order to complete the request. Missing Parameters: \"%s\"", @@ -242,15 +239,20 @@ "Summarize" : "Summarize", "Summary" : "Summary", "Extract topics" : "Extract topics", + "Translate" : "Translate", + "Result" : "Result", "Free prompt" : "Free prompt", "Runs an arbitrary prompt through the language model." : "Runs an arbitrary prompt through the language model.", "Generate headline" : "Generate headline", "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.", - "404" : "404", + "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", @@ -269,9 +271,8 @@ "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 required.", - "Please upgrade your database version." : "Please upgrade your database version.", "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." + "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 2f840751e49..df50ad96f64 100644 --- a/lib/l10n/ka_GE.js +++ b/lib/l10n/ka_GE.js @@ -9,7 +9,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s და %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s და %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s და %5$s", - "Education Edition" : "საგანმანათლებლო გამოცემა", "Enterprise bundle" : "ენტერპრაის კონსტრუქცია", "Groupware bundle" : "ჯგუფური კონსტრუქცია", "Social sharing bundle" : "სოციალური გაზიარების შეკვრა", @@ -45,11 +44,9 @@ OC.L10N.register( "in a few seconds" : "რამდენიმე წამში", "seconds ago" : "წამის წინ", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "მოდული ID-ით: %s არ არსებობს. გთხოვთ აამოქმედოთ ის აპლიკაციების პარამეტრებში ან დაუკავშირდეთ ადმინისტრატორს.", - "File already exists" : "ფაილი უკვე არსებობს", - "File name is a reserved word" : "ფაილის სახელი რეზერვირებული სიტყვაა", - "File name contains at least one invalid character" : "ფაილის სახელი მოიცავს დაუშვებელ სიმბოლოს", - "File name is too long" : "ფაილის სახელი ზედმეტად გრძელია", "Dot files are not allowed" : "წერტილოვანი ფაილები არაა ნებადართლი", + "File already exists" : "ფაილი უკვე არსებობს", + "Filename contains at least one invalid character" : "ფაილის სახელი შეიცავს მინ. 1 არასწორ ნიშანს", "Empty filename is not allowed" : "ცარიელი ფაილის სახელი არაა ნებადართული", "App \"%s\" cannot be installed because appinfo file cannot be read." : "აპლიკაცია \"%s\" ვერ ყენდება, რადგან appinfo ფაილი არ იკითხება.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "აპლიკაცია \"%s\" ვერ ყენდება, რადგან ის ამ სერვერის ვერსიასთან არაა თავსებადი.", @@ -77,11 +74,12 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "გაზიარების ბექენდმა %s-მ მოქმედებაში უნდა მოიყვანოს ინტეფეისი OCP\\Share_Backend", "Sharing backend %s not found" : "გაზიარების ბექენდი %s ვერ იქნა ნაპოვნი", "Sharing backend for %s not found" : "გაზიარების ბექენდი %s-თვის ვერ იქნა ნაპოვნი", + "Click the button below to open it." : "გასახსნელად დააჭირეთ ქვემოთ მყოფ ღილაკს.", "Open »%s«" : "გახნსნა »%s«", + "Unknown share type" : "ამოუცნობი გაზიარების სახეობა", "You are not allowed to share %s" : "თქვენ არ გაქვთ უფლება გააზიაროთ %s", "Cannot increase permissions of %s" : "%s-ის უფლებების გაზრდა ვერ ხერხდება", "Expiration date is in the past" : "ვადის ამოწურვის თარიღი წარსულშია", - "Click the button below to open it." : "გასახსნელად დააჭირეთ ქვემოთ მყოფ ღილაკს.", "The requested share does not exist anymore" : "მოთხოვნილი გაზიარება მეტი აღარ არსებობს", "Could not find category \"%s\"" : "\"%s\" კატეგორიის მოძებნა ვერ მოხერხდა", "Sunday" : "კვირა", @@ -145,7 +143,6 @@ OC.L10N.register( "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "ეს შესაძლოა გამოწვეული იყოს ისეთი კეშით/აქსელერატორით როგორიცაა Zend OPcache ან eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP მოდულები დაყენდა, მაგრამ მაინც ჩამოწერილია როგორც არმყოფები?", "Please ask your server administrator to restart the web server." : "გთხოვთ სთხოვოთ თქვენს სერვერის ადმინისტრატორს გადატვირთოს ვებ-სერვერი.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "დარწმუნდით რომ ფაილი სახელად \".ocdata\" მონაცემების დირექტორიის საწყისშია.", "Could not obtain lock type %d on \"%s\"." : "ჩაკეთვის ტიპის %d მოძიება \"%s\"-ზე ვერ მოხერხდა.", "Storage unauthorized. %s" : "საცავი არაავტორიზირებულია. %s", "Storage incomplete configuration. %s" : "საცავის არასრული კონფიგურაცია. %s", @@ -153,7 +150,13 @@ OC.L10N.register( "Storage is temporarily not available" : "საცავი დროებით ხელმიუწვდომელია", "Storage connection timeout. %s" : "საცავის კავშირის დროის ამოწურვა. %s", "Summary" : "შეჯამება", + "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" : "ამოუცნობი მომხმარებელი", @@ -167,6 +170,7 @@ OC.L10N.register( "Username contains whitespace at the beginning or at the end" : "მომხმარებლის სახელი დასაწყისსში ან დასასრულში მოიცავს სიცარიელეს", "Username must not consist of dots only" : "მომხმარებლის სახელი ვერ იქნება შემდგარი მხოლოდ წერტილებისგან", "User disabled" : "მომხმარებელი გათიშულია", - "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "გთხოვთ შეცვალოთ უფლებები 0770-ზე, რათა დირექტორია სხვა მომხმარებლების მიერ აღარ იყოს კითხვადი." + "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 8a72816e10f..bce62e51452 100644 --- a/lib/l10n/ka_GE.json +++ b/lib/l10n/ka_GE.json @@ -7,7 +7,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s და %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s და %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s და %5$s", - "Education Edition" : "საგანმანათლებლო გამოცემა", "Enterprise bundle" : "ენტერპრაის კონსტრუქცია", "Groupware bundle" : "ჯგუფური კონსტრუქცია", "Social sharing bundle" : "სოციალური გაზიარების შეკვრა", @@ -43,11 +42,9 @@ "in a few seconds" : "რამდენიმე წამში", "seconds ago" : "წამის წინ", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "მოდული ID-ით: %s არ არსებობს. გთხოვთ აამოქმედოთ ის აპლიკაციების პარამეტრებში ან დაუკავშირდეთ ადმინისტრატორს.", - "File already exists" : "ფაილი უკვე არსებობს", - "File name is a reserved word" : "ფაილის სახელი რეზერვირებული სიტყვაა", - "File name contains at least one invalid character" : "ფაილის სახელი მოიცავს დაუშვებელ სიმბოლოს", - "File name is too long" : "ფაილის სახელი ზედმეტად გრძელია", "Dot files are not allowed" : "წერტილოვანი ფაილები არაა ნებადართლი", + "File already exists" : "ფაილი უკვე არსებობს", + "Filename contains at least one invalid character" : "ფაილის სახელი შეიცავს მინ. 1 არასწორ ნიშანს", "Empty filename is not allowed" : "ცარიელი ფაილის სახელი არაა ნებადართული", "App \"%s\" cannot be installed because appinfo file cannot be read." : "აპლიკაცია \"%s\" ვერ ყენდება, რადგან appinfo ფაილი არ იკითხება.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "აპლიკაცია \"%s\" ვერ ყენდება, რადგან ის ამ სერვერის ვერსიასთან არაა თავსებადი.", @@ -75,11 +72,12 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "გაზიარების ბექენდმა %s-მ მოქმედებაში უნდა მოიყვანოს ინტეფეისი OCP\\Share_Backend", "Sharing backend %s not found" : "გაზიარების ბექენდი %s ვერ იქნა ნაპოვნი", "Sharing backend for %s not found" : "გაზიარების ბექენდი %s-თვის ვერ იქნა ნაპოვნი", + "Click the button below to open it." : "გასახსნელად დააჭირეთ ქვემოთ მყოფ ღილაკს.", "Open »%s«" : "გახნსნა »%s«", + "Unknown share type" : "ამოუცნობი გაზიარების სახეობა", "You are not allowed to share %s" : "თქვენ არ გაქვთ უფლება გააზიაროთ %s", "Cannot increase permissions of %s" : "%s-ის უფლებების გაზრდა ვერ ხერხდება", "Expiration date is in the past" : "ვადის ამოწურვის თარიღი წარსულშია", - "Click the button below to open it." : "გასახსნელად დააჭირეთ ქვემოთ მყოფ ღილაკს.", "The requested share does not exist anymore" : "მოთხოვნილი გაზიარება მეტი აღარ არსებობს", "Could not find category \"%s\"" : "\"%s\" კატეგორიის მოძებნა ვერ მოხერხდა", "Sunday" : "კვირა", @@ -143,7 +141,6 @@ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "ეს შესაძლოა გამოწვეული იყოს ისეთი კეშით/აქსელერატორით როგორიცაა Zend OPcache ან eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "PHP მოდულები დაყენდა, მაგრამ მაინც ჩამოწერილია როგორც არმყოფები?", "Please ask your server administrator to restart the web server." : "გთხოვთ სთხოვოთ თქვენს სერვერის ადმინისტრატორს გადატვირთოს ვებ-სერვერი.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "დარწმუნდით რომ ფაილი სახელად \".ocdata\" მონაცემების დირექტორიის საწყისშია.", "Could not obtain lock type %d on \"%s\"." : "ჩაკეთვის ტიპის %d მოძიება \"%s\"-ზე ვერ მოხერხდა.", "Storage unauthorized. %s" : "საცავი არაავტორიზირებულია. %s", "Storage incomplete configuration. %s" : "საცავის არასრული კონფიგურაცია. %s", @@ -151,7 +148,13 @@ "Storage is temporarily not available" : "საცავი დროებით ხელმიუწვდომელია", "Storage connection timeout. %s" : "საცავის კავშირის დროის ამოწურვა. %s", "Summary" : "შეჯამება", + "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" : "ამოუცნობი მომხმარებელი", @@ -165,6 +168,7 @@ "Username contains whitespace at the beginning or at the end" : "მომხმარებლის სახელი დასაწყისსში ან დასასრულში მოიცავს სიცარიელეს", "Username must not consist of dots only" : "მომხმარებლის სახელი ვერ იქნება შემდგარი მხოლოდ წერტილებისგან", "User disabled" : "მომხმარებელი გათიშულია", - "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "გთხოვთ შეცვალოთ უფლებები 0770-ზე, რათა დირექტორია სხვა მომხმარებლების მიერ აღარ იყოს კითხვადი." + "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 9d49611fe20..3f910bbf965 100644 --- a/lib/l10n/kab.js +++ b/lib/l10n/kab.js @@ -12,6 +12,7 @@ OC.L10N.register( "Website" : "Asmel web", "Address" : "Adresse", "About" : "Γef", + "Translate" : "Suqel", "Help" : "Tallalt", "Users" : "Iseqdacen" }, diff --git a/lib/l10n/kab.json b/lib/l10n/kab.json index f44da994ada..d121f39e512 100644 --- a/lib/l10n/kab.json +++ b/lib/l10n/kab.json @@ -10,6 +10,7 @@ "Website" : "Asmel web", "Address" : "Adresse", "About" : "Γef", + "Translate" : "Suqel", "Help" : "Tallalt", "Users" : "Iseqdacen" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/lib/l10n/ko.js b/lib/l10n/ko.js index 3d87dcd1bc8..0f74713294c 100644 --- a/lib/l10n/ko.js +++ b/lib/l10n/ko.js @@ -18,7 +18,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s 및 %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s 및 %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s 및 %5$s", - "Education Edition" : "교육용 에디션", "Enterprise bundle" : "엔터프라이즈 번들", "Groupware bundle" : "그룹웨어 번들", "Hub bundle" : "Hub 번들", @@ -78,14 +77,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인 모듈이 존재하지 않습니다. 앱 설정에서 확인하거나 시스템 관리자에게 연락하십시오.", + "Dot files are not allowed" : "점으로 시작하는 파일은 허용되지 않음", "File already exists" : "파일이 이미 있습니다.", "Invalid path" : "잘못된 경로", "Failed to create file from template" : "템플릿으로 새 파일을 만들 수 없음", "Templates" : "템플릿", - "File name is a reserved word" : "파일 이름이 예약된 단어임", - "File name contains at least one invalid character" : "파일 이름에 잘못된 글자가 한 자 이상 있음", - "File name is too long" : "파일 이름이 너무 김", - "Dot files are not allowed" : "점으로 시작하는 파일은 허용되지 않음", + "Filename contains at least one invalid character" : "파일 이름에 잘못된 글자가 한 자 이상 있음", "Empty filename is not allowed" : "파일 이름을 비워 둘 수 없음", "App \"%s\" cannot be installed because appinfo file cannot be read." : "appinfo 파일을 읽을 수 없어서 앱 \"%s\"을(를) 설치할 수 없습니다.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "이 서버 버전과 호환되지 않아서 앱 \"%s\"을(를) 설치할 수 없습니다", @@ -130,11 +127,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "공유 백엔드 %s에서 OCP\\Share_Backend 인터페이스를 구현해야 함", "Sharing backend %s not found" : "공유 백엔드 %s을(를) 찾을 수 없음", "Sharing backend for %s not found" : "%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." : "아래 단추를 눌러서 열 수 있습니다.", + "Open »%s«" : "%s 열기", + "%1$s via %2$s" : "%1$s(%2$s 경유)", "%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 열기", - "%1$s via %2$s" : "%1$s(%2$s 경유)", + "Unknown share type" : "알 수 없는 공유 형식", "You are not allowed to share %s" : "%s을(를) 공유할 수 있는 권한이 없습니다", "Cannot increase permissions of %s" : "%s의 권한을 늘릴 수 없습니다.", "Files cannot be shared with delete permissions" : "파일을 삭제 권한으로 공유할 수 없습니다", @@ -143,9 +144,6 @@ 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_" : ["만료 날짜는 최대 %s일까지 설정할 수 있습니다"], "Sharing is only allowed with group members" : "같은 그룹 사용자에게만 공유할 수 있습니다", "Sharing %s failed, because this item is already shared with the account %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 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." : "사용자 수 제한에 도달하여 사용자를 만들 수 없습니다. 더 자세한 정보는 알림을 참조하십시오.", @@ -233,7 +231,6 @@ OC.L10N.register( "Your data directory must be an absolute path." : "데이터 디렉토리는 절대경로여야 합니다.", "Check the value of \"datadirectory\" in your configuration." : "설정에서 \"datadirectory\"의 값을 확인하십시오.", "Your data directory is invalid." : "데이터 디렉토리가 올바르지 않습니다.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "데이터 디렉터리의 최상위 디렉터리에 \".ocdata\" 파일이 있는지 확인하십시오.", "Action \"%s\" not supported or implemented." : "동작 \"%s\"을(를) 지원하지 않거나 사용할 수 없습니다. ", "Authentication failed, wrong token or provider ID given" : "인증이 실패하였습니다. 토큰이나 프로바이더 ID가 틀렸습니다.", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "요청을 완료하기 위한 매개변수가 누락되었습니다. 누락된 매개변수: \"%s\"", @@ -246,6 +243,7 @@ OC.L10N.register( "Storage is temporarily not available" : "저장소를 임시로 사용할 수 없음", "Storage connection timeout. %s" : "저장소 연결 시간이 초과되었습니다. %s", "Audio input" : "음성 입력", + "Context write" : "컨텍스트 쓰기", "Writes text in a given style based on the provided source material." : "제공된 소스 자료를 기반으로 특정 스타일로 텍스트를 작성합니다.", "Writing style" : "작문 스타일", "Source material" : "소스 자료", @@ -256,12 +254,18 @@ OC.L10N.register( "Summarize" : "요약", "Summary" : "요약", "Extract topics" : "주제 추출", + "Translate" : "번역:", + "Result" : "결과", "Generate headline" : "헤드라인 생성", "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" : "알려지지 않은 사용자", @@ -280,9 +284,8 @@ OC.L10N.register( "Username must not consist of dots only" : "사용자 이름에 마침표만 있으면 안 됩니다", "Username is invalid because files already exist for this user" : "무효한 사용자이름. 이미 존재함", "User disabled" : "사용자 비활성화됨", - "PostgreSQL >= 9 required." : "PostgreSQL 버전 9 이상이 필요합니다", - "Please upgrade your database version." : "데이터베이스 버전을 업그레이드 하십시오", "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으로 변경하여 다른 사용자가 읽을 수 없도록 하십시오." + "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 a716aa6d7b7..284505f991e 100644 --- a/lib/l10n/ko.json +++ b/lib/l10n/ko.json @@ -16,7 +16,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s 및 %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s 및 %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s 및 %5$s", - "Education Edition" : "교육용 에디션", "Enterprise bundle" : "엔터프라이즈 번들", "Groupware bundle" : "그룹웨어 번들", "Hub bundle" : "Hub 번들", @@ -76,14 +75,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인 모듈이 존재하지 않습니다. 앱 설정에서 확인하거나 시스템 관리자에게 연락하십시오.", + "Dot files are not allowed" : "점으로 시작하는 파일은 허용되지 않음", "File already exists" : "파일이 이미 있습니다.", "Invalid path" : "잘못된 경로", "Failed to create file from template" : "템플릿으로 새 파일을 만들 수 없음", "Templates" : "템플릿", - "File name is a reserved word" : "파일 이름이 예약된 단어임", - "File name contains at least one invalid character" : "파일 이름에 잘못된 글자가 한 자 이상 있음", - "File name is too long" : "파일 이름이 너무 김", - "Dot files are not allowed" : "점으로 시작하는 파일은 허용되지 않음", + "Filename contains at least one invalid character" : "파일 이름에 잘못된 글자가 한 자 이상 있음", "Empty filename is not allowed" : "파일 이름을 비워 둘 수 없음", "App \"%s\" cannot be installed because appinfo file cannot be read." : "appinfo 파일을 읽을 수 없어서 앱 \"%s\"을(를) 설치할 수 없습니다.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "이 서버 버전과 호환되지 않아서 앱 \"%s\"을(를) 설치할 수 없습니다", @@ -128,11 +125,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "공유 백엔드 %s에서 OCP\\Share_Backend 인터페이스를 구현해야 함", "Sharing backend %s not found" : "공유 백엔드 %s을(를) 찾을 수 없음", "Sharing backend for %s not found" : "%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." : "아래 단추를 눌러서 열 수 있습니다.", + "Open »%s«" : "%s 열기", + "%1$s via %2$s" : "%1$s(%2$s 경유)", "%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 열기", - "%1$s via %2$s" : "%1$s(%2$s 경유)", + "Unknown share type" : "알 수 없는 공유 형식", "You are not allowed to share %s" : "%s을(를) 공유할 수 있는 권한이 없습니다", "Cannot increase permissions of %s" : "%s의 권한을 늘릴 수 없습니다.", "Files cannot be shared with delete permissions" : "파일을 삭제 권한으로 공유할 수 없습니다", @@ -141,9 +142,6 @@ "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["만료 날짜는 최대 %s일까지 설정할 수 있습니다"], "Sharing is only allowed with group members" : "같은 그룹 사용자에게만 공유할 수 있습니다", "Sharing %s failed, because this item is already shared with the account %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 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." : "사용자 수 제한에 도달하여 사용자를 만들 수 없습니다. 더 자세한 정보는 알림을 참조하십시오.", @@ -231,7 +229,6 @@ "Your data directory must be an absolute path." : "데이터 디렉토리는 절대경로여야 합니다.", "Check the value of \"datadirectory\" in your configuration." : "설정에서 \"datadirectory\"의 값을 확인하십시오.", "Your data directory is invalid." : "데이터 디렉토리가 올바르지 않습니다.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "데이터 디렉터리의 최상위 디렉터리에 \".ocdata\" 파일이 있는지 확인하십시오.", "Action \"%s\" not supported or implemented." : "동작 \"%s\"을(를) 지원하지 않거나 사용할 수 없습니다. ", "Authentication failed, wrong token or provider ID given" : "인증이 실패하였습니다. 토큰이나 프로바이더 ID가 틀렸습니다.", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "요청을 완료하기 위한 매개변수가 누락되었습니다. 누락된 매개변수: \"%s\"", @@ -244,6 +241,7 @@ "Storage is temporarily not available" : "저장소를 임시로 사용할 수 없음", "Storage connection timeout. %s" : "저장소 연결 시간이 초과되었습니다. %s", "Audio input" : "음성 입력", + "Context write" : "컨텍스트 쓰기", "Writes text in a given style based on the provided source material." : "제공된 소스 자료를 기반으로 특정 스타일로 텍스트를 작성합니다.", "Writing style" : "작문 스타일", "Source material" : "소스 자료", @@ -254,12 +252,18 @@ "Summarize" : "요약", "Summary" : "요약", "Extract topics" : "주제 추출", + "Translate" : "번역:", + "Result" : "결과", "Generate headline" : "헤드라인 생성", "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" : "알려지지 않은 사용자", @@ -278,9 +282,8 @@ "Username must not consist of dots only" : "사용자 이름에 마침표만 있으면 안 됩니다", "Username is invalid because files already exist for this user" : "무효한 사용자이름. 이미 존재함", "User disabled" : "사용자 비활성화됨", - "PostgreSQL >= 9 required." : "PostgreSQL 버전 9 이상이 필요합니다", - "Please upgrade your database version." : "데이터베이스 버전을 업그레이드 하십시오", "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으로 변경하여 다른 사용자가 읽을 수 없도록 하십시오." + "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 350037c3e1a..a107b551717 100644 --- a/lib/l10n/lb.js +++ b/lib/l10n/lb.js @@ -67,6 +67,7 @@ OC.L10N.register( "Dec." : "Dez.", "Authentication error" : "Authentifikatioun's Fehler", "Storage is temporarily not available" : "Späicherplaatz temporär net erreeschbar", + "Translate" : "Iwwersetzen", "Help" : "Hëllef", "Users" : "Benotzer" }, diff --git a/lib/l10n/lb.json b/lib/l10n/lb.json index 4b0b0300c90..144a73b024b 100644 --- a/lib/l10n/lb.json +++ b/lib/l10n/lb.json @@ -65,6 +65,7 @@ "Dec." : "Dez.", "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);" diff --git a/lib/l10n/lo.js b/lib/l10n/lo.js index 4cbc67b0b45..150cf4f4a57 100644 --- a/lib/l10n/lo.js +++ b/lib/l10n/lo.js @@ -5,6 +5,7 @@ OC.L10N.register( "Invalid image" : "ບໍ່ມີຮູບພາບ", "Files" : "ຟາຍ", "seconds ago" : "ວິນາທີຜ່ານມາ", + "Filename contains at least one invalid character" : "ຊື່ຟາຍມີລັກສະນະທີ່ບໍ່ຖືກຕ້ອງ", "__language_name__" : "ຂີ້ຕົວະ", "Apps" : "ແອັບພລິເຄຊັນ", "Settings" : "ການຕັ້ງຄ່າ", @@ -16,6 +17,7 @@ OC.L10N.register( "Address" : "ທີ່ຢູ່", "About" : "ກ່ຽວກັບ", "Role" : "ພາລະບົດບາດ", + "Translate" : "ແປ", "Help" : "ການຊ່ວຍເຫຼືອ", "Users" : "ຜູ້ໃຊ້", "User disabled" : "ປິດຊື່ຜູ້ໃຊ້" diff --git a/lib/l10n/lo.json b/lib/l10n/lo.json index 2edaeff64ef..c67941ae01a 100644 --- a/lib/l10n/lo.json +++ b/lib/l10n/lo.json @@ -3,6 +3,7 @@ "Invalid image" : "ບໍ່ມີຮູບພາບ", "Files" : "ຟາຍ", "seconds ago" : "ວິນາທີຜ່ານມາ", + "Filename contains at least one invalid character" : "ຊື່ຟາຍມີລັກສະນະທີ່ບໍ່ຖືກຕ້ອງ", "__language_name__" : "ຂີ້ຕົວະ", "Apps" : "ແອັບພລິເຄຊັນ", "Settings" : "ການຕັ້ງຄ່າ", @@ -14,6 +15,7 @@ "Address" : "ທີ່ຢູ່", "About" : "ກ່ຽວກັບ", "Role" : "ພາລະບົດບາດ", + "Translate" : "ແປ", "Help" : "ການຊ່ວຍເຫຼືອ", "Users" : "ຜູ້ໃຊ້", "User disabled" : "ປິດຊື່ຜູ້ໃຊ້" diff --git a/lib/l10n/lt_LT.js b/lib/l10n/lt_LT.js index a6ad68fc69d..99dd4a01f53 100644 --- a/lib/l10n/lt_LT.js +++ b/lib/l10n/lt_LT.js @@ -59,9 +59,7 @@ OC.L10N.register( "File already exists" : "Failas jau yra", "Invalid path" : "Neteisingas kelias", "Templates" : "Šablonai", - "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", + "Filename contains at least one invalid character" : "Failo pavadinime yra bent vienas neteisingas simbolis", "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.", @@ -93,17 +91,18 @@ 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į.", + "%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.", + "Open »%s«" : "Atverti \"%s\"", + "%1$s via %2$s" : "%1$s per %2$s", "%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\"", - "%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", - "%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 requested share does not exist anymore" : "Pageidaujamas bendrinimas daugiau neegzistuoja.", "Could not find category \"%s\"" : "Nepavyko rasti kategorijos „%s“", "Sunday" : "Sekmadienis", @@ -166,7 +165,6 @@ OC.L10N.register( "Adjusting this setting in php.ini will make Nextcloud run again" : "Šių nustatymų pritaikymas php.ini faile, iš naujo paleis Nextcloud", "PHP modules have been installed, but they are still listed as missing?" : "PHP moduliai yra įdiegti, bet jų vis tiek trūksta?", "Please ask your server administrator to restart the web server." : "Kreipkitės į savo sistemos administratorių, kad jis perkrautų žiniatinklio serverį.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Įsitikinkite, kad šakniniame duomenų kataloge yra failas, pavadinimu „.ocdata“.", "Action \"%s\" not supported or implemented." : "Veiksmas \"%s\" nepalaikomas ar neįgyvendintas.", "Authentication failed, wrong token or provider ID given" : "Tapatybės nustatymas nepavyko, nurodytas neteisingas prieigos raktas arba teikėjo ID", "Could not obtain lock type %d on \"%s\"." : "Nepavyko gauti užrakto tipo %d ties „%s“.", @@ -176,7 +174,11 @@ OC.L10N.register( "Storage is temporarily not available" : "Saugykla yra laikinai neprieinama", "Storage connection timeout. %s" : "Sujungimo su saugykla laikas baigėsi. %s", "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", @@ -191,6 +193,7 @@ OC.L10N.register( "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", - "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." + "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.", + "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 ff35352d8ea..6992726e88d 100644 --- a/lib/l10n/lt_LT.json +++ b/lib/l10n/lt_LT.json @@ -57,9 +57,7 @@ "File already exists" : "Failas jau yra", "Invalid path" : "Neteisingas kelias", "Templates" : "Šablonai", - "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", + "Filename contains at least one invalid character" : "Failo pavadinime yra bent vienas neteisingas simbolis", "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.", @@ -91,17 +89,18 @@ "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į.", + "%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.", + "Open »%s«" : "Atverti \"%s\"", + "%1$s via %2$s" : "%1$s per %2$s", "%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\"", - "%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", - "%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 requested share does not exist anymore" : "Pageidaujamas bendrinimas daugiau neegzistuoja.", "Could not find category \"%s\"" : "Nepavyko rasti kategorijos „%s“", "Sunday" : "Sekmadienis", @@ -164,7 +163,6 @@ "Adjusting this setting in php.ini will make Nextcloud run again" : "Šių nustatymų pritaikymas php.ini faile, iš naujo paleis Nextcloud", "PHP modules have been installed, but they are still listed as missing?" : "PHP moduliai yra įdiegti, bet jų vis tiek trūksta?", "Please ask your server administrator to restart the web server." : "Kreipkitės į savo sistemos administratorių, kad jis perkrautų žiniatinklio serverį.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Įsitikinkite, kad šakniniame duomenų kataloge yra failas, pavadinimu „.ocdata“.", "Action \"%s\" not supported or implemented." : "Veiksmas \"%s\" nepalaikomas ar neįgyvendintas.", "Authentication failed, wrong token or provider ID given" : "Tapatybės nustatymas nepavyko, nurodytas neteisingas prieigos raktas arba teikėjo ID", "Could not obtain lock type %d on \"%s\"." : "Nepavyko gauti užrakto tipo %d ties „%s“.", @@ -174,7 +172,11 @@ "Storage is temporarily not available" : "Saugykla yra laikinai neprieinama", "Storage connection timeout. %s" : "Sujungimo su saugykla laikas baigėsi. %s", "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", @@ -189,6 +191,7 @@ "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", - "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." + "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.", + "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 bd338f31430..88e40d99a66 100644 --- a/lib/l10n/lv.js +++ b/lib/l10n/lv.js @@ -37,8 +37,7 @@ OC.L10N.register( "_%n minute ago_::_%n minutes ago_" : ["%n minūtes atpakaļ","%n minūtes atpakaļ","%n minūtēm"], "seconds ago" : "sekundēm", "File already exists" : "Datne jau pastāv", - "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š", + "Filename contains at least one invalid character" : "Datnes nosaukums satur vismaz vienu nederīgu rakstzīmi", "Empty filename is not allowed" : "Tukšs datnes nosaukums nav atļauts", "__language_name__" : "Latviešu", "Help & privacy" : "Palīdzība un privātums", @@ -60,6 +59,7 @@ OC.L10N.register( "Oracle connection could not be established" : "Nevar izveidot savienojumu ar Oracle", "Set an admin password." : "Iestatiet administratora paroli.", "Open »%s«" : "Atvērt »%s«", + "Unknown share type" : "Nezināms kopīgošanas veids", "You are not allowed to share %s" : "Tev nav ļauts dalīties ar %s", "Could not find category \"%s\"" : "Nevarēja atrast kategoriju “%s”", "Sunday" : "Svētdiena", @@ -125,7 +125,9 @@ OC.L10N.register( "Storage is temporarily not available" : "Glabātuve īslaicīgi nav pieejama", "Storage connection timeout. %s" : "Datu savienojuma taimauts. %s", "Summary" : "Kopsavilkums", - "404" : "404", + "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", diff --git a/lib/l10n/lv.json b/lib/l10n/lv.json index cf69af0b400..8e166a86c4e 100644 --- a/lib/l10n/lv.json +++ b/lib/l10n/lv.json @@ -35,8 +35,7 @@ "_%n minute ago_::_%n minutes ago_" : ["%n minūtes atpakaļ","%n minūtes atpakaļ","%n minūtēm"], "seconds ago" : "sekundēm", "File already exists" : "Datne jau pastāv", - "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š", + "Filename contains at least one invalid character" : "Datnes nosaukums satur vismaz vienu nederīgu rakstzīmi", "Empty filename is not allowed" : "Tukšs datnes nosaukums nav atļauts", "__language_name__" : "Latviešu", "Help & privacy" : "Palīdzība un privātums", @@ -58,6 +57,7 @@ "Oracle connection could not be established" : "Nevar izveidot savienojumu ar Oracle", "Set an admin password." : "Iestatiet administratora paroli.", "Open »%s«" : "Atvērt »%s«", + "Unknown share type" : "Nezināms kopīgošanas veids", "You are not allowed to share %s" : "Tev nav ļauts dalīties ar %s", "Could not find category \"%s\"" : "Nevarēja atrast kategoriju “%s”", "Sunday" : "Svētdiena", @@ -123,7 +123,9 @@ "Storage is temporarily not available" : "Glabātuve īslaicīgi nav pieejama", "Storage connection timeout. %s" : "Datu savienojuma taimauts. %s", "Summary" : "Kopsavilkums", - "404" : "404", + "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", diff --git a/lib/l10n/mk.js b/lib/l10n/mk.js index 52097244e45..129535fc32e 100644 --- a/lib/l10n/mk.js +++ b/lib/l10n/mk.js @@ -18,7 +18,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s и %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s и %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s и %5$s", - "Education Edition" : "Едукативно издание", "Enterprise bundle" : "Професионален пакет", "Groupware bundle" : "Пакет со групни производи", "Hub bundle" : "Централизиран пакет", @@ -75,14 +74,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 не постои. Овозможете го во параметрите на апликациите или контактирајте администратор.", + "Dot files are not allowed" : "Датотеки само со точки не се дозволени", "File already exists" : "Датотека веќе постои", "Invalid path" : "Невалидна патека", "Failed to create file from template" : "Неуспешно креирање на датотека од шаблон", "Templates" : "Шаблони", - "File name is a reserved word" : "Името на датотеката е резервиран збор", - "File name contains at least one invalid character" : "Името на датотеката соджи невалиден карактер", - "File name is too long" : "Името на датотеката е премногу долго", - "Dot files are not allowed" : "Датотеки само со точки не се дозволени", + "Filename contains at least one invalid character" : "Името на датотеката соджи невалиден карактер", "Empty filename is not allowed" : "Датотеки без име не се дозволени", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Апликацијата \"%s\" неможе да се инсталира бидејќи датотеката appinfo неможе да се прочита.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Апликацијата \"%s\" неможе да се инсталира бидејќи не е компатибилна со верзијата на серверот.", @@ -126,11 +123,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "За позадинското споделување %s мора се имплементира интерфејсот OCP\\Share_Backend", "Sharing backend %s not found" : "Не е пронајдено позадинско споделување %s", "Sharing backend for %s not found" : "Не е пронајдено позадинско споделување за %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." : "Кликнете на копчето подолу за да ја отворите.", + "Open »%s«" : "Отвори »%s«", + "%1$s via %2$s" : "%1$s преку %2$s", "%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«", - "%1$s via %2$s" : "%1$s преку %2$s", + "Unknown share type" : "Непознат вид на споделување", "You are not allowed to share %s" : "Не сте овластени да ја споделите %s", "Cannot increase permissions of %s" : "Неможат да се зголемат дозволите на %s", "Files cannot be shared with delete permissions" : "Датотеки неможат да бидат споделени со дозвола за бришење", @@ -138,9 +139,6 @@ OC.L10N.register( "Expiration date is in the past" : "Рокот на траење е во минато време", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Неможе да се постави рок на траење повеќе од 1 ден","Неможе да се постави рок на траење повеќе од %s дена"], "Sharing is only allowed with group members" : "Споделувањето е овозможено само со членови на групата", - "%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 requested share does not exist anymore" : "Споделувањето не постои повеќе", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Корисникот не е креиран затоа што максималниот број на корисници е достигнат. Проверете ги вашите известувања за да дознаете повеќе.", "Could not find category \"%s\"" : "Не можам да најдам категорија „%s“", @@ -225,7 +223,6 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Вашата папка со податоци мора да биде апсолутна патека.", "Check the value of \"datadirectory\" in your configuration." : "Проверете ја вредноста на \"datadirectory\" во вашата конфигурација.", "Your data directory is invalid." : "Вашата папка со податоци не е валидна.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Осигурете се дека има датотека наречена \".ocdata\" во главната папка со податоци.", "Action \"%s\" not supported or implemented." : "Акцијата \"%s\" не е поддржана или не е имплементирана.", "Authentication failed, wrong token or provider ID given" : "Неуспешна автентификација, погрешен токен или зададен погрешен ИД", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Некој параметри недостасуваат за да се комплетира барањето.Параметри шо недостасуваат: \"%s\"", @@ -238,11 +235,15 @@ OC.L10N.register( "Storage is temporarily not available" : "Складиштето моментално не е достапно", "Storage connection timeout. %s" : "Поврзувањето со складиштето не успеа. %s", "Summary" : "Резиме", + "Translate" : "Преведи", "Generate headline" : "Генерирај заглавие", - "404" : "404", + "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" : "Непознат корисник", @@ -261,9 +262,8 @@ OC.L10N.register( "Username must not consist of dots only" : "Корисничкото име не смее да се состои само од точки", "Username is invalid because files already exist for this user" : "Невалидно корисничкото име бидејќи веќе постојат датотеки за овој корисник", "User disabled" : "Оневозможен корисник", - "PostgreSQL >= 9 required." : "Потребно е PostgreSQL >= 9 ", - "Please upgrade your database version." : "Ве молиме надградете ја верзијата на базата со податоци", "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, за да неможе да се чита од други корисници." + "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 bf37e27837d..dd91de2c1b8 100644 --- a/lib/l10n/mk.json +++ b/lib/l10n/mk.json @@ -16,7 +16,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s и %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s и %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s и %5$s", - "Education Edition" : "Едукативно издание", "Enterprise bundle" : "Професионален пакет", "Groupware bundle" : "Пакет со групни производи", "Hub bundle" : "Централизиран пакет", @@ -73,14 +72,12 @@ "seconds ago" : "пред неколку секунди", "Empty file" : "Празна датотека", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Модул со ИД: %s не постои. Овозможете го во параметрите на апликациите или контактирајте администратор.", + "Dot files are not allowed" : "Датотеки само со точки не се дозволени", "File already exists" : "Датотека веќе постои", "Invalid path" : "Невалидна патека", "Failed to create file from template" : "Неуспешно креирање на датотека од шаблон", "Templates" : "Шаблони", - "File name is a reserved word" : "Името на датотеката е резервиран збор", - "File name contains at least one invalid character" : "Името на датотеката соджи невалиден карактер", - "File name is too long" : "Името на датотеката е премногу долго", - "Dot files are not allowed" : "Датотеки само со точки не се дозволени", + "Filename contains at least one invalid character" : "Името на датотеката соджи невалиден карактер", "Empty filename is not allowed" : "Датотеки без име не се дозволени", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Апликацијата \"%s\" неможе да се инсталира бидејќи датотеката appinfo неможе да се прочита.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Апликацијата \"%s\" неможе да се инсталира бидејќи не е компатибилна со верзијата на серверот.", @@ -124,11 +121,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "За позадинското споделување %s мора се имплементира интерфејсот OCP\\Share_Backend", "Sharing backend %s not found" : "Не е пронајдено позадинско споделување %s", "Sharing backend for %s not found" : "Не е пронајдено позадинско споделување за %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." : "Кликнете на копчето подолу за да ја отворите.", + "Open »%s«" : "Отвори »%s«", + "%1$s via %2$s" : "%1$s преку %2$s", "%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«", - "%1$s via %2$s" : "%1$s преку %2$s", + "Unknown share type" : "Непознат вид на споделување", "You are not allowed to share %s" : "Не сте овластени да ја споделите %s", "Cannot increase permissions of %s" : "Неможат да се зголемат дозволите на %s", "Files cannot be shared with delete permissions" : "Датотеки неможат да бидат споделени со дозвола за бришење", @@ -136,9 +137,6 @@ "Expiration date is in the past" : "Рокот на траење е во минато време", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Неможе да се постави рок на траење повеќе од 1 ден","Неможе да се постави рок на траење повеќе од %s дена"], "Sharing is only allowed with group members" : "Споделувањето е овозможено само со членови на групата", - "%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 requested share does not exist anymore" : "Споделувањето не постои повеќе", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Корисникот не е креиран затоа што максималниот број на корисници е достигнат. Проверете ги вашите известувања за да дознаете повеќе.", "Could not find category \"%s\"" : "Не можам да најдам категорија „%s“", @@ -223,7 +221,6 @@ "Your data directory must be an absolute path." : "Вашата папка со податоци мора да биде апсолутна патека.", "Check the value of \"datadirectory\" in your configuration." : "Проверете ја вредноста на \"datadirectory\" во вашата конфигурација.", "Your data directory is invalid." : "Вашата папка со податоци не е валидна.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Осигурете се дека има датотека наречена \".ocdata\" во главната папка со податоци.", "Action \"%s\" not supported or implemented." : "Акцијата \"%s\" не е поддржана или не е имплементирана.", "Authentication failed, wrong token or provider ID given" : "Неуспешна автентификација, погрешен токен или зададен погрешен ИД", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Некој параметри недостасуваат за да се комплетира барањето.Параметри шо недостасуваат: \"%s\"", @@ -236,11 +233,15 @@ "Storage is temporarily not available" : "Складиштето моментално не е достапно", "Storage connection timeout. %s" : "Поврзувањето со складиштето не успеа. %s", "Summary" : "Резиме", + "Translate" : "Преведи", "Generate headline" : "Генерирај заглавие", - "404" : "404", + "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" : "Непознат корисник", @@ -259,9 +260,8 @@ "Username must not consist of dots only" : "Корисничкото име не смее да се состои само од точки", "Username is invalid because files already exist for this user" : "Невалидно корисничкото име бидејќи веќе постојат датотеки за овој корисник", "User disabled" : "Оневозможен корисник", - "PostgreSQL >= 9 required." : "Потребно е PostgreSQL >= 9 ", - "Please upgrade your database version." : "Ве молиме надградете ја верзијата на базата со податоци", "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, за да неможе да се чита од други корисници." + "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 ecb814dfe27..c39210fc523 100644 --- a/lib/l10n/mn.js +++ b/lib/l10n/mn.js @@ -11,9 +11,6 @@ OC.L10N.register( "last month" : "сүүлийн сар", "last year" : "сүүлийн жил", "seconds ago" : "секундийн өмнө", - "File name is a reserved word" : "Файлын нэр нь нийцгүй үг", - "File name contains at least one invalid character" : "файлын нэр нь хамгийн багадаа нэг нь хүчингүй тэмдэгт агуулж байна", - "File name is too long" : "Файлын нэр хэтэрхий урт байна", "Dot files are not allowed" : "Dot файлууд зөвшөөрөл байхгүй байна", "__language_name__" : "хэлний нэр", "Apps" : "Аппликэйшинууд", @@ -40,6 +37,10 @@ OC.L10N.register( "Authentication error" : "Нотолгооны алдаа", "Storage is temporarily not available" : "Хадгалах төхөөрөмж нь түр хугацаанд ашиглах боломжгүй байна", "Summary" : "Хураангуй", + "Translate" : "Орчуулга", + "File name is a reserved word" : "Файлын нэр нь нийцгүй үг", + "File name contains at least one invalid character" : "файлын нэр нь хамгийн багадаа нэг нь хүчингүй тэмдэгт агуулж байна", + "File name is too long" : "Файлын нэр хэтэрхий урт байна", "Help" : "Туслах", "Users" : "хэрэглэгч", "Unknown user" : "Тодорхойгүй хэрэглэгч" diff --git a/lib/l10n/mn.json b/lib/l10n/mn.json index f34c806eef7..2980f20bbee 100644 --- a/lib/l10n/mn.json +++ b/lib/l10n/mn.json @@ -9,9 +9,6 @@ "last month" : "сүүлийн сар", "last year" : "сүүлийн жил", "seconds ago" : "секундийн өмнө", - "File name is a reserved word" : "Файлын нэр нь нийцгүй үг", - "File name contains at least one invalid character" : "файлын нэр нь хамгийн багадаа нэг нь хүчингүй тэмдэгт агуулж байна", - "File name is too long" : "Файлын нэр хэтэрхий урт байна", "Dot files are not allowed" : "Dot файлууд зөвшөөрөл байхгүй байна", "__language_name__" : "хэлний нэр", "Apps" : "Аппликэйшинууд", @@ -38,6 +35,10 @@ "Authentication error" : "Нотолгооны алдаа", "Storage is temporarily not available" : "Хадгалах төхөөрөмж нь түр хугацаанд ашиглах боломжгүй байна", "Summary" : "Хураангуй", + "Translate" : "Орчуулга", + "File name is a reserved word" : "Файлын нэр нь нийцгүй үг", + "File name contains at least one invalid character" : "файлын нэр нь хамгийн багадаа нэг нь хүчингүй тэмдэгт агуулж байна", + "File name is too long" : "Файлын нэр хэтэрхий урт байна", "Help" : "Туслах", "Users" : "хэрэглэгч", "Unknown user" : "Тодорхойгүй хэрэглэгч" diff --git a/lib/l10n/nb.js b/lib/l10n/nb.js index 738d440a4f8..a527c10932b 100644 --- a/lib/l10n/nb.js +++ b/lib/l10n/nb.js @@ -19,7 +19,7 @@ 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 Edition" : "Utdanningsversjon", + "Education bundle" : "Utdanningspakke", "Enterprise bundle" : "Bedrifts-pakke", "Groupware bundle" : "Gruppevare-pakke", "Hub bundle" : "Hub-pakke", @@ -38,6 +38,7 @@ OC.L10N.register( "Server version %s or higher is required." : "Serverversjon %s eller høyere kreves.", "Server version %s or lower is required." : "Serverversjon %s eller lavere kreves.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Innlogget konto må være administrator, underadministrator eller ha fått spesiell rett til å få tilgang til denne innstillingen.", + "Your current IP address doesn’t allow you to perform admin actions" : "Den nåværende IP-adressen din lar deg ikke utføre administratorhandlinger", "Logged in account must be an admin or sub admin" : "Innlogget konto må være administrator eller en underadministrator.", "Logged in account must be an admin" : "Innlogget konto må være administrator", "Wiping of device %s has started" : "Sikker sletting av enhet %s er startet", @@ -80,14 +81,21 @@ OC.L10N.register( "seconds ago" : "for få sekunder siden", "Empty file" : "Tom fil", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modul med ID: %s finnes ikke. Skru den på i app-innstillingene eller kontakt en administrator.", + "Dot files are not allowed" : "Punktum-filer er ikke tillatt", + "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" er et forbudt fil- eller mappenavn.", + "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" er et forbudt prefiks for fil- eller mappenavn.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" er ikke tillatt i et fil- eller mappenavn.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" er en forbudt filtype.", + "Filenames must not end with \"%1$s\"." : "Filnavn må ikke slutte med \"%1$s\".", + "Invalid parent path" : "Ugyldig overordnet bane", "File already exists" : "Filen finnes allerede", "Invalid path" : "Ugyldig filbane", "Failed to create file from template" : "Oppretting av fil fra mal feilet", "Templates" : "Maler", - "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", - "Dot files are not allowed" : "Punktum-filer er ikke tillatt", + "Path contains invalid segments" : "Banen inneholder ugyldige segmenter", + "Filename is a reserved word" : "Filnavnet er et reservert ord", + "Filename contains at least one invalid character" : "Filnavnet innehold minst et ugyldig tegn", + "Filename is too long" : "Filnavnet er for langt", "Empty filename is not allowed" : "Tomt filnavn er ikke tillatt", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Appen \"%s\" kan ikke installeres på grunn av at appinfo-filen ikke kan leses.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Appen \"%s\" kan ikke installeres fordi det ikke er kompatibel med denne serverversjonen.", @@ -139,11 +147,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Delings-server %s må implementere grensesnittet OCP\\Share_Backend", "Sharing backend %s not found" : "Delings-server %s ikke funnet", "Sharing backend for %s not found" : "Delings-server for %s ikke funnet", + "%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.", + "Open »%s«" : "Åpne »%s«", + "%1$s via %2$s" : "%1$s via %2$s", "%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«", - "%1$s via %2$s" : "%1$s via %2$s", + "Unknown share type" : "Ukjent ressurstype", "You are not allowed to share %s" : "Du har ikke lov til å dele %s", "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", @@ -152,9 +164,6 @@ 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", - "%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 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.", @@ -252,7 +261,7 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Datakatalogen din må være en absolutt sti.", "Check the value of \"datadirectory\" in your configuration." : "Sjekk verdien for \"datadirectory\" i konfigurasjonen din.", "Your data directory is invalid." : "Datakatalogen din er ugyldig.", - "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.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Sørg for at det er en fil som heter \"%1$s\" i roten av datakatalogen. Den skal ha innholdet: \"%2$s\"", "Action \"%s\" not supported or implemented." : "Handling \"%s\" ikke støttet eller implementert.", "Authentication failed, wrong token or provider ID given" : "Autentisering feilet, feil token eller leverandør-ID gitt", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Parametere mangler for å fullføre forespørselen. Manglende parametere: \"%s\".", @@ -270,7 +279,7 @@ OC.L10N.register( "The audio to transcribe" : "Lyden å transkribere", "Transcription" : "Transkripsjon", "The transcribed text" : "Den transkriberte teksten", - "ContextWrite" : "KontekstSkriv", + "Context write" : "Kontekstskriving", "Writes text in a given style based on the provided source material." : "Skriver tekst i en gitt stil basert på det angitte kildematerialet.", "Writing style" : "Skrivestil", "Demonstrate a writing style that you would like to immitate" : "Demonstrer en skrivestil som du ønsker å etterligne", @@ -292,16 +301,39 @@ OC.L10N.register( "Output images" : "Utdatabilder", "The generated images" : "De genererte bildene", "Free text to text prompt" : "Fritekst til tekstmelding", - "Runs an arbitrary prompt through a language model that retuns a reply" : "Kjører en vilkårlig ledetekst gjennom en språkmodell som returnerer et svar", + "Runs an arbitrary prompt through a language model that returns a reply" : "Kjører en vilkårlig forespørsel gjennom en språkmodell som returnerer et svar", "Describe a task that you want the assistant to do or ask a question" : "Beskriv en oppgave du vil at assistenten skal gjøre, eller still et spørsmål", "Generated reply" : "Generert svar", "The generated text from the assistant" : "Den genererte teksten fra assistenten", "Chat" : "Chat", + "Chat with the assistant" : "Chat med assistenten", + "System prompt" : "Systemledetekst", + "Define rules and assumptions that the assistant should follow during the conversation." : "Definer regler og antagelser som assistenten skal følge under samtalen.", + "Chat message" : "Chatmelding", + "Chat history" : "Chathistorikk", + "The history of chat messages before the current message, starting with a message by the user" : "Loggen over chatmeldinger før gjeldende melding, som starter med en melding fra brukeren", + "Response message" : "Svarmelding", + "The generated response as part of the conversation" : "Den genererte responsen som en del av samtalen", + "Formalize text" : "Formaliser tekst", + "Takes a text and makes it sound more formal" : "Tar en tekst og får den til å høres mer formell ut", + "Write a text that you want the assistant to formalize" : "Skriv en tekst som du vil at assistenten skal formalisere", + "Formalized text" : "Formalisert tekst", + "The formalized text" : "Den formaliserte teksten", "Generate a headline" : "Generer en overskrift", "Generates a possible headline for a text." : "Genererer en mulig overskrift for en tekst.", "Original text" : "Opprinnelig tekst", "The original text to generate a headline for" : "Den opprinnelige teksten som skal genereres en overskrift for", "The generated headline" : "Den genererte overskriften", + "Reformulate text" : "Omformulere tekst", + "Takes a text and reformulates it" : "Tar en tekst og omformulerer den", + "Write a text that you want the assistant to reformulate" : "Skriv en tekst som du vil at assistenten skal omformulere", + "Reformulated text" : "Omformulert tekst", + "The reformulated text, written by the assistant" : "Den omformulerte teksten, skrevet av assistenten", + "Simplify text" : "Forenkle tekst", + "Takes a text and simplifies it" : "Tar en tekst og forenkler den", + "Write a text that you want the assistant to simplify" : "Skriv en tekst som du vil at assistenten skal forenkle", + "Simplified text" : "Forenklet tekst", + "The simplified text" : "Den forenklede teksten", "Summarize" : "Oppsummere", "Summarizes a text" : "Oppsummerer en tekst", "The original text to summarize" : "Den opprinnelige teksten å oppsummere", @@ -312,15 +344,28 @@ OC.L10N.register( "The original text to extract topics from" : "Den opprinnelige teksten å trekke ut emner fra", "Topics" : "Emner", "The list of extracted topics" : "Listen over uttrekte emner", + "Translate" : "Oversette", + "Translate text from one language to another" : "Oversett tekst fra ett språk til et annet", + "Origin text" : "Opprinnelig tekst", + "The text to translate" : "Teksten å oversette", + "Origin language" : "Opprinnelig språk", + "The language of the origin text" : "Språket til originalteksten", + "Target language" : "Målspråk", + "The desired language to translate the origin text in" : "Ønsket språk å oversette opprinnelsesteksten til", + "Result" : "Resultat", + "The translated text" : "Den oversatte teksten", "Free prompt" : "Ledig ledetekst", "Runs an arbitrary prompt through the language model." : "Kjører en vilkårlig ledetekst gjennom språkmodellen.", "Generate headline" : "Generer overskrift", "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.", - "404" : "404", + "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", @@ -339,9 +384,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 kreves.", - "Please upgrade your database version." : "Oppgrader databaseversjonen din.", "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." + "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 421937ec1bc..5a810e14020 100644 --- a/lib/l10n/nb.json +++ b/lib/l10n/nb.json @@ -17,7 +17,7 @@ "%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 Edition" : "Utdanningsversjon", + "Education bundle" : "Utdanningspakke", "Enterprise bundle" : "Bedrifts-pakke", "Groupware bundle" : "Gruppevare-pakke", "Hub bundle" : "Hub-pakke", @@ -36,6 +36,7 @@ "Server version %s or higher is required." : "Serverversjon %s eller høyere kreves.", "Server version %s or lower is required." : "Serverversjon %s eller lavere kreves.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Innlogget konto må være administrator, underadministrator eller ha fått spesiell rett til å få tilgang til denne innstillingen.", + "Your current IP address doesn’t allow you to perform admin actions" : "Den nåværende IP-adressen din lar deg ikke utføre administratorhandlinger", "Logged in account must be an admin or sub admin" : "Innlogget konto må være administrator eller en underadministrator.", "Logged in account must be an admin" : "Innlogget konto må være administrator", "Wiping of device %s has started" : "Sikker sletting av enhet %s er startet", @@ -78,14 +79,21 @@ "seconds ago" : "for få sekunder siden", "Empty file" : "Tom fil", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modul med ID: %s finnes ikke. Skru den på i app-innstillingene eller kontakt en administrator.", + "Dot files are not allowed" : "Punktum-filer er ikke tillatt", + "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" er et forbudt fil- eller mappenavn.", + "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" er et forbudt prefiks for fil- eller mappenavn.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" er ikke tillatt i et fil- eller mappenavn.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" er en forbudt filtype.", + "Filenames must not end with \"%1$s\"." : "Filnavn må ikke slutte med \"%1$s\".", + "Invalid parent path" : "Ugyldig overordnet bane", "File already exists" : "Filen finnes allerede", "Invalid path" : "Ugyldig filbane", "Failed to create file from template" : "Oppretting av fil fra mal feilet", "Templates" : "Maler", - "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", - "Dot files are not allowed" : "Punktum-filer er ikke tillatt", + "Path contains invalid segments" : "Banen inneholder ugyldige segmenter", + "Filename is a reserved word" : "Filnavnet er et reservert ord", + "Filename contains at least one invalid character" : "Filnavnet innehold minst et ugyldig tegn", + "Filename is too long" : "Filnavnet er for langt", "Empty filename is not allowed" : "Tomt filnavn er ikke tillatt", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Appen \"%s\" kan ikke installeres på grunn av at appinfo-filen ikke kan leses.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Appen \"%s\" kan ikke installeres fordi det ikke er kompatibel med denne serverversjonen.", @@ -137,11 +145,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Delings-server %s må implementere grensesnittet OCP\\Share_Backend", "Sharing backend %s not found" : "Delings-server %s ikke funnet", "Sharing backend for %s not found" : "Delings-server for %s ikke funnet", + "%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.", + "Open »%s«" : "Åpne »%s«", + "%1$s via %2$s" : "%1$s via %2$s", "%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«", - "%1$s via %2$s" : "%1$s via %2$s", + "Unknown share type" : "Ukjent ressurstype", "You are not allowed to share %s" : "Du har ikke lov til å dele %s", "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", @@ -150,9 +162,6 @@ "_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", - "%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 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.", @@ -250,7 +259,7 @@ "Your data directory must be an absolute path." : "Datakatalogen din må være en absolutt sti.", "Check the value of \"datadirectory\" in your configuration." : "Sjekk verdien for \"datadirectory\" i konfigurasjonen din.", "Your data directory is invalid." : "Datakatalogen din er ugyldig.", - "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.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Sørg for at det er en fil som heter \"%1$s\" i roten av datakatalogen. Den skal ha innholdet: \"%2$s\"", "Action \"%s\" not supported or implemented." : "Handling \"%s\" ikke støttet eller implementert.", "Authentication failed, wrong token or provider ID given" : "Autentisering feilet, feil token eller leverandør-ID gitt", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Parametere mangler for å fullføre forespørselen. Manglende parametere: \"%s\".", @@ -268,7 +277,7 @@ "The audio to transcribe" : "Lyden å transkribere", "Transcription" : "Transkripsjon", "The transcribed text" : "Den transkriberte teksten", - "ContextWrite" : "KontekstSkriv", + "Context write" : "Kontekstskriving", "Writes text in a given style based on the provided source material." : "Skriver tekst i en gitt stil basert på det angitte kildematerialet.", "Writing style" : "Skrivestil", "Demonstrate a writing style that you would like to immitate" : "Demonstrer en skrivestil som du ønsker å etterligne", @@ -290,16 +299,39 @@ "Output images" : "Utdatabilder", "The generated images" : "De genererte bildene", "Free text to text prompt" : "Fritekst til tekstmelding", - "Runs an arbitrary prompt through a language model that retuns a reply" : "Kjører en vilkårlig ledetekst gjennom en språkmodell som returnerer et svar", + "Runs an arbitrary prompt through a language model that returns a reply" : "Kjører en vilkårlig forespørsel gjennom en språkmodell som returnerer et svar", "Describe a task that you want the assistant to do or ask a question" : "Beskriv en oppgave du vil at assistenten skal gjøre, eller still et spørsmål", "Generated reply" : "Generert svar", "The generated text from the assistant" : "Den genererte teksten fra assistenten", "Chat" : "Chat", + "Chat with the assistant" : "Chat med assistenten", + "System prompt" : "Systemledetekst", + "Define rules and assumptions that the assistant should follow during the conversation." : "Definer regler og antagelser som assistenten skal følge under samtalen.", + "Chat message" : "Chatmelding", + "Chat history" : "Chathistorikk", + "The history of chat messages before the current message, starting with a message by the user" : "Loggen over chatmeldinger før gjeldende melding, som starter med en melding fra brukeren", + "Response message" : "Svarmelding", + "The generated response as part of the conversation" : "Den genererte responsen som en del av samtalen", + "Formalize text" : "Formaliser tekst", + "Takes a text and makes it sound more formal" : "Tar en tekst og får den til å høres mer formell ut", + "Write a text that you want the assistant to formalize" : "Skriv en tekst som du vil at assistenten skal formalisere", + "Formalized text" : "Formalisert tekst", + "The formalized text" : "Den formaliserte teksten", "Generate a headline" : "Generer en overskrift", "Generates a possible headline for a text." : "Genererer en mulig overskrift for en tekst.", "Original text" : "Opprinnelig tekst", "The original text to generate a headline for" : "Den opprinnelige teksten som skal genereres en overskrift for", "The generated headline" : "Den genererte overskriften", + "Reformulate text" : "Omformulere tekst", + "Takes a text and reformulates it" : "Tar en tekst og omformulerer den", + "Write a text that you want the assistant to reformulate" : "Skriv en tekst som du vil at assistenten skal omformulere", + "Reformulated text" : "Omformulert tekst", + "The reformulated text, written by the assistant" : "Den omformulerte teksten, skrevet av assistenten", + "Simplify text" : "Forenkle tekst", + "Takes a text and simplifies it" : "Tar en tekst og forenkler den", + "Write a text that you want the assistant to simplify" : "Skriv en tekst som du vil at assistenten skal forenkle", + "Simplified text" : "Forenklet tekst", + "The simplified text" : "Den forenklede teksten", "Summarize" : "Oppsummere", "Summarizes a text" : "Oppsummerer en tekst", "The original text to summarize" : "Den opprinnelige teksten å oppsummere", @@ -310,15 +342,28 @@ "The original text to extract topics from" : "Den opprinnelige teksten å trekke ut emner fra", "Topics" : "Emner", "The list of extracted topics" : "Listen over uttrekte emner", + "Translate" : "Oversette", + "Translate text from one language to another" : "Oversett tekst fra ett språk til et annet", + "Origin text" : "Opprinnelig tekst", + "The text to translate" : "Teksten å oversette", + "Origin language" : "Opprinnelig språk", + "The language of the origin text" : "Språket til originalteksten", + "Target language" : "Målspråk", + "The desired language to translate the origin text in" : "Ønsket språk å oversette opprinnelsesteksten til", + "Result" : "Resultat", + "The translated text" : "Den oversatte teksten", "Free prompt" : "Ledig ledetekst", "Runs an arbitrary prompt through the language model." : "Kjører en vilkårlig ledetekst gjennom språkmodellen.", "Generate headline" : "Generer overskrift", "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.", - "404" : "404", + "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", @@ -337,9 +382,8 @@ "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 kreves.", - "Please upgrade your database version." : "Oppgrader databaseversjonen din.", "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." + "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 ef3a156cdd7..fe06313658d 100644 --- a/lib/l10n/nl.js +++ b/lib/l10n/nl.js @@ -18,7 +18,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s en %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s en %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s en %5$s", - "Education Edition" : "Onderwijs Editie", "Enterprise bundle" : "Zakelijke bundel", "Groupware bundle" : "Groupware bundel", "Hub bundle" : "Hub bundel", @@ -74,14 +73,12 @@ OC.L10N.register( "seconds ago" : "seconden geleden", "Empty file" : "Leeg bestand", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Module met ID: %s bestaat niet. Schakel die in binnen de app-instellingen of neem contact op met je beheerder.", + "Dot files are not allowed" : "Punt-bestanden zijn niet toegestaan", "File already exists" : "Bestand bestaat al", "Invalid path" : "Ongeldig pad", "Failed to create file from template" : "Kon geen bestand van het sjabloon maken", "Templates" : "Sjablonen", - "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", - "Dot files are not allowed" : "Punt-bestanden zijn niet toegestaan", + "Filename contains at least one invalid character" : "De bestandsnaam bevat ten minste één ongeldig teken", "Empty filename is not allowed" : "Een lege bestandsnaam is niet toegestaan", "App \"%s\" cannot be installed because appinfo file cannot be read." : "App \"%s\" kan niet worden geïnstalleerd, omdat het app info bestand niet gelezen kan worden.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "App \"%s\" kan niet worden geïnstalleerd, omdat deze niet compatible is met deze versie van de server.", @@ -120,11 +117,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "De gedeelde achtergrond %s moet de OCP\\Share_Backend interface implementeren", "Sharing backend %s not found" : "De gedeelde backend %s is niet gevonden", "Sharing backend for %s not found" : "De gedeelde backend voor %s is niet gevonden", + "%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.", + "Open »%s«" : "Open \"%s\"", + "%1$s via %2$s" : "%1$s via %2$s", "%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\"", - "%1$s via %2$s" : "%1$s via %2$s", + "Unknown share type" : "Onbekend type gedeelde folder", "You are not allowed to share %s" : "Je bent niet bevoegd om %s te delen", "Cannot increase permissions of %s" : "Kan de machtiging van %s niet verhogen.", "Files cannot be shared with delete permissions" : "Bestanden kunnen niet worden gedeeld met verwijdermachtigingen", @@ -132,9 +133,6 @@ OC.L10N.register( "Expiration date is in the past" : "De vervaldatum ligt in het verleden", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Kan de vervaldatum niet meer dan %s dag in de toekomst instellen","Kan de vervaldatum niet meer dan %s dagen in de toekomst instellen"], "Sharing is only allowed with group members" : "Delen kan alleen met groepsleden", - "%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 requested share does not exist anymore" : "De toegang tot de gedeelde folder bestaat niet meer", "Could not find category \"%s\"" : "Kan categorie \"%s\" niet vinden", "Sunday" : "Zondag", @@ -215,7 +213,6 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Je datamap moet een absolute bestandslocatie hebben.", "Check the value of \"datadirectory\" in your configuration." : "Controleer de waarde van \"datadirectory\" in je configuratie.", "Your data directory is invalid." : "Je datamap is ongeldig.", - "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.", "Action \"%s\" not supported or implemented." : "Actie \"%s\" niet ondersteund of geïmplementeerd.", "Authentication failed, wrong token or provider ID given" : "Authenticatie mislukt, ongeldig token of provider ID opgegeven", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Er ontbreken parameters om de aanvraag uit te voeren. Ontbrekende parameters: \"%s\"", @@ -228,9 +225,15 @@ OC.L10N.register( "Storage is temporarily not available" : "Opslag is tijdelijk niet beschikbaar", "Storage connection timeout. %s" : "Opslag verbinding time-out. %s", "Summary" : "Samenvatting", + "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", @@ -246,9 +249,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 is vereist.", - "Please upgrade your database version." : "Werk je databaseversie bij.", "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." + "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 f7031f69b6f..80ab91e5d25 100644 --- a/lib/l10n/nl.json +++ b/lib/l10n/nl.json @@ -16,7 +16,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s en %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s en %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s en %5$s", - "Education Edition" : "Onderwijs Editie", "Enterprise bundle" : "Zakelijke bundel", "Groupware bundle" : "Groupware bundel", "Hub bundle" : "Hub bundel", @@ -72,14 +71,12 @@ "seconds ago" : "seconden geleden", "Empty file" : "Leeg bestand", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Module met ID: %s bestaat niet. Schakel die in binnen de app-instellingen of neem contact op met je beheerder.", + "Dot files are not allowed" : "Punt-bestanden zijn niet toegestaan", "File already exists" : "Bestand bestaat al", "Invalid path" : "Ongeldig pad", "Failed to create file from template" : "Kon geen bestand van het sjabloon maken", "Templates" : "Sjablonen", - "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", - "Dot files are not allowed" : "Punt-bestanden zijn niet toegestaan", + "Filename contains at least one invalid character" : "De bestandsnaam bevat ten minste één ongeldig teken", "Empty filename is not allowed" : "Een lege bestandsnaam is niet toegestaan", "App \"%s\" cannot be installed because appinfo file cannot be read." : "App \"%s\" kan niet worden geïnstalleerd, omdat het app info bestand niet gelezen kan worden.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "App \"%s\" kan niet worden geïnstalleerd, omdat deze niet compatible is met deze versie van de server.", @@ -118,11 +115,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "De gedeelde achtergrond %s moet de OCP\\Share_Backend interface implementeren", "Sharing backend %s not found" : "De gedeelde backend %s is niet gevonden", "Sharing backend for %s not found" : "De gedeelde backend voor %s is niet gevonden", + "%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.", + "Open »%s«" : "Open \"%s\"", + "%1$s via %2$s" : "%1$s via %2$s", "%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\"", - "%1$s via %2$s" : "%1$s via %2$s", + "Unknown share type" : "Onbekend type gedeelde folder", "You are not allowed to share %s" : "Je bent niet bevoegd om %s te delen", "Cannot increase permissions of %s" : "Kan de machtiging van %s niet verhogen.", "Files cannot be shared with delete permissions" : "Bestanden kunnen niet worden gedeeld met verwijdermachtigingen", @@ -130,9 +131,6 @@ "Expiration date is in the past" : "De vervaldatum ligt in het verleden", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Kan de vervaldatum niet meer dan %s dag in de toekomst instellen","Kan de vervaldatum niet meer dan %s dagen in de toekomst instellen"], "Sharing is only allowed with group members" : "Delen kan alleen met groepsleden", - "%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 requested share does not exist anymore" : "De toegang tot de gedeelde folder bestaat niet meer", "Could not find category \"%s\"" : "Kan categorie \"%s\" niet vinden", "Sunday" : "Zondag", @@ -213,7 +211,6 @@ "Your data directory must be an absolute path." : "Je datamap moet een absolute bestandslocatie hebben.", "Check the value of \"datadirectory\" in your configuration." : "Controleer de waarde van \"datadirectory\" in je configuratie.", "Your data directory is invalid." : "Je datamap is ongeldig.", - "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.", "Action \"%s\" not supported or implemented." : "Actie \"%s\" niet ondersteund of geïmplementeerd.", "Authentication failed, wrong token or provider ID given" : "Authenticatie mislukt, ongeldig token of provider ID opgegeven", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Er ontbreken parameters om de aanvraag uit te voeren. Ontbrekende parameters: \"%s\"", @@ -226,9 +223,15 @@ "Storage is temporarily not available" : "Opslag is tijdelijk niet beschikbaar", "Storage connection timeout. %s" : "Opslag verbinding time-out. %s", "Summary" : "Samenvatting", + "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", @@ -244,9 +247,8 @@ "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 is vereist.", - "Please upgrade your database version." : "Werk je databaseversie bij.", "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." + "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 ea5d4ffa247..a48c7f8985b 100644 --- a/lib/l10n/nn_NO.js +++ b/lib/l10n/nn_NO.js @@ -15,7 +15,6 @@ OC.L10N.register( "_%n hour ago_::_%n hours ago_" : ["%n time sidan","%n timar sidan"], "_%n minute ago_::_%n minutes ago_" : ["%n minutt sidan","%n minutt sidan"], "seconds ago" : "sekund sidan", - "File name is too long" : "Filnamnet er for langt", "__language_name__" : "Nynorsk", "Apps" : "Appar", "Settings" : "Instillingar", @@ -77,6 +76,7 @@ OC.L10N.register( "Login canceled by app" : "Innlogging avbroten av app", "Authentication error" : "Feil i autentisering", "Summary" : "Oppsumering", + "File name is too long" : "Filnamnet er for langt", "Help" : "Hjelp", "Users" : "Brukarar", "Unknown user" : "Ukjend brukar", diff --git a/lib/l10n/nn_NO.json b/lib/l10n/nn_NO.json index b2cf4217f05..4e79142f0e5 100644 --- a/lib/l10n/nn_NO.json +++ b/lib/l10n/nn_NO.json @@ -13,7 +13,6 @@ "_%n hour ago_::_%n hours ago_" : ["%n time sidan","%n timar sidan"], "_%n minute ago_::_%n minutes ago_" : ["%n minutt sidan","%n minutt sidan"], "seconds ago" : "sekund sidan", - "File name is too long" : "Filnamnet er for langt", "__language_name__" : "Nynorsk", "Apps" : "Appar", "Settings" : "Instillingar", @@ -75,6 +74,7 @@ "Login canceled by app" : "Innlogging avbroten av app", "Authentication error" : "Feil i autentisering", "Summary" : "Oppsumering", + "File name is too long" : "Filnamnet er for langt", "Help" : "Hjelp", "Users" : "Brukarar", "Unknown user" : "Ukjend brukar", diff --git a/lib/l10n/oc.js b/lib/l10n/oc.js index b8792750c95..df29ff06673 100644 --- a/lib/l10n/oc.js +++ b/lib/l10n/oc.js @@ -71,6 +71,7 @@ OC.L10N.register( "Authentication error" : "Error d’autentificacion", "Storage is temporarily not available" : "Emmagazinatge temporàriament indisponible", "Chat" : "Messatjariá", + "Translate" : "Tradurre", "Help" : "Ajuda", "Users" : "Utilizaires", "User disabled" : "Utilizaire desactivat" diff --git a/lib/l10n/oc.json b/lib/l10n/oc.json index 489c39d3f71..b5ca0193805 100644 --- a/lib/l10n/oc.json +++ b/lib/l10n/oc.json @@ -69,6 +69,7 @@ "Authentication error" : "Error d’autentificacion", "Storage is temporarily not available" : "Emmagazinatge temporàriament indisponible", "Chat" : "Messatjariá", + "Translate" : "Tradurre", "Help" : "Ajuda", "Users" : "Utilizaires", "User disabled" : "Utilizaire desactivat" diff --git a/lib/l10n/pl.js b/lib/l10n/pl.js index 257732e4ba8..2ff0e95d85d 100644 --- a/lib/l10n/pl.js +++ b/lib/l10n/pl.js @@ -19,7 +19,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s i %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s i %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s i %5$s", - "Education Edition" : "Edycja edukacyjna", "Enterprise bundle" : "Pakiet dla firm", "Groupware bundle" : "Pakiet do pracy grupowej", "Hub bundle" : "Pakiet centralny", @@ -79,14 +78,12 @@ OC.L10N.register( "seconds ago" : "przed chwilą", "Empty file" : "Pusty plik", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Moduł o ID: %s nie istnieje. Włącz go w ustawieniach aplikacji lub skontaktuj się z administratorem.", + "Dot files are not allowed" : "Pliki z kropką są nie dozwolone", "File already exists" : "Plik już istnieje", "Invalid path" : "Niewłaściwa ścieżka", "Failed to create file from template" : "Nie udało się utworzyć pliku z szablonu", "Templates" : "Szablony", - "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", - "Dot files are not allowed" : "Pliki z kropką są nie dozwolone", + "Filename contains at least one invalid character" : "Nazwa pliku zawiera co najmniej jeden nieprawidłowy znak", "Empty filename is not allowed" : "Pusta nazwa pliku jest niedozwolona", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Aplikacji \"%s\" nie można zainstalować, ponieważ nie można odczytać pliku appinfo.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Aplikacji \"%s\" nie można zainstalować, ponieważ nie jest kompatybilna z tą wersją serwera.", @@ -132,11 +129,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Zaplecze do udostępniania %s musi implementować interfejs OCP\\Share_Backend", "Sharing backend %s not found" : "Zaplecze %s do udostępniania nie zostało znalezione", "Sharing backend for %s not found" : "Zaplecze do udostępniania dla %s nie zostało znalezione", + "%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ć.", + "Open »%s«" : "Otwórz »%s«", + "%1$s via %2$s" : "%1$s przez %2$s", "%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«", - "%1$s via %2$s" : "%1$s przez %2$s", + "Unknown share type" : "Nieznany typ udostępnienia", "You are not allowed to share %s" : "Nie możesz udostępnić %s", "Cannot increase permissions of %s" : "Nie można zwiększyć uprawnień %s", "Files cannot be shared with delete permissions" : "Pliki nie mogą zostać udostępnione z prawem do usuwania", @@ -144,9 +145,6 @@ OC.L10N.register( "Expiration date is in the past" : "Data ważności już minęła", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Nie można utworzyć daty wygaśnięcia na %n dzień do przodu","Nie można utworzyć daty wygaśnięcia na %n dni do przodu","Nie można utworzyć daty wygaśnięcia na %n dni do przodu","Nie można utworzyć daty wygaśnięcia na %n dni do przodu"], "Sharing is only allowed with group members" : "Udostępnianie jest dozwolone tylko członkom grupy", - "%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 requested share does not exist anymore" : "Żądane udostępnienie już nie istnieje", "The requested share comes from a disabled user" : "Żądane udostępnienie pochodzi od wyłączonego użytkownika", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Użytkownik nie został utworzony, ponieważ osiągnięto limit użytkowników. Sprawdź swoje powiadomienia, aby dowiedzieć się więcej.", @@ -241,7 +239,6 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Katalog danych musi mieć ścieżkę absolutną.", "Check the value of \"datadirectory\" in your configuration." : "Sprawdź wartość \"datadirectory\" w swojej konfiguracji.", "Your data directory is invalid." : "Katalog danych jest nieprawidłowy.", - "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\".", "Action \"%s\" not supported or implemented." : "Akcja \"%s\" jest niewspierana lub niezaimplementowana.", "Authentication failed, wrong token or provider ID given" : "Uwierzytelnienie nie powiodło się, podano nieprawidłowy token lub ID dostawcy", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Brak parametrów w celu uzupełnienia żądania. Brakujące parametry: \"%s\"", @@ -258,15 +255,21 @@ OC.L10N.register( "Summarize" : "Podsumuj", "Summary" : "Podsumowanie", "Extract topics" : "Wyodrębnij tematy", + "Translate" : "Tłumaczenie", + "Target language" : "Język docelowy", + "Result" : "Wynik", "Free prompt" : "Monit bezpłatny", "Runs an arbitrary prompt through the language model." : "Uruchamia dowolny monit w modelu języka.", "Generate headline" : "Wygeneruj nagłówek", "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.", - "404" : "404", + "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", @@ -285,9 +288,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "Wymagany PostgreSQL >= 9", - "Please upgrade your database version." : "Zaktualizuj wersję bazy danych.", "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." + "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 d9def29a0b3..9b7f0872aa8 100644 --- a/lib/l10n/pl.json +++ b/lib/l10n/pl.json @@ -17,7 +17,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s i %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s i %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s i %5$s", - "Education Edition" : "Edycja edukacyjna", "Enterprise bundle" : "Pakiet dla firm", "Groupware bundle" : "Pakiet do pracy grupowej", "Hub bundle" : "Pakiet centralny", @@ -77,14 +76,12 @@ "seconds ago" : "przed chwilą", "Empty file" : "Pusty plik", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Moduł o ID: %s nie istnieje. Włącz go w ustawieniach aplikacji lub skontaktuj się z administratorem.", + "Dot files are not allowed" : "Pliki z kropką są nie dozwolone", "File already exists" : "Plik już istnieje", "Invalid path" : "Niewłaściwa ścieżka", "Failed to create file from template" : "Nie udało się utworzyć pliku z szablonu", "Templates" : "Szablony", - "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", - "Dot files are not allowed" : "Pliki z kropką są nie dozwolone", + "Filename contains at least one invalid character" : "Nazwa pliku zawiera co najmniej jeden nieprawidłowy znak", "Empty filename is not allowed" : "Pusta nazwa pliku jest niedozwolona", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Aplikacji \"%s\" nie można zainstalować, ponieważ nie można odczytać pliku appinfo.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Aplikacji \"%s\" nie można zainstalować, ponieważ nie jest kompatybilna z tą wersją serwera.", @@ -130,11 +127,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Zaplecze do udostępniania %s musi implementować interfejs OCP\\Share_Backend", "Sharing backend %s not found" : "Zaplecze %s do udostępniania nie zostało znalezione", "Sharing backend for %s not found" : "Zaplecze do udostępniania dla %s nie zostało znalezione", + "%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ć.", + "Open »%s«" : "Otwórz »%s«", + "%1$s via %2$s" : "%1$s przez %2$s", "%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«", - "%1$s via %2$s" : "%1$s przez %2$s", + "Unknown share type" : "Nieznany typ udostępnienia", "You are not allowed to share %s" : "Nie możesz udostępnić %s", "Cannot increase permissions of %s" : "Nie można zwiększyć uprawnień %s", "Files cannot be shared with delete permissions" : "Pliki nie mogą zostać udostępnione z prawem do usuwania", @@ -142,9 +143,6 @@ "Expiration date is in the past" : "Data ważności już minęła", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Nie można utworzyć daty wygaśnięcia na %n dzień do przodu","Nie można utworzyć daty wygaśnięcia na %n dni do przodu","Nie można utworzyć daty wygaśnięcia na %n dni do przodu","Nie można utworzyć daty wygaśnięcia na %n dni do przodu"], "Sharing is only allowed with group members" : "Udostępnianie jest dozwolone tylko członkom grupy", - "%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 requested share does not exist anymore" : "Żądane udostępnienie już nie istnieje", "The requested share comes from a disabled user" : "Żądane udostępnienie pochodzi od wyłączonego użytkownika", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Użytkownik nie został utworzony, ponieważ osiągnięto limit użytkowników. Sprawdź swoje powiadomienia, aby dowiedzieć się więcej.", @@ -239,7 +237,6 @@ "Your data directory must be an absolute path." : "Katalog danych musi mieć ścieżkę absolutną.", "Check the value of \"datadirectory\" in your configuration." : "Sprawdź wartość \"datadirectory\" w swojej konfiguracji.", "Your data directory is invalid." : "Katalog danych jest nieprawidłowy.", - "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\".", "Action \"%s\" not supported or implemented." : "Akcja \"%s\" jest niewspierana lub niezaimplementowana.", "Authentication failed, wrong token or provider ID given" : "Uwierzytelnienie nie powiodło się, podano nieprawidłowy token lub ID dostawcy", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Brak parametrów w celu uzupełnienia żądania. Brakujące parametry: \"%s\"", @@ -256,15 +253,21 @@ "Summarize" : "Podsumuj", "Summary" : "Podsumowanie", "Extract topics" : "Wyodrębnij tematy", + "Translate" : "Tłumaczenie", + "Target language" : "Język docelowy", + "Result" : "Wynik", "Free prompt" : "Monit bezpłatny", "Runs an arbitrary prompt through the language model." : "Uruchamia dowolny monit w modelu języka.", "Generate headline" : "Wygeneruj nagłówek", "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.", - "404" : "404", + "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", @@ -283,9 +286,8 @@ "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", - "PostgreSQL >= 9 required." : "Wymagany PostgreSQL >= 9", - "Please upgrade your database version." : "Zaktualizuj wersję bazy danych.", "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." + "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/pt_BR.js b/lib/l10n/pt_BR.js index 88c637e708b..c750601e4c4 100644 --- a/lib/l10n/pt_BR.js +++ b/lib/l10n/pt_BR.js @@ -19,7 +19,7 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s e %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s e %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s e %5$s", - "Education Edition" : "Edição Educativa", + "Education bundle" : "Pacote educacional", "Enterprise bundle" : "Pacote Enterprise", "Groupware bundle" : "Pacote Groupware", "Hub bundle" : "Pacote de hub", @@ -38,6 +38,7 @@ OC.L10N.register( "Server version %s or higher is required." : "É requerido um servidor da versão %s ou superior.", "Server version %s or lower is required." : "É requerido um servidor da versão %s ou abaixo.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "A conta conectada deve ser um administrador, um subadministrador ou ter direito especial para acessar esta configuração", + "Your current IP address doesn’t allow you to perform admin actions" : "Seu endereço IP atual não permite que você execute ações administrativas", "Logged in account must be an admin or sub admin" : "A conta conectada deve ser de um administrador ou subadministrador", "Logged in account must be an admin" : "A conta logada deve ser de um administrador", "Wiping of device %s has started" : "Limpeza do dispositivo %s iniciou", @@ -80,14 +81,21 @@ OC.L10N.register( "seconds ago" : "segundos atrás", "Empty file" : "Arquivo vazio", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "O módulo com a ID: %s não existe. Por favor, habilite-o nas configurações de seu aplicativo ou contacte o administrador.", + "Dot files are not allowed" : "Arquivos Dot não são permitidos", + "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" é um nome de arquivo ou pasta proibido.", + "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" é um prefixo proibido para nomes de arquivos ou pastas.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" não é permitido dentro de um nome de arquivo ou pasta.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" é um tipo de arquivo proibido.", + "Filenames must not end with \"%1$s\"." : "Os nomes dos arquivos não devem terminar com \"%1$s\".", + "Invalid parent path" : "Caminho mãe inválido", "File already exists" : "O arquivo já existe", "Invalid path" : "Diretório inválido", "Failed to create file from template" : "Falha ao criar arquivo do modelo ", "Templates" : "Modelos ", - "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", - "Dot files are not allowed" : "Arquivos Dot não são permitidos", + "Path contains invalid segments" : "O caminho contém segmentos inválidos", + "Filename is a reserved word" : "Nome do arquivo é uma palavra reservada", + "Filename contains at least one invalid character" : "O nome do arquivo contém pelo menos um caractere inválido ", + "Filename is too long" : "O nome do arquivo é muito longo", "Empty filename is not allowed" : "Nome vazio para arquivo não é permitido.", "App \"%s\" cannot be installed because appinfo file cannot be read." : "O aplicativo \"%s\" não pode ser instalado pois o arquivo appinfo não pôde ser lido.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "O aplicativo \"%s\" não pode ser instalado pois não é compatível com a versão do servidor.", @@ -139,22 +147,56 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "A plataforma de compartilhamento %s deve implementar a interface OCP\\Share_Backend", "Sharing backend %s not found" : "Plataforma de serviço de compartilhamento %s não encontrada", "Sharing backend for %s not found" : "Plataforma de compartilhamento para %s não foi encontrada", + "%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.", + "Open »%s«" : "Abrir »%s«", + "%1$s via %2$s" : "%1$s via %2$s", "%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«", - "%1$s via %2$s" : "%1$s via %2$s", + "Passwords are enforced for link and mail shares" : "As senhas são aplicadas para compartilhamentos de links e e-mails", + "SharedWith is not a valid user" : "SharedWith não é um usuário válido", + "SharedWith is not a valid group" : "SharedWith não é um grupo válido", + "SharedWith should be empty" : "SharedWith pode estar vazio", + "SharedWith should not be empty" : "SharedWith não pode estar vazio", + "SharedWith is not a valid circle" : "SharedWith não é um círculo válido", + "Unknown share type" : "Tipo de compartilhamento desconhecido", + "SharedBy should be set" : "SharedBy deve estar definido", + "Cannot share with yourself" : "Não é possível compartilhar consigo mesmo", + "Path should be set" : "O caminho deve estar definido", + "Path should be either a file or a folder" : "O caminho deve ser um arquivo ou pasta", + "You cannot share your root folder" : "Você não pode compartilhar sua pasta raiz", "You are not allowed to share %s" : "Você não tem permissão para compartilhar %s", + "A share requires permissions" : "Um compartilhamento requer permissões", "Cannot increase permissions of %s" : "Não foi possível aumentar as permissões de %s", + "Shares need at least read permissions" : "Compartilhamentos precisam pelo menos permissões de leitura", "Files cannot be shared with delete permissions" : "Arquivos não podem ser compartilhados com permissões de exclusão", "Files cannot be shared with create permissions" : "Arquivos não podem ser compartilhados com permissões de criação", "Expiration date is in the past" : "Data de expiração está no passado", + "Expiration date is enforced" : "A data de expiração é aplicada", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Não foi possível definir a data de expiração superior que %n dias no futuro","Não foi possível definir a data de expiração superior que %n dias no futuro","Não foi possível definir a data de expiração superior que %n dias no futuro"], "Sharing is only allowed with group members" : "O compartilhamento só é permitido com membros do grupo ", "Sharing %s failed, because this item is already shared with the account %s" : "Falha no compartilhamento %s porque este item já está compartilhado com a conta %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.", + "Group sharing is now allowed" : "O compartilhamento em grupo é permitido agora", + "Sharing is only allowed within your own groups" : "O compartilhamento só é permitido dentro de seus próprios grupos", + "Path is already shared with this group" : "O caminho já está compartilhado com este grupo", + "Link sharing is not allowed" : "O compartilhamento de link não é permitido", + "Public upload is not allowed" : "O upload público não é permitido", + "Path contains files shared with you" : "O caminho contém arquivos compartilhados com você", + "Sharing is disabled" : "O compartilhamento está desativado", + "Sharing is disabled for you" : "O compartilhamento está desativado para você", + "Cannot share with the share owner" : "Não é possível compartilhar com o proprietário do compartilhamento", + "Share does not have a full ID" : "O compartilhamento não tem um ID completo", + "Cannot change share type" : "Não é possível alterar o tipo de compartilhamento", + "Can only update recipient on user shares" : "Só é possível atualizar o destinatário em compartilhamentos de usuários", + "Cannot enable sending the password by Talk with an empty password" : "Não é possível ativar o envio da senha pelo Talk com uma senha vazia", + "Cannot enable sending the password by Talk without setting a new password" : "Não é possível ativar o envio da senha pelo Talk sem definir uma nova senha", + "Cannot disable sending the password by Talk without setting a new password" : "Não é possível desativar o envio da senha pelo Talk sem definir uma nova senha", + "Share provider does not support accepting" : "O provedor de compartilhamento não oferece suporte à aceitação", + "Cannot change target of link share" : "Não é possível alterar o destino do compartilhamento do link", + "Invalid recipient" : "Destinatário inválido", + "Group \"%s\" does not exist" : "Grupo \"%s\" não existe", "The requested share does not exist anymore" : "O compartilhamento solicitado não existe mais", "The requested share comes from a disabled user" : "O compartilhamento solicitado vem de um usuário desabilitado", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "O usuário não foi criado porque o limite de usuários foi atingido. Confira suas notificações para saber mais.", @@ -252,7 +294,7 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Seu diretório de dados deve ser um caminho absoluto.", "Check the value of \"datadirectory\" in your configuration." : "Verifique o valor de \"datadirectory\" em sua configuração.", "Your data directory is invalid." : "Seu diretório de dados é inválido.", - "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\".", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Certifique-se de que há um arquivo chamado \"%1$s\" na raiz do diretório de dados. Ele deve ter o conteúdo: \"%2$s\"", "Action \"%s\" not supported or implemented." : "Ação \"%s\" não suportada ou implementada.", "Authentication failed, wrong token or provider ID given" : "Falha na autenticação, token ou ID do provedor errados", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Parâmetros ausentes para concluir a solicitação: \"%s\"", @@ -270,7 +312,7 @@ OC.L10N.register( "The audio to transcribe" : "O áudio a ser transcrito", "Transcription" : "Transcrição", "The transcribed text" : "O texto transcrito", - "ContextWrite" : "Gravação de Contexto", + "Context write" : "Gravação de contexto", "Writes text in a given style based on the provided source material." : "Escreve texto em um determinado estilo com base no material de origem fornecido.", "Writing style" : "Estilo de escrita", "Demonstrate a writing style that you would like to immitate" : "Demonstre um estilo de escrita que você gostaria de imitar", @@ -292,16 +334,39 @@ OC.L10N.register( "Output images" : "Imagens de saída", "The generated images" : "As imagens geradas", "Free text to text prompt" : "Texto livre para prompt de texto", - "Runs an arbitrary prompt through a language model that retuns a reply" : "Executa um prompt arbitrário através de um modelo de linguagem que retorna uma resposta", + "Runs an arbitrary prompt through a language model that returns a reply" : "Usa um modelo de linguagem para gerar uma resposta a partir de um prompt.", "Describe a task that you want the assistant to do or ask a question" : "Descreva uma tarefa que você deseja que o assistente execute ou faça uma pergunta", "Generated reply" : "Resposta gerada", "The generated text from the assistant" : "O texto gerado do assistente", "Chat" : "Conversa", + "Chat with the assistant" : "Converse com o assistente", + "System prompt" : "Prompt do sistema", + "Define rules and assumptions that the assistant should follow during the conversation." : "Defina regras e suposições que o assistente deve seguir durante a conversa.", + "Chat message" : "Mensagem de bate-papo", + "Chat history" : "Histórico de bate-papo", + "The history of chat messages before the current message, starting with a message by the user" : "O histórico de mensagens de bate-papo antes da mensagem atual, começando com uma mensagem do usuário", + "Response message" : "Mensagem de resposta", + "The generated response as part of the conversation" : "A resposta gerada como parte da conversa", + "Formalize text" : "Formalizar texto", + "Takes a text and makes it sound more formal" : "Pega um texto e faz com que ele soe mais formal", + "Write a text that you want the assistant to formalize" : "Escreva um texto que você deseja que o assistente formalize", + "Formalized text" : "Texto formalizado", + "The formalized text" : "O texto formalizado", "Generate a headline" : "Gere um título", "Generates a possible headline for a text." : "Gera um título possível para um texto.", "Original text" : "Texto original", "The original text to generate a headline for" : "O texto original para gerar um título para", "The generated headline" : "O título gerado", + "Reformulate text" : "Reformular texto", + "Takes a text and reformulates it" : "Pega um texto e o reformula", + "Write a text that you want the assistant to reformulate" : "Escrever um texto que você deseja que o assistente reformule", + "Reformulated text" : "Texto reformulado", + "The reformulated text, written by the assistant" : "O texto reformulado, escrito pela assistente", + "Simplify text" : "Simplificar texto", + "Takes a text and simplifies it" : "Pegar um texto e simplificar ", + "Write a text that you want the assistant to simplify" : "Escreva um texto que você deseja que o assistente simplifique", + "Simplified text" : "Texto simplificado", + "The simplified text" : "O texto simplificado", "Summarize" : "Resumir", "Summarizes a text" : "Resumir um texto", "The original text to summarize" : "O texto original para resumir", @@ -312,15 +377,28 @@ OC.L10N.register( "The original text to extract topics from" : "O texto original para extrair tópicos de", "Topics" : "Tópicos", "The list of extracted topics" : "A lista de tópicos extraídos", + "Translate" : "Traduzir", + "Translate text from one language to another" : "Traduzir o texto de um idioma para outro", + "Origin text" : "Texto original", + "The text to translate" : "O texto a ser traduzido", + "Origin language" : "Idioma original", + "The language of the origin text" : "O idioma do texto original", + "Target language" : "Target language", + "The desired language to translate the origin text in" : "O idioma definido para traduzir o texto original", + "Result" : "Resultado", + "The translated text" : "O texto traduzido", "Free prompt" : "Solicitação gratuita", "Runs an arbitrary prompt through the language model." : "Executa um prompt arbitrário por meio do modelo de idioma.", "Generate headline" : "Gerar título", "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.", - "404" : "404", + "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", @@ -339,9 +417,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 é necessário.", - "Please upgrade your database version." : "Por favor, atualize a versão do seu banco de dados.", "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." + "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 f3d208de337..6ddfc036043 100644 --- a/lib/l10n/pt_BR.json +++ b/lib/l10n/pt_BR.json @@ -17,7 +17,7 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s e %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s e %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s e %5$s", - "Education Edition" : "Edição Educativa", + "Education bundle" : "Pacote educacional", "Enterprise bundle" : "Pacote Enterprise", "Groupware bundle" : "Pacote Groupware", "Hub bundle" : "Pacote de hub", @@ -36,6 +36,7 @@ "Server version %s or higher is required." : "É requerido um servidor da versão %s ou superior.", "Server version %s or lower is required." : "É requerido um servidor da versão %s ou abaixo.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "A conta conectada deve ser um administrador, um subadministrador ou ter direito especial para acessar esta configuração", + "Your current IP address doesn’t allow you to perform admin actions" : "Seu endereço IP atual não permite que você execute ações administrativas", "Logged in account must be an admin or sub admin" : "A conta conectada deve ser de um administrador ou subadministrador", "Logged in account must be an admin" : "A conta logada deve ser de um administrador", "Wiping of device %s has started" : "Limpeza do dispositivo %s iniciou", @@ -78,14 +79,21 @@ "seconds ago" : "segundos atrás", "Empty file" : "Arquivo vazio", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "O módulo com a ID: %s não existe. Por favor, habilite-o nas configurações de seu aplicativo ou contacte o administrador.", + "Dot files are not allowed" : "Arquivos Dot não são permitidos", + "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" é um nome de arquivo ou pasta proibido.", + "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" é um prefixo proibido para nomes de arquivos ou pastas.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" não é permitido dentro de um nome de arquivo ou pasta.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" é um tipo de arquivo proibido.", + "Filenames must not end with \"%1$s\"." : "Os nomes dos arquivos não devem terminar com \"%1$s\".", + "Invalid parent path" : "Caminho mãe inválido", "File already exists" : "O arquivo já existe", "Invalid path" : "Diretório inválido", "Failed to create file from template" : "Falha ao criar arquivo do modelo ", "Templates" : "Modelos ", - "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", - "Dot files are not allowed" : "Arquivos Dot não são permitidos", + "Path contains invalid segments" : "O caminho contém segmentos inválidos", + "Filename is a reserved word" : "Nome do arquivo é uma palavra reservada", + "Filename contains at least one invalid character" : "O nome do arquivo contém pelo menos um caractere inválido ", + "Filename is too long" : "O nome do arquivo é muito longo", "Empty filename is not allowed" : "Nome vazio para arquivo não é permitido.", "App \"%s\" cannot be installed because appinfo file cannot be read." : "O aplicativo \"%s\" não pode ser instalado pois o arquivo appinfo não pôde ser lido.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "O aplicativo \"%s\" não pode ser instalado pois não é compatível com a versão do servidor.", @@ -137,22 +145,56 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "A plataforma de compartilhamento %s deve implementar a interface OCP\\Share_Backend", "Sharing backend %s not found" : "Plataforma de serviço de compartilhamento %s não encontrada", "Sharing backend for %s not found" : "Plataforma de compartilhamento para %s não foi encontrada", + "%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.", + "Open »%s«" : "Abrir »%s«", + "%1$s via %2$s" : "%1$s via %2$s", "%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«", - "%1$s via %2$s" : "%1$s via %2$s", + "Passwords are enforced for link and mail shares" : "As senhas são aplicadas para compartilhamentos de links e e-mails", + "SharedWith is not a valid user" : "SharedWith não é um usuário válido", + "SharedWith is not a valid group" : "SharedWith não é um grupo válido", + "SharedWith should be empty" : "SharedWith pode estar vazio", + "SharedWith should not be empty" : "SharedWith não pode estar vazio", + "SharedWith is not a valid circle" : "SharedWith não é um círculo válido", + "Unknown share type" : "Tipo de compartilhamento desconhecido", + "SharedBy should be set" : "SharedBy deve estar definido", + "Cannot share with yourself" : "Não é possível compartilhar consigo mesmo", + "Path should be set" : "O caminho deve estar definido", + "Path should be either a file or a folder" : "O caminho deve ser um arquivo ou pasta", + "You cannot share your root folder" : "Você não pode compartilhar sua pasta raiz", "You are not allowed to share %s" : "Você não tem permissão para compartilhar %s", + "A share requires permissions" : "Um compartilhamento requer permissões", "Cannot increase permissions of %s" : "Não foi possível aumentar as permissões de %s", + "Shares need at least read permissions" : "Compartilhamentos precisam pelo menos permissões de leitura", "Files cannot be shared with delete permissions" : "Arquivos não podem ser compartilhados com permissões de exclusão", "Files cannot be shared with create permissions" : "Arquivos não podem ser compartilhados com permissões de criação", "Expiration date is in the past" : "Data de expiração está no passado", + "Expiration date is enforced" : "A data de expiração é aplicada", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Não foi possível definir a data de expiração superior que %n dias no futuro","Não foi possível definir a data de expiração superior que %n dias no futuro","Não foi possível definir a data de expiração superior que %n dias no futuro"], "Sharing is only allowed with group members" : "O compartilhamento só é permitido com membros do grupo ", "Sharing %s failed, because this item is already shared with the account %s" : "Falha no compartilhamento %s porque este item já está compartilhado com a conta %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.", + "Group sharing is now allowed" : "O compartilhamento em grupo é permitido agora", + "Sharing is only allowed within your own groups" : "O compartilhamento só é permitido dentro de seus próprios grupos", + "Path is already shared with this group" : "O caminho já está compartilhado com este grupo", + "Link sharing is not allowed" : "O compartilhamento de link não é permitido", + "Public upload is not allowed" : "O upload público não é permitido", + "Path contains files shared with you" : "O caminho contém arquivos compartilhados com você", + "Sharing is disabled" : "O compartilhamento está desativado", + "Sharing is disabled for you" : "O compartilhamento está desativado para você", + "Cannot share with the share owner" : "Não é possível compartilhar com o proprietário do compartilhamento", + "Share does not have a full ID" : "O compartilhamento não tem um ID completo", + "Cannot change share type" : "Não é possível alterar o tipo de compartilhamento", + "Can only update recipient on user shares" : "Só é possível atualizar o destinatário em compartilhamentos de usuários", + "Cannot enable sending the password by Talk with an empty password" : "Não é possível ativar o envio da senha pelo Talk com uma senha vazia", + "Cannot enable sending the password by Talk without setting a new password" : "Não é possível ativar o envio da senha pelo Talk sem definir uma nova senha", + "Cannot disable sending the password by Talk without setting a new password" : "Não é possível desativar o envio da senha pelo Talk sem definir uma nova senha", + "Share provider does not support accepting" : "O provedor de compartilhamento não oferece suporte à aceitação", + "Cannot change target of link share" : "Não é possível alterar o destino do compartilhamento do link", + "Invalid recipient" : "Destinatário inválido", + "Group \"%s\" does not exist" : "Grupo \"%s\" não existe", "The requested share does not exist anymore" : "O compartilhamento solicitado não existe mais", "The requested share comes from a disabled user" : "O compartilhamento solicitado vem de um usuário desabilitado", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "O usuário não foi criado porque o limite de usuários foi atingido. Confira suas notificações para saber mais.", @@ -250,7 +292,7 @@ "Your data directory must be an absolute path." : "Seu diretório de dados deve ser um caminho absoluto.", "Check the value of \"datadirectory\" in your configuration." : "Verifique o valor de \"datadirectory\" em sua configuração.", "Your data directory is invalid." : "Seu diretório de dados é inválido.", - "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\".", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Certifique-se de que há um arquivo chamado \"%1$s\" na raiz do diretório de dados. Ele deve ter o conteúdo: \"%2$s\"", "Action \"%s\" not supported or implemented." : "Ação \"%s\" não suportada ou implementada.", "Authentication failed, wrong token or provider ID given" : "Falha na autenticação, token ou ID do provedor errados", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Parâmetros ausentes para concluir a solicitação: \"%s\"", @@ -268,7 +310,7 @@ "The audio to transcribe" : "O áudio a ser transcrito", "Transcription" : "Transcrição", "The transcribed text" : "O texto transcrito", - "ContextWrite" : "Gravação de Contexto", + "Context write" : "Gravação de contexto", "Writes text in a given style based on the provided source material." : "Escreve texto em um determinado estilo com base no material de origem fornecido.", "Writing style" : "Estilo de escrita", "Demonstrate a writing style that you would like to immitate" : "Demonstre um estilo de escrita que você gostaria de imitar", @@ -290,16 +332,39 @@ "Output images" : "Imagens de saída", "The generated images" : "As imagens geradas", "Free text to text prompt" : "Texto livre para prompt de texto", - "Runs an arbitrary prompt through a language model that retuns a reply" : "Executa um prompt arbitrário através de um modelo de linguagem que retorna uma resposta", + "Runs an arbitrary prompt through a language model that returns a reply" : "Usa um modelo de linguagem para gerar uma resposta a partir de um prompt.", "Describe a task that you want the assistant to do or ask a question" : "Descreva uma tarefa que você deseja que o assistente execute ou faça uma pergunta", "Generated reply" : "Resposta gerada", "The generated text from the assistant" : "O texto gerado do assistente", "Chat" : "Conversa", + "Chat with the assistant" : "Converse com o assistente", + "System prompt" : "Prompt do sistema", + "Define rules and assumptions that the assistant should follow during the conversation." : "Defina regras e suposições que o assistente deve seguir durante a conversa.", + "Chat message" : "Mensagem de bate-papo", + "Chat history" : "Histórico de bate-papo", + "The history of chat messages before the current message, starting with a message by the user" : "O histórico de mensagens de bate-papo antes da mensagem atual, começando com uma mensagem do usuário", + "Response message" : "Mensagem de resposta", + "The generated response as part of the conversation" : "A resposta gerada como parte da conversa", + "Formalize text" : "Formalizar texto", + "Takes a text and makes it sound more formal" : "Pega um texto e faz com que ele soe mais formal", + "Write a text that you want the assistant to formalize" : "Escreva um texto que você deseja que o assistente formalize", + "Formalized text" : "Texto formalizado", + "The formalized text" : "O texto formalizado", "Generate a headline" : "Gere um título", "Generates a possible headline for a text." : "Gera um título possível para um texto.", "Original text" : "Texto original", "The original text to generate a headline for" : "O texto original para gerar um título para", "The generated headline" : "O título gerado", + "Reformulate text" : "Reformular texto", + "Takes a text and reformulates it" : "Pega um texto e o reformula", + "Write a text that you want the assistant to reformulate" : "Escrever um texto que você deseja que o assistente reformule", + "Reformulated text" : "Texto reformulado", + "The reformulated text, written by the assistant" : "O texto reformulado, escrito pela assistente", + "Simplify text" : "Simplificar texto", + "Takes a text and simplifies it" : "Pegar um texto e simplificar ", + "Write a text that you want the assistant to simplify" : "Escreva um texto que você deseja que o assistente simplifique", + "Simplified text" : "Texto simplificado", + "The simplified text" : "O texto simplificado", "Summarize" : "Resumir", "Summarizes a text" : "Resumir um texto", "The original text to summarize" : "O texto original para resumir", @@ -310,15 +375,28 @@ "The original text to extract topics from" : "O texto original para extrair tópicos de", "Topics" : "Tópicos", "The list of extracted topics" : "A lista de tópicos extraídos", + "Translate" : "Traduzir", + "Translate text from one language to another" : "Traduzir o texto de um idioma para outro", + "Origin text" : "Texto original", + "The text to translate" : "O texto a ser traduzido", + "Origin language" : "Idioma original", + "The language of the origin text" : "O idioma do texto original", + "Target language" : "Target language", + "The desired language to translate the origin text in" : "O idioma definido para traduzir o texto original", + "Result" : "Resultado", + "The translated text" : "O texto traduzido", "Free prompt" : "Solicitação gratuita", "Runs an arbitrary prompt through the language model." : "Executa um prompt arbitrário por meio do modelo de idioma.", "Generate headline" : "Gerar título", "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.", - "404" : "404", + "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", @@ -337,9 +415,8 @@ "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 é necessário.", - "Please upgrade your database version." : "Por favor, atualize a versão do seu banco de dados.", "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." + "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 ecb3338c5d9..404696d8d0d 100644 --- a/lib/l10n/pt_PT.js +++ b/lib/l10n/pt_PT.js @@ -15,7 +15,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s e %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s e %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s e %5$s", - "Education Edition" : "Edição Educação", "Enterprise bundle" : "Pacote Empresa", "Groupware bundle" : "Pacote Colaborativo", "Social sharing bundle" : "Pacote Partilha Social", @@ -56,14 +55,12 @@ OC.L10N.register( "seconds ago" : "Minutos atrás", "Empty file" : "Ficheiro vazio", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Módulo com ID: %s não existe. Por favor active-o nas definições da aplicação ou contacte o administrador.", + "Dot files are not allowed" : "Ficheiros dot não são permitidos", "File already exists" : "O ficheiro já existe", "Invalid path" : "Caminho inválido!", "Failed to create file from template" : "Erro ao criar o ficheiro a partir do modelo", "Templates" : "Modelos", - "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", - "Dot files are not allowed" : "Ficheiros dot não são permitidos", + "Filename contains at least one invalid character" : "Nome ficheiro contém pelo menos um caractere inválido", "Empty filename is not allowed" : "Não é permitido um ficheiro sem nome", "App \"%s\" cannot be installed because appinfo file cannot be read." : "A app \"%s\" não pode ser instalada porque o ficheiro appinfo não pode ser lido.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "A aplicação \"%s\" não pode ser instada porque não é compatível com esta versão do servidor.", @@ -98,17 +95,18 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Ao partilhar a interface %s deve implementar a interface OCP\\Share_Backend", "Sharing backend %s not found" : "Não foi encontrada a partilha da interface %s", "Sharing backend for %s not found" : "Não foi encontrada a partilha da interface para %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.", + "Open »%s«" : "Abrir »%s«", + "%1$s via %2$s" : "%1$s via %2$s", "%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«", - "%1$s via %2$s" : "%1$s via %2$s", + "Unknown share type" : "Tipo de partilha desconhecido", "You are not allowed to share %s" : "Não está autorizado a partilhar %s", "Cannot increase permissions of %s" : "Não é possível aumentar as permissões de %s", "Expiration date is in the past" : "A data de expiração está no passado", - "%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 requested share does not exist anymore" : "A partilha requisitada já não existe", "Could not find category \"%s\"" : "Não foi encontrado a categoria \"%s\"", "Sunday" : "Domingo", @@ -175,7 +173,6 @@ OC.L10N.register( "PHP modules have been installed, but they are still listed as missing?" : "Os módulos PHP foram instalados, mas eles ainda estão listados como desaparecidos?", "Please ask your server administrator to restart the web server." : "Pro favor pergunte ao seu administrador do servidor para reiniciar o servidor da internet.", "Your data directory is invalid." : "A sua diretoria de dados é inválida.", - "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", "Action \"%s\" not supported or implemented." : "Ação \"%s\" não suportada ou implementada.", "Could not obtain lock type %d on \"%s\"." : "Não foi possível obter o tipo de bloqueio %d em \"%s\".", "Storage unauthorized. %s" : "Armazenamento desautorizado. %s", @@ -185,8 +182,13 @@ OC.L10N.register( "Storage connection timeout. %s" : "Tempo de ligação ao armazenamento expirou. %s", "Chat" : "Chat", "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", @@ -200,8 +202,7 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "Necessário PostgreSQL >= 9", - "Please upgrade your database version." : "Por favor, atualize a sua versão da base de dados", - "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." + "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 3329cec21f1..dc78efffff6 100644 --- a/lib/l10n/pt_PT.json +++ b/lib/l10n/pt_PT.json @@ -13,7 +13,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s e %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s e %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s e %5$s", - "Education Edition" : "Edição Educação", "Enterprise bundle" : "Pacote Empresa", "Groupware bundle" : "Pacote Colaborativo", "Social sharing bundle" : "Pacote Partilha Social", @@ -54,14 +53,12 @@ "seconds ago" : "Minutos atrás", "Empty file" : "Ficheiro vazio", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Módulo com ID: %s não existe. Por favor active-o nas definições da aplicação ou contacte o administrador.", + "Dot files are not allowed" : "Ficheiros dot não são permitidos", "File already exists" : "O ficheiro já existe", "Invalid path" : "Caminho inválido!", "Failed to create file from template" : "Erro ao criar o ficheiro a partir do modelo", "Templates" : "Modelos", - "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", - "Dot files are not allowed" : "Ficheiros dot não são permitidos", + "Filename contains at least one invalid character" : "Nome ficheiro contém pelo menos um caractere inválido", "Empty filename is not allowed" : "Não é permitido um ficheiro sem nome", "App \"%s\" cannot be installed because appinfo file cannot be read." : "A app \"%s\" não pode ser instalada porque o ficheiro appinfo não pode ser lido.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "A aplicação \"%s\" não pode ser instada porque não é compatível com esta versão do servidor.", @@ -96,17 +93,18 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Ao partilhar a interface %s deve implementar a interface OCP\\Share_Backend", "Sharing backend %s not found" : "Não foi encontrada a partilha da interface %s", "Sharing backend for %s not found" : "Não foi encontrada a partilha da interface para %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.", + "Open »%s«" : "Abrir »%s«", + "%1$s via %2$s" : "%1$s via %2$s", "%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«", - "%1$s via %2$s" : "%1$s via %2$s", + "Unknown share type" : "Tipo de partilha desconhecido", "You are not allowed to share %s" : "Não está autorizado a partilhar %s", "Cannot increase permissions of %s" : "Não é possível aumentar as permissões de %s", "Expiration date is in the past" : "A data de expiração está no passado", - "%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 requested share does not exist anymore" : "A partilha requisitada já não existe", "Could not find category \"%s\"" : "Não foi encontrado a categoria \"%s\"", "Sunday" : "Domingo", @@ -173,7 +171,6 @@ "PHP modules have been installed, but they are still listed as missing?" : "Os módulos PHP foram instalados, mas eles ainda estão listados como desaparecidos?", "Please ask your server administrator to restart the web server." : "Pro favor pergunte ao seu administrador do servidor para reiniciar o servidor da internet.", "Your data directory is invalid." : "A sua diretoria de dados é inválida.", - "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", "Action \"%s\" not supported or implemented." : "Ação \"%s\" não suportada ou implementada.", "Could not obtain lock type %d on \"%s\"." : "Não foi possível obter o tipo de bloqueio %d em \"%s\".", "Storage unauthorized. %s" : "Armazenamento desautorizado. %s", @@ -183,8 +180,13 @@ "Storage connection timeout. %s" : "Tempo de ligação ao armazenamento expirou. %s", "Chat" : "Chat", "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", @@ -198,8 +200,7 @@ "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", - "PostgreSQL >= 9 required." : "Necessário PostgreSQL >= 9", - "Please upgrade your database version." : "Por favor, atualize a sua versão da base de dados", - "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." + "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 fe3632f0a60..f15d4839217 100644 --- a/lib/l10n/ro.js +++ b/lib/l10n/ro.js @@ -19,7 +19,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s și %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s și %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s și %5$s", - "Education Edition" : "Ediția pentru educație", "Enterprise bundle" : "Pachetul enterprise", "Groupware bundle" : "Pachetul Groupware", "Hub bundle" : "Pachetul central", @@ -76,14 +75,12 @@ OC.L10N.register( "seconds ago" : "secunde în urmă", "Empty file" : "Fișier gol", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modulul cu ID: %s nu există. Activați-l din setările aplicației sau contactați administratorul.", + "Dot files are not allowed" : "Fișierele care încep cu caracterul punct nu sunt permise", "File already exists" : "Fișierul există deja", "Invalid path" : "Cale invalidă", "Failed to create file from template" : "Eroare la crearea fișierului pe baza șablonului", "Templates" : "Șabloane", - "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", - "Dot files are not allowed" : "Fișierele care încep cu caracterul punct nu sunt permise", + "Filename contains at least one invalid character" : "Numele fișierului conține cel puțin un caracter invalid", "Empty filename is not allowed" : "Nu este permis fișier fără nume", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Aplicația \"%s\" nu poate fi instalată deoarece fișierul appinfo nu poate fi citit.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Aplicația \"%s\" nu poate fi instalată deoarece nu este compatibilă cu versiunea serverului.", @@ -124,11 +121,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Backend-ul de partajare %s trebuie să implementeze interfața OCP\\Share_Backend", "Sharing backend %s not found" : "Backend-ul de partajare %s nu există", "Sharing backend for %s not found" : "Backend-ul de partajare pentru %s nu a fost găsit", + "%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.", + "Open »%s«" : "Deschide »%s«", + "%1$s via %2$s" : "%1$sprin %2$s", "%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«", - "%1$s via %2$s" : "%1$sprin %2$s", + "Unknown share type" : "Tip necunoscut de partajare", "You are not allowed to share %s" : "Nu există permisiunea de partajare %s", "Cannot increase permissions of %s" : "Nu se pot extinde permisiunile pentru %s", "Files cannot be shared with delete permissions" : "Fișierele nu pot fi partajate cu permisiunea de ștergere", @@ -136,9 +137,6 @@ OC.L10N.register( "Expiration date is in the past" : "Data expirării este în trecut", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Data expirării nu poate fi mai mult de %n zi în viitor","Data expirării nu poate fi mai mult de %n zile în viitor","Data expirării nu poate fi mai mult de %n zile în viitor"], "Sharing is only allowed with group members" : "Partajarea este permisă doar cu membrii grupului", - "%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 requested share does not exist anymore" : "Partajarea solicitată nu mai există", "The requested share comes from a disabled user" : "Partajarea solicitată provine de la un utilizator dezactivat", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Utilizatorul nu a fost creat deoarece s-a atins limita acestui număr. Verificați notificările pentru a afla mai mult.", @@ -224,7 +222,6 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Directorul de date trebuie să fie o cale absolută.", "Check the value of \"datadirectory\" in your configuration." : "Verificați valoarea \"datadirectory\" în configurație.", "Your data directory is invalid." : "Directorul de date este invalid.", - "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.", "Action \"%s\" not supported or implemented." : "Acțiunea \"%s\" nu este suportată sau implementată.", "Authentication failed, wrong token or provider ID given" : "Autentificare eșuată, token greșit sau ID provider eronat", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Parametri lipsă pentru îndeplinirea solicitării. Parametrii lipsă: \"%s\"", @@ -240,14 +237,19 @@ OC.L10N.register( "Summarize" : "Rezumă", "Summary" : "Rezumat", "Extract topics" : "Extrage subiecte", + "Translate" : "Tradu", "Free prompt" : "Eliberează prompt-ul", "Runs an arbitrary prompt through the language model." : "Rulează un prompt arbitrar prin modelul lingvistic.", "Generate headline" : "Generează titlu", "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", @@ -266,9 +268,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "Este necesar PostgreSQL >= 9 .", - "Please upgrade your database version." : "Faceți upgrade la versiunea bazei de date.", "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." + "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 79df1604536..f762c52fa3c 100644 --- a/lib/l10n/ro.json +++ b/lib/l10n/ro.json @@ -17,7 +17,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s și %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s și %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s și %5$s", - "Education Edition" : "Ediția pentru educație", "Enterprise bundle" : "Pachetul enterprise", "Groupware bundle" : "Pachetul Groupware", "Hub bundle" : "Pachetul central", @@ -74,14 +73,12 @@ "seconds ago" : "secunde în urmă", "Empty file" : "Fișier gol", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modulul cu ID: %s nu există. Activați-l din setările aplicației sau contactați administratorul.", + "Dot files are not allowed" : "Fișierele care încep cu caracterul punct nu sunt permise", "File already exists" : "Fișierul există deja", "Invalid path" : "Cale invalidă", "Failed to create file from template" : "Eroare la crearea fișierului pe baza șablonului", "Templates" : "Șabloane", - "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", - "Dot files are not allowed" : "Fișierele care încep cu caracterul punct nu sunt permise", + "Filename contains at least one invalid character" : "Numele fișierului conține cel puțin un caracter invalid", "Empty filename is not allowed" : "Nu este permis fișier fără nume", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Aplicația \"%s\" nu poate fi instalată deoarece fișierul appinfo nu poate fi citit.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Aplicația \"%s\" nu poate fi instalată deoarece nu este compatibilă cu versiunea serverului.", @@ -122,11 +119,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Backend-ul de partajare %s trebuie să implementeze interfața OCP\\Share_Backend", "Sharing backend %s not found" : "Backend-ul de partajare %s nu există", "Sharing backend for %s not found" : "Backend-ul de partajare pentru %s nu a fost găsit", + "%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.", + "Open »%s«" : "Deschide »%s«", + "%1$s via %2$s" : "%1$sprin %2$s", "%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«", - "%1$s via %2$s" : "%1$sprin %2$s", + "Unknown share type" : "Tip necunoscut de partajare", "You are not allowed to share %s" : "Nu există permisiunea de partajare %s", "Cannot increase permissions of %s" : "Nu se pot extinde permisiunile pentru %s", "Files cannot be shared with delete permissions" : "Fișierele nu pot fi partajate cu permisiunea de ștergere", @@ -134,9 +135,6 @@ "Expiration date is in the past" : "Data expirării este în trecut", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Data expirării nu poate fi mai mult de %n zi în viitor","Data expirării nu poate fi mai mult de %n zile în viitor","Data expirării nu poate fi mai mult de %n zile în viitor"], "Sharing is only allowed with group members" : "Partajarea este permisă doar cu membrii grupului", - "%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 requested share does not exist anymore" : "Partajarea solicitată nu mai există", "The requested share comes from a disabled user" : "Partajarea solicitată provine de la un utilizator dezactivat", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Utilizatorul nu a fost creat deoarece s-a atins limita acestui număr. Verificați notificările pentru a afla mai mult.", @@ -222,7 +220,6 @@ "Your data directory must be an absolute path." : "Directorul de date trebuie să fie o cale absolută.", "Check the value of \"datadirectory\" in your configuration." : "Verificați valoarea \"datadirectory\" în configurație.", "Your data directory is invalid." : "Directorul de date este invalid.", - "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.", "Action \"%s\" not supported or implemented." : "Acțiunea \"%s\" nu este suportată sau implementată.", "Authentication failed, wrong token or provider ID given" : "Autentificare eșuată, token greșit sau ID provider eronat", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Parametri lipsă pentru îndeplinirea solicitării. Parametrii lipsă: \"%s\"", @@ -238,14 +235,19 @@ "Summarize" : "Rezumă", "Summary" : "Rezumat", "Extract topics" : "Extrage subiecte", + "Translate" : "Tradu", "Free prompt" : "Eliberează prompt-ul", "Runs an arbitrary prompt through the language model." : "Rulează un prompt arbitrar prin modelul lingvistic.", "Generate headline" : "Generează titlu", "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", @@ -264,9 +266,8 @@ "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", - "PostgreSQL >= 9 required." : "Este necesar PostgreSQL >= 9 .", - "Please upgrade your database version." : "Faceți upgrade la versiunea bazei de date.", "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." + "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 3356ce7f7a6..afa886d111e 100644 --- a/lib/l10n/ru.js +++ b/lib/l10n/ru.js @@ -19,10 +19,11 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s и %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s и %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s и %5$s", - "Education Edition" : "Набор приложений для образовательных учреждений", + "Education bundle" : "Образовательный пакет", "Enterprise bundle" : "Набор приложений для предприятий", "Groupware bundle" : "Набор приложений для совместной работы", "Hub bundle" : "Основной набор приложений", + "Public sector bundle" : "Пакет услуг для государственного сектора", "Social sharing bundle" : "Набор приложений для публикации с использованием соц. сетей", "PHP %s or higher is required." : "Требуется PHP версии %s или выше.", "PHP with a version lower than %s is required." : "Требуется PHP версии ниже %s.", @@ -36,6 +37,10 @@ OC.L10N.register( "The following platforms are supported: %s" : "Поддерживаются следующие платформы: %s", "Server version %s or higher is required." : "Требуется сервер версии %s или выше.", "Server version %s or lower is required." : "Требуется сервер версии %s или ниже.", + "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Для доступа к этой настройке зарегистрированная учетная запись должна быть администратором, субадминистратором или иметь специальные права", + "Your current IP address doesn’t allow you to perform admin actions" : "Ваш текущий IP-адрес не позволяет вам выполнять административные действи", + "Logged in account must be an admin or sub admin" : "Зарегистрированная учетная запись должна быть администратором или субадминистратором", + "Logged in account must be an admin" : "Вошедший в систему пользователь должен быть администратором", "Wiping of device %s has started" : "Удаление данных с устройства «%s».", "Wiping of device »%s« has started" : "Удаление данных с устройства «%s».", "»%s« started remote wipe" : "Начало удаления данных с устройства «%s»", @@ -76,19 +81,27 @@ 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» не существует. Включите его в настройках приложений или обратитесь к администратору.", + "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\" является запрещенным префиксом для имен файлов или папок.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" не допускается указывать имя файла или папки внутри него.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" это запрещенный тип файла.", + "Filenames must not end with \"%1$s\"." : "Имена файлов не должны заканчиваться на \"%1$s\".", + "Invalid parent path" : "Недопустимый родительский путь", "File already exists" : "Файл уже существует", "Invalid path" : "Некорректный путь", "Failed to create file from template" : "Не удалось создать файл на основе шаблона", "Templates" : "Шаблоны", - "File name is a reserved word" : "Имя файла является зарезервированным словом", - "File name contains at least one invalid character" : "Имя файла содержит по крайней мере один недопустимый символ", - "File name is too long" : "Имя файла слишком длинное.", - "Dot files are not allowed" : "Файлы начинающиеся с точки не допускаются", + "Path contains invalid segments" : "Путь содержит недопустимые сегменты", + "Filename is a reserved word" : "Имя файла - это зарезервированное слово", + "Filename contains at least one invalid character" : "Имя файла содержит как минимум один недопустимый символ", + "Filename is too long" : "Имя файла слишком длинное", "Empty filename is not allowed" : "Пустое имя файла не допускается", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Приложение «%s» не может быть установлено, так как файл с информацией о приложении не может быть прочтен.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Приложение «%s» не может быть установлено, потому что оно несовместимо с этой версией сервера", "__language_name__" : "Русский", "This is an automatically sent email, please do not reply." : "Это сообщение отправлено автоматически и не требует ответа.", + "Help & privacy" : "Помощь и конфиденциальность", "Appearance and accessibility" : "Внешний вид и доступность", "Apps" : "Приложения", "Personal settings" : "Личные настройки", @@ -113,39 +126,77 @@ OC.L10N.register( "Headline" : "Заголовок", "Organisation" : "Организация", "Role" : "Роль", + "Unknown account" : "Неизвестный аккаунт", "Additional settings" : "Дополнительные настройки", + "Enter the database Login and name for %s" : "Введите логин и имя пользователя базы данных для %s", + "Enter the database Login for %s" : "Введите логин в базе данных для %s", "Enter the database name for %s" : "Укажите название базы данных %s", "You cannot use dots in the database name %s" : "Имя базы данных %s не может содержать символ точки", + "MySQL Login and/or password not valid" : "Неверный логин и/или пароль для входа в MySQL", "You need to enter details of an existing account." : "Необходимо уточнить данные существующего акаунта.", "Oracle connection could not be established" : "Соединение с Oracle не может быть установлено", + "Oracle Login and/or password not valid" : "Неверный логин и/или пароль Oracle", + "PostgreSQL Login and/or password not valid" : "Неверный логин и/или пароль для PostgreSQL", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не поддерживается и %s может работать некорректно на данной платформе. Используйте на свой страх и риск!", "For the best results, please consider using a GNU/Linux server instead." : "Для достижения наилучших результатов, рассмотрите вариант использования сервера на GNU/Linux.", "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4 GB and is highly discouraged." : "Кажется что экземпляр этого %s работает в 32-битной среде PHP и в php.ini был настроен open_basedir. Это приведёт к проблемам с файлами более 4 ГБ и настоятельно не рекомендуется.", "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Удалите директиву open_basedir из файла php.ini или смените PHP на 64-разрядную сборку.", + "Set an admin Login." : "Установите логин администратора.", "Set an admin password." : "Задать пароль для admin.", "Cannot create or write into the data directory %s" : "Не удалось создать или записать в каталог данных «%s»", "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Бэкенд общего доступа %s должен реализовывать интерфейс OCP\\Share_Backend", "Sharing backend %s not found" : "Механизм предоставления общего доступа %s не найден", "Sharing backend for %s not found" : "Не найден механизм предоставления общего доступа для %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." : "Нажмите расположенную ниже кнопку для перехода к полученному общему ресурсу.", + "Open »%s«" : "Открыть «%s»", + "%1$s via %2$s" : "%1$s через %2$s", "%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»", - "%1$s via %2$s" : "%1$s через %2$s", + "Passwords are enforced for link and mail shares" : "Для общих ссылок и почтовых рассылок применяются пароли", + "Unknown share type" : "Общий доступ неизвестного типа", + "Cannot share with yourself" : "Не могу поделиться с самим собой", + "Path should be set" : "Путь должен быть задан", + "Path should be either a file or a folder" : "Путь должен быть либо к файлу, либо к папке", + "You cannot share your root folder" : "Вы не можете предоставить общий доступ к своей корневой папке", "You are not allowed to share %s" : "Вам не разрешено делиться %s", + "A share requires permissions" : "Для общего доступа требуются разрешения", "Cannot increase permissions of %s" : "Не удалось повысить права доступа %s", + "Shares need at least read permissions" : "Общим ресурсам требуются как минимум разрешения на чтение", "Files cannot be shared with delete permissions" : "Права на удаление файлов не позволяют открывать общий доступ к ним", "Files cannot be shared with create permissions" : "Права на создание файлов не позволяют открывать общий доступ к ним", "Expiration date is in the past" : "Дата окончания срока действия уже прошла", + "Expiration date is enforced" : "Срок годности истекает", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Срок окончания не может быть более %n дня","Срок окончания не может быть более %n дней","Срок окончания не может быть более %n дней","Срок окончания не может быть более %n дней"], "Sharing is only allowed with group members" : "Разрешено публиковать только для участников группы", - "%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." : "Нажмите расположенную ниже кнопку для перехода к полученному общему ресурсу.", + "Sharing %s failed, because this item is already shared with the account %s" : "Не удалось поделиться %s, так как этот элемент уже используется для доступа к учетной записи %s", + "Group sharing is now allowed" : "Теперь разрешен общий доступ к группам", + "Sharing is only allowed within your own groups" : "Общий доступ разрешен только в ваших собственных группах", + "Path is already shared with this group" : "Путь уже является общим для этой группы", + "Link sharing is not allowed" : "Обмен ссылками запрещен", + "Public upload is not allowed" : "Публичная загрузка данных запрещена", + "Path contains files shared with you" : "Путь содержит файлы, к которым вы предоставили общий доступ", + "Sharing is disabled" : "Общий доступ отключен", + "Sharing is disabled for you" : "Общий доступ для вас отключен", + "Cannot share with the share owner" : "Невозможно поделиться с владельцем общего доступа", + "Share does not have a full ID" : "Общий ресурс не имеет полного идентификатора", + "Cannot change share type" : "Невозможно изменить тип общего ресурса", + "Can only update recipient on user shares" : "Может обновлять информацию о получателе только в общих папках пользователей", + "Cannot enable sending the password by Talk with an empty password" : "Не удается включить отправку пароля по телефону с пустым паролем", + "Cannot enable sending the password by Talk without setting a new password" : "Невозможно включить отправку пароля по телефону без установки нового пароля", + "Cannot disable sending the password by Talk without setting a new password" : "Невозможно отключить отправку пароля по телефону без установки нового пароля", + "Share provider does not support accepting" : "Поставщик общего доступа не поддерживает прием", + "Cannot change target of link share" : "Невозможно изменить цель публикации ссылки", + "Invalid 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" : "Вторник", @@ -192,6 +243,14 @@ OC.L10N.register( "Nov." : "Нояб.", "Dec." : "Дек.", "A valid password must be provided" : "Укажите допустимый пароль", + "The Login is already being used" : "Логин уже используется", + "Could not create account" : "Не удалось создать учетную запись", + "Only the following characters are allowed in an Login: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "В логине разрешены только следующие символы: \"a-z\", \"A-Z\", \"0-9\", пробелы и \"_.@-'\"", + "A valid Login must be provided" : "Необходимо указать действительный логин для входа в систему", + "Login contains whitespace at the beginning or at the end" : "Имя пользователя содержит пробелы в начале или в конце", + "Login must not consist of dots only" : "Логин не должен состоять только из точек", + "Login is invalid because files already exist for this user" : "Логин недействителен, поскольку файлы для этого пользователя уже существуют", + "Account disabled" : "Учетная запись отключена", "Login canceled by app" : "Вход отменен приложением", "App \"%1$s\" cannot be installed because the following dependencies are not fulfilled: %2$s" : "Приложение «%1$s» не может быть установлено, так как не удовлетворены следующие зависимости: %2$s", "a safe home for all your data" : "надёжный дом для всех ваших данных", @@ -224,10 +283,12 @@ OC.L10N.register( "Please ask your server administrator to restart the web server." : "Пожалуйста, попросите вашего администратора перезапустить веб-сервер.", "The required %s config variable is not configured in the config.php file." : "Необходимая переменная %s не настроена в файле config.php.", "Please ask your server administrator to check the Nextcloud configuration." : "Пожалуйста, попросите администратора вашего сервера проверить конфигурацию Nextcloud.", + "Your data directory is readable by other people." : "Ваш каталог данных доступен для чтения другими пользователями.", + "Please change the permissions to 0770 so that the directory cannot be listed by other people." : "Пожалуйста, измените разрешения на 0770, чтобы другие пользователи не могли просматривать этот каталог.", "Your data directory must be an absolute path." : "Каталог данных должен быть указан в виде абсолютного пути.", "Check the value of \"datadirectory\" in your configuration." : "Проверьте в значение параметра «datadirectory» в файле конфигурации.", "Your data directory is invalid." : "Каталог данных задан неверно.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Убедитесь, что в корне каталога данных присутствует файл «.ocdata».", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Убедитесь, что в корневом каталоге данных есть файл с именем \"%1$s\". Он должен содержать следующее содержимое: \"%2$s\"", "Action \"%s\" not supported or implemented." : "Действие «%s» не поддерживается или не реализовано.", "Authentication failed, wrong token or provider ID given" : "Ошибка аутентификации, неверный токен или идентификатор провайдера", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Отсутствуют параметры для завершения запроса. Отсутствующие параметры: \"%s\"", @@ -239,20 +300,95 @@ OC.L10N.register( "Storage connection error. %s" : "Ошибка подключения к хранилищу. %s", "Storage is temporarily not available" : "Хранилище временно недоступно", "Storage connection timeout. %s" : "Истекло время ожидания подключения к хранилищу. %s", + "Transcribe audio" : "Транскрибировать аудио", + "Transcribe the things said in an audio" : "Запишите то, что было сказано в аудиозаписи", + "Audio input" : "Аудиовход", + "The audio to transcribe" : "Аудио для расшифровки", + "Transcription" : "Транскрипция", + "The transcribed text" : "Расшифрованный текст", + "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" : "Генератор Emoji", + "Takes text and generates a representative emoji for it." : "Берет текст и генерирует для него репрезентативный смайлик.", + "Generate image" : "Генерировать изображение", + "Generate an image from a text prompt" : "Создайте изображение из текстовой подсказки", + "Describe the image you want to generate" : "Опишите изображение, которое вы хотите создать", + "Number of images" : "Количество изображений", + "How many images to generate" : "Сколько изображений генерировать", + "Output images" : "Выходные изображения", + "The generated images" : "Сгенерированные изображения", + "Free text to text prompt" : "Произвольное преобразование текста в текстовую подсказку", + "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" : "Опишите задачу, которую вы хотите поручить ассистенту, или задайте вопрос", + "Generated reply" : "Сгенерированный ответ", + "The generated text from the assistant" : "Сгенерированный текст от помощника", "Chat" : "Разговор", + "Chat with the assistant" : "Пообщайтесь с ассистентом", + "System prompt" : "Системная подсказка", + "Define rules and assumptions that the assistant should follow during the conversation." : "Определите правила и допущения, которым ассистент должен следовать во время разговора.", + "Chat message" : "Сообщение в чате", + "Chat history" : "История чата", + "The history of chat messages before the current message, starting with a message by the user" : "История сообщений в чате до текущего сообщения, начиная с сообщения пользователя", + "Response message" : "Ответное сообщение", + "The generated response as part of the conversation" : "Сгенерированный ответ в ходе беседы", + "Formalize text" : "Формализовать текст", + "Takes a text and makes it sound more formal" : "Берется текст и делает его звучание более формальным", + "Write a text that you want the assistant to formalize" : "Напишите текст, который вы хотите, чтобы ассистент оформил официально", + "Formalized text" : "Формализованный текст", + "The formalized text" : "Формализованный текст", + "Generate a headline" : "Создайте заголовок", "Generates a possible headline for a text." : "Генерирует возможный заголовок для текста.", + "Original text" : "Оригинальный текст", + "The original text to generate a headline for" : "Исходный текст для создания заголовка для", + "The generated headline" : "Сгенерированный заголовок", + "Reformulate text" : "Переформулировать текст", + "Takes a text and reformulates it" : "Берет текст и переформулирует его", + "Write a text that you want the assistant to reformulate" : "Напишите текст, который вы хотите, чтобы ассистент переформулировал", + "Reformulated text" : "Измененный текст", + "The reformulated text, written by the assistant" : "Переформулированный текст, написанный ассистентом", + "Simplify text" : "Упрощение текста", + "Takes a text and simplifies it" : "Берет текст и упрощает его", + "Write a text that you want the assistant to simplify" : "Напишите текст, который вы хотите, чтобы ассистент упростил", + "Simplified text" : "Упрощенный текст", + "The simplified text" : "Упрощенный текст", "Summarize" : "Обобщить", + "Summarizes a text" : "Обобщенный текст", + "The original text to summarize" : "Исходный текст для подведения итогов", "Summary" : "Всего", + "The generated summary" : "Сгенерированная сводка", "Extract topics" : "Извлечь темы", + "Extracts topics from a text and outputs them separated by commas" : "Извлекает темы из текста и выводит их через запятую", + "The original text to extract topics from" : "Исходный текст для извлечения тем из", + "Topics" : "Темы", + "The list of extracted topics" : "Список извлеченных тем", + "Translate" : "Перевести", + "Translate text from one language to another" : "Перевод текста с одного языка на другой", + "Origin text" : "Исходный текст", + "The text to translate" : "Текст для перевода", + "Origin language" : "Исходный язык", + "The language of the origin text" : "Язык исходного текста", + "Target language" : "Целевой язык", + "The desired language to translate the origin text in" : "Желаемый язык для перевода исходного текста", + "Result" : "Результат", + "The translated text" : "Переведенный текст", "Free prompt" : "Свободная подсказка", "Runs an arbitrary prompt through the language model." : "Запускает произвольное приглашение через языковую модель.", "Generate headline" : "Сгенерировать заголовок", "Summarizes text by reducing its length without losing key information." : "Обобщает текст, сокращая его длину без потери ключевой информации.", "Extracts topics from a text and outputs them separated by commas." : "Извлекает темы из текста и выводит их через запятую.", - "404" : "404", + "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" : "Неизвестный пользователь", @@ -271,9 +407,8 @@ OC.L10N.register( "Username must not consist of dots only" : "Имя пользователя должно состоять не только из точек", "Username is invalid because files already exist for this user" : "Это имя не может быть использовано, файлы этого пользователя уже существуют", "User disabled" : "Пользователь отключен", - "PostgreSQL >= 9 required." : "Требуется PostgreSQL версии 9 или более новый.", - "Please upgrade your database version." : "Обновите базу данных.", "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, чтобы другие пользователи не могли получить список файлов этого каталога." + "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 5460e5c5ccc..6308ae25585 100644 --- a/lib/l10n/ru.json +++ b/lib/l10n/ru.json @@ -17,10 +17,11 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s и %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s и %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s и %5$s", - "Education Edition" : "Набор приложений для образовательных учреждений", + "Education bundle" : "Образовательный пакет", "Enterprise bundle" : "Набор приложений для предприятий", "Groupware bundle" : "Набор приложений для совместной работы", "Hub bundle" : "Основной набор приложений", + "Public sector bundle" : "Пакет услуг для государственного сектора", "Social sharing bundle" : "Набор приложений для публикации с использованием соц. сетей", "PHP %s or higher is required." : "Требуется PHP версии %s или выше.", "PHP with a version lower than %s is required." : "Требуется PHP версии ниже %s.", @@ -34,6 +35,10 @@ "The following platforms are supported: %s" : "Поддерживаются следующие платформы: %s", "Server version %s or higher is required." : "Требуется сервер версии %s или выше.", "Server version %s or lower is required." : "Требуется сервер версии %s или ниже.", + "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Для доступа к этой настройке зарегистрированная учетная запись должна быть администратором, субадминистратором или иметь специальные права", + "Your current IP address doesn’t allow you to perform admin actions" : "Ваш текущий IP-адрес не позволяет вам выполнять административные действи", + "Logged in account must be an admin or sub admin" : "Зарегистрированная учетная запись должна быть администратором или субадминистратором", + "Logged in account must be an admin" : "Вошедший в систему пользователь должен быть администратором", "Wiping of device %s has started" : "Удаление данных с устройства «%s».", "Wiping of device »%s« has started" : "Удаление данных с устройства «%s».", "»%s« started remote wipe" : "Начало удаления данных с устройства «%s»", @@ -74,19 +79,27 @@ "seconds ago" : "несколько секунд назад", "Empty file" : "Пустой файл", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Модуль с ID «%s» не существует. Включите его в настройках приложений или обратитесь к администратору.", + "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\" является запрещенным префиксом для имен файлов или папок.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" не допускается указывать имя файла или папки внутри него.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" это запрещенный тип файла.", + "Filenames must not end with \"%1$s\"." : "Имена файлов не должны заканчиваться на \"%1$s\".", + "Invalid parent path" : "Недопустимый родительский путь", "File already exists" : "Файл уже существует", "Invalid path" : "Некорректный путь", "Failed to create file from template" : "Не удалось создать файл на основе шаблона", "Templates" : "Шаблоны", - "File name is a reserved word" : "Имя файла является зарезервированным словом", - "File name contains at least one invalid character" : "Имя файла содержит по крайней мере один недопустимый символ", - "File name is too long" : "Имя файла слишком длинное.", - "Dot files are not allowed" : "Файлы начинающиеся с точки не допускаются", + "Path contains invalid segments" : "Путь содержит недопустимые сегменты", + "Filename is a reserved word" : "Имя файла - это зарезервированное слово", + "Filename contains at least one invalid character" : "Имя файла содержит как минимум один недопустимый символ", + "Filename is too long" : "Имя файла слишком длинное", "Empty filename is not allowed" : "Пустое имя файла не допускается", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Приложение «%s» не может быть установлено, так как файл с информацией о приложении не может быть прочтен.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Приложение «%s» не может быть установлено, потому что оно несовместимо с этой версией сервера", "__language_name__" : "Русский", "This is an automatically sent email, please do not reply." : "Это сообщение отправлено автоматически и не требует ответа.", + "Help & privacy" : "Помощь и конфиденциальность", "Appearance and accessibility" : "Внешний вид и доступность", "Apps" : "Приложения", "Personal settings" : "Личные настройки", @@ -111,39 +124,77 @@ "Headline" : "Заголовок", "Organisation" : "Организация", "Role" : "Роль", + "Unknown account" : "Неизвестный аккаунт", "Additional settings" : "Дополнительные настройки", + "Enter the database Login and name for %s" : "Введите логин и имя пользователя базы данных для %s", + "Enter the database Login for %s" : "Введите логин в базе данных для %s", "Enter the database name for %s" : "Укажите название базы данных %s", "You cannot use dots in the database name %s" : "Имя базы данных %s не может содержать символ точки", + "MySQL Login and/or password not valid" : "Неверный логин и/или пароль для входа в MySQL", "You need to enter details of an existing account." : "Необходимо уточнить данные существующего акаунта.", "Oracle connection could not be established" : "Соединение с Oracle не может быть установлено", + "Oracle Login and/or password not valid" : "Неверный логин и/или пароль Oracle", + "PostgreSQL Login and/or password not valid" : "Неверный логин и/или пароль для PostgreSQL", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не поддерживается и %s может работать некорректно на данной платформе. Используйте на свой страх и риск!", "For the best results, please consider using a GNU/Linux server instead." : "Для достижения наилучших результатов, рассмотрите вариант использования сервера на GNU/Linux.", "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4 GB and is highly discouraged." : "Кажется что экземпляр этого %s работает в 32-битной среде PHP и в php.ini был настроен open_basedir. Это приведёт к проблемам с файлами более 4 ГБ и настоятельно не рекомендуется.", "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Удалите директиву open_basedir из файла php.ini или смените PHP на 64-разрядную сборку.", + "Set an admin Login." : "Установите логин администратора.", "Set an admin password." : "Задать пароль для admin.", "Cannot create or write into the data directory %s" : "Не удалось создать или записать в каталог данных «%s»", "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Бэкенд общего доступа %s должен реализовывать интерфейс OCP\\Share_Backend", "Sharing backend %s not found" : "Механизм предоставления общего доступа %s не найден", "Sharing backend for %s not found" : "Не найден механизм предоставления общего доступа для %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." : "Нажмите расположенную ниже кнопку для перехода к полученному общему ресурсу.", + "Open »%s«" : "Открыть «%s»", + "%1$s via %2$s" : "%1$s через %2$s", "%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»", - "%1$s via %2$s" : "%1$s через %2$s", + "Passwords are enforced for link and mail shares" : "Для общих ссылок и почтовых рассылок применяются пароли", + "Unknown share type" : "Общий доступ неизвестного типа", + "Cannot share with yourself" : "Не могу поделиться с самим собой", + "Path should be set" : "Путь должен быть задан", + "Path should be either a file or a folder" : "Путь должен быть либо к файлу, либо к папке", + "You cannot share your root folder" : "Вы не можете предоставить общий доступ к своей корневой папке", "You are not allowed to share %s" : "Вам не разрешено делиться %s", + "A share requires permissions" : "Для общего доступа требуются разрешения", "Cannot increase permissions of %s" : "Не удалось повысить права доступа %s", + "Shares need at least read permissions" : "Общим ресурсам требуются как минимум разрешения на чтение", "Files cannot be shared with delete permissions" : "Права на удаление файлов не позволяют открывать общий доступ к ним", "Files cannot be shared with create permissions" : "Права на создание файлов не позволяют открывать общий доступ к ним", "Expiration date is in the past" : "Дата окончания срока действия уже прошла", + "Expiration date is enforced" : "Срок годности истекает", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Срок окончания не может быть более %n дня","Срок окончания не может быть более %n дней","Срок окончания не может быть более %n дней","Срок окончания не может быть более %n дней"], "Sharing is only allowed with group members" : "Разрешено публиковать только для участников группы", - "%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." : "Нажмите расположенную ниже кнопку для перехода к полученному общему ресурсу.", + "Sharing %s failed, because this item is already shared with the account %s" : "Не удалось поделиться %s, так как этот элемент уже используется для доступа к учетной записи %s", + "Group sharing is now allowed" : "Теперь разрешен общий доступ к группам", + "Sharing is only allowed within your own groups" : "Общий доступ разрешен только в ваших собственных группах", + "Path is already shared with this group" : "Путь уже является общим для этой группы", + "Link sharing is not allowed" : "Обмен ссылками запрещен", + "Public upload is not allowed" : "Публичная загрузка данных запрещена", + "Path contains files shared with you" : "Путь содержит файлы, к которым вы предоставили общий доступ", + "Sharing is disabled" : "Общий доступ отключен", + "Sharing is disabled for you" : "Общий доступ для вас отключен", + "Cannot share with the share owner" : "Невозможно поделиться с владельцем общего доступа", + "Share does not have a full ID" : "Общий ресурс не имеет полного идентификатора", + "Cannot change share type" : "Невозможно изменить тип общего ресурса", + "Can only update recipient on user shares" : "Может обновлять информацию о получателе только в общих папках пользователей", + "Cannot enable sending the password by Talk with an empty password" : "Не удается включить отправку пароля по телефону с пустым паролем", + "Cannot enable sending the password by Talk without setting a new password" : "Невозможно включить отправку пароля по телефону без установки нового пароля", + "Cannot disable sending the password by Talk without setting a new password" : "Невозможно отключить отправку пароля по телефону без установки нового пароля", + "Share provider does not support accepting" : "Поставщик общего доступа не поддерживает прием", + "Cannot change target of link share" : "Невозможно изменить цель публикации ссылки", + "Invalid 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" : "Вторник", @@ -190,6 +241,14 @@ "Nov." : "Нояб.", "Dec." : "Дек.", "A valid password must be provided" : "Укажите допустимый пароль", + "The Login is already being used" : "Логин уже используется", + "Could not create account" : "Не удалось создать учетную запись", + "Only the following characters are allowed in an Login: \"a-z\", \"A-Z\", \"0-9\", spaces and \"_.@-'\"" : "В логине разрешены только следующие символы: \"a-z\", \"A-Z\", \"0-9\", пробелы и \"_.@-'\"", + "A valid Login must be provided" : "Необходимо указать действительный логин для входа в систему", + "Login contains whitespace at the beginning or at the end" : "Имя пользователя содержит пробелы в начале или в конце", + "Login must not consist of dots only" : "Логин не должен состоять только из точек", + "Login is invalid because files already exist for this user" : "Логин недействителен, поскольку файлы для этого пользователя уже существуют", + "Account disabled" : "Учетная запись отключена", "Login canceled by app" : "Вход отменен приложением", "App \"%1$s\" cannot be installed because the following dependencies are not fulfilled: %2$s" : "Приложение «%1$s» не может быть установлено, так как не удовлетворены следующие зависимости: %2$s", "a safe home for all your data" : "надёжный дом для всех ваших данных", @@ -222,10 +281,12 @@ "Please ask your server administrator to restart the web server." : "Пожалуйста, попросите вашего администратора перезапустить веб-сервер.", "The required %s config variable is not configured in the config.php file." : "Необходимая переменная %s не настроена в файле config.php.", "Please ask your server administrator to check the Nextcloud configuration." : "Пожалуйста, попросите администратора вашего сервера проверить конфигурацию Nextcloud.", + "Your data directory is readable by other people." : "Ваш каталог данных доступен для чтения другими пользователями.", + "Please change the permissions to 0770 so that the directory cannot be listed by other people." : "Пожалуйста, измените разрешения на 0770, чтобы другие пользователи не могли просматривать этот каталог.", "Your data directory must be an absolute path." : "Каталог данных должен быть указан в виде абсолютного пути.", "Check the value of \"datadirectory\" in your configuration." : "Проверьте в значение параметра «datadirectory» в файле конфигурации.", "Your data directory is invalid." : "Каталог данных задан неверно.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Убедитесь, что в корне каталога данных присутствует файл «.ocdata».", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Убедитесь, что в корневом каталоге данных есть файл с именем \"%1$s\". Он должен содержать следующее содержимое: \"%2$s\"", "Action \"%s\" not supported or implemented." : "Действие «%s» не поддерживается или не реализовано.", "Authentication failed, wrong token or provider ID given" : "Ошибка аутентификации, неверный токен или идентификатор провайдера", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Отсутствуют параметры для завершения запроса. Отсутствующие параметры: \"%s\"", @@ -237,20 +298,95 @@ "Storage connection error. %s" : "Ошибка подключения к хранилищу. %s", "Storage is temporarily not available" : "Хранилище временно недоступно", "Storage connection timeout. %s" : "Истекло время ожидания подключения к хранилищу. %s", + "Transcribe audio" : "Транскрибировать аудио", + "Transcribe the things said in an audio" : "Запишите то, что было сказано в аудиозаписи", + "Audio input" : "Аудиовход", + "The audio to transcribe" : "Аудио для расшифровки", + "Transcription" : "Транскрипция", + "The transcribed text" : "Расшифрованный текст", + "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" : "Генератор Emoji", + "Takes text and generates a representative emoji for it." : "Берет текст и генерирует для него репрезентативный смайлик.", + "Generate image" : "Генерировать изображение", + "Generate an image from a text prompt" : "Создайте изображение из текстовой подсказки", + "Describe the image you want to generate" : "Опишите изображение, которое вы хотите создать", + "Number of images" : "Количество изображений", + "How many images to generate" : "Сколько изображений генерировать", + "Output images" : "Выходные изображения", + "The generated images" : "Сгенерированные изображения", + "Free text to text prompt" : "Произвольное преобразование текста в текстовую подсказку", + "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" : "Опишите задачу, которую вы хотите поручить ассистенту, или задайте вопрос", + "Generated reply" : "Сгенерированный ответ", + "The generated text from the assistant" : "Сгенерированный текст от помощника", "Chat" : "Разговор", + "Chat with the assistant" : "Пообщайтесь с ассистентом", + "System prompt" : "Системная подсказка", + "Define rules and assumptions that the assistant should follow during the conversation." : "Определите правила и допущения, которым ассистент должен следовать во время разговора.", + "Chat message" : "Сообщение в чате", + "Chat history" : "История чата", + "The history of chat messages before the current message, starting with a message by the user" : "История сообщений в чате до текущего сообщения, начиная с сообщения пользователя", + "Response message" : "Ответное сообщение", + "The generated response as part of the conversation" : "Сгенерированный ответ в ходе беседы", + "Formalize text" : "Формализовать текст", + "Takes a text and makes it sound more formal" : "Берется текст и делает его звучание более формальным", + "Write a text that you want the assistant to formalize" : "Напишите текст, который вы хотите, чтобы ассистент оформил официально", + "Formalized text" : "Формализованный текст", + "The formalized text" : "Формализованный текст", + "Generate a headline" : "Создайте заголовок", "Generates a possible headline for a text." : "Генерирует возможный заголовок для текста.", + "Original text" : "Оригинальный текст", + "The original text to generate a headline for" : "Исходный текст для создания заголовка для", + "The generated headline" : "Сгенерированный заголовок", + "Reformulate text" : "Переформулировать текст", + "Takes a text and reformulates it" : "Берет текст и переформулирует его", + "Write a text that you want the assistant to reformulate" : "Напишите текст, который вы хотите, чтобы ассистент переформулировал", + "Reformulated text" : "Измененный текст", + "The reformulated text, written by the assistant" : "Переформулированный текст, написанный ассистентом", + "Simplify text" : "Упрощение текста", + "Takes a text and simplifies it" : "Берет текст и упрощает его", + "Write a text that you want the assistant to simplify" : "Напишите текст, который вы хотите, чтобы ассистент упростил", + "Simplified text" : "Упрощенный текст", + "The simplified text" : "Упрощенный текст", "Summarize" : "Обобщить", + "Summarizes a text" : "Обобщенный текст", + "The original text to summarize" : "Исходный текст для подведения итогов", "Summary" : "Всего", + "The generated summary" : "Сгенерированная сводка", "Extract topics" : "Извлечь темы", + "Extracts topics from a text and outputs them separated by commas" : "Извлекает темы из текста и выводит их через запятую", + "The original text to extract topics from" : "Исходный текст для извлечения тем из", + "Topics" : "Темы", + "The list of extracted topics" : "Список извлеченных тем", + "Translate" : "Перевести", + "Translate text from one language to another" : "Перевод текста с одного языка на другой", + "Origin text" : "Исходный текст", + "The text to translate" : "Текст для перевода", + "Origin language" : "Исходный язык", + "The language of the origin text" : "Язык исходного текста", + "Target language" : "Целевой язык", + "The desired language to translate the origin text in" : "Желаемый язык для перевода исходного текста", + "Result" : "Результат", + "The translated text" : "Переведенный текст", "Free prompt" : "Свободная подсказка", "Runs an arbitrary prompt through the language model." : "Запускает произвольное приглашение через языковую модель.", "Generate headline" : "Сгенерировать заголовок", "Summarizes text by reducing its length without losing key information." : "Обобщает текст, сокращая его длину без потери ключевой информации.", "Extracts topics from a text and outputs them separated by commas." : "Извлекает темы из текста и выводит их через запятую.", - "404" : "404", + "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" : "Неизвестный пользователь", @@ -269,9 +405,8 @@ "Username must not consist of dots only" : "Имя пользователя должно состоять не только из точек", "Username is invalid because files already exist for this user" : "Это имя не может быть использовано, файлы этого пользователя уже существуют", "User disabled" : "Пользователь отключен", - "PostgreSQL >= 9 required." : "Требуется PostgreSQL версии 9 или более новый.", - "Please upgrade your database version." : "Обновите базу данных.", "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, чтобы другие пользователи не могли получить список файлов этого каталога." + "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 2719ffd8f04..80ee1b47928 100644 --- a/lib/l10n/sc.js +++ b/lib/l10n/sc.js @@ -12,7 +12,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s e %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s e %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s e %5$s", - "Education Edition" : "Editzione didàtica", "Enterprise bundle" : "Pachete Enterprise", "Groupware bundle" : "Pachete Groupware", "Hub bundle" : "Pachete Hub", @@ -67,14 +66,12 @@ OC.L10N.register( "seconds ago" : "segundos a immoe", "Empty file" : "Archìviu bòidu", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Su mòdulu cun ID: %s no esistit. Ativa·ddu in sa cunfiguratzione de s'aplicatzione o cuntata s'amministratzione.", + "Dot files are not allowed" : "Is archìvios cun unu puntu a su cumintzu no sunt permìtidos", "File already exists" : "S'archìviu b'est giai", "Invalid path" : "Percursu non bàlidu", "Failed to create file from template" : "No at fatu a creare s'archìviu dae su modellu", "Templates" : "Modellos", - "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", - "Dot files are not allowed" : "Is archìvios cun unu puntu a su cumintzu no sunt permìtidos", + "Filename contains at least one invalid character" : "Su nùmene de su documentu cuntenet a su mancu unu caràtere non vàlidu", "Empty filename is not allowed" : "Unu nùmene de archìviu bòidu no est permìtidu", "App \"%s\" cannot be installed because appinfo file cannot be read." : "No faghet a installare s'aplicatzione \"%s\" ca no faghet a lèghere s'archìviu appinfo.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "No faghet a installare s'aplicatzione \"%s\" ca no est cumpatìbile cun custa versione de su serbidore.", @@ -106,11 +103,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Su motore de cumpartzidura %s depet cumpletare s'interfache OCP\\Share_Backend", "Sharing backend %s not found" : "Motore de cumpartzidura%s no agatadu", "Sharing backend for %s not found" : "Motore de cumpartzidura pro %s no agatadu", + "%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.", + "Open »%s«" : "Aberi »%s«", + "%1$s via %2$s" : "%1$s cun %2$s", "%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«", - "%1$s via %2$s" : "%1$s cun %2$s", + "Unknown share type" : "Genia de cumpartzidura disconnota", "You are not allowed to share %s" : "No tenes su permissu de cumpartzire %s", "Cannot increase permissions of %s" : "No faghet a crèschere is permissos de %s", "Files cannot be shared with delete permissions" : "No faghet a cumpartzire archìvios cun permissos de cantzelladura", @@ -118,9 +119,6 @@ OC.L10N.register( "Expiration date is in the past" : "Sa data de iscadèntzia est giai passada", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["No faghet a impostare sa data de iscadèntzia a prus de %n die in su benidore","No faghet a impostare sa data de iscadèntzia a prus de %n dies in su benidore"], "Sharing is only allowed with group members" : "Sa cumpartzidura est permìtida isceti cun is partetzipantes de su grupu", - "%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 requested share does not exist anymore" : "Sa cumpartzidura pedida no b'est prus", "Could not find category \"%s\"" : "No at fatu a agatare sa categoria \"%s\"", "Sunday" : "Domìnigu", @@ -186,7 +184,6 @@ OC.L10N.register( "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Podet èssere causadu dae una memòria temporànea/atzeleradore cales Zend Opcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Is mòdulos PHP sunt istados installados, ma sunt ancora elencados comente mancantes?", "Please ask your server administrator to restart the web server." : "Pedi a s'amministratzione de su serbidore de torrare a aviare su serbidore ìnternet.", - "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\".", "Action \"%s\" not supported or implemented." : "S'atzione \"%s\" no est suportada o cumpletada.", "Authentication failed, wrong token or provider ID given" : "No at fatu a fàghere s'autenticatzione, token o ID de su frunidore isballiados", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Mancant paràmetros pro pòdere cumpletare sa rechesta. Paràmetros mancantes: \"%s\"", @@ -200,8 +197,14 @@ OC.L10N.register( "Storage connection timeout. %s" : "Tempus de connessione a s'archiviatzione iscadidu. %s", "Chat" : "Tzarrada", "Summary" : "Resumu", + "Translate" : "Borta", + "Result" : "Resurtadu", + "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", @@ -217,6 +220,7 @@ OC.L10N.register( "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", - "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." + "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 6b2121dba23..539c63d8b7f 100644 --- a/lib/l10n/sc.json +++ b/lib/l10n/sc.json @@ -10,7 +10,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s e %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s e %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s e %5$s", - "Education Edition" : "Editzione didàtica", "Enterprise bundle" : "Pachete Enterprise", "Groupware bundle" : "Pachete Groupware", "Hub bundle" : "Pachete Hub", @@ -65,14 +64,12 @@ "seconds ago" : "segundos a immoe", "Empty file" : "Archìviu bòidu", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Su mòdulu cun ID: %s no esistit. Ativa·ddu in sa cunfiguratzione de s'aplicatzione o cuntata s'amministratzione.", + "Dot files are not allowed" : "Is archìvios cun unu puntu a su cumintzu no sunt permìtidos", "File already exists" : "S'archìviu b'est giai", "Invalid path" : "Percursu non bàlidu", "Failed to create file from template" : "No at fatu a creare s'archìviu dae su modellu", "Templates" : "Modellos", - "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", - "Dot files are not allowed" : "Is archìvios cun unu puntu a su cumintzu no sunt permìtidos", + "Filename contains at least one invalid character" : "Su nùmene de su documentu cuntenet a su mancu unu caràtere non vàlidu", "Empty filename is not allowed" : "Unu nùmene de archìviu bòidu no est permìtidu", "App \"%s\" cannot be installed because appinfo file cannot be read." : "No faghet a installare s'aplicatzione \"%s\" ca no faghet a lèghere s'archìviu appinfo.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "No faghet a installare s'aplicatzione \"%s\" ca no est cumpatìbile cun custa versione de su serbidore.", @@ -104,11 +101,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Su motore de cumpartzidura %s depet cumpletare s'interfache OCP\\Share_Backend", "Sharing backend %s not found" : "Motore de cumpartzidura%s no agatadu", "Sharing backend for %s not found" : "Motore de cumpartzidura pro %s no agatadu", + "%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.", + "Open »%s«" : "Aberi »%s«", + "%1$s via %2$s" : "%1$s cun %2$s", "%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«", - "%1$s via %2$s" : "%1$s cun %2$s", + "Unknown share type" : "Genia de cumpartzidura disconnota", "You are not allowed to share %s" : "No tenes su permissu de cumpartzire %s", "Cannot increase permissions of %s" : "No faghet a crèschere is permissos de %s", "Files cannot be shared with delete permissions" : "No faghet a cumpartzire archìvios cun permissos de cantzelladura", @@ -116,9 +117,6 @@ "Expiration date is in the past" : "Sa data de iscadèntzia est giai passada", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["No faghet a impostare sa data de iscadèntzia a prus de %n die in su benidore","No faghet a impostare sa data de iscadèntzia a prus de %n dies in su benidore"], "Sharing is only allowed with group members" : "Sa cumpartzidura est permìtida isceti cun is partetzipantes de su grupu", - "%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 requested share does not exist anymore" : "Sa cumpartzidura pedida no b'est prus", "Could not find category \"%s\"" : "No at fatu a agatare sa categoria \"%s\"", "Sunday" : "Domìnigu", @@ -184,7 +182,6 @@ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Podet èssere causadu dae una memòria temporànea/atzeleradore cales Zend Opcache o eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Is mòdulos PHP sunt istados installados, ma sunt ancora elencados comente mancantes?", "Please ask your server administrator to restart the web server." : "Pedi a s'amministratzione de su serbidore de torrare a aviare su serbidore ìnternet.", - "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\".", "Action \"%s\" not supported or implemented." : "S'atzione \"%s\" no est suportada o cumpletada.", "Authentication failed, wrong token or provider ID given" : "No at fatu a fàghere s'autenticatzione, token o ID de su frunidore isballiados", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Mancant paràmetros pro pòdere cumpletare sa rechesta. Paràmetros mancantes: \"%s\"", @@ -198,8 +195,14 @@ "Storage connection timeout. %s" : "Tempus de connessione a s'archiviatzione iscadidu. %s", "Chat" : "Tzarrada", "Summary" : "Resumu", + "Translate" : "Borta", + "Result" : "Resurtadu", + "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", @@ -215,6 +218,7 @@ "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", - "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." + "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 27f2ce4c7a7..6b2915d16af 100644 --- a/lib/l10n/si.js +++ b/lib/l10n/si.js @@ -16,7 +16,6 @@ OC.L10N.register( "seconds ago" : "තත්පර කිහිපයකට පෙර", "Empty file" : "හිස් ගොනුවකි", "File already exists" : "ගොනුව දැනටමත් පවතී", - "File name is too long" : "ගොනුවේ නම දිග වැඩිය", "__language_name__" : "සිංහල", "This is an automatically sent email, please do not reply." : "මෙය ස්වයංක්රීයව යවන ලද විද්යුත් තැපෑලකි, කරුණාකර පිළිතුරු නොදෙන්න.", "Apps" : "යෙදුම්", @@ -64,6 +63,8 @@ OC.L10N.register( "November" : "නොවැම්බර්", "December" : "දෙසැම්බර්", "Summary" : "සාරාංශය", + "Translate" : "පරිවර්තනය", + "File name is too long" : "ගොනුවේ නම දිග වැඩිය", "Help" : "උපකාර", "Users" : "පරිශීලකයින්", "Unknown user" : "නොදන්නා පරිශීලකයෙකි" diff --git a/lib/l10n/si.json b/lib/l10n/si.json index a802ce5615a..fd5b2f45d86 100644 --- a/lib/l10n/si.json +++ b/lib/l10n/si.json @@ -14,7 +14,6 @@ "seconds ago" : "තත්පර කිහිපයකට පෙර", "Empty file" : "හිස් ගොනුවකි", "File already exists" : "ගොනුව දැනටමත් පවතී", - "File name is too long" : "ගොනුවේ නම දිග වැඩිය", "__language_name__" : "සිංහල", "This is an automatically sent email, please do not reply." : "මෙය ස්වයංක්රීයව යවන ලද විද්යුත් තැපෑලකි, කරුණාකර පිළිතුරු නොදෙන්න.", "Apps" : "යෙදුම්", @@ -62,6 +61,8 @@ "November" : "නොවැම්බර්", "December" : "දෙසැම්බර්", "Summary" : "සාරාංශය", + "Translate" : "පරිවර්තනය", + "File name is too long" : "ගොනුවේ නම දිග වැඩිය", "Help" : "උපකාර", "Users" : "පරිශීලකයින්", "Unknown user" : "නොදන්නා පරිශීලකයෙකි" diff --git a/lib/l10n/sk.js b/lib/l10n/sk.js index f41b1c41932..90a3f0fb1e1 100644 --- a/lib/l10n/sk.js +++ b/lib/l10n/sk.js @@ -19,7 +19,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s a %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s a %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s a %5$s", - "Education Edition" : "Edícia pre výuku", "Enterprise bundle" : "Enterprise balíček", "Groupware bundle" : "Balíček groupware", "Hub bundle" : "Sada pre centrum aktivity (hub)", @@ -80,14 +79,14 @@ 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.", + "Dot files are not allowed" : "Názov súboru začínajúci bodkou nie je povolený.", "File already exists" : "Súbor už existuje", "Invalid path" : "Neplatná cesta", "Failed to create file from template" : "Nemôžem vytvoriť súbor zo šablóny", "Templates" : "Šablóny", - "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é.", - "Dot files are not allowed" : "Názov súboru začínajúci bodkou nie je povolený.", + "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", + "Filename is too long" : "Meno súboru je veľmi dlhé", "Empty filename is not allowed" : "Prázdny názov súboru nie je povolený", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Aplikáciu \"%s\" nie je možné nainštalovať, lebo nebolo možné načítať súbor s informáciami o aplikácií.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Aplikácia \"%s\" nie je kompatibilná s verziou servera, preto nemôže byť nainštalovaná.", @@ -139,11 +138,16 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Backend pre sprístupnenie %s musí implementovať rozhranie OCP\\Share_Backend", "Sharing backend %s not found" : "Backend sprístupnenia %s nebol nájdený", "Sharing backend for %s not found" : "Backend sprístupnenia pre %s nebol nájdený", + "%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.", + "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 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«", - "%1$s via %2$s" : "%1$s cez %2$s", + "Unknown share type" : "Neplatný typ sprístupnenia", + "Path should be set" : "Cesta musí byť nastavená", "You are not allowed to share %s" : "Nemôžete sprístupniť %s", "Cannot increase permissions of %s" : "Nie je možné navýšiť oprávnenia pre %s", "Files cannot be shared with delete permissions" : "Súbory nie je možné sprístupňovať s oprávneniami na odstránenie", @@ -152,13 +156,13 @@ 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_" : ["Nie je možné nastaviť dátum konca platnosti viac ako %s deň v budúcnosti","Nie je možné nastaviť dátum konca platnosti viac ako %s dní v budúcnosti","Nie je možné nastaviť dátum konca platnosti viac ako %s dní v budúcnosti","Nie je možné nastaviť dátum konca platnosti viac ako %s dní v budúcnosti"], "Sharing is only allowed with group members" : "Zdieľanie je možné iba s členmi skupiny", "Sharing %s failed, because this item is already shared with the account %s" : "Zdieľanie %s zlyhalo, pretože táto položka už je uží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.", + "Invalid recipient" : "Neplatný príjemca", "The requested share does not exist anymore" : "Požadované sprístupnenie už neexistuje", "The requested share comes from a disabled user" : "Požadované zdieľanie pochádza od zakázaného užívateľa.", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Bol dosiahnutý limit používateľov a používateľ nebol vytvorený. Pozrite sa do upozornení pre viac informácií.", "Could not find category \"%s\"" : "Nemožno nájsť danú kategóriu \"%s\"", + "Input text" : "Vstupný text", + "The input text" : "Vstupný text", "Sunday" : "Nedeľa", "Monday" : "Pondelok", "Tuesday" : "Utorok", @@ -250,7 +254,6 @@ 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 \".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\".", "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\"", @@ -262,19 +265,26 @@ OC.L10N.register( "Storage connection error. %s" : "Chyba pripojenia k úložisku. %s", "Storage is temporarily not available" : "Úložisko je dočasne nedostupné", "Storage connection timeout. %s" : "Vypršanie pripojenia k úložisku. %s", + "Audio input" : "Audio vstup", "Generates a possible headline for a text." : "Generuje možný nadpis pre text.", "Summarize" : "Zhrnutie", "Summary" : "Súhrn", "Extract topics" : "Extrahovať témy", + "Translate" : "Preložiť", + "Target language" : "Cieľový jazyk", + "Result" : "Výsledok", "Free prompt" : "Bezplatný formulár", "Runs an arbitrary prompt through the language model." : "Spúšťa ľubovoľný príkaz cez jazykový model.", "Generate headline" : "Generovať nadpis", "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.", - "404" : "404", + "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ľ", @@ -293,9 +303,8 @@ OC.L10N.register( "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ý", - "PostgreSQL >= 9 required." : "Vyžadované PostgreSQL >= 9.", - "Please upgrade your database version." : "Prosím, aktualizujte verziu svojej databázy.", "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ť." + "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 6687e1c04c6..c3a5e6df74a 100644 --- a/lib/l10n/sk.json +++ b/lib/l10n/sk.json @@ -17,7 +17,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s a %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s a %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s a %5$s", - "Education Edition" : "Edícia pre výuku", "Enterprise bundle" : "Enterprise balíček", "Groupware bundle" : "Balíček groupware", "Hub bundle" : "Sada pre centrum aktivity (hub)", @@ -78,14 +77,14 @@ "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.", + "Dot files are not allowed" : "Názov súboru začínajúci bodkou nie je povolený.", "File already exists" : "Súbor už existuje", "Invalid path" : "Neplatná cesta", "Failed to create file from template" : "Nemôžem vytvoriť súbor zo šablóny", "Templates" : "Šablóny", - "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é.", - "Dot files are not allowed" : "Názov súboru začínajúci bodkou nie je povolený.", + "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", + "Filename is too long" : "Meno súboru je veľmi dlhé", "Empty filename is not allowed" : "Prázdny názov súboru nie je povolený", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Aplikáciu \"%s\" nie je možné nainštalovať, lebo nebolo možné načítať súbor s informáciami o aplikácií.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Aplikácia \"%s\" nie je kompatibilná s verziou servera, preto nemôže byť nainštalovaná.", @@ -137,11 +136,16 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Backend pre sprístupnenie %s musí implementovať rozhranie OCP\\Share_Backend", "Sharing backend %s not found" : "Backend sprístupnenia %s nebol nájdený", "Sharing backend for %s not found" : "Backend sprístupnenia pre %s nebol nájdený", + "%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.", + "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 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«", - "%1$s via %2$s" : "%1$s cez %2$s", + "Unknown share type" : "Neplatný typ sprístupnenia", + "Path should be set" : "Cesta musí byť nastavená", "You are not allowed to share %s" : "Nemôžete sprístupniť %s", "Cannot increase permissions of %s" : "Nie je možné navýšiť oprávnenia pre %s", "Files cannot be shared with delete permissions" : "Súbory nie je možné sprístupňovať s oprávneniami na odstránenie", @@ -150,13 +154,13 @@ "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Nie je možné nastaviť dátum konca platnosti viac ako %s deň v budúcnosti","Nie je možné nastaviť dátum konca platnosti viac ako %s dní v budúcnosti","Nie je možné nastaviť dátum konca platnosti viac ako %s dní v budúcnosti","Nie je možné nastaviť dátum konca platnosti viac ako %s dní v budúcnosti"], "Sharing is only allowed with group members" : "Zdieľanie je možné iba s členmi skupiny", "Sharing %s failed, because this item is already shared with the account %s" : "Zdieľanie %s zlyhalo, pretože táto položka už je uží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.", + "Invalid recipient" : "Neplatný príjemca", "The requested share does not exist anymore" : "Požadované sprístupnenie už neexistuje", "The requested share comes from a disabled user" : "Požadované zdieľanie pochádza od zakázaného užívateľa.", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Bol dosiahnutý limit používateľov a používateľ nebol vytvorený. Pozrite sa do upozornení pre viac informácií.", "Could not find category \"%s\"" : "Nemožno nájsť danú kategóriu \"%s\"", + "Input text" : "Vstupný text", + "The input text" : "Vstupný text", "Sunday" : "Nedeľa", "Monday" : "Pondelok", "Tuesday" : "Utorok", @@ -248,7 +252,6 @@ "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 \".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\".", "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\"", @@ -260,19 +263,26 @@ "Storage connection error. %s" : "Chyba pripojenia k úložisku. %s", "Storage is temporarily not available" : "Úložisko je dočasne nedostupné", "Storage connection timeout. %s" : "Vypršanie pripojenia k úložisku. %s", + "Audio input" : "Audio vstup", "Generates a possible headline for a text." : "Generuje možný nadpis pre text.", "Summarize" : "Zhrnutie", "Summary" : "Súhrn", "Extract topics" : "Extrahovať témy", + "Translate" : "Preložiť", + "Target language" : "Cieľový jazyk", + "Result" : "Výsledok", "Free prompt" : "Bezplatný formulár", "Runs an arbitrary prompt through the language model." : "Spúšťa ľubovoľný príkaz cez jazykový model.", "Generate headline" : "Generovať nadpis", "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.", - "404" : "404", + "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ľ", @@ -291,9 +301,8 @@ "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ý", - "PostgreSQL >= 9 required." : "Vyžadované PostgreSQL >= 9.", - "Please upgrade your database version." : "Prosím, aktualizujte verziu svojej databázy.", "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ť." + "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 ae4a674a702..3fe4bcbecf3 100644 --- a/lib/l10n/sl.js +++ b/lib/l10n/sl.js @@ -17,7 +17,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s in %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s in %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s in %5$s", - "Education Edition" : "Izobraževalna različica", "Enterprise bundle" : "Poslovni paket", "Groupware bundle" : "Paket za skupinsko delo", "Hub bundle" : "Razvijalski paket", @@ -74,14 +73,12 @@ OC.L10N.register( "seconds ago" : "pred nekaj sekundami", "Empty file" : "Prazna datoteka", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modul z ID: %s ne obstaja. Omogočite ga med nastavitvami, ali pa stopite v stik s skrbnikom sistema.", + "Dot files are not allowed" : "Skrite datoteke niso dovoljene", "File already exists" : "Datoteka že obstaja", "Invalid path" : "Neveljavna pot", "Failed to create file from template" : "Ustvarjanje datoteke iz predloge je spodletelo", "Templates" : "Predloge", - "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", - "Dot files are not allowed" : "Skrite datoteke niso dovoljene", + "Filename contains at least one invalid character" : "Ime datoteke vsebuje vsaj en neveljaven znak.", "Empty filename is not allowed" : "Prazno polje imena datoteke ni dovoljeno.", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Programa »%s« ni mogoče namestiti, ker datoteke appinfo ni mogoče brati.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Programa »%s« ni mogoče namestiti, ker ni združljiv z nameščeno različico strežnika.", @@ -125,11 +122,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Souporaba ozadnjega programa %s mora vsebovati tudi vmesnik OCP\\Share_Backend", "Sharing backend %s not found" : "Ozadnjega programa %s za souporabo ni mogoče najti", "Sharing backend for %s not found" : "Ozadnjega programa za souporabo za %s ni mogoče najti", + "%1$s shared »%2$s« with you" : "%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.", + "Open »%s«" : "Odpri »%s«", + "%1$s via %2$s" : "%1$s prek %2$s", "%1$s shared »%2$s« with you and wants to add:" : "%1$s vam omogoča souporabo »%2$s« in želi dodati:", "%1$s shared »%2$s« with you and wants to add" : "%1$s vam omogoča souporabo »%2$s« in želi dodati", "»%s« added a note to a file shared with you" : "»%s« doda opombo k datoteki v souporabi", - "Open »%s«" : "Odpri »%s«", - "%1$s via %2$s" : "%1$s prek %2$s", + "Unknown share type" : "Neznana vrsta mesta souporabe", "You are not allowed to share %s" : "Omogočanje souporabe %s brez ustreznih dovoljenj ni mogoče.", "Cannot increase permissions of %s" : "Ni mogoče povečati dovoljen %s", "Files cannot be shared with delete permissions" : "Souporaba datotek z nastavljenim dovoljenjem za brisanje ni mogoča", @@ -137,9 +138,6 @@ OC.L10N.register( "Expiration date is in the past" : "Datum preteka je že mimo!", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Datuma pretaka ni mogoče nastaviti za več kot %n dan v prihodnost.","Datuma pretaka ni mogoče nastaviti za več kot %n dneva v prihodnost.","Datuma pretaka ni mogoče nastaviti za več kot %n dni v prihodnost.","Datuma pretaka ni mogoče nastaviti za več kot %n dni v prihodnost."], "Sharing is only allowed with group members" : "Souporaba je dovoljena le med člani skupine", - "%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 requested share does not exist anymore" : "Podano mesto souporabe ne obstaja več", "Could not find category \"%s\"" : "Kategorije »%s« ni mogoče najti.", "Sunday" : "nedelja", @@ -220,7 +218,6 @@ OC.L10N.register( "Please ask your server administrator to restart the web server." : "Obvestite skrbnika strežnika, da je treba ponovno zagnati spletni strežnik.", "Your data directory must be an absolute path." : "Podatkovna mapa mora imeti navedeno celotno pot.", "Your data directory is invalid." : "Podatkovna mapa ni veljavna.", - "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.", "Action \"%s\" not supported or implemented." : "Dejanje »%s« ni podprto ali omogočeno.", "Authentication failed, wrong token or provider ID given" : "Overitev je spodletela, podan je napačen žeton oziroma določilo ID ponudnika", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Manjkajo parametri za dokončanje zahteve: »%s«.", @@ -232,11 +229,19 @@ OC.L10N.register( "Storage connection error. %s" : "Napaka povezave do shrambe. %s", "Storage is temporarily not available" : "Shramba trenutno ni na voljo", "Storage connection timeout. %s" : "Povezava do shrambe je časovno potekla. %s", + "Writing style" : "Slog pisanja", + "Generate image" : "Ustvari sliko", "Summary" : "Povzetek", - "404" : "404", + "Translate" : "Prevedi", + "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", @@ -255,6 +260,7 @@ OC.L10N.register( "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", - "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." + "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 e75d3b2f853..b3752071adf 100644 --- a/lib/l10n/sl.json +++ b/lib/l10n/sl.json @@ -15,7 +15,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s in %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s in %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s in %5$s", - "Education Edition" : "Izobraževalna različica", "Enterprise bundle" : "Poslovni paket", "Groupware bundle" : "Paket za skupinsko delo", "Hub bundle" : "Razvijalski paket", @@ -72,14 +71,12 @@ "seconds ago" : "pred nekaj sekundami", "Empty file" : "Prazna datoteka", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modul z ID: %s ne obstaja. Omogočite ga med nastavitvami, ali pa stopite v stik s skrbnikom sistema.", + "Dot files are not allowed" : "Skrite datoteke niso dovoljene", "File already exists" : "Datoteka že obstaja", "Invalid path" : "Neveljavna pot", "Failed to create file from template" : "Ustvarjanje datoteke iz predloge je spodletelo", "Templates" : "Predloge", - "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", - "Dot files are not allowed" : "Skrite datoteke niso dovoljene", + "Filename contains at least one invalid character" : "Ime datoteke vsebuje vsaj en neveljaven znak.", "Empty filename is not allowed" : "Prazno polje imena datoteke ni dovoljeno.", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Programa »%s« ni mogoče namestiti, ker datoteke appinfo ni mogoče brati.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Programa »%s« ni mogoče namestiti, ker ni združljiv z nameščeno različico strežnika.", @@ -123,11 +120,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Souporaba ozadnjega programa %s mora vsebovati tudi vmesnik OCP\\Share_Backend", "Sharing backend %s not found" : "Ozadnjega programa %s za souporabo ni mogoče najti", "Sharing backend for %s not found" : "Ozadnjega programa za souporabo za %s ni mogoče najti", + "%1$s shared »%2$s« with you" : "%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.", + "Open »%s«" : "Odpri »%s«", + "%1$s via %2$s" : "%1$s prek %2$s", "%1$s shared »%2$s« with you and wants to add:" : "%1$s vam omogoča souporabo »%2$s« in želi dodati:", "%1$s shared »%2$s« with you and wants to add" : "%1$s vam omogoča souporabo »%2$s« in želi dodati", "»%s« added a note to a file shared with you" : "»%s« doda opombo k datoteki v souporabi", - "Open »%s«" : "Odpri »%s«", - "%1$s via %2$s" : "%1$s prek %2$s", + "Unknown share type" : "Neznana vrsta mesta souporabe", "You are not allowed to share %s" : "Omogočanje souporabe %s brez ustreznih dovoljenj ni mogoče.", "Cannot increase permissions of %s" : "Ni mogoče povečati dovoljen %s", "Files cannot be shared with delete permissions" : "Souporaba datotek z nastavljenim dovoljenjem za brisanje ni mogoča", @@ -135,9 +136,6 @@ "Expiration date is in the past" : "Datum preteka je že mimo!", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Datuma pretaka ni mogoče nastaviti za več kot %n dan v prihodnost.","Datuma pretaka ni mogoče nastaviti za več kot %n dneva v prihodnost.","Datuma pretaka ni mogoče nastaviti za več kot %n dni v prihodnost.","Datuma pretaka ni mogoče nastaviti za več kot %n dni v prihodnost."], "Sharing is only allowed with group members" : "Souporaba je dovoljena le med člani skupine", - "%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 requested share does not exist anymore" : "Podano mesto souporabe ne obstaja več", "Could not find category \"%s\"" : "Kategorije »%s« ni mogoče najti.", "Sunday" : "nedelja", @@ -218,7 +216,6 @@ "Please ask your server administrator to restart the web server." : "Obvestite skrbnika strežnika, da je treba ponovno zagnati spletni strežnik.", "Your data directory must be an absolute path." : "Podatkovna mapa mora imeti navedeno celotno pot.", "Your data directory is invalid." : "Podatkovna mapa ni veljavna.", - "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.", "Action \"%s\" not supported or implemented." : "Dejanje »%s« ni podprto ali omogočeno.", "Authentication failed, wrong token or provider ID given" : "Overitev je spodletela, podan je napačen žeton oziroma določilo ID ponudnika", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Manjkajo parametri za dokončanje zahteve: »%s«.", @@ -230,11 +227,19 @@ "Storage connection error. %s" : "Napaka povezave do shrambe. %s", "Storage is temporarily not available" : "Shramba trenutno ni na voljo", "Storage connection timeout. %s" : "Povezava do shrambe je časovno potekla. %s", + "Writing style" : "Slog pisanja", + "Generate image" : "Ustvari sliko", "Summary" : "Povzetek", - "404" : "404", + "Translate" : "Prevedi", + "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", @@ -253,6 +258,7 @@ "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", - "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." + "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 5e894f52fd5..fa9cd1cbdd4 100644 --- a/lib/l10n/sq.js +++ b/lib/l10n/sq.js @@ -9,7 +9,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s dhe %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s dhe %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s dhe %5$s", - "Education Edition" : "Variant Edukativ", "Enterprise bundle" : "Pakoja e ndërmarrjeve", "Groupware bundle" : "Pako groupware", "Social sharing bundle" : "Pakoja e ndarjes sociale", @@ -36,11 +35,9 @@ OC.L10N.register( "_%n minute ago_::_%n minutes ago_" : ["%n minutë më parë","%n minuta më parë"], "seconds ago" : "sekonda më parë", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Moduli me ID: %s nuk ekziston. Ju lutem aktivizojeni atë në konfigurimet e aplikacionit tuaj ose kontaktoni administratorin tuaj.", - "File already exists" : "Skedari ekziston tashmë", - "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ë", "Dot files are not allowed" : "Nuk lejohen kartela të fshehura", + "File already exists" : "Skedari ekziston tashmë", + "Filename contains at least one invalid character" : "Emri i skedarit përmban të paktën një karakter të pavlefshëm", "Empty filename is not allowed" : "Nuk lejohen emra të zbrazët kartelash", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Aplikacioni \"%s\" s’mund të instalohet, ngaqë s’lexohet dot kartela appinfo.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Aplikacioni \"%s\" nuk mund të instalohet sepse nuk përputhet me këtë version të serverit.", @@ -68,11 +65,12 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Mekanizmi i shërbimit për ndarje %s duhet të sendërtojë ndërfaqen OCP\\Share_Backend", "Sharing backend %s not found" : "S’u gjet mekanizmi i shërbimit për ndarje %s", "Sharing backend for %s not found" : "S’u gjet mekanizmi i shërbimit për ndarje për %s", + "Click the button below to open it." : "Kliko butonin më poshtë për të hapur atë.", "Open »%s«" : "Hap»1 %s«", + "Unknown share type" : "Lloj i panjohur ndarjesh", "You are not allowed to share %s" : "Nuk ju lejohet ta ndani %s me të tjerët", "Cannot increase permissions of %s" : "S’mund të shtohen lejet për %s", "Expiration date is in the past" : "Data e skadimit bie në të kaluarën", - "Click the button below to open it." : "Kliko butonin më poshtë për të hapur atë.", "The requested share does not exist anymore" : "Ndarja e kërkuar nuk ekziston më", "Could not find category \"%s\"" : "S’u gjet kategori \"%s\"", "Sunday" : "E Dielë", @@ -136,7 +134,6 @@ OC.L10N.register( "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Kjo ka gjasa të jetë shkaktuar nga një fshehtinë/përshpejtues i tillë si Zend OPcache ose eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Modulet PHP janë instaluar, por tregohen ende sikur mungojnë?", "Please ask your server administrator to restart the web server." : "Ju lutemi, kërkojini përgjegjësit të shërbyesit tuaj të rinisë shërbyesin web.", - "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.", "Could not obtain lock type %d on \"%s\"." : "S’u mor dot lloj kyçjeje %d në \"%s\".", "Storage unauthorized. %s" : "Depozitë e paautorizuar. %s", "Storage incomplete configuration. %s" : "Formësim jo i plotë i depozitës. %s", @@ -144,6 +141,12 @@ OC.L10N.register( "Storage is temporarily not available" : "Hapsira ruajtëse nuk është në dispozicion përkohësisht", "Storage connection timeout. %s" : "Mbarim kohe lidhjeje për depozitën. %s", "Summary" : "Përmbledhje", + "Translate" : "Përkthe", + "Result" : "Rezultatet", + "Education Edition" : "Variant Edukativ", + "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", @@ -156,6 +159,7 @@ OC.L10N.register( "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", - "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ë." + "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 556a42bc4ae..4eb22ad2355 100644 --- a/lib/l10n/sq.json +++ b/lib/l10n/sq.json @@ -7,7 +7,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s dhe %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s dhe %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s dhe %5$s", - "Education Edition" : "Variant Edukativ", "Enterprise bundle" : "Pakoja e ndërmarrjeve", "Groupware bundle" : "Pako groupware", "Social sharing bundle" : "Pakoja e ndarjes sociale", @@ -34,11 +33,9 @@ "_%n minute ago_::_%n minutes ago_" : ["%n minutë më parë","%n minuta më parë"], "seconds ago" : "sekonda më parë", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Moduli me ID: %s nuk ekziston. Ju lutem aktivizojeni atë në konfigurimet e aplikacionit tuaj ose kontaktoni administratorin tuaj.", - "File already exists" : "Skedari ekziston tashmë", - "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ë", "Dot files are not allowed" : "Nuk lejohen kartela të fshehura", + "File already exists" : "Skedari ekziston tashmë", + "Filename contains at least one invalid character" : "Emri i skedarit përmban të paktën një karakter të pavlefshëm", "Empty filename is not allowed" : "Nuk lejohen emra të zbrazët kartelash", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Aplikacioni \"%s\" s’mund të instalohet, ngaqë s’lexohet dot kartela appinfo.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Aplikacioni \"%s\" nuk mund të instalohet sepse nuk përputhet me këtë version të serverit.", @@ -66,11 +63,12 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Mekanizmi i shërbimit për ndarje %s duhet të sendërtojë ndërfaqen OCP\\Share_Backend", "Sharing backend %s not found" : "S’u gjet mekanizmi i shërbimit për ndarje %s", "Sharing backend for %s not found" : "S’u gjet mekanizmi i shërbimit për ndarje për %s", + "Click the button below to open it." : "Kliko butonin më poshtë për të hapur atë.", "Open »%s«" : "Hap»1 %s«", + "Unknown share type" : "Lloj i panjohur ndarjesh", "You are not allowed to share %s" : "Nuk ju lejohet ta ndani %s me të tjerët", "Cannot increase permissions of %s" : "S’mund të shtohen lejet për %s", "Expiration date is in the past" : "Data e skadimit bie në të kaluarën", - "Click the button below to open it." : "Kliko butonin më poshtë për të hapur atë.", "The requested share does not exist anymore" : "Ndarja e kërkuar nuk ekziston më", "Could not find category \"%s\"" : "S’u gjet kategori \"%s\"", "Sunday" : "E Dielë", @@ -134,7 +132,6 @@ "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Kjo ka gjasa të jetë shkaktuar nga një fshehtinë/përshpejtues i tillë si Zend OPcache ose eAccelerator.", "PHP modules have been installed, but they are still listed as missing?" : "Modulet PHP janë instaluar, por tregohen ende sikur mungojnë?", "Please ask your server administrator to restart the web server." : "Ju lutemi, kërkojini përgjegjësit të shërbyesit tuaj të rinisë shërbyesin web.", - "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.", "Could not obtain lock type %d on \"%s\"." : "S’u mor dot lloj kyçjeje %d në \"%s\".", "Storage unauthorized. %s" : "Depozitë e paautorizuar. %s", "Storage incomplete configuration. %s" : "Formësim jo i plotë i depozitës. %s", @@ -142,6 +139,12 @@ "Storage is temporarily not available" : "Hapsira ruajtëse nuk është në dispozicion përkohësisht", "Storage connection timeout. %s" : "Mbarim kohe lidhjeje për depozitën. %s", "Summary" : "Përmbledhje", + "Translate" : "Përkthe", + "Result" : "Rezultatet", + "Education Edition" : "Variant Edukativ", + "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", @@ -154,6 +157,7 @@ "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", - "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ë." + "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 dcb04d5ca26..953b0d20ecf 100644 --- a/lib/l10n/sr.js +++ b/lib/l10n/sr.js @@ -19,7 +19,7 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s и %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s и %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s и %5$s", - "Education Edition" : "Образовно издање", + "Education bundle" : "Образовни пакет", "Enterprise bundle" : "Комплет за предузећа", "Groupware bundle" : "Комплет за радне тимове", "Hub bundle" : "Чвориште пакета", @@ -38,6 +38,7 @@ OC.L10N.register( "Server version %s or higher is required." : "Потребна је верзија сервера %s или виша.", "Server version %s or lower is required." : "Потребна је верзија сервера %s или нижа.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Пријављени налог мора бити админ, подадмин или мора да поседује специјално право да приступи овом подешавању", + "Your current IP address doesn’t allow you to perform admin actions" : "Ваша тренутна IP адреса не дозвољава да извршавате админ радње", "Logged in account must be an admin or sub admin" : "Пријављени налог мора бити админ или подадмин", "Logged in account must be an admin" : "Пријављени налог мора бити админ", "Wiping of device %s has started" : "Започето брисање уређаја %s", @@ -80,14 +81,13 @@ 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 не постоји. Омогућите га у подешавањима апликација или контактирајте администратора.", + "Dot files are not allowed" : "Фајлови са почетном тачком нису дозвољени", "File already exists" : "Фајл већ постоји", "Invalid path" : "Неисправна путања", "Failed to create file from template" : "Није успело креирање фајла из шаблона", "Templates" : "Шаблони", - "File name is a reserved word" : "Назив фајла је резервисана реч", - "File name contains at least one invalid character" : "Назив фајла садржи бар један недозвољен знак", - "File name is too long" : "Назив фајла је предугачак", - "Dot files are not allowed" : "Фајлови са почетном тачком нису дозвољени", + "Path contains invalid segments" : "Путања садржи неисправне сегменте", + "Filename contains at least one invalid character" : "Назив фајла садржи бар један недозвољен знак", "Empty filename is not allowed" : "Празан назив није дозвољен", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Апликација \"%s\" не може бити инсталирана јер appinfo фајл не може да се прочита.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Апликација \"%s\" не може бити инсталирана јер није компатибилна са овом верзијом сервера.", @@ -139,11 +139,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Позадина дељења %s мора користити корисничко окружење OCP\\Share_Backend", "Sharing backend %s not found" : "Позадина за дељење %s није пронађена", "Sharing backend for %s not found" : "Позадина за дељење за %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." : "Кликните дугме испод да га отворите.", + "Open »%s«" : "Отвори „%s“", + "%1$s via %2$s" : "%1$s преко %2$s", "%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“", - "%1$s via %2$s" : "%1$s преко %2$s", + "Unknown share type" : "Непознат тип дељења", "You are not allowed to share %s" : "Није вам дозвољено да делите %s", "Cannot increase permissions of %s" : "Не могу да повећам привилегије за %s", "Files cannot be shared with delete permissions" : "Фајлови не могу да се деле са дозволама за брисање", @@ -152,9 +156,6 @@ 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_" : ["Датум истека не може да се постави више од %n дан у будућност","Датум истека не може да се постави више од %n дана у будућност","Датум истека не може да се постави више од %n дана у будућност"], "Sharing is only allowed with group members" : "Дељење је дозвољено само са члановима групе", "Sharing %s failed, because this item is already shared with the account %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 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." : "Корисник није креиран јер је достигнуто ограничење броја корисника. За више детаља, погледајте своја обавештења.", @@ -252,7 +253,7 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Ваш директоријум са подацима мора бити апсолутна путања.", "Check the value of \"datadirectory\" in your configuration." : "Проверите вредност „datadirectory” у својој конфигурацији.", "Your data directory is invalid." : "Ваш директоријум са подацима је неисправан.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Уверите се да фајл \".ocdata\" постоји у корену директоријума са подацима.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Обезбедите да се у корену директоријум података налази фајл под називом „%1$s”. Он би требало да има следећи садржај: „%2$s”", "Action \"%s\" not supported or implemented." : "Радња \"%s\" није подржана или имплементирана.", "Authentication failed, wrong token or provider ID given" : "Неуспела провера идентитета, добијен погрешан токен или ID провајдера", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Недостају параметри да би се довршио захтев. Недостајући параметри: \"%s\"", @@ -270,7 +271,7 @@ OC.L10N.register( "The audio to transcribe" : "Звук који треба да се транскрибује", "Transcription" : "Транскрипција", "The transcribed text" : "Транскрибовани текст", - "ContextWrite" : "ContextWrite", + "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" : "Демонстрирајте стил писања који желите да се имитира", @@ -292,15 +293,39 @@ OC.L10N.register( "Output images" : "Излазне слике", "The generated images" : "Генерисане слике", "Free text to text prompt" : "Произвољни текст као унос", - "Runs an arbitrary prompt through a language model that retuns a reply" : "Пропушта произвољни текст кроз језички модел који враћа одговор", + "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" : "Опишите задатак који желите да обави асистент или поставите питање", "Generated reply" : "Генерисани одговор", "The generated text from the assistant" : "Текст који је генерисао асистент", + "Chat" : "Ћаскање", + "Chat with the assistant" : "Ћаскање са асистентом", + "System prompt" : "Кориснички захтев", + "Define rules and assumptions that the assistant should follow during the conversation." : "Дефинишите правила и претпоставке које би асистент требало да следи током разговора.", + "Chat message" : "Чет порука", + "Chat history" : "Историју чета", + "The history of chat messages before the current message, starting with a message by the user" : "Историја чет порука пре текуће поруке, почевши са поруком корисника", + "Response message" : "Порука одговора", + "The generated response as part of the conversation" : "Генерисани одговор као део разговора", + "Formalize text" : "Формализуј текст", + "Takes a text and makes it sound more formal" : "Узима текст и реформулише га тако да постане формалнији", + "Write a text that you want the assistant to formalize" : "Напишите текст који желите да асистент формализује", + "Formalized text" : "Формализован текст", + "The formalized text" : "Формализовани текст", "Generate a headline" : "Генериши наслов", "Generates a possible headline for a text." : "Генерише могућу насловну линију текста.", "Original text" : "Оригинални текст", "The original text to generate a headline for" : "Оригинални текст за који се генерише наслов", "The generated headline" : "Генерисани наслов", + "Reformulate text" : "Реформулиши текст", + "Takes a text and reformulates it" : "Узима текст и реформулише га", + "Write a text that you want the assistant to reformulate" : "Напишите текст који желите да асистент реформулише", + "Reformulated text" : "Реформулисани текст", + "The reformulated text, written by the assistant" : "Реформулисани текст који је написао асистент", + "Simplify text" : "Упрости текст", + "Takes a text and simplifies it" : "Узима текст и упрошћава га", + "Write a text that you want the assistant to simplify" : "Напишите текст који желите да асистент упрости", + "Simplified text" : "Упрошћени текст", + "The simplified text" : "Поједностављени текст", "Summarize" : "Резимирај", "Summarizes a text" : "Прави резиме текста", "The original text to summarize" : "Оригинални текст који се резимира", @@ -311,15 +336,28 @@ OC.L10N.register( "The original text to extract topics from" : "Оригинални текст из којег се издвајају теме", "Topics" : "Теме", "The list of extracted topics" : "Листа издвојених тема", + "Translate" : "Превођење", + "Translate text from one language to another" : "Преводи текст са једног језика на други", + "Origin text" : "Изворни текст", + "The text to translate" : "Текст који треба да се преведе", + "Origin language" : "Изворни језик", + "The language of the origin text" : "Језик изворног текста", + "Target language" : "Циљни језик", + "The desired language to translate the origin text in" : "Жељени језик на који треба да се преведе изворни текст", + "Result" : "Резултат", + "The translated text" : "Преведени текст", "Free prompt" : "Произвољни захтев", "Runs an arbitrary prompt through the language model." : "Извршава произвољни захтев кроз језички модел.", "Generate headline" : "Генериши линију наслова", "Summarizes text by reducing its length without losing key information." : "Резимира текст тако што га скраћује без губитка кључних информација.", "Extracts topics from a text and outputs them separated by commas." : "Издваја теме из текста и исписује их раздвојене запетама.", - "404" : "404", + "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" : "Непознат корисник", @@ -338,9 +376,8 @@ OC.L10N.register( "Username must not consist of dots only" : "Корисничко име не могу бити само тачке", "Username is invalid because files already exist for this user" : "Корисничко име није исправно пошто већ постоје фајлови за овог корисника", "User disabled" : "Корисник онемогућен", - "PostgreSQL >= 9 required." : "Потребан је PostgreSQL >= 9.", - "Please upgrade your database version." : "Молимо вас да ажурирате верзију базе података.", "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 како директоријуми не би могли бити излистани од стране других корисника." + "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 81aeace9d72..ac2001208e6 100644 --- a/lib/l10n/sr.json +++ b/lib/l10n/sr.json @@ -17,7 +17,7 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s и %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s и %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s и %5$s", - "Education Edition" : "Образовно издање", + "Education bundle" : "Образовни пакет", "Enterprise bundle" : "Комплет за предузећа", "Groupware bundle" : "Комплет за радне тимове", "Hub bundle" : "Чвориште пакета", @@ -36,6 +36,7 @@ "Server version %s or higher is required." : "Потребна је верзија сервера %s или виша.", "Server version %s or lower is required." : "Потребна је верзија сервера %s или нижа.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Пријављени налог мора бити админ, подадмин или мора да поседује специјално право да приступи овом подешавању", + "Your current IP address doesn’t allow you to perform admin actions" : "Ваша тренутна IP адреса не дозвољава да извршавате админ радње", "Logged in account must be an admin or sub admin" : "Пријављени налог мора бити админ или подадмин", "Logged in account must be an admin" : "Пријављени налог мора бити админ", "Wiping of device %s has started" : "Започето брисање уређаја %s", @@ -78,14 +79,13 @@ "seconds ago" : "пре неколико секунди", "Empty file" : "Празан фајл", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Модул са идентификацијом: %s не постоји. Омогућите га у подешавањима апликација или контактирајте администратора.", + "Dot files are not allowed" : "Фајлови са почетном тачком нису дозвољени", "File already exists" : "Фајл већ постоји", "Invalid path" : "Неисправна путања", "Failed to create file from template" : "Није успело креирање фајла из шаблона", "Templates" : "Шаблони", - "File name is a reserved word" : "Назив фајла је резервисана реч", - "File name contains at least one invalid character" : "Назив фајла садржи бар један недозвољен знак", - "File name is too long" : "Назив фајла је предугачак", - "Dot files are not allowed" : "Фајлови са почетном тачком нису дозвољени", + "Path contains invalid segments" : "Путања садржи неисправне сегменте", + "Filename contains at least one invalid character" : "Назив фајла садржи бар један недозвољен знак", "Empty filename is not allowed" : "Празан назив није дозвољен", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Апликација \"%s\" не може бити инсталирана јер appinfo фајл не може да се прочита.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Апликација \"%s\" не може бити инсталирана јер није компатибилна са овом верзијом сервера.", @@ -137,11 +137,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Позадина дељења %s мора користити корисничко окружење OCP\\Share_Backend", "Sharing backend %s not found" : "Позадина за дељење %s није пронађена", "Sharing backend for %s not found" : "Позадина за дељење за %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." : "Кликните дугме испод да га отворите.", + "Open »%s«" : "Отвори „%s“", + "%1$s via %2$s" : "%1$s преко %2$s", "%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“", - "%1$s via %2$s" : "%1$s преко %2$s", + "Unknown share type" : "Непознат тип дељења", "You are not allowed to share %s" : "Није вам дозвољено да делите %s", "Cannot increase permissions of %s" : "Не могу да повећам привилегије за %s", "Files cannot be shared with delete permissions" : "Фајлови не могу да се деле са дозволама за брисање", @@ -150,9 +154,6 @@ "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Датум истека не може да се постави више од %n дан у будућност","Датум истека не може да се постави више од %n дана у будућност","Датум истека не може да се постави више од %n дана у будућност"], "Sharing is only allowed with group members" : "Дељење је дозвољено само са члановима групе", "Sharing %s failed, because this item is already shared with the account %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 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." : "Корисник није креиран јер је достигнуто ограничење броја корисника. За више детаља, погледајте своја обавештења.", @@ -250,7 +251,7 @@ "Your data directory must be an absolute path." : "Ваш директоријум са подацима мора бити апсолутна путања.", "Check the value of \"datadirectory\" in your configuration." : "Проверите вредност „datadirectory” у својој конфигурацији.", "Your data directory is invalid." : "Ваш директоријум са подацима је неисправан.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Уверите се да фајл \".ocdata\" постоји у корену директоријума са подацима.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Обезбедите да се у корену директоријум података налази фајл под називом „%1$s”. Он би требало да има следећи садржај: „%2$s”", "Action \"%s\" not supported or implemented." : "Радња \"%s\" није подржана или имплементирана.", "Authentication failed, wrong token or provider ID given" : "Неуспела провера идентитета, добијен погрешан токен или ID провајдера", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Недостају параметри да би се довршио захтев. Недостајући параметри: \"%s\"", @@ -268,7 +269,7 @@ "The audio to transcribe" : "Звук који треба да се транскрибује", "Transcription" : "Транскрипција", "The transcribed text" : "Транскрибовани текст", - "ContextWrite" : "ContextWrite", + "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" : "Демонстрирајте стил писања који желите да се имитира", @@ -290,15 +291,39 @@ "Output images" : "Излазне слике", "The generated images" : "Генерисане слике", "Free text to text prompt" : "Произвољни текст као унос", - "Runs an arbitrary prompt through a language model that retuns a reply" : "Пропушта произвољни текст кроз језички модел који враћа одговор", + "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" : "Опишите задатак који желите да обави асистент или поставите питање", "Generated reply" : "Генерисани одговор", "The generated text from the assistant" : "Текст који је генерисао асистент", + "Chat" : "Ћаскање", + "Chat with the assistant" : "Ћаскање са асистентом", + "System prompt" : "Кориснички захтев", + "Define rules and assumptions that the assistant should follow during the conversation." : "Дефинишите правила и претпоставке које би асистент требало да следи током разговора.", + "Chat message" : "Чет порука", + "Chat history" : "Историју чета", + "The history of chat messages before the current message, starting with a message by the user" : "Историја чет порука пре текуће поруке, почевши са поруком корисника", + "Response message" : "Порука одговора", + "The generated response as part of the conversation" : "Генерисани одговор као део разговора", + "Formalize text" : "Формализуј текст", + "Takes a text and makes it sound more formal" : "Узима текст и реформулише га тако да постане формалнији", + "Write a text that you want the assistant to formalize" : "Напишите текст који желите да асистент формализује", + "Formalized text" : "Формализован текст", + "The formalized text" : "Формализовани текст", "Generate a headline" : "Генериши наслов", "Generates a possible headline for a text." : "Генерише могућу насловну линију текста.", "Original text" : "Оригинални текст", "The original text to generate a headline for" : "Оригинални текст за који се генерише наслов", "The generated headline" : "Генерисани наслов", + "Reformulate text" : "Реформулиши текст", + "Takes a text and reformulates it" : "Узима текст и реформулише га", + "Write a text that you want the assistant to reformulate" : "Напишите текст који желите да асистент реформулише", + "Reformulated text" : "Реформулисани текст", + "The reformulated text, written by the assistant" : "Реформулисани текст који је написао асистент", + "Simplify text" : "Упрости текст", + "Takes a text and simplifies it" : "Узима текст и упрошћава га", + "Write a text that you want the assistant to simplify" : "Напишите текст који желите да асистент упрости", + "Simplified text" : "Упрошћени текст", + "The simplified text" : "Поједностављени текст", "Summarize" : "Резимирај", "Summarizes a text" : "Прави резиме текста", "The original text to summarize" : "Оригинални текст који се резимира", @@ -309,15 +334,28 @@ "The original text to extract topics from" : "Оригинални текст из којег се издвајају теме", "Topics" : "Теме", "The list of extracted topics" : "Листа издвојених тема", + "Translate" : "Превођење", + "Translate text from one language to another" : "Преводи текст са једног језика на други", + "Origin text" : "Изворни текст", + "The text to translate" : "Текст који треба да се преведе", + "Origin language" : "Изворни језик", + "The language of the origin text" : "Језик изворног текста", + "Target language" : "Циљни језик", + "The desired language to translate the origin text in" : "Жељени језик на који треба да се преведе изворни текст", + "Result" : "Резултат", + "The translated text" : "Преведени текст", "Free prompt" : "Произвољни захтев", "Runs an arbitrary prompt through the language model." : "Извршава произвољни захтев кроз језички модел.", "Generate headline" : "Генериши линију наслова", "Summarizes text by reducing its length without losing key information." : "Резимира текст тако што га скраћује без губитка кључних информација.", "Extracts topics from a text and outputs them separated by commas." : "Издваја теме из текста и исписује их раздвојене запетама.", - "404" : "404", + "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" : "Непознат корисник", @@ -336,9 +374,8 @@ "Username must not consist of dots only" : "Корисничко име не могу бити само тачке", "Username is invalid because files already exist for this user" : "Корисничко име није исправно пошто већ постоје фајлови за овог корисника", "User disabled" : "Корисник онемогућен", - "PostgreSQL >= 9 required." : "Потребан је PostgreSQL >= 9.", - "Please upgrade your database version." : "Молимо вас да ажурирате верзију базе података.", "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 како директоријуми не би могли бити излистани од стране других корисника." + "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 3487200ee85..042f035355f 100644 --- a/lib/l10n/sr@latin.js +++ b/lib/l10n/sr@latin.js @@ -1,9 +1,12 @@ OC.L10N.register( "lib", { + "Unknown filetype" : "Nepoznati tip fajla", + "Invalid image" : "Neispravna slika", "Files" : "Фајлови", "View profile" : "Vidi profil", "seconds ago" : "pre par sekundi", + "Filename contains at least one invalid character" : "Naziv fajla sadrži bar jedan nedozvoljen znak", "__language_name__" : "Srpski", "Settings" : "Postavke", "Log out" : "Odjava", @@ -19,6 +22,7 @@ OC.L10N.register( "Thursday" : "Četvrtak", "Friday" : "Petak", "Saturday" : "Subota", + "Translate" : "Prevedi", "Help" : "Help" }, "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 84ad4559b0a..7ff0358bacf 100644 --- a/lib/l10n/sr@latin.json +++ b/lib/l10n/sr@latin.json @@ -1,7 +1,10 @@ { "translations": { + "Unknown filetype" : "Nepoznati tip fajla", + "Invalid image" : "Neispravna slika", "Files" : "Фајлови", "View profile" : "Vidi profil", "seconds ago" : "pre par sekundi", + "Filename contains at least one invalid character" : "Naziv fajla sadrži bar jedan nedozvoljen znak", "__language_name__" : "Srpski", "Settings" : "Postavke", "Log out" : "Odjava", @@ -17,6 +20,7 @@ "Thursday" : "Četvrtak", "Friday" : "Petak", "Saturday" : "Subota", + "Translate" : "Prevedi", "Help" : "Help" },"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 3a4fed3e462..d412a4166ef 100644 --- a/lib/l10n/sv.js +++ b/lib/l10n/sv.js @@ -19,7 +19,7 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s och %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s och %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s och %5$s", - "Education Edition" : "Utbildningspaket", + "Education bundle" : "Utbildningspaket", "Enterprise bundle" : "Företagspaketet", "Groupware bundle" : "Gruppvarupaket", "Hub bundle" : "Hub-paket", @@ -38,6 +38,7 @@ OC.L10N.register( "Server version %s or higher is required." : "Serverversion %s eller nyare krävs.", "Server version %s or lower is required." : "Serverversion %s eller äldre krävs.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Inloggat konto måste vara en admin, underadministratör eller ha tilldelats speciella rättigheter för att komma åt denna inställning", + "Your current IP address doesn’t allow you to perform admin actions" : "Din nuvarande IP-adress tillåter dig inte att utföra administratörsåtgärder", "Logged in account must be an admin or sub admin" : "Inloggat konto måste vara en admin eller underadministratör", "Logged in account must be an admin" : "Inloggat konto måste vara admin", "Wiping of device %s has started" : "Rensning av enhet %s har startat", @@ -80,14 +81,21 @@ OC.L10N.register( "seconds ago" : "sekunder sedan", "Empty file" : "Tom fil", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modulen med ID: %s finns inte. Aktivera den i appinställningar eller kontakta din administratör.", + "Dot files are not allowed" : "Dot-filer är inte tillåtna", + "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" är ett förbjudet fil- eller mappnamn.", + "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" är ett förbjudet prefix för fil- eller mappnamn.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" är inte tillåtet i ett fil- eller mappnamn.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" är en förbjuden filtyp.", + "Filenames must not end with \"%1$s\"." : "Filnamn får inte sluta med \"%1$s\".", + "Invalid parent path" : "Ogiltig överordnad sökväg", "File already exists" : "Filen existerar redan", "Invalid path" : "Ogiltig sökväg", "Failed to create file from template" : "Kunde skapa fil från mall", "Templates" : "Mallar", - "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", - "Dot files are not allowed" : "Dot-filer är inte tillåtna", + "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", + "Filename is too long" : "Filnamnet är för långt", "Empty filename is not allowed" : "Tomma filnamn är inte tillåtna", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Appen \"%s\" kan inte installeras eftersom appinfo-filen inte kan läsas.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Appen \"%s\" kan inte installeras eftersom den inte är kompatibel med den här versionen av servern.", @@ -139,26 +147,55 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Delningsgränssnittet %s måste implementera gränssnittet OCP\\Share_Backend", "Sharing backend %s not found" : "Delningsgränssnittet %s hittades inte", "Sharing backend for %s not found" : "Delningsgränssnittet för %s hittades inte", + "%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.", + "Open »%s«" : "Öppna »%s«", + "%1$s via %2$s" : "%1$s via %2$s", "%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« la till en kommentar till en fil delad med dig", - "Open »%s«" : "Öppna »%s«", - "%1$s via %2$s" : "%1$s via %2$s", + "Passwords are enforced for link and mail shares" : "Lösenord är obligatoriskt för länk och e-postdelning", + "Unknown share type" : "Ogiltig delningstyp", + "Cannot share with yourself" : "Kan inte dela med dig själv", + "Path should be set" : "Sökvägen bör ställas in", + "Path should be either a file or a folder" : "Sökvägen ska vara antingen en fil eller en mapp", + "You cannot share your root folder" : "Du kan inte dela din rotmapp", "You are not allowed to share %s" : "Du tillåts inte att dela %s", + "A share requires permissions" : "En delning kräver behörigheter", "Cannot increase permissions of %s" : "Kan inte höja behörigheter av %s", + "Shares need at least read permissions" : "Delningar behöver åtminstone läsbehörighet", "Files cannot be shared with delete permissions" : "Filer kan inte delas med rättighet att radera", "Files cannot be shared with create permissions" : "Filer kan inte delas med rättighet att skapa", "Expiration date is in the past" : "Utgångsdatum är i det förflutna", + "Expiration date is enforced" : "Förfallodatum är obligatoriskt", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Kan inte sätta ett utgångsdatum längre fram än %n dag","Kan inte sätta ett utgångsdatum längre fram än %n dagar"], "Sharing is only allowed with group members" : "Delning är endast tillåten med gruppmedlemmar", "Sharing %s failed, because this item is already shared with the account %s" : "Delning av %s misslyckades, eftersom det här objektet redan delas med kontot %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.", + "Group sharing is now allowed" : "Gruppdelning är nu tillåten", + "Sharing is only allowed within your own groups" : "Delning är endast tillåten inom dina egna grupper", + "Path is already shared with this group" : "Sökvägen delas redan med den här gruppen", + "Link sharing is not allowed" : "Länkdelning är inte tillåtet", + "Public upload is not allowed" : "Offentlig uppladdning är inte tillåten", + "Path contains files shared with you" : "Sökvägen innehåller filer som delas med dig", + "Sharing is disabled" : "Delning är inaktiverat", + "Sharing is disabled for you" : "Delning är inaktiverat för dig", + "Cannot share with the share owner" : "Kan inte dela med ägaren", + "Share does not have a full ID" : "Delningen har inte ett fullständigt ID", + "Cannot change share type" : "Kan inte ändra delningstyp", + "Can only update recipient on user shares" : "Kan bara uppdatera mottagare på användardelningar", + "Cannot enable sending the password by Talk with an empty password" : "Kan inte aktivera sändning av lösenordet via Talk med ett tomt lösenord", + "Cannot enable sending the password by Talk without setting a new password" : "Kan inte aktivera sändning av lösenordet med Talk utan att ange ett nytt lösenord", + "Cannot disable sending the password by Talk without setting a new password" : "Kan inte inaktivera sändning av lösenordet med Talk utan att ange ett nytt lösenord", + "Cannot change target of link share" : "Kan inte ändra mål för länkdelning", + "Invalid recipient" : "Ogiltig mottagare", + "Group \"%s\" does not exist" : "Gruppen \"%s\" finns inte", "The requested share does not exist anymore" : "Den begärda delningen finns inte mer", "The requested share comes from a disabled user" : "Den begärda delningen kommer från en inaktiverad användare", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Användaren skapades inte eftersom användargränsen har nåtts. Kontrollera dina aviseringar för att läsa mer.", "Could not find category \"%s\"" : "Kunde inte hitta kategorin \"%s\"", + "Input text" : "Mata in text", + "The input text" : "Inmatningstexten", "Sunday" : "Söndag", "Monday" : "Måndag", "Tuesday" : "Tisdag", @@ -250,7 +287,7 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Din datakatalog måste vara en absolut sökväg.", "Check the value of \"datadirectory\" in your configuration." : "Kontrollera värdet på \"datadirectory\" i din konfiguration.", "Your data directory is invalid." : "Din datakatalog är ogiltig.", - "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.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Se till att det finns en fil som heter \"%1$s\" i roten av datakatalogen. Den ska ha innehållet: \"%2$s\"", "Action \"%s\" not supported or implemented." : "Åtgärd \"%s\" stöds inte eller är inte implementerad.", "Authentication failed, wrong token or provider ID given" : "Autentisering misslyckades, felaktig token eller leverantörs-ID", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Parametrar saknas för att slutföra förfrågan. Saknade parametrar: \"%s\"", @@ -262,19 +299,99 @@ OC.L10N.register( "Storage connection error. %s" : "Lagringsutrymme lyckas inte ansluta. %s", "Storage is temporarily not available" : "Lagringsutrymme är för tillfället inte tillgängligt", "Storage connection timeout. %s" : "Lagringsutrymme lyckas inte ansluta \"timeout\". %s", + "Transcribe audio" : "Transkribera ljud", + "Transcribe the things said in an audio" : "Transkribera det som sägs i ljud", + "Audio input" : "Ljudinmatning", + "The audio to transcribe" : "Ljudet att transkribera", + "Transcription" : "Transkription", + "The transcribed text" : "Den transkriberade texten", + "Context write" : "Kontextuell skrivning", + "Writes text in a given style based on the provided source material." : "Skriver text i en given stil baserat på det tillhandahållna källmaterialet.", + "Writing style" : "Skrivstil", + "Demonstrate a writing style that you would like to immitate" : "Demonstrera en skrivstil som du skulle vilja imitera", + "Source material" : "Källmaterial", + "The content that would like to be rewritten in the new writing style" : "Innehållet som skulle vilja skrivas om i den nya skrivstilen", + "Generated text" : "Genererad text", + "The generated text with content from the source material in the given style" : "Den genererade texten med innehåll från källmaterialet i den givna stilen", + "Emoji generator" : "Emoji-generator", + "Takes text and generates a representative emoji for it." : "Tar text och genererar en representativ emoji för den.", + "The text to generate an emoji for" : "Texten att generera en emoji för", + "Generated emoji" : "Genererad emoji", + "The generated emoji based on the input text" : "Den genererade emojin baserad på inmatningstexten", + "Generate image" : "Skapa bild", + "Generate an image from a text prompt" : "Skapa en bild från en textuppmaning", "Prompt" : "Uppmaning", - "Chat" : "Chat", - "Generates a possible headline for a text." : "Genererar en möjlig rubrik för en text.", + "Describe the image you want to generate" : "Beskriv bilden du vill skapa", + "Number of images" : "Antal bilder", + "How many images to generate" : "Hur många bilder som ska genereras", + "Output images" : "Skapade bilder", + "The generated images" : "De genererade bilderna", + "Free text to text prompt" : "Fritext till text prompt", + "Runs an arbitrary prompt through a language model that returns a reply" : "Kör en godtycklig prompt genom en språkmodell som returnerar ett svar", + "Describe a task that you want the assistant to do or ask a question" : "Beskriv en uppgift som du vill att assistenten ska göra eller ställ en fråga", + "Generated reply" : "Genererat svar", + "The generated text from the assistant" : "Den genererade texten från assistenten", + "Chat" : "Chatt", + "Chat with the assistant" : "Chatta med assistenten", + "System prompt" : "Systemuppmaning", + "Define rules and assumptions that the assistant should follow during the conversation." : "Definiera regler och antaganden som assistenten ska följa under samtalet.", + "Chat message" : "Chattmeddelande", + "Chat history" : "Chatthistorik", + "The history of chat messages before the current message, starting with a message by the user" : "Historiken för chattmeddelanden före det aktuella meddelandet, som börjar med ett meddelande från användaren", + "Response message" : "Svarsmeddelande", + "The generated response as part of the conversation" : "Det genererade svaret som en del av konversationen", + "Formalize text" : "Formalisera text", + "Takes a text and makes it sound more formal" : "Tar en text och får det att låta mer formellt", + "Write a text that you want the assistant to formalize" : "Skriv en text som du vill att assistenten ska formalisera", + "Formalized text" : "Formaliserad text", + "The formalized text" : "Den formaliserade texten", + "Generate a headline" : "Skapa en rubrik", + "Generates a possible headline for a text." : "Skapar en möjlig rubrik för en text.", + "Original text" : "Ursprunglig text", + "The original text to generate a headline for" : "Den ursprungliga texten att skapa en rubrik för", + "The generated headline" : "Den skapade rubriken", + "Reformulate text" : "Omformulera text", + "Takes a text and reformulates it" : "Tar en text och omformulerar den", + "Write a text that you want the assistant to reformulate" : "Skriv en text som du vill att assistenten ska formulera om", + "Reformulated text" : "Omformulerad text", + "The reformulated text, written by the assistant" : "Den omformulerade texten, skriven av assistenten", + "Simplify text" : "Förenkla text", + "Takes a text and simplifies it" : "Tar en text och förenklar den", + "Write a text that you want the assistant to simplify" : "Skriv en text som du vill att assistenten ska förenkla", + "Simplified text" : "Förenklad text", + "The simplified text" : "Den förenklade texten", "Summarize" : "Sammanfatta", + "Summarizes a text" : "Sammanfattar en text", + "The original text to summarize" : "Den ursprungliga texten för att sammanfatta", "Summary" : "Sammanfattning", + "The generated summary" : "Den genererade sammanfattningen", "Extract topics" : "Extrahera ämnen", + "Extracts topics from a text and outputs them separated by commas" : "Extraherar ämnen från en text och matar ut dem separerade med kommatecken", + "The original text to extract topics from" : "Originaltexten att extrahera ämnen från", + "Topics" : "Ämnen", + "The list of extracted topics" : "Listan över extraherade ämnen", + "Translate" : "Översätt", + "Translate text from one language to another" : "Översätt text från ett språk till ett annat", + "Origin text" : "Ursprungstext", + "The text to translate" : "Text att översätta", + "Origin language" : "Ursprungsspråk", + "The language of the origin text" : "Ursprungstextens språk", + "Target language" : "Målspråk", + "The desired language to translate the origin text in" : "Det önskade språket att översätta ursprungstexten till", + "Result" : "Resultat", + "The translated text" : "Den översatta texten", + "Free prompt" : "Fri prompt", + "Runs an arbitrary prompt through the language model." : "Kör en godtycklig uppmaning genom språkmodellen.", "Generate headline" : "Skapa rubrik", "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.", - "404" : "404", + "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", @@ -293,9 +410,8 @@ OC.L10N.register( "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 krävs.", - "Please upgrade your database version." : "Uppgradera din databasversion.", "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." + "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 ae727c7959f..6d8f52a13a6 100644 --- a/lib/l10n/sv.json +++ b/lib/l10n/sv.json @@ -17,7 +17,7 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s och %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s och %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s och %5$s", - "Education Edition" : "Utbildningspaket", + "Education bundle" : "Utbildningspaket", "Enterprise bundle" : "Företagspaketet", "Groupware bundle" : "Gruppvarupaket", "Hub bundle" : "Hub-paket", @@ -36,6 +36,7 @@ "Server version %s or higher is required." : "Serverversion %s eller nyare krävs.", "Server version %s or lower is required." : "Serverversion %s eller äldre krävs.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Inloggat konto måste vara en admin, underadministratör eller ha tilldelats speciella rättigheter för att komma åt denna inställning", + "Your current IP address doesn’t allow you to perform admin actions" : "Din nuvarande IP-adress tillåter dig inte att utföra administratörsåtgärder", "Logged in account must be an admin or sub admin" : "Inloggat konto måste vara en admin eller underadministratör", "Logged in account must be an admin" : "Inloggat konto måste vara admin", "Wiping of device %s has started" : "Rensning av enhet %s har startat", @@ -78,14 +79,21 @@ "seconds ago" : "sekunder sedan", "Empty file" : "Tom fil", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modulen med ID: %s finns inte. Aktivera den i appinställningar eller kontakta din administratör.", + "Dot files are not allowed" : "Dot-filer är inte tillåtna", + "\"%1$s\" is a forbidden file or folder name." : "\"%1$s\" är ett förbjudet fil- eller mappnamn.", + "\"%1$s\" is a forbidden prefix for file or folder names." : "\"%1$s\" är ett förbjudet prefix för fil- eller mappnamn.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" är inte tillåtet i ett fil- eller mappnamn.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" är en förbjuden filtyp.", + "Filenames must not end with \"%1$s\"." : "Filnamn får inte sluta med \"%1$s\".", + "Invalid parent path" : "Ogiltig överordnad sökväg", "File already exists" : "Filen existerar redan", "Invalid path" : "Ogiltig sökväg", "Failed to create file from template" : "Kunde skapa fil från mall", "Templates" : "Mallar", - "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", - "Dot files are not allowed" : "Dot-filer är inte tillåtna", + "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", + "Filename is too long" : "Filnamnet är för långt", "Empty filename is not allowed" : "Tomma filnamn är inte tillåtna", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Appen \"%s\" kan inte installeras eftersom appinfo-filen inte kan läsas.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Appen \"%s\" kan inte installeras eftersom den inte är kompatibel med den här versionen av servern.", @@ -137,26 +145,55 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Delningsgränssnittet %s måste implementera gränssnittet OCP\\Share_Backend", "Sharing backend %s not found" : "Delningsgränssnittet %s hittades inte", "Sharing backend for %s not found" : "Delningsgränssnittet för %s hittades inte", + "%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.", + "Open »%s«" : "Öppna »%s«", + "%1$s via %2$s" : "%1$s via %2$s", "%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« la till en kommentar till en fil delad med dig", - "Open »%s«" : "Öppna »%s«", - "%1$s via %2$s" : "%1$s via %2$s", + "Passwords are enforced for link and mail shares" : "Lösenord är obligatoriskt för länk och e-postdelning", + "Unknown share type" : "Ogiltig delningstyp", + "Cannot share with yourself" : "Kan inte dela med dig själv", + "Path should be set" : "Sökvägen bör ställas in", + "Path should be either a file or a folder" : "Sökvägen ska vara antingen en fil eller en mapp", + "You cannot share your root folder" : "Du kan inte dela din rotmapp", "You are not allowed to share %s" : "Du tillåts inte att dela %s", + "A share requires permissions" : "En delning kräver behörigheter", "Cannot increase permissions of %s" : "Kan inte höja behörigheter av %s", + "Shares need at least read permissions" : "Delningar behöver åtminstone läsbehörighet", "Files cannot be shared with delete permissions" : "Filer kan inte delas med rättighet att radera", "Files cannot be shared with create permissions" : "Filer kan inte delas med rättighet att skapa", "Expiration date is in the past" : "Utgångsdatum är i det förflutna", + "Expiration date is enforced" : "Förfallodatum är obligatoriskt", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Kan inte sätta ett utgångsdatum längre fram än %n dag","Kan inte sätta ett utgångsdatum längre fram än %n dagar"], "Sharing is only allowed with group members" : "Delning är endast tillåten med gruppmedlemmar", "Sharing %s failed, because this item is already shared with the account %s" : "Delning av %s misslyckades, eftersom det här objektet redan delas med kontot %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.", + "Group sharing is now allowed" : "Gruppdelning är nu tillåten", + "Sharing is only allowed within your own groups" : "Delning är endast tillåten inom dina egna grupper", + "Path is already shared with this group" : "Sökvägen delas redan med den här gruppen", + "Link sharing is not allowed" : "Länkdelning är inte tillåtet", + "Public upload is not allowed" : "Offentlig uppladdning är inte tillåten", + "Path contains files shared with you" : "Sökvägen innehåller filer som delas med dig", + "Sharing is disabled" : "Delning är inaktiverat", + "Sharing is disabled for you" : "Delning är inaktiverat för dig", + "Cannot share with the share owner" : "Kan inte dela med ägaren", + "Share does not have a full ID" : "Delningen har inte ett fullständigt ID", + "Cannot change share type" : "Kan inte ändra delningstyp", + "Can only update recipient on user shares" : "Kan bara uppdatera mottagare på användardelningar", + "Cannot enable sending the password by Talk with an empty password" : "Kan inte aktivera sändning av lösenordet via Talk med ett tomt lösenord", + "Cannot enable sending the password by Talk without setting a new password" : "Kan inte aktivera sändning av lösenordet med Talk utan att ange ett nytt lösenord", + "Cannot disable sending the password by Talk without setting a new password" : "Kan inte inaktivera sändning av lösenordet med Talk utan att ange ett nytt lösenord", + "Cannot change target of link share" : "Kan inte ändra mål för länkdelning", + "Invalid recipient" : "Ogiltig mottagare", + "Group \"%s\" does not exist" : "Gruppen \"%s\" finns inte", "The requested share does not exist anymore" : "Den begärda delningen finns inte mer", "The requested share comes from a disabled user" : "Den begärda delningen kommer från en inaktiverad användare", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Användaren skapades inte eftersom användargränsen har nåtts. Kontrollera dina aviseringar för att läsa mer.", "Could not find category \"%s\"" : "Kunde inte hitta kategorin \"%s\"", + "Input text" : "Mata in text", + "The input text" : "Inmatningstexten", "Sunday" : "Söndag", "Monday" : "Måndag", "Tuesday" : "Tisdag", @@ -248,7 +285,7 @@ "Your data directory must be an absolute path." : "Din datakatalog måste vara en absolut sökväg.", "Check the value of \"datadirectory\" in your configuration." : "Kontrollera värdet på \"datadirectory\" i din konfiguration.", "Your data directory is invalid." : "Din datakatalog är ogiltig.", - "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.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Se till att det finns en fil som heter \"%1$s\" i roten av datakatalogen. Den ska ha innehållet: \"%2$s\"", "Action \"%s\" not supported or implemented." : "Åtgärd \"%s\" stöds inte eller är inte implementerad.", "Authentication failed, wrong token or provider ID given" : "Autentisering misslyckades, felaktig token eller leverantörs-ID", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Parametrar saknas för att slutföra förfrågan. Saknade parametrar: \"%s\"", @@ -260,19 +297,99 @@ "Storage connection error. %s" : "Lagringsutrymme lyckas inte ansluta. %s", "Storage is temporarily not available" : "Lagringsutrymme är för tillfället inte tillgängligt", "Storage connection timeout. %s" : "Lagringsutrymme lyckas inte ansluta \"timeout\". %s", + "Transcribe audio" : "Transkribera ljud", + "Transcribe the things said in an audio" : "Transkribera det som sägs i ljud", + "Audio input" : "Ljudinmatning", + "The audio to transcribe" : "Ljudet att transkribera", + "Transcription" : "Transkription", + "The transcribed text" : "Den transkriberade texten", + "Context write" : "Kontextuell skrivning", + "Writes text in a given style based on the provided source material." : "Skriver text i en given stil baserat på det tillhandahållna källmaterialet.", + "Writing style" : "Skrivstil", + "Demonstrate a writing style that you would like to immitate" : "Demonstrera en skrivstil som du skulle vilja imitera", + "Source material" : "Källmaterial", + "The content that would like to be rewritten in the new writing style" : "Innehållet som skulle vilja skrivas om i den nya skrivstilen", + "Generated text" : "Genererad text", + "The generated text with content from the source material in the given style" : "Den genererade texten med innehåll från källmaterialet i den givna stilen", + "Emoji generator" : "Emoji-generator", + "Takes text and generates a representative emoji for it." : "Tar text och genererar en representativ emoji för den.", + "The text to generate an emoji for" : "Texten att generera en emoji för", + "Generated emoji" : "Genererad emoji", + "The generated emoji based on the input text" : "Den genererade emojin baserad på inmatningstexten", + "Generate image" : "Skapa bild", + "Generate an image from a text prompt" : "Skapa en bild från en textuppmaning", "Prompt" : "Uppmaning", - "Chat" : "Chat", - "Generates a possible headline for a text." : "Genererar en möjlig rubrik för en text.", + "Describe the image you want to generate" : "Beskriv bilden du vill skapa", + "Number of images" : "Antal bilder", + "How many images to generate" : "Hur många bilder som ska genereras", + "Output images" : "Skapade bilder", + "The generated images" : "De genererade bilderna", + "Free text to text prompt" : "Fritext till text prompt", + "Runs an arbitrary prompt through a language model that returns a reply" : "Kör en godtycklig prompt genom en språkmodell som returnerar ett svar", + "Describe a task that you want the assistant to do or ask a question" : "Beskriv en uppgift som du vill att assistenten ska göra eller ställ en fråga", + "Generated reply" : "Genererat svar", + "The generated text from the assistant" : "Den genererade texten från assistenten", + "Chat" : "Chatt", + "Chat with the assistant" : "Chatta med assistenten", + "System prompt" : "Systemuppmaning", + "Define rules and assumptions that the assistant should follow during the conversation." : "Definiera regler och antaganden som assistenten ska följa under samtalet.", + "Chat message" : "Chattmeddelande", + "Chat history" : "Chatthistorik", + "The history of chat messages before the current message, starting with a message by the user" : "Historiken för chattmeddelanden före det aktuella meddelandet, som börjar med ett meddelande från användaren", + "Response message" : "Svarsmeddelande", + "The generated response as part of the conversation" : "Det genererade svaret som en del av konversationen", + "Formalize text" : "Formalisera text", + "Takes a text and makes it sound more formal" : "Tar en text och får det att låta mer formellt", + "Write a text that you want the assistant to formalize" : "Skriv en text som du vill att assistenten ska formalisera", + "Formalized text" : "Formaliserad text", + "The formalized text" : "Den formaliserade texten", + "Generate a headline" : "Skapa en rubrik", + "Generates a possible headline for a text." : "Skapar en möjlig rubrik för en text.", + "Original text" : "Ursprunglig text", + "The original text to generate a headline for" : "Den ursprungliga texten att skapa en rubrik för", + "The generated headline" : "Den skapade rubriken", + "Reformulate text" : "Omformulera text", + "Takes a text and reformulates it" : "Tar en text och omformulerar den", + "Write a text that you want the assistant to reformulate" : "Skriv en text som du vill att assistenten ska formulera om", + "Reformulated text" : "Omformulerad text", + "The reformulated text, written by the assistant" : "Den omformulerade texten, skriven av assistenten", + "Simplify text" : "Förenkla text", + "Takes a text and simplifies it" : "Tar en text och förenklar den", + "Write a text that you want the assistant to simplify" : "Skriv en text som du vill att assistenten ska förenkla", + "Simplified text" : "Förenklad text", + "The simplified text" : "Den förenklade texten", "Summarize" : "Sammanfatta", + "Summarizes a text" : "Sammanfattar en text", + "The original text to summarize" : "Den ursprungliga texten för att sammanfatta", "Summary" : "Sammanfattning", + "The generated summary" : "Den genererade sammanfattningen", "Extract topics" : "Extrahera ämnen", + "Extracts topics from a text and outputs them separated by commas" : "Extraherar ämnen från en text och matar ut dem separerade med kommatecken", + "The original text to extract topics from" : "Originaltexten att extrahera ämnen från", + "Topics" : "Ämnen", + "The list of extracted topics" : "Listan över extraherade ämnen", + "Translate" : "Översätt", + "Translate text from one language to another" : "Översätt text från ett språk till ett annat", + "Origin text" : "Ursprungstext", + "The text to translate" : "Text att översätta", + "Origin language" : "Ursprungsspråk", + "The language of the origin text" : "Ursprungstextens språk", + "Target language" : "Målspråk", + "The desired language to translate the origin text in" : "Det önskade språket att översätta ursprungstexten till", + "Result" : "Resultat", + "The translated text" : "Den översatta texten", + "Free prompt" : "Fri prompt", + "Runs an arbitrary prompt through the language model." : "Kör en godtycklig uppmaning genom språkmodellen.", "Generate headline" : "Skapa rubrik", "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.", - "404" : "404", + "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", @@ -291,9 +408,8 @@ "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", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 krävs.", - "Please upgrade your database version." : "Uppgradera din databasversion.", "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." + "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 7076b5a4d7f..b93c197b614 100644 --- a/lib/l10n/ta.js +++ b/lib/l10n/ta.js @@ -57,6 +57,7 @@ OC.L10N.register( "Application is not enabled" : "செயலி இயலுமைப்படுத்தப்படவில்லை", "Authentication error" : "அத்தாட்சிப்படுத்தலில் வழு", "Token expired. Please reload page." : "அடையாளவில்லை காலாவதியாகிவிட்டது. தயவுசெய்து பக்கத்தை மீள் ஏற்றுக.", + "Translate" : "Translate", "Help" : "உதவி", "Users" : "பயனாளர்" }, diff --git a/lib/l10n/ta.json b/lib/l10n/ta.json index f2c7e531d88..66cc40fe3f8 100644 --- a/lib/l10n/ta.json +++ b/lib/l10n/ta.json @@ -55,6 +55,7 @@ "Application is not enabled" : "செயலி இயலுமைப்படுத்தப்படவில்லை", "Authentication error" : "அத்தாட்சிப்படுத்தலில் வழு", "Token expired. Please reload page." : "அடையாளவில்லை காலாவதியாகிவிட்டது. தயவுசெய்து பக்கத்தை மீள் ஏற்றுக.", + "Translate" : "Translate", "Help" : "உதவி", "Users" : "பயனாளர்" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/lib/l10n/th.js b/lib/l10n/th.js index f22a94117ad..6948b8b4e20 100644 --- a/lib/l10n/th.js +++ b/lib/l10n/th.js @@ -46,12 +46,10 @@ OC.L10N.register( "in a few seconds" : "ในไม่กี่วินาที", "seconds ago" : "วินาทีที่ผ่านมา", "Empty file" : "ไฟล์ว่าง", + "Dot files are not allowed" : "ไม่อนุญาตไฟล์จุด", "File already exists" : "มีไฟล์นี้อยู่แล้ว", "Templates" : "เทมเพลต", - "File name is a reserved word" : "ชื่อแฟ้มเป็นคำสงวน", - "File name contains at least one invalid character" : "ชื่อไฟล์มีตัวอักษรที่ไม่ถูกต้องอย่างน้อย 1 ตัว", - "File name is too long" : "ชื่อไฟล์ยาวเกินไป", - "Dot files are not allowed" : "ไม่อนุญาตไฟล์จุด", + "Filename contains at least one invalid character" : "ชื่อไฟล์มีตัวอักษรที่ไม่ถูกต้องอย่างน้อย 1 ตัว", "Empty filename is not allowed" : "ชื่อไฟล์ห้ามว่างเปล่า", "App \"%s\" cannot be installed because appinfo file cannot be read." : "แอป \"%s\" ไม่สามารถติดตั้งได้ เพราะไฟล์ appInfo ไม่สามารถอ่านได้", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "ไม่สามารถติดตั้งแอป \"%s\" เนื่องจากแอปเข้ากับเซิร์ฟเวอร์รุ่นนี้ไม่ได้", @@ -83,6 +81,7 @@ OC.L10N.register( "Sharing backend %s not found" : "ไม่พบแบ็กเอนด์การแชร์ %s", "Sharing backend for %s not found" : "ไม่พบแบ็กเอนด์การแชร์สำหรับ %s", "Open »%s«" : "เปิด »%s«", + "Unknown share type" : "ไม่รู้จักประเภทของแชร์", "You are not allowed to share %s" : "คุณไม่ได้รับอนุญาตให้แชร์ %s", "Cannot increase permissions of %s" : "ไม่สามารถเพิ่มสิทธิ์ของ %s", "Expiration date is in the past" : "วันหมดอายุอยู่ในอดีต", @@ -154,6 +153,10 @@ OC.L10N.register( "Storage connection error. %s" : "ข้อผิดพลาดการเชื่อมต่อพื้นที่จัดเก็บข้อมูล %s", "Storage is temporarily not available" : "พื้นที่จัดเก็บข้อมูลไม่สามารถใช้งานได้ชั่วคราว", "Storage connection timeout. %s" : "หมดเวลาการเชื่อมต่อพื้นที่จัดเก็บข้อมูล %s", + "Translate" : "แปลภาษา", + "File name is a reserved word" : "ชื่อแฟ้มเป็นคำสงวน", + "File name contains at least one invalid character" : "ชื่อไฟล์มีตัวอักษรที่ไม่ถูกต้องอย่างน้อย 1 ตัว", + "File name is too long" : "ชื่อไฟล์ยาวเกินไป", "Help" : "ช่วยเหลือ", "Users" : "ผู้ใช้งาน", "Unknown user" : "ผู้ใช้ที่ไม่รู้จัก", diff --git a/lib/l10n/th.json b/lib/l10n/th.json index d7a669af602..d33efd1bc54 100644 --- a/lib/l10n/th.json +++ b/lib/l10n/th.json @@ -44,12 +44,10 @@ "in a few seconds" : "ในไม่กี่วินาที", "seconds ago" : "วินาทีที่ผ่านมา", "Empty file" : "ไฟล์ว่าง", + "Dot files are not allowed" : "ไม่อนุญาตไฟล์จุด", "File already exists" : "มีไฟล์นี้อยู่แล้ว", "Templates" : "เทมเพลต", - "File name is a reserved word" : "ชื่อแฟ้มเป็นคำสงวน", - "File name contains at least one invalid character" : "ชื่อไฟล์มีตัวอักษรที่ไม่ถูกต้องอย่างน้อย 1 ตัว", - "File name is too long" : "ชื่อไฟล์ยาวเกินไป", - "Dot files are not allowed" : "ไม่อนุญาตไฟล์จุด", + "Filename contains at least one invalid character" : "ชื่อไฟล์มีตัวอักษรที่ไม่ถูกต้องอย่างน้อย 1 ตัว", "Empty filename is not allowed" : "ชื่อไฟล์ห้ามว่างเปล่า", "App \"%s\" cannot be installed because appinfo file cannot be read." : "แอป \"%s\" ไม่สามารถติดตั้งได้ เพราะไฟล์ appInfo ไม่สามารถอ่านได้", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "ไม่สามารถติดตั้งแอป \"%s\" เนื่องจากแอปเข้ากับเซิร์ฟเวอร์รุ่นนี้ไม่ได้", @@ -81,6 +79,7 @@ "Sharing backend %s not found" : "ไม่พบแบ็กเอนด์การแชร์ %s", "Sharing backend for %s not found" : "ไม่พบแบ็กเอนด์การแชร์สำหรับ %s", "Open »%s«" : "เปิด »%s«", + "Unknown share type" : "ไม่รู้จักประเภทของแชร์", "You are not allowed to share %s" : "คุณไม่ได้รับอนุญาตให้แชร์ %s", "Cannot increase permissions of %s" : "ไม่สามารถเพิ่มสิทธิ์ของ %s", "Expiration date is in the past" : "วันหมดอายุอยู่ในอดีต", @@ -152,6 +151,10 @@ "Storage connection error. %s" : "ข้อผิดพลาดการเชื่อมต่อพื้นที่จัดเก็บข้อมูล %s", "Storage is temporarily not available" : "พื้นที่จัดเก็บข้อมูลไม่สามารถใช้งานได้ชั่วคราว", "Storage connection timeout. %s" : "หมดเวลาการเชื่อมต่อพื้นที่จัดเก็บข้อมูล %s", + "Translate" : "แปลภาษา", + "File name is a reserved word" : "ชื่อแฟ้มเป็นคำสงวน", + "File name contains at least one invalid character" : "ชื่อไฟล์มีตัวอักษรที่ไม่ถูกต้องอย่างน้อย 1 ตัว", + "File name is too long" : "ชื่อไฟล์ยาวเกินไป", "Help" : "ช่วยเหลือ", "Users" : "ผู้ใช้งาน", "Unknown user" : "ผู้ใช้ที่ไม่รู้จัก", diff --git a/lib/l10n/tk.js b/lib/l10n/tk.js index 5d89e835d3e..1934bafa03c 100644 --- a/lib/l10n/tk.js +++ b/lib/l10n/tk.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Files" : "Faýllar", "seconds ago" : "Sekunt öň", + "Filename contains at least one invalid character" : "Faýlyň ady azyndan bir nädogry belgini öz içine alýar", "Settings" : "Sazlamalar", "Log out" : "Hasapdan çykmak", "Accounts" : "Hasaplar", @@ -10,6 +11,7 @@ OC.L10N.register( "Website" : "Website", "Address" : "Salgysy", "About" : "Hakynda", + "Translate" : "Terjime et", "Help" : "Kömek" }, "nplurals=2; plural=(n != 1);"); diff --git a/lib/l10n/tk.json b/lib/l10n/tk.json index 7c79f55024c..d1d18522cbd 100644 --- a/lib/l10n/tk.json +++ b/lib/l10n/tk.json @@ -1,6 +1,7 @@ { "translations": { "Files" : "Faýllar", "seconds ago" : "Sekunt öň", + "Filename contains at least one invalid character" : "Faýlyň ady azyndan bir nädogry belgini öz içine alýar", "Settings" : "Sazlamalar", "Log out" : "Hasapdan çykmak", "Accounts" : "Hasaplar", @@ -8,6 +9,7 @@ "Website" : "Website", "Address" : "Salgysy", "About" : "Hakynda", + "Translate" : "Terjime et", "Help" : "Kömek" },"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 be4afe13455..f8aa7323e63 100644 --- a/lib/l10n/tr.js +++ b/lib/l10n/tr.js @@ -19,7 +19,7 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s ve %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s ve %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s ve %5$s", - "Education Edition" : "Eğitim sürümü", + "Education bundle" : "Eğitim paketi", "Enterprise bundle" : "Kurumsal paket", "Groupware bundle" : "Grup çalışması paketi", "Hub bundle" : "Toplayıcı paketi", @@ -38,6 +38,7 @@ OC.L10N.register( "Server version %s or higher is required." : "Sunucu %s ya da daha sonraki bir sürüm olmalıdır.", "Server version %s or lower is required." : "Sunucu %s ya da daha önceki bir sürüm olmalıdır.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Oturum açmış hesap bir yönetici, bir alt yönetici veya bu ayara erişmek için özel izne sahip olmalıdır", + "Your current IP address doesn’t allow you to perform admin actions" : "Geçerli IP adresiniz yönetici işlemleri yapmanıza izin vermiyor", "Logged in account must be an admin or sub admin" : "Oturum açmış hesap bir yönetici ya da alt yönetici olmalıdır", "Logged in account must be an admin" : "Oturum açmış hesap bir yönetici olmalıdır", "Wiping of device %s has started" : "%s aygıtının silinmesine başlandı", @@ -80,14 +81,21 @@ 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ü etkinleştirin ya da BT yöneticinizle görüşün.", + "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.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" bir dosya ya da klasör adında kullanılamaz.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" dosya türüne izin verilmiyor.", + "Filenames must not end with \"%1$s\"." : "Dosya adları \"%1$s\" ile bitemez.", + "Invalid parent path" : "Üst yol geçersiz", "File already exists" : "Dosya zaten var", "Invalid path" : "Yol geçersiz", "Failed to create file from template" : "Kalıptan dosya oluşturulamadı", "Templates" : "Kalıplar", - "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", - "Dot files are not allowed" : "Nokta dosyaları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", + "Filename is too long" : "Dosya adı çok uzun", "Empty filename is not allowed" : "Boş dosya adına izin verilmiyor", "App \"%s\" cannot be installed because appinfo file cannot be read." : "appinfo dosyası okunamadığından \"%s\" uygulaması kurulamaz.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "\"%s\" uygulaması sunucu sürümüyle uyumlu olmadığından kurulamaz.", @@ -139,22 +147,56 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Paylaşım arka ucu %s OCP\\Share_Backend arayüzünü desteklemeli", "Sharing backend %s not found" : "%s paylaşım arka ucu bulunamadı", "Sharing backend for %s not found" : "%s için paylaşım arka ucu bulunamadı", + "%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.", + "Open »%s«" : "»%s« aç", + "%1$s via %2$s" : "%1$s, %2$s aracılığıyla", "%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ç", - "%1$s via %2$s" : "%1$s, %2$s aracılığıyla", + "Passwords are enforced for link and mail shares" : "Bağlantı ve e-posta paylaşımları için parolalar zorunludur", + "SharedWith is not a valid user" : "SharedWith geçerli bir kullanıcı değil", + "SharedWith is not a valid group" : "SharedWith geçerli bir grup değil", + "SharedWith should be empty" : "SharedWith boş olamaz", + "SharedWith should not be empty" : "SharedWith boş olmamalı", + "SharedWith is not a valid circle" : "SharedWith geçerli bir çevre değil", + "Unknown share type" : "Paylaşım türü bilinmiyor", + "SharedBy should be set" : "SharedBy ayarlanmalıdır", + "Cannot share with yourself" : "Kendinizle paylaşamazsınız", + "Path should be set" : "Yol ayarlanmalıdır", + "Path should be either a file or a folder" : "Yol bir dosya ya da klasör olmalıdır", + "You cannot share your root folder" : "Kök klasörünüzü paylaşamazsınız", "You are not allowed to share %s" : "%s ögesini paylaşma izniniz yok", + "A share requires permissions" : "Bir paylaşımın izinleri olmalıdır", "Cannot increase permissions of %s" : "%s izinleri yükseltilemedi", + "Shares need at least read permissions" : "Paylaşımların en azından okuma izinleri olmalıdır", "Files cannot be shared with delete permissions" : "Silme izni ile dosya paylaşılamaz", "Files cannot be shared with create permissions" : "Ekleme izni ile dosya paylaşılamaz", "Expiration date is in the past" : "Geçerlilik sonu tarihi geçmişte", + "Expiration date is enforced" : "Geçerlilik sonu tarihi dayatılıyor", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Paylaşımların geçerlilik süreleri, gelecekte %n günden fazla olamaz","Paylaşımların geçerlilik süreleri, gelecekte %n günden fazla olamaz"], "Sharing is only allowed with group members" : "Paylaşım yalnızca grup üyeleri ile yapılabilir", "Sharing %s failed, because this item is already shared with the account %s" : "%s paylaşılamadı. Bu öge zaten %s hesabı 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.", + "Group sharing is now allowed" : "Artık grup paylaşımına izin veriliyor", + "Sharing is only allowed within your own groups" : "Paylaşım yalnızca kendi gruplarınız ile yapılabilir", + "Path is already shared with this group" : "Bu yol bu grup ile zaten paylaşılmış", + "Link sharing is not allowed" : "Bağlantı paylaşımına izin verilmiyor", + "Public upload is not allowed" : "Herkese açık yüklemeye izin verilmiyor", + "Path contains files shared with you" : "Yolda sizinle paylaşılmış dosyalar var", + "Sharing is disabled" : "Paylaşım devre dışı bırakılmış", + "Sharing is disabled for you" : "Paylaşım sizin için devre dışı bırakılmış", + "Cannot share with the share owner" : "Paylaşımı sahibi ile paylaşamazsınız", + "Share does not have a full ID" : "Paylaşımın tam kimliği yok", + "Cannot change share type" : "Paylaşım türü değiştirilemez", + "Can only update recipient on user shares" : "Yalnızca kullanıcı paylaşımlarındaki alıcıyı güncelleyebilir", + "Cannot enable sending the password by Talk with an empty password" : "Boş bir parola ile Sohbet uygulaması ile parola gönderme etkinleştirilemez", + "Cannot enable sending the password by Talk without setting a new password" : "Yeni bir parola ayarlanmadan Sohbet uygulaması ile parola gönderme etkinleştirilemez", + "Cannot disable sending the password by Talk without setting a new password" : "Yeni bir parola ayarlanmadan Sohbet uygulaması ile parola gönderme devre dışı bırakılamaz", + "Share provider does not support accepting" : "Paylaşım hizmeti sağlayıcısı kabul etmeyi desteklemiyor", + "Cannot change target of link share" : "Bağlantı paylaşımının hedefi değiştirilemedi", + "Invalid recipient" : "Alıcı geçersiz", + "Group \"%s\" does not exist" : "\"%s\" grubu bulunamadı", "The requested share does not exist anymore" : "Erişilmek istenilen paylaşım artık yok", "The requested share comes from a disabled user" : "Erişilmek istenilen paylaşım devre dışı bırakılmış bir kullanıcıdan geliyor", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Kullanıcı sayısı sınırına ulaşıldığından kullanıcı eklenemedi. Ayrıntılı bilgi almak için bildirimlerinize bakın.", @@ -252,7 +294,7 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Veri klasörünüz mutlak bir yol olmalıdır.", "Check the value of \"datadirectory\" in your configuration." : "Yapılandırmanızdaki \"datadirectory\" değerini denetleyin.", "Your data directory is invalid." : "Veri klasörünüz geçersiz.", - "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.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Veri klasörü kökünde \"%1$s\" adında bir dosya bulunduğundan emin olun. İçeriğinde şu bulunmalıdır: \"%2$s\"", "Action \"%s\" not supported or implemented." : "\"%s\" işlemi desteklenmiyor ya da henüz kullanılamıyor.", "Authentication failed, wrong token or provider ID given" : "Kimlik doğrulanamadı. Belirtilen kod ya da hizmet sağlayıcı kimliği hatalı", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "İsteğin tamamlanması için gerekli parametreler eksik: \"%s\"", @@ -270,7 +312,7 @@ OC.L10N.register( "The audio to transcribe" : "Yazıya dönüştürülecek ses", "Transcription" : "Yazıya dönüştürme", "The transcribed text" : "Dönüştürülen yazı", - "ContextWrite" : "ContextWrite", + "Context write" : "Bağlam yazma", "Writes text in a given style based on the provided source material." : "Sağlanan kaynak materyale göre belirli bir tarzda metin yazar.", "Writing style" : "Yazma tarzı", "Demonstrate a writing style that you would like to immitate" : "Taklit etmek isteyeceğiniz bir yazım tarzını gösterin", @@ -291,20 +333,72 @@ OC.L10N.register( "How many images to generate" : "Oluşturulacak görsel sayısı", "Output images" : "Çıktı görselleri", "The generated images" : "Oluşturulan görseller", + "Free text to text prompt" : "Ücretsiz yazıdan yazıya istemi", + "Runs an arbitrary prompt through a language model that returns a reply" : "Dil modeli ile bir yanıt döndüren isteğe bağlı bir bilgi istemi çalıştırır", + "Describe a task that you want the assistant to do or ask a question" : "Yardımcının yapmasını istediğiniz bir görevi tanımlayın ya da bir soru sorun", + "Generated reply" : "Oluşturulan yanıt", + "The generated text from the assistant" : "Yardımcının oluşturduğu metin", "Chat" : "Sohbet", + "Chat with the assistant" : "Yardımcı ile sohbet et", + "System prompt" : "Sistem istemi", + "Define rules and assumptions that the assistant should follow during the conversation." : "Sohbet sırasında yardımcının uyması gereken kuralları ve varsayımları tanımlayın.", + "Chat message" : "Sohbet iletisi", + "Chat history" : "Sohbet geçmişi", + "The history of chat messages before the current message, starting with a message by the user" : "Kullanıcının iletisiyle başlayarak, geçerli iletiden önceki sohbet iletilerinin geçmişi", + "Response message" : "Yanıt iletisi", + "The generated response as part of the conversation" : "Sohbetin parçası olarak oluşturulan yanıt", + "Formalize text" : "Metni resmileştir", + "Takes a text and makes it sound more formal" : "Bir metni alarak daha resmi dile dönüştürür", + "Write a text that you want the assistant to formalize" : "Yardımcının resmileştirmesini istediğiniz bir metin yazın", + "Formalized text" : "Resmileştirilmiş metin", + "The formalized text" : "Resmileştirilmiş metin", + "Generate a headline" : "Bir başlık oluştur", "Generates a possible headline for a text." : "Bir metin için olası bir başlık oluşturur.", + "Original text" : "Özgün metin", + "The original text to generate a headline for" : "Başlık oluşturulacak metin", + "The generated headline" : "Oluşturulan başlık", + "Reformulate text" : "Metni yeniden düzenle", + "Takes a text and reformulates it" : "Bir metni alarak yeniden düzenler", + "Write a text that you want the assistant to reformulate" : "Yardımcının yeniden düzenlemesini istediğiniz bir metin yazın", + "Reformulated text" : "Yeniden düzenlenmiş metin", + "The reformulated text, written by the assistant" : "Yardımcı tarafından yazılan yeniden düzenlenmiş metin", + "Simplify text" : "Metni basitleştir", + "Takes a text and simplifies it" : "Bir metni alarak basitleştirir", + "Write a text that you want the assistant to simplify" : "Yardımcının basitleştirmesini istediğiniz bir metin yazın", + "Simplified text" : "Basitleştirilmiş metin", + "The simplified text" : "Basitleştirilmiş metin", "Summarize" : "Özetlensin", + "Summarizes a text" : "Bir metni özetler", + "The original text to summarize" : "Özetlenecek özgün metin", "Summary" : "Özet", + "The generated summary" : "Oluşturulan özet", "Extract topics" : "Başlıklar ayıklansın", + "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", + "The original text to extract topics from" : "Konuların ayıklanacağı özgün metin", + "Topics" : "Konular", + "The list of extracted topics" : "Ayıklanan konuların listesi", + "Translate" : "Çevir", + "Translate text from one language to another" : "Metni bir dilden diğerine çevir", + "Origin text" : "Kaynak metin", + "The text to translate" : "Çevrilecek metin", + "Origin language" : "Kaynak dil", + "The language of the origin text" : "Kaynak metnin dili", + "Target language" : "Hedef dil", + "The desired language to translate the origin text in" : "Kaynak metnin çevrilmesini istediğiniz dil", + "Result" : "Sonuç", + "The translated text" : "Çevrilmiş metin", "Free prompt" : "Ücretsiz bilgi istemi", "Runs an arbitrary prompt through the language model." : "Dil modeli ile isteğe bağlı bir bilgi istemi çalıştırır.", "Generate headline" : "Başlık oluşturulsun", "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.", - "404" : "404", + "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", @@ -323,9 +417,8 @@ OC.L10N.register( "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ı devre dışı", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 gerekli.", - "Please upgrade your database version." : "Lütfen veri tabanı sürümünüzü yükseltin.", "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." + "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 f018957c3a5..ab8f59356ba 100644 --- a/lib/l10n/tr.json +++ b/lib/l10n/tr.json @@ -17,7 +17,7 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s ve %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s ve %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s ve %5$s", - "Education Edition" : "Eğitim sürümü", + "Education bundle" : "Eğitim paketi", "Enterprise bundle" : "Kurumsal paket", "Groupware bundle" : "Grup çalışması paketi", "Hub bundle" : "Toplayıcı paketi", @@ -36,6 +36,7 @@ "Server version %s or higher is required." : "Sunucu %s ya da daha sonraki bir sürüm olmalıdır.", "Server version %s or lower is required." : "Sunucu %s ya da daha önceki bir sürüm olmalıdır.", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "Oturum açmış hesap bir yönetici, bir alt yönetici veya bu ayara erişmek için özel izne sahip olmalıdır", + "Your current IP address doesn’t allow you to perform admin actions" : "Geçerli IP adresiniz yönetici işlemleri yapmanıza izin vermiyor", "Logged in account must be an admin or sub admin" : "Oturum açmış hesap bir yönetici ya da alt yönetici olmalıdır", "Logged in account must be an admin" : "Oturum açmış hesap bir yönetici olmalıdır", "Wiping of device %s has started" : "%s aygıtının silinmesine başlandı", @@ -78,14 +79,21 @@ "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ü etkinleştirin ya da BT yöneticinizle görüşün.", + "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.", + "\"%1$s\" is not allowed inside a file or folder name." : "\"%1$s\" bir dosya ya da klasör adında kullanılamaz.", + "\"%1$s\" is a forbidden file type." : "\"%1$s\" dosya türüne izin verilmiyor.", + "Filenames must not end with \"%1$s\"." : "Dosya adları \"%1$s\" ile bitemez.", + "Invalid parent path" : "Üst yol geçersiz", "File already exists" : "Dosya zaten var", "Invalid path" : "Yol geçersiz", "Failed to create file from template" : "Kalıptan dosya oluşturulamadı", "Templates" : "Kalıplar", - "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", - "Dot files are not allowed" : "Nokta dosyaları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", + "Filename is too long" : "Dosya adı çok uzun", "Empty filename is not allowed" : "Boş dosya adına izin verilmiyor", "App \"%s\" cannot be installed because appinfo file cannot be read." : "appinfo dosyası okunamadığından \"%s\" uygulaması kurulamaz.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "\"%s\" uygulaması sunucu sürümüyle uyumlu olmadığından kurulamaz.", @@ -137,22 +145,56 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Paylaşım arka ucu %s OCP\\Share_Backend arayüzünü desteklemeli", "Sharing backend %s not found" : "%s paylaşım arka ucu bulunamadı", "Sharing backend for %s not found" : "%s için paylaşım arka ucu bulunamadı", + "%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.", + "Open »%s«" : "»%s« aç", + "%1$s via %2$s" : "%1$s, %2$s aracılığıyla", "%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ç", - "%1$s via %2$s" : "%1$s, %2$s aracılığıyla", + "Passwords are enforced for link and mail shares" : "Bağlantı ve e-posta paylaşımları için parolalar zorunludur", + "SharedWith is not a valid user" : "SharedWith geçerli bir kullanıcı değil", + "SharedWith is not a valid group" : "SharedWith geçerli bir grup değil", + "SharedWith should be empty" : "SharedWith boş olamaz", + "SharedWith should not be empty" : "SharedWith boş olmamalı", + "SharedWith is not a valid circle" : "SharedWith geçerli bir çevre değil", + "Unknown share type" : "Paylaşım türü bilinmiyor", + "SharedBy should be set" : "SharedBy ayarlanmalıdır", + "Cannot share with yourself" : "Kendinizle paylaşamazsınız", + "Path should be set" : "Yol ayarlanmalıdır", + "Path should be either a file or a folder" : "Yol bir dosya ya da klasör olmalıdır", + "You cannot share your root folder" : "Kök klasörünüzü paylaşamazsınız", "You are not allowed to share %s" : "%s ögesini paylaşma izniniz yok", + "A share requires permissions" : "Bir paylaşımın izinleri olmalıdır", "Cannot increase permissions of %s" : "%s izinleri yükseltilemedi", + "Shares need at least read permissions" : "Paylaşımların en azından okuma izinleri olmalıdır", "Files cannot be shared with delete permissions" : "Silme izni ile dosya paylaşılamaz", "Files cannot be shared with create permissions" : "Ekleme izni ile dosya paylaşılamaz", "Expiration date is in the past" : "Geçerlilik sonu tarihi geçmişte", + "Expiration date is enforced" : "Geçerlilik sonu tarihi dayatılıyor", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Paylaşımların geçerlilik süreleri, gelecekte %n günden fazla olamaz","Paylaşımların geçerlilik süreleri, gelecekte %n günden fazla olamaz"], "Sharing is only allowed with group members" : "Paylaşım yalnızca grup üyeleri ile yapılabilir", "Sharing %s failed, because this item is already shared with the account %s" : "%s paylaşılamadı. Bu öge zaten %s hesabı 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.", + "Group sharing is now allowed" : "Artık grup paylaşımına izin veriliyor", + "Sharing is only allowed within your own groups" : "Paylaşım yalnızca kendi gruplarınız ile yapılabilir", + "Path is already shared with this group" : "Bu yol bu grup ile zaten paylaşılmış", + "Link sharing is not allowed" : "Bağlantı paylaşımına izin verilmiyor", + "Public upload is not allowed" : "Herkese açık yüklemeye izin verilmiyor", + "Path contains files shared with you" : "Yolda sizinle paylaşılmış dosyalar var", + "Sharing is disabled" : "Paylaşım devre dışı bırakılmış", + "Sharing is disabled for you" : "Paylaşım sizin için devre dışı bırakılmış", + "Cannot share with the share owner" : "Paylaşımı sahibi ile paylaşamazsınız", + "Share does not have a full ID" : "Paylaşımın tam kimliği yok", + "Cannot change share type" : "Paylaşım türü değiştirilemez", + "Can only update recipient on user shares" : "Yalnızca kullanıcı paylaşımlarındaki alıcıyı güncelleyebilir", + "Cannot enable sending the password by Talk with an empty password" : "Boş bir parola ile Sohbet uygulaması ile parola gönderme etkinleştirilemez", + "Cannot enable sending the password by Talk without setting a new password" : "Yeni bir parola ayarlanmadan Sohbet uygulaması ile parola gönderme etkinleştirilemez", + "Cannot disable sending the password by Talk without setting a new password" : "Yeni bir parola ayarlanmadan Sohbet uygulaması ile parola gönderme devre dışı bırakılamaz", + "Share provider does not support accepting" : "Paylaşım hizmeti sağlayıcısı kabul etmeyi desteklemiyor", + "Cannot change target of link share" : "Bağlantı paylaşımının hedefi değiştirilemedi", + "Invalid recipient" : "Alıcı geçersiz", + "Group \"%s\" does not exist" : "\"%s\" grubu bulunamadı", "The requested share does not exist anymore" : "Erişilmek istenilen paylaşım artık yok", "The requested share comes from a disabled user" : "Erişilmek istenilen paylaşım devre dışı bırakılmış bir kullanıcıdan geliyor", "The user was not created because the user limit has been reached. Check your notifications to learn more." : "Kullanıcı sayısı sınırına ulaşıldığından kullanıcı eklenemedi. Ayrıntılı bilgi almak için bildirimlerinize bakın.", @@ -250,7 +292,7 @@ "Your data directory must be an absolute path." : "Veri klasörünüz mutlak bir yol olmalıdır.", "Check the value of \"datadirectory\" in your configuration." : "Yapılandırmanızdaki \"datadirectory\" değerini denetleyin.", "Your data directory is invalid." : "Veri klasörünüz geçersiz.", - "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.", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "Veri klasörü kökünde \"%1$s\" adında bir dosya bulunduğundan emin olun. İçeriğinde şu bulunmalıdır: \"%2$s\"", "Action \"%s\" not supported or implemented." : "\"%s\" işlemi desteklenmiyor ya da henüz kullanılamıyor.", "Authentication failed, wrong token or provider ID given" : "Kimlik doğrulanamadı. Belirtilen kod ya da hizmet sağlayıcı kimliği hatalı", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "İsteğin tamamlanması için gerekli parametreler eksik: \"%s\"", @@ -268,7 +310,7 @@ "The audio to transcribe" : "Yazıya dönüştürülecek ses", "Transcription" : "Yazıya dönüştürme", "The transcribed text" : "Dönüştürülen yazı", - "ContextWrite" : "ContextWrite", + "Context write" : "Bağlam yazma", "Writes text in a given style based on the provided source material." : "Sağlanan kaynak materyale göre belirli bir tarzda metin yazar.", "Writing style" : "Yazma tarzı", "Demonstrate a writing style that you would like to immitate" : "Taklit etmek isteyeceğiniz bir yazım tarzını gösterin", @@ -289,20 +331,72 @@ "How many images to generate" : "Oluşturulacak görsel sayısı", "Output images" : "Çıktı görselleri", "The generated images" : "Oluşturulan görseller", + "Free text to text prompt" : "Ücretsiz yazıdan yazıya istemi", + "Runs an arbitrary prompt through a language model that returns a reply" : "Dil modeli ile bir yanıt döndüren isteğe bağlı bir bilgi istemi çalıştırır", + "Describe a task that you want the assistant to do or ask a question" : "Yardımcının yapmasını istediğiniz bir görevi tanımlayın ya da bir soru sorun", + "Generated reply" : "Oluşturulan yanıt", + "The generated text from the assistant" : "Yardımcının oluşturduğu metin", "Chat" : "Sohbet", + "Chat with the assistant" : "Yardımcı ile sohbet et", + "System prompt" : "Sistem istemi", + "Define rules and assumptions that the assistant should follow during the conversation." : "Sohbet sırasında yardımcının uyması gereken kuralları ve varsayımları tanımlayın.", + "Chat message" : "Sohbet iletisi", + "Chat history" : "Sohbet geçmişi", + "The history of chat messages before the current message, starting with a message by the user" : "Kullanıcının iletisiyle başlayarak, geçerli iletiden önceki sohbet iletilerinin geçmişi", + "Response message" : "Yanıt iletisi", + "The generated response as part of the conversation" : "Sohbetin parçası olarak oluşturulan yanıt", + "Formalize text" : "Metni resmileştir", + "Takes a text and makes it sound more formal" : "Bir metni alarak daha resmi dile dönüştürür", + "Write a text that you want the assistant to formalize" : "Yardımcının resmileştirmesini istediğiniz bir metin yazın", + "Formalized text" : "Resmileştirilmiş metin", + "The formalized text" : "Resmileştirilmiş metin", + "Generate a headline" : "Bir başlık oluştur", "Generates a possible headline for a text." : "Bir metin için olası bir başlık oluşturur.", + "Original text" : "Özgün metin", + "The original text to generate a headline for" : "Başlık oluşturulacak metin", + "The generated headline" : "Oluşturulan başlık", + "Reformulate text" : "Metni yeniden düzenle", + "Takes a text and reformulates it" : "Bir metni alarak yeniden düzenler", + "Write a text that you want the assistant to reformulate" : "Yardımcının yeniden düzenlemesini istediğiniz bir metin yazın", + "Reformulated text" : "Yeniden düzenlenmiş metin", + "The reformulated text, written by the assistant" : "Yardımcı tarafından yazılan yeniden düzenlenmiş metin", + "Simplify text" : "Metni basitleştir", + "Takes a text and simplifies it" : "Bir metni alarak basitleştirir", + "Write a text that you want the assistant to simplify" : "Yardımcının basitleştirmesini istediğiniz bir metin yazın", + "Simplified text" : "Basitleştirilmiş metin", + "The simplified text" : "Basitleştirilmiş metin", "Summarize" : "Özetlensin", + "Summarizes a text" : "Bir metni özetler", + "The original text to summarize" : "Özetlenecek özgün metin", "Summary" : "Özet", + "The generated summary" : "Oluşturulan özet", "Extract topics" : "Başlıklar ayıklansın", + "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", + "The original text to extract topics from" : "Konuların ayıklanacağı özgün metin", + "Topics" : "Konular", + "The list of extracted topics" : "Ayıklanan konuların listesi", + "Translate" : "Çevir", + "Translate text from one language to another" : "Metni bir dilden diğerine çevir", + "Origin text" : "Kaynak metin", + "The text to translate" : "Çevrilecek metin", + "Origin language" : "Kaynak dil", + "The language of the origin text" : "Kaynak metnin dili", + "Target language" : "Hedef dil", + "The desired language to translate the origin text in" : "Kaynak metnin çevrilmesini istediğiniz dil", + "Result" : "Sonuç", + "The translated text" : "Çevrilmiş metin", "Free prompt" : "Ücretsiz bilgi istemi", "Runs an arbitrary prompt through the language model." : "Dil modeli ile isteğe bağlı bir bilgi istemi çalıştırır.", "Generate headline" : "Başlık oluşturulsun", "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.", - "404" : "404", + "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", @@ -321,9 +415,8 @@ "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ı devre dışı", - "PostgreSQL >= 9 required." : "PostgreSQL >= 9 gerekli.", - "Please upgrade your database version." : "Lütfen veri tabanı sürümünüzü yükseltin.", "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." + "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/uk.js b/lib/l10n/uk.js index d45cabb70c2..cac7d6a244f 100644 --- a/lib/l10n/uk.js +++ b/lib/l10n/uk.js @@ -19,7 +19,7 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s та %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s та %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s та %5$s", - "Education Edition" : "Для навчання", + "Education bundle" : "Освіта", "Enterprise bundle" : "Для бізнесу", "Groupware bundle" : "Для робочих груп", "Hub bundle" : "Основні застосунки", @@ -80,14 +80,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 не існує. Будь ласка, увімкніть це в налаштуваннях застосунку або зверніться до адміністратора.", + "Dot files are not allowed" : "Файли які починаються з крапки не допустимі", "File already exists" : "Файл вже існує", "Invalid path" : "Недійсний шлях", "Failed to create file from template" : "Не вдалося створити файл із шаблону", "Templates" : "Шаблони", - "File name is a reserved word" : "Ім’я файлу є зарезервованим словом", - "File name contains at least one invalid character" : "Ім’я файлу містить принаймні один некоректний символ", - "File name is too long" : "Ім’я файлу занадто довге", - "Dot files are not allowed" : "Файли які починаються з крапки не допустимі", + "Filename contains at least one invalid character" : "У назві файлу міститься щонайменше один неправильний символ", "Empty filename is not allowed" : "Порожні імена файлів не допускаються", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Застосунок \"%s\" не може бути встановлений через те, що файл appinfo не може бути прочитано.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Застосунок \"%s\" неможливо встановити, оскільки він не сумісний з цією версією сервера.", @@ -139,11 +137,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Бекенд спільного доступу %s повинен реалізовувати інтерфейс OCP\\Share_Backend", "Sharing backend %s not found" : "Бекенд спільного доступу %s не знайдено", "Sharing backend for %s not found" : "Бекенд спільного доступу для %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." : "Щоб відкрити файл, натисніть кнопку нижче.", + "Open »%s«" : "Відкрити %s", + "%1$s via %2$s" : "%1$s через %2$s", "%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", - "%1$s via %2$s" : "%1$s через %2$s", + "Unknown share type" : "Невідомий тип спільного ресурсу", "You are not allowed to share %s" : "Вам заборонено поширювати %s", "Cannot increase permissions of %s" : "Не вдалося підвищити дозволи для %s", "Files cannot be shared with delete permissions" : "Не можна надавати у спільний доступ файли з дозволами на вилучення", @@ -152,9 +154,6 @@ 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_" : ["Неможливо встановити дату закінчення більше ніж %n день у майбутньому","Неможливо встановити дату закінчення більше ніж %n днів у майбутньому","Неможливо встановити дату закінчення більше ніж %n днів у майбутньому","Неможливо встановити дату закінчення більше ніж %n днів у майбутньому"], "Sharing is only allowed with group members" : "Спільний доступ дозволений лише для учасників групи", "Sharing %s failed, because this item is already shared with the account %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 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." : "Користувача не створено, оскільки досягнуто обмеження на кількість користувачів. Перевірте сповіщення для докладної інформації.", @@ -250,9 +249,8 @@ OC.L10N.register( "Your data directory must be an absolute path." : "Ваш каталог даних має бути абсолютним шляхом.", "Check the value of \"datadirectory\" in your configuration." : "Перевірте значення «каталогу даних» у вашій конфігурації.", "Your data directory is invalid." : "Ваш каталог даних недійсний.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Переконайтеся, що в корені каталогу даних є файл під назвою \".ocdata\".", "Action \"%s\" not supported or implemented." : "Дія \"%s\" не підтримується або не реалізована.", - "Authentication failed, wrong token or provider ID given" : "Помилка авторизації, надано неправильний маркер або ідентифікатор постачальника", + "Authentication failed, wrong token or provider ID given" : "Помилка авторизації, надано неправильний токен або ідентифікатор постачальника", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Немає параметрів для виконання запиту. Відсутні параметри: \"%s\"", "ID \"%1$s\" already used by cloud federation provider \"%2$s\"" : "Ідентифікатор \"%1$s\" уже використовується постачальником об'єднаних хмар \"%2$s\"", "Cloud Federation Provider with ID: \"%s\" does not exist." : "Постачальник Cloud Federation з ідентифікатором \"%s\" не існує.", @@ -262,19 +260,26 @@ OC.L10N.register( "Storage connection error. %s" : "Помилка з'єднання зі сховищем. %s", "Storage is temporarily not available" : "Сховище тимчасово недоступне", "Storage connection timeout. %s" : "Час під'єднання до сховища вичерпався. %s", + "Chat" : "Чат", "Generates a possible headline for a text." : "Створює ймовірний заголовок тексту.", "Summarize" : "Підсумок", "Summary" : "Загалом", "Extract topics" : "Виділити теми", + "Translate" : "Перекласти", + "Target language" : "Цільова мова", + "Result" : "Результат", "Free prompt" : "Вільне запрошення", "Runs an arbitrary prompt through the language model." : "Виконує довільне запрошення через мовну модель.", "Generate headline" : "Створити заголовок", "Summarizes text by reducing its length without losing key information." : "Викокремлює головне у тексті шляхом зменшення довжини тексту без втрати ключової інформації.", "Extracts topics from a text and outputs them separated by commas." : "Виділяє теми, які висвітлює текст, зводить їх у перелік, що розділено комами.", - "404" : "404", + "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" : "Невідомий користувач", @@ -293,9 +298,8 @@ OC.L10N.register( "Username must not consist of dots only" : "Ім'я користувача не повинно складатися лише з крапок", "Username is invalid because files already exist for this user" : "Ім'я користувача недійсне, оскільки файли для цього користувача вже існують", "User disabled" : "Користувач виключений", - "PostgreSQL >= 9 required." : "Необхідно PostgreSQL >= 9.", - "Please upgrade your database version." : "Оновіть версію бази даних.", "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, щоб інші користувачі не могли отримати список файлів цього каталогу." + "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 15c4bdd2ec2..cefca8381a8 100644 --- a/lib/l10n/uk.json +++ b/lib/l10n/uk.json @@ -17,7 +17,7 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s та %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s та %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s та %5$s", - "Education Edition" : "Для навчання", + "Education bundle" : "Освіта", "Enterprise bundle" : "Для бізнесу", "Groupware bundle" : "Для робочих груп", "Hub bundle" : "Основні застосунки", @@ -78,14 +78,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 не існує. Будь ласка, увімкніть це в налаштуваннях застосунку або зверніться до адміністратора.", + "Dot files are not allowed" : "Файли які починаються з крапки не допустимі", "File already exists" : "Файл вже існує", "Invalid path" : "Недійсний шлях", "Failed to create file from template" : "Не вдалося створити файл із шаблону", "Templates" : "Шаблони", - "File name is a reserved word" : "Ім’я файлу є зарезервованим словом", - "File name contains at least one invalid character" : "Ім’я файлу містить принаймні один некоректний символ", - "File name is too long" : "Ім’я файлу занадто довге", - "Dot files are not allowed" : "Файли які починаються з крапки не допустимі", + "Filename contains at least one invalid character" : "У назві файлу міститься щонайменше один неправильний символ", "Empty filename is not allowed" : "Порожні імена файлів не допускаються", "App \"%s\" cannot be installed because appinfo file cannot be read." : "Застосунок \"%s\" не може бути встановлений через те, що файл appinfo не може бути прочитано.", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "Застосунок \"%s\" неможливо встановити, оскільки він не сумісний з цією версією сервера.", @@ -137,11 +135,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Бекенд спільного доступу %s повинен реалізовувати інтерфейс OCP\\Share_Backend", "Sharing backend %s not found" : "Бекенд спільного доступу %s не знайдено", "Sharing backend for %s not found" : "Бекенд спільного доступу для %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." : "Щоб відкрити файл, натисніть кнопку нижче.", + "Open »%s«" : "Відкрити %s", + "%1$s via %2$s" : "%1$s через %2$s", "%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", - "%1$s via %2$s" : "%1$s через %2$s", + "Unknown share type" : "Невідомий тип спільного ресурсу", "You are not allowed to share %s" : "Вам заборонено поширювати %s", "Cannot increase permissions of %s" : "Не вдалося підвищити дозволи для %s", "Files cannot be shared with delete permissions" : "Не можна надавати у спільний доступ файли з дозволами на вилучення", @@ -150,9 +152,6 @@ "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["Неможливо встановити дату закінчення більше ніж %n день у майбутньому","Неможливо встановити дату закінчення більше ніж %n днів у майбутньому","Неможливо встановити дату закінчення більше ніж %n днів у майбутньому","Неможливо встановити дату закінчення більше ніж %n днів у майбутньому"], "Sharing is only allowed with group members" : "Спільний доступ дозволений лише для учасників групи", "Sharing %s failed, because this item is already shared with the account %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 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." : "Користувача не створено, оскільки досягнуто обмеження на кількість користувачів. Перевірте сповіщення для докладної інформації.", @@ -248,9 +247,8 @@ "Your data directory must be an absolute path." : "Ваш каталог даних має бути абсолютним шляхом.", "Check the value of \"datadirectory\" in your configuration." : "Перевірте значення «каталогу даних» у вашій конфігурації.", "Your data directory is invalid." : "Ваш каталог даних недійсний.", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "Переконайтеся, що в корені каталогу даних є файл під назвою \".ocdata\".", "Action \"%s\" not supported or implemented." : "Дія \"%s\" не підтримується або не реалізована.", - "Authentication failed, wrong token or provider ID given" : "Помилка авторизації, надано неправильний маркер або ідентифікатор постачальника", + "Authentication failed, wrong token or provider ID given" : "Помилка авторизації, надано неправильний токен або ідентифікатор постачальника", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Немає параметрів для виконання запиту. Відсутні параметри: \"%s\"", "ID \"%1$s\" already used by cloud federation provider \"%2$s\"" : "Ідентифікатор \"%1$s\" уже використовується постачальником об'єднаних хмар \"%2$s\"", "Cloud Federation Provider with ID: \"%s\" does not exist." : "Постачальник Cloud Federation з ідентифікатором \"%s\" не існує.", @@ -260,19 +258,26 @@ "Storage connection error. %s" : "Помилка з'єднання зі сховищем. %s", "Storage is temporarily not available" : "Сховище тимчасово недоступне", "Storage connection timeout. %s" : "Час під'єднання до сховища вичерпався. %s", + "Chat" : "Чат", "Generates a possible headline for a text." : "Створює ймовірний заголовок тексту.", "Summarize" : "Підсумок", "Summary" : "Загалом", "Extract topics" : "Виділити теми", + "Translate" : "Перекласти", + "Target language" : "Цільова мова", + "Result" : "Результат", "Free prompt" : "Вільне запрошення", "Runs an arbitrary prompt through the language model." : "Виконує довільне запрошення через мовну модель.", "Generate headline" : "Створити заголовок", "Summarizes text by reducing its length without losing key information." : "Викокремлює головне у тексті шляхом зменшення довжини тексту без втрати ключової інформації.", "Extracts topics from a text and outputs them separated by commas." : "Виділяє теми, які висвітлює текст, зводить їх у перелік, що розділено комами.", - "404" : "404", + "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" : "Невідомий користувач", @@ -291,9 +296,8 @@ "Username must not consist of dots only" : "Ім'я користувача не повинно складатися лише з крапок", "Username is invalid because files already exist for this user" : "Ім'я користувача недійсне, оскільки файли для цього користувача вже існують", "User disabled" : "Користувач виключений", - "PostgreSQL >= 9 required." : "Необхідно PostgreSQL >= 9.", - "Please upgrade your database version." : "Оновіть версію бази даних.", "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, щоб інші користувачі не могли отримати список файлів цього каталогу." + "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/uz.js b/lib/l10n/uz.js index 12b6bc21e78..17830cba76b 100644 --- a/lib/l10n/uz.js +++ b/lib/l10n/uz.js @@ -8,7 +8,6 @@ OC.L10N.register( "View profile" : "View profile", "last month" : "last month", "seconds ago" : "seconds ago", - "File name is too long" : "File name is too long", "Apps" : "Apps", "Settings" : "Settings", "Address" : "Address", @@ -18,6 +17,7 @@ OC.L10N.register( "January" : "January", "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" diff --git a/lib/l10n/uz.json b/lib/l10n/uz.json index 79e8f9b187e..bb313c8fa89 100644 --- a/lib/l10n/uz.json +++ b/lib/l10n/uz.json @@ -6,7 +6,6 @@ "View profile" : "View profile", "last month" : "last month", "seconds ago" : "seconds ago", - "File name is too long" : "File name is too long", "Apps" : "Apps", "Settings" : "Settings", "Address" : "Address", @@ -16,6 +15,7 @@ "January" : "January", "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" diff --git a/lib/l10n/vi.js b/lib/l10n/vi.js index 44dbf8cb018..d9d0f2d55f7 100644 --- a/lib/l10n/vi.js +++ b/lib/l10n/vi.js @@ -13,7 +13,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s và %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s và %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s và %5$s", - "Education Edition" : "Bản Giáo dục", "Enterprise bundle" : "Gói doanh nghiệp", "The library %s is not available." : "Thư viện %s không có sẵn.", "The following platforms are supported: %s" : "Các nền tảng sau được hỗ trợ: %s", @@ -35,6 +34,7 @@ OC.L10N.register( "seconds ago" : "vài giây trước", "File already exists" : "Tệp đã tồn tại", "Templates" : "Mẫu", + "Filename contains at least one invalid character" : "Tên tệp chứa ít nhất một ký tự không hợp lệ", "__language_name__" : "Tiếng Việt", "Appearance and accessibility" : "Ngoại hình và khả năng tiếp cận", "Apps" : "Ứng dụng", @@ -53,9 +53,10 @@ OC.L10N.register( "Additional settings" : "Cài đặt bổ sung", "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Hãy xóa thiết lập open_basedir tại tập tin cấu hình php.ini hoặc chuyển sang dùng PHP 64-bit.", "Set an admin password." : "Thiết lập mật khẩu quản trị", + "Click the button below to open it." : "Bấm vào nút bên dưới để mở nó.", "Open »%s«" : "Mở »%s«", "%1$s via %2$s" : "%1$s thông qua %2$s", - "Click the button below to open it." : "Bấm vào nút bên dưới để mở nó.", + "Unknown share type" : "Loại chia sẻ không xác định", "Could not find category \"%s\"" : "không thể tìm thấy mục \"%s\"", "Sunday" : "Chủ nhật", "Monday" : "Thứ 2", @@ -102,6 +103,8 @@ OC.L10N.register( "PHP module %s not installed." : "PHP mô đun %s chưa được cài đặt", "Storage is temporarily not available" : "Kho lưu trữ tạm thời không khả dụng", "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", diff --git a/lib/l10n/vi.json b/lib/l10n/vi.json index a620296c74b..82c22021e88 100644 --- a/lib/l10n/vi.json +++ b/lib/l10n/vi.json @@ -11,7 +11,6 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s và %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s và %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s và %5$s", - "Education Edition" : "Bản Giáo dục", "Enterprise bundle" : "Gói doanh nghiệp", "The library %s is not available." : "Thư viện %s không có sẵn.", "The following platforms are supported: %s" : "Các nền tảng sau được hỗ trợ: %s", @@ -33,6 +32,7 @@ "seconds ago" : "vài giây trước", "File already exists" : "Tệp đã tồn tại", "Templates" : "Mẫu", + "Filename contains at least one invalid character" : "Tên tệp chứa ít nhất một ký tự không hợp lệ", "__language_name__" : "Tiếng Việt", "Appearance and accessibility" : "Ngoại hình và khả năng tiếp cận", "Apps" : "Ứng dụng", @@ -51,9 +51,10 @@ "Additional settings" : "Cài đặt bổ sung", "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Hãy xóa thiết lập open_basedir tại tập tin cấu hình php.ini hoặc chuyển sang dùng PHP 64-bit.", "Set an admin password." : "Thiết lập mật khẩu quản trị", + "Click the button below to open it." : "Bấm vào nút bên dưới để mở nó.", "Open »%s«" : "Mở »%s«", "%1$s via %2$s" : "%1$s thông qua %2$s", - "Click the button below to open it." : "Bấm vào nút bên dưới để mở nó.", + "Unknown share type" : "Loại chia sẻ không xác định", "Could not find category \"%s\"" : "không thể tìm thấy mục \"%s\"", "Sunday" : "Chủ nhật", "Monday" : "Thứ 2", @@ -100,6 +101,8 @@ "PHP module %s not installed." : "PHP mô đun %s chưa được cài đặt", "Storage is temporarily not available" : "Kho lưu trữ tạm thời không khả dụng", "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", diff --git a/lib/l10n/zh_CN.js b/lib/l10n/zh_CN.js index 05489afa022..92f29545374 100644 --- a/lib/l10n/zh_CN.js +++ b/lib/l10n/zh_CN.js @@ -19,7 +19,6 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s，%2$s 和 %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s，%2$s，%3$s 和 %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s，%2$s，%3$s，%4$s 和 %5$s", - "Education Edition" : "教育版", "Enterprise bundle" : "企业捆绑包", "Groupware bundle" : "群组捆绑包", "Hub bundle" : "枢纽捆绑包", @@ -76,14 +75,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不存在。请在 App 设置中开启或联系您的管理员。", + "Dot files are not allowed" : "以 . 开头的文件不被允许", "File already exists" : "文件已存在", "Invalid path" : "无效的路径", "Failed to create file from template" : "从模板创建文件失败", "Templates" : "模板", - "File name is a reserved word" : "文件名包含敏感字符", - "File name contains at least one invalid character" : "文件名中存在至少一个非法字符", - "File name is too long" : "文件名过长", - "Dot files are not allowed" : "以 . 开头的文件不被允许", + "Filename contains at least one invalid character" : "文件名中存在至少一个非法字符", "Empty filename is not allowed" : "不允许使用空名称", "App \"%s\" cannot be installed because appinfo file cannot be read." : "无法安装应用\"%s\"，因为无法读取appinfo文件。", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "应用程式 \"%s\" 无法安装，因为它与这个版本的服务器不兼容。", @@ -127,11 +124,15 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "共享后端 %s 必须实现 OCP\\Share_Backend 接口", "Sharing backend %s not found" : "%s 的共享后端未找到", "Sharing backend for %s not found" : "%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." : "点击下方按钮可打开它。", + "Open »%s«" : "打开 »%s«", + "%1$s via %2$s" : "%1$s 通过 %2$s", "%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«", - "%1$s via %2$s" : "%1$s 通过 %2$s", + "Unknown share type" : "未知共享类型", "You are not allowed to share %s" : "您无权共享 %s", "Cannot increase permissions of %s" : "无法提升 %s 的权限", "Files cannot be shared with delete permissions" : "不能带删除权限分享文件", @@ -139,9 +140,6 @@ OC.L10N.register( "Expiration date is in the past" : "到期日期已过", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["允许设置的最远截止期是从今天算起的 %n-1 天之后"], "Sharing is only allowed with group members" : "只允许与群组成员共享", - "%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 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." : "由于已达用户数量上限，用户未创建。请检查通知以了解详情。", @@ -227,7 +225,6 @@ OC.L10N.register( "Your data directory must be an absolute path." : "您的数据目录必须是绝对路径。", "Check the value of \"datadirectory\" in your configuration." : "请检查配置文件中 \"datadirectory\" 的值。", "Your data directory is invalid." : "您的数据目录无效。", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "请确定在根目录下有一个名为\".ocdata\"的文件。", "Action \"%s\" not supported or implemented." : "操作 \"%s\" 不支持或未实现。", "Authentication failed, wrong token or provider ID given" : "认证失败，提供了错误的token或提供者ID", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "缺少参数来完成请求。缺少的参数为：\"%s\"", @@ -239,22 +236,32 @@ OC.L10N.register( "Storage connection error. %s" : "存储连接错误。%s", "Storage is temporarily not available" : "存储暂时不可用", "Storage connection timeout. %s" : "存储连接超时。%s", + "Audio input" : "音频输入", + "Context write" : "文本撰写", "Writes text in a given style based on the provided source material." : "通过给出语料的风格生成文字", + "Writing style" : "撰写风格", + "Source material" : "来源材料", "Generate image" : "生成图片", "Prompt" : "提示", "Generates a possible headline for a text." : "为一段文本生成一个可能的标题", "Summarize" : "总结归纳", "Summary" : "概况", "Extract topics" : "提取主题", + "Translate" : "翻译", + "Target language" : "目标语言", + "Result" : "结果", "Free prompt" : "自由提示", "Runs an arbitrary prompt through the language model." : "向语言模型中输入任何提示词", "Generate headline" : "产生标题", "Summarizes text by reducing its length without losing key information." : "总结一段文本以减少长度而不丢失关键信息", "Extracts topics from a text and outputs them separated by commas." : "从文本中摘出主题，输出逗号分隔的结果", - "404" : "404", + "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" : "未知用户", @@ -273,9 +280,8 @@ OC.L10N.register( "Username must not consist of dots only" : "用户名不能仅由点组成", "Username is invalid because files already exist for this user" : "用户名无效，因为该用户已经存在文件", "User disabled" : "用户已禁用", - "PostgreSQL >= 9 required." : "需要 PostgreSQL >= 9。", - "Please upgrade your database version." : "请升级您的数据库版本。", "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 以避免其他用户查看目录。" + "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 4c4c20208f1..cc034717624 100644 --- a/lib/l10n/zh_CN.json +++ b/lib/l10n/zh_CN.json @@ -17,7 +17,6 @@ "%1$s, %2$s and %3$s" : "%1$s，%2$s 和 %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s，%2$s，%3$s 和 %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s，%2$s，%3$s，%4$s 和 %5$s", - "Education Edition" : "教育版", "Enterprise bundle" : "企业捆绑包", "Groupware bundle" : "群组捆绑包", "Hub bundle" : "枢纽捆绑包", @@ -74,14 +73,12 @@ "seconds ago" : "几秒前", "Empty file" : "空文件", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "模块：%s不存在。请在 App 设置中开启或联系您的管理员。", + "Dot files are not allowed" : "以 . 开头的文件不被允许", "File already exists" : "文件已存在", "Invalid path" : "无效的路径", "Failed to create file from template" : "从模板创建文件失败", "Templates" : "模板", - "File name is a reserved word" : "文件名包含敏感字符", - "File name contains at least one invalid character" : "文件名中存在至少一个非法字符", - "File name is too long" : "文件名过长", - "Dot files are not allowed" : "以 . 开头的文件不被允许", + "Filename contains at least one invalid character" : "文件名中存在至少一个非法字符", "Empty filename is not allowed" : "不允许使用空名称", "App \"%s\" cannot be installed because appinfo file cannot be read." : "无法安装应用\"%s\"，因为无法读取appinfo文件。", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "应用程式 \"%s\" 无法安装，因为它与这个版本的服务器不兼容。", @@ -125,11 +122,15 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "共享后端 %s 必须实现 OCP\\Share_Backend 接口", "Sharing backend %s not found" : "%s 的共享后端未找到", "Sharing backend for %s not found" : "%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." : "点击下方按钮可打开它。", + "Open »%s«" : "打开 »%s«", + "%1$s via %2$s" : "%1$s 通过 %2$s", "%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«", - "%1$s via %2$s" : "%1$s 通过 %2$s", + "Unknown share type" : "未知共享类型", "You are not allowed to share %s" : "您无权共享 %s", "Cannot increase permissions of %s" : "无法提升 %s 的权限", "Files cannot be shared with delete permissions" : "不能带删除权限分享文件", @@ -137,9 +138,6 @@ "Expiration date is in the past" : "到期日期已过", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["允许设置的最远截止期是从今天算起的 %n-1 天之后"], "Sharing is only allowed with group members" : "只允许与群组成员共享", - "%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 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." : "由于已达用户数量上限，用户未创建。请检查通知以了解详情。", @@ -225,7 +223,6 @@ "Your data directory must be an absolute path." : "您的数据目录必须是绝对路径。", "Check the value of \"datadirectory\" in your configuration." : "请检查配置文件中 \"datadirectory\" 的值。", "Your data directory is invalid." : "您的数据目录无效。", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "请确定在根目录下有一个名为\".ocdata\"的文件。", "Action \"%s\" not supported or implemented." : "操作 \"%s\" 不支持或未实现。", "Authentication failed, wrong token or provider ID given" : "认证失败，提供了错误的token或提供者ID", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "缺少参数来完成请求。缺少的参数为：\"%s\"", @@ -237,22 +234,32 @@ "Storage connection error. %s" : "存储连接错误。%s", "Storage is temporarily not available" : "存储暂时不可用", "Storage connection timeout. %s" : "存储连接超时。%s", + "Audio input" : "音频输入", + "Context write" : "文本撰写", "Writes text in a given style based on the provided source material." : "通过给出语料的风格生成文字", + "Writing style" : "撰写风格", + "Source material" : "来源材料", "Generate image" : "生成图片", "Prompt" : "提示", "Generates a possible headline for a text." : "为一段文本生成一个可能的标题", "Summarize" : "总结归纳", "Summary" : "概况", "Extract topics" : "提取主题", + "Translate" : "翻译", + "Target language" : "目标语言", + "Result" : "结果", "Free prompt" : "自由提示", "Runs an arbitrary prompt through the language model." : "向语言模型中输入任何提示词", "Generate headline" : "产生标题", "Summarizes text by reducing its length without losing key information." : "总结一段文本以减少长度而不丢失关键信息", "Extracts topics from a text and outputs them separated by commas." : "从文本中摘出主题，输出逗号分隔的结果", - "404" : "404", + "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" : "未知用户", @@ -271,9 +278,8 @@ "Username must not consist of dots only" : "用户名不能仅由点组成", "Username is invalid because files already exist for this user" : "用户名无效，因为该用户已经存在文件", "User disabled" : "用户已禁用", - "PostgreSQL >= 9 required." : "需要 PostgreSQL >= 9。", - "Please upgrade your database version." : "请升级您的数据库版本。", "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 以避免其他用户查看目录。" + "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 8515003106d..64e06b38449 100644 --- a/lib/l10n/zh_HK.js +++ b/lib/l10n/zh_HK.js @@ -19,7 +19,7 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s、%2$s 和 %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s、%2$s、%3$s 和 %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s、%2$s、%3$s、%4$s 和 %5$s", - "Education Edition" : "教育版", + "Education bundle" : "教育組合包", "Enterprise bundle" : "企業組合包", "Groupware bundle" : "協作組合包", "Hub bundle" : "集線器束", @@ -38,6 +38,7 @@ OC.L10N.register( "Server version %s or higher is required." : "需要伺服器版本 %s 或更高", "Server version %s or lower is required." : "需要伺服器版本 %s 或更低", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "登錄帳戶必須是管理員、子管理員或具有存取此設定的特殊權限", + "Your current IP address doesn’t allow you to perform admin actions" : "您目前的 IP 位置不允許您執行管理動作", "Logged in account must be an admin or sub admin" : "登入的帳戶必須要是管理員或是子管理員", "Logged in account must be an admin" : "登入的帳戶必須有管理員權限", "Wiping of device %s has started" : "已開始抹除裝置 %s ", @@ -80,14 +81,21 @@ 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 的模組不存在，請在應用程式設定中啟用，或是聯絡系統管理員", + "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」是禁止的檔案或資料夾名稱前綴。", + "\"%1$s\" is not allowed inside a file or folder name." : "「%1$s」不允許出現在檔案或資料夾名稱中。", + "\"%1$s\" is a forbidden file type." : "「%1$s」是禁止的檔案類型。", + "Filenames must not end with \"%1$s\"." : "檔案名稱不能以「%1$s」結尾。", + "Invalid parent path" : "無效的上層路徑", "File already exists" : "檔案已存在", "Invalid path" : "路徑無效", "Failed to create file from template" : "無法從模板創建檔案", "Templates" : "模板", - "File name is a reserved word" : "檔案名稱是保留字", - "File name contains at least one invalid character" : "檔案名稱含有不允許的字元", - "File name is too long" : "檔案名稱太長", - "Dot files are not allowed" : "不允許小數點開頭的檔案", + "Path contains invalid segments" : "路徑包含無效的部份", + "Filename is a reserved word" : "檔案名稱是保留字", + "Filename contains at least one invalid character" : "檔名至少要有一個有效字元", + "Filename is too long" : "檔案名稱太長", "Empty filename is not allowed" : "不允許空白的檔名", "App \"%s\" cannot be installed because appinfo file cannot be read." : "應用程式 \"%s\" 無法安裝，因為無法讀取 appinfo 檔案。", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "應用程式 \"%s\" 無法安裝，因為該應用程式不相容於目前伺服器的版本。", @@ -139,22 +147,50 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "分享後端 %s 必須實作 OCP\\Share_Backend 界面", "Sharing backend %s not found" : "找不到分享後端 %s", "Sharing backend for %s not found" : "找不到 %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." : "點下方連結開啟", + "Open »%s«" : "開啟 »%s«", + "%1$s via %2$s" : "%1$s 由 %2$s", "%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«", - "%1$s via %2$s" : "%1$s 由 %2$s", + "Passwords are enforced for link and mail shares" : "連結及郵件分享強制使用密碼", + "Unknown share type" : "分享類型不詳", + "Cannot share with yourself" : "無法與您自己分享", + "Path should be set" : "應該設定途徑", + "Path should be either a file or a folder" : "途徑應為檔案或資料夾", + "You cannot share your root folder" : "您無法分享您的根資料夾", "You are not allowed to share %s" : "你無權分享 %s", + "A share requires permissions" : "分享需要權限", "Cannot increase permissions of %s" : "無法增加 %s 的權限", + "Shares need at least read permissions" : "分享需要至少讀取的權限", "Files cannot be shared with delete permissions" : "無法分享具有刪除權限的檔案", "Files cannot be shared with create permissions" : "無法分享具有新建權限的檔案", "Expiration date is in the past" : "到期日為過去的日期", + "Expiration date is enforced" : "屆滿日期為強制要求", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["到期日不能設定為 %n 天以後的日期"], "Sharing is only allowed with group members" : "僅允許在群組成員中共享", "Sharing %s failed, because this item is already shared with the account %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." : "點下方連結開啟", + "Group sharing is now allowed" : "現在允許群組分享", + "Sharing is only allowed within your own groups" : "僅允許與您自己的群組分享", + "Path is already shared with this group" : "已與此群組分享了路徑", + "Link sharing is not allowed" : "不允許連結分享", + "Public upload is not allowed" : "不允許公開上傳", + "Path contains files shared with you" : "路徑包含與您分享的檔案", + "Sharing is disabled" : "已停用分享", + "Sharing is disabled for you" : "您已停用分享", + "Cannot share with the share owner" : "無法與分享擁有者分享", + "Share does not have a full ID" : "分享並無完整 ID", + "Cannot change share type" : "無法變更分享類型", + "Can only update recipient on user shares" : "僅能更新使用者分享的收件者", + "Cannot enable sending the password by Talk with an empty password" : "若密碼為空，則無法啟用透過 Talk 傳送密碼", + "Cannot enable sending the password by Talk without setting a new password" : "若未設定新密碼，則無法啟用透過 Talk 傳送密碼", + "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 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." : "未創建用戶因為已達到用戶上限。請查看您的通知以了解更多信息。", @@ -252,7 +288,7 @@ OC.L10N.register( "Your data directory must be an absolute path." : "您的資料目錄必須為絕對路徑。", "Check the value of \"datadirectory\" in your configuration." : "請檢查您的設定檔中 \"datadirectory\" 的值。", "Your data directory is invalid." : "您的數據目錄無效。", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "請確保資料目錄最上層有一個 \"。ocdata\" 檔案", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "請確保資料目錄最上層有一個「%1$s」檔案。其應有內容：「%2$s」", "Action \"%s\" not supported or implemented." : "操作 \"%s\" 並未支援，或是尚未實作", "Authentication failed, wrong token or provider ID given" : "認證失敗，提供了錯誤的 token 或是 provider ID", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "欠缺完成請求所需的參數： \"%s\"", @@ -270,7 +306,7 @@ OC.L10N.register( "The audio to transcribe" : "要轉錄的音頻", "Transcription" : "轉錄", "The transcribed text" : "已轉錄的文字", - "ContextWrite" : "ContextWrite", + "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" : "展現您想模仿的寫作風格", @@ -292,7 +328,7 @@ OC.L10N.register( "Output images" : "輸出圖像", "The generated images" : "產生的圖像", "Free text to text prompt" : "文字提示的自由文字", - "Runs an arbitrary prompt through a language model that retuns a reply" : "透過回傳回覆的語言模型執行任意提示", + "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" : "描述您希望助理執行的任務或提出問題", "Generated reply" : "已產生的回覆", "The generated text from the assistant" : "從助理產生的文字", @@ -335,15 +371,28 @@ OC.L10N.register( "The original text to extract topics from" : "用來擷取主題的原始文字", "Topics" : "主題", "The list of extracted topics" : "擷取的主題清單", + "Translate" : "翻譯", + "Translate text from one language to another" : "從一個語言翻譯成其他語言的文字", + "Origin text" : "原始文字", + "The text to translate" : "要翻譯的文字", + "Origin language" : "原始語言", + "The language of the origin text" : "原始文字語言", + "Target language" : "目標語言", + "The desired language to translate the origin text in" : "要翻譯原始文字成什麼語言", + "Result" : "結果", + "The translated text" : "已翻譯的文字", "Free prompt" : "免費提示", "Runs an arbitrary prompt through the language model." : "通過語言模型運行任意提示。", "Generate headline" : "産生標題", "Summarizes text by reducing its length without losing key information." : "通過減少文字長度來總結而不丟失關鍵資訊。", "Extracts topics from a text and outputs them separated by commas." : "從文字中提取主題並輸出，並用逗號分隔。", - "404" : "404", + "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" : "用戶不詳", @@ -362,9 +411,8 @@ OC.L10N.register( "Username must not consist of dots only" : "用戶名稱不能只包含小數點", "Username is invalid because files already exist for this user" : "用戶名稱無效，因為用戶的檔案已經存在", "User disabled" : "用戶已停用", - "PostgreSQL >= 9 required." : "需要 PostgreSQL 版本 >= 9", - "Please upgrade your database version." : "請升級您數據庫的版本。", "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 ，以免其他用戶讀取目錄列表" + "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 8e20b78e191..1b5a28362b4 100644 --- a/lib/l10n/zh_HK.json +++ b/lib/l10n/zh_HK.json @@ -17,7 +17,7 @@ "%1$s, %2$s and %3$s" : "%1$s、%2$s 和 %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s、%2$s、%3$s 和 %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s、%2$s、%3$s、%4$s 和 %5$s", - "Education Edition" : "教育版", + "Education bundle" : "教育組合包", "Enterprise bundle" : "企業組合包", "Groupware bundle" : "協作組合包", "Hub bundle" : "集線器束", @@ -36,6 +36,7 @@ "Server version %s or higher is required." : "需要伺服器版本 %s 或更高", "Server version %s or lower is required." : "需要伺服器版本 %s 或更低", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "登錄帳戶必須是管理員、子管理員或具有存取此設定的特殊權限", + "Your current IP address doesn’t allow you to perform admin actions" : "您目前的 IP 位置不允許您執行管理動作", "Logged in account must be an admin or sub admin" : "登入的帳戶必須要是管理員或是子管理員", "Logged in account must be an admin" : "登入的帳戶必須有管理員權限", "Wiping of device %s has started" : "已開始抹除裝置 %s ", @@ -78,14 +79,21 @@ "seconds ago" : "幾秒前", "Empty file" : "空檔案", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "名為 %s 的模組不存在，請在應用程式設定中啟用，或是聯絡系統管理員", + "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」是禁止的檔案或資料夾名稱前綴。", + "\"%1$s\" is not allowed inside a file or folder name." : "「%1$s」不允許出現在檔案或資料夾名稱中。", + "\"%1$s\" is a forbidden file type." : "「%1$s」是禁止的檔案類型。", + "Filenames must not end with \"%1$s\"." : "檔案名稱不能以「%1$s」結尾。", + "Invalid parent path" : "無效的上層路徑", "File already exists" : "檔案已存在", "Invalid path" : "路徑無效", "Failed to create file from template" : "無法從模板創建檔案", "Templates" : "模板", - "File name is a reserved word" : "檔案名稱是保留字", - "File name contains at least one invalid character" : "檔案名稱含有不允許的字元", - "File name is too long" : "檔案名稱太長", - "Dot files are not allowed" : "不允許小數點開頭的檔案", + "Path contains invalid segments" : "路徑包含無效的部份", + "Filename is a reserved word" : "檔案名稱是保留字", + "Filename contains at least one invalid character" : "檔名至少要有一個有效字元", + "Filename is too long" : "檔案名稱太長", "Empty filename is not allowed" : "不允許空白的檔名", "App \"%s\" cannot be installed because appinfo file cannot be read." : "應用程式 \"%s\" 無法安裝，因為無法讀取 appinfo 檔案。", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "應用程式 \"%s\" 無法安裝，因為該應用程式不相容於目前伺服器的版本。", @@ -137,22 +145,50 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "分享後端 %s 必須實作 OCP\\Share_Backend 界面", "Sharing backend %s not found" : "找不到分享後端 %s", "Sharing backend for %s not found" : "找不到 %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." : "點下方連結開啟", + "Open »%s«" : "開啟 »%s«", + "%1$s via %2$s" : "%1$s 由 %2$s", "%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«", - "%1$s via %2$s" : "%1$s 由 %2$s", + "Passwords are enforced for link and mail shares" : "連結及郵件分享強制使用密碼", + "Unknown share type" : "分享類型不詳", + "Cannot share with yourself" : "無法與您自己分享", + "Path should be set" : "應該設定途徑", + "Path should be either a file or a folder" : "途徑應為檔案或資料夾", + "You cannot share your root folder" : "您無法分享您的根資料夾", "You are not allowed to share %s" : "你無權分享 %s", + "A share requires permissions" : "分享需要權限", "Cannot increase permissions of %s" : "無法增加 %s 的權限", + "Shares need at least read permissions" : "分享需要至少讀取的權限", "Files cannot be shared with delete permissions" : "無法分享具有刪除權限的檔案", "Files cannot be shared with create permissions" : "無法分享具有新建權限的檔案", "Expiration date is in the past" : "到期日為過去的日期", + "Expiration date is enforced" : "屆滿日期為強制要求", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["到期日不能設定為 %n 天以後的日期"], "Sharing is only allowed with group members" : "僅允許在群組成員中共享", "Sharing %s failed, because this item is already shared with the account %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." : "點下方連結開啟", + "Group sharing is now allowed" : "現在允許群組分享", + "Sharing is only allowed within your own groups" : "僅允許與您自己的群組分享", + "Path is already shared with this group" : "已與此群組分享了路徑", + "Link sharing is not allowed" : "不允許連結分享", + "Public upload is not allowed" : "不允許公開上傳", + "Path contains files shared with you" : "路徑包含與您分享的檔案", + "Sharing is disabled" : "已停用分享", + "Sharing is disabled for you" : "您已停用分享", + "Cannot share with the share owner" : "無法與分享擁有者分享", + "Share does not have a full ID" : "分享並無完整 ID", + "Cannot change share type" : "無法變更分享類型", + "Can only update recipient on user shares" : "僅能更新使用者分享的收件者", + "Cannot enable sending the password by Talk with an empty password" : "若密碼為空，則無法啟用透過 Talk 傳送密碼", + "Cannot enable sending the password by Talk without setting a new password" : "若未設定新密碼，則無法啟用透過 Talk 傳送密碼", + "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 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." : "未創建用戶因為已達到用戶上限。請查看您的通知以了解更多信息。", @@ -250,7 +286,7 @@ "Your data directory must be an absolute path." : "您的資料目錄必須為絕對路徑。", "Check the value of \"datadirectory\" in your configuration." : "請檢查您的設定檔中 \"datadirectory\" 的值。", "Your data directory is invalid." : "您的數據目錄無效。", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "請確保資料目錄最上層有一個 \"。ocdata\" 檔案", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "請確保資料目錄最上層有一個「%1$s」檔案。其應有內容：「%2$s」", "Action \"%s\" not supported or implemented." : "操作 \"%s\" 並未支援，或是尚未實作", "Authentication failed, wrong token or provider ID given" : "認證失敗，提供了錯誤的 token 或是 provider ID", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "欠缺完成請求所需的參數： \"%s\"", @@ -268,7 +304,7 @@ "The audio to transcribe" : "要轉錄的音頻", "Transcription" : "轉錄", "The transcribed text" : "已轉錄的文字", - "ContextWrite" : "ContextWrite", + "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" : "展現您想模仿的寫作風格", @@ -290,7 +326,7 @@ "Output images" : "輸出圖像", "The generated images" : "產生的圖像", "Free text to text prompt" : "文字提示的自由文字", - "Runs an arbitrary prompt through a language model that retuns a reply" : "透過回傳回覆的語言模型執行任意提示", + "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" : "描述您希望助理執行的任務或提出問題", "Generated reply" : "已產生的回覆", "The generated text from the assistant" : "從助理產生的文字", @@ -333,15 +369,28 @@ "The original text to extract topics from" : "用來擷取主題的原始文字", "Topics" : "主題", "The list of extracted topics" : "擷取的主題清單", + "Translate" : "翻譯", + "Translate text from one language to another" : "從一個語言翻譯成其他語言的文字", + "Origin text" : "原始文字", + "The text to translate" : "要翻譯的文字", + "Origin language" : "原始語言", + "The language of the origin text" : "原始文字語言", + "Target language" : "目標語言", + "The desired language to translate the origin text in" : "要翻譯原始文字成什麼語言", + "Result" : "結果", + "The translated text" : "已翻譯的文字", "Free prompt" : "免費提示", "Runs an arbitrary prompt through the language model." : "通過語言模型運行任意提示。", "Generate headline" : "産生標題", "Summarizes text by reducing its length without losing key information." : "通過減少文字長度來總結而不丟失關鍵資訊。", "Extracts topics from a text and outputs them separated by commas." : "從文字中提取主題並輸出，並用逗號分隔。", - "404" : "404", + "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" : "用戶不詳", @@ -360,9 +409,8 @@ "Username must not consist of dots only" : "用戶名稱不能只包含小數點", "Username is invalid because files already exist for this user" : "用戶名稱無效，因為用戶的檔案已經存在", "User disabled" : "用戶已停用", - "PostgreSQL >= 9 required." : "需要 PostgreSQL 版本 >= 9", - "Please upgrade your database version." : "請升級您數據庫的版本。", "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 ，以免其他用戶讀取目錄列表" + "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 ec14176982b..7113638f6d8 100644 --- a/lib/l10n/zh_TW.js +++ b/lib/l10n/zh_TW.js @@ -19,7 +19,7 @@ OC.L10N.register( "%1$s, %2$s and %3$s" : "%1$s, %2$s 和 %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s、%2$s、%3$s 和 %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s、%2$s、%3$s、%4$s 和 %5$s", - "Education Edition" : "教育版", + "Education bundle" : "教育組合包", "Enterprise bundle" : "企業組合包", "Groupware bundle" : "協作組合包", "Hub bundle" : "Hub 套裝", @@ -38,6 +38,7 @@ OC.L10N.register( "Server version %s or higher is required." : "需要伺服器版本 %s 或更高", "Server version %s or lower is required." : "需要伺服器版本 %s 或更低", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "登入帳號必須為管理員、子管理員或有可存取此設定的特殊權限的使用者", + "Your current IP address doesn’t allow you to perform admin actions" : "您目前的 IP 位置不允許您執行管理動作", "Logged in account must be an admin or sub admin" : "登入的帳號必須要是管理員或是子管理員", "Logged in account must be an admin" : "登入的帳號必須有管理員權限", "Wiping of device %s has started" : "已開始抹除裝置 %s ", @@ -80,14 +81,21 @@ 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 的模組不存在，請在應用程式設定中啟用，或是聯絡系統管理員", + "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」是禁止的檔案或資料夾名稱前綴。", + "\"%1$s\" is not allowed inside a file or folder name." : "「%1$s」不允許出現在檔案或資料夾名稱中。", + "\"%1$s\" is a forbidden file type." : "「%1$s」是禁止的檔案類型。", + "Filenames must not end with \"%1$s\"." : "檔案名稱不能以「%1$s」結尾。", + "Invalid parent path" : "無效的上層路徑", "File already exists" : "檔案已存在", "Invalid path" : "無效的路徑", "Failed to create file from template" : "無法從範本建立檔案", "Templates" : "範本", - "File name is a reserved word" : "檔案名稱是保留字", - "File name contains at least one invalid character" : "檔案名稱含有不允許的字元", - "File name is too long" : "檔案名稱太長", - "Dot files are not allowed" : "不允許小數點開頭的檔案", + "Path contains invalid segments" : "路徑包含無效的部份", + "Filename is a reserved word" : "檔案名稱是保留字", + "Filename contains at least one invalid character" : "檔案名稱包含了至少一個無效的字元", + "Filename is too long" : "檔案名稱太長", "Empty filename is not allowed" : "不允許空白的檔名", "App \"%s\" cannot be installed because appinfo file cannot be read." : "應用程式 \"%s\" 無法安裝，因為無法讀取 appinfo 檔案。", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "應用程式 \"%s\" 無法安裝，因為該應用程式不相容於目前版本的伺服器。", @@ -139,22 +147,56 @@ OC.L10N.register( "Sharing backend %s must implement the interface OCP\\Share_Backend" : "分享後端 %s 必須實作 OCP\\Share_Backend 界面", "Sharing backend %s not found" : "找不到分享後端 %s", "Sharing backend for %s not found" : "找不到 %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." : "點下方連結開啟", + "Open »%s«" : "開啟 »%s«", + "%1$s via %2$s" : "%1$s 由 %2$s", "%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«", - "%1$s via %2$s" : "%1$s 由 %2$s", + "Passwords are enforced for link and mail shares" : "連結與郵件分享強制使用密碼", + "SharedWith is not a valid user" : "SharedWith 不是有效的使用者", + "SharedWith is not a valid group" : "SharedWith 不是有效的群組", + "SharedWith should be empty" : "SharedWith 應該為空", + "SharedWith should not be empty" : "SharedWith 不應為空", + "SharedWith is not a valid circle" : "SharedWith 不是有效的小圈圈", + "Unknown share type" : "未知的分享類型", + "SharedBy should be set" : "應該設定 SharedBy", + "Cannot share with yourself" : "無法與您自己分享", + "Path should be set" : "應該設定路徑", + "Path should be either a file or a folder" : "路徑應為檔案或資料夾", + "You cannot share your root folder" : "您無法分享您的根資料夾", "You are not allowed to share %s" : "你不被允許分享 %s", + "A share requires permissions" : "分享需要權限", "Cannot increase permissions of %s" : "無法增加 %s 的權限", + "Shares need at least read permissions" : "分享需要至少讀取的權限", "Files cannot be shared with delete permissions" : "無法分享具有刪除權限的檔案", "Files cannot be shared with create permissions" : "無法分享具有新建權限的檔案", "Expiration date is in the past" : "到期日為過去的日期", + "Expiration date is enforced" : "有效日期為強制要求", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["無法設定到期日超過未來%n天"], "Sharing is only allowed with group members" : "僅允許與群組成員分享", "Sharing %s failed, because this item is already shared with the account %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." : "點下方連結開啟", + "Group sharing is now allowed" : "現在允許群組分享", + "Sharing is only allowed within your own groups" : "僅允許與您自己的群組分享", + "Path is already shared with this group" : "路徑已與此群組分享", + "Link sharing is not allowed" : "不允許連結分享", + "Public upload is not allowed" : "不允許公開上傳", + "Path contains files shared with you" : "路徑包含與您分享的檔案", + "Sharing is disabled" : "已停用分享", + "Sharing is disabled for you" : "您已停用分享", + "Cannot share with the share owner" : "無法與分享擁有者分享", + "Share does not have a full ID" : "分享並無完整 ID", + "Cannot change share type" : "無法變更分享類型", + "Can only update recipient on user shares" : "僅能更新使用者分享的收件者", + "Cannot enable sending the password by Talk with an empty password" : "若密碼為空，則無法啟用透過 Talk 傳送密碼", + "Cannot enable sending the password by Talk without setting a new password" : "若未設定新密碼，則無法啟用透過 Talk 傳送密碼", + "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 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." : "未建立使用者，因為已達使用者上限。請檢查您的通知以取得更多資訊。", @@ -252,7 +294,7 @@ OC.L10N.register( "Your data directory must be an absolute path." : "您的 data 目錄必須是絕對路徑。", "Check the value of \"datadirectory\" in your configuration." : "請檢查您設定檔中「datadirectory」的值。", "Your data directory is invalid." : "您的 data 目錄無效。", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "請確保資料目錄最上層有一個 \".ocdata\" 檔案", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "請確保資料目錄最上層有一個「%1$s」檔案。其應有內容：「%2$s」", "Action \"%s\" not supported or implemented." : "操作 \"%s\" 並未支援，或是尚未實作", "Authentication failed, wrong token or provider ID given" : "認證失敗，提供了錯誤的 token 或是 provider ID", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "欠缺完成請求所需的參數： \"%s\"", @@ -270,7 +312,7 @@ OC.L10N.register( "The audio to transcribe" : "要轉錄的音訊", "Transcription" : "轉錄", "The transcribed text" : "已轉錄的文字", - "ContextWrite" : "ContextWrite", + "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" : "展現您想模仿的寫作風格", @@ -292,7 +334,7 @@ OC.L10N.register( "Output images" : "輸出影像", "The generated images" : "產生的影像", "Free text to text prompt" : "文字提示的自由文字", - "Runs an arbitrary prompt through a language model that retuns a reply" : "透過回傳回覆的語言模型執行任意提示", + "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" : "描述您希望助理執行的任務或提出問題", "Generated reply" : "已產生的回覆", "The generated text from the assistant" : "從助理產生的文字", @@ -335,15 +377,28 @@ OC.L10N.register( "The original text to extract topics from" : "用來擷取主題的原始文字", "Topics" : "主題", "The list of extracted topics" : "擷取的主題清單", + "Translate" : "翻譯", + "Translate text from one language to another" : "從一個語言翻譯成其他語言的文字", + "Origin text" : "原始文字", + "The text to translate" : "要翻譯的文字", + "Origin language" : "原始語言", + "The language of the origin text" : "原始文字語言", + "Target language" : "目標語言", + "The desired language to translate the origin text in" : "要翻譯原始文字成什麼語言", + "Result" : "結果", + "The translated text" : "已翻譯的文字", "Free prompt" : "免費提示詞", "Runs an arbitrary prompt through the language model." : "透過語言模型執行任意提示詞。", "Generate headline" : "產生標題", "Summarizes text by reducing its length without losing key information." : "透過減少文字長度來總結而不遺失關鍵資訊。", "Extracts topics from a text and outputs them separated by commas." : "從文字中擷取主題並輸出，然後用逗號分隔。", - "404" : "404", + "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" : "未知的使用者", @@ -362,9 +417,8 @@ OC.L10N.register( "Username must not consist of dots only" : "使用者名稱不能只包含小數點", "Username is invalid because files already exist for this user" : "使用者名稱無效，因為使用者的檔案已經存在", "User disabled" : "使用者已停用", - "PostgreSQL >= 9 required." : "需要 PostgreSQL 版本 >= 9。", - "Please upgrade your database version." : "請升級您的資料庫版本。", "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 ，以免其他使用者讀取目錄列表" + "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 d44803dffdd..ee22098e7a8 100644 --- a/lib/l10n/zh_TW.json +++ b/lib/l10n/zh_TW.json @@ -17,7 +17,7 @@ "%1$s, %2$s and %3$s" : "%1$s, %2$s 和 %3$s", "%1$s, %2$s, %3$s and %4$s" : "%1$s、%2$s、%3$s 和 %4$s", "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s、%2$s、%3$s、%4$s 和 %5$s", - "Education Edition" : "教育版", + "Education bundle" : "教育組合包", "Enterprise bundle" : "企業組合包", "Groupware bundle" : "協作組合包", "Hub bundle" : "Hub 套裝", @@ -36,6 +36,7 @@ "Server version %s or higher is required." : "需要伺服器版本 %s 或更高", "Server version %s or lower is required." : "需要伺服器版本 %s 或更低", "Logged in account must be an admin, a sub admin or gotten special right to access this setting" : "登入帳號必須為管理員、子管理員或有可存取此設定的特殊權限的使用者", + "Your current IP address doesn’t allow you to perform admin actions" : "您目前的 IP 位置不允許您執行管理動作", "Logged in account must be an admin or sub admin" : "登入的帳號必須要是管理員或是子管理員", "Logged in account must be an admin" : "登入的帳號必須有管理員權限", "Wiping of device %s has started" : "已開始抹除裝置 %s ", @@ -78,14 +79,21 @@ "seconds ago" : "幾秒前", "Empty file" : "空檔案", "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "名為 %s 的模組不存在，請在應用程式設定中啟用，或是聯絡系統管理員", + "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」是禁止的檔案或資料夾名稱前綴。", + "\"%1$s\" is not allowed inside a file or folder name." : "「%1$s」不允許出現在檔案或資料夾名稱中。", + "\"%1$s\" is a forbidden file type." : "「%1$s」是禁止的檔案類型。", + "Filenames must not end with \"%1$s\"." : "檔案名稱不能以「%1$s」結尾。", + "Invalid parent path" : "無效的上層路徑", "File already exists" : "檔案已存在", "Invalid path" : "無效的路徑", "Failed to create file from template" : "無法從範本建立檔案", "Templates" : "範本", - "File name is a reserved word" : "檔案名稱是保留字", - "File name contains at least one invalid character" : "檔案名稱含有不允許的字元", - "File name is too long" : "檔案名稱太長", - "Dot files are not allowed" : "不允許小數點開頭的檔案", + "Path contains invalid segments" : "路徑包含無效的部份", + "Filename is a reserved word" : "檔案名稱是保留字", + "Filename contains at least one invalid character" : "檔案名稱包含了至少一個無效的字元", + "Filename is too long" : "檔案名稱太長", "Empty filename is not allowed" : "不允許空白的檔名", "App \"%s\" cannot be installed because appinfo file cannot be read." : "應用程式 \"%s\" 無法安裝，因為無法讀取 appinfo 檔案。", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "應用程式 \"%s\" 無法安裝，因為該應用程式不相容於目前版本的伺服器。", @@ -137,22 +145,56 @@ "Sharing backend %s must implement the interface OCP\\Share_Backend" : "分享後端 %s 必須實作 OCP\\Share_Backend 界面", "Sharing backend %s not found" : "找不到分享後端 %s", "Sharing backend for %s not found" : "找不到 %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." : "點下方連結開啟", + "Open »%s«" : "開啟 »%s«", + "%1$s via %2$s" : "%1$s 由 %2$s", "%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«", - "%1$s via %2$s" : "%1$s 由 %2$s", + "Passwords are enforced for link and mail shares" : "連結與郵件分享強制使用密碼", + "SharedWith is not a valid user" : "SharedWith 不是有效的使用者", + "SharedWith is not a valid group" : "SharedWith 不是有效的群組", + "SharedWith should be empty" : "SharedWith 應該為空", + "SharedWith should not be empty" : "SharedWith 不應為空", + "SharedWith is not a valid circle" : "SharedWith 不是有效的小圈圈", + "Unknown share type" : "未知的分享類型", + "SharedBy should be set" : "應該設定 SharedBy", + "Cannot share with yourself" : "無法與您自己分享", + "Path should be set" : "應該設定路徑", + "Path should be either a file or a folder" : "路徑應為檔案或資料夾", + "You cannot share your root folder" : "您無法分享您的根資料夾", "You are not allowed to share %s" : "你不被允許分享 %s", + "A share requires permissions" : "分享需要權限", "Cannot increase permissions of %s" : "無法增加 %s 的權限", + "Shares need at least read permissions" : "分享需要至少讀取的權限", "Files cannot be shared with delete permissions" : "無法分享具有刪除權限的檔案", "Files cannot be shared with create permissions" : "無法分享具有新建權限的檔案", "Expiration date is in the past" : "到期日為過去的日期", + "Expiration date is enforced" : "有效日期為強制要求", "_Cannot set expiration date more than %n day in the future_::_Cannot set expiration date more than %n days in the future_" : ["無法設定到期日超過未來%n天"], "Sharing is only allowed with group members" : "僅允許與群組成員分享", "Sharing %s failed, because this item is already shared with the account %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." : "點下方連結開啟", + "Group sharing is now allowed" : "現在允許群組分享", + "Sharing is only allowed within your own groups" : "僅允許與您自己的群組分享", + "Path is already shared with this group" : "路徑已與此群組分享", + "Link sharing is not allowed" : "不允許連結分享", + "Public upload is not allowed" : "不允許公開上傳", + "Path contains files shared with you" : "路徑包含與您分享的檔案", + "Sharing is disabled" : "已停用分享", + "Sharing is disabled for you" : "您已停用分享", + "Cannot share with the share owner" : "無法與分享擁有者分享", + "Share does not have a full ID" : "分享並無完整 ID", + "Cannot change share type" : "無法變更分享類型", + "Can only update recipient on user shares" : "僅能更新使用者分享的收件者", + "Cannot enable sending the password by Talk with an empty password" : "若密碼為空，則無法啟用透過 Talk 傳送密碼", + "Cannot enable sending the password by Talk without setting a new password" : "若未設定新密碼，則無法啟用透過 Talk 傳送密碼", + "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 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." : "未建立使用者，因為已達使用者上限。請檢查您的通知以取得更多資訊。", @@ -250,7 +292,7 @@ "Your data directory must be an absolute path." : "您的 data 目錄必須是絕對路徑。", "Check the value of \"datadirectory\" in your configuration." : "請檢查您設定檔中「datadirectory」的值。", "Your data directory is invalid." : "您的 data 目錄無效。", - "Ensure there is a file called \".ocdata\" in the root of the data directory." : "請確保資料目錄最上層有一個 \".ocdata\" 檔案", + "Ensure there is a file called \"%1$s\" in the root of the data directory. It should have the content: \"%2$s\"" : "請確保資料目錄最上層有一個「%1$s」檔案。其應有內容：「%2$s」", "Action \"%s\" not supported or implemented." : "操作 \"%s\" 並未支援，或是尚未實作", "Authentication failed, wrong token or provider ID given" : "認證失敗，提供了錯誤的 token 或是 provider ID", "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "欠缺完成請求所需的參數： \"%s\"", @@ -268,7 +310,7 @@ "The audio to transcribe" : "要轉錄的音訊", "Transcription" : "轉錄", "The transcribed text" : "已轉錄的文字", - "ContextWrite" : "ContextWrite", + "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" : "展現您想模仿的寫作風格", @@ -290,7 +332,7 @@ "Output images" : "輸出影像", "The generated images" : "產生的影像", "Free text to text prompt" : "文字提示的自由文字", - "Runs an arbitrary prompt through a language model that retuns a reply" : "透過回傳回覆的語言模型執行任意提示", + "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" : "描述您希望助理執行的任務或提出問題", "Generated reply" : "已產生的回覆", "The generated text from the assistant" : "從助理產生的文字", @@ -333,15 +375,28 @@ "The original text to extract topics from" : "用來擷取主題的原始文字", "Topics" : "主題", "The list of extracted topics" : "擷取的主題清單", + "Translate" : "翻譯", + "Translate text from one language to another" : "從一個語言翻譯成其他語言的文字", + "Origin text" : "原始文字", + "The text to translate" : "要翻譯的文字", + "Origin language" : "原始語言", + "The language of the origin text" : "原始文字語言", + "Target language" : "目標語言", + "The desired language to translate the origin text in" : "要翻譯原始文字成什麼語言", + "Result" : "結果", + "The translated text" : "已翻譯的文字", "Free prompt" : "免費提示詞", "Runs an arbitrary prompt through the language model." : "透過語言模型執行任意提示詞。", "Generate headline" : "產生標題", "Summarizes text by reducing its length without losing key information." : "透過減少文字長度來總結而不遺失關鍵資訊。", "Extracts topics from a text and outputs them separated by commas." : "從文字中擷取主題並輸出，然後用逗號分隔。", - "404" : "404", + "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" : "未知的使用者", @@ -360,9 +415,8 @@ "Username must not consist of dots only" : "使用者名稱不能只包含小數點", "Username is invalid because files already exist for this user" : "使用者名稱無效，因為使用者的檔案已經存在", "User disabled" : "使用者已停用", - "PostgreSQL >= 9 required." : "需要 PostgreSQL 版本 >= 9。", - "Please upgrade your database version." : "請升級您的資料庫版本。", "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 ，以免其他使用者讀取目錄列表" + "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/Activity/ActivitySettingsAdapter.php b/lib/private/Activity/ActivitySettingsAdapter.php index bc0e60c1acb..5579685ccb8 100644 --- a/lib/private/Activity/ActivitySettingsAdapter.php +++ b/lib/private/Activity/ActivitySettingsAdapter.php @@ -17,12 +17,10 @@ use OCP\IL10N; * class based one */ class ActivitySettingsAdapter extends ActivitySettings { - private $oldSettings; - private $l10n; - - public function __construct(ISetting $oldSettings, IL10N $l10n) { - $this->oldSettings = $oldSettings; - $this->l10n = $l10n; + public function __construct( + private ISetting $oldSettings, + private IL10N $l10n + ) { } public function getIdentifier() { diff --git a/lib/private/Activity/Event.php b/lib/private/Activity/Event.php index 97ab7d1c935..02cfd758058 100644 --- a/lib/private/Activity/Event.php +++ b/lib/private/Activity/Event.php @@ -259,7 +259,7 @@ class Event implements IEvent { } /** - * @return array[] + * @return array<string, array<string, string>> * @since 11.0.0 */ public function getRichSubjectParameters(): array { @@ -335,7 +335,7 @@ class Event implements IEvent { } /** - * @return array[] + * @return array<string, array<string, string>> * @since 11.0.0 */ public function getRichMessageParameters(): array { diff --git a/lib/private/Activity/Manager.php b/lib/private/Activity/Manager.php index 8b60dc49ec9..54d50a47dcb 100644 --- a/lib/private/Activity/Manager.php +++ b/lib/private/Activity/Manager.php @@ -291,7 +291,7 @@ class Manager implements IManager { public function isFormattingFilteredObject(): bool { return $this->formattingObjectType !== null && $this->formattingObjectId !== null && $this->formattingObjectType === $this->request->getParam('object_type') - && $this->formattingObjectId === (int) $this->request->getParam('object_id'); + && $this->formattingObjectId === (int)$this->request->getParam('object_id'); } /** @@ -344,7 +344,7 @@ class Manager implements IManager { * @throws \UnexpectedValueException If the token is invalid, does not exist or is not unique */ protected function getUserFromToken(): string { - $token = (string) $this->request->getParam('token', ''); + $token = (string)$this->request->getParam('token', ''); if (strlen($token) !== 30) { throw new \UnexpectedValueException('The token is invalid'); } diff --git a/lib/private/AllConfig.php b/lib/private/AllConfig.php index d05fe440202..f08e5125a47 100644 --- a/lib/private/AllConfig.php +++ b/lib/private/AllConfig.php @@ -6,7 +6,6 @@ */ namespace OC; -use Doctrine\DBAL\Platforms\OraclePlatform; use OCP\Cache\CappedMemoryCache; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IConfig; @@ -108,7 +107,7 @@ class AllConfig implements IConfig { * @since 16.0.0 */ public function getSystemValueBool(string $key, bool $default = false): bool { - return (bool) $this->getSystemValue($key, $default); + return (bool)$this->getSystemValue($key, $default); } /** @@ -122,7 +121,7 @@ class AllConfig implements IConfig { * @since 16.0.0 */ public function getSystemValueInt(string $key, int $default = 0): int { - return (int) $this->getSystemValue($key, $default); + return (int)$this->getSystemValue($key, $default); } /** @@ -136,7 +135,7 @@ class AllConfig implements IConfig { * @since 16.0.0 */ public function getSystemValueString(string $key, string $default = ''): string { - return (string) $this->getSystemValue($key, $default); + return (string)$this->getSystemValue($key, $default); } /** @@ -237,16 +236,16 @@ class AllConfig implements IConfig { $this->fixDIInit(); if ($appName === 'settings' && $key === 'email') { - $value = strtolower((string) $value); + $value = strtolower((string)$value); } $prevValue = $this->getUserValue($userId, $appName, $key, null); if ($prevValue !== null) { - if ($prevValue === (string)$value) { - return; - } elseif ($preCondition !== null && $prevValue !== (string)$preCondition) { + if ($preCondition !== null && $prevValue !== (string)$preCondition) { throw new PreConditionNotMetException(); + } elseif ($prevValue === (string)$value) { + return; } else { $qb = $this->connection->getQueryBuilder(); $qb->update('preferences') @@ -383,9 +382,9 @@ class AllConfig implements IConfig { * @param ?string $userId the user ID to get the app configs from * @psalm-return array<string, array<string, string>> * @return array[] - 2 dimensional array with the following structure: - * [ $appId => - * [ $key => $value ] - * ] + * [ $appId => + * [ $key => $value ] + * ] */ public function getAllUserValues(?string $userId): array { if (isset($this->userCache[$userId])) { @@ -463,14 +462,14 @@ class AllConfig implements IConfig { * @param string $appName the app to get the user for * @param string $key the key to get the user for * @param string $value the value to get the user for - * @return array of user IDs + * @return list<string> of user IDs */ public function getUsersForUserValue($appName, $key, $value) { // TODO - FIXME $this->fixDIInit(); $qb = $this->connection->getQueryBuilder(); - $configValueColumn = ($this->connection->getDatabasePlatform() instanceof OraclePlatform) + $configValueColumn = ($this->connection->getDatabaseProvider() === IDBConnection::PLATFORM_ORACLE) ? $qb->expr()->castColumn('configvalue', IQueryBuilder::PARAM_STR) : 'configvalue'; $result = $qb->select('userid') @@ -497,7 +496,7 @@ class AllConfig implements IConfig { * @param string $appName the app to get the user for * @param string $key the key to get the user for * @param string $value the value to get the user for - * @return array of user IDs + * @return list<string> of user IDs */ public function getUsersForUserValueCaseInsensitive($appName, $key, $value) { // TODO - FIXME @@ -509,7 +508,7 @@ class AllConfig implements IConfig { } $qb = $this->connection->getQueryBuilder(); - $configValueColumn = ($this->connection->getDatabasePlatform() instanceof OraclePlatform) + $configValueColumn = ($this->connection->getDatabaseProvider() === IDBConnection::PLATFORM_ORACLE) ? $qb->expr()->castColumn('configvalue', IQueryBuilder::PARAM_STR) : 'configvalue'; diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php index 52a88a724ff..4ffddef98c3 100644 --- a/lib/private/App/AppManager.php +++ b/lib/private/App/AppManager.php @@ -6,7 +6,6 @@ */ namespace OC\App; -use InvalidArgumentException; use OC\AppConfig; use OC\AppFramework\Bootstrap\Coordinator; use OC\ServerNotAvailableException; @@ -24,6 +23,7 @@ use OCP\ICacheFactory; use OCP\IConfig; use OCP\IGroup; use OCP\IGroupManager; +use OCP\INavigationManager; use OCP\IURLGenerator; use OCP\IUser; use OCP\IUserSession; @@ -67,6 +67,7 @@ class AppManager implements IAppManager { private ?AppConfig $appConfig = null; private ?IURLGenerator $urlGenerator = null; + private ?INavigationManager $navigationManager = null; /** * Be extremely careful when injecting classes here. The AppManager is used by the installer, @@ -82,6 +83,13 @@ class AppManager implements IAppManager { ) { } + private function getNavigationManager(): INavigationManager { + if ($this->navigationManager === null) { + $this->navigationManager = \OCP\Server::get(INavigationManager::class); + } + return $this->navigationManager; + } + public function getAppIcon(string $appId, bool $dark = false): ?string { $possibleIcons = $dark ? [$appId . '-dark.svg', 'app-dark.svg'] : [$appId . '.svg', 'app.svg']; $icon = null; @@ -148,6 +156,37 @@ class AppManager implements IAppManager { } /** + * Get a list of all apps in the apps folder + * + * @return list<string> an array of app names (string IDs) + */ + public function getAllAppsInAppsFolders(): array { + $apps = []; + + foreach (\OC::$APPSROOTS as $apps_dir) { + if (!is_readable($apps_dir['path'])) { + $this->logger->warning('unable to read app folder : ' . $apps_dir['path'], ['app' => 'core']); + continue; + } + $dh = opendir($apps_dir['path']); + + if (is_resource($dh)) { + while (($file = readdir($dh)) !== false) { + if ( + $file[0] != '.' && + is_dir($apps_dir['path'] . '/' . $file) && + is_file($apps_dir['path'] . '/' . $file . '/appinfo/info.xml') + ) { + $apps[] = $file; + } + } + } + } + + return array_values(array_unique($apps)); + } + + /** * List all apps enabled for a user * * @param \OCP\IUser $user @@ -639,11 +678,9 @@ class AppManager implements IAppManager { /** * Get the directory for the given app. * - * @param string $appId - * @return string * @throws AppPathNotFoundException if app folder can't be found */ - public function getAppPath($appId) { + public function getAppPath(string $appId): string { $appPath = \OC_App::getAppPath($appId); if ($appPath === false) { throw new AppPathNotFoundException('Could not find path for ' . $appId); @@ -820,59 +857,58 @@ class AppManager implements IAppManager { return $this->defaultEnabled; } + /** + * @inheritdoc + */ public function getDefaultAppForUser(?IUser $user = null, bool $withFallbacks = true): string { - // Set fallback to always-enabled files app - $appId = $withFallbacks ? 'files' : ''; - $defaultApps = explode(',', $this->config->getSystemValueString('defaultapp', '')); - $defaultApps = array_filter($defaultApps); - - $user ??= $this->userSession->getUser(); - - if ($user !== null) { - $userDefaultApps = explode(',', $this->config->getUserValue($user->getUID(), 'core', 'defaultapp')); - $defaultApps = array_filter(array_merge($userDefaultApps, $defaultApps)); - if (empty($defaultApps) && $withFallbacks) { - /* Fallback on user defined apporder */ - $customOrders = json_decode($this->config->getUserValue($user->getUID(), 'core', 'apporder', '[]'), true, flags:JSON_THROW_ON_ERROR); - if (!empty($customOrders)) { - // filter only entries with app key (when added using closures or NavigationManager::add the app is not guranteed to be set) - $customOrders = array_filter($customOrders, fn ($entry) => isset($entry['app'])); - // sort apps by order - usort($customOrders, fn ($a, $b) => $a['order'] - $b['order']); - // set default apps to sorted apps - $defaultApps = array_map(fn ($entry) => $entry['app'], $customOrders); - } - } - } + $id = $this->getNavigationManager()->getDefaultEntryIdForUser($user, $withFallbacks); + $entry = $this->getNavigationManager()->get($id); + return (string)$entry['app']; + } - if (empty($defaultApps) && $withFallbacks) { - $defaultApps = ['dashboard','files']; - } + /** + * @inheritdoc + */ + public function getDefaultApps(): array { + $ids = $this->getNavigationManager()->getDefaultEntryIds(); + + return array_values(array_unique(array_map(function (string $id) { + $entry = $this->getNavigationManager()->get($id); + return (string)$entry['app']; + }, $ids))); + } - // Find the first app that is enabled for the current user + /** + * @inheritdoc + */ + public function setDefaultApps(array $defaultApps): void { + $entries = $this->getNavigationManager()->getAll(); + $ids = []; foreach ($defaultApps as $defaultApp) { - $defaultApp = \OC_App::cleanAppId(strip_tags($defaultApp)); - if ($this->isEnabledForUser($defaultApp, $user)) { - $appId = $defaultApp; - break; + foreach ($entries as $entry) { + if ((string)$entry['app'] === $defaultApp) { + $ids[] = (string)$entry['id']; + break; + } } } - - return $appId; - } - - public function getDefaultApps(): array { - return explode(',', $this->config->getSystemValueString('defaultapp', 'dashboard,files')); + $this->getNavigationManager()->setDefaultEntryIds($ids); } - public function setDefaultApps(array $defaultApps): void { - foreach ($defaultApps as $app) { - if (!$this->isInstalled($app)) { - $this->logger->debug('Can not set not installed app as default app', ['missing_app' => $app]); - throw new InvalidArgumentException('App is not installed'); + public function isBackendRequired(string $backend): bool { + foreach ($this->appInfos as $appInfo) { + foreach ($appInfo['dependencies']['backend'] as $appBackend) { + if ($backend === $appBackend) { + return true; + } } } - $this->config->setSystemValue('defaultapp', join(',', $defaultApps)); + return false; + } + + public function cleanAppId(string $app): string { + // FIXME should list allowed characters instead + return str_replace(['<', '>', '"', "'", '\0', '/', '\\', '..'], '', $app); } } diff --git a/lib/private/App/AppStore/Bundles/EducationBundle.php b/lib/private/App/AppStore/Bundles/EducationBundle.php index a08d707b021..6770d4a7091 100644 --- a/lib/private/App/AppStore/Bundles/EducationBundle.php +++ b/lib/private/App/AppStore/Bundles/EducationBundle.php @@ -10,7 +10,7 @@ class EducationBundle extends Bundle { * {@inheritDoc} */ public function getName() { - return $this->l10n->t('Education Edition'); + return $this->l10n->t('Education bundle'); } /** @@ -24,6 +24,7 @@ class EducationBundle extends Bundle { 'announcementcenter', 'quota_warning', 'user_saml', + 'whiteboard', ]; } } diff --git a/lib/private/App/AppStore/Bundles/PublicSectorBundle.php b/lib/private/App/AppStore/Bundles/PublicSectorBundle.php index edb86fb5ca7..158d525bdcc 100644 --- a/lib/private/App/AppStore/Bundles/PublicSectorBundle.php +++ b/lib/private/App/AppStore/Bundles/PublicSectorBundle.php @@ -28,6 +28,7 @@ class PublicSectorBundle extends Bundle { 'richdocuments', 'admin_audit', 'files_retention', + 'whiteboard', ]; } diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php index 508a5dae8f7..4ef0b1eb51b 100644 --- a/lib/private/App/AppStore/Fetcher/AppFetcher.php +++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php @@ -53,7 +53,8 @@ class AppFetcher extends Fetcher { /** @var mixed[] $response */ $response = parent::fetch($ETag, $content); - if (empty($response)) { + if (!isset($response['data']) || $response['data'] === null) { + $this->logger->warning('Response from appstore is invalid, apps could not be retrieved. Try again later.', ['app' => 'appstoreFetcher']); return []; } @@ -148,11 +149,22 @@ class AppFetcher extends Fetcher { $this->ignoreMaxVersion = $ignoreMaxVersion; } - - public function get($allowUnstable = false) { + public function get($allowUnstable = false): array { $allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git'; + $appStoreEnabled = $this->config->getSystemValueBool('appstoreenabled', true); + $internetAvailable = $this->config->getSystemValueBool('has_internet_connection', true); + + if (!$appStoreEnabled || !$internetAvailable) { + $this->logger->info('AppStore is disabled or this instance has no Internet connection', ['app' => 'appstoreFetcher']); + return []; + } + $apps = parent::get($allowPreReleases); + if (empty($apps)) { + $this->logger->warning('Could not get apps from the appstore', ['app' => 'appstoreFetcher']); + return []; + } $allowList = $this->config->getSystemValue('appsallowlist'); // If the admin specified a allow list, filter apps from the appstore diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php index ad76befc5fa..bc85be662df 100644 --- a/lib/private/App/AppStore/Fetcher/Fetcher.php +++ b/lib/private/App/AppStore/Fetcher/Fetcher.php @@ -18,6 +18,7 @@ use Psr\Log\LoggerInterface; abstract class Fetcher { public const INVALIDATE_AFTER_SECONDS = 3600; + public const INVALIDATE_AFTER_SECONDS_UNSTABLE = 900; public const RETRY_AFTER_FAILURE_SECONDS = 300; public const APP_STORE_URL = 'https://apps.nextcloud.com/api/v1'; @@ -86,7 +87,8 @@ abstract class Fetcher { $response = $client->get($this->getEndpoint(), $options); } catch (ConnectException $e) { $this->config->setAppValue('settings', 'appstore-fetcher-lastFailure', (string)time()); - throw $e; + $this->logger->error('Failed to connect to the app store', ['exception' => $e]); + return []; } $responseJson = []; @@ -132,12 +134,17 @@ abstract class Fetcher { $file = $rootFolder->getFile($this->fileName); $jsonBlob = json_decode($file->getContent(), true); - // Always get latests apps info if $allowUnstable - if (!$allowUnstable && is_array($jsonBlob)) { + if (is_array($jsonBlob)) { // No caching when the version has been updated if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) { // If the timestamp is older than 3600 seconds request the files new - if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) { + $invalidateAfterSeconds = self::INVALIDATE_AFTER_SECONDS; + + if ($allowUnstable) { + $invalidateAfterSeconds = self::INVALIDATE_AFTER_SECONDS_UNSTABLE; + } + + if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - $invalidateAfterSeconds)) { return $jsonBlob['data']; } @@ -160,11 +167,6 @@ abstract class Fetcher { return []; } - // Don't store the apps request file - if ($allowUnstable) { - return $responseJson['data']; - } - $file->putContent(json_encode($responseJson)); return json_decode($file->getContent(), true)['data']; } catch (ConnectException $e) { diff --git a/lib/private/App/DependencyAnalyzer.php b/lib/private/App/DependencyAnalyzer.php index d963c74de79..72b38ca12c7 100644 --- a/lib/private/App/DependencyAnalyzer.php +++ b/lib/private/App/DependencyAnalyzer.php @@ -66,7 +66,7 @@ class DependencyAnalyzer { * @param string $first * @param string $second * @return string[] first element is the first version, second element is the - * second version + * second version */ private function normalizeVersions($first, $second) { $first = explode('.', $first); diff --git a/lib/private/App/InfoParser.php b/lib/private/App/InfoParser.php index d29b1d6596d..d0e67b82f21 100644 --- a/lib/private/App/InfoParser.php +++ b/lib/private/App/InfoParser.php @@ -113,6 +113,12 @@ class InfoParser { if (!array_key_exists('personal-section', $array['settings'])) { $array['settings']['personal-section'] = []; } + if (!array_key_exists('dependencies', $array)) { + $array['dependencies'] = []; + } + if (!array_key_exists('backend', $array['dependencies'])) { + $array['dependencies']['backend'] = []; + } if (array_key_exists('types', $array)) { if (is_array($array['types'])) { @@ -177,10 +183,12 @@ class InfoParser { if (isset($array['settings']['personal-section']) && !is_array($array['settings']['personal-section'])) { $array['settings']['personal-section'] = [$array['settings']['personal-section']]; } - if (isset($array['navigations']['navigation']) && $this->isNavigationItem($array['navigations']['navigation'])) { $array['navigations']['navigation'] = [$array['navigations']['navigation']]; } + if (isset($array['dependencies']['backend']) && !is_array($array['dependencies']['backend'])) { + $array['dependencies']['backend'] = [$array['dependencies']['backend']]; + } if ($this->cache !== null) { $this->cache->set($fileCacheKey, json_encode($array)); @@ -215,7 +223,7 @@ class InfoParser { $totalElement = count($xml->{$element}); if (!isset($array[$element])) { - $array[$element] = $totalElement > 1 ? [] : ""; + $array[$element] = $totalElement > 1 ? [] : ''; } /** @var \SimpleXMLElement $node */ // Has attributes diff --git a/lib/private/AppConfig.php b/lib/private/AppConfig.php index d046557e42c..f6361ff2ac6 100644 --- a/lib/private/AppConfig.php +++ b/lib/private/AppConfig.php @@ -748,11 +748,11 @@ class AppConfig implements IAppConfig { try { $insert = $this->connection->getQueryBuilder(); $insert->insert('appconfig') - ->setValue('appid', $insert->createNamedParameter($app)) - ->setValue('lazy', $insert->createNamedParameter(($lazy) ? 1 : 0, IQueryBuilder::PARAM_INT)) - ->setValue('type', $insert->createNamedParameter($type, IQueryBuilder::PARAM_INT)) - ->setValue('configkey', $insert->createNamedParameter($key)) - ->setValue('configvalue', $insert->createNamedParameter($value)); + ->setValue('appid', $insert->createNamedParameter($app)) + ->setValue('lazy', $insert->createNamedParameter(($lazy) ? 1 : 0, IQueryBuilder::PARAM_INT)) + ->setValue('type', $insert->createNamedParameter($type, IQueryBuilder::PARAM_INT)) + ->setValue('configkey', $insert->createNamedParameter($key)) + ->setValue('configvalue', $insert->createNamedParameter($value)); $insert->executeStatement(); $inserted = true; } catch (DBException $e) { @@ -807,11 +807,11 @@ class AppConfig implements IAppConfig { $update = $this->connection->getQueryBuilder(); $update->update('appconfig') - ->set('configvalue', $update->createNamedParameter($value)) - ->set('lazy', $update->createNamedParameter(($lazy) ? 1 : 0, IQueryBuilder::PARAM_INT)) - ->set('type', $update->createNamedParameter($type, IQueryBuilder::PARAM_INT)) - ->where($update->expr()->eq('appid', $update->createNamedParameter($app))) - ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key))); + ->set('configvalue', $update->createNamedParameter($value)) + ->set('lazy', $update->createNamedParameter(($lazy) ? 1 : 0, IQueryBuilder::PARAM_INT)) + ->set('type', $update->createNamedParameter($type, IQueryBuilder::PARAM_INT)) + ->where($update->expr()->eq('appid', $update->createNamedParameter($app))) + ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key))); $update->executeStatement(); } @@ -869,9 +869,9 @@ class AppConfig implements IAppConfig { $update = $this->connection->getQueryBuilder(); $update->update('appconfig') - ->set('type', $update->createNamedParameter($type, IQueryBuilder::PARAM_INT)) - ->where($update->expr()->eq('appid', $update->createNamedParameter($app))) - ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key))); + ->set('type', $update->createNamedParameter($type, IQueryBuilder::PARAM_INT)) + ->where($update->expr()->eq('appid', $update->createNamedParameter($app))) + ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key))); $update->executeStatement(); $this->valueTypes[$app][$key] = $type; @@ -927,10 +927,10 @@ class AppConfig implements IAppConfig { $update = $this->connection->getQueryBuilder(); $update->update('appconfig') - ->set('type', $update->createNamedParameter($type, IQueryBuilder::PARAM_INT)) - ->set('configvalue', $update->createNamedParameter($value)) - ->where($update->expr()->eq('appid', $update->createNamedParameter($app))) - ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key))); + ->set('type', $update->createNamedParameter($type, IQueryBuilder::PARAM_INT)) + ->set('configvalue', $update->createNamedParameter($value)) + ->where($update->expr()->eq('appid', $update->createNamedParameter($app))) + ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key))); $update->executeStatement(); $this->valueTypes[$app][$key] = $type; @@ -962,9 +962,9 @@ class AppConfig implements IAppConfig { $update = $this->connection->getQueryBuilder(); $update->update('appconfig') - ->set('lazy', $update->createNamedParameter($lazy ? 1 : 0, IQueryBuilder::PARAM_INT)) - ->where($update->expr()->eq('appid', $update->createNamedParameter($app))) - ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key))); + ->set('lazy', $update->createNamedParameter($lazy ? 1 : 0, IQueryBuilder::PARAM_INT)) + ->where($update->expr()->eq('appid', $update->createNamedParameter($app))) + ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key))); $update->executeStatement(); // At this point, it is a lot safer to clean cache @@ -1075,8 +1075,8 @@ class AppConfig implements IAppConfig { $this->assertParams($app, $key); $qb = $this->connection->getQueryBuilder(); $qb->delete('appconfig') - ->where($qb->expr()->eq('appid', $qb->createNamedParameter($app))) - ->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key))); + ->where($qb->expr()->eq('appid', $qb->createNamedParameter($app))) + ->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key))); $qb->executeStatement(); unset($this->lazyCache[$app][$key]); @@ -1094,7 +1094,7 @@ class AppConfig implements IAppConfig { $this->assertParams($app); $qb = $this->connection->getQueryBuilder(); $qb->delete('appconfig') - ->where($qb->expr()->eq('appid', $qb->createNamedParameter($app))); + ->where($qb->expr()->eq('appid', $qb->createNamedParameter($app))); $qb->executeStatement(); $this->clearCache(); @@ -1378,7 +1378,7 @@ class AppConfig implements IAppConfig { * @return array<string, string|int|float|bool|array> */ private function formatAppValues(string $app, array $values, ?bool $lazy = null): array { - foreach($values as $key => $value) { + foreach ($values as $key => $value) { try { $type = $this->getValueType($app, $key, $lazy); } catch (AppConfigUnknownKeyException $e) { diff --git a/lib/private/AppFramework/App.php b/lib/private/AppFramework/App.php index 9f9fb32dbcb..c5f61d7e938 100644 --- a/lib/private/AppFramework/App.php +++ b/lib/private/AppFramework/App.php @@ -37,7 +37,7 @@ class App { * namespace tag or uppercasing the appid's first letter * @param string $appId the app id * @param string $topNamespace the namespace which should be prepended to - * the transformed app id, defaults to OCA\ + * the transformed app id, defaults to OCA\ * @return string the starting namespace for the app */ public static function buildAppNamespace(string $appId, string $topNamespace = 'OCA\\'): string { diff --git a/lib/private/AppFramework/Bootstrap/RegistrationContext.php b/lib/private/AppFramework/Bootstrap/RegistrationContext.php index df03d59ebfa..d7a380f9e1d 100644 --- a/lib/private/AppFramework/Bootstrap/RegistrationContext.php +++ b/lib/private/AppFramework/Bootstrap/RegistrationContext.php @@ -26,6 +26,7 @@ use OCP\Dashboard\IWidget; use OCP\EventDispatcher\IEventDispatcher; use OCP\Files\Template\ICustomTemplateProvider; use OCP\Http\WellKnown\IHandler; +use OCP\Mail\Provider\IProvider as IMailProvider; use OCP\Notification\INotifier; use OCP\Profile\ILinkAction; use OCP\Search\IProvider; @@ -148,6 +149,9 @@ class RegistrationContext { /** @var ServiceRegistration<\OCP\TaskProcessing\ITaskType>[] */ private array $taskProcessingTaskTypes = []; + + /** @var ServiceRegistration<IMailProvider>[] */ + private $mailProviders = []; public function __construct(LoggerInterface $logger) { $this->logger = $logger; @@ -411,6 +415,13 @@ class RegistrationContext { $taskProcessingTaskTypeClass ); } + + public function registerMailProvider(string $class): void { + $this->context->registerMailProvider( + $this->appId, + $class + ); + } }; } @@ -527,10 +538,10 @@ class RegistrationContext { public function registerTalkBackend(string $appId, string $backend) { // Some safeguards for invalid registrations if ($appId !== 'spreed') { - throw new RuntimeException("Only the Talk app is allowed to register a Talk backend"); + throw new RuntimeException('Only the Talk app is allowed to register a Talk backend'); } if ($this->talkBackendRegistration !== null) { - throw new RuntimeException("There can only be one Talk backend"); + throw new RuntimeException('There can only be one Talk backend'); } $this->talkBackendRegistration = new ServiceRegistration($appId, $backend); @@ -603,6 +614,12 @@ class RegistrationContext { public function registerTaskProcessingTaskType(string $appId, string $taskProcessingTaskTypeClass) { $this->taskProcessingTaskTypes[] = new ServiceRegistration($appId, $taskProcessingTaskTypeClass); } + /** + * @psalm-param class-string<IMailProvider> $migratorClass + */ + public function registerMailProvider(string $appId, string $class): void { + $this->mailProviders[] = new ServiceRegistration($appId, $class); + } /** * @param App[] $apps @@ -948,4 +965,11 @@ class RegistrationContext { public function getTaskProcessingTaskTypes(): array { return $this->taskProcessingTaskTypes; } + + /** + * @return ServiceRegistration<IMailProvider>[] + */ + public function getMailProviders(): array { + return $this->mailProviders; + } } diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php index 4add17396b0..a96e050c0e6 100644 --- a/lib/private/AppFramework/DependencyInjection/DIContainer.php +++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php @@ -36,6 +36,7 @@ use OCP\Files\IAppData; use OCP\Group\ISubAdmin; use OCP\IConfig; use OCP\IDBConnection; +use OCP\IGroupManager; use OCP\IInitialStateService; use OCP\IL10N; use OCP\ILogger; @@ -46,6 +47,7 @@ use OCP\ISession; use OCP\IURLGenerator; use OCP\IUserSession; use OCP\Security\Bruteforce\IThrottler; +use OCP\Security\Ip\IRemoteAddress; use Psr\Container\ContainerInterface; use Psr\Log\LoggerInterface; @@ -207,7 +209,8 @@ class DIContainer extends SimpleContainer implements IAppContainer { $c->get(IRequest::class), $c->get(IControllerMethodReflector::class), $c->get(IUserSession::class), - $c->get(IThrottler::class) + $c->get(IThrottler::class), + $c->get(LoggerInterface::class) ) ); $dispatcher->registerMiddleware( @@ -226,19 +229,19 @@ class DIContainer extends SimpleContainer implements IAppContainer { $server->get(LoggerInterface::class), $c->get('AppName'), $server->getUserSession()->isLoggedIn(), - $this->getUserId() !== null && $server->getGroupManager()->isAdmin($this->getUserId()), - $server->getUserSession()->getUser() !== null && $server->query(ISubAdmin::class)->isSubAdmin($server->getUserSession()->getUser()), + $c->get(IGroupManager::class), + $c->get(ISubAdmin::class), $server->getAppManager(), $server->getL10N('lib'), $c->get(AuthorizedGroupMapper::class), - $server->get(IUserSession::class) + $server->get(IUserSession::class), + $c->get(IRemoteAddress::class), ); $dispatcher->registerMiddleware($securityMiddleware); $dispatcher->registerMiddleware( new OC\AppFramework\Middleware\Security\CSPMiddleware( $server->query(OC\Security\CSP\ContentSecurityPolicyManager::class), $server->query(OC\Security\CSP\ContentSecurityPolicyNonceManager::class), - $server->query(OC\Security\CSRF\CsrfTokenManager::class) ) ); $dispatcher->registerMiddleware( @@ -251,6 +254,7 @@ class DIContainer extends SimpleContainer implements IAppContainer { $c->get(IUserSession::class), $c->get(ITimeFactory::class), $c->get(\OC\Authentication\Token\IProvider::class), + $c->get(LoggerInterface::class), ) ); $dispatcher->registerMiddleware( @@ -284,7 +288,7 @@ class DIContainer extends SimpleContainer implements IAppContainer { new OC\AppFramework\Middleware\PublicShare\PublicShareMiddleware( $c->get(IRequest::class), $c->get(ISession::class), - $c->get(\OCP\IConfig::class), + $c->get(IConfig::class), $c->get(IThrottler::class) ) ); diff --git a/lib/private/AppFramework/Http/Dispatcher.php b/lib/private/AppFramework/Http/Dispatcher.php index bbb68972a41..b7952df8d19 100644 --- a/lib/private/AppFramework/Http/Dispatcher.php +++ b/lib/private/AppFramework/Http/Dispatcher.php @@ -55,9 +55,9 @@ class Dispatcher { /** * @param Http $protocol the http protocol with contains all status headers * @param MiddlewareDispatcher $middlewareDispatcher the dispatcher which - * runs the middleware + * runs the middleware * @param ControllerMethodReflector $reflector the reflector that is used to inject - * the arguments for the controller + * the arguments for the controller * @param IRequest $request the incoming request * @param IConfig $config * @param ConnectionAdapter $connection @@ -89,10 +89,10 @@ class Dispatcher { * Handles a request and calls the dispatcher on the controller * @param Controller $controller the controller which will be called * @param string $methodName the method name which will be called on - * the controller + * the controller * @return array $array[0] contains a string with the http main header, - * $array[1] contains headers in the form: $key => value, $array[2] contains - * the response output + * $array[1] contains headers in the form: $key => value, $array[2] contains + * the response output * @throws \Exception */ public function dispatch(Controller $controller, string $methodName): array { diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php index 0bd430545d4..4bbeabb7aae 100644 --- a/lib/private/AppFramework/Http/Request.php +++ b/lib/private/AppFramework/Http/Request.php @@ -38,6 +38,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { public const USER_AGENT_CHROME = '/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\)( Ubuntu Chromium\/[0-9.]+|) Chrome\/[0-9.]+ (Mobile Safari|Safari)\/[0-9.]+( (Vivaldi|Brave|OPR)\/[0-9.]+|)$/'; // Safari User Agent from http://www.useragentstring.com/pages/Safari/ public const USER_AGENT_SAFARI = '/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Version\/[0-9.]+ Safari\/[0-9.A-Z]+$/'; + public const USER_AGENT_SAFARI_MOBILE = '/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Version\/[0-9.]+ (Mobile\/[0-9.A-Z]+) Safari\/[0-9.A-Z]+$/'; // Android Chrome user agent: https://developers.google.com/chrome/mobile/docs/user-agent public const USER_AGENT_ANDROID_MOBILE_CHROME = '#Android.*Chrome/[.0-9]*#'; public const USER_AGENT_FREEBOX = '#^Mozilla/5\.0$#'; @@ -66,15 +67,15 @@ class Request implements \ArrayAccess, \Countable, IRequest { /** * @param array $vars An associative array with the following optional values: - * - array 'urlParams' the parameters which were matched from the URL - * - array 'get' the $_GET array - * - array|string 'post' the $_POST array or JSON string - * - array 'files' the $_FILES array - * - array 'server' the $_SERVER array - * - array 'env' the $_ENV array - * - array 'cookies' the $_COOKIE array - * - string 'method' the request method (GET, POST etc) - * - string|false 'requesttoken' the requesttoken or false when not available + * - array 'urlParams' the parameters which were matched from the URL + * - array 'get' the $_GET array + * - array|string 'post' the $_POST array or JSON string + * - array 'files' the $_FILES array + * - array 'server' the $_SERVER array + * - array 'env' the $_ENV array + * - array 'cookies' the $_COOKIE array + * - string 'method' the request method (GET, POST etc) + * - string|false 'requesttoken' the requesttoken or false when not available * @param IRequestId $requestId * @param IConfig $config * @param CsrfTokenManager|null $csrfTokenManager @@ -283,11 +284,11 @@ class Request implements \ArrayAccess, \Countable, IRequest { * In case of json requests the encoded json body is accessed * * @param string $key the key which you want to access in the URL Parameter - * placeholder, $_POST or $_GET array. - * The priority how they're returned is the following: - * 1. URL parameters - * 2. POST parameters - * 3. GET parameters + * placeholder, $_POST or $_GET array. + * The priority how they're returned is the following: + * 1. URL parameters + * 2. POST parameters + * 3. GET parameters * @param mixed $default If the key is not found, this value will be returned * @return mixed the content of the array */ @@ -426,6 +427,10 @@ class Request implements \ArrayAccess, \Countable, IRequest { return false; } + if ($this->getHeader('OCS-APIRequest') !== '') { + return true; + } + if (isset($this->items['get']['requesttoken'])) { $token = $this->items['get']['requesttoken']; } elseif (isset($this->items['post']['requesttoken'])) { @@ -832,7 +837,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { * Returns the overwritehost setting from the config if set and * if the overwrite condition is met * @return string|null overwritehost value or null if not defined or the defined condition - * isn't met + * isn't met */ private function getOverwriteHost() { if ($this->config->getSystemValueString('overwritehost') !== '' && $this->isOverwriteCondition()) { diff --git a/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php b/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php index 2b5acc8b75f..c9b51f26f34 100644 --- a/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php +++ b/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php @@ -23,7 +23,7 @@ class MiddlewareDispatcher { /** * @var int counter which tells us what middleware was executed once an - * exception occurs + * exception occurs */ private int $middlewareCounter; @@ -84,10 +84,10 @@ class MiddlewareDispatcher { * * @param Controller $controller the controller that is being called * @param string $methodName the name of the method that will be called on - * the controller + * the controller * @param \Exception $exception the thrown exception * @return Response a Response object if the middleware can handle the - * exception + * exception * @throws \Exception the passed in exception if it can't handle it */ public function afterException(Controller $controller, string $methodName, \Exception $exception): Response { @@ -109,7 +109,7 @@ class MiddlewareDispatcher { * * @param Controller $controller the controller that is being called * @param string $methodName the name of the method that will be called on - * the controller + * the controller * @param Response $response the generated response from the controller * @return Response a Response object */ diff --git a/lib/private/AppFramework/Middleware/PublicShare/PublicShareMiddleware.php b/lib/private/AppFramework/Middleware/PublicShare/PublicShareMiddleware.php index 41cba1aacd3..34291dfef10 100644 --- a/lib/private/AppFramework/Middleware/PublicShare/PublicShareMiddleware.php +++ b/lib/private/AppFramework/Middleware/PublicShare/PublicShareMiddleware.php @@ -6,8 +6,10 @@ namespace OC\AppFramework\Middleware\PublicShare; use OC\AppFramework\Middleware\PublicShare\Exceptions\NeedAuthenticationException; +use OCA\Files_Sharing\AppInfo\Application; use OCP\AppFramework\AuthPublicShareController; -use OCP\AppFramework\Http\NotFoundResponse; +use OCP\AppFramework\Http; +use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Middleware; use OCP\AppFramework\PublicShareController; use OCP\Files\NotFoundException; @@ -17,23 +19,13 @@ use OCP\ISession; use OCP\Security\Bruteforce\IThrottler; class PublicShareMiddleware extends Middleware { - /** @var IRequest */ - private $request; - /** @var ISession */ - private $session; - - /** @var IConfig */ - private $config; - - /** @var IThrottler */ - private $throttler; - - public function __construct(IRequest $request, ISession $session, IConfig $config, IThrottler $throttler) { - $this->request = $request; - $this->session = $session; - $this->config = $config; - $this->throttler = $throttler; + public function __construct( + private IRequest $request, + private ISession $session, + private IConfig $config, + private IThrottler $throttler + ) { } public function beforeController($controller, $methodName) { @@ -92,7 +84,9 @@ class PublicShareMiddleware extends Middleware { } if ($exception instanceof NotFoundException) { - return new NotFoundResponse(); + return new TemplateResponse(Application::APP_ID, 'sharenotfound', [ + 'message' => $exception->getMessage(), + ], 'guest', Http::STATUS_NOT_FOUND); } if ($controller instanceof AuthPublicShareController && $exception instanceof NeedAuthenticationException) { diff --git a/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php b/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php index 7b617b22e3c..10c8f8c7aee 100644 --- a/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php @@ -21,6 +21,7 @@ use OCP\AppFramework\Middleware; use OCP\IRequest; use OCP\ISession; use OCP\Security\Bruteforce\IThrottler; +use Psr\Log\LoggerInterface; use ReflectionMethod; /** @@ -30,7 +31,7 @@ use ReflectionMethod; * https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS */ class CORSMiddleware extends Middleware { - /** @var IRequest */ + /** @var IRequest */ private $request; /** @var ControllerMethodReflector */ private $reflector; @@ -42,7 +43,9 @@ class CORSMiddleware extends Middleware { public function __construct(IRequest $request, ControllerMethodReflector $reflector, Session $session, - IThrottler $throttler) { + IThrottler $throttler, + private readonly LoggerInterface $logger, + ) { $this->request = $request; $this->reflector = $reflector; $this->session = $session; @@ -103,6 +106,7 @@ class CORSMiddleware extends Middleware { if (!empty($reflectionMethod->getAttributes($attributeClass))) { + $this->logger->debug($reflectionMethod->getDeclaringClass()->getName() . '::' . $reflectionMethod->getName() . ' uses the @' . $annotationName . ' annotation and should use the #[' . $attributeClass . '] attribute instead'); return true; } diff --git a/lib/private/AppFramework/Middleware/Security/CSPMiddleware.php b/lib/private/AppFramework/Middleware/Security/CSPMiddleware.php index 2115c07c0fc..e88c9563c00 100644 --- a/lib/private/AppFramework/Middleware/Security/CSPMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/CSPMiddleware.php @@ -10,7 +10,6 @@ namespace OC\AppFramework\Middleware\Security; use OC\Security\CSP\ContentSecurityPolicyManager; use OC\Security\CSP\ContentSecurityPolicyNonceManager; -use OC\Security\CSRF\CsrfTokenManager; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\ContentSecurityPolicy; use OCP\AppFramework\Http\EmptyContentSecurityPolicy; @@ -18,19 +17,11 @@ use OCP\AppFramework\Http\Response; use OCP\AppFramework\Middleware; class CSPMiddleware extends Middleware { - /** @var ContentSecurityPolicyManager */ - private $contentSecurityPolicyManager; - /** @var ContentSecurityPolicyNonceManager */ - private $cspNonceManager; - /** @var CsrfTokenManager */ - private $csrfTokenManager; - - public function __construct(ContentSecurityPolicyManager $policyManager, - ContentSecurityPolicyNonceManager $cspNonceManager, - CsrfTokenManager $csrfTokenManager) { - $this->contentSecurityPolicyManager = $policyManager; - $this->cspNonceManager = $cspNonceManager; - $this->csrfTokenManager = $csrfTokenManager; + + public function __construct( + private ContentSecurityPolicyManager $policyManager, + private ContentSecurityPolicyNonceManager $cspNonceManager, + ) { } /** @@ -49,11 +40,11 @@ class CSPMiddleware extends Middleware { return $response; } - $defaultPolicy = $this->contentSecurityPolicyManager->getDefaultPolicy(); - $defaultPolicy = $this->contentSecurityPolicyManager->mergePolicies($defaultPolicy, $policy); + $defaultPolicy = $this->policyManager->getDefaultPolicy(); + $defaultPolicy = $this->policyManager->mergePolicies($defaultPolicy, $policy); if ($this->cspNonceManager->browserSupportsCspV3()) { - $defaultPolicy->useJsNonce($this->csrfTokenManager->getToken()->getEncryptedValue()); + $defaultPolicy->useJsNonce($this->cspNonceManager->getNonce()); } $response->setContentSecurityPolicy($defaultPolicy); diff --git a/lib/private/AppFramework/Middleware/Security/Exceptions/AdminIpNotAllowedException.php b/lib/private/AppFramework/Middleware/Security/Exceptions/AdminIpNotAllowedException.php new file mode 100644 index 00000000000..36eb8f18928 --- /dev/null +++ b/lib/private/AppFramework/Middleware/Security/Exceptions/AdminIpNotAllowedException.php @@ -0,0 +1,23 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-only + */ +namespace OC\AppFramework\Middleware\Security\Exceptions; + +use OCP\AppFramework\Http; + +/** + * Class AdminIpNotAllowed is thrown when a resource has been requested by a + * an admin user connecting from an unauthorized IP address + * See configuration `allowed_admin_ranges` + * + * @package OC\AppFramework\Middleware\Security\Exceptions + */ +class AdminIpNotAllowedException extends SecurityException { + public function __construct(string $message) { + parent::__construct($message, Http::STATUS_FORBIDDEN); + } +} diff --git a/lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php b/lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php index 5ff9d7386da..34933e13ecd 100644 --- a/lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php @@ -20,6 +20,7 @@ use OCP\ISession; use OCP\IUserSession; use OCP\Session\Exceptions\SessionNotAvailableException; use OCP\User\Backend\IPasswordConfirmationBackend; +use Psr\Log\LoggerInterface; use ReflectionMethod; class PasswordConfirmationMiddleware extends Middleware { @@ -48,6 +49,7 @@ class PasswordConfirmationMiddleware extends Middleware { IUserSession $userSession, ITimeFactory $timeFactory, IProvider $tokenProvider, + private readonly LoggerInterface $logger, ) { $this->reflector = $reflector; $this->session = $session; @@ -91,7 +93,7 @@ class PasswordConfirmationMiddleware extends Middleware { return; } - $lastConfirm = (int) $this->session->get('last-password-confirm'); + $lastConfirm = (int)$this->session->get('last-password-confirm'); // TODO: confirm excludedUserBackEnds can go away and remove it if (!isset($this->excludedUserBackEnds[$backendClassName]) && $lastConfirm < ($this->timeFactory->getTime() - (30 * 60 + 15))) { // allow 15 seconds delay throw new NotConfirmedException(); @@ -113,6 +115,7 @@ class PasswordConfirmationMiddleware extends Middleware { } if ($this->reflector->hasAnnotation($annotationName)) { + $this->logger->debug($reflectionMethod->getDeclaringClass()->getName() . '::' . $reflectionMethod->getName() . ' uses the @' . $annotationName . ' annotation and should use the #[' . $attributeClass . '] attribute instead'); return true; } diff --git a/lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php b/lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php index d593bf5019f..f4d120ebc30 100644 --- a/lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php @@ -11,6 +11,7 @@ namespace OC\AppFramework\Middleware\Security; use OC\AppFramework\Utility\ControllerMethodReflector; use OC\Security\RateLimiting\Exception\RateLimitExceededException; use OC\Security\RateLimiting\Limiter; +use OC\User\Session; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\Attribute\AnonRateLimit; use OCP\AppFramework\Http\Attribute\ARateLimit; @@ -63,8 +64,8 @@ class RateLimitingMiddleware extends Middleware { parent::beforeController($controller, $methodName); $rateLimitIdentifier = get_class($controller) . '::' . $methodName; - if ($this->session->exists('app_api_system')) { - // Bypass rate limiting for app_api + if ($this->userSession instanceof Session && $this->userSession->getSession()->get('app_api') === true && $this->userSession->getUser() === null) { + // if userId is not specified and the request is authenticated by AppAPI, we skip the rate limit return; } @@ -111,8 +112,8 @@ class RateLimitingMiddleware extends Middleware { if ($annotationLimit !== '' && $annotationPeriod !== '') { return new $attributeClass( - (int) $annotationLimit, - (int) $annotationPeriod, + (int)$annotationLimit, + (int)$annotationPeriod, ); } diff --git a/lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php b/lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php index e0bb96f132b..efe56e0b124 100644 --- a/lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php @@ -46,13 +46,13 @@ class SameSiteCookieMiddleware extends Middleware { public function afterException($controller, $methodName, \Exception $exception) { if ($exception instanceof LaxSameSiteCookieFailedException) { - $respone = new Response(); - $respone->setStatus(Http::STATUS_FOUND); - $respone->addHeader('Location', $this->request->getRequestUri()); + $response = new Response(); + $response->setStatus(Http::STATUS_FOUND); + $response->addHeader('Location', $this->request->getRequestUri()); $this->setSameSiteCookie(); - return $respone; + return $response; } throw $exception; diff --git a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php index bc2014da246..88987290244 100644 --- a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php @@ -8,6 +8,7 @@ declare(strict_types=1); */ namespace OC\AppFramework\Middleware\Security; +use OC\AppFramework\Middleware\Security\Exceptions\AdminIpNotAllowedException; use OC\AppFramework\Middleware\Security\Exceptions\AppNotEnabledException; use OC\AppFramework\Middleware\Security\Exceptions\CrossSiteRequestForgeryException; use OC\AppFramework\Middleware\Security\Exceptions\ExAppRequiredException; @@ -21,6 +22,7 @@ use OC\User\Session; use OCP\App\AppPathNotFoundException; use OCP\App\IAppManager; use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\Attribute\AppApiAdminAccessWithoutUser; use OCP\AppFramework\Http\Attribute\AuthorizedAdminSetting; use OCP\AppFramework\Http\Attribute\ExAppRequired; use OCP\AppFramework\Http\Attribute\NoAdminRequired; @@ -34,11 +36,14 @@ use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Middleware; use OCP\AppFramework\OCSController; +use OCP\Group\ISubAdmin; +use OCP\IGroupManager; use OCP\IL10N; use OCP\INavigationManager; use OCP\IRequest; use OCP\IURLGenerator; use OCP\IUserSession; +use OCP\Security\Ip\IRemoteAddress; use OCP\Util; use Psr\Log\LoggerInterface; use ReflectionMethod; @@ -50,60 +55,41 @@ use ReflectionMethod; * check fails */ class SecurityMiddleware extends Middleware { - /** @var INavigationManager */ - private $navigationManager; - /** @var IRequest */ - private $request; - /** @var ControllerMethodReflector */ - private $reflector; - /** @var string */ - private $appName; - /** @var IURLGenerator */ - private $urlGenerator; - /** @var LoggerInterface */ - private $logger; - /** @var bool */ - private $isLoggedIn; - /** @var bool */ - private $isAdminUser; - /** @var bool */ - private $isSubAdmin; - /** @var IAppManager */ - private $appManager; - /** @var IL10N */ - private $l10n; - /** @var AuthorizedGroupMapper */ - private $groupAuthorizationMapper; - /** @var IUserSession */ - private $userSession; - - public function __construct(IRequest $request, - ControllerMethodReflector $reflector, - INavigationManager $navigationManager, - IURLGenerator $urlGenerator, - LoggerInterface $logger, - string $appName, - bool $isLoggedIn, - bool $isAdminUser, - bool $isSubAdmin, - IAppManager $appManager, - IL10N $l10n, - AuthorizedGroupMapper $mapper, - IUserSession $userSession + private ?bool $isAdminUser = null; + private ?bool $isSubAdmin = null; + + public function __construct( + private IRequest $request, + private ControllerMethodReflector $reflector, + private INavigationManager $navigationManager, + private IURLGenerator $urlGenerator, + private LoggerInterface $logger, + private string $appName, + private bool $isLoggedIn, + private IGroupManager $groupManager, + private ISubAdmin $subAdminManager, + private IAppManager $appManager, + private IL10N $l10n, + private AuthorizedGroupMapper $groupAuthorizationMapper, + private IUserSession $userSession, + private IRemoteAddress $remoteAddress, ) { - $this->navigationManager = $navigationManager; - $this->request = $request; - $this->reflector = $reflector; - $this->appName = $appName; - $this->urlGenerator = $urlGenerator; - $this->logger = $logger; - $this->isLoggedIn = $isLoggedIn; - $this->isAdminUser = $isAdminUser; - $this->isSubAdmin = $isSubAdmin; - $this->appManager = $appManager; - $this->l10n = $l10n; - $this->groupAuthorizationMapper = $mapper; - $this->userSession = $userSession; + } + + private function isAdminUser(): bool { + if ($this->isAdminUser === null) { + $user = $this->userSession->getUser(); + $this->isAdminUser = $user && $this->groupManager->isAdmin($user->getUID()); + } + return $this->isAdminUser; + } + + private function isSubAdmin(): bool { + if ($this->isSubAdmin === null) { + $user = $this->userSession->getUser(); + $this->isSubAdmin = $user && $this->subAdminManager->isSubAdmin($user); + } + return $this->isSubAdmin; } /** @@ -136,15 +122,23 @@ class SecurityMiddleware extends Middleware { throw new ExAppRequiredException(); } } elseif (!$isPublicPage) { - if (!$this->isLoggedIn) { + $authorized = false; + if ($this->hasAnnotationOrAttribute($reflectionMethod, null, AppApiAdminAccessWithoutUser::class)) { + // this attribute allows ExApp to access admin endpoints only if "userId" is "null" + if ($this->userSession instanceof Session && $this->userSession->getSession()->get('app_api') === true && $this->userSession->getUser() === null) { + $authorized = true; + } + } + + if (!$authorized && !$this->isLoggedIn) { throw new NotLoggedInException(); } - $authorized = false; - if ($this->hasAnnotationOrAttribute($reflectionMethod, 'AuthorizedAdminSetting', AuthorizedAdminSetting::class)) { - $authorized = $this->isAdminUser; + + if (!$authorized && $this->hasAnnotationOrAttribute($reflectionMethod, 'AuthorizedAdminSetting', AuthorizedAdminSetting::class)) { + $authorized = $this->isAdminUser(); if (!$authorized && $this->hasAnnotationOrAttribute($reflectionMethod, 'SubAdminRequired', SubAdminRequired::class)) { - $authorized = $this->isSubAdmin; + $authorized = $this->isSubAdmin(); } if (!$authorized) { @@ -161,19 +155,32 @@ class SecurityMiddleware extends Middleware { if (!$authorized) { throw new NotAdminException($this->l10n->t('Logged in account must be an admin, a sub admin or gotten special right to access this setting')); } + if (!$this->remoteAddress->allowsAdminActions()) { + throw new AdminIpNotAllowedException($this->l10n->t('Your current IP address doesn’t allow you to perform admin actions')); + } } if ($this->hasAnnotationOrAttribute($reflectionMethod, 'SubAdminRequired', SubAdminRequired::class) - && !$this->isSubAdmin - && !$this->isAdminUser + && !$this->isSubAdmin() + && !$this->isAdminUser() && !$authorized) { throw new NotAdminException($this->l10n->t('Logged in account must be an admin or sub admin')); } if (!$this->hasAnnotationOrAttribute($reflectionMethod, 'SubAdminRequired', SubAdminRequired::class) && !$this->hasAnnotationOrAttribute($reflectionMethod, 'NoAdminRequired', NoAdminRequired::class) - && !$this->isAdminUser + && !$this->isAdminUser() && !$authorized) { throw new NotAdminException($this->l10n->t('Logged in account must be an admin')); } + if ($this->hasAnnotationOrAttribute($reflectionMethod, 'SubAdminRequired', SubAdminRequired::class) + && !$this->remoteAddress->allowsAdminActions()) { + throw new AdminIpNotAllowedException($this->l10n->t('Your current IP address doesn’t allow you to perform admin actions')); + } + if (!$this->hasAnnotationOrAttribute($reflectionMethod, 'SubAdminRequired', SubAdminRequired::class) + && !$this->hasAnnotationOrAttribute($reflectionMethod, 'NoAdminRequired', NoAdminRequired::class) + && !$this->remoteAddress->allowsAdminActions()) { + throw new AdminIpNotAllowedException($this->l10n->t('Your current IP address doesn’t allow you to perform admin actions')); + } + } // Check for strict cookie requirement @@ -233,16 +240,17 @@ class SecurityMiddleware extends Middleware { * @template T * * @param ReflectionMethod $reflectionMethod - * @param string $annotationName + * @param ?string $annotationName * @param class-string<T> $attributeClass * @return boolean */ - protected function hasAnnotationOrAttribute(ReflectionMethod $reflectionMethod, string $annotationName, string $attributeClass): bool { + protected function hasAnnotationOrAttribute(ReflectionMethod $reflectionMethod, ?string $annotationName, string $attributeClass): bool { if (!empty($reflectionMethod->getAttributes($attributeClass))) { return true; } - if ($this->reflector->hasAnnotation($annotationName)) { + if ($annotationName && $this->reflector->hasAnnotation($annotationName)) { + $this->logger->debug($reflectionMethod->getDeclaringClass()->getName() . '::' . $reflectionMethod->getName() . ' uses the @' . $annotationName . ' annotation and should use the #[' . $attributeClass . '] attribute instead'); return true; } diff --git a/lib/private/AppFramework/OCS/BaseResponse.php b/lib/private/AppFramework/OCS/BaseResponse.php index 2e685de856b..3b0a28fe89c 100644 --- a/lib/private/AppFramework/OCS/BaseResponse.php +++ b/lib/private/AppFramework/OCS/BaseResponse.php @@ -133,7 +133,9 @@ abstract class BaseResponse extends Response { $v = []; } - if (\is_array($v)) { + if ($k === '$comment') { + $writer->writeComment($v); + } elseif (\is_array($v)) { $writer->startElement($k); $this->toXML($v, $writer); $writer->endElement(); @@ -141,8 +143,10 @@ abstract class BaseResponse extends Response { $writer->startElement($k); $this->toXML($v->jsonSerialize(), $writer); $writer->endElement(); + } elseif ($v === null) { + $writer->writeElement($k); } else { - $writer->writeElement($k, $v); + $writer->writeElement($k, (string)$v); } } } diff --git a/lib/private/AppFramework/Utility/ControllerMethodReflector.php b/lib/private/AppFramework/Utility/ControllerMethodReflector.php index 9c08f58b384..2031327dfae 100644 --- a/lib/private/AppFramework/Utility/ControllerMethodReflector.php +++ b/lib/private/AppFramework/Utility/ControllerMethodReflector.php @@ -82,9 +82,9 @@ class ControllerMethodReflector implements IControllerMethodReflector { /** * Inspects the PHPDoc parameters for types * @param string $parameter the parameter whose type comments should be - * parsed + * parsed * @return string|null type in the type parameters (@param int $something) - * would return int or null if not existing + * would return int or null if not existing */ public function getType(string $parameter) { if (array_key_exists($parameter, $this->types)) { diff --git a/lib/private/AppFramework/Utility/SimpleContainer.php b/lib/private/AppFramework/Utility/SimpleContainer.php index bf0ef36d13c..56de4a34cf6 100644 --- a/lib/private/AppFramework/Utility/SimpleContainer.php +++ b/lib/private/AppFramework/Utility/SimpleContainer.php @@ -89,7 +89,7 @@ class SimpleContainer implements ArrayAccess, ContainerInterface, IContainer { } // don't lose the error we got while trying to query by type - throw new QueryException($e->getMessage(), (int) $e->getCode(), $e); + throw new QueryException($e->getMessage(), (int)$e->getCode(), $e); } } diff --git a/lib/private/Authentication/Listeners/RemoteWipeNotificationsListener.php b/lib/private/Authentication/Listeners/RemoteWipeNotificationsListener.php index d95bcd98cf9..5781c1edf16 100644 --- a/lib/private/Authentication/Listeners/RemoteWipeNotificationsListener.php +++ b/lib/private/Authentication/Listeners/RemoteWipeNotificationsListener.php @@ -45,7 +45,7 @@ class RemoteWipeNotificationsListener implements IEventListener { $notification->setApp('auth') ->setUser($token->getUID()) ->setDateTime($this->timeFactory->getDateTime()) - ->setObject('token', (string) $token->getId()) + ->setObject('token', (string)$token->getId()) ->setSubject($event, [ 'name' => $token->getName(), ]); diff --git a/lib/private/Authentication/Listeners/UserDeletedFilesCleanupListener.php b/lib/private/Authentication/Listeners/UserDeletedFilesCleanupListener.php index 697aea71c6d..8523fb6abc7 100644 --- a/lib/private/Authentication/Listeners/UserDeletedFilesCleanupListener.php +++ b/lib/private/Authentication/Listeners/UserDeletedFilesCleanupListener.php @@ -39,7 +39,7 @@ class UserDeletedFilesCleanupListener implements IEventListener { $userHome = $this->mountProviderCollection->getHomeMountForUser($event->getUser()); $storage = $userHome->getStorage(); if (!$storage) { - throw new \Exception("Account has no home storage"); + throw new \Exception('Account has no home storage'); } // remove all wrappers, so we do the delete directly on the home storage bypassing any wrapper @@ -52,7 +52,7 @@ class UserDeletedFilesCleanupListener implements IEventListener { } if ($event instanceof UserDeletedEvent) { if (!isset($this->homeStorageCache[$event->getUser()->getUID()])) { - throw new \Exception("UserDeletedEvent fired without matching BeforeUserDeletedEvent"); + throw new \Exception('UserDeletedEvent fired without matching BeforeUserDeletedEvent'); } $storage = $this->homeStorageCache[$event->getUser()->getUID()]; $cache = $storage->getCache(); @@ -60,7 +60,7 @@ class UserDeletedFilesCleanupListener implements IEventListener { if ($cache instanceof Cache) { $cache->clear(); } else { - throw new \Exception("Home storage has invalid cache"); + throw new \Exception('Home storage has invalid cache'); } } } diff --git a/lib/private/Authentication/Token/IProvider.php b/lib/private/Authentication/Token/IProvider.php index dfb17301ab3..d47427e79bf 100644 --- a/lib/private/Authentication/Token/IProvider.php +++ b/lib/private/Authentication/Token/IProvider.php @@ -35,7 +35,9 @@ interface IProvider { ?string $password, string $name, int $type = OCPIToken::TEMPORARY_TOKEN, - int $remember = OCPIToken::DO_NOT_REMEMBER): OCPIToken; + int $remember = OCPIToken::DO_NOT_REMEMBER, + ?array $scope = null, + ): OCPIToken; /** * Get a token by token id diff --git a/lib/private/Authentication/Token/Manager.php b/lib/private/Authentication/Token/Manager.php index 37ed6083d82..6953f47b004 100644 --- a/lib/private/Authentication/Token/Manager.php +++ b/lib/private/Authentication/Token/Manager.php @@ -42,7 +42,9 @@ class Manager implements IProvider, OCPIProvider { $password, string $name, int $type = OCPIToken::TEMPORARY_TOKEN, - int $remember = OCPIToken::DO_NOT_REMEMBER): OCPIToken { + int $remember = OCPIToken::DO_NOT_REMEMBER, + ?array $scope = null, + ): OCPIToken { if (mb_strlen($name) > 128) { $name = mb_substr($name, 0, 120) . '…'; } @@ -55,7 +57,8 @@ class Manager implements IProvider, OCPIProvider { $password, $name, $type, - $remember + $remember, + $scope, ); } catch (UniqueConstraintViolationException $e) { // It's rare, but if two requests of the same session (e.g. env-based SAML) diff --git a/lib/private/Authentication/Token/PublicKeyTokenMapper.php b/lib/private/Authentication/Token/PublicKeyTokenMapper.php index 0db5c4f53e7..b1341fe1898 100644 --- a/lib/private/Authentication/Token/PublicKeyTokenMapper.php +++ b/lib/private/Authentication/Token/PublicKeyTokenMapper.php @@ -36,17 +36,20 @@ class PublicKeyTokenMapper extends QBMapper { /** * @param int $olderThan - * @param int $remember + * @param int $type + * @param int|null $remember */ - public function invalidateOld(int $olderThan, int $remember = IToken::DO_NOT_REMEMBER) { + public function invalidateOld(int $olderThan, int $type = IToken::TEMPORARY_TOKEN, ?int $remember = null) { /* @var $qb IQueryBuilder */ $qb = $this->db->getQueryBuilder(); - $qb->delete($this->tableName) + $delete = $qb->delete($this->tableName) ->where($qb->expr()->lt('last_activity', $qb->createNamedParameter($olderThan, IQueryBuilder::PARAM_INT))) - ->andWhere($qb->expr()->eq('type', $qb->createNamedParameter(IToken::TEMPORARY_TOKEN, IQueryBuilder::PARAM_INT))) - ->andWhere($qb->expr()->eq('remember', $qb->createNamedParameter($remember, IQueryBuilder::PARAM_INT))) - ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT))) - ->execute(); + ->andWhere($qb->expr()->eq('type', $qb->createNamedParameter($type, IQueryBuilder::PARAM_INT))) + ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT))); + if ($remember !== null) { + $delete->andWhere($qb->expr()->eq('remember', $qb->createNamedParameter($remember, IQueryBuilder::PARAM_INT))); + } + $delete->executeStatement(); } public function invalidateLastUsedBefore(string $uid, int $before): int { diff --git a/lib/private/Authentication/Token/PublicKeyTokenProvider.php b/lib/private/Authentication/Token/PublicKeyTokenProvider.php index 767ece1e551..4eddd5c80f7 100644 --- a/lib/private/Authentication/Token/PublicKeyTokenProvider.php +++ b/lib/private/Authentication/Token/PublicKeyTokenProvider.php @@ -85,7 +85,9 @@ class PublicKeyTokenProvider implements IProvider { ?string $password, string $name, int $type = OCPIToken::TEMPORARY_TOKEN, - int $remember = OCPIToken::DO_NOT_REMEMBER): OCPIToken { + int $remember = OCPIToken::DO_NOT_REMEMBER, + ?array $scope = null, + ): OCPIToken { if (strlen($token) < self::TOKEN_MIN_LENGTH) { $exception = new InvalidTokenException('Token is too short, minimum of ' . self::TOKEN_MIN_LENGTH . ' characters is required, ' . strlen($token) . ' characters given'); $this->logger->error('Invalid token provided when generating new token', ['exception' => $exception]); @@ -107,6 +109,10 @@ class PublicKeyTokenProvider implements IProvider { $dbToken->setPasswordHash($randomOldToken->getPasswordHash()); } + if ($scope !== null) { + $dbToken->setScope($scope); + } + $this->mapper->insert($dbToken); if (!$oldTokenMatches && $password !== null) { @@ -156,7 +162,7 @@ class PublicKeyTokenProvider implements IProvider { $this->rotate($token, $tokenId, $tokenId); } catch (DoesNotExistException) { $this->cacheInvalidHash($tokenHash); - throw new InvalidTokenException("Token does not exist: " . $ex->getMessage(), 0, $ex); + throw new InvalidTokenException('Token does not exist: ' . $ex->getMessage(), 0, $ex); } } @@ -171,7 +177,7 @@ class PublicKeyTokenProvider implements IProvider { private function getTokenFromCache(string $tokenHash): ?PublicKeyToken { $serializedToken = $this->cache->get($tokenHash); if ($serializedToken === false) { - throw new InvalidTokenException('Token does not exist: ' . $tokenHash); + return null; } if ($serializedToken === null) { @@ -226,7 +232,7 @@ class PublicKeyTokenProvider implements IProvider { $token = $this->getToken($oldSessionId); if (!($token instanceof PublicKeyToken)) { - throw new InvalidTokenException("Invalid token type"); + throw new InvalidTokenException('Invalid token type'); } $password = null; @@ -234,6 +240,8 @@ class PublicKeyTokenProvider implements IProvider { $privateKey = $this->decrypt($token->getPrivateKey(), $oldSessionId); $password = $this->decryptPassword($token->getPassword(), $privateKey); } + + $scope = $token->getScope() === '' ? null : $token->getScopeAsArray(); $newToken = $this->generateToken( $sessionId, $token->getUID(), @@ -241,9 +249,9 @@ class PublicKeyTokenProvider implements IProvider { $password, $token->getName(), OCPIToken::TEMPORARY_TOKEN, - $token->getRemember() + $token->getRemember(), + $scope, ); - $newToken->setScope($token->getScopeAsArray()); $this->cacheToken($newToken); $this->cacheInvalidHash($token->getToken()); @@ -273,10 +281,19 @@ class PublicKeyTokenProvider implements IProvider { public function invalidateOldTokens() { $olderThan = $this->time->getTime() - $this->config->getSystemValueInt('session_lifetime', 60 * 60 * 24); $this->logger->debug('Invalidating session tokens older than ' . date('c', $olderThan), ['app' => 'cron']); - $this->mapper->invalidateOld($olderThan, OCPIToken::DO_NOT_REMEMBER); + $this->mapper->invalidateOld($olderThan, OCPIToken::TEMPORARY_TOKEN, OCPIToken::DO_NOT_REMEMBER); + $rememberThreshold = $this->time->getTime() - $this->config->getSystemValueInt('remember_login_cookie_lifetime', 60 * 60 * 24 * 15); $this->logger->debug('Invalidating remembered session tokens older than ' . date('c', $rememberThreshold), ['app' => 'cron']); - $this->mapper->invalidateOld($rememberThreshold, OCPIToken::REMEMBER); + $this->mapper->invalidateOld($rememberThreshold, OCPIToken::TEMPORARY_TOKEN, OCPIToken::REMEMBER); + + $wipeThreshold = $this->time->getTime() - $this->config->getSystemValueInt('token_auth_wipe_token_retention', 60 * 60 * 24 * 60); + $this->logger->debug('Invalidating auth tokens marked for remote wipe older than ' . date('c', $wipeThreshold), ['app' => 'cron']); + $this->mapper->invalidateOld($wipeThreshold, OCPIToken::WIPE_TOKEN); + + $authTokenThreshold = $this->time->getTime() - $this->config->getSystemValueInt('token_auth_token_retention', 60 * 60 * 24 * 365); + $this->logger->debug('Invalidating auth tokens older than ' . date('c', $authTokenThreshold), ['app' => 'cron']); + $this->mapper->invalidateOld($authTokenThreshold, OCPIToken::PERMANENT_TOKEN); } public function invalidateLastUsedBefore(string $uid, int $before): void { @@ -285,7 +302,7 @@ class PublicKeyTokenProvider implements IProvider { public function updateToken(OCPIToken $token) { if (!($token instanceof PublicKeyToken)) { - throw new InvalidTokenException("Invalid token type"); + throw new InvalidTokenException('Invalid token type'); } $this->mapper->update($token); $this->cacheToken($token); @@ -293,7 +310,7 @@ class PublicKeyTokenProvider implements IProvider { public function updateTokenActivity(OCPIToken $token) { if (!($token instanceof PublicKeyToken)) { - throw new InvalidTokenException("Invalid token type"); + throw new InvalidTokenException('Invalid token type'); } $activityInterval = $this->config->getSystemValueInt('token_auth_activity_update', 60); @@ -314,7 +331,7 @@ class PublicKeyTokenProvider implements IProvider { public function getPassword(OCPIToken $savedToken, string $tokenId): string { if (!($savedToken instanceof PublicKeyToken)) { - throw new InvalidTokenException("Invalid token type"); + throw new InvalidTokenException('Invalid token type'); } if ($savedToken->getPassword() === null) { @@ -330,7 +347,7 @@ class PublicKeyTokenProvider implements IProvider { public function setPassword(OCPIToken $token, string $tokenId, string $password) { if (!($token instanceof PublicKeyToken)) { - throw new InvalidTokenException("Invalid token type"); + throw new InvalidTokenException('Invalid token type'); } $this->atomic(function () use ($password, $token) { @@ -355,7 +372,7 @@ class PublicKeyTokenProvider implements IProvider { public function rotate(OCPIToken $token, string $oldTokenId, string $newTokenId): OCPIToken { if (!($token instanceof PublicKeyToken)) { - throw new InvalidTokenException("Invalid token type"); + throw new InvalidTokenException('Invalid token type'); } // Decrypt private key with oldTokenId @@ -388,7 +405,7 @@ class PublicKeyTokenProvider implements IProvider { } catch (\Exception $ex2) { // Delete the invalid token $this->invalidateToken($token); - throw new InvalidTokenException("Could not decrypt token password: " . $ex->getMessage(), 0, $ex2); + throw new InvalidTokenException('Could not decrypt token password: ' . $ex->getMessage(), 0, $ex2); } } } @@ -478,7 +495,7 @@ class PublicKeyTokenProvider implements IProvider { public function markPasswordInvalid(OCPIToken $token, string $tokenId) { if (!($token instanceof PublicKeyToken)) { - throw new InvalidTokenException("Invalid token type"); + throw new InvalidTokenException('Invalid token type'); } $token->setPasswordInvalid(true); diff --git a/lib/private/Authentication/Token/RemoteWipe.php b/lib/private/Authentication/Token/RemoteWipe.php index 43c2bd060d1..80ba330b66d 100644 --- a/lib/private/Authentication/Token/RemoteWipe.php +++ b/lib/private/Authentication/Token/RemoteWipe.php @@ -98,7 +98,7 @@ class RemoteWipe { $dbToken = $e->getToken(); - $this->logger->info("user " . $dbToken->getUID() . " started a remote wipe"); + $this->logger->info('user ' . $dbToken->getUID() . ' started a remote wipe'); $this->eventDispatcher->dispatch(RemoteWipeStarted::class, new RemoteWipeStarted($dbToken)); @@ -126,7 +126,7 @@ class RemoteWipe { $this->tokenProvider->invalidateToken($token); - $this->logger->info("user " . $dbToken->getUID() . " finished a remote wipe"); + $this->logger->info('user ' . $dbToken->getUID() . ' finished a remote wipe'); $this->eventDispatcher->dispatch(RemoteWipeFinished::class, new RemoteWipeFinished($dbToken)); return true; diff --git a/lib/private/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDao.php b/lib/private/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDao.php index c84b7f1af20..cdbd8b48cf2 100644 --- a/lib/private/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDao.php +++ b/lib/private/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDao.php @@ -29,7 +29,7 @@ class ProviderUserAssignmentDao { * Get all assigned provider IDs for the given user ID * * @return array<string, bool> where the array key is the provider ID (string) and the - * value is the enabled state (bool) + * value is the enabled state (bool) */ public function getState(string $uid): array { $qb = $this->conn->getQueryBuilder(); @@ -95,7 +95,7 @@ class ProviderUserAssignmentDao { return [ 'provider_id' => (string)$row['provider_id'], 'uid' => (string)$row['uid'], - 'enabled' => ((int) $row['enabled']) === 1, + 'enabled' => ((int)$row['enabled']) === 1, ]; }, $rows)); } diff --git a/lib/private/Authentication/TwoFactorAuth/Manager.php b/lib/private/Authentication/TwoFactorAuth/Manager.php index 2585646c998..072ffc4f86f 100644 --- a/lib/private/Authentication/TwoFactorAuth/Manager.php +++ b/lib/private/Authentication/TwoFactorAuth/Manager.php @@ -192,7 +192,7 @@ class Manager { if (!empty($missing)) { // There was at least one provider missing - $this->logger->alert(count($missing) . " two-factor auth providers failed to load", ['app' => 'core']); + $this->logger->alert(count($missing) . ' two-factor auth providers failed to load', ['app' => 'core']); return true; } @@ -322,7 +322,7 @@ class Manager { $tokenId = $token->getId(); $tokensNeeding2FA = $this->config->getUserKeys($user->getUID(), 'login_token_2fa'); - if (!\in_array((string) $tokenId, $tokensNeeding2FA, true)) { + if (!\in_array((string)$tokenId, $tokensNeeding2FA, true)) { $this->session->set(self::SESSION_UID_DONE, $user->getUID()); return false; } @@ -359,7 +359,7 @@ class Manager { $id = $this->session->getId(); $token = $this->tokenProvider->getToken($id); - $this->config->setUserValue($user->getUID(), 'login_token_2fa', (string) $token->getId(), (string)$this->timeFactory->getTime()); + $this->config->setUserValue($user->getUID(), 'login_token_2fa', (string)$token->getId(), (string)$this->timeFactory->getTime()); } public function clearTwoFactorPending(string $userId) { diff --git a/lib/private/Authentication/TwoFactorAuth/ProviderLoader.php b/lib/private/Authentication/TwoFactorAuth/ProviderLoader.php index b9a0a97bec4..7e674a01dd8 100644 --- a/lib/private/Authentication/TwoFactorAuth/ProviderLoader.php +++ b/lib/private/Authentication/TwoFactorAuth/ProviderLoader.php @@ -9,8 +9,7 @@ declare(strict_types=1); namespace OC\Authentication\TwoFactorAuth; use Exception; -use OC; -use OC_App; +use OC\AppFramework\Bootstrap\Coordinator; use OCP\App\IAppManager; use OCP\AppFramework\QueryException; use OCP\Authentication\TwoFactorAuth\IProvider; @@ -19,15 +18,10 @@ use OCP\IUser; class ProviderLoader { public const BACKUP_CODES_APP_ID = 'twofactor_backupcodes'; - /** @var IAppManager */ - private $appManager; - - /** @var OC\AppFramework\Bootstrap\Coordinator */ - private $coordinator; - - public function __construct(IAppManager $appManager, OC\AppFramework\Bootstrap\Coordinator $coordinator) { - $this->appManager = $appManager; - $this->coordinator = $coordinator; + public function __construct( + private IAppManager $appManager, + private Coordinator $coordinator, + ) { } /** @@ -58,12 +52,12 @@ class ProviderLoader { } } - $registeredProviders = $this->coordinator->getRegistrationContext()->getTwoFactorProviders(); + $registeredProviders = $this->coordinator->getRegistrationContext()?->getTwoFactorProviders() ?? []; foreach ($registeredProviders as $provider) { try { $this->loadTwoFactorApp($provider->getAppId()); - $provider = \OCP\Server::get($provider->getService()); - $providers[$provider->getId()] = $provider; + $providerInstance = \OCP\Server::get($provider->getService()); + $providers[$providerInstance->getId()] = $providerInstance; } catch (QueryException $exc) { // Provider class can not be resolved throw new Exception('Could not load two-factor auth provider ' . $provider->getService()); @@ -75,12 +69,10 @@ class ProviderLoader { /** * Load an app by ID if it has not been loaded yet - * - * @param string $appId */ - protected function loadTwoFactorApp(string $appId) { - if (!OC_App::isAppLoaded($appId)) { - OC_App::loadApp($appId); + protected function loadTwoFactorApp(string $appId): void { + if (!$this->appManager->isAppLoaded($appId)) { + $this->appManager->loadApp($appId); } } } diff --git a/lib/private/Authentication/WebAuthn/CredentialRepository.php b/lib/private/Authentication/WebAuthn/CredentialRepository.php index f32136f9594..203f2ef9020 100644 --- a/lib/private/Authentication/WebAuthn/CredentialRepository.php +++ b/lib/private/Authentication/WebAuthn/CredentialRepository.php @@ -44,7 +44,7 @@ class CredentialRepository implements PublicKeyCredentialSourceRepository { }, $entities); } - public function saveAndReturnCredentialSource(PublicKeyCredentialSource $publicKeyCredentialSource, ?string $name = null): PublicKeyCredentialEntity { + public function saveAndReturnCredentialSource(PublicKeyCredentialSource $publicKeyCredentialSource, ?string $name = null, bool $userVerification = false): PublicKeyCredentialEntity { $oldEntity = null; try { @@ -58,13 +58,18 @@ class CredentialRepository implements PublicKeyCredentialSourceRepository { $name = 'default'; } - $entity = PublicKeyCredentialEntity::fromPublicKeyCrendentialSource($name, $publicKeyCredentialSource); + $entity = PublicKeyCredentialEntity::fromPublicKeyCrendentialSource($name, $publicKeyCredentialSource, $userVerification); if ($oldEntity) { $entity->setId($oldEntity->getId()); if ($defaultName) { $entity->setName($oldEntity->getName()); } + + // Don't downgrade UV just because it was skipped during a login due to another key + if ($oldEntity->getUserVerification()) { + $entity->setUserVerification(true); + } } return $this->credentialMapper->insertOrUpdate($entity); diff --git a/lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialEntity.php b/lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialEntity.php index 443a7985cae..6c4bc3ca81b 100644 --- a/lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialEntity.php +++ b/lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialEntity.php @@ -23,6 +23,10 @@ use Webauthn\PublicKeyCredentialSource; * @method void setPublicKeyCredentialId(string $id); * @method string getData(); * @method void setData(string $data); + * + * @since 30.0.0 Add userVerification attribute + * @method bool|null getUserVerification(); + * @method void setUserVerification(bool $userVerification); */ class PublicKeyCredentialEntity extends Entity implements JsonSerializable { /** @var string */ @@ -37,20 +41,25 @@ class PublicKeyCredentialEntity extends Entity implements JsonSerializable { /** @var string */ protected $data; + /** @var bool|null */ + protected $userVerification; + public function __construct() { $this->addType('name', 'string'); $this->addType('uid', 'string'); $this->addType('publicKeyCredentialId', 'string'); $this->addType('data', 'string'); + $this->addType('userVerification', 'boolean'); } - public static function fromPublicKeyCrendentialSource(string $name, PublicKeyCredentialSource $publicKeyCredentialSource): PublicKeyCredentialEntity { + public static function fromPublicKeyCrendentialSource(string $name, PublicKeyCredentialSource $publicKeyCredentialSource, bool $userVerification): PublicKeyCredentialEntity { $publicKeyCredentialEntity = new self(); $publicKeyCredentialEntity->setName($name); $publicKeyCredentialEntity->setUid($publicKeyCredentialSource->getUserHandle()); $publicKeyCredentialEntity->setPublicKeyCredentialId(base64_encode($publicKeyCredentialSource->getPublicKeyCredentialId())); $publicKeyCredentialEntity->setData(json_encode($publicKeyCredentialSource)); + $publicKeyCredentialEntity->setUserVerification($userVerification); return $publicKeyCredentialEntity; } diff --git a/lib/private/Authentication/WebAuthn/Manager.php b/lib/private/Authentication/WebAuthn/Manager.php index 007be245992..7aa7a3c8f3a 100644 --- a/lib/private/Authentication/WebAuthn/Manager.php +++ b/lib/private/Authentication/WebAuthn/Manager.php @@ -88,8 +88,8 @@ class Manager { ]; $authenticatorSelectionCriteria = new AuthenticatorSelectionCriteria( - null, - AuthenticatorSelectionCriteria::USER_VERIFICATION_REQUIREMENT_DISCOURAGED, + AuthenticatorSelectionCriteria::AUTHENTICATOR_ATTACHMENT_NO_PREFERENCE, + AuthenticatorSelectionCriteria::USER_VERIFICATION_REQUIREMENT_PREFERRED, null, false, ); @@ -151,7 +151,8 @@ class Manager { } // Persist the data - return $this->repository->saveAndReturnCredentialSource($publicKeyCredentialSource, $name); + $userVerification = $response->attestationObject->authData->isUserVerified(); + return $this->repository->saveAndReturnCredentialSource($publicKeyCredentialSource, $name, $userVerification); } private function stripPort(string $serverHost): string { @@ -160,7 +161,11 @@ class Manager { public function startAuthentication(string $uid, string $serverHost): PublicKeyCredentialRequestOptions { // List of registered PublicKeyCredentialDescriptor classes associated to the user - $registeredPublicKeyCredentialDescriptors = array_map(function (PublicKeyCredentialEntity $entity) { + $userVerificationRequirement = AuthenticatorSelectionCriteria::USER_VERIFICATION_REQUIREMENT_REQUIRED; + $registeredPublicKeyCredentialDescriptors = array_map(function (PublicKeyCredentialEntity $entity) use (&$userVerificationRequirement) { + if ($entity->getUserVerification() !== true) { + $userVerificationRequirement = AuthenticatorSelectionCriteria::USER_VERIFICATION_REQUIREMENT_DISCOURAGED; + } $credential = $entity->toPublicKeyCredentialSource(); return new PublicKeyCredentialDescriptor( $credential->type, @@ -173,7 +178,7 @@ class Manager { random_bytes(32), // Challenge $this->stripPort($serverHost), // Relying Party ID $registeredPublicKeyCredentialDescriptors, // Registered PublicKeyCredentialDescriptor classes - AuthenticatorSelectionCriteria::USER_VERIFICATION_REQUIREMENT_DISCOURAGED, + $userVerificationRequirement, 60000, // Timeout ); } diff --git a/lib/private/Avatar/Avatar.php b/lib/private/Avatar/Avatar.php index 1ad70001f13..bf29d57b88d 100644 --- a/lib/private/Avatar/Avatar.php +++ b/lib/private/Avatar/Avatar.php @@ -88,8 +88,8 @@ abstract class Avatar implements IAvatar { $userDisplayName = $this->getDisplayName(); $fgRGB = $this->avatarBackgroundColor($userDisplayName); $bgRGB = $fgRGB->alphaBlending(0.1, $darkTheme ? new Color(0, 0, 0) : new Color(255, 255, 255)); - $fill = sprintf("%02x%02x%02x", $bgRGB->red(), $bgRGB->green(), $bgRGB->blue()); - $fgFill = sprintf("%02x%02x%02x", $fgRGB->red(), $fgRGB->green(), $fgRGB->blue()); + $fill = sprintf('%02x%02x%02x', $bgRGB->red(), $bgRGB->green(), $bgRGB->blue()); + $fgFill = sprintf('%02x%02x%02x', $fgRGB->red(), $fgRGB->green(), $fgRGB->blue()); $text = $this->getAvatarText(); $toReplace = ['{size}', '{fill}', '{fgFill}', '{letter}']; return str_replace($toReplace, [$size, $fill, $fgFill, $text], $this->svgTemplate); @@ -104,7 +104,7 @@ abstract class Avatar implements IAvatar { } $formats = Imagick::queryFormats(); // Avatar generation breaks if RSVG format is enabled. Fall back to gd in that case - if (in_array("RSVG", $formats, true)) { + if (in_array('RSVG', $formats, true)) { return null; } try { diff --git a/lib/private/Avatar/AvatarManager.php b/lib/private/Avatar/AvatarManager.php index f8ce4d5b656..60a3d358bf4 100644 --- a/lib/private/Avatar/AvatarManager.php +++ b/lib/private/Avatar/AvatarManager.php @@ -115,7 +115,7 @@ class AvatarManager implements IAvatarManager { $folder->delete(); } catch (NotFoundException $e) { $this->logger->debug("No cache for the user $userId. Ignoring avatar deletion"); - } catch (NotPermittedException | StorageNotAvailableException $e) { + } catch (NotPermittedException|StorageNotAvailableException $e) { $this->logger->error("Unable to delete user avatars for $userId. gnoring avatar deletion"); } catch (NoUserException $e) { $this->logger->debug("Account $userId not found. Ignoring avatar deletion"); diff --git a/lib/private/BackgroundJob/JobList.php b/lib/private/BackgroundJob/JobList.php index 61c48b0eab2..dc8e33c743c 100644 --- a/lib/private/BackgroundJob/JobList.php +++ b/lib/private/BackgroundJob/JobList.php @@ -7,7 +7,6 @@ */ namespace OC\BackgroundJob; -use Doctrine\DBAL\Platforms\MySQLPlatform; use OCP\AppFramework\QueryException; use OCP\AppFramework\Utility\ITimeFactory; use OCP\AutoloadNotAllowedException; @@ -21,31 +20,23 @@ use OCP\IDBConnection; use Psr\Log\LoggerInterface; use function get_class; use function json_encode; -use function md5; use function strlen; class JobList implements IJobList { - protected IDBConnection $connection; - protected IConfig $config; - protected ITimeFactory $timeFactory; - protected LoggerInterface $logger; - - public function __construct(IDBConnection $connection, IConfig $config, ITimeFactory $timeFactory, LoggerInterface $logger) { - $this->connection = $connection; - $this->config = $config; - $this->timeFactory = $timeFactory; - $this->logger = $logger; + public function __construct( + protected IDBConnection $connection, + protected IConfig $config, + protected ITimeFactory $timeFactory, + protected LoggerInterface $logger + ) { } public function add($job, $argument = null, ?int $firstCheck = null): void { if ($firstCheck === null) { $firstCheck = $this->timeFactory->getTime(); } - if ($job instanceof IJob) { - $class = get_class($job); - } else { - $class = $job; - } + + $class = ($job instanceof IJob) ? get_class($job) : $job; $argumentJson = json_encode($argument); if (strlen($argumentJson) > 4000) { @@ -58,7 +49,7 @@ class JobList implements IJobList { ->values([ 'class' => $query->createNamedParameter($class), 'argument' => $query->createNamedParameter($argumentJson), - 'argument_hash' => $query->createNamedParameter(md5($argumentJson)), + 'argument_hash' => $query->createNamedParameter(hash('sha256', $argumentJson)), 'last_run' => $query->createNamedParameter(0, IQueryBuilder::PARAM_INT), 'last_checked' => $query->createNamedParameter($firstCheck, IQueryBuilder::PARAM_INT), ]); @@ -68,7 +59,7 @@ class JobList implements IJobList { ->set('last_checked', $query->createNamedParameter($firstCheck, IQueryBuilder::PARAM_INT)) ->set('last_run', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT)) ->where($query->expr()->eq('class', $query->createNamedParameter($class))) - ->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(md5($argumentJson)))); + ->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(hash('sha256', $argumentJson)))); } $query->executeStatement(); } @@ -82,34 +73,30 @@ class JobList implements IJobList { * @param mixed $argument */ public function remove($job, $argument = null): void { - if ($job instanceof IJob) { - $class = get_class($job); - } else { - $class = $job; - } + $class = ($job instanceof IJob) ? get_class($job) : $job; $query = $this->connection->getQueryBuilder(); $query->delete('jobs') ->where($query->expr()->eq('class', $query->createNamedParameter($class))); if (!is_null($argument)) { $argumentJson = json_encode($argument); - $query->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(md5($argumentJson)))); + $query->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(hash('sha256', $argumentJson)))); } // Add galera safe delete chunking if using mysql // Stops us hitting wsrep_max_ws_rows when large row counts are deleted - if ($this->connection->getDatabasePlatform() instanceof MySQLPlatform) { + if ($this->connection->getDatabaseProvider() === IDBConnection::PLATFORM_MYSQL) { // Then use chunked delete $max = IQueryBuilder::MAX_ROW_DELETION; $query->setMaxResults($max); do { - $deleted = $query->execute(); + $deleted = $query->executeStatement(); } while ($deleted === $max); } else { // Dont use chunked delete - let the DB handle the large row count natively - $query->execute(); + $query->executeStatement(); } } @@ -127,34 +114,28 @@ class JobList implements IJobList { * @param mixed $argument */ public function has($job, $argument): bool { - if ($job instanceof IJob) { - $class = get_class($job); - } else { - $class = $job; - } + $class = ($job instanceof IJob) ? get_class($job) : $job; $argument = json_encode($argument); $query = $this->connection->getQueryBuilder(); $query->select('id') ->from('jobs') ->where($query->expr()->eq('class', $query->createNamedParameter($class))) - ->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(md5($argument)))) + ->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(hash('sha256', $argument)))) ->setMaxResults(1); $result = $query->executeQuery(); $row = $result->fetch(); $result->closeCursor(); - return (bool) $row; + return (bool)$row; } public function getJobs($job, ?int $limit, int $offset): array { $iterable = $this->getJobsIterator($job, $limit, $offset); - if (is_array($iterable)) { - return $iterable; - } else { - return iterator_to_array($iterable); - } + return (is_array($iterable)) + ? $iterable + : iterator_to_array($iterable); } /** @@ -169,11 +150,7 @@ class JobList implements IJobList { ->setFirstResult($offset); if ($job !== null) { - if ($job instanceof IJob) { - $class = get_class($job); - } else { - $class = $job; - } + $class = ($job instanceof IJob) ? get_class($job) : $job; $query->where($query->expr()->eq('class', $query->createNamedParameter($class))); } @@ -204,12 +181,12 @@ class JobList implements IJobList { $query->andWhere($query->expr()->eq('time_sensitive', $query->createNamedParameter(IJob::TIME_SENSITIVE, IQueryBuilder::PARAM_INT))); } - if ($jobClasses !== null && count($jobClasses) > 0) { - $orClasses = $query->expr()->orx(); + if (!empty($jobClasses)) { + $orClasses = []; foreach ($jobClasses as $jobClass) { - $orClasses->add($query->expr()->eq('class', $query->createNamedParameter($jobClass, IQueryBuilder::PARAM_STR))); + $orClasses[] = $query->expr()->eq('class', $query->createNamedParameter($jobClass, IQueryBuilder::PARAM_STR)); } - $query->andWhere($orClasses); + $query->andWhere($query->expr()->orX(...$orClasses)); } $result = $query->executeQuery(); @@ -220,7 +197,7 @@ class JobList implements IJobList { $job = $this->buildJob($row); if ($job instanceof IParallelAwareJob && !$job->getAllowParallelRuns() && $this->hasReservedJob(get_class($job))) { - $this->logger->debug('Skipping ' . get_class($job) . ' job with ID ' . $job->getId() . ' because another job with the same class is already running', ['app' => 'cron']); + $this->logger->info('Skipping ' . get_class($job) . ' job with ID ' . $job->getId() . ' because another job with the same class is already running', ['app' => 'cron']); $update = $this->connection->getQueryBuilder(); $update->update('jobs') @@ -324,8 +301,8 @@ class JobList implements IJobList { // This most likely means an invalid job was enqueued. We can ignore it. return null; } - $job->setId((int) $row['id']); - $job->setLastRun((int) $row['last_run']); + $job->setId((int)$row['id']); + $job->setLastRun((int)$row['last_run']); $job->setArgument(json_decode($row['argument'], true)); return $job; } catch (AutoloadNotAllowedException $e) { diff --git a/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php b/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php index 61ace449453..1d0a502df6d 100644 --- a/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php +++ b/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php @@ -15,12 +15,10 @@ use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventDispatcher; use OCP\EventDispatcher\IEventListener; use OCP\Files\GenericFileException; -use OCP\Files\NotFoundException; use OCP\Files\NotPermittedException; use OCP\FilesMetadata\AMetadataEvent; use OCP\FilesMetadata\Event\MetadataBackgroundEvent; use OCP\FilesMetadata\Event\MetadataLiveEvent; -use OCP\IPreview; use OCP\Lock\LockedException; /** @@ -34,11 +32,6 @@ class GenerateBlurhashMetadata implements IEventListener { private const COMPONENTS_X = 4; private const COMPONENTS_Y = 3; - public function __construct( - private IPreview $preview, - ) { - } - /** * @throws NotPermittedException * @throws GenericFileException @@ -67,25 +60,17 @@ class GenerateBlurhashMetadata implements IEventListener { return; } - $image = false; - try { - // using preview image to generate the blurhash - $preview = $this->preview->getPreview($file, 256, 256); - $image = @imagecreatefromstring($preview->getContent()); - } catch (NotFoundException $e) { - // https://github.com/nextcloud/server/blob/9d70fd3e64b60a316a03fb2b237891380c310c58/lib/private/legacy/OC_Image.php#L668 - // The preview system can fail on huge picture, in that case we use our own image resizer. - if (str_starts_with($file->getMimetype(), 'image/')) { - $image = $this->resizedImageFromFile($file); - } + if (!str_starts_with($file->getMimetype(), 'image/')) { + return; } - if ($image === false) { + $image = $this->resizedImageFromFile($file); + if (!$image) { return; } $metadata->setString('blurhash', $this->generateBlurHash($image)) - ->setEtag('blurhash', $currentEtag); + ->setEtag('blurhash', $currentEtag); } /** diff --git a/lib/private/Calendar/Manager.php b/lib/private/Calendar/Manager.php index 7ae577c9d7f..fa324273f5c 100644 --- a/lib/private/Calendar/Manager.php +++ b/lib/private/Calendar/Manager.php @@ -53,7 +53,7 @@ class Manager implements IManager { * @param string $pattern which should match within the $searchProperties * @param array $searchProperties defines the properties within the query pattern should match * @param array $options - optional parameters: - * ['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]] + * ['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]] * @param integer|null $limit - limit number of search results * @param integer|null $offset - offset for paging of search results * @return array an array of events/journals/todos which are arrays of arrays of key-value-pairs @@ -193,6 +193,7 @@ class Manager implements IManager { foreach ($r as $o) { $o['calendar-key'] = $calendar->getKey(); + $o['calendar-uri'] = $calendar->getUri(); $results[] = $o; } } diff --git a/lib/private/Calendar/ResourcesRoomsUpdater.php b/lib/private/Calendar/ResourcesRoomsUpdater.php index ae2a2f3a650..eacdaf0aeb4 100644 --- a/lib/private/Calendar/ResourcesRoomsUpdater.php +++ b/lib/private/Calendar/ResourcesRoomsUpdater.php @@ -406,7 +406,7 @@ class ResourcesRoomsUpdater { ->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId))); $result = $query->executeQuery(); - $id = (int) $result->fetchOne(); + $id = (int)$result->fetchOne(); $result->closeCursor(); return $id; } diff --git a/lib/private/CapabilitiesManager.php b/lib/private/CapabilitiesManager.php index bb84ebb65e8..d7bf25f078a 100644 --- a/lib/private/CapabilitiesManager.php +++ b/lib/private/CapabilitiesManager.php @@ -15,6 +15,12 @@ use OCP\Capabilities\IPublicCapability; use Psr\Log\LoggerInterface; class CapabilitiesManager { + /** + * Anything above 0.1s to load the capabilities of an app qualifies for bad code + * and should be cached within the app. + */ + public const ACCEPTABLE_LOADING_TIME = 0.1; + /** @var \Closure[] */ private $capabilities = []; @@ -51,7 +57,27 @@ class CapabilitiesManager { // that we would otherwise inject to every page load continue; } + $startTime = microtime(true); $capabilities = array_replace_recursive($capabilities, $c->getCapabilities()); + $endTime = microtime(true); + $timeSpent = $endTime - $startTime; + if ($timeSpent > self::ACCEPTABLE_LOADING_TIME) { + $logLevel = match (true) { + $timeSpent > self::ACCEPTABLE_LOADING_TIME * 16 => \OCP\ILogger::FATAL, + $timeSpent > self::ACCEPTABLE_LOADING_TIME * 8 => \OCP\ILogger::ERROR, + $timeSpent > self::ACCEPTABLE_LOADING_TIME * 4 => \OCP\ILogger::WARN, + $timeSpent > self::ACCEPTABLE_LOADING_TIME * 2 => \OCP\ILogger::INFO, + default => \OCP\ILogger::DEBUG, + }; + $this->logger->log( + $logLevel, + 'Capabilities of {className} took {duration} seconds to generate.', + [ + 'className' => get_class($c), + 'duration' => round($timeSpent, 2), + ] + ); + } } } else { throw new \InvalidArgumentException('The given Capability (' . get_class($c) . ') does not implement the ICapability interface'); diff --git a/lib/private/Collaboration/AutoComplete/Manager.php b/lib/private/Collaboration/AutoComplete/Manager.php index d7298d9deef..382b9188535 100644 --- a/lib/private/Collaboration/AutoComplete/Manager.php +++ b/lib/private/Collaboration/AutoComplete/Manager.php @@ -13,7 +13,7 @@ class Manager implements IManager { /** @var string[] */ protected array $sorters = []; - /** @var ISorter[] */ + /** @var ISorter[] */ protected array $sorterInstances = []; public function __construct( diff --git a/lib/private/Collaboration/Collaborators/UserPlugin.php b/lib/private/Collaboration/Collaborators/UserPlugin.php index b4cb77ad5b8..d196abae042 100644 --- a/lib/private/Collaboration/Collaborators/UserPlugin.php +++ b/lib/private/Collaboration/Collaborators/UserPlugin.php @@ -73,7 +73,7 @@ class UserPlugin implements ISearchPlugin { foreach ($currentUserGroups as $userGroupId) { $usersInGroup = $this->groupManager->displayNamesInGroup($userGroupId, $search, $limit, $offset); foreach ($usersInGroup as $userId => $displayName) { - $userId = (string) $userId; + $userId = (string)$userId; $user = $this->userManager->get($userId); if (!$user->isEnabled()) { // Ignore disabled users @@ -130,7 +130,7 @@ class UserPlugin implements ISearchPlugin { foreach ($users as $uid => $user) { $userDisplayName = $user->getDisplayName(); $userEmail = $user->getSystemEMailAddress(); - $uid = (string) $uid; + $uid = (string)$uid; $status = []; if (array_key_exists($uid, $userStatuses)) { diff --git a/lib/private/Collaboration/Reference/ReferenceManager.php b/lib/private/Collaboration/Reference/ReferenceManager.php index 208c50a074b..9287b66b2a2 100644 --- a/lib/private/Collaboration/Reference/ReferenceManager.php +++ b/lib/private/Collaboration/Reference/ReferenceManager.php @@ -11,6 +11,7 @@ namespace OC\Collaboration\Reference; use OC\AppFramework\Bootstrap\Coordinator; use OC\Collaboration\Reference\File\FileReferenceProvider; use OCP\Collaboration\Reference\IDiscoverableReferenceProvider; +use OCP\Collaboration\Reference\IPublicReferenceProvider; use OCP\Collaboration\Reference\IReference; use OCP\Collaboration\Reference\IReferenceManager; use OCP\Collaboration\Reference\IReferenceProvider; @@ -59,14 +60,14 @@ class ReferenceManager implements IReferenceManager { /** * Try to get a cached reference object from a reference string */ - public function getReferenceFromCache(string $referenceId): ?IReference { - $matchedProvider = $this->getMatchedProvider($referenceId); + public function getReferenceFromCache(string $referenceId, bool $public = false, string $sharingToken = ''): ?IReference { + $matchedProvider = $this->getMatchedProvider($referenceId, $public); if ($matchedProvider === null) { return null; } - $cacheKey = $this->getFullCacheKey($matchedProvider, $referenceId); + $cacheKey = $this->getFullCacheKey($matchedProvider, $referenceId, $public, $sharingToken); return $this->getReferenceByCacheKey($cacheKey); } @@ -86,20 +87,25 @@ class ReferenceManager implements IReferenceManager { * Get a reference object from a reference string with a matching provider * Use a cached reference if possible */ - public function resolveReference(string $referenceId): ?IReference { - $matchedProvider = $this->getMatchedProvider($referenceId); + public function resolveReference(string $referenceId, bool $public = false, $sharingToken = ''): ?IReference { + $matchedProvider = $this->getMatchedProvider($referenceId, $public); if ($matchedProvider === null) { return null; } - $cacheKey = $this->getFullCacheKey($matchedProvider, $referenceId); + $cacheKey = $this->getFullCacheKey($matchedProvider, $referenceId, $public, $sharingToken); $cached = $this->cache->get($cacheKey); if ($cached) { return Reference::fromCache($cached); } - $reference = $matchedProvider->resolveReference($referenceId); + $reference = null; + if ($public && $matchedProvider instanceof IPublicReferenceProvider) { + $reference = $matchedProvider->resolveReferencePublic($referenceId, $sharingToken); + } elseif ($matchedProvider instanceof IReferenceProvider) { + $reference = $matchedProvider->resolveReference($referenceId); + } if ($reference) { $cachePrefix = $matchedProvider->getCachePrefix($referenceId); if ($cachePrefix !== '') { @@ -117,11 +123,14 @@ class ReferenceManager implements IReferenceManager { * Try to match a reference string with all the registered providers * Fallback to the link reference provider (using OpenGraph) * - * @return IReferenceProvider|null the first matching provider + * @return IReferenceProvider|IPublicReferenceProvider|null the first matching provider */ - private function getMatchedProvider(string $referenceId): ?IReferenceProvider { + private function getMatchedProvider(string $referenceId, bool $public): null|IReferenceProvider|IPublicReferenceProvider { $matchedProvider = null; foreach ($this->getProviders() as $provider) { + if ($public && !($provider instanceof IPublicReferenceProvider)) { + continue; + } $matchedProvider = $provider->matchReference($referenceId) ? $provider : null; if ($matchedProvider !== null) { break; @@ -138,8 +147,13 @@ class ReferenceManager implements IReferenceManager { /** * Get a hashed full cache key from a key and prefix given by a provider */ - private function getFullCacheKey(IReferenceProvider $provider, string $referenceId): string { - $cacheKey = $provider->getCacheKey($referenceId); + private function getFullCacheKey(IReferenceProvider $provider, string $referenceId, bool $public, string $sharingToken): string { + if ($public && !($provider instanceof IPublicReferenceProvider)) { + throw new \RuntimeException('Provider doesn\'t support public lookups'); + } + $cacheKey = $public + ? $provider->getCacheKeyPublic($referenceId, $sharingToken) + : $provider->getCacheKey($referenceId); return md5($provider->getCachePrefix($referenceId)) . ( $cacheKey !== null ? ('-' . md5($cacheKey)) : '' ); @@ -217,7 +231,7 @@ class ReferenceManager implements IReferenceManager { } $configKey = 'provider-last-use_' . $providerId; - $this->config->setUserValue($userId, 'references', $configKey, (string) $timestamp); + $this->config->setUserValue($userId, 'references', $configKey, (string)$timestamp); return true; } return false; @@ -240,7 +254,7 @@ class ReferenceManager implements IReferenceManager { $timestamps = []; foreach ($keys as $key) { $providerId = substr($key, strlen($prefix)); - $timestamp = (int) $this->config->getUserValue($userId, 'references', $key); + $timestamp = (int)$this->config->getUserValue($userId, 'references', $key); $timestamps[$providerId] = $timestamp; } return $timestamps; diff --git a/lib/private/Collaboration/Resources/Manager.php b/lib/private/Collaboration/Resources/Manager.php index 6c9b77d41c5..8d1e4b13287 100644 --- a/lib/private/Collaboration/Resources/Manager.php +++ b/lib/private/Collaboration/Resources/Manager.php @@ -53,7 +53,7 @@ class Manager implements IManager { throw new CollectionException('Collection not found'); } - return new Collection($this, $this->connection, (int) $row['id'], (string) $row['name']); + return new Collection($this, $this->connection, (int)$row['id'], (string)$row['name']); } /** @@ -82,12 +82,12 @@ class Manager implements IManager { throw new CollectionException('Collection not found'); } - $access = $row['access'] === null ? null : (bool) $row['access']; + $access = $row['access'] === null ? null : (bool)$row['access']; if ($user instanceof IUser) { - return new Collection($this, $this->connection, (int) $row['id'], (string) $row['name'], $user, $access); + return new Collection($this, $this->connection, (int)$row['id'], (string)$row['name'], $user, $access); } - return new Collection($this, $this->connection, (int) $row['id'], (string) $row['name'], $user, $access); + return new Collection($this, $this->connection, (int)$row['id'], (string)$row['name'], $user, $access); } /** @@ -122,7 +122,7 @@ class Manager implements IManager { $foundResults = 0; while ($row = $result->fetch()) { $foundResults++; - $access = $row['access'] === null ? null : (bool) $row['access']; + $access = $row['access'] === null ? null : (bool)$row['access']; $collection = new Collection($this, $this->connection, (int)$row['id'], (string)$row['name'], $user, $access); if ($collection->canAccess($user)) { $collections[] = $collection; @@ -186,7 +186,7 @@ class Manager implements IManager { throw new ResourceException('Resource not found'); } - $access = $row['access'] === null ? null : (bool) $row['access']; + $access = $row['access'] === null ? null : (bool)$row['access']; if ($user instanceof IUser) { return new Resource($this, $this->connection, $type, $id, $user, $access); } @@ -217,7 +217,7 @@ class Manager implements IManager { $resources = []; $result = $query->execute(); while ($row = $result->fetch()) { - $access = $row['access'] === null ? null : (bool) $row['access']; + $access = $row['access'] === null ? null : (bool)$row['access']; $resources[] = new Resource($this, $this->connection, $row['resource_type'], $row['resource_id'], $user, $access); } $result->closeCursor(); @@ -311,7 +311,7 @@ class Manager implements IManager { $hasAccess = null; $result = $query->execute(); if ($row = $result->fetch()) { - $hasAccess = (bool) $row['access']; + $hasAccess = (bool)$row['access']; } $result->closeCursor(); @@ -331,7 +331,7 @@ class Manager implements IManager { $hasAccess = null; $result = $query->execute(); if ($row = $result->fetch()) { - $hasAccess = (bool) $row['access']; + $hasAccess = (bool)$row['access']; } $result->closeCursor(); diff --git a/lib/private/Collaboration/Resources/Resource.php b/lib/private/Collaboration/Resources/Resource.php index ae011e319de..34f68aeee11 100644 --- a/lib/private/Collaboration/Resources/Resource.php +++ b/lib/private/Collaboration/Resources/Resource.php @@ -104,7 +104,7 @@ class Resource implements IResource { $result = $query->execute(); while ($row = $result->fetch()) { - $collections[] = $this->manager->getCollection((int) $row['collection_id']); + $collections[] = $this->manager->getCollection((int)$row['collection_id']); } $result->closeCursor(); diff --git a/lib/private/Comments/Comment.php b/lib/private/Comments/Comment.php index 422e29c084d..c67358cc854 100644 --- a/lib/private/Comments/Comment.php +++ b/lib/private/Comments/Comment.php @@ -16,7 +16,7 @@ class Comment implements IComment { 'id' => '', 'parentId' => '0', 'topmostParentId' => '0', - 'childrenCount' => '0', + 'childrenCount' => 0, 'message' => '', 'verb' => '', 'actorType' => '', @@ -34,8 +34,8 @@ class Comment implements IComment { /** * Comment constructor. * - * @param array $data optional, array with keys according to column names from - * the comments database scheme + * @param array $data optional, array with keys according to column names from + * the comments database scheme */ public function __construct(?array $data = null) { if (is_array($data)) { diff --git a/lib/private/Comments/Manager.php b/lib/private/Comments/Manager.php index 21ff5322f23..8b7f43c03a2 100644 --- a/lib/private/Comments/Manager.php +++ b/lib/private/Comments/Manager.php @@ -33,10 +33,10 @@ class Manager implements ICommentsManager { /** @var IComment[] */ protected array $commentsCache = []; - /** @var \Closure[] */ + /** @var \Closure[] */ protected array $eventHandlerClosures = []; - /** @var ICommentsEventHandler[] */ + /** @var ICommentsEventHandler[] */ protected array $eventHandlers = []; /** @var \Closure[] */ @@ -132,7 +132,7 @@ class Manager implements ICommentsManager { try { $comment->getCreationDateTime(); - } catch(\LogicException $e) { + } catch (\LogicException $e) { $comment->setCreationDateTime(new \DateTime()); } @@ -308,10 +308,10 @@ class Manager implements ICommentsManager { * @param string $objectType the object type, e.g. 'files' * @param string $objectId the id of the object * @param int $limit optional, number of maximum comments to be returned. if - * not specified, all comments are returned. + * not specified, all comments are returned. * @param int $offset optional, starting point * @param \DateTime $notOlderThan optional, timestamp of the oldest comments - * that may be returned + * that may be returned * @return list<IComment> * @since 9.0.0 */ @@ -362,7 +362,7 @@ class Manager implements ICommentsManager { * @param int $lastKnownCommentId the last known comment (will be used as offset) * @param string $sortDirection direction of the comments (`asc` or `desc`) * @param int $limit optional, number of maximum comments to be returned. if - * set to 0, all comments are returned. + * set to 0, all comments are returned. * @param bool $includeLastKnown * @return list<IComment> */ @@ -392,7 +392,7 @@ class Manager implements ICommentsManager { * @param int $lastKnownCommentId the last known comment (will be used as offset) * @param string $sortDirection direction of the comments (`asc` or `desc`) * @param int $limit optional, number of maximum comments to be returned. if - * set to 0, all comments are returned. + * set to 0, all comments are returned. * @param bool $includeLastKnown * @return list<IComment> */ @@ -608,7 +608,7 @@ class Manager implements ICommentsManager { * @param $objectType string the object type, e.g. 'files' * @param $objectId string the id of the object * @param \DateTime $notOlderThan optional, timestamp of the oldest comments - * that may be returned + * that may be returned * @param string $verb Limit the verb of the comment - Added in 14.0.0 * @return Int * @since 9.0.0 @@ -675,7 +675,7 @@ class Manager implements ICommentsManager { $result = $query->executeQuery(); while ($row = $result->fetch()) { - $unreadComments[$row['object_id']] = (int) $row['num_comments']; + $unreadComments[$row['object_id']] = (int)$row['num_comments']; } $result->closeCursor(); } @@ -723,7 +723,7 @@ class Manager implements ICommentsManager { $data = $result->fetch(); $result->closeCursor(); - return (int) ($data['num_messages'] ?? 0); + return (int)($data['num_messages'] ?? 0); } /** @@ -751,7 +751,7 @@ class Manager implements ICommentsManager { $data = $result->fetch(); $result->closeCursor(); - return (int) ($data['id'] ?? 0); + return (int)($data['id'] ?? 0); } /** @@ -808,9 +808,9 @@ class Manager implements ICommentsManager { return []; } $children = $directory->getDirectoryListing(); - $ids = array_map(fn (FileInfo $child) => (string) $child->getId(), $children); + $ids = array_map(fn (FileInfo $child) => (string)$child->getId(), $children); - $ids[] = (string) $directory->getId(); + $ids[] = (string)$directory->getId(); $counts = $this->getNumberOfUnreadCommentsForObjects('files', $ids, $user); return array_filter($counts, function (int $count) { return $count > 0; @@ -1079,7 +1079,7 @@ class Manager implements ICommentsManager { $result = $this->update($comment); } - if ($result && !!$comment->getParentId()) { + if ($result && (bool)$comment->getParentId()) { $this->updateChildrenInformation( $comment->getParentId(), $comment->getCreationDateTime() @@ -1141,7 +1141,7 @@ class Manager implements ICommentsManager { ->andWhere($qb->expr()->eq('actor_id', $qb->createNamedParameter($reaction->getActorId()))) ->andWhere($qb->expr()->eq('reaction', $qb->createNamedParameter($reaction->getMessage()))); $result = $qb->executeQuery(); - $exists = (int) $result->fetchOne(); + $exists = (int)$result->fetchOne(); if (!$exists) { $qb = $this->dbConn->getQueryBuilder(); try { diff --git a/lib/private/Config.php b/lib/private/Config.php index 46c32d5f628..08f9b028856 100644 --- a/lib/private/Config.php +++ b/lib/private/Config.php @@ -183,7 +183,7 @@ class Config { // Invalidate opcache (only if the timestamp changed) if (function_exists('opcache_invalidate')) { - opcache_invalidate($file, false); + @opcache_invalidate($file, false); } $filePointer = @fopen($file, 'r'); @@ -276,7 +276,7 @@ class Config { $df = disk_free_space($this->configDir); $size = strlen($content) + 10240; if ($df !== false && $df < (float)$size) { - throw new \Exception($this->configDir . " does not have enough space for writing the config file! Not writing it back!"); + throw new \Exception($this->configDir . ' does not have enough space for writing the config file! Not writing it back!'); } } diff --git a/lib/private/Console/Application.php b/lib/private/Console/Application.php index 14baa528940..22dc8d0c65e 100644 --- a/lib/private/Console/Application.php +++ b/lib/private/Console/Application.php @@ -7,14 +7,18 @@ */ namespace OC\Console; +use ArgumentCountError; use OC\MemoryInfo; use OC\NeedsUpdateException; +use OC\SystemConfig; use OCP\App\AppPathNotFoundException; use OCP\App\IAppManager; use OCP\Console\ConsoleEvent; +use OCP\Defaults; use OCP\EventDispatcher\IEventDispatcher; use OCP\IConfig; use OCP\IRequest; +use OCP\Server; use Psr\Container\ContainerExceptionInterface; use Psr\Log\LoggerInterface; use Symfony\Component\Console\Application as SymfonyApplication; @@ -33,8 +37,8 @@ class Application { private LoggerInterface $logger, private MemoryInfo $memoryInfo, private IAppManager $appManager, + private Defaults $defaults, ) { - $defaults = \OC::$server->get('ThemingDefaults'); $this->application = new SymfonyApplication($defaults->getName(), \OC_Util::getVersionString()); } @@ -44,7 +48,7 @@ class Application { public function loadCommands( InputInterface $input, ConsoleOutputInterface $output - ) { + ): void { // $application is required to be defined in the register_command scripts $application = $this->application; $inputDefinition = $application->getDefinition(); @@ -94,7 +98,7 @@ class Application { try { $this->loadCommandsFromInfoXml($info['commands']); } catch (\Throwable $e) { - $output->writeln("<error>" . $e->getMessage() . "</error>"); + $output->writeln('<error>' . $e->getMessage() . '</error>'); $this->logger->error($e->getMessage(), [ 'exception' => $e, ]); @@ -116,25 +120,25 @@ class Application { } } elseif ($input->getArgument('command') !== '_completion' && $input->getArgument('command') !== 'maintenance:install') { $errorOutput = $output->getErrorOutput(); - $errorOutput->writeln("Nextcloud is not installed - only a limited number of commands are available"); + $errorOutput->writeln('Nextcloud is not installed - only a limited number of commands are available'); } - } catch (NeedsUpdateException $e) { + } catch (NeedsUpdateException) { if ($input->getArgument('command') !== '_completion') { $errorOutput = $output->getErrorOutput(); - $errorOutput->writeln("Nextcloud or one of the apps require upgrade - only a limited number of commands are available"); - $errorOutput->writeln("You may use your browser or the occ upgrade command to do the upgrade"); + $errorOutput->writeln('Nextcloud or one of the apps require upgrade - only a limited number of commands are available'); + $errorOutput->writeln('You may use your browser or the occ upgrade command to do the upgrade'); } } if ($input->getFirstArgument() !== 'check') { - $errors = \OC_Util::checkServer(\OC::$server->getSystemConfig()); + $errors = \OC_Util::checkServer(Server::get(SystemConfig::class)); if (!empty($errors)) { foreach ($errors as $error) { $output->writeln((string)$error['error']); $output->writeln((string)$error['hint']); $output->writeln(''); } - throw new \Exception("Environment not properly prepared."); + throw new \Exception('Environment not properly prepared.'); } } } @@ -145,7 +149,7 @@ class Application { * * @param InputInterface $input The input implementation for reading inputs. * @param ConsoleOutputInterface $output The output implementation - * for writing outputs. + * for writing outputs. * @return void */ private function writeMaintenanceModeInfo(InputInterface $input, ConsoleOutputInterface $output): void { @@ -163,13 +167,11 @@ class Application { * * @param bool $boolean Whether to automatically exit after a command execution or not */ - public function setAutoExit($boolean) { + public function setAutoExit(bool $boolean): void { $this->application->setAutoExit($boolean); } /** - * @param InputInterface $input - * @param OutputInterface $output * @return int * @throws \Exception */ @@ -183,15 +185,18 @@ class Application { return $this->application->run($input, $output); } - private function loadCommandsFromInfoXml($commands) { + /** + * @throws \Exception + */ + private function loadCommandsFromInfoXml(iterable $commands): void { foreach ($commands as $command) { try { - $c = \OCP\Server::get($command); + $c = Server::get($command); } catch (ContainerExceptionInterface $e) { if (class_exists($command)) { try { $c = new $command(); - } catch (\ArgumentCountError $e2) { + } catch (ArgumentCountError) { throw new \Exception("Failed to construct console command '$command': " . $e->getMessage(), 0, $e); } } else { diff --git a/lib/private/Console/TimestampFormatter.php b/lib/private/Console/TimestampFormatter.php index de0675cc5df..da1b7ba48dd 100644 --- a/lib/private/Console/TimestampFormatter.php +++ b/lib/private/Console/TimestampFormatter.php @@ -81,7 +81,7 @@ class TimestampFormatter implements OutputFormatterInterface { * * @param string|null $message The message to style * @return string|null The styled message, prepended with a timestamp using the - * log timezone and dateformat, e.g. "2015-06-23T17:24:37+02:00" + * log timezone and dateformat, e.g. "2015-06-23T17:24:37+02:00" */ public function format(?string $message): ?string { if (!$this->formatter->isDecorated()) { diff --git a/lib/private/Contacts/ContactsMenu/ContactsStore.php b/lib/private/Contacts/ContactsMenu/ContactsStore.php index d7cdb5efebf..d15e6e35706 100644 --- a/lib/private/Contacts/ContactsMenu/ContactsStore.php +++ b/lib/private/Contacts/ContactsMenu/ContactsStore.php @@ -348,7 +348,7 @@ class ContactsStore implements IContactsStore { $entry->setFullName($contact['FN']); } - $avatarPrefix = "VALUE=uri:"; + $avatarPrefix = 'VALUE=uri:'; if (!empty($contact['PHOTO']) && str_starts_with($contact['PHOTO'], $avatarPrefix)) { $entry->setAvatar(substr($contact['PHOTO'], strlen($avatarPrefix))); } diff --git a/lib/private/ContactsManager.php b/lib/private/ContactsManager.php index f67cb196eef..7dd2bf33124 100644 --- a/lib/private/ContactsManager.php +++ b/lib/private/ContactsManager.php @@ -19,14 +19,14 @@ class ContactsManager implements IManager { * @param string $pattern which should match within the $searchProperties * @param array $searchProperties defines the properties within the query pattern should match * @param array $options = array() to define the search behavior - * - 'types' boolean (since 15.0.0) If set to true, fields that come with a TYPE property will be an array - * example: ['id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => ['type => 'HOME', 'value' => 'g@h.i']] - * - 'escape_like_param' - If set to false wildcards _ and % are not escaped - * - 'limit' - Set a numeric limit for the search results - * - 'offset' - Set the offset for the limited search results - * - 'enumeration' - (since 23.0.0) Whether user enumeration on system address book is allowed - * - 'fullmatch' - (since 23.0.0) Whether matching on full detail in system address book is allowed - * - 'strict_search' - (since 23.0.0) Whether the search pattern is full string or partial search + * - 'types' boolean (since 15.0.0) If set to true, fields that come with a TYPE property will be an array + * example: ['id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => ['type => 'HOME', 'value' => 'g@h.i']] + * - 'escape_like_param' - If set to false wildcards _ and % are not escaped + * - 'limit' - Set a numeric limit for the search results + * - 'offset' - Set the offset for the limited search results + * - 'enumeration' - (since 23.0.0) Whether user enumeration on system address book is allowed + * - 'fullmatch' - (since 23.0.0) Whether matching on full detail in system address book is allowed + * - 'strict_search' - (since 23.0.0) Whether the search pattern is full string or partial search * @psalm-param array{types?: bool, escape_like_param?: bool, limit?: int, offset?: int, enumeration?: bool, fullmatch?: bool, strict_search?: bool} $options * @return array an array of contacts which are arrays of key-value-pairs */ diff --git a/lib/private/DB/Adapter.php b/lib/private/DB/Adapter.php index b5be14e5dc6..71824bda9e8 100644 --- a/lib/private/DB/Adapter.php +++ b/lib/private/DB/Adapter.php @@ -32,7 +32,7 @@ class Adapter { * @throws Exception */ public function lastInsertId($table) { - return (int) $this->conn->realLastInsertId($table); + return (int)$this->conn->realLastInsertId($table); } /** @@ -46,11 +46,10 @@ class Adapter { /** * Create an exclusive read+write lock on a table * - * @param string $tableName * @throws Exception * @since 9.1.0 */ - public function lockTable($tableName) { + public function lockTable(string $tableName) { $this->conn->beginTransaction(); $this->conn->executeUpdate('LOCK TABLE `' .$tableName . '` IN EXCLUSIVE MODE'); } @@ -73,19 +72,21 @@ class Adapter { * @param string $table The table name (will replace *PREFIX* with the actual prefix) * @param array $input data that should be inserted into the table (column name => value) * @param array|null $compare List of values that should be checked for "if not exists" - * If this is null or an empty array, all keys of $input will be compared - * Please note: text fields (clob) must not be used in the compare array + * If this is null or an empty array, all keys of $input will be compared + * Please note: text fields (clob) must not be used in the compare array * @return int number of inserted rows * @throws Exception * @deprecated 15.0.0 - use unique index and "try { $db->insert() } catch (UniqueConstraintViolationException $e) {}" instead, because it is more reliable and does not have the risk for deadlocks - see https://github.com/nextcloud/server/pull/12371 */ public function insertIfNotExist($table, $input, ?array $compare = null) { - if (empty($compare)) { - $compare = array_keys($input); - } - $query = 'INSERT INTO `' .$table . '` (`' - . implode('`,`', array_keys($input)) . '`) SELECT ' - . str_repeat('?,', count($input) - 1).'? ' // Is there a prettier alternative? + $compare = $compare ?: array_keys($input); + + // Prepare column names and generate placeholders + $columns = '`' . implode('`,`', array_keys($input)) . '`'; + $placeholders = implode(', ', array_fill(0, count($input), '?')); + + $query = 'INSERT INTO `' . $table . '` (' . $columns . ') ' + . 'SELECT ' . $placeholders . ' ' . 'FROM `' . $table . '` WHERE '; $inserts = array_values($input); @@ -104,10 +105,9 @@ class Adapter { try { return $this->conn->executeUpdate($query, $inserts); } catch (UniqueConstraintViolationException $e) { - // if this is thrown then a concurrent insert happened between the insert and the sub-select in the insert, that should have avoided it - // it's fine to ignore this then - // - // more discussions about this can be found at https://github.com/nextcloud/server/pull/12315 + // This exception indicates a concurrent insert happened between + // the insert and the sub-select in the insert, which is safe to ignore. + // More details: https://github.com/nextcloud/server/pull/12315 return 0; } } diff --git a/lib/private/DB/AdapterSqlite.php b/lib/private/DB/AdapterSqlite.php index 24274cbcda6..0023ee15364 100644 --- a/lib/private/DB/AdapterSqlite.php +++ b/lib/private/DB/AdapterSqlite.php @@ -38,8 +38,8 @@ class AdapterSqlite extends Adapter { * @param string $table The table name (will replace *PREFIX* with the actual prefix) * @param array $input data that should be inserted into the table (column name => value) * @param array|null $compare List of values that should be checked for "if not exists" - * If this is null or an empty array, all keys of $input will be compared - * Please note: text fields (clob) must not be used in the compare array + * If this is null or an empty array, all keys of $input will be compared + * Please note: text fields (clob) must not be used in the compare array * @return int number of inserted rows * @throws \Doctrine\DBAL\Exception * @deprecated 15.0.0 - use unique index and "try { $db->insert() } catch (UniqueConstraintViolationException $e) {}" instead, because it is more reliable and does not have the risk for deadlocks - see https://github.com/nextcloud/server/pull/12371 diff --git a/lib/private/DB/ArrayResult.php b/lib/private/DB/ArrayResult.php new file mode 100644 index 00000000000..b567ad23d57 --- /dev/null +++ b/lib/private/DB/ArrayResult.php @@ -0,0 +1,74 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-only + */ + +namespace OC\DB; + +use OCP\DB\IResult; +use PDO; + +/** + * Wrap an array or rows into a result interface + */ +class ArrayResult implements IResult { + protected int $count; + + public function __construct( + protected array $rows, + ) { + $this->count = count($this->rows); + } + + public function closeCursor(): bool { + // noop + return true; + } + + public function fetch(int $fetchMode = PDO::FETCH_ASSOC) { + $row = array_shift($this->rows); + if (!$row) { + return false; + } + return match ($fetchMode) { + PDO::FETCH_ASSOC => $row, + PDO::FETCH_NUM => array_values($row), + PDO::FETCH_COLUMN => current($row), + default => throw new \InvalidArgumentException('Fetch mode not supported for array result'), + }; + + } + + public function fetchAll(int $fetchMode = PDO::FETCH_ASSOC): array { + return match ($fetchMode) { + PDO::FETCH_ASSOC => $this->rows, + PDO::FETCH_NUM => array_map(function ($row) { + return array_values($row); + }, $this->rows), + PDO::FETCH_COLUMN => array_map(function ($row) { + return current($row); + }, $this->rows), + default => throw new \InvalidArgumentException('Fetch mode not supported for array result'), + }; + } + + public function fetchColumn() { + return $this->fetchOne(); + } + + public function fetchOne() { + $row = $this->fetch(); + if ($row) { + return current($row); + } else { + return false; + } + } + + public function rowCount(): int { + return $this->count; + } +} diff --git a/lib/private/DB/Connection.php b/lib/private/DB/Connection.php index c886cb20235..ecc6d09bc95 100644 --- a/lib/private/DB/Connection.php +++ b/lib/private/DB/Connection.php @@ -13,18 +13,31 @@ use Doctrine\DBAL\Cache\QueryCacheProfile; use Doctrine\DBAL\Configuration; use Doctrine\DBAL\Connections\PrimaryReadReplicaConnection; use Doctrine\DBAL\Driver; +use Doctrine\DBAL\Driver\ServerInfoAwareConnection; use Doctrine\DBAL\Exception; use Doctrine\DBAL\Exception\ConnectionLost; use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Platforms\OraclePlatform; +use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Result; use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Statement; +use OC\DB\QueryBuilder\Partitioned\PartitionedQueryBuilder; +use OC\DB\QueryBuilder\Partitioned\PartitionSplit; use OC\DB\QueryBuilder\QueryBuilder; +use OC\DB\QueryBuilder\Sharded\AutoIncrementHandler; +use OC\DB\QueryBuilder\Sharded\CrossShardMoveHelper; +use OC\DB\QueryBuilder\Sharded\RoundRobinShardMapper; +use OC\DB\QueryBuilder\Sharded\ShardConnectionManager; +use OC\DB\QueryBuilder\Sharded\ShardDefinition; use OC\SystemConfig; use OCP\DB\QueryBuilder\IQueryBuilder; +use OCP\DB\QueryBuilder\Sharded\IShardMapper; use OCP\Diagnostics\IEventLogger; +use OCP\ICacheFactory; +use OCP\IDBConnection; +use OCP\ILogger; use OCP\IRequestId; use OCP\PreConditionNotMetException; use OCP\Profiler\IProfiler; @@ -66,9 +79,35 @@ class Connection extends PrimaryReadReplicaConnection { /** @var array<string, int> */ protected $tableDirtyWrites = []; + protected bool $logDbException = false; + private ?array $transactionBacktrace = null; + protected bool $logRequestId; protected string $requestId; + /** @var array<string, list<string>> */ + protected array $partitions; + /** @var ShardDefinition[] */ + protected array $shards = []; + protected ShardConnectionManager $shardConnectionManager; + protected AutoIncrementHandler $autoIncrementHandler; + protected bool $isShardingEnabled; + + public const SHARD_PRESETS = [ + 'filecache' => [ + 'companion_keys' => [ + 'file_id', + ], + 'companion_tables' => [ + 'filecache_extended', + 'files_metadata', + ], + 'primary_key' => 'fileid', + 'shard_key' => 'storage', + 'table' => 'filecache', + ], + ]; + /** * Initializes a new instance of the Connection class. * @@ -92,12 +131,23 @@ class Connection extends PrimaryReadReplicaConnection { parent::__construct($params, $driver, $config, $eventManager); $this->adapter = new $params['adapter']($this); $this->tablePrefix = $params['tablePrefix']; - + $this->isShardingEnabled = isset($this->params['sharding']) && !empty($this->params['sharding']); + + if ($this->isShardingEnabled) { + /** @psalm-suppress InvalidArrayOffset */ + $this->shardConnectionManager = $this->params['shard_connection_manager'] ?? Server::get(ShardConnectionManager::class); + /** @psalm-suppress InvalidArrayOffset */ + $this->autoIncrementHandler = $this->params['auto_increment_handler'] ?? new AutoIncrementHandler( + Server::get(ICacheFactory::class), + $this->shardConnectionManager, + ); + } $this->systemConfig = \OC::$server->getSystemConfig(); $this->clock = Server::get(ClockInterface::class); $this->logger = Server::get(LoggerInterface::class); $this->logRequestId = $this->systemConfig->getValue('db.log_request_id', false); + $this->logDbException = $this->systemConfig->getValue('db.log_exceptions', false); $this->requestId = Server::get(IRequestId::class)->getId(); /** @var \OCP\Profiler\IProfiler */ @@ -110,10 +160,54 @@ class Connection extends PrimaryReadReplicaConnection { $this->_config->setSQLLogger($debugStack); } + /** @var array<string, array{shards: array[], mapper: ?string}> $shardConfig */ + $shardConfig = $this->params['sharding'] ?? []; + $shardNames = array_keys($shardConfig); + $this->shards = array_map(function (array $config, string $name) { + if (!isset(self::SHARD_PRESETS[$name])) { + throw new \Exception("Shard preset $name not found"); + } + + $shardMapperClass = $config['mapper'] ?? RoundRobinShardMapper::class; + $shardMapper = Server::get($shardMapperClass); + if (!$shardMapper instanceof IShardMapper) { + throw new \Exception("Invalid shard mapper: $shardMapperClass"); + } + return new ShardDefinition( + self::SHARD_PRESETS[$name]['table'], + self::SHARD_PRESETS[$name]['primary_key'], + self::SHARD_PRESETS[$name]['companion_keys'], + self::SHARD_PRESETS[$name]['shard_key'], + $shardMapper, + self::SHARD_PRESETS[$name]['companion_tables'], + $config['shards'] + ); + }, $shardConfig, $shardNames); + $this->shards = array_combine($shardNames, $this->shards); + $this->partitions = array_map(function (ShardDefinition $shard) { + return array_merge([$shard->table], $shard->companionTables); + }, $this->shards); + $this->setNestTransactionsWithSavepoints(true); } /** + * @return IDBConnection[] + */ + public function getShardConnections(): array { + $connections = []; + if ($this->isShardingEnabled) { + foreach ($this->shards as $shardDefinition) { + foreach ($shardDefinition->getAllShards() as $shard) { + /** @var ConnectionAdapter $connection */ + $connections[] = $this->shardConnectionManager->getConnection($shardDefinition, $shard); + } + } + } + return $connections; + } + + /** * @throws Exception */ public function connect($connectionName = null) { @@ -161,11 +255,27 @@ class Connection extends PrimaryReadReplicaConnection { */ public function getQueryBuilder(): IQueryBuilder { $this->queriesBuilt++; - return new QueryBuilder( + + $builder = new QueryBuilder( new ConnectionAdapter($this), $this->systemConfig, $this->logger ); + if ($this->isShardingEnabled && count($this->partitions) > 0) { + $builder = new PartitionedQueryBuilder( + $builder, + $this->shards, + $this->shardConnectionManager, + $this->autoIncrementHandler, + ); + foreach ($this->partitions as $name => $tables) { + $partition = new PartitionSplit($name, $tables); + $builder->addPartition($partition); + } + return $builder; + } else { + return $builder; + } } /** @@ -232,10 +342,10 @@ class Connection extends PrimaryReadReplicaConnection { if ($limit === -1 || $limit === null) { $limit = null; } else { - $limit = (int) $limit; + $limit = (int)$limit; } if ($offset !== null) { - $offset = (int) $offset; + $offset = (int)$offset; } if (!is_null($limit)) { $platform = $this->getDatabasePlatform(); @@ -252,10 +362,10 @@ class Connection extends PrimaryReadReplicaConnection { * If the query is parametrized, a prepared statement is used. * If an SQLLogger is configured, the execution is logged. * - * @param string $sql The SQL query to execute. - * @param array $params The parameters to bind to the query, if any. - * @param array $types The types the previous parameters are in. - * @param \Doctrine\DBAL\Cache\QueryCacheProfile|null $qcp The query cache profile, optional. + * @param string $sql The SQL query to execute. + * @param array $params The parameters to bind to the query, if any. + * @param array $types The types the previous parameters are in. + * @param \Doctrine\DBAL\Cache\QueryCacheProfile|null $qcp The query cache profile, optional. * * @return Result The executed statement. * @@ -284,7 +394,7 @@ class Connection extends PrimaryReadReplicaConnection { // Read to a table that has been written to previously // While this might not necessarily mean that we did a read after write it is an indication for a code path to check $this->logger->log( - (int) ($this->systemConfig->getValue('loglevel_dirty_database_queries', null) ?? 0), + (int)($this->systemConfig->getValue('loglevel_dirty_database_queries', null) ?? 0), 'dirty table reads: ' . $sql, [ 'tables' => array_keys($this->tableDirtyWrites), @@ -301,7 +411,12 @@ class Connection extends PrimaryReadReplicaConnection { $sql = $this->finishQuery($sql); $this->queriesExecuted++; $this->logQueryToFile($sql); - return parent::executeQuery($sql, $params, $types, $qcp); + try { + return parent::executeQuery($sql, $params, $types, $qcp); + } catch (\Exception $e) { + $this->logDatabaseException($e); + throw $e; + } } /** @@ -318,10 +433,7 @@ class Connection extends PrimaryReadReplicaConnection { * @throws Exception */ public function executeUpdate(string $sql, array $params = [], array $types = []): int { - $sql = $this->finishQuery($sql); - $this->queriesExecuted++; - $this->logQueryToFile($sql); - return parent::executeUpdate($sql, $params, $types); + return $this->executeStatement($sql, $params, $types); } /** @@ -330,9 +442,9 @@ class Connection extends PrimaryReadReplicaConnection { * * This method supports PDO binding types as well as DBAL mapping types. * - * @param string $sql The SQL query. - * @param array $params The query parameters. - * @param array $types The parameter types. + * @param string $sql The SQL query. + * @param array $params The query parameters. + * @param array $types The parameter types. * * @return int The number of affected rows. * @@ -346,7 +458,12 @@ class Connection extends PrimaryReadReplicaConnection { $sql = $this->finishQuery($sql); $this->queriesExecuted++; $this->logQueryToFile($sql); - return (int)parent::executeStatement($sql, $params, $types); + try { + return (int)parent::executeStatement($sql, $params, $types); + } catch (\Exception $e) { + $this->logDatabaseException($e); + throw $e; + } } protected function logQueryToFile(string $sql): void { @@ -412,18 +529,28 @@ class Connection extends PrimaryReadReplicaConnection { * @param string $table The table name (will replace *PREFIX* with the actual prefix) * @param array $input data that should be inserted into the table (column name => value) * @param array|null $compare List of values that should be checked for "if not exists" - * If this is null or an empty array, all keys of $input will be compared - * Please note: text fields (clob) must not be used in the compare array + * If this is null or an empty array, all keys of $input will be compared + * Please note: text fields (clob) must not be used in the compare array * @return int number of inserted rows * @throws \Doctrine\DBAL\Exception * @deprecated 15.0.0 - use unique index and "try { $db->insert() } catch (UniqueConstraintViolationException $e) {}" instead, because it is more reliable and does not have the risk for deadlocks - see https://github.com/nextcloud/server/pull/12371 */ public function insertIfNotExist($table, $input, ?array $compare = null) { - return $this->adapter->insertIfNotExist($table, $input, $compare); + try { + return $this->adapter->insertIfNotExist($table, $input, $compare); + } catch (\Exception $e) { + $this->logDatabaseException($e); + throw $e; + } } public function insertIgnoreConflict(string $table, array $values) : int { - return $this->adapter->insertIgnoreConflict($table, $values); + try { + return $this->adapter->insertIgnoreConflict($table, $values); + } catch (\Exception $e) { + $this->logDatabaseException($e); + throw $e; + } } private function getType($value) { @@ -472,22 +599,22 @@ class Connection extends PrimaryReadReplicaConnection { foreach ($values as $name => $value) { $updateQb->set($name, $updateQb->createNamedParameter($value, $this->getType($value))); } - $where = $updateQb->expr()->andX(); + $where = []; $whereValues = array_merge($keys, $updatePreconditionValues); foreach ($whereValues as $name => $value) { if ($value === '') { - $where->add($updateQb->expr()->emptyString( + $where[] = $updateQb->expr()->emptyString( $name - )); + ); } else { - $where->add($updateQb->expr()->eq( + $where[] = $updateQb->expr()->eq( $name, $updateQb->createNamedParameter($value, $this->getType($value)), $this->getType($value) - )); + ); } } - $updateQb->where($where); + $updateQb->where($updateQb->expr()->andX(...$where)); $affected = $updateQb->executeStatement(); if ($affected === 0 && !empty($updatePreconditionValues)) { @@ -561,7 +688,7 @@ class Connection extends PrimaryReadReplicaConnection { */ public function dropTable($table) { $table = $this->tablePrefix . trim($table); - $schema = $this->getSchemaManager(); + $schema = $this->createSchemaManager(); if ($schema->tablesExist([$table])) { $schema->dropTable($table); } @@ -577,7 +704,7 @@ class Connection extends PrimaryReadReplicaConnection { */ public function tableExists($table) { $table = $this->tablePrefix . trim($table); - $schema = $this->getSchemaManager(); + $schema = $this->createSchemaManager(); return $schema->tablesExist([$table]); } @@ -585,7 +712,7 @@ class Connection extends PrimaryReadReplicaConnection { $statement = $this->replaceTablePrefix($statement); $statement = $this->adapter->fixupStatement($statement); if ($this->logRequestId) { - return $statement . " /* reqid: " . $this->requestId . " */"; + return $statement . ' /* reqid: ' . $this->requestId . ' */'; } else { return $statement; } @@ -662,6 +789,9 @@ class Connection extends PrimaryReadReplicaConnection { return $migrator->generateChangeScript($toSchema); } else { $migrator->migrate($toSchema); + foreach ($this->getShardConnections() as $shardConnection) { + $shardConnection->migrateToSchema($toSchema); + } } } @@ -682,6 +812,7 @@ class Connection extends PrimaryReadReplicaConnection { public function beginTransaction() { if (!$this->inTransaction()) { + $this->transactionBacktrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); $this->transactionActiveSince = microtime(true); } return parent::beginTransaction(); @@ -691,9 +822,23 @@ class Connection extends PrimaryReadReplicaConnection { $result = parent::commit(); if ($this->getTransactionNestingLevel() === 0) { $timeTook = microtime(true) - $this->transactionActiveSince; + $this->transactionBacktrace = null; $this->transactionActiveSince = null; if ($timeTook > 1) { - $this->logger->debug('Transaction took ' . $timeTook . 's', ['exception' => new \Exception('Transaction took ' . $timeTook . 's')]); + $logLevel = match (true) { + $timeTook > 20 * 60 => ILogger::ERROR, + $timeTook > 5 * 60 => ILogger::WARN, + $timeTook > 10 => ILogger::INFO, + default => ILogger::DEBUG, + }; + $this->logger->log( + $logLevel, + 'Transaction took ' . $timeTook . 's', + [ + 'exception' => new \Exception('Transaction took ' . $timeTook . 's'), + 'timeSpent' => $timeTook, + ] + ); } } return $result; @@ -703,9 +848,23 @@ class Connection extends PrimaryReadReplicaConnection { $result = parent::rollBack(); if ($this->getTransactionNestingLevel() === 0) { $timeTook = microtime(true) - $this->transactionActiveSince; + $this->transactionBacktrace = null; $this->transactionActiveSince = null; if ($timeTook > 1) { - $this->logger->debug('Transaction rollback took longer than 1s: ' . $timeTook, ['exception' => new \Exception('Long running transaction rollback')]); + $logLevel = match (true) { + $timeTook > 20 * 60 => ILogger::ERROR, + $timeTook > 5 * 60 => ILogger::WARN, + $timeTook > 10 => ILogger::INFO, + default => ILogger::DEBUG, + }; + $this->logger->log( + $logLevel, + 'Transaction rollback took longer than 1s: ' . $timeTook, + [ + 'exception' => new \Exception('Long running transaction rollback'), + 'timeSpent' => $timeTook, + ] + ); } } return $result; @@ -732,4 +891,55 @@ class Connection extends PrimaryReadReplicaConnection { private function getConnectionName(): string { return $this->isConnectedToPrimary() ? 'primary' : 'replica'; } + + /** + * @return IDBConnection::PLATFORM_MYSQL|IDBConnection::PLATFORM_ORACLE|IDBConnection::PLATFORM_POSTGRES|IDBConnection::PLATFORM_SQLITE + */ + public function getDatabaseProvider(): string { + $platform = $this->getDatabasePlatform(); + if ($platform instanceof MySQLPlatform) { + return IDBConnection::PLATFORM_MYSQL; + } elseif ($platform instanceof OraclePlatform) { + return IDBConnection::PLATFORM_ORACLE; + } elseif ($platform instanceof PostgreSQLPlatform) { + return IDBConnection::PLATFORM_POSTGRES; + } elseif ($platform instanceof SqlitePlatform) { + return IDBConnection::PLATFORM_SQLITE; + } else { + throw new \Exception('Database ' . $platform::class . ' not supported'); + } + } + + /** + * @internal Should only be used inside the QueryBuilder, ExpressionBuilder and FunctionBuilder + * All apps and API code should not need this and instead use provided functionality from the above. + */ + public function getServerVersion(): string { + /** @var ServerInfoAwareConnection $this->_conn */ + return $this->_conn->getServerVersion(); + } + + /** + * Log a database exception if enabled + * + * @param \Exception $exception + * @return void + */ + public function logDatabaseException(\Exception $exception): void { + if ($this->logDbException) { + if ($exception instanceof Exception\UniqueConstraintViolationException) { + $this->logger->info($exception->getMessage(), ['exception' => $exception, 'transaction' => $this->transactionBacktrace]); + } else { + $this->logger->error($exception->getMessage(), ['exception' => $exception, 'transaction' => $this->transactionBacktrace]); + } + } + } + + public function getShardDefinition(string $name): ?ShardDefinition { + return $this->shards[$name] ?? null; + } + + public function getCrossShardMoveHelper(): CrossShardMoveHelper { + return new CrossShardMoveHelper($this->shardConnectionManager); + } } diff --git a/lib/private/DB/ConnectionAdapter.php b/lib/private/DB/ConnectionAdapter.php index 86a901a7de3..2baeda9cfb7 100644 --- a/lib/private/DB/ConnectionAdapter.php +++ b/lib/private/DB/ConnectionAdapter.php @@ -10,12 +10,10 @@ namespace OC\DB; use Doctrine\DBAL\Exception; use Doctrine\DBAL\Platforms\AbstractPlatform; -use Doctrine\DBAL\Platforms\MySQLPlatform; -use Doctrine\DBAL\Platforms\OraclePlatform; -use Doctrine\DBAL\Platforms\PostgreSQLPlatform; -use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Schema\Schema; use OC\DB\Exceptions\DbalException; +use OC\DB\QueryBuilder\Sharded\CrossShardMoveHelper; +use OC\DB\QueryBuilder\Sharded\ShardDefinition; use OCP\DB\IPreparedStatement; use OCP\DB\IResult; use OCP\DB\QueryBuilder\IQueryBuilder; @@ -230,18 +228,30 @@ class ConnectionAdapter implements IDBConnection { return $this->inner; } + /** + * @return self::PLATFORM_MYSQL|self::PLATFORM_ORACLE|self::PLATFORM_POSTGRES|self::PLATFORM_SQLITE + */ public function getDatabaseProvider(): string { - $platform = $this->inner->getDatabasePlatform(); - if ($platform instanceof MySQLPlatform) { - return IDBConnection::PLATFORM_MYSQL; - } elseif ($platform instanceof OraclePlatform) { - return IDBConnection::PLATFORM_ORACLE; - } elseif ($platform instanceof PostgreSQLPlatform) { - return IDBConnection::PLATFORM_POSTGRES; - } elseif ($platform instanceof SqlitePlatform) { - return IDBConnection::PLATFORM_SQLITE; - } else { - throw new \Exception('Database ' . $platform::class . ' not supported'); - } + return $this->inner->getDatabaseProvider(); + } + + /** + * @internal Should only be used inside the QueryBuilder, ExpressionBuilder and FunctionBuilder + * All apps and API code should not need this and instead use provided functionality from the above. + */ + public function getServerVersion(): string { + return $this->inner->getServerVersion(); + } + + public function logDatabaseException(\Exception $exception) { + $this->inner->logDatabaseException($exception); + } + + public function getShardDefinition(string $name): ?ShardDefinition { + return $this->inner->getShardDefinition($name); + } + + public function getCrossShardMoveHelper(): CrossShardMoveHelper { + return $this->inner->getCrossShardMoveHelper(); } } diff --git a/lib/private/DB/ConnectionFactory.php b/lib/private/DB/ConnectionFactory.php index 5e50d01538a..8d662b0508c 100644 --- a/lib/private/DB/ConnectionFactory.php +++ b/lib/private/DB/ConnectionFactory.php @@ -11,7 +11,11 @@ use Doctrine\Common\EventManager; use Doctrine\DBAL\Configuration; use Doctrine\DBAL\DriverManager; use Doctrine\DBAL\Event\Listeners\OracleSessionInit; +use OC\DB\QueryBuilder\Sharded\AutoIncrementHandler; +use OC\DB\QueryBuilder\Sharded\ShardConnectionManager; use OC\SystemConfig; +use OCP\ICacheFactory; +use OCP\Server; /** * Takes care of creating and configuring Doctrine connections. @@ -54,16 +58,13 @@ class ConnectionFactory { ], ]; - /** @var SystemConfig */ - private $config; + private ShardConnectionManager $shardConnectionManager; + private ICacheFactory $cacheFactory; - /** - * ConnectionFactory constructor. - * - * @param SystemConfig $systemConfig - */ - public function __construct(SystemConfig $systemConfig) { - $this->config = $systemConfig; + public function __construct( + private SystemConfig $config, + ?ICacheFactory $cacheFactory = null, + ) { if ($this->config->getValue('mysql.utf8mb4', false)) { $this->defaultConnectionParams['mysql']['charset'] = 'utf8mb4'; } @@ -71,6 +72,8 @@ class ConnectionFactory { if ($collationOverride) { $this->defaultConnectionParams['mysql']['collation'] = $collationOverride; } + $this->shardConnectionManager = new ShardConnectionManager($this->config, $this); + $this->cacheFactory = $cacheFactory ?? Server::get(ICacheFactory::class); } /** @@ -101,49 +104,49 @@ class ConnectionFactory { * @param array $additionalConnectionParams Additional connection parameters * @return \OC\DB\Connection */ - public function getConnection($type, $additionalConnectionParams) { + public function getConnection(string $type, array $additionalConnectionParams): Connection { $normalizedType = $this->normalizeType($type); $eventManager = new EventManager(); $eventManager->addEventSubscriber(new SetTransactionIsolationLevel()); - $additionalConnectionParams = array_merge($this->createConnectionParams(), $additionalConnectionParams); + $connectionParams = $this->createConnectionParams('', $additionalConnectionParams); switch ($normalizedType) { case 'pgsql': // pg_connect used by Doctrine DBAL does not support URI notation (enclosed in brackets) $matches = []; - if (preg_match('/^\[([^\]]+)\]$/', $additionalConnectionParams['host'], $matches)) { + if (preg_match('/^\[([^\]]+)\]$/', $connectionParams['host'], $matches)) { // Host variable carries a port or socket. - $additionalConnectionParams['host'] = $matches[1]; + $connectionParams['host'] = $matches[1]; } break; case 'oci': $eventManager->addEventSubscriber(new OracleSessionInit); // the driverOptions are unused in dbal and need to be mapped to the parameters - if (isset($additionalConnectionParams['driverOptions'])) { - $additionalConnectionParams = array_merge($additionalConnectionParams, $additionalConnectionParams['driverOptions']); + if (isset($connectionParams['driverOptions'])) { + $connectionParams = array_merge($connectionParams, $connectionParams['driverOptions']); } - $host = $additionalConnectionParams['host']; - $port = $additionalConnectionParams['port'] ?? null; - $dbName = $additionalConnectionParams['dbname']; + $host = $connectionParams['host']; + $port = $connectionParams['port'] ?? null; + $dbName = $connectionParams['dbname']; // we set the connect string as dbname and unset the host to coerce doctrine into using it as connect string if ($host === '') { - $additionalConnectionParams['dbname'] = $dbName; // use dbname as easy connect name + $connectionParams['dbname'] = $dbName; // use dbname as easy connect name } else { - $additionalConnectionParams['dbname'] = '//' . $host . (!empty($port) ? ":{$port}" : "") . '/' . $dbName; + $connectionParams['dbname'] = '//' . $host . (!empty($port) ? ":{$port}" : '') . '/' . $dbName; } - unset($additionalConnectionParams['host']); + unset($connectionParams['host']); break; case 'sqlite3': - $journalMode = $additionalConnectionParams['sqlite.journal_mode']; - $additionalConnectionParams['platform'] = new OCSqlitePlatform(); + $journalMode = $connectionParams['sqlite.journal_mode']; + $connectionParams['platform'] = new OCSqlitePlatform(); $eventManager->addEventSubscriber(new SQLiteSessionInit(true, $journalMode)); break; } /** @var Connection $connection */ $connection = DriverManager::getConnection( - $additionalConnectionParams, + $connectionParams, new Configuration(), $eventManager ); @@ -176,7 +179,7 @@ class ConnectionFactory { * @param string $configPrefix * @return array */ - public function createConnectionParams(string $configPrefix = '') { + public function createConnectionParams(string $configPrefix = '', array $additionalConnectionParams = []) { $type = $this->config->getValue('dbtype', 'sqlite'); $connectionParams = array_merge($this->getDefaultConnectionParams($type), [ @@ -186,7 +189,7 @@ class ConnectionFactory { $name = $this->config->getValue($configPrefix . 'dbname', $this->config->getValue('dbname', self::DEFAULT_DBNAME)); if ($this->normalizeType($type) === 'sqlite3') { - $dataDir = $this->config->getValue("datadirectory", \OC::$SERVERROOT . '/data'); + $dataDir = $this->config->getValue('datadirectory', \OC::$SERVERROOT . '/data'); $connectionParams['path'] = $dataDir . '/' . $name . '.db'; } else { $host = $this->config->getValue($configPrefix . 'dbhost', $this->config->getValue('dbhost', '')); @@ -221,6 +224,20 @@ class ConnectionFactory { $connectionParams['persistent'] = true; } + $connectionParams['sharding'] = $this->config->getValue('dbsharding', []); + if (!empty($connectionParams['sharding'])) { + $connectionParams['shard_connection_manager'] = $this->shardConnectionManager; + $connectionParams['auto_increment_handler'] = new AutoIncrementHandler( + $this->cacheFactory, + $this->shardConnectionManager, + ); + } else { + // just in case only the presence could lead to funny behaviour + unset($connectionParams['sharding']); + } + + $connectionParams = array_merge($connectionParams, $additionalConnectionParams); + $replica = $this->config->getValue($configPrefix . 'dbreplica', $this->config->getValue('dbreplica', [])) ?: [$connectionParams]; return array_merge($connectionParams, [ 'primary' => $connectionParams, @@ -242,7 +259,7 @@ class ConnectionFactory { // Host variable carries a port or socket. $params['host'] = $matches[1]; if (is_numeric($matches[2])) { - $params['port'] = (int) $matches[2]; + $params['port'] = (int)$matches[2]; } else { $params['unix_socket'] = $matches[2]; } diff --git a/lib/private/DB/MigrationService.php b/lib/private/DB/MigrationService.php index 19d1b240736..61a6d2baf16 100644 --- a/lib/private/DB/MigrationService.php +++ b/lib/private/DB/MigrationService.php @@ -6,20 +6,19 @@ */ namespace OC\DB; -use Doctrine\DBAL\Platforms\OraclePlatform; -use Doctrine\DBAL\Platforms\PostgreSQL94Platform; use Doctrine\DBAL\Schema\Index; use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\SchemaException; use Doctrine\DBAL\Schema\Sequence; use Doctrine\DBAL\Schema\Table; -use Doctrine\DBAL\Types\Types; use OC\App\InfoParser; use OC\IntegrityCheck\Helpers\AppLocator; use OC\Migration\SimpleOutput; use OCP\AppFramework\App; use OCP\AppFramework\QueryException; use OCP\DB\ISchemaWrapper; +use OCP\DB\Types; +use OCP\IDBConnection; use OCP\Migration\IMigrationStep; use OCP\Migration\IOutput; use OCP\Server; @@ -159,7 +158,7 @@ class MigrationService { /** * Returns all versions which have already been applied * - * @return string[] + * @return list<string> * @codeCoverageIgnore - no need to test this */ public function getMigratedVersions() { @@ -175,6 +174,8 @@ class MigrationService { $rows = $result->fetchAll(\PDO::FETCH_COLUMN); $result->closeCursor(); + usort($rows, $this->sortMigrations(...)); + return $rows; } @@ -184,7 +185,23 @@ class MigrationService { */ public function getAvailableVersions(): array { $this->ensureMigrationsAreLoaded(); - return array_map('strval', array_keys($this->migrations)); + $versions = array_map('strval', array_keys($this->migrations)); + usort($versions, $this->sortMigrations(...)); + return $versions; + } + + protected function sortMigrations(string $a, string $b): int { + preg_match('/(\d+)Date(\d+)/', basename($a), $matchA); + preg_match('/(\d+)Date(\d+)/', basename($b), $matchB); + if (!empty($matchA) && !empty($matchB)) { + $versionA = (int)$matchA[1]; + $versionB = (int)$matchB[1]; + if ($versionA !== $versionB) { + return ($versionA < $versionB) ? -1 : 1; + } + return ($matchA[2] < $matchB[2]) ? -1 : 1; + } + return (basename($a) < basename($b)) ? -1 : 1; } /** @@ -205,23 +222,13 @@ class MigrationService { \RegexIterator::GET_MATCH); $files = array_keys(iterator_to_array($iterator)); - uasort($files, function ($a, $b) { - preg_match('/^Version(\d+)Date(\d+)\\.php$/', basename($a), $matchA); - preg_match('/^Version(\d+)Date(\d+)\\.php$/', basename($b), $matchB); - if (!empty($matchA) && !empty($matchB)) { - if ($matchA[1] !== $matchB[1]) { - return ($matchA[1] < $matchB[1]) ? -1 : 1; - } - return ($matchA[2] < $matchB[2]) ? -1 : 1; - } - return (basename($a) < basename($b)) ? -1 : 1; - }); + usort($files, $this->sortMigrations(...)); $migrations = []; foreach ($files as $file) { $className = basename($file, '.php'); - $version = (string) substr($className, 7); + $version = (string)substr($className, 7); if ($version === '0') { throw new \InvalidArgumentException( "Cannot load a migrations with the name '$version' because it is a reserved number" @@ -599,7 +606,7 @@ class MigrationService { $indexName = strtolower($primaryKey->getName()); $isUsingDefaultName = $indexName === 'primary'; - if ($this->connection->getDatabasePlatform() instanceof PostgreSQL94Platform) { + if ($this->connection->getDatabaseProvider() === IDBConnection::PLATFORM_POSTGRES) { $defaultName = $table->getName() . '_pkey'; $isUsingDefaultName = strtolower($defaultName) === $indexName; @@ -609,7 +616,7 @@ class MigrationService { return $sequence->getName() !== $sequenceName; }); } - } elseif ($this->connection->getDatabasePlatform() instanceof OraclePlatform) { + } elseif ($this->connection->getDatabaseProvider() === IDBConnection::PLATFORM_ORACLE) { $defaultName = $table->getName() . '_seq'; $isUsingDefaultName = strtolower($defaultName) === $indexName; } diff --git a/lib/private/DB/Migrator.php b/lib/private/DB/Migrator.php index 4fd457b4bc6..40f8ad9676a 100644 --- a/lib/private/DB/Migrator.php +++ b/lib/private/DB/Migrator.php @@ -139,7 +139,7 @@ class Migrator { $step = 0; foreach ($sqls as $sql) { $this->emit($sql, $step++, count($sqls)); - $connection->executeQuery($sql); + $connection->executeStatement($sql); } if (!$connection->getDatabasePlatform() instanceof MySQLPlatform) { $connection->commit(); diff --git a/lib/private/DB/OracleConnection.php b/lib/private/DB/OracleConnection.php index abfb69f129b..5ffb65d801d 100644 --- a/lib/private/DB/OracleConnection.php +++ b/lib/private/DB/OracleConnection.php @@ -68,7 +68,7 @@ class OracleConnection extends Connection { public function dropTable($table) { $table = $this->tablePrefix . trim($table); $table = $this->quoteIdentifier($table); - $schema = $this->getSchemaManager(); + $schema = $this->createSchemaManager(); if ($schema->tablesExist([$table])) { $schema->dropTable($table); } @@ -83,7 +83,7 @@ class OracleConnection extends Connection { public function tableExists($table) { $table = $this->tablePrefix . trim($table); $table = $this->quoteIdentifier($table); - $schema = $this->getSchemaManager(); + $schema = $this->createSchemaManager(); return $schema->tablesExist([$table]); } } diff --git a/lib/private/DB/PgSqlTools.php b/lib/private/DB/PgSqlTools.php index 35e8016191c..d529cb26b09 100644 --- a/lib/private/DB/PgSqlTools.php +++ b/lib/private/DB/PgSqlTools.php @@ -43,7 +43,7 @@ class PgSqlTools { return preg_match($filterExpression, $asset) !== false; }); - foreach ($conn->getSchemaManager()->listSequences() as $sequence) { + foreach ($conn->createSchemaManager()->listSequences() as $sequence) { $sequenceName = $sequence->getName(); $sqlInfo = 'SELECT table_schema, table_name, column_name FROM information_schema.columns diff --git a/lib/private/DB/PreparedStatement.php b/lib/private/DB/PreparedStatement.php index 5fdfa2b03e8..54561ed96cd 100644 --- a/lib/private/DB/PreparedStatement.php +++ b/lib/private/DB/PreparedStatement.php @@ -78,6 +78,6 @@ class PreparedStatement implements IPreparedStatement { return $this->result; } - throw new Exception("You have to execute the prepared statement before accessing the results"); + throw new Exception('You have to execute the prepared statement before accessing the results'); } } diff --git a/lib/private/DB/QueryBuilder/CompositeExpression.php b/lib/private/DB/QueryBuilder/CompositeExpression.php index 493d804d54d..6edf385360c 100644 --- a/lib/private/DB/QueryBuilder/CompositeExpression.php +++ b/lib/private/DB/QueryBuilder/CompositeExpression.php @@ -5,21 +5,19 @@ * SPDX-FileCopyrightText: 2016 ownCloud, Inc. * SPDX-License-Identifier: AGPL-3.0-only */ + namespace OC\DB\QueryBuilder; use OCP\DB\QueryBuilder\ICompositeExpression; class CompositeExpression implements ICompositeExpression, \Countable { - /** @var \Doctrine\DBAL\Query\Expression\CompositeExpression */ - protected $compositeExpression; + public const TYPE_AND = 'AND'; + public const TYPE_OR = 'OR'; - /** - * Constructor. - * - * @param \Doctrine\DBAL\Query\Expression\CompositeExpression $compositeExpression - */ - public function __construct(\Doctrine\DBAL\Query\Expression\CompositeExpression $compositeExpression) { - $this->compositeExpression = $compositeExpression; + public function __construct( + private string $type, + private array $parts = [] + ) { } /** @@ -30,7 +28,9 @@ class CompositeExpression implements ICompositeExpression, \Countable { * @return \OCP\DB\QueryBuilder\ICompositeExpression */ public function addMultiple(array $parts = []): ICompositeExpression { - $this->compositeExpression->addMultiple($parts); + foreach ($parts as $part) { + $this->add($part); + } return $this; } @@ -43,7 +43,15 @@ class CompositeExpression implements ICompositeExpression, \Countable { * @return \OCP\DB\QueryBuilder\ICompositeExpression */ public function add($part): ICompositeExpression { - $this->compositeExpression->add($part); + if ($part === null) { + return $this; + } + + if ($part instanceof self && count($part) === 0) { + return $this; + } + + $this->parts[] = $part; return $this; } @@ -54,7 +62,7 @@ class CompositeExpression implements ICompositeExpression, \Countable { * @return integer */ public function count(): int { - return $this->compositeExpression->count(); + return count($this->parts); } /** @@ -63,7 +71,7 @@ class CompositeExpression implements ICompositeExpression, \Countable { * @return string */ public function getType(): string { - return $this->compositeExpression->getType(); + return $this->type; } /** @@ -72,6 +80,13 @@ class CompositeExpression implements ICompositeExpression, \Countable { * @return string */ public function __toString(): string { - return (string) $this->compositeExpression; + if ($this->count() === 1) { + return (string)$this->parts[0]; + } + return '(' . implode(') ' . $this->type . ' (', $this->parts) . ')'; + } + + public function getParts(): array { + return $this->parts; } } diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php index a7af00b9f97..b922c861630 100644 --- a/lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php +++ b/lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php @@ -21,6 +21,7 @@ use OCP\DB\QueryBuilder\IParameter; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\DB\QueryBuilder\IQueryFunction; use OCP\IDBConnection; +use Psr\Log\LoggerInterface; class ExpressionBuilder implements IExpressionBuilder { /** @var \Doctrine\DBAL\Query\Expression\ExpressionBuilder */ @@ -32,17 +33,15 @@ class ExpressionBuilder implements IExpressionBuilder { /** @var IDBConnection */ protected $connection; + /** @var LoggerInterface */ + protected $logger; + /** @var FunctionBuilder */ protected $functionBuilder; - /** - * Initializes a new <tt>ExpressionBuilder</tt>. - * - * @param ConnectionAdapter $connection - * @param IQueryBuilder $queryBuilder - */ - public function __construct(ConnectionAdapter $connection, IQueryBuilder $queryBuilder) { + public function __construct(ConnectionAdapter $connection, IQueryBuilder $queryBuilder, LoggerInterface $logger) { $this->connection = $connection; + $this->logger = $logger; $this->helper = new QuoteHelper(); $this->expressionBuilder = new DoctrineExpressionBuilder($connection->getInner()); $this->functionBuilder = $queryBuilder->func(); @@ -58,13 +57,15 @@ class ExpressionBuilder implements IExpressionBuilder { * $expr->andX('u.type = ?', 'u.role = ?')); * * @param mixed ...$x Optional clause. Defaults = null, but requires - * at least one defined when converting to string. + * at least one defined when converting to string. * * @return \OCP\DB\QueryBuilder\ICompositeExpression */ public function andX(...$x): ICompositeExpression { - $compositeExpression = call_user_func_array([$this->expressionBuilder, 'andX'], $x); - return new CompositeExpression($compositeExpression); + if (empty($x)) { + $this->logger->debug('Calling ' . IQueryBuilder::class . '::' . __FUNCTION__ . ' without parameters is deprecated and will throw soon.', ['exception' => new \Exception('No parameters in call to ' . __METHOD__)]); + } + return new CompositeExpression(CompositeExpression::TYPE_AND, $x); } /** @@ -77,13 +78,15 @@ class ExpressionBuilder implements IExpressionBuilder { * $qb->where($qb->expr()->orX('u.type = ?', 'u.role = ?')); * * @param mixed ...$x Optional clause. Defaults = null, but requires - * at least one defined when converting to string. + * at least one defined when converting to string. * * @return \OCP\DB\QueryBuilder\ICompositeExpression */ public function orX(...$x): ICompositeExpression { - $compositeExpression = call_user_func_array([$this->expressionBuilder, 'orX'], $x); - return new CompositeExpression($compositeExpression); + if (empty($x)) { + $this->logger->debug('Calling ' . IQueryBuilder::class . '::' . __FUNCTION__ . ' without parameters is deprecated and will throw soon.', ['exception' => new \Exception('No parameters in call to ' . __METHOD__)]); + } + return new CompositeExpression(CompositeExpression::TYPE_OR, $x); } /** @@ -93,7 +96,7 @@ class ExpressionBuilder implements IExpressionBuilder { * @param string $operator One of the IExpressionBuilder::* constants. * @param mixed $y The right expression. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string */ @@ -116,7 +119,7 @@ class ExpressionBuilder implements IExpressionBuilder { * @param mixed $x The left expression. * @param mixed $y The right expression. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string */ @@ -138,7 +141,7 @@ class ExpressionBuilder implements IExpressionBuilder { * @param mixed $x The left expression. * @param mixed $y The right expression. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string */ @@ -160,7 +163,7 @@ class ExpressionBuilder implements IExpressionBuilder { * @param mixed $x The left expression. * @param mixed $y The right expression. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string */ @@ -182,7 +185,7 @@ class ExpressionBuilder implements IExpressionBuilder { * @param mixed $x The left expression. * @param mixed $y The right expression. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string */ @@ -204,7 +207,7 @@ class ExpressionBuilder implements IExpressionBuilder { * @param mixed $x The left expression. * @param mixed $y The right expression. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string */ @@ -226,7 +229,7 @@ class ExpressionBuilder implements IExpressionBuilder { * @param mixed $x The left expression. * @param mixed $y The right expression. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string */ @@ -266,7 +269,7 @@ class ExpressionBuilder implements IExpressionBuilder { * @param ILiteral|IParameter|IQueryFunction|string $x Field in string format to be inspected by LIKE() comparison. * @param mixed $y Argument to be used in LIKE() comparison. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string */ @@ -282,7 +285,7 @@ class ExpressionBuilder implements IExpressionBuilder { * @param string $x Field in string format to be inspected by ILIKE() comparison. * @param mixed $y Argument to be used in ILIKE() comparison. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string * @since 9.0.0 @@ -297,7 +300,7 @@ class ExpressionBuilder implements IExpressionBuilder { * @param ILiteral|IParameter|IQueryFunction|string $x Field in string format to be inspected by NOT LIKE() comparison. * @param mixed $y Argument to be used in NOT LIKE() comparison. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string */ @@ -313,7 +316,7 @@ class ExpressionBuilder implements IExpressionBuilder { * @param ILiteral|IParameter|IQueryFunction|string $x The field in string format to be inspected by IN() comparison. * @param ILiteral|IParameter|IQueryFunction|string|array $y The placeholder or the array of values to be used by IN() comparison. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string */ @@ -329,7 +332,7 @@ class ExpressionBuilder implements IExpressionBuilder { * @param ILiteral|IParameter|IQueryFunction|string $x The field in string format to be inspected by NOT IN() comparison. * @param ILiteral|IParameter|IQueryFunction|string|array $y The placeholder or the array of values to be used by NOT IN() comparison. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string */ diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php index cd2fb5a5cc3..7216fd8807b 100644 --- a/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php +++ b/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php @@ -11,17 +11,13 @@ use OC\DB\ConnectionAdapter; use OC\DB\QueryBuilder\QueryFunction; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\DB\QueryBuilder\IQueryFunction; +use Psr\Log\LoggerInterface; class MySqlExpressionBuilder extends ExpressionBuilder { - /** @var string */ - protected $collation; + protected string $collation; - /** - * @param ConnectionAdapter $connection - * @param IQueryBuilder $queryBuilder - */ - public function __construct(ConnectionAdapter $connection, IQueryBuilder $queryBuilder) { - parent::__construct($connection, $queryBuilder); + public function __construct(ConnectionAdapter $connection, IQueryBuilder $queryBuilder, LoggerInterface $logger) { + parent::__construct($connection, $queryBuilder, $logger); $params = $connection->getInner()->getParams(); $this->collation = $params['collation'] ?? (($params['charset'] ?? 'utf8') . '_general_ci'); diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php index 1a162f04a49..53a566a7eb6 100644 --- a/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php +++ b/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php @@ -23,7 +23,7 @@ class PgSqlExpressionBuilder extends ExpressionBuilder { public function castColumn($column, $type): IQueryFunction { switch ($type) { case IQueryBuilder::PARAM_INT: - return new QueryFunction('CAST(' . $this->helper->quoteColumnName($column) . ' AS INT)'); + return new QueryFunction('CAST(' . $this->helper->quoteColumnName($column) . ' AS BIGINT)'); case IQueryBuilder::PARAM_STR: return new QueryFunction('CAST(' . $this->helper->quoteColumnName($column) . ' AS TEXT)'); default: diff --git a/lib/private/DB/QueryBuilder/ExtendedQueryBuilder.php b/lib/private/DB/QueryBuilder/ExtendedQueryBuilder.php new file mode 100644 index 00000000000..f928132a123 --- /dev/null +++ b/lib/private/DB/QueryBuilder/ExtendedQueryBuilder.php @@ -0,0 +1,309 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Robin Appelman <robin@icewind.nl> + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OC\DB\QueryBuilder; + +use OC\DB\Exceptions\DbalException; +use OCP\DB\IResult; +use OCP\DB\QueryBuilder\IQueryBuilder; +use OCP\IDBConnection; + +/** + * Base class for creating classes that extend the builtin query builder + */ +abstract class ExtendedQueryBuilder implements IQueryBuilder { + public function __construct( + protected IQueryBuilder $builder, + ) { + } + + public function automaticTablePrefix($enabled) { + $this->builder->automaticTablePrefix($enabled); + return $this; + } + + public function expr() { + return $this->builder->expr(); + } + + public function func() { + return $this->builder->func(); + } + + public function getType() { + return $this->builder->getType(); + } + + public function getConnection() { + return $this->builder->getConnection(); + } + + public function getState() { + return $this->builder->getState(); + } + + public function execute(?IDBConnection $connection = null) { + try { + if ($this->getType() === \Doctrine\DBAL\Query\QueryBuilder::SELECT) { + return $this->executeQuery($connection); + } else { + return $this->executeStatement($connection); + } + } catch (DBALException $e) { + // `IQueryBuilder->execute` never wrapped the exception, but `executeQuery` and `executeStatement` do + /** @var \Doctrine\DBAL\Exception $previous */ + $previous = $e->getPrevious(); + throw $previous; + } + } + + public function getSQL() { + return $this->builder->getSQL(); + } + + public function setParameter($key, $value, $type = null) { + $this->builder->setParameter($key, $value, $type); + return $this; + } + + public function setParameters(array $params, array $types = []) { + $this->builder->setParameters($params, $types); + return $this; + } + + public function getParameters() { + return $this->builder->getParameters(); + } + + public function getParameter($key) { + return $this->builder->getParameter($key); + } + + public function getParameterTypes() { + return $this->builder->getParameterTypes(); + } + + public function getParameterType($key) { + return $this->builder->getParameterType($key); + } + + public function setFirstResult($firstResult) { + $this->builder->setFirstResult($firstResult); + return $this; + } + + public function getFirstResult() { + return $this->builder->getFirstResult(); + } + + public function setMaxResults($maxResults) { + $this->builder->setMaxResults($maxResults); + return $this; + } + + public function getMaxResults() { + return $this->builder->getMaxResults(); + } + + public function select(...$selects) { + $this->builder->select(...$selects); + return $this; + } + + public function selectAlias($select, $alias) { + $this->builder->selectAlias($select, $alias); + return $this; + } + + public function selectDistinct($select) { + $this->builder->selectDistinct($select); + return $this; + } + + public function addSelect(...$select) { + $this->builder->addSelect(...$select); + return $this; + } + + public function delete($delete = null, $alias = null) { + $this->builder->delete($delete, $alias); + return $this; + } + + public function update($update = null, $alias = null) { + $this->builder->update($update, $alias); + return $this; + } + + public function insert($insert = null) { + $this->builder->insert($insert); + return $this; + } + + public function from($from, $alias = null) { + $this->builder->from($from, $alias); + return $this; + } + + public function join($fromAlias, $join, $alias, $condition = null) { + $this->builder->join($fromAlias, $join, $alias, $condition); + return $this; + } + + public function innerJoin($fromAlias, $join, $alias, $condition = null) { + $this->builder->innerJoin($fromAlias, $join, $alias, $condition); + return $this; + } + + public function leftJoin($fromAlias, $join, $alias, $condition = null) { + $this->builder->leftJoin($fromAlias, $join, $alias, $condition); + return $this; + } + + public function rightJoin($fromAlias, $join, $alias, $condition = null) { + $this->builder->rightJoin($fromAlias, $join, $alias, $condition); + return $this; + } + + public function set($key, $value) { + $this->builder->set($key, $value); + return $this; + } + + public function where(...$predicates) { + $this->builder->where(...$predicates); + return $this; + } + + public function andWhere(...$where) { + $this->builder->andWhere(...$where); + return $this; + } + + public function orWhere(...$where) { + $this->builder->orWhere(...$where); + return $this; + } + + public function groupBy(...$groupBys) { + $this->builder->groupBy(...$groupBys); + return $this; + } + + public function addGroupBy(...$groupBy) { + $this->builder->addGroupBy(...$groupBy); + return $this; + } + + public function setValue($column, $value) { + $this->builder->setValue($column, $value); + return $this; + } + + public function values(array $values) { + $this->builder->values($values); + return $this; + } + + public function having(...$having) { + $this->builder->having(...$having); + return $this; + } + + public function andHaving(...$having) { + $this->builder->andHaving(...$having); + return $this; + } + + public function orHaving(...$having) { + $this->builder->orHaving(...$having); + return $this; + } + + public function orderBy($sort, $order = null) { + $this->builder->orderBy($sort, $order); + return $this; + } + + public function addOrderBy($sort, $order = null) { + $this->builder->addOrderBy($sort, $order); + return $this; + } + + public function getQueryPart($queryPartName) { + return $this->builder->getQueryPart($queryPartName); + } + + public function getQueryParts() { + return $this->builder->getQueryParts(); + } + + public function resetQueryParts($queryPartNames = null) { + $this->builder->resetQueryParts($queryPartNames); + return $this; + } + + public function resetQueryPart($queryPartName) { + $this->builder->resetQueryPart($queryPartName); + return $this; + } + + public function createNamedParameter($value, $type = self::PARAM_STR, $placeHolder = null) { + return $this->builder->createNamedParameter($value, $type, $placeHolder); + } + + public function createPositionalParameter($value, $type = self::PARAM_STR) { + return $this->builder->createPositionalParameter($value, $type); + } + + public function createParameter($name) { + return $this->builder->createParameter($name); + } + + public function createFunction($call) { + return $this->builder->createFunction($call); + } + + public function getLastInsertId(): int { + return $this->builder->getLastInsertId(); + } + + public function getTableName($table) { + return $this->builder->getTableName($table); + } + + public function getColumnName($column, $tableAlias = '') { + return $this->builder->getColumnName($column, $tableAlias); + } + + public function executeQuery(?IDBConnection $connection = null): IResult { + return $this->builder->executeQuery($connection); + } + + public function executeStatement(?IDBConnection $connection = null): int { + return $this->builder->executeStatement($connection); + } + + public function hintShardKey(string $column, mixed $value, bool $overwrite = false): self { + $this->builder->hintShardKey($column, $value, $overwrite); + return $this; + } + + public function runAcrossAllShards(): self { + $this->builder->runAcrossAllShards(); + return $this; + } + + public function getOutputColumns(): array { + return $this->builder->getOutputColumns(); + } + + public function prefixTableName(string $table): string { + return $this->builder->prefixTableName($table); + } +} diff --git a/lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php b/lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php index b168d2c1a84..2466493c1fa 100644 --- a/lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php +++ b/lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php @@ -5,6 +5,7 @@ */ namespace OC\DB\QueryBuilder\FunctionBuilder; +use OC\DB\Connection; use OC\DB\QueryBuilder\QueryFunction; use OC\DB\QueryBuilder\QuoteHelper; use OCP\DB\QueryBuilder\IFunctionBuilder; @@ -13,7 +14,7 @@ use OCP\DB\QueryBuilder\IQueryFunction; use OCP\IDBConnection; class FunctionBuilder implements IFunctionBuilder { - /** @var IDBConnection */ + /** @var IDBConnection|Connection */ protected $connection; /** @var IQueryBuilder */ diff --git a/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php b/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php index d0258eafea8..a8dc4d8cf14 100644 --- a/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php +++ b/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php @@ -12,6 +12,9 @@ use OCP\DB\QueryBuilder\IQueryFunction; class OCIFunctionBuilder extends FunctionBuilder { public function md5($input): IQueryFunction { + if (version_compare($this->connection->getServerVersion(), '20', '>=')) { + return new QueryFunction('LOWER(STANDARD_HASH(' . $this->helper->quoteColumnName($input) . ", 'MD5'))"); + } return new QueryFunction('LOWER(DBMS_OBFUSCATION_TOOLKIT.md5 (input => UTL_RAW.cast_to_raw(' . $this->helper->quoteColumnName($input) .')))'); } diff --git a/lib/private/DB/QueryBuilder/Literal.php b/lib/private/DB/QueryBuilder/Literal.php index f0accce1d93..3fb897328e5 100644 --- a/lib/private/DB/QueryBuilder/Literal.php +++ b/lib/private/DB/QueryBuilder/Literal.php @@ -18,6 +18,6 @@ class Literal implements ILiteral { } public function __toString(): string { - return (string) $this->literal; + return (string)$this->literal; } } diff --git a/lib/private/DB/QueryBuilder/Parameter.php b/lib/private/DB/QueryBuilder/Parameter.php index dbd723639fc..a272c744d62 100644 --- a/lib/private/DB/QueryBuilder/Parameter.php +++ b/lib/private/DB/QueryBuilder/Parameter.php @@ -18,6 +18,6 @@ class Parameter implements IParameter { } public function __toString(): string { - return (string) $this->name; + return (string)$this->name; } } diff --git a/lib/private/DB/QueryBuilder/Partitioned/InvalidPartitionedQueryException.php b/lib/private/DB/QueryBuilder/Partitioned/InvalidPartitionedQueryException.php new file mode 100644 index 00000000000..3a5aa2f3e0e --- /dev/null +++ b/lib/private/DB/QueryBuilder/Partitioned/InvalidPartitionedQueryException.php @@ -0,0 +1,79 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-only + */ + +namespace OC\DB\QueryBuilder\Partitioned; + +/** + * Partitioned queries impose limitations that queries have to follow: + * + * 1. Any reference to columns not in the "main table" (the table referenced by "FROM"), needs to explicitly include the + * table or alias the column belongs to. + * + * For example: + * ``` + * $query->select("mount_point", "mimetype") + * ->from("mounts", "m") + * ->innerJoin("m", "filecache", "f", $query->expr()->eq("root_id", "fileid")); + * ``` + * will not work, as the query builder doesn't know that the `mimetype` column belongs to the "filecache partition". + * Instead, you need to do + * ``` + * $query->select("mount_point", "f.mimetype") + * ->from("mounts", "m") + * ->innerJoin("m", "filecache", "f", $query->expr()->eq("m.root_id", "f.fileid")); + * ``` + * + * 2. The "ON" condition for the join can only perform a comparison between both sides of the join once. + * + * For example: + * ``` + * $query->select("mount_point", "mimetype") + * ->from("mounts", "m") + * ->innerJoin("m", "filecache", "f", $query->expr()->andX($query->expr()->eq("m.root_id", "f.fileid"), $query->expr()->eq("m.storage_id", "f.storage"))); + * ``` + * will not work. + * + * 3. An "OR" expression in the "WHERE" cannot mention both sides of the join, this does not apply to "AND" expressions. + * + * For example: + * ``` + * $query->select("mount_point", "mimetype") + * ->from("mounts", "m") + * ->innerJoin("m", "filecache", "f", $query->expr()->eq("m.root_id", "f.fileid"))) + * ->where($query->expr()->orX( + * $query->expr()-eq("m.user_id", $query->createNamedParameter("test"))), + * $query->expr()-eq("f.name", $query->createNamedParameter("test"))), + * )); + * ``` + * will not work, but. + * ``` + * $query->select("mount_point", "mimetype") + * ->from("mounts", "m") + * ->innerJoin("m", "filecache", "f", $query->expr()->eq("m.root_id", "f.fileid"))) + * ->where($query->expr()->andX( + * $query->expr()-eq("m.user_id", $query->createNamedParameter("test"))), + * $query->expr()-eq("f.name", $query->createNamedParameter("test"))), + * )); + * ``` + * will. + * + * 4. Queries that join cross-partition cannot use position parameters, only named parameters are allowed + * 5. The "ON" condition of a join cannot contain and "OR" expression. + * 6. Right-joins are not allowed. + * 7. Update, delete and insert statements aren't allowed to contain cross-partition joins. + * 8. Queries that "GROUP BY" a column from the joined partition are not allowed. + * 9. Any `join` call needs to be made before any `where` call. + * 10. Queries that join cross-partition with an "INNER JOIN" or "LEFT JOIN" with a condition on the left side + * cannot use "LIMIT" or "OFFSET" in queries. + * + * The part of the query running on the sharded table has some additional limitations, + * see the `InvalidShardedQueryException` documentation for more information. + */ +class InvalidPartitionedQueryException extends \Exception { + +} diff --git a/lib/private/DB/QueryBuilder/Partitioned/JoinCondition.php b/lib/private/DB/QueryBuilder/Partitioned/JoinCondition.php new file mode 100644 index 00000000000..a08858d1d6b --- /dev/null +++ b/lib/private/DB/QueryBuilder/Partitioned/JoinCondition.php @@ -0,0 +1,173 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Robin Appelman <robin@icewind.nl> + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OC\DB\QueryBuilder\Partitioned; + +use OC\DB\QueryBuilder\CompositeExpression; +use OC\DB\QueryBuilder\QueryFunction; +use OCP\DB\QueryBuilder\IQueryFunction; + +/** + * Utility class for working with join conditions + */ +class JoinCondition { + public function __construct( + public string|IQueryFunction $fromColumn, + public ?string $fromAlias, + public string|IQueryFunction $toColumn, + public ?string $toAlias, + public array $fromConditions, + public array $toConditions, + ) { + if (is_string($this->fromColumn) && str_starts_with($this->fromColumn, '(')) { + $this->fromColumn = new QueryFunction($this->fromColumn); + } + if (is_string($this->toColumn) && str_starts_with($this->toColumn, '(')) { + $this->toColumn = new QueryFunction($this->toColumn); + } + } + + /** + * @param JoinCondition[] $conditions + * @return JoinCondition + */ + public static function merge(array $conditions): JoinCondition { + $fromColumn = ''; + $toColumn = ''; + $fromAlias = null; + $toAlias = null; + $fromConditions = []; + $toConditions = []; + foreach ($conditions as $condition) { + if (($condition->fromColumn && $fromColumn) || ($condition->toColumn && $toColumn)) { + throw new InvalidPartitionedQueryException("Can't join from {$condition->fromColumn} to {$condition->toColumn} as it already join froms {$fromColumn} to {$toColumn}"); + } + if ($condition->fromColumn) { + $fromColumn = $condition->fromColumn; + } + if ($condition->toColumn) { + $toColumn = $condition->toColumn; + } + if ($condition->fromAlias) { + $fromAlias = $condition->fromAlias; + } + if ($condition->toAlias) { + $toAlias = $condition->toAlias; + } + $fromConditions = array_merge($fromConditions, $condition->fromConditions); + $toConditions = array_merge($toConditions, $condition->toConditions); + } + return new JoinCondition($fromColumn, $fromAlias, $toColumn, $toAlias, $fromConditions, $toConditions); + } + + /** + * @param null|string|CompositeExpression $condition + * @param string $join + * @param string $alias + * @param string $fromAlias + * @return JoinCondition + * @throws InvalidPartitionedQueryException + */ + public static function parse($condition, string $join, string $alias, string $fromAlias): JoinCondition { + if ($condition === null) { + throw new InvalidPartitionedQueryException("Can't join on $join without a condition"); + } + + $result = self::parseSubCondition($condition, $join, $alias, $fromAlias); + if (!$result->fromColumn || !$result->toColumn) { + throw new InvalidPartitionedQueryException("No join condition found from $fromAlias to $alias"); + } + return $result; + } + + private static function parseSubCondition($condition, string $join, string $alias, string $fromAlias): JoinCondition { + if ($condition instanceof CompositeExpression) { + if ($condition->getType() === CompositeExpression::TYPE_OR) { + throw new InvalidPartitionedQueryException("Cannot join on $join with an OR expression"); + } + return self::merge(array_map(function ($subCondition) use ($join, $alias, $fromAlias) { + return self::parseSubCondition($subCondition, $join, $alias, $fromAlias); + }, $condition->getParts())); + } + + $condition = (string)$condition; + $isSubCondition = self::isExtraCondition($condition); + if ($isSubCondition) { + if (self::mentionsAlias($condition, $fromAlias)) { + return new JoinCondition('', null, '', null, [$condition], []); + } else { + return new JoinCondition('', null, '', null, [], [$condition]); + } + } + + $condition = str_replace('`', '', $condition); + + // expect a condition in the form of 'alias1.column1 = alias2.column2' + if (!str_contains($condition, ' = ')) { + throw new InvalidPartitionedQueryException("Can only join on $join with an `eq` condition"); + } + $parts = explode(' = ', $condition, 2); + $parts = array_map(function (string $part) { + return self::clearConditionPart($part); + }, $parts); + + if (!self::isSingleCondition($parts[0]) || !self::isSingleCondition($parts[1])) { + throw new InvalidPartitionedQueryException("Can only join on $join with a single condition"); + } + + + if (self::mentionsAlias($parts[0], $fromAlias)) { + return new JoinCondition($parts[0], self::getAliasForPart($parts[0]), $parts[1], self::getAliasForPart($parts[1]), [], []); + } elseif (self::mentionsAlias($parts[1], $fromAlias)) { + return new JoinCondition($parts[1], self::getAliasForPart($parts[1]), $parts[0], self::getAliasForPart($parts[0]), [], []); + } else { + throw new InvalidPartitionedQueryException("join condition for $join needs to explicitly refer to the table by alias"); + } + } + + private static function isSingleCondition(string $condition): bool { + return !(str_contains($condition, ' OR ') || str_contains($condition, ' AND ')); + } + + private static function getAliasForPart(string $part): ?string { + if (str_contains($part, ' ')) { + return uniqid('join_alias_'); + } else { + return null; + } + } + + private static function clearConditionPart(string $part): string { + if (str_starts_with($part, 'CAST(')) { + // pgsql/mysql cast + $part = substr($part, strlen('CAST(')); + [$part] = explode(' AS ', $part); + } elseif (str_starts_with($part, 'to_number(to_char(')) { + // oracle cast to int + $part = substr($part, strlen('to_number(to_char('), -2); + } elseif (str_starts_with($part, 'to_number(to_char(')) { + // oracle cast to string + $part = substr($part, strlen('to_char('), -1); + } + return $part; + } + + /** + * Check that a condition is an extra limit on the from/to part, and not the join condition + * + * This is done by checking that only one of the halves of the condition references a column + */ + private static function isExtraCondition(string $condition): bool { + $parts = explode(' ', $condition, 2); + return str_contains($parts[0], '`') xor str_contains($parts[1], '`'); + } + + private static function mentionsAlias(string $condition, string $alias): bool { + return str_contains($condition, "$alias."); + } +} diff --git a/lib/private/DB/QueryBuilder/Partitioned/PartitionQuery.php b/lib/private/DB/QueryBuilder/Partitioned/PartitionQuery.php new file mode 100644 index 00000000000..a5024b478d3 --- /dev/null +++ b/lib/private/DB/QueryBuilder/Partitioned/PartitionQuery.php @@ -0,0 +1,75 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-only + */ + +namespace OC\DB\QueryBuilder\Partitioned; + +use OCP\DB\QueryBuilder\IQueryBuilder; + +/** + * A sub-query from a partitioned join + */ +class PartitionQuery { + public const JOIN_MODE_INNER = 'inner'; + public const JOIN_MODE_LEFT = 'left'; + // left-join where the left side IS NULL + public const JOIN_MODE_LEFT_NULL = 'left_null'; + + public const JOIN_MODE_RIGHT = 'right'; + + public function __construct( + public IQueryBuilder $query, + public string $joinFromColumn, + public string $joinToColumn, + public string $joinMode, + ) { + if ($joinMode !== self::JOIN_MODE_LEFT && $joinMode !== self::JOIN_MODE_INNER) { + throw new InvalidPartitionedQueryException("$joinMode joins aren't allowed in partitioned queries"); + } + } + + public function mergeWith(array $rows): array { + if (empty($rows)) { + return []; + } + // strip table/alias from column names + $joinFromColumn = preg_replace('/\w+\./', '', $this->joinFromColumn); + $joinToColumn = preg_replace('/\w+\./', '', $this->joinToColumn); + + $joinFromValues = array_map(function (array $row) use ($joinFromColumn) { + return $row[$joinFromColumn]; + }, $rows); + $joinFromValues = array_filter($joinFromValues, function ($value) { + return $value !== null; + }); + $this->query->andWhere($this->query->expr()->in($this->joinToColumn, $this->query->createNamedParameter($joinFromValues, IQueryBuilder::PARAM_STR_ARRAY, ':' . uniqid()))); + + $s = $this->query->getSQL(); + $partitionedRows = $this->query->executeQuery()->fetchAll(); + + $columns = $this->query->getOutputColumns(); + $nullResult = array_combine($columns, array_fill(0, count($columns), null)); + + $partitionedRowsByKey = []; + foreach ($partitionedRows as $partitionedRow) { + $partitionedRowsByKey[$partitionedRow[$joinToColumn]][] = $partitionedRow; + } + $result = []; + foreach ($rows as $row) { + if (isset($partitionedRowsByKey[$row[$joinFromColumn]])) { + if ($this->joinMode !== self::JOIN_MODE_LEFT_NULL) { + foreach ($partitionedRowsByKey[$row[$joinFromColumn]] as $partitionedRow) { + $result[] = array_merge($row, $partitionedRow); + } + } + } elseif ($this->joinMode === self::JOIN_MODE_LEFT || $this->joinMode === self::JOIN_MODE_LEFT_NULL) { + $result[] = array_merge($nullResult, $row); + } + } + return $result; + } +} diff --git a/lib/private/DB/QueryBuilder/Partitioned/PartitionSplit.php b/lib/private/DB/QueryBuilder/Partitioned/PartitionSplit.php new file mode 100644 index 00000000000..ad4c0fab055 --- /dev/null +++ b/lib/private/DB/QueryBuilder/Partitioned/PartitionSplit.php @@ -0,0 +1,74 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Robin Appelman <robin@icewind.nl> + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OC\DB\QueryBuilder\Partitioned; + +/** + * Information about a database partition, containing the tables in the partition and any active alias + */ +class PartitionSplit { + /** @var array<string, string> */ + public array $aliases = []; + + /** + * @param string[] $tables + */ + public function __construct( + public string $name, + public array $tables, + ) { + } + + public function addAlias(string $table, string $alias): void { + if ($this->containsTable($table)) { + $this->aliases[$alias] = $table; + } + } + + public function addTable(string $table): void { + if (!$this->containsTable($table)) { + $this->tables[] = $table; + } + } + + public function containsTable(string $table): bool { + return in_array($table, $this->tables); + } + + public function containsAlias(string $alias): bool { + return array_key_exists($alias, $this->aliases); + } + + private function getTablesAndAliases(): array { + return array_keys($this->aliases) + $this->tables; + } + + /** + * Check if a query predicate mentions a table or alias from this partition + * + * @param string $predicate + * @return bool + */ + public function checkPredicateForTable(string $predicate): bool { + foreach ($this->getTablesAndAliases() as $name) { + if (str_contains($predicate, "`$name`.`")) { + return true; + } + } + return false; + } + + public function isColumnInPartition(string $column): bool { + foreach ($this->getTablesAndAliases() as $name) { + if (str_starts_with($column, "$name.")) { + return true; + } + } + return false; + } +} diff --git a/lib/private/DB/QueryBuilder/Partitioned/PartitionedQueryBuilder.php b/lib/private/DB/QueryBuilder/Partitioned/PartitionedQueryBuilder.php new file mode 100644 index 00000000000..9d351c1d3f1 --- /dev/null +++ b/lib/private/DB/QueryBuilder/Partitioned/PartitionedQueryBuilder.php @@ -0,0 +1,426 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-only + */ + +namespace OC\DB\QueryBuilder\Partitioned; + +use OC\DB\QueryBuilder\CompositeExpression; +use OC\DB\QueryBuilder\QuoteHelper; +use OC\DB\QueryBuilder\Sharded\AutoIncrementHandler; +use OC\DB\QueryBuilder\Sharded\ShardConnectionManager; +use OC\DB\QueryBuilder\Sharded\ShardedQueryBuilder; +use OCP\DB\IResult; +use OCP\DB\QueryBuilder\IQueryBuilder; +use OCP\DB\QueryBuilder\IQueryFunction; +use OCP\IDBConnection; + +/** + * A special query builder that automatically splits queries that span across multiple database partitions[1]. + * + * This is done by inspecting the query as it's being built, and when a cross-partition join is detected, + * the part of the query that touches the partition is split of into a different sub-query. + * Then, when the query is executed, the results from the sub-queries are automatically merged. + * + * This whole process is intended to be transparent to any code using the query builder, however it does impose some extra + * limitation for queries that work cross-partition. See the documentation from `InvalidPartitionedQueryException` for more details. + * + * When a join is created in the query, this builder checks if it belongs to the same partition as the table from the + * original FROM/UPDATE/DELETE/INSERT and if not, creates a new "sub query" for the partition. + * Then for every part that is added the query, the part is analyzed to determine which partition the query part is referencing + * and the query part is added to the sub query for that partition. + * + * [1]: A set of tables which can't be queried together with the rest of the tables, such as when sharding is used. + */ +class PartitionedQueryBuilder extends ShardedQueryBuilder { + /** @var array<string, PartitionQuery> $splitQueries */ + private array $splitQueries = []; + /** @var list<PartitionSplit> */ + private array $partitions = []; + + /** @var array{'select': string|array, 'alias': ?string}[] */ + private array $selects = []; + private ?PartitionSplit $mainPartition = null; + private bool $hasPositionalParameter = false; + private QuoteHelper $quoteHelper; + private ?int $limit = null; + private ?int $offset = null; + + public function __construct( + IQueryBuilder $builder, + array $shardDefinitions, + ShardConnectionManager $shardConnectionManager, + AutoIncrementHandler $autoIncrementHandler, + ) { + parent::__construct($builder, $shardDefinitions, $shardConnectionManager, $autoIncrementHandler); + $this->quoteHelper = new QuoteHelper(); + } + + private function newQuery(): IQueryBuilder { + // get a fresh, non-partitioning query builder + $builder = $this->builder->getConnection()->getQueryBuilder(); + if ($builder instanceof PartitionedQueryBuilder) { + $builder = $builder->builder; + } + + return new ShardedQueryBuilder( + $builder, + $this->shardDefinitions, + $this->shardConnectionManager, + $this->autoIncrementHandler, + ); + } + + // we need to save selects until we know all the table aliases + public function select(...$selects) { + $this->selects = []; + $this->addSelect(...$selects); + return $this; + } + + public function addSelect(...$select) { + $select = array_map(function ($select) { + return ['select' => $select, 'alias' => null]; + }, $select); + $this->selects = array_merge($this->selects, $select); + return $this; + } + + public function selectAlias($select, $alias) { + $this->selects[] = ['select' => $select, 'alias' => $alias]; + return $this; + } + + /** + * Ensure that a column is being selected by the query + * + * This is mainly used to ensure that the returned rows from both sides of a partition contains the columns of the join predicate + * + * @param string $column + * @return void + */ + private function ensureSelect(string|IQueryFunction $column, ?string $alias = null): void { + $checkColumn = $alias ?: $column; + if (str_contains($checkColumn, '.')) { + [, $checkColumn] = explode('.', $checkColumn); + } + foreach ($this->selects as $select) { + if ($select['select'] === $checkColumn || $select['select'] === '*' || str_ends_with($select['select'], '.' . $checkColumn)) { + return; + } + } + if ($alias) { + $this->selectAlias($column, $alias); + } else { + $this->addSelect($column); + } + } + + /** + * Distribute the select statements to the correct partition + * + * This is done at the end instead of when the `select` call is made, because the `select` calls are generally done + * before we know what tables are involved in the query + * + * @return void + */ + private function applySelects(): void { + foreach ($this->selects as $select) { + foreach ($this->partitions as $partition) { + if (is_string($select['select']) && ( + $select['select'] === '*' || + $partition->isColumnInPartition($select['select'])) + ) { + if (isset($this->splitQueries[$partition->name])) { + if ($select['alias']) { + $this->splitQueries[$partition->name]->query->selectAlias($select['select'], $select['alias']); + } else { + $this->splitQueries[$partition->name]->query->addSelect($select['select']); + } + if ($select['select'] !== '*') { + continue 2; + } + } + } + } + + if ($select['alias']) { + parent::selectAlias($select['select'], $select['alias']); + } else { + parent::addSelect($select['select']); + } + } + $this->selects = []; + } + + + public function addPartition(PartitionSplit $partition): void { + $this->partitions[] = $partition; + } + + private function getPartition(string $table): ?PartitionSplit { + foreach ($this->partitions as $partition) { + if ($partition->containsTable($table) || $partition->containsAlias($table)) { + return $partition; + } + } + return null; + } + + public function from($from, $alias = null) { + if (is_string($from) && $partition = $this->getPartition($from)) { + $this->mainPartition = $partition; + if ($alias) { + $this->mainPartition->addAlias($from, $alias); + } + } + return parent::from($from, $alias); + } + + public function innerJoin($fromAlias, $join, $alias, $condition = null): self { + return $this->join($fromAlias, $join, $alias, $condition); + } + + public function leftJoin($fromAlias, $join, $alias, $condition = null): self { + return $this->join($fromAlias, (string)$join, $alias, $condition, PartitionQuery::JOIN_MODE_LEFT); + } + + public function join($fromAlias, $join, $alias, $condition = null, $joinMode = PartitionQuery::JOIN_MODE_INNER): self { + $partition = $this->getPartition($join); + $fromPartition = $this->getPartition($fromAlias); + if ($partition && $partition !== $this->mainPartition) { + // join from the main db to a partition + + $joinCondition = JoinCondition::parse($condition, $join, $alias, $fromAlias); + $partition->addAlias($join, $alias); + + if (!isset($this->splitQueries[$partition->name])) { + $this->splitQueries[$partition->name] = new PartitionQuery( + $this->newQuery(), + $joinCondition->fromAlias ?? $joinCondition->fromColumn, $joinCondition->toAlias ?? $joinCondition->toColumn, + $joinMode + ); + $this->splitQueries[$partition->name]->query->from($join, $alias); + $this->ensureSelect($joinCondition->fromColumn, $joinCondition->fromAlias); + $this->ensureSelect($joinCondition->toColumn, $joinCondition->toAlias); + } else { + $query = $this->splitQueries[$partition->name]->query; + if ($partition->containsAlias($fromAlias)) { + $query->innerJoin($fromAlias, $join, $alias, $condition); + } else { + throw new InvalidPartitionedQueryException("Can't join across partition boundaries more than once"); + } + } + $this->splitQueries[$partition->name]->query->andWhere(...$joinCondition->toConditions); + parent::andWhere(...$joinCondition->fromConditions); + return $this; + } elseif ($fromPartition && $fromPartition !== $partition) { + // join from partition, to the main db + + $joinCondition = JoinCondition::parse($condition, $join, $alias, $fromAlias); + if (str_starts_with($fromPartition->name, 'from_')) { + $partitionName = $fromPartition->name; + } else { + $partitionName = 'from_' . $fromPartition->name; + } + + if (!isset($this->splitQueries[$partitionName])) { + $newPartition = new PartitionSplit($partitionName, [$join]); + $newPartition->addAlias($join, $alias); + $this->partitions[] = $newPartition; + + $this->splitQueries[$partitionName] = new PartitionQuery( + $this->newQuery(), + $joinCondition->fromAlias ?? $joinCondition->fromColumn, $joinCondition->toAlias ?? $joinCondition->toColumn, + $joinMode + ); + $this->ensureSelect($joinCondition->fromColumn, $joinCondition->fromAlias); + $this->ensureSelect($joinCondition->toColumn, $joinCondition->toAlias); + $this->splitQueries[$partitionName]->query->from($join, $alias); + $this->splitQueries[$partitionName]->query->andWhere(...$joinCondition->toConditions); + parent::andWhere(...$joinCondition->fromConditions); + } else { + $fromPartition->addTable($join); + $fromPartition->addAlias($join, $alias); + + $query = $this->splitQueries[$partitionName]->query; + $query->innerJoin($fromAlias, $join, $alias, $condition); + } + return $this; + } else { + // join within the main db or a partition + if ($joinMode === PartitionQuery::JOIN_MODE_INNER) { + return parent::innerJoin($fromAlias, $join, $alias, $condition); + } elseif ($joinMode === PartitionQuery::JOIN_MODE_LEFT) { + return parent::leftJoin($fromAlias, $join, $alias, $condition); + } elseif ($joinMode === PartitionQuery::JOIN_MODE_RIGHT) { + return parent::rightJoin($fromAlias, $join, $alias, $condition); + } else { + throw new \InvalidArgumentException("Invalid join mode: $joinMode"); + } + } + } + + /** + * Flatten a list of predicates by merging the parts of any "AND" expression into the list of predicates + * + * @param array $predicates + * @return array + */ + private function flattenPredicates(array $predicates): array { + $result = []; + foreach ($predicates as $predicate) { + if ($predicate instanceof CompositeExpression && $predicate->getType() === CompositeExpression::TYPE_AND) { + $result = array_merge($result, $this->flattenPredicates($predicate->getParts())); + } else { + $result[] = $predicate; + } + } + return $result; + } + + /** + * Split an array of predicates (WHERE query parts) by the partition they reference + * @param array $predicates + * @return array<string, array> + */ + private function splitPredicatesByParts(array $predicates): array { + $predicates = $this->flattenPredicates($predicates); + + $partitionPredicates = []; + foreach ($predicates as $predicate) { + $partition = $this->getPartitionForPredicate((string)$predicate); + if ($this->mainPartition === $partition) { + $partitionPredicates[''][] = $predicate; + } elseif ($partition) { + $partitionPredicates[$partition->name][] = $predicate; + } else { + $partitionPredicates[''][] = $predicate; + } + } + return $partitionPredicates; + } + + public function where(...$predicates) { + return $this->andWhere(...$predicates); + } + + public function andWhere(...$where) { + if ($where) { + foreach ($this->splitPredicatesByParts($where) as $alias => $predicates) { + if (isset($this->splitQueries[$alias])) { + // when there is a condition on a table being left-joined it starts to behave as if it's an inner join + // since any joined column that doesn't have the left part will not match the condition + // when there the condition is `$joinToColumn IS NULL` we instead mark the query as excluding the left half + if ($this->splitQueries[$alias]->joinMode === PartitionQuery::JOIN_MODE_LEFT) { + $this->splitQueries[$alias]->joinMode = PartitionQuery::JOIN_MODE_INNER; + + $column = $this->quoteHelper->quoteColumnName($this->splitQueries[$alias]->joinToColumn); + foreach ($predicates as $predicate) { + if ((string)$predicate === "$column IS NULL") { + $this->splitQueries[$alias]->joinMode = PartitionQuery::JOIN_MODE_LEFT_NULL; + } else { + $this->splitQueries[$alias]->query->andWhere($predicate); + } + } + } else { + $this->splitQueries[$alias]->query->andWhere(...$predicates); + } + } else { + parent::andWhere(...$predicates); + } + } + } + return $this; + } + + + private function getPartitionForPredicate(string $predicate): ?PartitionSplit { + foreach ($this->partitions as $partition) { + + if (str_contains($predicate, '?')) { + $this->hasPositionalParameter = true; + } + if ($partition->checkPredicateForTable($predicate)) { + return $partition; + } + } + return null; + } + + public function update($update = null, $alias = null) { + return parent::update($update, $alias); + } + + public function insert($insert = null) { + return parent::insert($insert); + } + + public function delete($delete = null, $alias = null) { + return parent::delete($delete, $alias); + } + + public function setMaxResults($maxResults) { + if ($maxResults > 0) { + $this->limit = (int)$maxResults; + } + return parent::setMaxResults($maxResults); + } + + public function setFirstResult($firstResult) { + if ($firstResult > 0) { + $this->offset = (int)$firstResult; + } + return parent::setFirstResult($firstResult); + } + + public function executeQuery(?IDBConnection $connection = null): IResult { + $this->applySelects(); + if ($this->splitQueries && $this->hasPositionalParameter) { + throw new InvalidPartitionedQueryException("Partitioned queries aren't allowed to to positional arguments"); + } + foreach ($this->splitQueries as $split) { + $split->query->setParameters($this->getParameters(), $this->getParameterTypes()); + } + if (count($this->splitQueries) > 0) { + $hasNonLeftJoins = array_reduce($this->splitQueries, function (bool $hasNonLeftJoins, PartitionQuery $query) { + return $hasNonLeftJoins || $query->joinMode !== PartitionQuery::JOIN_MODE_LEFT; + }, false); + if ($hasNonLeftJoins) { + if (is_int($this->limit)) { + throw new InvalidPartitionedQueryException('Limit is not allowed in partitioned queries'); + } + if (is_int($this->offset)) { + throw new InvalidPartitionedQueryException('Offset is not allowed in partitioned queries'); + } + } + } + + $s = $this->getSQL(); + $result = parent::executeQuery($connection); + if (count($this->splitQueries) > 0) { + return new PartitionedResult($this->splitQueries, $result); + } else { + return $result; + } + } + + public function executeStatement(?IDBConnection $connection = null): int { + if (count($this->splitQueries)) { + throw new InvalidPartitionedQueryException("Partitioning write queries isn't supported"); + } + return parent::executeStatement($connection); + } + + public function getSQL() { + $this->applySelects(); + return parent::getSQL(); + } + + public function getPartitionCount(): int { + return count($this->splitQueries) + 1; + } +} diff --git a/lib/private/DB/QueryBuilder/Partitioned/PartitionedResult.php b/lib/private/DB/QueryBuilder/Partitioned/PartitionedResult.php new file mode 100644 index 00000000000..aa9cc43b38b --- /dev/null +++ b/lib/private/DB/QueryBuilder/Partitioned/PartitionedResult.php @@ -0,0 +1,61 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-only + */ + +namespace OC\DB\QueryBuilder\Partitioned; + +use OC\DB\ArrayResult; +use OCP\DB\IResult; +use PDO; + +/** + * Combine the results of multiple join parts into a single result + */ +class PartitionedResult extends ArrayResult { + private bool $fetched = false; + + /** + * @param PartitionQuery[] $splitOfParts + * @param IResult $result + */ + public function __construct( + private array $splitOfParts, + private IResult $result + ) { + parent::__construct([]); + } + + public function closeCursor(): bool { + return $this->result->closeCursor(); + } + + public function fetch(int $fetchMode = PDO::FETCH_ASSOC) { + $this->fetchRows(); + return parent::fetch($fetchMode); + } + + public function fetchAll(int $fetchMode = PDO::FETCH_ASSOC): array { + $this->fetchRows(); + return parent::fetchAll($fetchMode); + } + + public function rowCount(): int { + $this->fetchRows(); + return parent::rowCount(); + } + + private function fetchRows(): void { + if (!$this->fetched) { + $this->fetched = true; + $this->rows = $this->result->fetchAll(); + foreach ($this->splitOfParts as $part) { + $this->rows = $part->mergeWith($this->rows); + } + $this->count = count($this->rows); + } + } +} diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php index 0e7d8d2ff3e..3ee41773330 100644 --- a/lib/private/DB/QueryBuilder/QueryBuilder.php +++ b/lib/private/DB/QueryBuilder/QueryBuilder.php @@ -7,13 +7,9 @@ */ namespace OC\DB\QueryBuilder; -use Doctrine\DBAL\Platforms\MySQLPlatform; -use Doctrine\DBAL\Platforms\OraclePlatform; -use Doctrine\DBAL\Platforms\PostgreSQL94Platform; -use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\DBAL\Query\QueryException; use OC\DB\ConnectionAdapter; -use OC\DB\QueryBuilder\ExpressionBuilder\ExpressionBuilder; +use OC\DB\Exceptions\DbalException; use OC\DB\QueryBuilder\ExpressionBuilder\MySqlExpressionBuilder; use OC\DB\QueryBuilder\ExpressionBuilder\OCIExpressionBuilder; use OC\DB\QueryBuilder\ExpressionBuilder\PgSqlExpressionBuilder; @@ -22,7 +18,6 @@ use OC\DB\QueryBuilder\FunctionBuilder\FunctionBuilder; use OC\DB\QueryBuilder\FunctionBuilder\OCIFunctionBuilder; use OC\DB\QueryBuilder\FunctionBuilder\PgSqlFunctionBuilder; use OC\DB\QueryBuilder\FunctionBuilder\SqliteFunctionBuilder; -use OC\DB\ResultAdapter; use OC\SystemConfig; use OCP\DB\IResult; use OCP\DB\QueryBuilder\ICompositeExpression; @@ -30,6 +25,7 @@ use OCP\DB\QueryBuilder\ILiteral; use OCP\DB\QueryBuilder\IParameter; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\DB\QueryBuilder\IQueryFunction; +use OCP\IDBConnection; use Psr\Log\LoggerInterface; class QueryBuilder implements IQueryBuilder { @@ -49,9 +45,11 @@ class QueryBuilder implements IQueryBuilder { /** @var bool */ private $automaticTablePrefix = true; + private bool $nonEmptyWhere = false; /** @var string */ protected $lastInsertedTable; + private array $selectedColumns = []; /** * Initializes a new QueryBuilder. @@ -71,11 +69,11 @@ class QueryBuilder implements IQueryBuilder { * Enable/disable automatic prefixing of table names with the oc_ prefix * * @param bool $enabled If set to true table names will be prefixed with the - * owncloud database prefix automatically. + * owncloud database prefix automatically. * @since 8.2.0 */ public function automaticTablePrefix($enabled) { - $this->automaticTablePrefix = (bool) $enabled; + $this->automaticTablePrefix = (bool)$enabled; } /** @@ -95,20 +93,12 @@ class QueryBuilder implements IQueryBuilder { * @return \OCP\DB\QueryBuilder\IExpressionBuilder */ public function expr() { - if ($this->connection->getDatabasePlatform() instanceof OraclePlatform) { - return new OCIExpressionBuilder($this->connection, $this); - } - if ($this->connection->getDatabasePlatform() instanceof PostgreSQL94Platform) { - return new PgSqlExpressionBuilder($this->connection, $this); - } - if ($this->connection->getDatabasePlatform() instanceof MySQLPlatform) { - return new MySqlExpressionBuilder($this->connection, $this); - } - if ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) { - return new SqliteExpressionBuilder($this->connection, $this); - } - - return new ExpressionBuilder($this->connection, $this); + return match($this->connection->getDatabaseProvider()) { + IDBConnection::PLATFORM_ORACLE => new OCIExpressionBuilder($this->connection, $this, $this->logger), + IDBConnection::PLATFORM_POSTGRES => new PgSqlExpressionBuilder($this->connection, $this, $this->logger), + IDBConnection::PLATFORM_MYSQL => new MySqlExpressionBuilder($this->connection, $this, $this->logger), + IDBConnection::PLATFORM_SQLITE => new SqliteExpressionBuilder($this->connection, $this, $this->logger), + }; } /** @@ -128,17 +118,12 @@ class QueryBuilder implements IQueryBuilder { * @return \OCP\DB\QueryBuilder\IFunctionBuilder */ public function func() { - if ($this->connection->getDatabasePlatform() instanceof OraclePlatform) { - return new OCIFunctionBuilder($this->connection, $this, $this->helper); - } - if ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) { - return new SqliteFunctionBuilder($this->connection, $this, $this->helper); - } - if ($this->connection->getDatabasePlatform() instanceof PostgreSQL94Platform) { - return new PgSqlFunctionBuilder($this->connection, $this, $this->helper); - } - - return new FunctionBuilder($this->connection, $this, $this->helper); + return match($this->connection->getDatabaseProvider()) { + IDBConnection::PLATFORM_ORACLE => new OCIFunctionBuilder($this->connection, $this, $this->helper), + IDBConnection::PLATFORM_POSTGRES => new PgSqlFunctionBuilder($this->connection, $this, $this->helper), + IDBConnection::PLATFORM_MYSQL => new FunctionBuilder($this->connection, $this, $this->helper), + IDBConnection::PLATFORM_SQLITE => new SqliteFunctionBuilder($this->connection, $this, $this->helper), + }; } /** @@ -162,21 +147,16 @@ class QueryBuilder implements IQueryBuilder { /** * Gets the state of this query builder instance. * - * @return integer Either QueryBuilder::STATE_DIRTY or QueryBuilder::STATE_CLEAN. + * @return int Always returns 0 which is former `QueryBuilder::STATE_DIRTY` + * @deprecated 30.0.0 This function is going to be removed with the next Doctrine/DBAL update + * and we can not fix this in our wrapper. */ public function getState() { + $this->logger->debug(IQueryBuilder::class . '::' . __FUNCTION__ . ' is deprecated and will be removed soon.', ['exception' => new \Exception('Deprecated call to ' . __METHOD__)]); return $this->queryBuilder->getState(); } - /** - * Executes this query using the bound parameters and their types. - * - * Uses {@see Connection::executeQuery} for select statements and {@see Connection::executeUpdate} - * for insert, update and delete statements. - * - * @return IResult|int - */ - public function execute() { + private function prepareForExecute() { if ($this->systemConfig->getValue('log_query', false)) { try { $params = []; @@ -207,24 +187,24 @@ class QueryBuilder implements IQueryBuilder { } } - if (!empty($this->getQueryPart('select'))) { - $select = $this->getQueryPart('select'); - $hasSelectAll = array_filter($select, static function ($s) { - return $s === '*'; - }); - $hasSelectSpecific = array_filter($select, static function ($s) { - return $s !== '*'; - }); - - if (empty($hasSelectAll) === empty($hasSelectSpecific)) { - $exception = new QueryException('Query is selecting * and specific values in the same query. This is not supported in Oracle.'); - $this->logger->error($exception->getMessage(), [ - 'query' => $this->getSQL(), - 'app' => 'core', - 'exception' => $exception, - ]); - } - } + // if (!empty($this->getQueryPart('select'))) { + // $select = $this->getQueryPart('select'); + // $hasSelectAll = array_filter($select, static function ($s) { + // return $s === '*'; + // }); + // $hasSelectSpecific = array_filter($select, static function ($s) { + // return $s !== '*'; + // }); + + // if (empty($hasSelectAll) === empty($hasSelectSpecific)) { + // $exception = new QueryException('Query is selecting * and specific values in the same query. This is not supported in Oracle.'); + // $this->logger->error($exception->getMessage(), [ + // 'query' => $this->getSQL(), + // 'app' => 'core', + // 'exception' => $exception, + // ]); + // } + // } $numberOfParameters = 0; $hasTooLargeArrayParameter = false; @@ -253,48 +233,64 @@ class QueryBuilder implements IQueryBuilder { 'exception' => $exception, ]); } + } + + /** + * Executes this query using the bound parameters and their types. + * + * Uses {@see Connection::executeQuery} for select statements and {@see Connection::executeUpdate} + * for insert, update and delete statements. + * + * @return IResult|int + */ + public function execute(?IDBConnection $connection = null) { + try { + if ($this->getType() === \Doctrine\DBAL\Query\QueryBuilder::SELECT) { + return $this->executeQuery($connection); + } else { + return $this->executeStatement($connection); + } + } catch (DBALException $e) { + // `IQueryBuilder->execute` never wrapped the exception, but `executeQuery` and `executeStatement` do + /** @var \Doctrine\DBAL\Exception $previous */ + $previous = $e->getPrevious(); - $result = $this->queryBuilder->execute(); - if (is_int($result)) { - return $result; + throw $previous; } - return new ResultAdapter($result); } - public function executeQuery(): IResult { + public function executeQuery(?IDBConnection $connection = null): IResult { if ($this->getType() !== \Doctrine\DBAL\Query\QueryBuilder::SELECT) { throw new \RuntimeException('Invalid query type, expected SELECT query'); } - try { - $result = $this->execute(); - } catch (\Doctrine\DBAL\Exception $e) { - throw \OC\DB\Exceptions\DbalException::wrap($e); - } - - if ($result instanceof IResult) { - return $result; + $this->prepareForExecute(); + if (!$connection) { + $connection = $this->connection; } - throw new \RuntimeException('Invalid return type for query'); + return $connection->executeQuery( + $this->getSQL(), + $this->getParameters(), + $this->getParameterTypes(), + ); } - public function executeStatement(): int { + public function executeStatement(?IDBConnection $connection = null): int { if ($this->getType() === \Doctrine\DBAL\Query\QueryBuilder::SELECT) { throw new \RuntimeException('Invalid query type, expected INSERT, DELETE or UPDATE statement'); } - try { - $result = $this->execute(); - } catch (\Doctrine\DBAL\Exception $e) { - throw \OC\DB\Exceptions\DbalException::wrap($e); - } - - if (!is_int($result)) { - throw new \RuntimeException('Invalid return type for statement'); + $this->prepareForExecute(); + if (!$connection) { + $connection = $this->connection; } - return $result; + return $connection->executeStatement( + $this->getSQL(), + $this->getParameters(), + $this->getParameterTypes(), + ); } @@ -410,7 +406,7 @@ class QueryBuilder implements IQueryBuilder { * @return $this This QueryBuilder instance. */ public function setFirstResult($firstResult) { - $this->queryBuilder->setFirstResult((int) $firstResult); + $this->queryBuilder->setFirstResult((int)$firstResult); return $this; } @@ -440,7 +436,7 @@ class QueryBuilder implements IQueryBuilder { if ($maxResults === null) { $this->queryBuilder->setMaxResults($maxResults); } else { - $this->queryBuilder->setMaxResults((int) $maxResults); + $this->queryBuilder->setMaxResults((int)$maxResults); } return $this; @@ -475,6 +471,7 @@ class QueryBuilder implements IQueryBuilder { if (count($selects) === 1 && is_array($selects[0])) { $selects = $selects[0]; } + $this->addOutputColumns($selects); $this->queryBuilder->select( $this->helper->quoteColumnNames($selects) @@ -502,6 +499,7 @@ class QueryBuilder implements IQueryBuilder { $this->queryBuilder->addSelect( $this->helper->quoteColumnName($select) . ' AS ' . $this->helper->quoteColumnName($alias) ); + $this->addOutputColumns([$alias]); return $this; } @@ -523,6 +521,7 @@ class QueryBuilder implements IQueryBuilder { if (!is_array($select)) { $select = [$select]; } + $this->addOutputColumns($select); $quotedSelect = $this->helper->quoteColumnNames($select); @@ -552,6 +551,7 @@ class QueryBuilder implements IQueryBuilder { if (count($selects) === 1 && is_array($selects[0])) { $selects = $selects[0]; } + $this->addOutputColumns($selects); $this->queryBuilder->addSelect( $this->helper->quoteColumnNames($selects) @@ -560,6 +560,30 @@ class QueryBuilder implements IQueryBuilder { return $this; } + private function addOutputColumns(array $columns): void { + foreach ($columns as $column) { + if (is_array($column)) { + $this->addOutputColumns($column); + } elseif (is_string($column) && !str_contains($column, '*')) { + if (str_contains($column, '.')) { + [, $column] = explode('.', $column); + } + $this->selectedColumns[] = $column; + } + } + } + + public function getOutputColumns(): array { + return array_unique(array_map(function (string $column) { + if (str_contains($column, '.')) { + [, $column] = explode('.', $column); + return $column; + } else { + return $column; + } + }, $this->selectedColumns)); + } + /** * Turns the query being built into a bulk delete query that ranges over * a certain table. @@ -575,8 +599,13 @@ class QueryBuilder implements IQueryBuilder { * @param string $alias The table alias used in the constructed query. * * @return $this This QueryBuilder instance. + * @since 30.0.0 Alias is deprecated and will no longer be used with the next Doctrine/DBAL update */ public function delete($delete = null, $alias = null) { + if ($alias !== null) { + $this->logger->debug('DELETE queries with alias are no longer supported and the provided alias is ignored', ['exception' => new \InvalidArgumentException('Table alias provided for DELETE query')]); + } + $this->queryBuilder->delete( $this->getTableName($delete), $alias @@ -600,8 +629,13 @@ class QueryBuilder implements IQueryBuilder { * @param string $alias The table alias used in the constructed query. * * @return $this This QueryBuilder instance. + * @since 30.0.0 Alias is deprecated and will no longer be used with the next Doctrine/DBAL update */ public function update($update = null, $alias = null) { + if ($alias !== null) { + $this->logger->debug('UPDATE queries with alias are no longer supported and the provided alias is ignored', ['exception' => new \InvalidArgumentException('Table alias provided for UPDATE query')]); + } + $this->queryBuilder->update( $this->getTableName($update), $alias @@ -730,7 +764,7 @@ class QueryBuilder implements IQueryBuilder { * </code> * * @param string $fromAlias The alias that points to a from clause. - * @param string $join The table name to join. + * @param string|IQueryFunction $join The table name or sub-query to join. * @param string $alias The alias of the join table. * @param string|ICompositeExpression|null $condition The condition for the join. * @@ -812,9 +846,10 @@ class QueryBuilder implements IQueryBuilder { * // You can optionally programmatically build and/or expressions * $qb = $conn->getQueryBuilder(); * - * $or = $qb->expr()->orx(); - * $or->add($qb->expr()->eq('u.id', 1)); - * $or->add($qb->expr()->eq('u.id', 2)); + * $or = $qb->expr()->orx( + * $qb->expr()->eq('u.id', 1), + * $qb->expr()->eq('u.id', 2), + * ); * * $qb->update('users', 'u') * ->set('u.password', md5('password')) @@ -826,12 +861,14 @@ class QueryBuilder implements IQueryBuilder { * @return $this This QueryBuilder instance. */ public function where(...$predicates) { - if ($this->getQueryPart('where') !== null && $this->systemConfig->getValue('debug', false)) { + if ($this->nonEmptyWhere && $this->systemConfig->getValue('debug', false)) { // Only logging a warning, not throwing for now. $e = new QueryException('Using where() on non-empty WHERE part, please verify it is intentional to not call andWhere() or orWhere() instead. Otherwise consider creating a new query builder object or call resetQueryPart(\'where\') first.'); $this->logger->warning($e->getMessage(), ['exception' => $e]); } + $this->nonEmptyWhere = true; + call_user_func_array( [$this->queryBuilder, 'where'], $predicates @@ -859,6 +896,7 @@ class QueryBuilder implements IQueryBuilder { * @see where() */ public function andWhere(...$where) { + $this->nonEmptyWhere = true; call_user_func_array( [$this->queryBuilder, 'andWhere'], $where @@ -886,6 +924,7 @@ class QueryBuilder implements IQueryBuilder { * @see where() */ public function orWhere(...$where) { + $this->nonEmptyWhere = true; call_user_func_array( [$this->queryBuilder, 'orWhere'], $where @@ -968,7 +1007,7 @@ class QueryBuilder implements IQueryBuilder { public function setValue($column, $value) { $this->queryBuilder->setValue( $this->helper->quoteColumnName($column), - (string) $value + (string)$value ); return $this; @@ -1096,8 +1135,11 @@ class QueryBuilder implements IQueryBuilder { * @param string $queryPartName * * @return mixed + * @deprecated 30.0.0 This function is going to be removed with the next Doctrine/DBAL update + * and we can not fix this in our wrapper. Please track the details you need, outside the object. */ public function getQueryPart($queryPartName) { + $this->logger->debug(IQueryBuilder::class . '::' . __FUNCTION__ . ' is deprecated and will be removed soon.', ['exception' => new \Exception('Deprecated call to ' . __METHOD__)]); return $this->queryBuilder->getQueryPart($queryPartName); } @@ -1105,8 +1147,11 @@ class QueryBuilder implements IQueryBuilder { * Gets all query parts. * * @return array + * @deprecated 30.0.0 This function is going to be removed with the next Doctrine/DBAL update + * and we can not fix this in our wrapper. Please track the details you need, outside the object. */ public function getQueryParts() { + $this->logger->debug(IQueryBuilder::class . '::' . __FUNCTION__ . ' is deprecated and will be removed soon.', ['exception' => new \Exception('Deprecated call to ' . __METHOD__)]); return $this->queryBuilder->getQueryParts(); } @@ -1116,8 +1161,11 @@ class QueryBuilder implements IQueryBuilder { * @param array|null $queryPartNames * * @return $this This QueryBuilder instance. + * @deprecated 30.0.0 This function is going to be removed with the next Doctrine/DBAL update + * and we can not fix this in our wrapper. Please create a new IQueryBuilder instead. */ public function resetQueryParts($queryPartNames = null) { + $this->logger->debug(IQueryBuilder::class . '::' . __FUNCTION__ . ' is deprecated and will be removed soon.', ['exception' => new \Exception('Deprecated call to ' . __METHOD__)]); $this->queryBuilder->resetQueryParts($queryPartNames); return $this; @@ -1129,8 +1177,11 @@ class QueryBuilder implements IQueryBuilder { * @param string $queryPartName * * @return $this This QueryBuilder instance. + * @deprecated 30.0.0 This function is going to be removed with the next Doctrine/DBAL update + * and we can not fix this in our wrapper. Please create a new IQueryBuilder instead. */ public function resetQueryPart($queryPartName) { + $this->logger->debug(IQueryBuilder::class . '::' . __FUNCTION__ . ' is deprecated and will be removed soon.', ['exception' => new \Exception('Deprecated call to ' . __METHOD__)]); $this->queryBuilder->resetQueryPart($queryPartName); return $this; @@ -1265,7 +1316,7 @@ class QueryBuilder implements IQueryBuilder { */ public function getTableName($table) { if ($table instanceof IQueryFunction) { - return (string) $table; + return (string)$table; } $table = $this->prefixTableName($table); @@ -1278,7 +1329,7 @@ class QueryBuilder implements IQueryBuilder { * @param string $table * @return string */ - protected function prefixTableName($table) { + public function prefixTableName(string $table): string { if ($this->automaticTablePrefix === false || str_starts_with($table, '*PREFIX*')) { return $table; } @@ -1314,4 +1365,18 @@ class QueryBuilder implements IQueryBuilder { return $this->helper->quoteColumnName($alias); } + + public function escapeLikeParameter(string $parameter): string { + return $this->connection->escapeLikeParameter($parameter); + } + + public function hintShardKey(string $column, mixed $value, bool $overwrite = false): self { + return $this; + } + + public function runAcrossAllShards(): self { + // noop + return $this; + } + } diff --git a/lib/private/DB/QueryBuilder/QueryFunction.php b/lib/private/DB/QueryBuilder/QueryFunction.php index 9cdd6c31c7b..7f2ab584a73 100644 --- a/lib/private/DB/QueryBuilder/QueryFunction.php +++ b/lib/private/DB/QueryBuilder/QueryFunction.php @@ -18,6 +18,6 @@ class QueryFunction implements IQueryFunction { } public function __toString(): string { - return (string) $this->function; + return (string)$this->function; } } diff --git a/lib/private/DB/QueryBuilder/QuoteHelper.php b/lib/private/DB/QueryBuilder/QuoteHelper.php index a60a9731aa2..7ce4b359638 100644 --- a/lib/private/DB/QueryBuilder/QuoteHelper.php +++ b/lib/private/DB/QueryBuilder/QuoteHelper.php @@ -35,7 +35,7 @@ class QuoteHelper { */ public function quoteColumnName($string) { if ($string instanceof IParameter || $string instanceof ILiteral || $string instanceof IQueryFunction) { - return (string) $string; + return (string)$string; } if ($string === null || $string === 'null' || $string === '*') { diff --git a/lib/private/DB/QueryBuilder/Sharded/AutoIncrementHandler.php b/lib/private/DB/QueryBuilder/Sharded/AutoIncrementHandler.php new file mode 100644 index 00000000000..c3ce28376e3 --- /dev/null +++ b/lib/private/DB/QueryBuilder/Sharded/AutoIncrementHandler.php @@ -0,0 +1,152 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Robin Appelman <robin@icewind.nl> + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OC\DB\QueryBuilder\Sharded; + +use OCP\ICacheFactory; +use OCP\IMemcache; +use OCP\IMemcacheTTL; + +/** + * A helper to atomically determine the next auto increment value for a sharded table + * + * Since we can't use the database's auto-increment (since each db doesn't know about the keys in the other shards) + * we need external logic for doing the auto increment + */ +class AutoIncrementHandler { + public const MIN_VALID_KEY = 1000; + public const TTL = 365 * 24 * 60 * 60; + + private ?IMemcache $cache = null; + + public function __construct( + private ICacheFactory $cacheFactory, + private ShardConnectionManager $shardConnectionManager, + ) { + if (PHP_INT_SIZE < 8) { + throw new \Exception('sharding is only supported with 64bit php'); + } + } + + private function getCache(): IMemcache { + if (is_null($this->cache)) { + $cache = $this->cacheFactory->createDistributed('shared_autoincrement'); + if ($cache instanceof IMemcache) { + $this->cache = $cache; + } else { + throw new \Exception('Distributed cache ' . get_class($cache) . ' is not suitable'); + } + } + return $this->cache; + } + + /** + * Get the next value for the given shard definition + * + * The returned key is unique and incrementing, but not sequential. + * The shard id is encoded in the first byte of the returned value + * + * @param ShardDefinition $shardDefinition + * @return int + * @throws \Exception + */ + public function getNextPrimaryKey(ShardDefinition $shardDefinition, int $shard): int { + $retries = 0; + while ($retries < 5) { + $next = $this->getNextInner($shardDefinition); + if ($next !== null) { + if ($next > ShardDefinition::MAX_PRIMARY_KEY) { + throw new \Exception('Max primary key of ' . ShardDefinition::MAX_PRIMARY_KEY . ' exceeded'); + } + // we encode the shard the primary key was originally inserted into to allow guessing the shard by primary key later on + return ($next << 8) | $shard; + } else { + $retries++; + } + } + throw new \Exception('Failed to get next primary key'); + } + + /** + * auto increment logic without retry + * + * @param ShardDefinition $shardDefinition + * @return int|null either the next primary key or null if the call needs to be retried + */ + private function getNextInner(ShardDefinition $shardDefinition): ?int { + $cache = $this->getCache(); + // because this function will likely be called concurrently from different requests + // the implementation needs to ensure that the cached value can be cleared, invalidated or re-calculated at any point between our cache calls + // care must be taken that the logic remains fully resilient against race conditions + + // in the ideal case, the last primary key is stored in the cache and we can just do an `inc` + // if that is not the case we find the highest used id in the database increment it, and save it in the cache + + // prevent inc from returning `1` if the key doesn't exist by setting it to a non-numeric value + $cache->add($shardDefinition->table, 'empty-placeholder', self::TTL); + $next = $cache->inc($shardDefinition->table); + + if ($cache instanceof IMemcacheTTL) { + $cache->setTTL($shardDefinition->table, self::TTL); + } + + // the "add + inc" trick above isn't strictly atomic, so as a safety we reject any result that to small + // to handle the edge case of the stored value disappearing between the add and inc + if (is_int($next) && $next >= self::MIN_VALID_KEY) { + return $next; + } elseif (is_int($next)) { + // we hit the edge case, so invalidate the cached value + if (!$cache->cas($shardDefinition->table, $next, 'empty-placeholder')) { + // someone else is changing the value concurrently, give up and retry + return null; + } + } + + // discard the encoded initial shard + $current = $this->getMaxFromDb($shardDefinition) >> 8; + $next = max($current, self::MIN_VALID_KEY) + 1; + if ($cache->cas($shardDefinition->table, 'empty-placeholder', $next)) { + return $next; + } + + // another request set the cached value before us, so we should just be able to inc + $next = $cache->inc($shardDefinition->table); + if (is_int($next) && $next >= self::MIN_VALID_KEY) { + return $next; + } elseif (is_int($next)) { + // key got cleared, invalidate and retry + $cache->cas($shardDefinition->table, $next, 'empty-placeholder'); + return null; + } else { + // cleanup any non-numeric value other than the placeholder if that got stored somehow + $cache->ncad($shardDefinition->table, 'empty-placeholder'); + // retry + return null; + } + } + + /** + * Get the maximum primary key value from the shards + */ + private function getMaxFromDb(ShardDefinition $shardDefinition): int { + $max = 0; + foreach ($shardDefinition->getAllShards() as $shard) { + $connection = $this->shardConnectionManager->getConnection($shardDefinition, $shard); + $query = $connection->getQueryBuilder(); + $query->select($shardDefinition->primaryKey) + ->from($shardDefinition->table) + ->orderBy($shardDefinition->primaryKey, 'DESC') + ->setMaxResults(1); + $result = $query->executeQuery()->fetchOne(); + if ($result) { + $max = max($max, $result); + } + } + return $max; + } +} diff --git a/lib/private/DB/QueryBuilder/Sharded/CrossShardMoveHelper.php b/lib/private/DB/QueryBuilder/Sharded/CrossShardMoveHelper.php new file mode 100644 index 00000000000..45f24e32685 --- /dev/null +++ b/lib/private/DB/QueryBuilder/Sharded/CrossShardMoveHelper.php @@ -0,0 +1,162 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Robin Appelman <robin@icewind.nl> + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OC\DB\QueryBuilder\Sharded; + +use OCP\DB\QueryBuilder\IQueryBuilder; +use OCP\IDBConnection; + +/** + * Utility methods for implementing logic that moves data across shards + */ +class CrossShardMoveHelper { + public function __construct( + private ShardConnectionManager $connectionManager + ) { + } + + public function getConnection(ShardDefinition $shardDefinition, int $shardKey): IDBConnection { + return $this->connectionManager->getConnection($shardDefinition, $shardDefinition->getShardForKey($shardKey)); + } + + /** + * Update the shard key of a set of rows, moving them to a different shard if needed + * + * @param ShardDefinition $shardDefinition + * @param string $table + * @param string $shardColumn + * @param int $sourceShardKey + * @param int $targetShardKey + * @param string $primaryColumn + * @param int[] $primaryKeys + * @return void + */ + public function moveCrossShards(ShardDefinition $shardDefinition, string $table, string $shardColumn, int $sourceShardKey, int $targetShardKey, string $primaryColumn, array $primaryKeys): void { + $sourceShard = $shardDefinition->getShardForKey($sourceShardKey); + $targetShard = $shardDefinition->getShardForKey($targetShardKey); + $sourceConnection = $this->connectionManager->getConnection($shardDefinition, $sourceShard); + if ($sourceShard === $targetShard) { + $this->updateItems($sourceConnection, $table, $shardColumn, $targetShardKey, $primaryColumn, $primaryKeys); + + return; + } + $targetConnection = $this->connectionManager->getConnection($shardDefinition, $targetShard); + + $sourceItems = $this->loadItems($sourceConnection, $table, $primaryColumn, $primaryKeys); + foreach ($sourceItems as &$sourceItem) { + $sourceItem[$shardColumn] = $targetShardKey; + } + if (!$sourceItems) { + return; + } + + $sourceConnection->beginTransaction(); + $targetConnection->beginTransaction(); + try { + $this->saveItems($targetConnection, $table, $sourceItems); + $this->deleteItems($sourceConnection, $table, $primaryColumn, $primaryKeys); + + $targetConnection->commit(); + $sourceConnection->commit(); + } catch (\Exception $e) { + $sourceConnection->rollback(); + $targetConnection->rollback(); + throw $e; + } + } + + /** + * Load rows from a table to move + * + * @param IDBConnection $connection + * @param string $table + * @param string $primaryColumn + * @param int[] $primaryKeys + * @return array[] + */ + public function loadItems(IDBConnection $connection, string $table, string $primaryColumn, array $primaryKeys): array { + $query = $connection->getQueryBuilder(); + $query->select('*') + ->from($table) + ->where($query->expr()->in($primaryColumn, $query->createParameter('keys'))); + + $chunks = array_chunk($primaryKeys, 1000); + + $results = []; + foreach ($chunks as $chunk) { + $query->setParameter('keys', $chunk, IQueryBuilder::PARAM_INT_ARRAY); + $results = array_merge($results, $query->execute()->fetchAll()); + } + + return $results; + } + + /** + * Save modified rows + * + * @param IDBConnection $connection + * @param string $table + * @param array[] $items + * @return void + */ + public function saveItems(IDBConnection $connection, string $table, array $items): void { + if (count($items) === 0) { + return; + } + $query = $connection->getQueryBuilder(); + $query->insert($table); + foreach ($items[0] as $column => $value) { + $query->setValue($column, $query->createParameter($column)); + } + + foreach ($items as $item) { + foreach ($item as $column => $value) { + if (is_int($column)) { + $query->setParameter($column, $value, IQueryBuilder::PARAM_INT); + } else { + $query->setParameter($column, $value); + } + } + $query->executeStatement(); + } + } + + /** + * @param IDBConnection $connection + * @param string $table + * @param string $primaryColumn + * @param int[] $primaryKeys + * @return void + */ + public function updateItems(IDBConnection $connection, string $table, string $shardColumn, int $targetShardKey, string $primaryColumn, array $primaryKeys): void { + $query = $connection->getQueryBuilder(); + $query->update($table) + ->set($shardColumn, $query->createNamedParameter($targetShardKey, IQueryBuilder::PARAM_INT)) + ->where($query->expr()->in($primaryColumn, $query->createNamedParameter($primaryKeys, IQueryBuilder::PARAM_INT_ARRAY))); + $query->executeQuery()->fetchAll(); + } + + /** + * @param IDBConnection $connection + * @param string $table + * @param string $primaryColumn + * @param int[] $primaryKeys + * @return void + */ + public function deleteItems(IDBConnection $connection, string $table, string $primaryColumn, array $primaryKeys): void { + $query = $connection->getQueryBuilder(); + $query->delete($table) + ->where($query->expr()->in($primaryColumn, $query->createParameter('keys'))); + $chunks = array_chunk($primaryKeys, 1000); + + foreach ($chunks as $chunk) { + $query->setParameter('keys', $chunk, IQueryBuilder::PARAM_INT_ARRAY); + $query->executeStatement(); + } + } +} diff --git a/lib/private/DB/QueryBuilder/Sharded/HashShardMapper.php b/lib/private/DB/QueryBuilder/Sharded/HashShardMapper.php new file mode 100644 index 00000000000..af778489a2d --- /dev/null +++ b/lib/private/DB/QueryBuilder/Sharded/HashShardMapper.php @@ -0,0 +1,21 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Robin Appelman <robin@icewind.nl> + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OC\DB\QueryBuilder\Sharded; + +use OCP\DB\QueryBuilder\Sharded\IShardMapper; + +/** + * Map string key to an int-range by hashing the key + */ +class HashShardMapper implements IShardMapper { + public function getShardForKey(int $key, int $count): int { + $int = unpack('L', substr(md5((string)$key, true), 0, 4))[1]; + return $int % $count; + } +} diff --git a/lib/private/DB/QueryBuilder/Sharded/InvalidShardedQueryException.php b/lib/private/DB/QueryBuilder/Sharded/InvalidShardedQueryException.php new file mode 100644 index 00000000000..733a6acaf9d --- /dev/null +++ b/lib/private/DB/QueryBuilder/Sharded/InvalidShardedQueryException.php @@ -0,0 +1,29 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-only + */ + +namespace OC\DB\QueryBuilder\Sharded; + +/** + * Queries on sharded table has the following limitations: + * + * 1. Either the shard key (e.g. "storage") or primary key (e.g. "fileid") must be mentioned in the query. + * Or the query must be explicitly marked as running across all shards. + * + * For queries where it isn't possible to set one of these keys in the query normally, you can set it using `hintShardKey` + * + * 2. Insert statements must always explicitly set the shard key + * 3. A query on a sharded table is not allowed to join on the same table + * 4. Right joins are not allowed on sharded tables + * 5. Updating the shard key where the new shard key maps to a different shard is not allowed + * + * Moving rows to a different shard needs to be implemented manually. `CrossShardMoveHelper` provides + * some tools to help make this easier. + */ +class InvalidShardedQueryException extends \Exception { + +} diff --git a/lib/private/DB/QueryBuilder/Sharded/RoundRobinShardMapper.php b/lib/private/DB/QueryBuilder/Sharded/RoundRobinShardMapper.php new file mode 100644 index 00000000000..a5694b06507 --- /dev/null +++ b/lib/private/DB/QueryBuilder/Sharded/RoundRobinShardMapper.php @@ -0,0 +1,20 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Robin Appelman <robin@icewind.nl> + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OC\DB\QueryBuilder\Sharded; + +use OCP\DB\QueryBuilder\Sharded\IShardMapper; + +/** + * Map string key to an int-range by hashing the key + */ +class RoundRobinShardMapper implements IShardMapper { + public function getShardForKey(int $key, int $count): int { + return $key % $count; + } +} diff --git a/lib/private/DB/QueryBuilder/Sharded/ShardConnectionManager.php b/lib/private/DB/QueryBuilder/Sharded/ShardConnectionManager.php new file mode 100644 index 00000000000..87cac58bc57 --- /dev/null +++ b/lib/private/DB/QueryBuilder/Sharded/ShardConnectionManager.php @@ -0,0 +1,43 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Robin Appelman <robin@icewind.nl> + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OC\DB\QueryBuilder\Sharded; + +use OC\DB\ConnectionAdapter; +use OC\DB\ConnectionFactory; +use OC\SystemConfig; +use OCP\IDBConnection; + +/** + * Keeps track of the db connections to the various shards + */ +class ShardConnectionManager { + /** @var array<string, IDBConnection> */ + private array $connections = []; + + public function __construct( + private SystemConfig $config, + private ConnectionFactory $factory, + ) { + } + + public function getConnection(ShardDefinition $shardDefinition, int $shard): IDBConnection { + $connectionKey = $shardDefinition->table . '_' . $shard; + if (!isset($this->connections[$connectionKey])) { + $this->connections[$connectionKey] = $this->createConnection($shardDefinition->shards[$shard]); + } + + return $this->connections[$connectionKey]; + } + + private function createConnection(array $shardConfig): IDBConnection { + $shardConfig['sharding'] = []; + $type = $this->config->getValue('dbtype', 'sqlite'); + return new ConnectionAdapter($this->factory->getConnection($type, $shardConfig)); + } +} diff --git a/lib/private/DB/QueryBuilder/Sharded/ShardDefinition.php b/lib/private/DB/QueryBuilder/Sharded/ShardDefinition.php new file mode 100644 index 00000000000..ebccbb639a6 --- /dev/null +++ b/lib/private/DB/QueryBuilder/Sharded/ShardDefinition.php @@ -0,0 +1,66 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Robin Appelman <robin@icewind.nl> + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OC\DB\QueryBuilder\Sharded; + +use OCP\DB\QueryBuilder\Sharded\IShardMapper; + +/** + * Configuration for a shard setup + */ +class ShardDefinition { + // we reserve the bottom byte of the primary key for the initial shard, so the total shard count is limited to what we can fit there + public const MAX_SHARDS = 256; + + public const PRIMARY_KEY_MASK = 0x7F_FF_FF_FF_FF_FF_FF_00; + public const PRIMARY_KEY_SHARD_MASK = 0x00_00_00_00_00_00_00_FF; + // since we reserve 1 byte for the shard index, we only have 56 bits of primary key space + public const MAX_PRIMARY_KEY = PHP_INT_MAX >> 8; + + /** + * @param string $table + * @param string $primaryKey + * @param string $shardKey + * @param string[] $companionKeys + * @param IShardMapper $shardMapper + * @param string[] $companionTables + * @param array $shards + */ + public function __construct( + public string $table, + public string $primaryKey, + public array $companionKeys, + public string $shardKey, + public IShardMapper $shardMapper, + public array $companionTables = [], + public array $shards = [], + ) { + if (count($this->shards) >= self::MAX_SHARDS) { + throw new \Exception('Only allowed maximum of ' . self::MAX_SHARDS . ' shards allowed'); + } + } + + public function hasTable(string $table): bool { + if ($this->table === $table) { + return true; + } + return in_array($table, $this->companionTables); + } + + public function getShardForKey(int $key): int { + return $this->shardMapper->getShardForKey($key, count($this->shards)); + } + + public function getAllShards(): array { + return array_keys($this->shards); + } + + public function isKey(string $column): bool { + return $column === $this->primaryKey || in_array($column, $this->companionKeys); + } +} diff --git a/lib/private/DB/QueryBuilder/Sharded/ShardQueryRunner.php b/lib/private/DB/QueryBuilder/Sharded/ShardQueryRunner.php new file mode 100644 index 00000000000..51cd055e801 --- /dev/null +++ b/lib/private/DB/QueryBuilder/Sharded/ShardQueryRunner.php @@ -0,0 +1,197 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Robin Appelman <robin@icewind.nl> + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OC\DB\QueryBuilder\Sharded; + +use OC\DB\ArrayResult; +use OCP\DB\IResult; +use OCP\DB\QueryBuilder\IQueryBuilder; + +/** + * Logic for running a query across a number of shards, combining the results + */ +class ShardQueryRunner { + public function __construct( + private ShardConnectionManager $shardConnectionManager, + private ShardDefinition $shardDefinition, + ) { + } + + /** + * Get the shards for a specific query or null if the shards aren't known in advance + * + * @param bool $allShards + * @param int[] $shardKeys + * @return null|int[] + */ + public function getShards(bool $allShards, array $shardKeys): ?array { + if ($allShards) { + return $this->shardDefinition->getAllShards(); + } + $allConfiguredShards = $this->shardDefinition->getAllShards(); + if (count($allConfiguredShards) === 1) { + return $allConfiguredShards; + } + if (empty($shardKeys)) { + return null; + } + $shards = array_map(function ($shardKey) { + return $this->shardDefinition->getShardForKey((int)$shardKey); + }, $shardKeys); + return array_values(array_unique($shards)); + } + + /** + * Try to get the shards that the keys are likely to be in, based on the shard the row was created + * + * @param int[] $primaryKeys + * @return int[] + */ + private function getLikelyShards(array $primaryKeys): array { + $shards = []; + foreach ($primaryKeys as $primaryKey) { + $encodedShard = $primaryKey & ShardDefinition::PRIMARY_KEY_SHARD_MASK; + if ($encodedShard < count($this->shardDefinition->shards) && !in_array($encodedShard, $shards)) { + $shards[] = $encodedShard; + } + } + return $shards; + } + + /** + * Execute a SELECT statement across the configured shards + * + * @param IQueryBuilder $query + * @param bool $allShards + * @param int[] $shardKeys + * @param int[] $primaryKeys + * @param array{column: string, order: string}[] $sortList + * @param int|null $limit + * @param int|null $offset + * @return IResult + */ + public function executeQuery( + IQueryBuilder $query, + bool $allShards, + array $shardKeys, + array $primaryKeys, + ?array $sortList = null, + ?int $limit = null, + ?int $offset = null, + ): IResult { + $shards = $this->getShards($allShards, $shardKeys); + $results = []; + if ($shards && count($shards) === 1) { + // trivial case + return $query->executeQuery($this->shardConnectionManager->getConnection($this->shardDefinition, $shards[0])); + } + // we have to emulate limit and offset, so we select offset+limit from all shards to ensure we have enough rows + // and then filter them down after we merged the results + if ($limit !== null && $offset !== null) { + $query->setMaxResults($limit + $offset); + } + + if ($shards) { + // we know exactly what shards we need to query + foreach ($shards as $shard) { + $shardConnection = $this->shardConnectionManager->getConnection($this->shardDefinition, $shard); + $subResult = $query->executeQuery($shardConnection); + $results = array_merge($results, $subResult->fetchAll()); + $subResult->closeCursor(); + } + } else { + // we don't know for sure what shards we need to query, + // we first try the shards that are "likely" to have the rows we want, based on the shard that the row was + // originally created in. If we then still haven't found all rows we try the rest of the shards + $likelyShards = $this->getLikelyShards($primaryKeys); + $unlikelyShards = array_diff($this->shardDefinition->getAllShards(), $likelyShards); + $shards = array_merge($likelyShards, $unlikelyShards); + + foreach ($shards as $shard) { + $shardConnection = $this->shardConnectionManager->getConnection($this->shardDefinition, $shard); + $subResult = $query->executeQuery($shardConnection); + $rows = $subResult->fetchAll(); + $results = array_merge($results, $rows); + $subResult->closeCursor(); + + if (count($rows) >= count($primaryKeys)) { + // we have all the rows we're looking for + break; + } + } + } + + if ($sortList) { + usort($results, function ($a, $b) use ($sortList) { + foreach ($sortList as $sort) { + $valueA = $a[$sort['column']] ?? null; + $valueB = $b[$sort['column']] ?? null; + $cmp = $valueA <=> $valueB; + if ($cmp === 0) { + continue; + } + if ($sort['order'] === 'DESC') { + $cmp = -$cmp; + } + return $cmp; + } + }); + } + + if ($limit !== null && $offset !== null) { + $results = array_slice($results, $offset, $limit); + } elseif ($limit !== null) { + $results = array_slice($results, 0, $limit); + } elseif ($offset !== null) { + $results = array_slice($results, $offset); + } + + return new ArrayResult($results); + } + + /** + * Execute an UPDATE or DELETE statement + * + * @param IQueryBuilder $query + * @param bool $allShards + * @param int[] $shardKeys + * @param int[] $primaryKeys + * @return int + * @throws \OCP\DB\Exception + */ + public function executeStatement(IQueryBuilder $query, bool $allShards, array $shardKeys, array $primaryKeys): int { + if ($query->getType() === \Doctrine\DBAL\Query\QueryBuilder::INSERT) { + throw new \Exception('insert queries need special handling'); + } + + $shards = $this->getShards($allShards, $shardKeys); + $maxCount = count($primaryKeys); + if ($shards && count($shards) === 1) { + return $query->executeStatement($this->shardConnectionManager->getConnection($this->shardDefinition, $shards[0])); + } elseif ($shards) { + $maxCount = PHP_INT_MAX; + } else { + // sort the likely shards before the rest, similar logic to `self::executeQuery` + $likelyShards = $this->getLikelyShards($primaryKeys); + $unlikelyShards = array_diff($this->shardDefinition->getAllShards(), $likelyShards); + $shards = array_merge($likelyShards, $unlikelyShards); + } + + $count = 0; + + foreach ($shards as $shard) { + $shardConnection = $this->shardConnectionManager->getConnection($this->shardDefinition, $shard); + $count += $query->executeStatement($shardConnection); + + if ($count >= $maxCount) { + break; + } + } + return $count; + } +} diff --git a/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php b/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php new file mode 100644 index 00000000000..e5b66470de0 --- /dev/null +++ b/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php @@ -0,0 +1,407 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Robin Appelman <robin@icewind.nl> + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OC\DB\QueryBuilder\Sharded; + +use OC\DB\QueryBuilder\CompositeExpression; +use OC\DB\QueryBuilder\ExtendedQueryBuilder; +use OC\DB\QueryBuilder\Parameter; +use OCP\DB\IResult; +use OCP\DB\QueryBuilder\IQueryBuilder; +use OCP\IDBConnection; + +/** + * A special query builder that automatically distributes queries over multiple database shards. + * + * This relies on `PartitionedQueryBuilder` to handle splitting of parts of the query that touch the sharded tables + * from the non-sharded tables. So the query build here should only either touch only sharded table or only non-sharded tables. + * + * Most of the logic in this class is concerned with extracting either the shard key (e.g. "storage") or primary key (e.g. "fileid") + * from the query. The logic for actually running the query across the shards is mostly delegated to `ShardQueryRunner`. + */ +class ShardedQueryBuilder extends ExtendedQueryBuilder { + private array $shardKeys = []; + private array $primaryKeys = []; + private ?ShardDefinition $shardDefinition = null; + /** @var bool Run the query across all shards */ + private bool $allShards = false; + private ?string $insertTable = null; + private mixed $lastInsertId = null; + private ?IDBConnection $lastInsertConnection = null; + private ?int $updateShardKey = null; + private ?int $limit = null; + private ?int $offset = null; + /** @var array{column: string, order: string}[] */ + private array $sortList = []; + private string $mainTable = ''; + + public function __construct( + IQueryBuilder $builder, + protected array $shardDefinitions, + protected ShardConnectionManager $shardConnectionManager, + protected AutoIncrementHandler $autoIncrementHandler, + ) { + parent::__construct($builder); + } + + public function getShardKeys(): array { + return $this->getKeyValues($this->shardKeys); + } + + public function getPrimaryKeys(): array { + return $this->getKeyValues($this->primaryKeys); + } + + private function getKeyValues(array $keys): array { + $values = []; + foreach ($keys as $key) { + $values = array_merge($values, $this->getKeyValue($key)); + } + return array_values(array_unique($values)); + } + + private function getKeyValue($value): array { + if ($value instanceof Parameter) { + $value = (string)$value; + } + if (is_string($value) && str_starts_with($value, ':')) { + $param = $this->getParameter(substr($value, 1)); + if (is_array($param)) { + return $param; + } else { + return [$param]; + } + } elseif ($value !== null) { + return [$value]; + } else { + return []; + } + } + + public function where(...$predicates) { + return $this->andWhere(...$predicates); + } + + public function andWhere(...$where) { + if ($where) { + foreach ($where as $predicate) { + $this->tryLoadShardKey($predicate); + } + parent::andWhere(...$where); + } + return $this; + } + + private function tryLoadShardKey($predicate): void { + if (!$this->shardDefinition) { + return; + } + if ($keys = $this->tryExtractShardKeys($predicate, $this->shardDefinition->shardKey)) { + $this->shardKeys += $keys; + } + if ($keys = $this->tryExtractShardKeys($predicate, $this->shardDefinition->primaryKey)) { + $this->primaryKeys += $keys; + } + foreach ($this->shardDefinition->companionKeys as $companionKey) { + if ($keys = $this->tryExtractShardKeys($predicate, $companionKey)) { + $this->primaryKeys += $keys; + } + } + } + + /** + * @param $predicate + * @param string $column + * @return string[] + */ + private function tryExtractShardKeys($predicate, string $column): array { + if ($predicate instanceof CompositeExpression) { + $values = []; + foreach ($predicate->getParts() as $part) { + $partValues = $this->tryExtractShardKeys($part, $column); + // for OR expressions, we can only rely on the predicate if all parts contain the comparison + if ($predicate->getType() === CompositeExpression::TYPE_OR && !$partValues) { + return []; + } + $values = array_merge($values, $partValues); + } + return $values; + } + $predicate = (string)$predicate; + // expect a condition in the form of 'alias1.column1 = placeholder' or 'alias1.column1 in placeholder' + if (substr_count($predicate, ' ') > 2) { + return []; + } + if (str_contains($predicate, ' = ')) { + $parts = explode(' = ', $predicate); + if ($parts[0] === "`{$column}`" || str_ends_with($parts[0], "`.`{$column}`")) { + return [$parts[1]]; + } else { + return []; + } + } + + if (str_contains($predicate, ' IN ')) { + $parts = explode(' IN ', $predicate); + if ($parts[0] === "`{$column}`" || str_ends_with($parts[0], "`.`{$column}`")) { + return [trim(trim($parts[1], '('), ')')]; + } else { + return []; + } + } + + return []; + } + + public function set($key, $value) { + if ($this->shardDefinition && $key === $this->shardDefinition->shardKey) { + $updateShardKey = $value; + } + return parent::set($key, $value); + } + + public function setValue($column, $value) { + if ($this->shardDefinition) { + if ($this->shardDefinition->isKey($column)) { + $this->primaryKeys[] = $value; + } + if ($column === $this->shardDefinition->shardKey) { + $this->shardKeys[] = $value; + } + } + return parent::setValue($column, $value); + } + + public function values(array $values) { + foreach ($values as $column => $value) { + $this->setValue($column, $value); + } + return $this; + } + + private function actOnTable(string $table): void { + $this->mainTable = $table; + foreach ($this->shardDefinitions as $shardDefinition) { + if ($shardDefinition->hasTable($table)) { + $this->shardDefinition = $shardDefinition; + } + } + } + + public function from($from, $alias = null) { + if (is_string($from) && $from) { + $this->actOnTable($from); + } + return parent::from($from, $alias); + } + + public function update($update = null, $alias = null) { + if (is_string($update) && $update) { + $this->actOnTable($update); + } + return parent::update($update, $alias); + } + + public function insert($insert = null) { + if (is_string($insert) && $insert) { + $this->insertTable = $insert; + $this->actOnTable($insert); + } + return parent::insert($insert); + } + + public function delete($delete = null, $alias = null) { + if (is_string($delete) && $delete) { + $this->actOnTable($delete); + } + return parent::delete($delete, $alias); + } + + private function checkJoin(string $table): void { + if ($this->shardDefinition) { + if ($table === $this->mainTable) { + throw new InvalidShardedQueryException("Sharded query on {$this->mainTable} isn't allowed to join on itself"); + } + if (!$this->shardDefinition->hasTable($table)) { + // this generally shouldn't happen as the partitioning logic should prevent this + // but the check is here just in case + throw new InvalidShardedQueryException("Sharded query on {$this->shardDefinition->table} isn't allowed to join on $table"); + } + } + } + + public function innerJoin($fromAlias, $join, $alias, $condition = null) { + $this->checkJoin($join); + return parent::innerJoin($fromAlias, $join, $alias, $condition); + } + + public function leftJoin($fromAlias, $join, $alias, $condition = null) { + $this->checkJoin($join); + return parent::leftJoin($fromAlias, $join, $alias, $condition); + } + + public function rightJoin($fromAlias, $join, $alias, $condition = null) { + if ($this->shardDefinition) { + throw new InvalidShardedQueryException("Sharded query on {$this->shardDefinition->table} isn't allowed to right join"); + } + return parent::rightJoin($fromAlias, $join, $alias, $condition); + } + + public function join($fromAlias, $join, $alias, $condition = null) { + return $this->innerJoin($fromAlias, $join, $alias, $condition); + } + + public function setMaxResults($maxResults) { + if ($maxResults > 0) { + $this->limit = (int)$maxResults; + } + return parent::setMaxResults($maxResults); + } + + public function setFirstResult($firstResult) { + if ($firstResult > 0) { + $this->offset = (int)$firstResult; + } + if ($this->shardDefinition && count($this->shardDefinition->shards) > 1) { + // we have to emulate offset + return $this; + } else { + return parent::setFirstResult($firstResult); + } + } + + public function addOrderBy($sort, $order = null) { + $this->registerOrder((string)$sort, (string)$order ?? 'ASC'); + return parent::orderBy($sort, $order); + } + + public function orderBy($sort, $order = null) { + $this->sortList = []; + $this->registerOrder((string)$sort, (string)$order ?? 'ASC'); + return parent::orderBy($sort, $order); + } + + private function registerOrder(string $column, string $order): void { + // handle `mime + 0` and similar by just sorting on the first part of the expression + [$column] = explode(' ', $column); + $column = trim($column, '`'); + $this->sortList[] = [ + 'column' => $column, + 'order' => strtoupper($order), + ]; + } + + public function hintShardKey(string $column, mixed $value, bool $overwrite = false): self { + if ($overwrite) { + $this->primaryKeys = []; + $this->shardKeys = []; + } + if ($this->shardDefinition?->isKey($column)) { + $this->primaryKeys[] = $value; + } + if ($column === $this->shardDefinition?->shardKey) { + $this->shardKeys[] = $value; + } + return $this; + } + + public function runAcrossAllShards(): self { + $this->allShards = true; + return $this; + } + + /** + * @throws InvalidShardedQueryException + */ + public function validate(): void { + if ($this->shardDefinition && $this->insertTable) { + if ($this->allShards) { + throw new InvalidShardedQueryException("Can't insert across all shards"); + } + if (empty($this->getShardKeys())) { + throw new InvalidShardedQueryException("Can't insert without shard key"); + } + } + if ($this->shardDefinition && !$this->allShards) { + if (empty($this->getShardKeys()) && empty($this->getPrimaryKeys())) { + throw new InvalidShardedQueryException('No shard key or primary key set for query'); + } + } + if ($this->shardDefinition && $this->updateShardKey) { + $newShardKey = $this->getKeyValue($this->updateShardKey); + $oldShardKeys = $this->getShardKeys(); + if (count($newShardKey) !== 1) { + throw new InvalidShardedQueryException("Can't set shard key to an array"); + } + $newShardKey = current($newShardKey); + if (empty($oldShardKeys)) { + throw new InvalidShardedQueryException("Can't update without shard key"); + } + $oldShards = array_values(array_unique(array_map(function ($shardKey) { + return $this->shardDefinition->getShardForKey((int)$shardKey); + }, $oldShardKeys))); + $newShard = $this->shardDefinition->getShardForKey((int)$newShardKey); + if ($oldShards === [$newShard]) { + throw new InvalidShardedQueryException('Update statement would move rows to a different shard'); + } + } + } + + public function executeQuery(?IDBConnection $connection = null): IResult { + $this->validate(); + if ($this->shardDefinition) { + $runner = new ShardQueryRunner($this->shardConnectionManager, $this->shardDefinition); + return $runner->executeQuery($this->builder, $this->allShards, $this->getShardKeys(), $this->getPrimaryKeys(), $this->sortList, $this->limit, $this->offset); + } + return parent::executeQuery($connection); + } + + public function executeStatement(?IDBConnection $connection = null): int { + $this->validate(); + if ($this->shardDefinition) { + $runner = new ShardQueryRunner($this->shardConnectionManager, $this->shardDefinition); + if ($this->insertTable) { + $shards = $runner->getShards($this->allShards, $this->getShardKeys()); + if (!$shards) { + throw new InvalidShardedQueryException("Can't insert without shard key"); + } + $count = 0; + foreach ($shards as $shard) { + $shardConnection = $this->shardConnectionManager->getConnection($this->shardDefinition, $shard); + if (!$this->primaryKeys && $this->shardDefinition->table === $this->insertTable) { + $id = $this->autoIncrementHandler->getNextPrimaryKey($this->shardDefinition, $shard); + parent::setValue($this->shardDefinition->primaryKey, $this->createParameter('__generated_primary_key')); + $this->setParameter('__generated_primary_key', $id, self::PARAM_INT); + $this->lastInsertId = $id; + } + $count += parent::executeStatement($shardConnection); + + $this->lastInsertConnection = $shardConnection; + } + return $count; + } else { + return $runner->executeStatement($this->builder, $this->allShards, $this->getShardKeys(), $this->getPrimaryKeys()); + } + } + return parent::executeStatement($connection); + } + + public function getLastInsertId(): int { + if ($this->lastInsertId) { + return $this->lastInsertId; + } + if ($this->lastInsertConnection) { + $table = $this->builder->prefixTableName($this->insertTable); + return $this->lastInsertConnection->lastInsertId($table); + } else { + return parent::getLastInsertId(); + } + } + + +} diff --git a/lib/private/DB/ResultAdapter.php b/lib/private/DB/ResultAdapter.php index 8b004d471ec..95a7620e0ff 100644 --- a/lib/private/DB/ResultAdapter.php +++ b/lib/private/DB/ResultAdapter.php @@ -30,14 +30,21 @@ class ResultAdapter implements IResult { } public function fetch(int $fetchMode = PDO::FETCH_ASSOC) { - return $this->inner->fetch($fetchMode); + return match ($fetchMode) { + PDO::FETCH_ASSOC => $this->inner->fetchAssociative(), + PDO::FETCH_NUM => $this->inner->fetchNumeric(), + PDO::FETCH_COLUMN => $this->inner->fetchOne(), + default => throw new \Exception('Fetch mode needs to be assoc, num or column.'), + }; } public function fetchAll(int $fetchMode = PDO::FETCH_ASSOC): array { - if ($fetchMode !== PDO::FETCH_ASSOC && $fetchMode !== PDO::FETCH_NUM && $fetchMode !== PDO::FETCH_COLUMN) { - throw new \Exception('Fetch mode needs to be assoc, num or column.'); - } - return $this->inner->fetchAll($fetchMode); + return match ($fetchMode) { + PDO::FETCH_ASSOC => $this->inner->fetchAllAssociative(), + PDO::FETCH_NUM => $this->inner->fetchAllNumeric(), + PDO::FETCH_COLUMN => $this->inner->fetchFirstColumn(), + default => throw new \Exception('Fetch mode needs to be assoc, num or column.'), + }; } public function fetchColumn($columnIndex = 0) { diff --git a/lib/private/DB/SchemaWrapper.php b/lib/private/DB/SchemaWrapper.php index 5720e10fbdb..473c0009237 100644 --- a/lib/private/DB/SchemaWrapper.php +++ b/lib/private/DB/SchemaWrapper.php @@ -36,6 +36,9 @@ class SchemaWrapper implements ISchemaWrapper { public function performDropTableCalls() { foreach ($this->tablesToDelete as $tableName => $true) { $this->connection->dropTable($tableName); + foreach ($this->connection->getShardConnections() as $shardConnection) { + $shardConnection->dropTable($tableName); + } unset($this->tablesToDelete[$tableName]); } } diff --git a/lib/private/Dashboard/Manager.php b/lib/private/Dashboard/Manager.php index 45038b87f90..d4a9eb189ff 100644 --- a/lib/private/Dashboard/Manager.php +++ b/lib/private/Dashboard/Manager.php @@ -25,11 +25,12 @@ class Manager implements IManager { /** @var array<string, IWidget> */ private array $widgets = []; - private ContainerInterface $serverContainer; private ?IAppManager $appManager = null; - public function __construct(ContainerInterface $serverContainer) { - $this->serverContainer = $serverContainer; + public function __construct( + private ContainerInterface $serverContainer, + private LoggerInterface $logger, + ) { } private function registerWidget(IWidget $widget): void { @@ -37,6 +38,10 @@ class Manager implements IManager { throw new InvalidArgumentException('Dashboard widget with this id has already been registered'); } + if (!preg_match('/^[a-z][a-z0-9\-_]*$/', $widget->getId())) { + $this->logger->debug('Deprecated dashboard widget ID provided: "' . $widget->getId() . '" [ ' . get_class($widget) . ' ]. Please use a-z, 0-9, - and _ only, starting with a-z'); + } + $this->widgets[$widget->getId()] = $widget; } diff --git a/lib/private/DateTimeFormatter.php b/lib/private/DateTimeFormatter.php index cd765a2a14b..2882a7d8cd7 100644 --- a/lib/private/DateTimeFormatter.php +++ b/lib/private/DateTimeFormatter.php @@ -28,8 +28,8 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter { /** * Get TimeZone to use * - * @param \DateTimeZone $timeZone The timezone to use - * @return \DateTimeZone The timezone to use, falling back to the current user's timezone + * @param \DateTimeZone $timeZone The timezone to use + * @return \DateTimeZone The timezone to use, falling back to the current user's timezone */ protected function getTimeZone($timeZone = null) { if ($timeZone === null) { @@ -42,8 +42,8 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter { /** * Get \OCP\IL10N to use * - * @param \OCP\IL10N $l The locale to use - * @return \OCP\IL10N The locale to use, falling back to the current user's locale + * @param \OCP\IL10N $l The locale to use + * @return \OCP\IL10N The locale to use, falling back to the current user's locale */ protected function getLocale($l = null) { if ($l === null) { @@ -57,7 +57,7 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter { * Generates a DateTime object with the given timestamp and TimeZone * * @param mixed $timestamp - * @param \DateTimeZone $timeZone The timezone to use + * @param \DateTimeZone $timeZone The timezone to use * @return \DateTime */ protected function getDateTime($timestamp, ?\DateTimeZone $timeZone = null) { @@ -77,15 +77,15 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter { /** * Formats the date of the given timestamp * - * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object - * @param string $format Either 'full', 'long', 'medium' or 'short' - * full: e.g. 'EEEE, MMMM d, y' => 'Wednesday, August 20, 2014' - * long: e.g. 'MMMM d, y' => 'August 20, 2014' - * medium: e.g. 'MMM d, y' => 'Aug 20, 2014' - * short: e.g. 'M/d/yy' => '8/20/14' - * The exact format is dependent on the language - * @param \DateTimeZone $timeZone The timezone to use - * @param \OCP\IL10N $l The locale to use + * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object + * @param string $format Either 'full', 'long', 'medium' or 'short' + * full: e.g. 'EEEE, MMMM d, y' => 'Wednesday, August 20, 2014' + * long: e.g. 'MMMM d, y' => 'August 20, 2014' + * medium: e.g. 'MMM d, y' => 'Aug 20, 2014' + * short: e.g. 'M/d/yy' => '8/20/14' + * The exact format is dependent on the language + * @param \DateTimeZone $timeZone The timezone to use + * @param \OCP\IL10N $l The locale to use * @return string Formatted date string */ public function formatDate($timestamp, $format = 'long', ?\DateTimeZone $timeZone = null, ?\OCP\IL10N $l = null) { @@ -95,16 +95,16 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter { /** * Formats the date of the given timestamp * - * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object - * @param string $format Either 'full', 'long', 'medium' or 'short' - * full: e.g. 'EEEE, MMMM d, y' => 'Wednesday, August 20, 2014' - * long: e.g. 'MMMM d, y' => 'August 20, 2014' - * medium: e.g. 'MMM d, y' => 'Aug 20, 2014' - * short: e.g. 'M/d/yy' => '8/20/14' - * The exact format is dependent on the language - * Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable - * @param \DateTimeZone $timeZone The timezone to use - * @param \OCP\IL10N $l The locale to use + * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object + * @param string $format Either 'full', 'long', 'medium' or 'short' + * full: e.g. 'EEEE, MMMM d, y' => 'Wednesday, August 20, 2014' + * long: e.g. 'MMMM d, y' => 'August 20, 2014' + * medium: e.g. 'MMM d, y' => 'Aug 20, 2014' + * short: e.g. 'M/d/yy' => '8/20/14' + * The exact format is dependent on the language + * Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable + * @param \DateTimeZone $timeZone The timezone to use + * @param \OCP\IL10N $l The locale to use * @return string Formatted relative date string */ public function formatDateRelativeDay($timestamp, $format = 'long', ?\DateTimeZone $timeZone = null, ?\OCP\IL10N $l = null) { @@ -119,13 +119,13 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter { * Gives the relative date of the timestamp * Only works for past dates * - * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object - * @param int|\DateTime $baseTimestamp Timestamp to compare $timestamp against, defaults to current time - * @param \OCP\IL10N $l The locale to use + * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object + * @param int|\DateTime $baseTimestamp Timestamp to compare $timestamp against, defaults to current time + * @param \OCP\IL10N $l The locale to use * @return string Formatted date span. Dates returned are: - * < 1 month => Today, Yesterday, n days ago - * < 13 month => last month, n months ago - * >= 13 month => last year, n years ago + * < 1 month => Today, Yesterday, n days ago + * < 13 month => last month, n months ago + * >= 13 month => last year, n years ago */ public function formatDateSpan($timestamp, $baseTimestamp = null, ?\OCP\IL10N $l = null) { $l = $this->getLocale($l); @@ -182,15 +182,15 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter { /** * Formats the time of the given timestamp * - * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object - * @param string $format Either 'full', 'long', 'medium' or 'short' - * full: e.g. 'h:mm:ss a zzzz' => '11:42:13 AM GMT+0:00' - * long: e.g. 'h:mm:ss a z' => '11:42:13 AM GMT' - * medium: e.g. 'h:mm:ss a' => '11:42:13 AM' - * short: e.g. 'h:mm a' => '11:42 AM' - * The exact format is dependent on the language - * @param \DateTimeZone $timeZone The timezone to use - * @param \OCP\IL10N $l The locale to use + * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object + * @param string $format Either 'full', 'long', 'medium' or 'short' + * full: e.g. 'h:mm:ss a zzzz' => '11:42:13 AM GMT+0:00' + * long: e.g. 'h:mm:ss a z' => '11:42:13 AM GMT' + * medium: e.g. 'h:mm:ss a' => '11:42:13 AM' + * short: e.g. 'h:mm a' => '11:42 AM' + * The exact format is dependent on the language + * @param \DateTimeZone $timeZone The timezone to use + * @param \OCP\IL10N $l The locale to use * @return string Formatted time string */ public function formatTime($timestamp, $format = 'medium', ?\DateTimeZone $timeZone = null, ?\OCP\IL10N $l = null) { @@ -200,16 +200,16 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter { /** * Gives the relative past time of the timestamp * - * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object - * @param int|\DateTime $baseTimestamp Timestamp to compare $timestamp against, defaults to current time - * @param \OCP\IL10N $l The locale to use + * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object + * @param int|\DateTime $baseTimestamp Timestamp to compare $timestamp against, defaults to current time + * @param \OCP\IL10N $l The locale to use * @return string Formatted time span. Dates returned are: - * < 60 sec => seconds ago - * < 1 hour => n minutes ago - * < 1 day => n hours ago - * < 1 month => Yesterday, n days ago - * < 13 month => last month, n months ago - * >= 13 month => last year, n years ago + * < 60 sec => seconds ago + * < 1 hour => n minutes ago + * < 1 day => n hours ago + * < 1 month => Yesterday, n days ago + * < 13 month => last month, n months ago + * >= 13 month => last year, n years ago */ public function formatTimeSpan($timestamp, $baseTimestamp = null, ?\OCP\IL10N $l = null) { $l = $this->getLocale($l); @@ -247,11 +247,11 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter { /** * Formats the date and time of the given timestamp * - * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object - * @param string $formatDate See formatDate() for description - * @param string $formatTime See formatTime() for description - * @param \DateTimeZone $timeZone The timezone to use - * @param \OCP\IL10N $l The locale to use + * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object + * @param string $formatDate See formatDate() for description + * @param string $formatTime See formatTime() for description + * @param \DateTimeZone $timeZone The timezone to use + * @param \OCP\IL10N $l The locale to use * @return string Formatted date and time string */ public function formatDateTime($timestamp, $formatDate = 'long', $formatTime = 'medium', ?\DateTimeZone $timeZone = null, ?\OCP\IL10N $l = null) { @@ -261,12 +261,12 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter { /** * Formats the date and time of the given timestamp * - * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object - * @param string $formatDate See formatDate() for description - * Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable - * @param string $formatTime See formatTime() for description - * @param \DateTimeZone $timeZone The timezone to use - * @param \OCP\IL10N $l The locale to use + * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object + * @param string $formatDate See formatDate() for description + * Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable + * @param string $formatTime See formatTime() for description + * @param \DateTimeZone $timeZone The timezone to use + * @param \OCP\IL10N $l The locale to use * @return string Formatted relative date and time string */ public function formatDateTimeRelativeDay($timestamp, $formatDate = 'long', $formatTime = 'medium', ?\DateTimeZone $timeZone = null, ?\OCP\IL10N $l = null) { @@ -280,11 +280,11 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter { /** * Formats the date and time of the given timestamp * - * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object - * @param string $type One of 'date', 'datetime' or 'time' - * @param string $format Format string - * @param \DateTimeZone $timeZone The timezone to use - * @param \OCP\IL10N $l The locale to use + * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object + * @param string $type One of 'date', 'datetime' or 'time' + * @param string $format Format string + * @param \DateTimeZone $timeZone The timezone to use + * @param \OCP\IL10N $l The locale to use * @return string Formatted date and time string */ protected function format($timestamp, $type, $format, ?\DateTimeZone $timeZone = null, ?\OCP\IL10N $l = null) { diff --git a/lib/private/Diagnostics/EventLogger.php b/lib/private/Diagnostics/EventLogger.php index 11c59b9227a..40cbd3e9e5d 100644 --- a/lib/private/Diagnostics/EventLogger.php +++ b/lib/private/Diagnostics/EventLogger.php @@ -48,7 +48,7 @@ class EventLogger implements IEventLogger { return true; } - $isDebugLevel = $this->internalLogger->getLogLevel([]) === Log::DEBUG; + $isDebugLevel = $this->internalLogger->getLogLevel([], '') === Log::DEBUG; return $systemValue && $isDebugLevel; } diff --git a/lib/private/DirectEditing/Token.php b/lib/private/DirectEditing/Token.php index 594cef98086..12ad9411216 100644 --- a/lib/private/DirectEditing/Token.php +++ b/lib/private/DirectEditing/Token.php @@ -42,7 +42,7 @@ class Token implements IToken { } public function hasBeenAccessed(): bool { - return (bool) $this->data['accessed']; + return (bool)$this->data['accessed']; } public function getEditor(): string { diff --git a/lib/private/Encryption/DecryptAll.php b/lib/private/Encryption/DecryptAll.php index f9a92d07d20..0007467298c 100644 --- a/lib/private/Encryption/DecryptAll.php +++ b/lib/private/Encryption/DecryptAll.php @@ -17,13 +17,13 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; class DecryptAll { - /** @var OutputInterface */ + /** @var OutputInterface */ protected $output; - /** @var InputInterface */ + /** @var InputInterface */ protected $input; - /** @var array files which couldn't be decrypted */ + /** @var array files which couldn't be decrypted */ protected $failed; public function __construct( @@ -114,7 +114,7 @@ class DecryptAll { $fetchUsersProgress = new ProgressBar($this->output); $fetchUsersProgress->setFormat(" %message% \n [%bar%]"); $fetchUsersProgress->start(); - $fetchUsersProgress->setMessage("Fetch list of users..."); + $fetchUsersProgress->setMessage('Fetch list of users...'); $fetchUsersProgress->advance(); foreach ($this->userManager->getBackends() as $backend) { @@ -128,7 +128,7 @@ class DecryptAll { $offset += $limit; $fetchUsersProgress->advance(); } while (count($users) >= $limit); - $fetchUsersProgress->setMessage("Fetch list of users... finished"); + $fetchUsersProgress->setMessage('Fetch list of users... finished'); $fetchUsersProgress->finish(); } } else { @@ -140,7 +140,7 @@ class DecryptAll { $progress = new ProgressBar($this->output); $progress->setFormat(" %message% \n [%bar%]"); $progress->start(); - $progress->setMessage("starting to decrypt files..."); + $progress->setMessage('starting to decrypt files...'); $progress->advance(); $numberOfUsers = count($userList); @@ -151,7 +151,7 @@ class DecryptAll { $userNo++; } - $progress->setMessage("starting to decrypt files... finished"); + $progress->setMessage('starting to decrypt files... finished'); $progress->finish(); $this->output->writeln("\n\n"); diff --git a/lib/private/Encryption/EncryptionWrapper.php b/lib/private/Encryption/EncryptionWrapper.php index d3bf0aeb4d8..aec93a3ce4d 100644 --- a/lib/private/Encryption/EncryptionWrapper.php +++ b/lib/private/Encryption/EncryptionWrapper.php @@ -26,10 +26,10 @@ use Psr\Log\LoggerInterface; * @package OC\Encryption */ class EncryptionWrapper { - /** @var ArrayCache */ + /** @var ArrayCache */ private $arrayCache; - /** @var Manager */ + /** @var Manager */ private $manager; private LoggerInterface $logger; diff --git a/lib/private/Encryption/File.php b/lib/private/Encryption/File.php index a29d62946c4..26e643d1006 100644 --- a/lib/private/Encryption/File.php +++ b/lib/private/Encryption/File.php @@ -92,7 +92,7 @@ class File implements \OCP\Encryption\IFile { } // check if it is a group mount - if ($this->getAppManager()->isEnabledForUser("files_external")) { + if ($this->getAppManager()->isEnabledForUser('files_external')) { /** @var GlobalStoragesService $storageService */ $storageService = \OC::$server->get(GlobalStoragesService::class); $storages = $storageService->getAllStorages(); diff --git a/lib/private/Encryption/HookManager.php b/lib/private/Encryption/HookManager.php index 5ce51229e4e..39e7edabb95 100644 --- a/lib/private/Encryption/HookManager.php +++ b/lib/private/Encryption/HookManager.php @@ -42,7 +42,7 @@ class HookManager { $user = \OC::$server->getUserManager()->get($owner); } if (!$user) { - throw new \Exception("Inconsistent data, File unshared, but owner not found. Should not happen"); + throw new \Exception('Inconsistent data, File unshared, but owner not found. Should not happen'); } $uid = ''; diff --git a/lib/private/EventSource.php b/lib/private/EventSource.php index dbeda25049e..18af6e35832 100644 --- a/lib/private/EventSource.php +++ b/lib/private/EventSource.php @@ -45,10 +45,10 @@ class EventSource implements IEventSource { * @link https://github.com/owncloud/core/issues/14286 */ header("Content-Security-Policy: default-src 'none'; script-src 'unsafe-inline'"); - header("Content-Type: text/html"); + header('Content-Type: text/html'); echo str_repeat('<span></span>' . PHP_EOL, 10); //dummy data to keep IE happy } else { - header("Content-Type: text/event-stream"); + header('Content-Type: text/event-stream'); } if (!$this->request->passesStrictCookieCheck()) { header('Location: '.\OC::$WEBROOT); @@ -69,7 +69,7 @@ class EventSource implements IEventSource { * @param mixed $data * * @throws \BadMethodCallException - * if only one parameter is given, a typeless message will be send with that parameter as data + * if only one parameter is given, a typeless message will be send with that parameter as data * @suppress PhanDeprecatedFunction */ public function send($type, $data = null) { diff --git a/lib/private/Federation/CloudIdManager.php b/lib/private/Federation/CloudIdManager.php index 3528d06a167..69d48a148b3 100644 --- a/lib/private/Federation/CloudIdManager.php +++ b/lib/private/Federation/CloudIdManager.php @@ -59,7 +59,7 @@ class CloudIdManager implements ICloudIdManager { if ($event instanceof CardUpdatedEvent) { $data = $event->getCardData()['carddata']; foreach (explode("\r\n", $data) as $line) { - if (str_starts_with($line, "CLOUD;")) { + if (str_starts_with($line, 'CLOUD;')) { $parts = explode(':', $line, 2); if (isset($parts[1])) { $key = $parts[1]; diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php index 3c871fdf4dc..e1547fefe1c 100644 --- a/lib/private/Files/Cache/Cache.php +++ b/lib/private/Files/Cache/Cache.php @@ -9,6 +9,7 @@ namespace OC\Files\Cache; use Doctrine\DBAL\Exception\UniqueConstraintViolationException; use OC\DB\Exceptions\DbalException; +use OC\DB\QueryBuilder\Sharded\ShardDefinition; use OC\Files\Search\SearchComparison; use OC\Files\Search\SearchQuery; use OC\Files\Storage\Wrapper\Encryption; @@ -87,9 +88,7 @@ class Cache implements ICache { protected function getQueryBuilder() { return new CacheQueryBuilder( - $this->connection, - $this->systemConfig, - $this->logger, + $this->connection->getQueryBuilder(), $this->metadataManager, ); } @@ -122,11 +121,11 @@ class Cache implements ICache { // normalize file $file = $this->normalize($file); - $query->whereStorageId($this->getNumericStorageId()) - ->wherePath($file); + $query->wherePath($file); } else { //file id $query->whereFileId($file); } + $query->whereStorageId($this->getNumericStorageId()); $result = $query->execute(); $data = $result->fetch(); @@ -201,6 +200,7 @@ class Cache implements ICache { $query = $this->getQueryBuilder(); $query->selectFileCache() ->whereParent($fileId) + ->whereStorageId($this->getNumericStorageId()) ->orderBy('name', 'ASC'); $metadataQuery = $query->selectMetadata(); @@ -285,6 +285,7 @@ class Cache implements ICache { if (count($extensionValues)) { $query = $this->getQueryBuilder(); $query->insert('filecache_extended'); + $query->hintShardKey('storage', $storageId); $query->setValue('fileid', $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)); foreach ($extensionValues as $column => $value) { @@ -339,6 +340,7 @@ class Cache implements ICache { $query->update('filecache') ->whereFileId($id) + ->whereStorageId($this->getNumericStorageId()) ->andWhere($query->expr()->orX(...array_map(function ($key, $value) use ($query) { return $query->expr()->orX( $query->expr()->neq($key, $query->createNamedParameter($value)), @@ -357,6 +359,7 @@ class Cache implements ICache { try { $query = $this->getQueryBuilder(); $query->insert('filecache_extended'); + $query->hintShardKey('storage', $this->getNumericStorageId()); $query->setValue('fileid', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)); foreach ($extensionValues as $column => $value) { @@ -368,6 +371,7 @@ class Cache implements ICache { $query = $this->getQueryBuilder(); $query->update('filecache_extended') ->whereFileId($id) + ->hintShardKey('storage', $this->getNumericStorageId()) ->andWhere($query->expr()->orX(...array_map(function ($key, $value) use ($query) { return $query->expr()->orX( $query->expr()->neq($key, $query->createNamedParameter($value)), @@ -514,12 +518,14 @@ class Cache implements ICache { if ($entry instanceof ICacheEntry) { $query = $this->getQueryBuilder(); $query->delete('filecache') + ->whereStorageId($this->getNumericStorageId()) ->whereFileId($entry->getId()); $query->execute(); $query = $this->getQueryBuilder(); $query->delete('filecache_extended') - ->whereFileId($entry->getId()); + ->whereFileId($entry->getId()) + ->hintShardKey('storage', $this->getNumericStorageId()); $query->execute(); if ($entry->getMimeType() == FileInfo::MIMETYPE_FOLDER) { @@ -563,7 +569,8 @@ class Cache implements ICache { $query = $this->getQueryBuilder(); $query->delete('filecache_extended') - ->where($query->expr()->in('fileid', $query->createParameter('childIds'))); + ->where($query->expr()->in('fileid', $query->createParameter('childIds'))) + ->hintShardKey('storage', $this->getNumericStorageId()); foreach (array_chunk($childIds, 1000) as $childIdChunk) { $query->setParameter('childIds', $childIdChunk, IQueryBuilder::PARAM_INT_ARRAY); @@ -585,6 +592,7 @@ class Cache implements ICache { $query = $this->getQueryBuilder(); $query->delete('filecache') + ->whereStorageId($this->getNumericStorageId()) ->whereParentInParameter('parentIds'); // Sorting before chunking allows the db to find the entries close to each @@ -650,6 +658,15 @@ class Cache implements ICache { throw new \Exception('Invalid source storage path: ' . $sourcePath); } + $shardDefinition = $this->connection->getShardDefinition('filecache'); + if ( + $shardDefinition && + $shardDefinition->getShardForKey($sourceCache->getNumericStorageId()) !== $shardDefinition->getShardForKey($this->getNumericStorageId()) + ) { + $this->moveFromStorageSharded($shardDefinition, $sourceCache, $sourceData, $targetPath); + return; + } + $sourceId = $sourceData['fileid']; $newParentId = $this->getParentId($targetPath); @@ -671,7 +688,7 @@ class Cache implements ICache { $childChunks = array_chunk($childIds, 1000); - $query = $this->connection->getQueryBuilder(); + $query = $this->getQueryBuilder(); $fun = $query->func(); $newPathFunction = $fun->concat( @@ -679,12 +696,15 @@ class Cache implements ICache { $fun->substring('path', $query->createNamedParameter($sourceLength + 1, IQueryBuilder::PARAM_INT))// +1 for the leading slash ); $query->update('filecache') - ->set('storage', $query->createNamedParameter($targetStorageId, IQueryBuilder::PARAM_INT)) ->set('path_hash', $fun->md5($newPathFunction)) ->set('path', $newPathFunction) - ->where($query->expr()->eq('storage', $query->createNamedParameter($sourceStorageId, IQueryBuilder::PARAM_INT))) + ->whereStorageId($sourceStorageId) ->andWhere($query->expr()->in('fileid', $query->createParameter('files'))); + if ($sourceStorageId !== $targetStorageId) { + $query->set('storage', $query->createNamedParameter($targetStorageId), IQueryBuilder::PARAM_INT); + } + // when moving from an encrypted storage to a non-encrypted storage remove the `encrypted` mark if ($sourceCache->hasEncryptionWrapper() && !$this->hasEncryptionWrapper()) { $query->set('encrypted', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT)); @@ -726,13 +746,17 @@ class Cache implements ICache { $query = $this->getQueryBuilder(); $query->update('filecache') - ->set('storage', $query->createNamedParameter($targetStorageId)) ->set('path', $query->createNamedParameter($targetPath)) ->set('path_hash', $query->createNamedParameter(md5($targetPath))) ->set('name', $query->createNamedParameter(basename($targetPath))) ->set('parent', $query->createNamedParameter($newParentId, IQueryBuilder::PARAM_INT)) + ->whereStorageId($sourceStorageId) ->whereFileId($sourceId); + if ($sourceStorageId !== $targetStorageId) { + $query->set('storage', $query->createNamedParameter($targetStorageId), IQueryBuilder::PARAM_INT); + } + // when moving from an encrypted storage to a non-encrypted storage remove the `encrypted` mark if ($sourceCache->hasEncryptionWrapper() && !$this->hasEncryptionWrapper()) { $query->set('encrypted', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT)); @@ -837,7 +861,7 @@ class Cache implements ICache { * search for files by mimetype * * @param string $mimetype either a full mimetype to search ('text/plain') or only the first part of a mimetype ('image') - * where it will search for all mimetypes in the group ('image/*') + * where it will search for all mimetypes in the group ('image/*') * @return ICacheEntry[] an array of cache entries where the mimetype matches the search */ public function searchByMime($mimetype) { @@ -849,8 +873,8 @@ class Cache implements ICache { return $this->searchQuery(new SearchQuery($operator, 0, 0, [], null)); } - public function searchQuery(ISearchQuery $searchQuery) { - return current($this->querySearchHelper->searchInCaches($searchQuery, [$this])); + public function searchQuery(ISearchQuery $query) { + return current($this->querySearchHelper->searchInCaches($query, [$this])); } /** @@ -889,6 +913,7 @@ class Cache implements ICache { $query->select($query->func()->count()) ->from('filecache') ->whereParent($fileId) + ->whereStorageId($this->getNumericStorageId()) ->andWhere($query->expr()->lt('size', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))); $result = $query->execute(); @@ -931,6 +956,7 @@ class Cache implements ICache { $query = $this->getQueryBuilder(); $query->select('size', 'unencrypted_size') ->from('filecache') + ->whereStorageId($this->getNumericStorageId()) ->whereParent($id); if ($ignoreUnknown) { $query->andWhere($query->expr()->gte('size', $query->createNamedParameter(0))); @@ -1130,7 +1156,7 @@ class Cache implements ICache { */ public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, string $targetPath): int { if ($sourceEntry->getId() < 0) { - throw new \RuntimeException("Invalid source cache entry on copyFromCache"); + throw new \RuntimeException('Invalid source cache entry on copyFromCache'); } $data = $this->cacheEntryToArray($sourceEntry); @@ -1141,7 +1167,7 @@ class Cache implements ICache { $fileId = $this->put($targetPath, $data); if ($fileId <= 0) { - throw new \RuntimeException("Failed to copy to " . $targetPath . " from cache with source data " . json_encode($data) . " "); + throw new \RuntimeException('Failed to copy to ' . $targetPath . ' from cache with source data ' . json_encode($data) . ' '); } if ($sourceEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) { $folderContent = $sourceCache->getFolderContentsById($sourceEntry->getId()); @@ -1180,4 +1206,72 @@ class Cache implements ICache { return null; } } + + private function moveFromStorageSharded(ShardDefinition $shardDefinition, ICache $sourceCache, ICacheEntry $sourceEntry, $targetPath): void { + if ($sourceEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) { + $fileIds = $this->getChildIds($sourceCache->getNumericStorageId(), $sourceEntry->getPath()); + } else { + $fileIds = []; + } + $fileIds[] = $sourceEntry->getId(); + + $helper = $this->connection->getCrossShardMoveHelper(); + + $sourceConnection = $helper->getConnection($shardDefinition, $sourceCache->getNumericStorageId()); + $targetConnection = $helper->getConnection($shardDefinition, $this->getNumericStorageId()); + + $cacheItems = $helper->loadItems($sourceConnection, 'filecache', 'fileid', $fileIds); + $extendedItems = $helper->loadItems($sourceConnection, 'filecache_extended', 'fileid', $fileIds); + $metadataItems = $helper->loadItems($sourceConnection, 'files_metadata', 'file_id', $fileIds); + + // when moving from an encrypted storage to a non-encrypted storage remove the `encrypted` mark + $removeEncryptedFlag = ($sourceCache instanceof Cache && $sourceCache->hasEncryptionWrapper()) && !$this->hasEncryptionWrapper(); + + $sourcePathLength = strlen($sourceEntry->getPath()); + foreach ($cacheItems as &$cacheItem) { + if ($cacheItem['path'] === $sourceEntry->getPath()) { + $cacheItem['path'] = $targetPath; + $cacheItem['parent'] = $this->getParentId($targetPath); + $cacheItem['name'] = basename($cacheItem['path']); + } else { + $cacheItem['path'] = $targetPath . '/' . substr($cacheItem['path'], $sourcePathLength + 1); // +1 for the leading slash + } + $cacheItem['path_hash'] = md5($cacheItem['path']); + $cacheItem['storage'] = $this->getNumericStorageId(); + if ($removeEncryptedFlag) { + $cacheItem['encrypted'] = 0; + } + } + + $targetConnection->beginTransaction(); + + try { + $helper->saveItems($targetConnection, 'filecache', $cacheItems); + $helper->saveItems($targetConnection, 'filecache_extended', $extendedItems); + $helper->saveItems($targetConnection, 'files_metadata', $metadataItems); + } catch (\Exception $e) { + $targetConnection->rollback(); + throw $e; + } + + $sourceConnection->beginTransaction(); + + try { + $helper->deleteItems($sourceConnection, 'filecache', 'fileid', $fileIds); + $helper->deleteItems($sourceConnection, 'filecache_extended', 'fileid', $fileIds); + $helper->deleteItems($sourceConnection, 'files_metadata', 'file_id', $fileIds); + } catch (\Exception $e) { + $targetConnection->rollback(); + $sourceConnection->rollBack(); + throw $e; + } + + try { + $sourceConnection->commit(); + } catch (\Exception $e) { + $targetConnection->rollback(); + throw $e; + } + $targetConnection->commit(); + } } diff --git a/lib/private/Files/Cache/CacheQueryBuilder.php b/lib/private/Files/Cache/CacheQueryBuilder.php index 9bf5f970458..76eb2bfa5ca 100644 --- a/lib/private/Files/Cache/CacheQueryBuilder.php +++ b/lib/private/Files/Cache/CacheQueryBuilder.php @@ -8,27 +8,22 @@ declare(strict_types=1); */ namespace OC\Files\Cache; -use OC\DB\QueryBuilder\QueryBuilder; -use OC\SystemConfig; +use OC\DB\QueryBuilder\ExtendedQueryBuilder; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\FilesMetadata\IFilesMetadataManager; use OCP\FilesMetadata\IMetadataQuery; -use OCP\IDBConnection; -use Psr\Log\LoggerInterface; /** * Query builder with commonly used helpers for filecache queries */ -class CacheQueryBuilder extends QueryBuilder { +class CacheQueryBuilder extends ExtendedQueryBuilder { private ?string $alias = null; public function __construct( - IDBConnection $connection, - SystemConfig $systemConfig, - LoggerInterface $logger, + IQueryBuilder $queryBuilder, private IFilesMetadataManager $filesMetadataManager, ) { - parent::__construct($connection, $systemConfig, $logger); + parent::__construct($queryBuilder); } public function selectTagUsage(): self { diff --git a/lib/private/Files/Cache/FailedCache.php b/lib/private/Files/Cache/FailedCache.php index 8ba2ac491bf..44c1016ca8e 100644 --- a/lib/private/Files/Cache/FailedCache.php +++ b/lib/private/Files/Cache/FailedCache.php @@ -125,7 +125,7 @@ class FailedCache implements ICache { } public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, string $targetPath): int { - throw new \Exception("Invalid cache"); + throw new \Exception('Invalid cache'); } public function getQueryFilterForStorage(): ISearchOperator { diff --git a/lib/private/Files/Cache/FileAccess.php b/lib/private/Files/Cache/FileAccess.php index 5818017bd66..11a95b5d897 100644 --- a/lib/private/Files/Cache/FileAccess.php +++ b/lib/private/Files/Cache/FileAccess.php @@ -31,9 +31,7 @@ class FileAccess implements IFileAccess { private function getQuery(): CacheQueryBuilder { return new CacheQueryBuilder( - $this->connection, - $this->systemConfig, - $this->logger, + $this->connection->getQueryBuilder(), $this->metadataManager, ); } diff --git a/lib/private/Files/Cache/Propagator.php b/lib/private/Files/Cache/Propagator.php index 5580dcf22a8..bbeb8c42075 100644 --- a/lib/private/Files/Cache/Propagator.php +++ b/lib/private/Files/Cache/Propagator.php @@ -186,15 +186,15 @@ class Propagator implements IPropagator { $query->update('filecache') ->set('mtime', $query->func()->greatest('mtime', $query->createParameter('time'))) ->set('etag', $query->expr()->literal(uniqid())) - ->where($query->expr()->eq('storage', $query->expr()->literal($storageId, IQueryBuilder::PARAM_INT))) + ->where($query->expr()->eq('storage', $query->createNamedParameter($storageId, IQueryBuilder::PARAM_INT))) ->andWhere($query->expr()->eq('path_hash', $query->createParameter('hash'))); $sizeQuery = $this->connection->getQueryBuilder(); $sizeQuery->update('filecache') ->set('size', $sizeQuery->func()->add('size', $sizeQuery->createParameter('size'))) - ->where($query->expr()->eq('storage', $query->expr()->literal($storageId, IQueryBuilder::PARAM_INT))) - ->andWhere($query->expr()->eq('path_hash', $query->createParameter('hash'))) - ->andWhere($sizeQuery->expr()->gt('size', $sizeQuery->expr()->literal(-1, IQueryBuilder::PARAM_INT))); + ->where($query->expr()->eq('storage', $sizeQuery->createNamedParameter($storageId, IQueryBuilder::PARAM_INT))) + ->andWhere($query->expr()->eq('path_hash', $sizeQuery->createParameter('hash'))) + ->andWhere($sizeQuery->expr()->gt('size', $sizeQuery->createNamedParameter(-1, IQueryBuilder::PARAM_INT))); foreach ($this->batch as $item) { $query->setParameter('time', $item['time'], IQueryBuilder::PARAM_INT); diff --git a/lib/private/Files/Cache/QuerySearchHelper.php b/lib/private/Files/Cache/QuerySearchHelper.php index c31d62e1a86..82f9ec3be66 100644 --- a/lib/private/Files/Cache/QuerySearchHelper.php +++ b/lib/private/Files/Cache/QuerySearchHelper.php @@ -39,9 +39,7 @@ class QuerySearchHelper { protected function getQueryBuilder() { return new CacheQueryBuilder( - $this->connection, - $this->systemConfig, - $this->logger, + $this->connection->getQueryBuilder(), $this->filesMetadataManager, ); } @@ -112,7 +110,6 @@ class QuerySearchHelper { $query ->leftJoin('file', 'vcategory_to_object', 'tagmap', $query->expr()->eq('file.fileid', 'tagmap.objid')) ->leftJoin('tagmap', 'vcategory', 'tag', $query->expr()->andX( - $query->expr()->eq('tagmap.type', 'tag.type'), $query->expr()->eq('tagmap.categoryid', 'tag.id'), $query->expr()->eq('tag.type', $query->createNamedParameter('files')), $query->expr()->eq('tag.uid', $query->createNamedParameter($user->getUID())) @@ -197,7 +194,7 @@ class QuerySearchHelper { protected function requireUser(ISearchQuery $searchQuery): IUser { $user = $searchQuery->getUser(); if ($user === null) { - throw new \InvalidArgumentException("This search operation requires the user to be set in the query"); + throw new \InvalidArgumentException('This search operation requires the user to be set in the query'); } return $user; } diff --git a/lib/private/Files/Cache/SearchBuilder.php b/lib/private/Files/Cache/SearchBuilder.php index 32502cb8258..748844b9e1b 100644 --- a/lib/private/Files/Cache/SearchBuilder.php +++ b/lib/private/Files/Cache/SearchBuilder.php @@ -290,7 +290,7 @@ class SearchBuilder { $value = $operator->getValue(); $type = $operator->getType(); - switch($operator->getExtra()) { + switch ($operator->getExtra()) { case IMetadataQuery::EXTRA: $metadataQuery->joinIndex($field); // join index table if not joined yet $field = $metadataQuery->getMetadataValueField($field); diff --git a/lib/private/Files/Cache/Storage.php b/lib/private/Files/Cache/Storage.php index 0929907fcff..8d99a268dc0 100644 --- a/lib/private/Files/Cache/Storage.php +++ b/lib/private/Files/Cache/Storage.php @@ -80,7 +80,7 @@ class Storage { * Adjusts the storage id to use md5 if too long * @param string $storageId storage id * @return string unchanged $storageId if its length is less than 64 characters, - * else returns the md5 of $storageId + * else returns the md5 of $storageId */ public static function adjustStorageId($storageId) { if (strlen($storageId) > 64) { diff --git a/lib/private/Files/Cache/Updater.php b/lib/private/Files/Cache/Updater.php index e8c6d32599e..eab68b4f545 100644 --- a/lib/private/Files/Cache/Updater.php +++ b/lib/private/Files/Cache/Updater.php @@ -114,7 +114,7 @@ class Updater implements IUpdater { } // encryption is a pita and touches the cache itself - if (isset($data['encrypted']) && !!$data['encrypted']) { + if (isset($data['encrypted']) && (bool)$data['encrypted']) { $sizeDifference = null; } @@ -246,7 +246,7 @@ class Updater implements IUpdater { // ignore the failure. // with failures concurrent updates, someone else would have already done it. // in the worst case the `storage_mtime` isn't updated, which should at most only trigger an extra rescan - $this->logger->warning("Error while updating parent storage_mtime, should be safe to ignore", ['exception' => $e]); + $this->logger->warning('Error while updating parent storage_mtime, should be safe to ignore', ['exception' => $e]); } } } diff --git a/lib/private/Files/Cache/Wrapper/CacheWrapper.php b/lib/private/Files/Cache/Wrapper/CacheWrapper.php index 17f1031d1cc..fdaa2cf4b7a 100644 --- a/lib/private/Files/Cache/Wrapper/CacheWrapper.php +++ b/lib/private/Files/Cache/Wrapper/CacheWrapper.php @@ -214,8 +214,8 @@ class CacheWrapper extends Cache { return $this->getCache()->getStatus($file); } - public function searchQuery(ISearchQuery $searchQuery) { - return current($this->querySearchHelper->searchInCaches($searchQuery, [$this])); + public function searchQuery(ISearchQuery $query) { + return current($this->querySearchHelper->searchInCaches($query, [$this])); } /** diff --git a/lib/private/Files/Config/MountProviderCollection.php b/lib/private/Files/Config/MountProviderCollection.php index 0e103690b6b..1dbc469c8c3 100644 --- a/lib/private/Files/Config/MountProviderCollection.php +++ b/lib/private/Files/Config/MountProviderCollection.php @@ -131,9 +131,9 @@ class MountProviderCollection implements IMountProviderCollection, Emitter { } $lateMounts = $this->filterMounts($user, $lateMounts); - $this->eventLogger->start("fs:setup:add-mounts", "Add mounts to the filesystem"); + $this->eventLogger->start('fs:setup:add-mounts', 'Add mounts to the filesystem'); array_walk($lateMounts, [$mountManager, 'addMount']); - $this->eventLogger->end("fs:setup:add-mounts"); + $this->eventLogger->end('fs:setup:add-mounts'); return array_merge($lateMounts, $firstMounts); } @@ -223,7 +223,7 @@ class MountProviderCollection implements IMountProviderCollection, Emitter { }, []); if (count($mounts) === 0) { - throw new \Exception("No root mounts provided by any provider"); + throw new \Exception('No root mounts provided by any provider'); } return $mounts; diff --git a/lib/private/Files/Config/UserMountCache.php b/lib/private/Files/Config/UserMountCache.php index 0afdf9cdcc2..94da770b63f 100644 --- a/lib/private/Files/Config/UserMountCache.php +++ b/lib/private/Files/Config/UserMountCache.php @@ -237,7 +237,7 @@ class UserMountCache implements IUserMountCache { $builder = $this->connection->getQueryBuilder(); $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'mount_provider_class') ->from('mounts', 'm') - ->where($builder->expr()->eq('user_id', $builder->createPositionalParameter($userUID))); + ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($userUID))); $result = $query->execute(); $rows = $result->fetchAll(); @@ -264,7 +264,7 @@ class UserMountCache implements IUserMountCache { $builder = $this->connection->getQueryBuilder(); $query = $builder->select('path') ->from('filecache') - ->where($builder->expr()->eq('fileid', $builder->createPositionalParameter($info->getRootId()))); + ->where($builder->expr()->eq('fileid', $builder->createNamedParameter($info->getRootId()))); return $query->executeQuery()->fetchOne() ?: ''; } @@ -278,10 +278,10 @@ class UserMountCache implements IUserMountCache { $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class') ->from('mounts', 'm') ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid')) - ->where($builder->expr()->eq('storage_id', $builder->createPositionalParameter($numericStorageId, IQueryBuilder::PARAM_INT))); + ->where($builder->expr()->eq('storage_id', $builder->createNamedParameter($numericStorageId, IQueryBuilder::PARAM_INT))); if ($user) { - $query->andWhere($builder->expr()->eq('user_id', $builder->createPositionalParameter($user))); + $query->andWhere($builder->expr()->eq('user_id', $builder->createNamedParameter($user))); } $result = $query->execute(); @@ -300,7 +300,7 @@ class UserMountCache implements IUserMountCache { $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class') ->from('mounts', 'm') ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid')) - ->where($builder->expr()->eq('root_id', $builder->createPositionalParameter($rootFileId, IQueryBuilder::PARAM_INT))); + ->where($builder->expr()->eq('root_id', $builder->createNamedParameter($rootFileId, IQueryBuilder::PARAM_INT))); $result = $query->execute(); $rows = $result->fetchAll(); @@ -362,9 +362,9 @@ class UserMountCache implements IUserMountCache { return $internalMountPath === '' || str_starts_with($internalPath, $internalMountPath . '/'); }); - $filteredMounts = array_filter($filteredMounts, function (ICachedMountInfo $mount) { + $filteredMounts = array_values(array_filter($filteredMounts, function (ICachedMountInfo $mount) { return $this->userManager->userExists($mount->getUser()->getUID()); - }); + })); return array_map(function (ICachedMountInfo $mount) use ($internalPath) { return new CachedMountFileInfo( @@ -477,7 +477,7 @@ class UserMountCache implements IUserMountCache { } } - throw new NotFoundException("No cached mount for path " . $path); + throw new NotFoundException('No cached mount for path ' . $path); } public function getMountsInPath(IUser $user, string $path): array { diff --git a/lib/private/Files/FileInfo.php b/lib/private/Files/FileInfo.php index c3dcb531342..0679dc1ae72 100644 --- a/lib/private/Files/FileInfo.php +++ b/lib/private/Files/FileInfo.php @@ -95,11 +95,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess { unset($this->data[$offset]); } - /** - * @return mixed - */ - #[\ReturnTypeWillChange] - public function offsetGet($offset) { + public function offsetGet(mixed $offset): mixed { return match ($offset) { 'type' => $this->getType(), 'etag' => $this->getEtag(), @@ -134,7 +130,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess { * @return int|null */ public function getId() { - return isset($this->data['fileid']) ? (int) $this->data['fileid'] : null; + return isset($this->data['fileid']) ? (int)$this->data['fileid'] : null; } /** @@ -164,7 +160,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess { * @return string */ public function getEtag() { - $this->updateEntryfromSubMounts(); + $this->updateEntryFromSubMounts(); if (count($this->childEtags) > 0) { $combinedEtag = $this->data['etag'] . '::' . implode('::', $this->childEtags); return md5($combinedEtag); @@ -179,7 +175,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess { */ public function getSize($includeMounts = true) { if ($includeMounts) { - $this->updateEntryfromSubMounts(); + $this->updateEntryFromSubMounts(); if ($this->isEncrypted() && isset($this->data['unencrypted_size']) && $this->data['unencrypted_size'] > 0) { return $this->data['unencrypted_size']; @@ -195,8 +191,8 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess { * @return int */ public function getMTime() { - $this->updateEntryfromSubMounts(); - return (int) $this->data['mtime']; + $this->updateEntryFromSubMounts(); + return (int)$this->data['mtime']; } /** @@ -210,14 +206,14 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess { * Return the current version used for the HMAC in the encryption app */ public function getEncryptedVersion(): int { - return isset($this->data['encryptedVersion']) ? (int) $this->data['encryptedVersion'] : 1; + return isset($this->data['encryptedVersion']) ? (int)$this->data['encryptedVersion'] : 1; } /** * @return int */ public function getPermissions() { - return (int) $this->data['permissions']; + return (int)$this->data['permissions']; } /** @@ -318,7 +314,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess { $this->subMounts = $mounts; } - private function updateEntryfromSubMounts(): void { + private function updateEntryFromSubMounts(): void { if ($this->subMountsUsed) { return; } @@ -379,11 +375,11 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess { } public function getCreationTime(): int { - return (int) $this->data['creation_time']; + return (int)$this->data['creation_time']; } public function getUploadTime(): int { - return (int) $this->data['upload_time']; + return (int)$this->data['upload_time']; } public function getParentId(): int { diff --git a/lib/private/Files/FilenameValidator.php b/lib/private/Files/FilenameValidator.php new file mode 100644 index 00000000000..fde45068df7 --- /dev/null +++ b/lib/private/Files/FilenameValidator.php @@ -0,0 +1,300 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OC\Files; + +use OCP\Files\EmptyFileNameException; +use OCP\Files\FileNameTooLongException; +use OCP\Files\IFilenameValidator; +use OCP\Files\InvalidCharacterInPathException; +use OCP\Files\InvalidDirectoryException; +use OCP\Files\InvalidPathException; +use OCP\Files\ReservedWordException; +use OCP\IConfig; +use OCP\IDBConnection; +use OCP\IL10N; +use OCP\L10N\IFactory; +use Psr\Log\LoggerInterface; + +/** + * @since 30.0.0 + */ +class FilenameValidator implements IFilenameValidator { + + public const INVALID_FILE_TYPE = 100; + + private IL10N $l10n; + + /** + * @var list<string> + */ + private array $forbiddenNames = []; + + /** + * @var list<string> + */ + private array $forbiddenBasenames = []; + /** + * @var list<string> + */ + private array $forbiddenCharacters = []; + + /** + * @var list<string> + */ + private array $forbiddenExtensions = []; + + public function __construct( + IFactory $l10nFactory, + private IDBConnection $database, + private IConfig $config, + private LoggerInterface $logger, + ) { + $this->l10n = $l10nFactory->get('core'); + } + + /** + * Get a list of reserved filenames that must not be used + * This list should be checked case-insensitive, all names are returned lowercase. + * @return list<string> + * @since 30.0.0 + */ + public function getForbiddenExtensions(): array { + if (empty($this->forbiddenExtensions)) { + $forbiddenExtensions = $this->getConfigValue('forbidden_filename_extensions', ['.filepart']); + + // Always forbid .part files as they are used internally + $forbiddenExtensions[] = '.part'; + + $this->forbiddenExtensions = array_values($forbiddenExtensions); + } + return $this->forbiddenExtensions; + } + + /** + * Get a list of forbidden filename extensions that must not be used + * This list should be checked case-insensitive, all names are returned lowercase. + * @return list<string> + * @since 30.0.0 + */ + public function getForbiddenFilenames(): array { + if (empty($this->forbiddenNames)) { + $forbiddenNames = $this->getConfigValue('forbidden_filenames', ['.htaccess']); + + // Handle legacy config option + // TODO: Drop with Nextcloud 34 + $legacyForbiddenNames = $this->getConfigValue('blacklisted_files', []); + if (!empty($legacyForbiddenNames)) { + $this->logger->warning('System config option "blacklisted_files" is deprecated and will be removed in Nextcloud 34, use "forbidden_filenames" instead.'); + } + $forbiddenNames = array_merge($legacyForbiddenNames, $forbiddenNames); + + // Ensure we are having a proper string list + $this->forbiddenNames = array_values($forbiddenNames); + } + return $this->forbiddenNames; + } + + /** + * Get a list of forbidden file basenames that must not be used + * This list should be checked case-insensitive, all names are returned lowercase. + * @return list<string> + * @since 30.0.0 + */ + public function getForbiddenBasenames(): array { + if (empty($this->forbiddenBasenames)) { + $forbiddenBasenames = $this->getConfigValue('forbidden_filename_basenames', []); + // Ensure we are having a proper string list + $this->forbiddenBasenames = array_values($forbiddenBasenames); + } + return $this->forbiddenBasenames; + } + + /** + * Get a list of characters forbidden in filenames + * + * Note: Characters in the range [0-31] are always forbidden, + * even if not inside this list (see OCP\Files\Storage\IStorage::verifyPath). + * + * @return list<string> + * @since 30.0.0 + */ + public function getForbiddenCharacters(): array { + if (empty($this->forbiddenCharacters)) { + // Get always forbidden characters + $forbiddenCharacters = str_split(\OCP\Constants::FILENAME_INVALID_CHARS); + if ($forbiddenCharacters === false) { + $forbiddenCharacters = []; + } + + // Get admin defined invalid characters + $additionalChars = $this->config->getSystemValue('forbidden_filename_characters', []); + if (!is_array($additionalChars)) { + $this->logger->error('Invalid system config value for "forbidden_filename_characters" is ignored.'); + $additionalChars = []; + } + $forbiddenCharacters = array_merge($forbiddenCharacters, $additionalChars); + + // Handle legacy config option + // TODO: Drop with Nextcloud 34 + $legacyForbiddenCharacters = $this->config->getSystemValue('forbidden_chars', []); + if (!is_array($legacyForbiddenCharacters)) { + $this->logger->error('Invalid system config value for "forbidden_chars" is ignored.'); + $legacyForbiddenCharacters = []; + } + if (!empty($legacyForbiddenCharacters)) { + $this->logger->warning('System config option "forbidden_chars" is deprecated and will be removed in Nextcloud 34, use "forbidden_filename_characters" instead.'); + } + $forbiddenCharacters = array_merge($legacyForbiddenCharacters, $forbiddenCharacters); + + $this->forbiddenCharacters = array_values($forbiddenCharacters); + } + return $this->forbiddenCharacters; + } + + /** + * @inheritdoc + */ + public function isFilenameValid(string $filename): bool { + try { + $this->validateFilename($filename); + } catch (\OCP\Files\InvalidPathException) { + return false; + } + return true; + } + + /** + * @inheritdoc + */ + public function validateFilename(string $filename): void { + $trimmed = trim($filename); + if ($trimmed === '') { + throw new EmptyFileNameException(); + } + + // the special directories . and .. would cause never ending recursion + // we check the trimmed name here to ensure unexpected trimming will not cause severe issues + if ($trimmed === '.' || $trimmed === '..') { + throw new InvalidDirectoryException($this->l10n->t('Dot files are not allowed')); + } + + // 255 characters is the limit on common file systems (ext/xfs) + // oc_filecache has a 250 char length limit for the filename + if (isset($filename[250])) { + throw new FileNameTooLongException(); + } + + if (!$this->database->supports4ByteText()) { + // verify database - e.g. mysql only 3-byte chars + if (preg_match('%(?: + \xF0[\x90-\xBF][\x80-\xBF]{2} # planes 1-3 + | [\xF1-\xF3][\x80-\xBF]{3} # planes 4-15 + | \xF4[\x80-\x8F][\x80-\xBF]{2} # plane 16 +)%xs', $filename)) { + throw new InvalidCharacterInPathException(); + } + } + + $this->checkForbiddenName($filename); + + $this->checkForbiddenExtension($filename); + + $this->checkForbiddenCharacters($filename); + } + + /** + * Check if the filename is forbidden + * @param string $path Path to check the filename + * @return bool True if invalid name, False otherwise + */ + public function isForbidden(string $path): bool { + // We support paths here as this function is also used in some storage internals + $filename = basename($path); + $filename = mb_strtolower($filename); + + if ($filename === '') { + return false; + } + + // Check for forbidden filenames + $forbiddenNames = $this->getForbiddenFilenames(); + if (in_array($filename, $forbiddenNames)) { + return true; + } + + // Filename is not forbidden + return false; + } + + protected function checkForbiddenName($filename): void { + if ($this->isForbidden($filename)) { + throw new ReservedWordException($this->l10n->t('"%1$s" is a forbidden file or folder name.', [$filename])); + } + + // Check for forbidden basenames - basenames are the part of the file until the first dot + // (except if the dot is the first character as this is then part of the basename "hidden files") + $basename = substr($filename, 0, strpos($filename, '.', 1) ?: null); + $forbiddenNames = $this->getForbiddenBasenames(); + if (in_array($basename, $forbiddenNames)) { + throw new ReservedWordException($this->l10n->t('"%1$s" is a forbidden prefix for file or folder names.', [$filename])); + } + } + + + /** + * Check if a filename contains any of the forbidden characters + * @param string $filename + * @throws InvalidCharacterInPathException + */ + protected function checkForbiddenCharacters(string $filename): void { + $sanitizedFileName = filter_var($filename, FILTER_UNSAFE_RAW, FILTER_FLAG_STRIP_LOW); + if ($sanitizedFileName !== $filename) { + throw new InvalidCharacterInPathException(); + } + + foreach ($this->getForbiddenCharacters() as $char) { + if (str_contains($filename, $char)) { + throw new InvalidCharacterInPathException($this->l10n->t('"%1$s" is not allowed inside a file or folder name.', [$char])); + } + } + } + + /** + * Check if a filename has a forbidden filename extension + * @param string $filename The filename to validate + * @throws InvalidPathException + */ + protected function checkForbiddenExtension(string $filename): void { + $filename = mb_strtolower($filename); + // Check for forbidden filename extensions + $forbiddenExtensions = $this->getForbiddenExtensions(); + foreach ($forbiddenExtensions as $extension) { + if (str_ends_with($filename, $extension)) { + if (str_starts_with($extension, '.')) { + throw new InvalidPathException($this->l10n->t('"%1$s" is a forbidden file type.', [$extension]), self::INVALID_FILE_TYPE); + } else { + throw new InvalidPathException($this->l10n->t('Filenames must not end with "%1$s".', [$extension])); + } + } + } + } + + /** + * Helper to get lower case list from config with validation + * @return string[] + */ + private function getConfigValue(string $key, array $fallback): array { + $values = $this->config->getSystemValue($key, $fallback); + if (!is_array($values)) { + $this->logger->error('Invalid system config value for "' . $key . '" is ignored.'); + $values = $fallback; + } + + return array_map('mb_strtolower', $values); + } +}; diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php index db7420c3c4c..48c069de0b9 100644 --- a/lib/private/Files/Filesystem.php +++ b/lib/private/Files/Filesystem.php @@ -674,7 +674,7 @@ class Filesystem { * * @param string $path * @param bool|string $includeMountPoints whether to add mountpoint sizes, - * defaults to true + * defaults to true * @return \OC\Files\FileInfo|false False if file does not exist */ public static function getFileInfo($path, $includeMountPoints = true) { diff --git a/lib/private/Files/Mount/Manager.php b/lib/private/Files/Mount/Manager.php index c2267af3c96..d118021afa2 100644 --- a/lib/private/Files/Mount/Manager.php +++ b/lib/private/Files/Mount/Manager.php @@ -84,7 +84,7 @@ class Manager implements IMountManager { if (count($this->mounts) === 0) { $this->setupManager->setupRoot(); if (count($this->mounts) === 0) { - throw new \Exception("No mounts even after explicitly setting up the root mounts"); + throw new \Exception('No mounts even after explicitly setting up the root mounts'); } } @@ -104,7 +104,7 @@ class Manager implements IMountManager { } } - throw new NotFoundException("No mount for path " . $path . " existing mounts (" . count($this->mounts) ."): " . implode(",", array_keys($this->mounts))); + throw new NotFoundException('No mount for path ' . $path . ' existing mounts (' . count($this->mounts) .'): ' . implode(',', array_keys($this->mounts))); } /** diff --git a/lib/private/Files/Mount/RootMountProvider.php b/lib/private/Files/Mount/RootMountProvider.php index 7ad7a7f059c..86f8188978f 100644 --- a/lib/private/Files/Mount/RootMountProvider.php +++ b/lib/private/Files/Mount/RootMountProvider.php @@ -56,7 +56,7 @@ class RootMountProvider implements IRootMountProvider { } private function getLocalRootMount(IStorageFactory $loader): MountPoint { - $configDataDirectory = $this->config->getSystemValue("datadirectory", OC::$SERVERROOT . "/data"); + $configDataDirectory = $this->config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data'); return new MountPoint(LocalRootStorage::class, '/', ['datadir' => $configDataDirectory], $loader, null, null, self::class); } diff --git a/lib/private/Files/Node/Folder.php b/lib/private/Files/Node/Folder.php index 7ae55d046b9..ca256b09d33 100644 --- a/lib/private/Files/Node/Folder.php +++ b/lib/private/Files/Node/Folder.php @@ -12,6 +12,7 @@ use OC\Files\Search\SearchComparison; use OC\Files\Search\SearchOrder; use OC\Files\Search\SearchQuery; use OC\Files\Utils\PathHelper; +use OC\User\LazyUser; use OCP\Files\Cache\ICacheEntry; use OCP\Files\FileInfo; use OCP\Files\Mount\IMountPoint; @@ -26,6 +27,9 @@ use OCP\Files\Search\ISearchQuery; use OCP\IUserManager; class Folder extends Node implements \OCP\Files\Folder { + + private ?IUserManager $userManager = null; + /** * Creates a Folder that represents a non-existing path * @@ -218,9 +222,9 @@ class Folder extends Node implements \OCP\Files\Folder { }, array_values($resultsPerCache), array_keys($resultsPerCache))); // don't include this folder in the results - $files = array_filter($files, function (FileInfo $file) { + $files = array_values(array_filter($files, function (FileInfo $file) { return $file->getPath() !== $this->getPath(); - }); + })); // since results were returned per-cache, they are no longer fully sorted $order = $query->getOrder(); @@ -245,7 +249,26 @@ class Folder extends Node implements \OCP\Files\Folder { $cacheEntry['internalPath'] = $cacheEntry['path']; $cacheEntry['path'] = rtrim($appendRoot . $cacheEntry->getPath(), '/'); $subPath = $cacheEntry['path'] !== '' ? '/' . $cacheEntry['path'] : ''; - return new \OC\Files\FileInfo($this->path . $subPath, $mount->getStorage(), $cacheEntry['internalPath'], $cacheEntry, $mount); + $storage = $mount->getStorage(); + + $owner = null; + $ownerId = $storage->getOwner($cacheEntry['internalPath']); + if (!empty($ownerId)) { + // Cache the user manager (for performance) + if ($this->userManager === null) { + $this->userManager = \OCP\Server::get(IUserManager::class); + } + $owner = new LazyUser($ownerId, $this->userManager); + } + + return new \OC\Files\FileInfo( + $this->path . $subPath, + $storage, + $cacheEntry['internalPath'], + $cacheEntry, + $mount, + $owner, + ); } /** @@ -399,7 +422,7 @@ class Folder extends Node implements \OCP\Files\Folder { $filterNonRecentFiles = new SearchComparison( ISearchComparison::COMPARE_GREATER_THAN, 'mtime', - strtotime("-2 week") + strtotime('-2 week') ); if ($offset === 0 && $limit <= 100) { $query = new SearchQuery( diff --git a/lib/private/Files/Node/LazyUserFolder.php b/lib/private/Files/Node/LazyUserFolder.php index f9908b9b7b6..77479c2fa5e 100644 --- a/lib/private/Files/Node/LazyUserFolder.php +++ b/lib/private/Files/Node/LazyUserFolder.php @@ -59,7 +59,7 @@ class LazyUserFolder extends LazyFolder { } $mountPoint = $this->mountManager->find('/' . $this->user->getUID()); if (is_null($mountPoint)) { - throw new \Exception("No mountpoint for user folder"); + throw new \Exception('No mountpoint for user folder'); } return $mountPoint; } diff --git a/lib/private/Files/Node/Node.php b/lib/private/Files/Node/Node.php index e7f533e73a9..5dbdc4054bf 100644 --- a/lib/private/Files/Node/Node.php +++ b/lib/private/Files/Node/Node.php @@ -158,7 +158,7 @@ class Node implements INode { public function getStorage() { $storage = $this->getMountPoint()->getStorage(); if (!$storage) { - throw new \Exception("No storage for node"); + throw new \Exception('No storage for node'); } return $storage; } @@ -432,11 +432,14 @@ class Node implements INode { $targetPath = $this->normalizePath($targetPath); $parent = $this->root->get(dirname($targetPath)); if ( - $parent instanceof Folder and - $this->isValidPath($targetPath) and - ( - $parent->isCreatable() || - ($parent->getInternalPath() === '' && $parent->getMountPoint() instanceof MoveableMount) + ($parent instanceof Folder) + && $this->isValidPath($targetPath) + && ( + $parent->isCreatable() + || ( + $parent->getInternalPath() === '' + && ($parent->getMountPoint() instanceof MoveableMount) + ) ) ) { $nonExisting = $this->createNonExistingNode($targetPath); diff --git a/lib/private/Files/Node/NonExistingFile.php b/lib/private/Files/Node/NonExistingFile.php index d154876432e..66ec2e6c040 100644 --- a/lib/private/Files/Node/NonExistingFile.php +++ b/lib/private/Files/Node/NonExistingFile.php @@ -38,6 +38,14 @@ class NonExistingFile extends File { } } + public function getInternalPath() { + if ($this->fileInfo) { + return parent::getInternalPath(); + } else { + return $this->getParent()->getMountPoint()->getInternalPath($this->getPath()); + } + } + public function stat() { throw new NotFoundException(); } diff --git a/lib/private/Files/Node/NonExistingFolder.php b/lib/private/Files/Node/NonExistingFolder.php index 5650c99fe73..4489fdaf010 100644 --- a/lib/private/Files/Node/NonExistingFolder.php +++ b/lib/private/Files/Node/NonExistingFolder.php @@ -38,6 +38,14 @@ class NonExistingFolder extends Folder { } } + public function getInternalPath() { + if ($this->fileInfo) { + return parent::getInternalPath(); + } else { + return $this->getParent()->getMountPoint()->getInternalPath($this->getPath()); + } + } + public function stat() { throw new NotFoundException(); } diff --git a/lib/private/Files/Node/Root.php b/lib/private/Files/Node/Root.php index 5fb4013cfc9..416adc7f374 100644 --- a/lib/private/Files/Node/Root.php +++ b/lib/private/Files/Node/Root.php @@ -459,7 +459,7 @@ class Root extends Folder implements IRootFolder { if ($folder instanceof Folder) { return $folder->getByIdInRootMount($id); } else { - throw new \Exception("getByIdInPath with non folder"); + throw new \Exception('getByIdInPath with non folder'); } } return []; diff --git a/lib/private/Files/ObjectStore/Azure.php b/lib/private/Files/ObjectStore/Azure.php index 55400d4131c..2dacdac1f8d 100644 --- a/lib/private/Files/ObjectStore/Azure.php +++ b/lib/private/Files/ObjectStore/Azure.php @@ -21,7 +21,7 @@ class Azure implements IObjectStore { private $blobClient = null; /** @var string|null */ private $endpoint = null; - /** @var bool */ + /** @var bool */ private $autoCreate = false; /** @@ -45,7 +45,7 @@ class Azure implements IObjectStore { private function getBlobClient() { if (!$this->blobClient) { $protocol = $this->endpoint ? substr($this->endpoint, 0, strpos($this->endpoint, ':')) : 'https'; - $connectionString = "DefaultEndpointsProtocol=" . $protocol . ";AccountName=" . $this->accountName . ";AccountKey=" . $this->accountKey; + $connectionString = 'DefaultEndpointsProtocol=' . $protocol . ';AccountName=' . $this->accountName . ';AccountKey=' . $this->accountKey; if ($this->endpoint) { $connectionString .= ';BlobEndpoint=' . $this->endpoint; } diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php index 389f744eab4..228fc516677 100644 --- a/lib/private/Files/ObjectStore/ObjectStoreStorage.php +++ b/lib/private/Files/ObjectStore/ObjectStoreStorage.php @@ -594,6 +594,31 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil return parent::copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath); } + public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, ?ICacheEntry $sourceCacheEntry = null): bool { + $sourceCache = $sourceStorage->getCache(); + if (!$sourceCacheEntry) { + $sourceCacheEntry = $sourceCache->get($sourceInternalPath); + } + if ($sourceCacheEntry->getMimeType() === FileInfo::MIMETYPE_FOLDER) { + foreach ($sourceCache->getFolderContents($sourceInternalPath) as $child) { + $this->moveFromStorage($sourceStorage, $child->getPath(), $targetInternalPath . '/' . $child->getName()); + } + $sourceStorage->rmdir($sourceInternalPath); + } else { + // move the cache entry before the contents so that we have the correct fileid/urn for the target + $this->getCache()->moveFromCache($sourceCache, $sourceInternalPath, $targetInternalPath); + try { + $this->writeStream($targetInternalPath, $sourceStorage->fopen($sourceInternalPath, 'r'), $sourceCacheEntry->getSize()); + } catch (\Exception $e) { + // restore the cache entry + $sourceCache->moveFromCache($this->getCache(), $targetInternalPath, $sourceInternalPath); + throw $e; + } + $sourceStorage->unlink($sourceInternalPath); + } + return true; + } + public function copy($source, $target) { $source = $this->normalizePath($source); $target = $this->normalizePath($target); @@ -632,7 +657,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil $sourceUrn = $this->getURN($sourceEntry->getId()); if (!$cache instanceof Cache) { - throw new \Exception("Invalid source cache for object store copy"); + throw new \Exception('Invalid source cache for object store copy'); } $targetId = $cache->copyFromCache($cache, $sourceEntry, $to); diff --git a/lib/private/Files/ObjectStore/S3ConfigTrait.php b/lib/private/Files/ObjectStore/S3ConfigTrait.php index 3a399e6413d..63f14ac2d00 100644 --- a/lib/private/Files/ObjectStore/S3ConfigTrait.php +++ b/lib/private/Files/ObjectStore/S3ConfigTrait.php @@ -20,7 +20,7 @@ trait S3ConfigTrait { protected int $timeout; - protected string $proxy; + protected string|false $proxy; protected string $storageClass; diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php index 4609ad18905..9de85f00620 100644 --- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php +++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php @@ -14,6 +14,7 @@ use Aws\S3\S3Client; use GuzzleHttp\Promise\Create; use GuzzleHttp\Promise\RejectedPromise; use OCP\ICertificateManager; +use OCP\Server; use Psr\Log\LoggerInterface; trait S3ConnectionTrait { @@ -27,7 +28,7 @@ trait S3ConnectionTrait { protected function parseParams($params) { if (empty($params['bucket'])) { - throw new \Exception("Bucket has to be configured."); + throw new \Exception('Bucket has to be configured.'); } $this->id = 'amazon::' . $params['bucket']; @@ -98,7 +99,11 @@ trait S3ConnectionTrait { 'signature_provider' => \Aws\or_chain([self::class, 'legacySignatureProvider'], ClientResolver::_default_signature_provider()), 'csm' => false, 'use_arn_region' => false, - 'http' => ['verify' => $this->getCertificateBundlePath()], + 'http' => [ + 'verify' => $this->getCertificateBundlePath(), + // Timeout for the connection to S3 server, not for the request. + 'connect_timeout' => 5 + ], 'use_aws_shared_config_files' => false, ]; @@ -116,35 +121,38 @@ trait S3ConnectionTrait { } $this->connection = new S3Client($options); - if (!$this->connection::isBucketDnsCompatible($this->bucket)) { - $logger = \OC::$server->get(LoggerInterface::class); - $logger->debug('Bucket "' . $this->bucket . '" This bucket name is not dns compatible, it may contain invalid characters.', - ['app' => 'objectstore']); - } - - if ($this->params['verify_bucket_exists'] && !$this->connection->doesBucketExist($this->bucket)) { - $logger = \OC::$server->get(LoggerInterface::class); - try { - $logger->info('Bucket "' . $this->bucket . '" does not exist - creating it.', ['app' => 'objectstore']); - if (!$this->connection::isBucketDnsCompatible($this->bucket)) { - throw new \Exception("The bucket will not be created because the name is not dns compatible, please correct it: " . $this->bucket); - } - $this->connection->createBucket(['Bucket' => $this->bucket]); - $this->testTimeout(); - } catch (S3Exception $e) { - $logger->debug('Invalid remote storage.', [ - 'exception' => $e, - 'app' => 'objectstore', - ]); - if ($e->getAwsErrorCode() !== "BucketAlreadyOwnedByYou") { - throw new \Exception('Creation of bucket "' . $this->bucket . '" failed. ' . $e->getMessage()); + try { + $logger = Server::get(LoggerInterface::class); + if (!$this->connection::isBucketDnsCompatible($this->bucket)) { + $logger->debug('Bucket "' . $this->bucket . '" This bucket name is not dns compatible, it may contain invalid characters.', + ['app' => 'objectstore']); + } + + if ($this->params['verify_bucket_exists'] && !$this->connection->doesBucketExist($this->bucket)) { + try { + $logger->info('Bucket "' . $this->bucket . '" does not exist - creating it.', ['app' => 'objectstore']); + if (!$this->connection::isBucketDnsCompatible($this->bucket)) { + throw new \Exception('The bucket will not be created because the name is not dns compatible, please correct it: ' . $this->bucket); + } + $this->connection->createBucket(['Bucket' => $this->bucket]); + $this->testTimeout(); + } catch (S3Exception $e) { + $logger->debug('Invalid remote storage.', [ + 'exception' => $e, + 'app' => 'objectstore', + ]); + if ($e->getAwsErrorCode() !== 'BucketAlreadyOwnedByYou') { + throw new \Exception('Creation of bucket "' . $this->bucket . '" failed. ' . $e->getMessage()); + } } } - } - - // google cloud's s3 compatibility doesn't like the EncodingType parameter - if (strpos($base_url, 'storage.googleapis.com')) { - $this->connection->getHandlerList()->remove('s3.auto_encode'); + + // google cloud's s3 compatibility doesn't like the EncodingType parameter + if (strpos($base_url, 'storage.googleapis.com')) { + $this->connection->getHandlerList()->remove('s3.auto_encode'); + } + } catch (S3Exception $e) { + throw new \Exception('S3 service is unable to handle request: ' . $e->getMessage()); } return $this->connection; @@ -189,11 +197,11 @@ trait S3ConnectionTrait { } protected function getCertificateBundlePath(): ?string { - if ((int)($this->params['use_nextcloud_bundle'] ?? "0")) { + if ((int)($this->params['use_nextcloud_bundle'] ?? '0')) { // since we store the certificate bundles on the primary storage, we can't get the bundle while setting up the primary storage if (!isset($this->params['primary_storage'])) { /** @var ICertificateManager $certManager */ - $certManager = \OC::$server->get(ICertificateManager::class); + $certManager = Server::get(ICertificateManager::class); return $certManager->getAbsoluteBundlePath(); } else { return \OC::$SERVERROOT . '/resources/config/ca-bundle.crt'; diff --git a/lib/private/Files/ObjectStore/S3ObjectTrait.php b/lib/private/Files/ObjectStore/S3ObjectTrait.php index 5d00c184ca7..2e625033751 100644 --- a/lib/private/Files/ObjectStore/S3ObjectTrait.php +++ b/lib/private/Files/ObjectStore/S3ObjectTrait.php @@ -127,7 +127,7 @@ trait S3ObjectTrait { if ($e->getState()->isInitiated() && (array_key_exists('UploadId', $uploadInfo))) { $this->getConnection()->abortMultipartUpload($uploadInfo); } - throw new \OCA\DAV\Connector\Sabre\Exception\BadGateway("Error while uploading to S3 bucket", 0, $e); + throw new \OCA\DAV\Connector\Sabre\Exception\BadGateway('Error while uploading to S3 bucket', 0, $e); } } @@ -144,7 +144,7 @@ trait S3ObjectTrait { // ($psrStream->isSeekable() && $psrStream->getSize() !== null) evaluates to true for a On-Seekable stream // so the optimisation does not apply - $buffer = new Psr7\Stream(fopen("php://memory", 'rwb+')); + $buffer = new Psr7\Stream(fopen('php://memory', 'rwb+')); Utils::copyToStream($psrStream, $buffer, $this->putSizeLimit); $buffer->seek(0); if ($buffer->getSize() < $this->putSizeLimit) { @@ -183,14 +183,14 @@ trait S3ObjectTrait { if ($this->useMultipartCopy && $size > $this->copySizeLimit) { $copy = new MultipartCopy($this->getConnection(), [ - "source_bucket" => $this->getBucket(), - "source_key" => $from + 'source_bucket' => $this->getBucket(), + 'source_key' => $from ], array_merge([ - "bucket" => $this->getBucket(), - "key" => $to, - "acl" => "private", - "params" => $this->getSSECParameters() + $this->getSSECParameters(true), - "source_metadata" => $sourceMetadata + 'bucket' => $this->getBucket(), + 'key' => $to, + 'acl' => 'private', + 'params' => $this->getSSECParameters() + $this->getSSECParameters(true), + 'source_metadata' => $sourceMetadata ], $options)); $copy->copy(); } else { diff --git a/lib/private/Files/ObjectStore/S3Signature.php b/lib/private/Files/ObjectStore/S3Signature.php index e3a522b6581..4e9784ee81a 100644 --- a/lib/private/Files/ObjectStore/S3Signature.php +++ b/lib/private/Files/ObjectStore/S3Signature.php @@ -99,7 +99,7 @@ class S3Signature implements SignatureInterface { } /** - * @param RequestInterface $request + * @param RequestInterface $request * @param CredentialsInterface $creds * * @return RequestInterface diff --git a/lib/private/Files/ObjectStore/SwiftFactory.php b/lib/private/Files/ObjectStore/SwiftFactory.php index 0db5c9762d2..118724159e5 100644 --- a/lib/private/Files/ObjectStore/SwiftFactory.php +++ b/lib/private/Files/ObjectStore/SwiftFactory.php @@ -170,7 +170,7 @@ class SwiftFactory { try { /** @var \OpenStack\Identity\v2\Models\Token $token */ $token = $authService->model(\OpenStack\Identity\v2\Models\Token::class, $cachedToken['token']); - $now = new \DateTimeImmutable("now"); + $now = new \DateTimeImmutable('now'); if ($token->expires > $now) { $hasValidCachedToken = true; $this->params['v2cachedToken'] = $token; @@ -194,13 +194,13 @@ class SwiftFactory { } catch (ClientException $e) { $statusCode = $e->getResponse()->getStatusCode(); if ($statusCode === 404) { - throw new StorageAuthException('Keystone not found, verify the keystone url', $e); + throw new StorageAuthException('Keystone not found while connecting to object storage, verify the keystone url', $e); } elseif ($statusCode === 412) { - throw new StorageAuthException('Precondition failed, verify the keystone url', $e); + throw new StorageAuthException('Precondition failed while connecting to object storage, verify the keystone url', $e); } elseif ($statusCode === 401) { - throw new StorageAuthException('Authentication failed, verify the username, password and possibly tenant', $e); + throw new StorageAuthException('Authentication failed while connecting to object storage, verify the username, password and possibly tenant', $e); } else { - throw new StorageAuthException('Unknown error', $e); + throw new StorageAuthException('Unknown error while connecting to object storage', $e); } } catch (RequestException $e) { throw new StorageAuthException('Connection reset while connecting to keystone, verify the keystone url', $e); diff --git a/lib/private/Files/Search/SearchQuery.php b/lib/private/Files/Search/SearchQuery.php index e7cb031da3e..3c8711facd8 100644 --- a/lib/private/Files/Search/SearchQuery.php +++ b/lib/private/Files/Search/SearchQuery.php @@ -11,13 +11,13 @@ use OCP\Files\Search\ISearchQuery; use OCP\IUser; class SearchQuery implements ISearchQuery { - /** @var ISearchOperator */ + /** @var ISearchOperator */ private $searchOperation; - /** @var integer */ + /** @var integer */ private $limit; - /** @var integer */ + /** @var integer */ private $offset; - /** @var ISearchOrder[] */ + /** @var ISearchOrder[] */ private $order; /** @var ?IUser */ private $user; diff --git a/lib/private/Files/SetupManager.php b/lib/private/Files/SetupManager.php index 53befe57e36..e74dd1042d6 100644 --- a/lib/private/Files/SetupManager.php +++ b/lib/private/Files/SetupManager.php @@ -107,8 +107,9 @@ class SetupManager { $prevLogging = Filesystem::logWarningWhenAddingStorageWrapper(false); Filesystem::addStorageWrapper('mount_options', function ($mountPoint, IStorage $storage, IMountPoint $mount) { - if ($mount->getOptions() && $storage->instanceOfStorage(Common::class)) { - $storage->setMountOptions($mount->getOptions()); + if ($storage->instanceOfStorage(Common::class)) { + $options = array_merge($mount->getOptions(), ['mount_point' => $mountPoint]); + $storage->setMountOptions($options); } return $storage; }); @@ -381,7 +382,7 @@ class SetupManager { } // for the user's home folder, and includes children we need everything always - if (rtrim($path) === "/" . $user->getUID() . "/files" && $includeChildren) { + if (rtrim($path) === '/' . $user->getUID() . '/files' && $includeChildren) { $this->setupForUser($user); return; } @@ -411,7 +412,7 @@ class SetupManager { $setupProviders[] = $cachedMount->getMountProvider(); $mounts = $this->mountProviderCollection->getUserMountsForProviderClasses($user, [$cachedMount->getMountProvider()]); } else { - $this->logger->debug("mount at " . $cachedMount->getMountPoint() . " has no provider set, performing full setup"); + $this->logger->debug('mount at ' . $cachedMount->getMountPoint() . ' has no provider set, performing full setup'); $this->eventLogger->end('fs:setup:user:path:find'); $this->setupForUser($user); $this->eventLogger->end('fs:setup:user:path'); @@ -428,7 +429,7 @@ class SetupManager { }, false); if ($needsFullSetup) { - $this->logger->debug("mount has no provider set, performing full setup"); + $this->logger->debug('mount has no provider set, performing full setup'); $this->setupForUser($user); $this->eventLogger->end('fs:setup:user:path'); return; @@ -490,7 +491,7 @@ class SetupManager { return; } - $this->eventLogger->start('fs:setup:user:providers', "Setup filesystem for " . implode(', ', $providers)); + $this->eventLogger->start('fs:setup:user:providers', 'Setup filesystem for ' . implode(', ', $providers)); $this->oneTimeUserSetup($user); diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php index e613e435f03..cefba66683b 100644 --- a/lib/private/Files/Storage/Common.php +++ b/lib/private/Files/Storage/Common.php @@ -13,17 +13,14 @@ use OC\Files\Cache\Propagator; use OC\Files\Cache\Scanner; use OC\Files\Cache\Updater; use OC\Files\Cache\Watcher; +use OC\Files\FilenameValidator; use OC\Files\Filesystem; use OC\Files\Storage\Wrapper\Jail; use OC\Files\Storage\Wrapper\Wrapper; -use OCP\Files\EmptyFileNameException; -use OCP\Files\FileNameTooLongException; use OCP\Files\ForbiddenException; use OCP\Files\GenericFileException; -use OCP\Files\InvalidCharacterInPathException; -use OCP\Files\InvalidDirectoryException; +use OCP\Files\IFilenameValidator; use OCP\Files\InvalidPathException; -use OCP\Files\ReservedWordException; use OCP\Files\Storage\ILockingStorage; use OCP\Files\Storage\IStorage; use OCP\Files\Storage\IWriteStreamStorage; @@ -57,10 +54,9 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage { protected $mountOptions = []; protected $owner = null; - /** @var ?bool */ - private $shouldLogLocks = null; - /** @var ?LoggerInterface */ - private $logger; + private ?bool $shouldLogLocks = null; + private ?LoggerInterface $logger = null; + private ?IFilenameValidator $filenameValidator = null; public function __construct($parameters) { } @@ -164,7 +160,7 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage { } public function file_get_contents($path) { - $handle = $this->fopen($path, "r"); + $handle = $this->fopen($path, 'r'); if (!$handle) { return false; } @@ -174,7 +170,7 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage { } public function file_put_contents($path, $data) { - $handle = $this->fopen($path, "w"); + $handle = $this->fopen($path, 'w'); if (!$handle) { return false; } @@ -196,7 +192,7 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage { $this->remove($target); $dir = $this->opendir($source); $this->mkdir($target); - while ($file = readdir($dir)) { + while (($file = readdir($dir)) !== false) { if (!Filesystem::isIgnoredDir($file)) { if (!$this->copy($source . '/' . $file, $target . '/' . $file)) { closedir($dir); @@ -395,7 +391,7 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage { * get the ETag for a file or folder * * @param string $path - * @return string + * @return string|false */ public function getETag($path) { return uniqid(); @@ -435,11 +431,11 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage { if ($this->stat('')) { return true; } - \OC::$server->get(LoggerInterface::class)->info("External storage not available: stat() failed"); + \OC::$server->get(LoggerInterface::class)->info('External storage not available: stat() failed'); return false; } catch (\Exception $e) { \OC::$server->get(LoggerInterface::class)->warning( - "External storage not available: " . $e->getMessage(), + 'External storage not available: ' . $e->getMessage(), ['exception' => $e] ); return false; @@ -496,68 +492,32 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage { * @throws InvalidPathException */ public function verifyPath($path, $fileName) { - // verify empty and dot files - $trimmed = trim($fileName); - if ($trimmed === '') { - throw new EmptyFileNameException(); - } - - if (\OC\Files\Filesystem::isIgnoredDir($trimmed)) { - throw new InvalidDirectoryException(); - } - - if (!\OC::$server->getDatabaseConnection()->supports4ByteText()) { - // verify database - e.g. mysql only 3-byte chars - if (preg_match('%(?: - \xF0[\x90-\xBF][\x80-\xBF]{2} # planes 1-3 - | [\xF1-\xF3][\x80-\xBF]{3} # planes 4-15 - | \xF4[\x80-\x8F][\x80-\xBF]{2} # plane 16 -)%xs', $fileName)) { - throw new InvalidCharacterInPathException(); + $this->getFilenameValidator() + ->validateFilename($fileName); + + // verify also the path is valid + if ($path && $path !== '/' && $path !== '.') { + try { + $this->verifyPath(dirname($path), basename($path)); + } catch (InvalidPathException $e) { + // Ignore invalid file type exceptions on directories + if ($e->getCode() !== FilenameValidator::INVALID_FILE_TYPE) { + $l = \OCP\Util::getL10N('lib'); + throw new InvalidPathException($l->t('Invalid parent path'), previous: $e); + } } } - - // 255 characters is the limit on common file systems (ext/xfs) - // oc_filecache has a 250 char length limit for the filename - if (isset($fileName[250])) { - throw new FileNameTooLongException(); - } - - // NOTE: $path will remain unverified for now - $this->verifyPosixPath($fileName); } /** - * @param string $fileName - * @throws InvalidPathException + * Get the filename validator + * (cached for performance) */ - protected function verifyPosixPath($fileName) { - $invalidChars = \OCP\Util::getForbiddenFileNameChars(); - $this->scanForInvalidCharacters($fileName, $invalidChars); - - $fileName = trim($fileName); - $reservedNames = ['*']; - if (in_array($fileName, $reservedNames)) { - throw new ReservedWordException(); - } - } - - /** - * @param string $fileName - * @param string[] $invalidChars - * @throws InvalidPathException - */ - private function scanForInvalidCharacters(string $fileName, array $invalidChars) { - foreach ($invalidChars as $char) { - if (str_contains($fileName, $char)) { - throw new InvalidCharacterInPathException(); - } - } - - $sanitizedFileName = filter_var($fileName, FILTER_UNSAFE_RAW, FILTER_FLAG_STRIP_LOW); - if ($sanitizedFileName !== $fileName) { - throw new InvalidCharacterInPathException(); + protected function getFilenameValidator(): IFilenameValidator { + if ($this->filenameValidator === null) { + $this->filenameValidator = \OCP\Server::get(IFilenameValidator::class); } + return $this->filenameValidator; } /** @@ -868,7 +828,7 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage { try { [$count, $result] = \OC_Helper::streamCopy($stream, $target); if (!$result) { - throw new GenericFileException("Failed to copy stream"); + throw new GenericFileException('Failed to copy stream'); } } finally { fclose($target); diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php index 63ef1399a69..4c017082cea 100644 --- a/lib/private/Files/Storage/DAV.php +++ b/lib/private/Files/Storage/DAV.php @@ -23,6 +23,7 @@ use OCP\Files\StorageNotAvailableException; use OCP\Http\Client\IClientService; use OCP\ICertificateManager; use OCP\IConfig; +use OCP\Server; use OCP\Util; use Psr\Http\Message\ResponseInterface; use Psr\Log\LoggerInterface; @@ -86,13 +87,13 @@ class DAV extends Common { */ public function __construct($params) { $this->statCache = new ArrayCache(); - $this->httpClientService = \OC::$server->get(IClientService::class); + $this->httpClientService = Server::get(IClientService::class); if (isset($params['host']) && isset($params['user']) && isset($params['password'])) { $host = $params['host']; //remove leading http[s], will be generated in createBaseUri() - if (str_starts_with($host, "https://")) { + if (str_starts_with($host, 'https://')) { $host = substr($host, 8); - } elseif (str_starts_with($host, "http://")) { + } elseif (str_starts_with($host, 'http://')) { $host = substr($host, 7); } $this->host = $host; @@ -120,10 +121,10 @@ class DAV extends Common { } else { throw new \Exception('Invalid webdav storage configuration'); } - $this->logger = \OC::$server->get(LoggerInterface::class); - $this->eventLogger = \OC::$server->get(IEventLogger::class); + $this->logger = Server::get(LoggerInterface::class); + $this->eventLogger = Server::get(IEventLogger::class); // This timeout value will be used for the download and upload of files - $this->timeout = \OC::$server->get(IConfig::class)->getSystemValueInt('davstorage.request_timeout', 30); + $this->timeout = Server::get(IConfig::class)->getSystemValueInt('davstorage.request_timeout', 30); $this->mimeTypeDetector = \OC::$server->getMimeTypeDetector(); } @@ -142,7 +143,7 @@ class DAV extends Common { $settings['authType'] = $this->authType; } - $proxy = \OC::$server->getConfig()->getSystemValueString('proxy', ''); + $proxy = Server::get(IConfig::class)->getSystemValueString('proxy', ''); if ($proxy !== '') { $settings['proxy'] = $proxy; } @@ -162,13 +163,13 @@ class DAV extends Common { $lastRequestStart = 0; $this->client->on('beforeRequest', function (RequestInterface $request) use (&$lastRequestStart) { - $this->logger->debug("sending dav " . $request->getMethod() . " request to external storage: " . $request->getAbsoluteUrl(), ['app' => 'dav']); + $this->logger->debug('sending dav ' . $request->getMethod() . ' request to external storage: ' . $request->getAbsoluteUrl(), ['app' => 'dav']); $lastRequestStart = microtime(true); - $this->eventLogger->start('fs:storage:dav:request', "Sending dav request to external storage"); + $this->eventLogger->start('fs:storage:dav:request', 'Sending dav request to external storage'); }); $this->client->on('afterRequest', function (RequestInterface $request) use (&$lastRequestStart) { $elapsed = microtime(true) - $lastRequestStart; - $this->logger->debug("dav " . $request->getMethod() . " request to external storage: " . $request->getAbsoluteUrl() . " took " . round($elapsed * 1000, 1) . "ms", ['app' => 'dav']); + $this->logger->debug('dav ' . $request->getMethod() . ' request to external storage: ' . $request->getAbsoluteUrl() . ' took ' . round($elapsed * 1000, 1) . 'ms', ['app' => 'dav']); $this->eventLogger->end('fs:storage:dav:request'); }); } @@ -283,11 +284,11 @@ class DAV extends Common { return false; } $responseType = []; - if (isset($response["{DAV:}resourcetype"])) { + if (isset($response['{DAV:}resourcetype'])) { /** @var ResourceType[] $response */ - $responseType = $response["{DAV:}resourcetype"]->getValue(); + $responseType = $response['{DAV:}resourcetype']->getValue(); } - return (count($responseType) > 0 and $responseType[0] == "{DAV:}collection") ? 'dir' : 'file'; + return (count($responseType) > 0 && $responseType[0] == '{DAV:}collection') ? 'dir' : 'file'; } catch (\Exception $e) { $this->convertException($e, $path); } @@ -352,7 +353,7 @@ class DAV extends Common { if ($response->getStatusCode() === Http::STATUS_LOCKED) { throw new \OCP\Lock\LockedException($path); } else { - \OC::$server->get(LoggerInterface::class)->error('Guzzle get returned status code ' . $response->getStatusCode(), ['app' => 'webdav client']); + Server::get(LoggerInterface::class)->error('Guzzle get returned status code ' . $response->getStatusCode(), ['app' => 'webdav client']); } } @@ -380,7 +381,7 @@ class DAV extends Common { if (!$this->isUpdatable($path)) { return false; } - if ($mode === 'w' or $mode === 'w+') { + if ($mode === 'w' || $mode === 'w+') { $tmpFile = $tempManager->getTemporaryFile($ext); } else { $tmpFile = $this->getCachedFile($path); @@ -582,11 +583,11 @@ class DAV extends Common { } $responseType = []; - if (isset($response["{DAV:}resourcetype"])) { + if (isset($response['{DAV:}resourcetype'])) { /** @var ResourceType[] $response */ - $responseType = $response["{DAV:}resourcetype"]->getValue(); + $responseType = $response['{DAV:}resourcetype']->getValue(); } - $type = (count($responseType) > 0 and $responseType[0] == "{DAV:}collection") ? 'dir' : 'file'; + $type = (count($responseType) > 0 && $responseType[0] == '{DAV:}collection') ? 'dir' : 'file'; if ($type === 'dir') { $mimeType = 'httpd/unix-directory'; } elseif (isset($response['{DAV:}getcontenttype'])) { @@ -625,21 +626,14 @@ class DAV extends Common { /** {@inheritdoc} */ public function stat($path) { $meta = $this->getMetaData($path); - if (!$meta) { - return false; - } else { - return $meta; - } + return $meta ?: false; + } /** {@inheritdoc} */ public function getMimeType($path) { $meta = $this->getMetaData($path); - if ($meta) { - return $meta['mimetype']; - } else { - return false; - } + return $meta ? $meta['mimetype'] : false; } /** @@ -724,21 +718,12 @@ class DAV extends Common { /** {@inheritdoc} */ public function getPermissions($path) { $stat = $this->getMetaData($path); - if ($stat) { - return $stat['permissions']; - } else { - return 0; - } + return $stat ? $stat['permissions'] : 0; } - /** {@inheritdoc} */ public function getETag($path) { $meta = $this->getMetaData($path); - if ($meta) { - return $meta['etag']; - } else { - return null; - } + return $meta ? $meta['etag'] : false; } /** @@ -832,13 +817,13 @@ class DAV extends Common { * @param string $path optional path from the operation * * @throws StorageInvalidException if the storage is invalid, for example - * when the authentication expired or is invalid + * when the authentication expired or is invalid * @throws StorageNotAvailableException if the storage is not available, - * which might be temporary + * which might be temporary * @throws ForbiddenException if the action is not allowed */ protected function convertException(Exception $e, $path = '') { - \OC::$server->get(LoggerInterface::class)->debug($e->getMessage(), ['app' => 'files_external', 'exception' => $e]); + Server::get(LoggerInterface::class)->debug($e->getMessage(), ['app' => 'files_external', 'exception' => $e]); if ($e instanceof ClientHttpException) { if ($e->getHttpStatus() === Http::STATUS_LOCKED) { throw new \OCP\Lock\LockedException($path); diff --git a/lib/private/Files/Storage/Home.php b/lib/private/Files/Storage/Home.php index 9a336d2efcc..a8d1f82b987 100644 --- a/lib/private/Files/Storage/Home.php +++ b/lib/private/Files/Storage/Home.php @@ -28,7 +28,7 @@ class Home extends Local implements \OCP\Files\IHomeStorage { * Construct a Home storage instance * * @param array $arguments array with "user" containing the - * storage owner + * storage owner */ public function __construct($arguments) { $this->user = $arguments['user']; diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php index ac3696118f7..811a000ad6f 100644 --- a/lib/private/Files/Storage/Local.php +++ b/lib/private/Files/Storage/Local.php @@ -106,7 +106,7 @@ class Local extends \OC\Files\Storage\Common { * @var \SplFileInfo $file */ $file = $it->current(); - clearstatcache(true, $this->getSourcePath($file)); + clearstatcache(true, $file->getRealPath()); if (in_array($file->getBasename(), ['.', '..'])) { $it->next(); continue; @@ -117,6 +117,7 @@ class Local extends \OC\Files\Storage\Common { } $it->next(); } + unset($it); // Release iterator and thereby its potential directory lock (e.g. in case of VirtualBox shared folders) clearstatcache(true, $this->getSourcePath($path)); return rmdir($this->getSourcePath($path)); } catch (\UnexpectedValueException $e) { @@ -512,17 +513,11 @@ class Local extends \OC\Files\Storage\Common { return true; } - /** - * get the ETag for a file or folder - * - * @param string $path - * @return string - */ public function getETag($path) { return $this->calculateEtag($path, $this->stat($path)); } - private function calculateEtag(string $path, array $stat): string { + private function calculateEtag(string $path, array $stat): string|false { if ($stat['mode'] & 0x4000 && !($stat['mode'] & 0x8000)) { // is_dir & not socket return parent::getETag($path); } else { diff --git a/lib/private/Files/Storage/PolyFill/CopyDirectory.php b/lib/private/Files/Storage/PolyFill/CopyDirectory.php index 4b3e367da78..5fe396d97e1 100644 --- a/lib/private/Files/Storage/PolyFill/CopyDirectory.php +++ b/lib/private/Files/Storage/PolyFill/CopyDirectory.php @@ -70,7 +70,7 @@ trait CopyDirectory { protected function copyRecursive($source, $target) { $dh = $this->opendir($source); $result = true; - while ($file = readdir($dh)) { + while (($file = readdir($dh)) !== false) { if (!\OC\Files\Filesystem::isIgnoredDir($file)) { if ($this->is_dir($source . '/' . $file)) { $this->mkdir($target . '/' . $file); diff --git a/lib/private/Files/Storage/StorageFactory.php b/lib/private/Files/Storage/StorageFactory.php index 18fca1d28e3..612592e2d3a 100644 --- a/lib/private/Files/Storage/StorageFactory.php +++ b/lib/private/Files/Storage/StorageFactory.php @@ -26,7 +26,7 @@ class StorageFactory implements IStorageFactory { * @param int $priority wrappers with the lower priority are applied last (meaning they get called first) * @param \OCP\Files\Mount\IMountPoint[] $existingMounts existing mount points to apply the wrapper to * @return bool true if the wrapper was added, false if there was already a wrapper with this - * name registered + * name registered */ public function addStorageWrapper($wrapperName, $callback, $priority = 50, $existingMounts = []) { if (isset($this->storageWrappers[$wrapperName])) { diff --git a/lib/private/Files/Storage/Wrapper/Encryption.php b/lib/private/Files/Storage/Wrapper/Encryption.php index 5c7862e8226..1ead1c342b0 100644 --- a/lib/private/Files/Storage/Wrapper/Encryption.php +++ b/lib/private/Files/Storage/Wrapper/Encryption.php @@ -14,6 +14,7 @@ use OC\Files\Cache\CacheEntry; use OC\Files\Filesystem; use OC\Files\Mount\Manager; use OC\Files\ObjectStore\ObjectStoreStorage; +use OC\Files\Storage\Common; use OC\Files\Storage\LocalTempFileTrait; use OC\Memcache\ArrayCache; use OCP\Cache\CappedMemoryCache; @@ -64,7 +65,7 @@ class Encryption extends Wrapper { /** @var array remember for which path we execute the repair step to avoid recursions */ private $fixUnencryptedSizeOf = []; - /** @var ArrayCache */ + /** @var ArrayCache */ private $arrayCache; /** @var CappedMemoryCache<bool> */ @@ -203,7 +204,7 @@ class Encryption extends Wrapper { $encryptionModule = $this->getEncryptionModule($path); if ($encryptionModule) { - $handle = $this->fopen($path, "r"); + $handle = $this->fopen($path, 'r'); if (!$handle) { return false; } @@ -469,7 +470,7 @@ class Encryption extends Wrapper { /** - * perform some plausibility checks if the the unencrypted size is correct. + * perform some plausibility checks if the unencrypted size is correct. * If not, we calculate the correct unencrypted size and return it * * @param string $path internal path relative to the storage root @@ -776,9 +777,8 @@ class Encryption extends Wrapper { // first copy the keys that we reuse the existing file key on the target location // and don't create a new one which would break versions for example. - $mount = $this->mountManager->findByStorageId($sourceStorage->getId()); - if (count($mount) === 1) { - $mountPoint = $mount[0]->getMountPoint(); + if ($sourceStorage->instanceOfStorage(Common::class) && $sourceStorage->getMountOption('mount_point')) { + $mountPoint = $sourceStorage->getMountOption('mount_point'); $source = $mountPoint . '/' . $sourceInternalPath; $target = $this->getFullPath($targetInternalPath); $this->copyKeys($source, $target); diff --git a/lib/private/Files/Storage/Wrapper/Quota.php b/lib/private/Files/Storage/Wrapper/Quota.php index 8c6799fdd2d..b642c438266 100644 --- a/lib/private/Files/Storage/Wrapper/Quota.php +++ b/lib/private/Files/Storage/Wrapper/Quota.php @@ -40,7 +40,7 @@ class Quota extends Wrapper { if ($this->quota === null) { $quotaCallback = $this->quotaCallback; if ($quotaCallback === null) { - throw new \Exception("No quota or quota callback provider"); + throw new \Exception('No quota or quota callback provider'); } $this->quota = $quotaCallback(); } diff --git a/lib/private/Files/Storage/Wrapper/Wrapper.php b/lib/private/Files/Storage/Wrapper/Wrapper.php index 29acc9ad1c2..f8aa9d963dc 100644 --- a/lib/private/Files/Storage/Wrapper/Wrapper.php +++ b/lib/private/Files/Storage/Wrapper/Wrapper.php @@ -40,7 +40,7 @@ class Wrapper implements \OC\Files\Storage\Storage, ILockingStorage, IWriteStrea */ public function getWrapperStorage() { if (!$this->storage) { - $message = "storage wrapper " . get_class($this) . " doesn't have a wrapped storage set"; + $message = 'storage wrapper ' . get_class($this) . " doesn't have a wrapped storage set"; $logger = Server::get(LoggerInterface::class); $logger->error($message); $this->storage = new FailedStorage(['exception' => new \Exception($message)]); diff --git a/lib/private/Files/Stream/Encryption.php b/lib/private/Files/Stream/Encryption.php index 32c0021cd23..8f08f925da0 100644 --- a/lib/private/Files/Stream/Encryption.php +++ b/lib/private/Files/Stream/Encryption.php @@ -55,7 +55,7 @@ class Encryption extends Wrapper { /** @var string */ protected $fullPath; - /** @var bool */ + /** @var bool */ protected $signed; /** diff --git a/lib/private/Files/Stream/SeekableHttpStream.php b/lib/private/Files/Stream/SeekableHttpStream.php index 02ed1470fbd..5ed04ed9066 100644 --- a/lib/private/Files/Stream/SeekableHttpStream.php +++ b/lib/private/Files/Stream/SeekableHttpStream.php @@ -90,7 +90,7 @@ class SeekableHttpStream implements File { continue 2; } } - throw new \Exception("Failed to get source stream from stream wrapper of " . get_class($responseHead)); + throw new \Exception('Failed to get source stream from stream wrapper of ' . get_class($responseHead)); } $rangeHeaders = array_values(array_filter($responseHead, function ($v) { diff --git a/lib/private/Files/Template/TemplateManager.php b/lib/private/Files/Template/TemplateManager.php index 8362298b831..e61b4720289 100644 --- a/lib/private/Files/Template/TemplateManager.php +++ b/lib/private/Files/Template/TemplateManager.php @@ -18,6 +18,7 @@ use OCP\Files\GenericFileException; use OCP\Files\IRootFolder; use OCP\Files\Node; use OCP\Files\NotFoundException; +use OCP\Files\Template\BeforeGetTemplatesEvent; use OCP\Files\Template\FileCreatedFromTemplateEvent; use OCP\Files\Template\ICustomTemplateProvider; use OCP\Files\Template\ITemplateManager; @@ -127,10 +128,11 @@ class TemplateManager implements ITemplateManager { /** * @param string $filePath * @param string $templateId + * @param array $templateFields * @return array * @throws GenericFileException */ - public function createFromTemplate(string $filePath, string $templateId = '', string $templateType = 'user'): array { + public function createFromTemplate(string $filePath, string $templateId = '', string $templateType = 'user', array $templateFields = []): array { $userFolder = $this->rootFolder->getUserFolder($this->userId); try { $userFolder->get($filePath); @@ -142,11 +144,9 @@ class TemplateManager implements ITemplateManager { throw new GenericFileException($this->l10n->t('Invalid path')); } $folder = $userFolder->get(dirname($filePath)); - $targetFile = $folder->newFile(basename($filePath)); $template = null; if ($templateType === 'user' && $templateId !== '') { $template = $userFolder->get($templateId); - $template->copy($targetFile->getPath()); } else { $matchingProvider = array_filter($this->getRegisteredProviders(), function (ICustomTemplateProvider $provider) use ($templateType) { return $templateType === get_class($provider); @@ -154,10 +154,12 @@ class TemplateManager implements ITemplateManager { $provider = array_shift($matchingProvider); if ($provider) { $template = $provider->getCustomTemplate($templateId); - $template->copy($targetFile->getPath()); } } - $this->eventDispatcher->dispatchTyped(new FileCreatedFromTemplateEvent($template, $targetFile)); + + $targetFile = $folder->newFile(basename($filePath), ($template instanceof File ? $template->fopen('rb') : null)); + + $this->eventDispatcher->dispatchTyped(new FileCreatedFromTemplateEvent($template, $targetFile, $templateFields)); return $this->formatFile($userFolder->get($filePath)); } catch (\Exception $e) { $this->logger->error($e->getMessage(), ['exception' => $e]); @@ -204,6 +206,8 @@ class TemplateManager implements ITemplateManager { } } + $this->eventDispatcher->dispatchTyped(new BeforeGetTemplatesEvent($templates)); + return $templates; } diff --git a/lib/private/Files/Type/Loader.php b/lib/private/Files/Type/Loader.php index 247acf0141a..407df59b2e2 100644 --- a/lib/private/Files/Type/Loader.php +++ b/lib/private/Files/Type/Loader.php @@ -115,7 +115,7 @@ class Loader implements IMimeTypeLoader { throw new \Exception("Database threw an unique constraint on inserting a new mimetype, but couldn't return the ID for this very mimetype"); } - $mimetypeId = (int) $id; + $mimetypeId = (int)$id; } $this->mimetypes[$mimetypeId] = $mimetype; @@ -136,8 +136,8 @@ class Loader implements IMimeTypeLoader { $result->closeCursor(); foreach ($results as $row) { - $this->mimetypes[(int) $row['id']] = $row['mimetype']; - $this->mimetypeIds[$row['mimetype']] = (int) $row['id']; + $this->mimetypes[(int)$row['id']] = $row['mimetype']; + $this->mimetypeIds[$row['mimetype']] = (int)$row['id']; } } diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index 0150a3e117a..336349c680b 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -221,7 +221,7 @@ class View { $relPath = '/' . $pathParts[3]; $this->lockFile($relPath, ILockingProvider::LOCK_SHARED, true); \OC_Hook::emit( - Filesystem::CLASSNAME, "umount", + Filesystem::CLASSNAME, 'umount', [Filesystem::signal_param_path => $relPath] ); $this->changeLock($relPath, ILockingProvider::LOCK_EXCLUSIVE, true); @@ -229,7 +229,7 @@ class View { $this->changeLock($relPath, ILockingProvider::LOCK_SHARED, true); if ($result) { \OC_Hook::emit( - Filesystem::CLASSNAME, "post_umount", + Filesystem::CLASSNAME, 'post_umount', [Filesystem::signal_param_path => $relPath] ); } @@ -697,7 +697,7 @@ class View { $absolutePath2 = Filesystem::normalizePath($this->getAbsolutePath($target)); if (str_starts_with($absolutePath2, $absolutePath1 . '/')) { - throw new ForbiddenException("Moving a folder into a child folder is forbidden", false); + throw new ForbiddenException('Moving a folder into a child folder is forbidden', false); } $targetParts = explode('/', $absolutePath2); @@ -716,6 +716,12 @@ class View { return false; } + try { + $this->verifyPath(dirname($target), basename($target)); + } catch (InvalidPathException) { + return false; + } + $this->lockFile($source, ILockingProvider::LOCK_SHARED, true); try { $this->lockFile($target, ILockingProvider::LOCK_SHARED, true); @@ -739,8 +745,6 @@ class View { } } if ($run) { - $this->verifyPath(dirname($target), basename($target)); - $manager = Filesystem::getMountManager(); $mount1 = $this->getMount($source); $mount2 = $this->getMount($target); @@ -1326,7 +1330,7 @@ class View { * * @param string $path * @param bool|string $includeMountPoints true to add mountpoint sizes, - * 'ext' to add only ext storage mount point sizes. Defaults to true. + * 'ext' to add only ext storage mount point sizes. Defaults to true. * @return \OC\Files\FileInfo|false False if file does not exist */ public function getFileInfo($path, $includeMountPoints = true) { @@ -1334,9 +1338,6 @@ class View { if (!Filesystem::isValidPath($path)) { return false; } - if (Cache\Scanner::isPartialFile($path)) { - return $this->getPartFileInfo($path); - } $relativePath = $path; $path = Filesystem::normalizePath($this->fakeRoot . '/' . $path); @@ -1347,12 +1348,20 @@ class View { $data = $this->getCacheEntry($storage, $internalPath, $relativePath); if (!$data instanceof ICacheEntry) { + if (Cache\Scanner::isPartialFile($relativePath)) { + return $this->getPartFileInfo($relativePath); + } + return false; } if ($mount instanceof MoveableMount && $internalPath === '') { $data['permissions'] |= \OCP\Constants::PERMISSION_DELETE; } + if ($internalPath === '' && $data['name']) { + $data['name'] = basename($path); + } + $ownerId = $storage->getOwner($internalPath); $owner = null; if ($ownerId !== null && $ownerId !== false) { @@ -1487,6 +1496,15 @@ class View { if ($pos = strpos($relativePath, '/')) { //mountpoint inside subfolder add size to the correct folder $entryName = substr($relativePath, 0, $pos); + + // Create parent folders if the mountpoint is inside a subfolder that doesn't exist yet + if (!isset($files[$entryName]) && $this->mkdir($path . '/' . $entryName) !== false) { + $info = $this->getFileInfo($path . '/' . $entryName); + if ($info !== false) { + $files[$entryName] = $info; + } + } + if (isset($files[$entryName])) { $files[$entryName]->addSubEntry($rootEntry, $mountPoint); } @@ -1776,7 +1794,8 @@ class View { }, $providers)); foreach ($shares as $share) { - if (str_starts_with($targetPath, $share->getNode()->getPath())) { + $sharedPath = $share->getNode()->getPath(); + if ($targetPath === $sharedPath || str_starts_with($targetPath, $sharedPath . '/')) { $this->logger->debug( 'It is not allowed to move one mount point into a shared folder', ['app' => 'files']); @@ -1817,22 +1836,39 @@ class View { /** * @param string $path * @param string $fileName + * @param bool $readonly Check only if the path is allowed for read-only access * @throws InvalidPathException */ - public function verifyPath($path, $fileName): void { + public function verifyPath($path, $fileName, $readonly = false): void { + // All of the view's functions disallow '..' in the path so we can short cut if the path is invalid + if (!Filesystem::isValidPath($path ?: '/')) { + $l = \OCP\Util::getL10N('lib'); + throw new InvalidPathException($l->t('Path contains invalid segments')); + } + + // Short cut for read-only validation + if ($readonly) { + $validator = \OCP\Server::get(FilenameValidator::class); + if ($validator->isForbidden($fileName)) { + $l = \OCP\Util::getL10N('lib'); + throw new InvalidPathException($l->t('Filename is a reserved word')); + } + return; + } + try { /** @type \OCP\Files\Storage $storage */ [$storage, $internalPath] = $this->resolvePath($path); $storage->verifyPath($internalPath, $fileName); } catch (ReservedWordException $ex) { $l = \OCP\Util::getL10N('lib'); - throw new InvalidPathException($l->t('File name is a reserved word')); + throw new InvalidPathException($ex->getMessage() ?: $l->t('Filename is a reserved word')); } catch (InvalidCharacterInPathException $ex) { $l = \OCP\Util::getL10N('lib'); - throw new InvalidPathException($l->t('File name contains at least one invalid character')); + throw new InvalidPathException($ex->getMessage() ?: $l->t('Filename contains at least one invalid character')); } catch (FileNameTooLongException $ex) { $l = \OCP\Util::getL10N('lib'); - throw new InvalidPathException($l->t('File name is too long')); + throw new InvalidPathException($l->t('Filename is too long')); } catch (InvalidDirectoryException $ex) { $l = \OCP\Util::getL10N('lib'); throw new InvalidPathException($l->t('Dot files are not allowed')); @@ -1874,7 +1910,7 @@ class View { * * @param string $absolutePath absolute path * @param bool $useParentMount true to return parent mount instead of whatever - * is mounted directly on the given path, false otherwise + * is mounted directly on the given path, false otherwise * @return IMountPoint mount point for which to apply locks */ private function getMountForLock(string $absolutePath, bool $useParentMount = false): IMountPoint { @@ -2088,7 +2124,7 @@ class View { * @param string $absolutePath absolute path which is under "files" * * @return string path relative to "files" with trimmed slashes or null - * if the path was NOT relative to files + * if the path was NOT relative to files * * @throws \InvalidArgumentException if the given path was not under "files" * @since 8.1.0 diff --git a/lib/private/FilesMetadata/Service/IndexRequestService.php b/lib/private/FilesMetadata/Service/IndexRequestService.php index 32248ff5c24..b50fb378325 100644 --- a/lib/private/FilesMetadata/Service/IndexRequestService.php +++ b/lib/private/FilesMetadata/Service/IndexRequestService.php @@ -82,9 +82,9 @@ class IndexRequestService { private function insertIndexString(int $fileId, string $key, string $value): void { $qb = $this->dbConnection->getQueryBuilder(); $qb->insert(self::TABLE_METADATA_INDEX) - ->setValue('meta_key', $qb->createNamedParameter($key)) - ->setValue('meta_value_string', $qb->createNamedParameter($value)) - ->setValue('file_id', $qb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)); + ->setValue('meta_key', $qb->createNamedParameter($key)) + ->setValue('meta_value_string', $qb->createNamedParameter($value)) + ->setValue('file_id', $qb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)); $qb->executeStatement(); } @@ -100,9 +100,9 @@ class IndexRequestService { public function insertIndexInt(int $fileId, string $key, int $value): void { $qb = $this->dbConnection->getQueryBuilder(); $qb->insert(self::TABLE_METADATA_INDEX) - ->setValue('meta_key', $qb->createNamedParameter($key)) - ->setValue('meta_value_int', $qb->createNamedParameter($value, IQueryBuilder::PARAM_INT)) - ->setValue('file_id', $qb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)); + ->setValue('meta_key', $qb->createNamedParameter($key)) + ->setValue('meta_value_int', $qb->createNamedParameter($value, IQueryBuilder::PARAM_INT)) + ->setValue('file_id', $qb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)); $qb->executeStatement(); } @@ -118,9 +118,9 @@ class IndexRequestService { public function insertIndexBool(int $fileId, string $key, bool $value): void { $qb = $this->dbConnection->getQueryBuilder(); $qb->insert(self::TABLE_METADATA_INDEX) - ->setValue('meta_key', $qb->createNamedParameter($key)) - ->setValue('meta_value_int', $qb->createNamedParameter(($value) ? '1' : '0', IQueryBuilder::PARAM_INT)) - ->setValue('file_id', $qb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)); + ->setValue('meta_key', $qb->createNamedParameter($key)) + ->setValue('meta_value_int', $qb->createNamedParameter(($value) ? '1' : '0', IQueryBuilder::PARAM_INT)) + ->setValue('file_id', $qb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)); $qb->executeStatement(); } @@ -167,7 +167,7 @@ class IndexRequestService { $qb = $this->dbConnection->getQueryBuilder(); $expr = $qb->expr(); $qb->delete(self::TABLE_METADATA_INDEX) - ->where($expr->eq('file_id', $qb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT))); + ->where($expr->eq('file_id', $qb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT))); if ($key !== '') { $qb->andWhere($expr->eq('meta_key', $qb->createNamedParameter($key))); diff --git a/lib/private/FilesMetadata/Service/MetadataRequestService.php b/lib/private/FilesMetadata/Service/MetadataRequestService.php index 08982a2a659..b58912b0216 100644 --- a/lib/private/FilesMetadata/Service/MetadataRequestService.php +++ b/lib/private/FilesMetadata/Service/MetadataRequestService.php @@ -38,10 +38,10 @@ class MetadataRequestService { public function store(IFilesMetadata $filesMetadata): void { $qb = $this->dbConnection->getQueryBuilder(); $qb->insert(self::TABLE_METADATA) - ->setValue('file_id', $qb->createNamedParameter($filesMetadata->getFileId(), IQueryBuilder::PARAM_INT)) - ->setValue('json', $qb->createNamedParameter(json_encode($filesMetadata->jsonSerialize()))) - ->setValue('sync_token', $qb->createNamedParameter($this->generateSyncToken())) - ->setValue('last_update', (string) $qb->createFunction('NOW()')); + ->setValue('file_id', $qb->createNamedParameter($filesMetadata->getFileId(), IQueryBuilder::PARAM_INT)) + ->setValue('json', $qb->createNamedParameter(json_encode($filesMetadata->jsonSerialize()))) + ->setValue('sync_token', $qb->createNamedParameter($this->generateSyncToken())) + ->setValue('last_update', (string)$qb->createFunction('NOW()')); $qb->executeStatement(); } @@ -92,7 +92,7 @@ class MetadataRequestService { $list = []; $result = $qb->executeQuery(); while ($data = $result->fetch()) { - $fileId = (int) $data['file_id']; + $fileId = (int)$data['file_id']; $metadata = new FilesMetadata($fileId); try { $metadata->importFromDatabase($data); @@ -117,7 +117,7 @@ class MetadataRequestService { public function dropMetadata(int $fileId): void { $qb = $this->dbConnection->getQueryBuilder(); $qb->delete(self::TABLE_METADATA) - ->where($qb->expr()->eq('file_id', $qb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT))); + ->where($qb->expr()->eq('file_id', $qb->createNamedParameter($fileId, IQueryBuilder::PARAM_INT))); $qb->executeStatement(); } @@ -134,15 +134,15 @@ class MetadataRequestService { $expr = $qb->expr(); $qb->update(self::TABLE_METADATA) - ->set('json', $qb->createNamedParameter(json_encode($filesMetadata->jsonSerialize()))) - ->set('sync_token', $qb->createNamedParameter($this->generateSyncToken())) - ->set('last_update', $qb->createFunction('NOW()')) - ->where( - $expr->andX( - $expr->eq('file_id', $qb->createNamedParameter($filesMetadata->getFileId(), IQueryBuilder::PARAM_INT)), - $expr->eq('sync_token', $qb->createNamedParameter($filesMetadata->getSyncToken())) - ) - ); + ->set('json', $qb->createNamedParameter(json_encode($filesMetadata->jsonSerialize()))) + ->set('sync_token', $qb->createNamedParameter($this->generateSyncToken())) + ->set('last_update', $qb->createFunction('NOW()')) + ->where( + $expr->andX( + $expr->eq('file_id', $qb->createNamedParameter($filesMetadata->getFileId(), IQueryBuilder::PARAM_INT)), + $expr->eq('sync_token', $qb->createNamedParameter($filesMetadata->getSyncToken())) + ) + ); return $qb->executeStatement(); } diff --git a/lib/private/FullTextSearch/Model/IndexDocument.php b/lib/private/FullTextSearch/Model/IndexDocument.php index 6f9da9416fa..8bd20bad1e0 100644 --- a/lib/private/FullTextSearch/Model/IndexDocument.php +++ b/lib/private/FullTextSearch/Model/IndexDocument.php @@ -402,7 +402,7 @@ class IndexDocument implements IIndexDocument, JsonSerializable { return $this; } - $this->hash = hash("md5", $this->getContent()); + $this->hash = hash('md5', $this->getContent()); return $this; } @@ -556,9 +556,9 @@ class IndexDocument implements IIndexDocument, JsonSerializable { * @since 16.0.0 */ private function cleanExcerpt(string $excerpt): string { - $excerpt = str_replace("\\n", ' ', $excerpt); - $excerpt = str_replace("\\r", ' ', $excerpt); - $excerpt = str_replace("\\t", ' ', $excerpt); + $excerpt = str_replace('\\n', ' ', $excerpt); + $excerpt = str_replace('\\r', ' ', $excerpt); + $excerpt = str_replace('\\t', ' ', $excerpt); $excerpt = str_replace("\n", ' ', $excerpt); $excerpt = str_replace("\r", ' ', $excerpt); $excerpt = str_replace("\t", ' ', $excerpt); diff --git a/lib/private/Group/Database.php b/lib/private/Group/Database.php index 925b5bb0bdd..72cd0ea4a91 100644 --- a/lib/private/Group/Database.php +++ b/lib/private/Group/Database.php @@ -325,8 +325,8 @@ class Database extends ABackend implements $qb = $this->dbConn->getQueryBuilder(); $qb->select('gid', 'displayname') - ->from('groups') - ->where($qb->expr()->in('gid', $qb->createParameter('ids'))); + ->from('groups') + ->where($qb->expr()->in('gid', $qb->createParameter('ids'))); foreach (array_chunk($notFoundGids, 1000) as $chunk) { $qb->setParameter('ids', $chunk, IQueryBuilder::PARAM_STR_ARRAY); $result = $qb->executeQuery(); @@ -488,7 +488,7 @@ class Database extends ABackend implements $displayName = $result->fetchOne(); $result->closeCursor(); - return (string) $displayName; + return (string)$displayName; } public function getGroupDetails(string $gid): array { @@ -507,6 +507,8 @@ class Database extends ABackend implements $notFoundGids = []; $details = []; + $this->fixDI(); + // In case the data is already locally accessible, not need to do SQL query // or do a SQL query but with a smaller in clause foreach ($gids as $gid) { diff --git a/lib/private/Group/Group.php b/lib/private/Group/Group.php index dcda7c29bb5..147c5baf543 100644 --- a/lib/private/Group/Group.php +++ b/lib/private/Group/Group.php @@ -30,7 +30,7 @@ use OCP\IUser; use OCP\IUserManager; class Group implements IGroup { - /** @var null|string */ + /** @var null|string */ protected $displayName; /** @var string */ @@ -46,7 +46,7 @@ class Group implements IGroup { private $backends; /** @var IEventDispatcher */ private $dispatcher; - /** @var \OC\User\Manager|IUserManager */ + /** @var \OC\User\Manager|IUserManager */ private $userManager; /** @var PublicEmitter */ private $emitter; diff --git a/lib/private/Group/Manager.php b/lib/private/Group/Manager.php index 0ab64907c8b..d18c7796805 100644 --- a/lib/private/Group/Manager.php +++ b/lib/private/Group/Manager.php @@ -8,6 +8,7 @@ namespace OC\Group; use OC\Hooks\PublicEmitter; +use OC\Settings\AuthorizedGroupMapper; use OCP\EventDispatcher\IEventDispatcher; use OCP\Group\Backend\IBatchMethodsBackend; use OCP\Group\Backend\ICreateNamedGroupBackend; @@ -19,6 +20,7 @@ use OCP\ICacheFactory; use OCP\IGroup; use OCP\IGroupManager; use OCP\IUser; +use OCP\Security\Ip\IRemoteAddress; use Psr\Log\LoggerInterface; use function is_string; @@ -41,11 +43,6 @@ class Manager extends PublicEmitter implements IGroupManager { /** @var GroupInterface[] */ private $backends = []; - /** @var \OC\User\Manager */ - private $userManager; - private IEventDispatcher $dispatcher; - private LoggerInterface $logger; - /** @var array<string, IGroup> */ private $cachedGroups = []; @@ -59,13 +56,13 @@ class Manager extends PublicEmitter implements IGroupManager { private const MAX_GROUP_LENGTH = 255; - public function __construct(\OC\User\Manager $userManager, - IEventDispatcher $dispatcher, - LoggerInterface $logger, - ICacheFactory $cacheFactory) { - $this->userManager = $userManager; - $this->dispatcher = $dispatcher; - $this->logger = $logger; + public function __construct( + private \OC\User\Manager $userManager, + private IEventDispatcher $dispatcher, + private LoggerInterface $logger, + ICacheFactory $cacheFactory, + private IRemoteAddress $remoteAddress, + ) { $this->displayNameCache = new DisplayNameCache($cacheFactory, $this); $this->listen('\OC\Group', 'postDelete', function (IGroup $group): void { @@ -325,6 +322,10 @@ class Manager extends PublicEmitter implements IGroupManager { * @return bool if admin */ public function isAdmin($userId) { + if (!$this->remoteAddress->allowsAdminActions()) { + return false; + } + foreach ($this->backends as $backend) { if (is_string($userId) && $backend->implementsActions(Backend::IS_ADMIN) && $backend->isAdmin($userId)) { return true; @@ -333,6 +334,18 @@ class Manager extends PublicEmitter implements IGroupManager { return $this->isInGroup($userId, 'admin'); } + public function isDelegatedAdmin(string $userId): bool { + if (!$this->remoteAddress->allowsAdminActions()) { + return false; + } + + // Check if the user as admin delegation for users listing + $authorizedGroupMapper = \OCP\Server::get(AuthorizedGroupMapper::class); + $user = $this->userManager->get($userId); + $authorizedClasses = $authorizedGroupMapper->findAllClassesForUser($user); + return in_array(\OCA\Settings\Settings\Admin\Users::class, $authorizedClasses, true); + } + /** * Checks if a userId is in a group * @@ -439,7 +452,7 @@ class Manager extends PublicEmitter implements IGroupManager { $matchingUsers = []; foreach ($groupUsers as $groupUser) { - $matchingUsers[(string) $groupUser->getUID()] = $groupUser->getDisplayName(); + $matchingUsers[(string)$groupUser->getUID()] = $groupUser->getDisplayName(); } return $matchingUsers; } diff --git a/lib/private/Group/MetaData.php b/lib/private/Group/MetaData.php index 638dc184812..fe0d931cb09 100644 --- a/lib/private/Group/MetaData.php +++ b/lib/private/Group/MetaData.php @@ -17,33 +17,22 @@ class MetaData { public const SORT_USERCOUNT = 1; // May have performance issues on LDAP backends public const SORT_GROUPNAME = 2; - /** @var string */ - protected $user; - /** @var bool */ - protected $isAdmin; /** @var array */ protected $metaData = []; - /** @var GroupManager */ - protected $groupManager; /** @var int */ protected $sorting = self::SORT_NONE; - /** @var IUserSession */ - protected $userSession; /** * @param string $user the uid of the current user * @param bool $isAdmin whether the current users is an admin */ public function __construct( - string $user, - bool $isAdmin, - IGroupManager $groupManager, - IUserSession $userSession + private string $user, + private bool $isAdmin, + private bool $isDelegatedAdmin, + private IGroupManager $groupManager, + private IUserSession $userSession ) { - $this->user = $user; - $this->isAdmin = $isAdmin; - $this->groupManager = $groupManager; - $this->userSession = $userSession; } /** @@ -52,7 +41,7 @@ class MetaData { * [0] array containing meta data about admin groups * [1] array containing meta data about unprivileged groups * @param string $groupSearch only effective when instance was created with - * isAdmin being true + * isAdmin being true * @param string $userSearch the pattern users are search for */ public function get(string $groupSearch = '', string $userSearch = ''): array { @@ -162,11 +151,11 @@ class MetaData { * @return IGroup[] */ public function getGroups(string $search = ''): array { - if ($this->isAdmin) { + if ($this->isAdmin || $this->isDelegatedAdmin) { return $this->groupManager->search($search); } else { $userObject = $this->userSession->getUser(); - if ($userObject !== null) { + if ($userObject !== null && $this->groupManager instanceof GroupManager) { $groups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($userObject); } else { $groups = []; diff --git a/lib/private/Http/Client/Client.php b/lib/private/Http/Client/Client.php index 7cadf3fdf6e..0b72522c218 100644 --- a/lib/private/Http/Client/Client.php +++ b/lib/private/Http/Client/Client.php @@ -176,27 +176,27 @@ class Client implements IClient { * * @param string $uri * @param array $options Array such as - * 'query' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, - * 'timeout' => 5, + * 'query' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, + * 'timeout' => 5, * @return IResponse * @throws \Exception If the request could not get completed */ @@ -212,22 +212,22 @@ class Client implements IClient { * * @param string $uri * @param array $options Array such as - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, - * 'timeout' => 5, + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, + * 'timeout' => 5, * @return IResponse * @throws \Exception If the request could not get completed */ @@ -242,27 +242,27 @@ class Client implements IClient { * * @param string $uri * @param array $options Array such as - * 'body' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, - * 'timeout' => 5, + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, + * 'timeout' => 5, * @return IResponse * @throws \Exception If the request could not get completed */ @@ -283,27 +283,27 @@ class Client implements IClient { * * @param string $uri * @param array $options Array such as - * 'body' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, - * 'timeout' => 5, + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, + * 'timeout' => 5, * @return IResponse * @throws \Exception If the request could not get completed */ @@ -318,27 +318,27 @@ class Client implements IClient { * * @param string $uri * @param array $options Array such as - * 'body' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, - * 'timeout' => 5, + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, + * 'timeout' => 5, * @return IResponse * @throws \Exception If the request could not get completed */ @@ -353,27 +353,27 @@ class Client implements IClient { * * @param string $uri * @param array $options Array such as - * 'body' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, - * 'timeout' => 5, + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, + * 'timeout' => 5, * @return IResponse * @throws \Exception If the request could not get completed */ @@ -388,27 +388,27 @@ class Client implements IClient { * * @param string $uri * @param array $options Array such as - * 'body' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, - * 'timeout' => 5, + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, + * 'timeout' => 5, * @return IResponse * @throws \Exception If the request could not get completed */ @@ -440,27 +440,27 @@ class Client implements IClient { * @param string $method The HTTP method to use * @param string $uri * @param array $options Array such as - * 'query' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, - * 'timeout' => 5, + * 'query' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, + * 'timeout' => 5, * @return IResponse * @throws \Exception If the request could not get completed */ @@ -483,27 +483,27 @@ class Client implements IClient { * * @param string $uri * @param array $options Array such as - * 'query' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, - * 'timeout' => 5, + * 'query' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, + * 'timeout' => 5, * @return IPromise */ public function getAsync(string $uri, array $options = []): IPromise { @@ -517,22 +517,22 @@ class Client implements IClient { * * @param string $uri * @param array $options Array such as - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, - * 'timeout' => 5, + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, + * 'timeout' => 5, * @return IPromise */ public function headAsync(string $uri, array $options = []): IPromise { @@ -546,27 +546,27 @@ class Client implements IClient { * * @param string $uri * @param array $options Array such as - * 'body' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, - * 'timeout' => 5, + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, + * 'timeout' => 5, * @return IPromise */ public function postAsync(string $uri, array $options = []): IPromise { @@ -585,27 +585,27 @@ class Client implements IClient { * * @param string $uri * @param array $options Array such as - * 'body' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, - * 'timeout' => 5, + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, + * 'timeout' => 5, * @return IPromise */ public function putAsync(string $uri, array $options = []): IPromise { @@ -619,27 +619,27 @@ class Client implements IClient { * * @param string $uri * @param array $options Array such as - * 'body' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, - * 'timeout' => 5, + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, + * 'timeout' => 5, * @return IPromise */ public function deleteAsync(string $uri, array $options = []): IPromise { @@ -653,27 +653,27 @@ class Client implements IClient { * * @param string $uri * @param array $options Array such as - * 'body' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, - * 'timeout' => 5, + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, + * 'timeout' => 5, * @return IPromise */ public function optionsAsync(string $uri, array $options = []): IPromise { diff --git a/lib/private/Http/Client/ClientService.php b/lib/private/Http/Client/ClientService.php index 9a170be8752..b719f3d369d 100644 --- a/lib/private/Http/Client/ClientService.php +++ b/lib/private/Http/Client/ClientService.php @@ -61,7 +61,7 @@ class ClientService implements IClientService { $stack->push($this->dnsPinMiddleware->addDnsPinning()); } $stack->push(Middleware::tap(function (RequestInterface $request) { - $this->eventLogger->start('http:request', $request->getMethod() . " request to " . $request->getRequestTarget()); + $this->eventLogger->start('http:request', $request->getMethod() . ' request to ' . $request->getRequestTarget()); }, function () { $this->eventLogger->end('http:request'); }), 'event logger'); diff --git a/lib/private/Http/Client/GuzzlePromiseAdapter.php b/lib/private/Http/Client/GuzzlePromiseAdapter.php index dc8be9bd2e0..03a9ed9a599 100644 --- a/lib/private/Http/Client/GuzzlePromiseAdapter.php +++ b/lib/private/Http/Client/GuzzlePromiseAdapter.php @@ -36,7 +36,7 @@ class GuzzlePromiseAdapter implements IPromise { * a new promise resolving to the return value of the called handler. * * @param ?callable(IResponse): void $onFulfilled Invoked when the promise fulfills. Gets an \OCP\Http\Client\IResponse passed in as argument - * @param ?callable(Exception): void $onRejected Invoked when the promise is rejected. Gets an \Exception passed in as argument + * @param ?callable(Exception): void $onRejected Invoked when the promise is rejected. Gets an \Exception passed in as argument * * @return IPromise * @since 28.0.0 @@ -115,7 +115,7 @@ class GuzzlePromiseAdapter implements IPromise { * @return mixed * * @throws LogicException if the promise has no wait function or if the - * promise does not settle after waiting. + * promise does not settle after waiting. * @since 28.0.0 */ public function wait(bool $unwrap = true): mixed { diff --git a/lib/private/Http/Client/NegativeDnsCache.php b/lib/private/Http/Client/NegativeDnsCache.php index d5e32fa7c2d..ca8a477d6be 100644 --- a/lib/private/Http/Client/NegativeDnsCache.php +++ b/lib/private/Http/Client/NegativeDnsCache.php @@ -20,11 +20,11 @@ class NegativeDnsCache { } private function createCacheKey(string $domain, int $type) : string { - return $domain . "-" . (string)$type; + return $domain . '-' . (string)$type; } public function setNegativeCacheForDnsType(string $domain, int $type, int $ttl) : void { - $this->cache->set($this->createCacheKey($domain, $type), "true", $ttl); + $this->cache->set($this->createCacheKey($domain, $type), 'true', $ttl); } public function isNegativeCached(string $domain, int $type) : bool { diff --git a/lib/private/Http/WellKnown/RequestManager.php b/lib/private/Http/WellKnown/RequestManager.php index 38dde0eade2..3624bf73962 100644 --- a/lib/private/Http/WellKnown/RequestManager.php +++ b/lib/private/Http/WellKnown/RequestManager.php @@ -74,11 +74,11 @@ class RequestManager { $context = $this->coordinator->getRegistrationContext(); if ($context === null) { - throw new RuntimeException("Well known handlers requested before the apps had been fully registered"); + throw new RuntimeException('Well known handlers requested before the apps had been fully registered'); } $registrations = $context->getWellKnownHandlers(); - $this->logger->debug(count($registrations) . " well known handlers registered"); + $this->logger->debug(count($registrations) . ' well known handlers registered'); return array_filter( array_map(function (ServiceRegistration $registration) { diff --git a/lib/private/legacy/OC_Image.php b/lib/private/Image.php index cc6968839d4..3dd0bc49662 100644 --- a/lib/private/legacy/OC_Image.php +++ b/lib/private/Image.php @@ -1,17 +1,27 @@ <?php declare(strict_types=1); + /** * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors * SPDX-FileCopyrightText: 2016 ownCloud, Inc. * SPDX-License-Identifier: AGPL-3.0-only */ + +namespace OC; + +use finfo; +use GdImage; +use OCP\IAppConfig; +use OCP\IConfig; use OCP\IImage; +use OCP\Server; +use Psr\Log\LoggerInterface; /** * Class for basic image manipulation */ -class OC_Image implements \OCP\IImage { +class Image implements IImage { // Default memory limit for images to load (256 MBytes). protected const DEFAULT_MEMORY_LIMIT = 256; @@ -21,49 +31,34 @@ class OC_Image implements \OCP\IImage { // Default quality for webp images protected const DEFAULT_WEBP_QUALITY = 80; - /** @var false|\GdImage */ - protected $resource = false; // tmp resource. - /** @var int */ - protected $imageType = IMAGETYPE_PNG; // Default to png if file type isn't evident. - /** @var null|string */ - protected $mimeType = 'image/png'; // Default to png - /** @var null|string */ - protected $filePath = null; - /** @var ?finfo */ - private $fileInfo = null; - /** @var \OCP\ILogger */ - private $logger; - /** @var \OCP\IConfig */ - private $config; - /** @var ?array */ - private $exif = null; + // tmp resource. + protected GdImage|false $resource = false; + // Default to png if file type isn't evident. + protected int $imageType = IMAGETYPE_PNG; + // Default to png + protected ?string $mimeType = 'image/png'; + protected ?string $filePath = null; + private ?finfo $fileInfo = null; + private LoggerInterface $logger; + private IAppConfig $appConfig; + private IConfig $config; + private ?array $exif = null; /** - * Constructor. - * - * @param mixed $imageRef Deprecated, should be null - * @psalm-assert null $imageRef - * @param \OCP\ILogger $logger - * @param \OCP\IConfig $config * @throws \InvalidArgumentException in case the $imageRef parameter is not null */ - public function __construct($imageRef = null, ?\OCP\ILogger $logger = null, ?\OCP\IConfig $config = null) { - $this->logger = $logger; - if ($logger === null) { - $this->logger = \OC::$server->getLogger(); - } - $this->config = $config; - if ($config === null) { - $this->config = \OC::$server->getConfig(); - } + public function __construct( + ?LoggerInterface $logger = null, + ?IAppConfig $appConfig = null, + ?IConfig $config = null, + ) { + $this->logger = $logger ?? Server::get(LoggerInterface::class); + $this->appConfig = $appConfig ?? Server::get(IAppConfig::class); + $this->config = $config ?? Server::get(IConfig::class); if (\OC_Util::fileInfoLoaded()) { $this->fileInfo = new finfo(FILEINFO_MIME_TYPE); } - - if ($imageRef !== null) { - throw new \InvalidArgumentException('The first parameter in the constructor is not supported anymore. Please use any of the load* methods of the image object to load an image.'); - } } /** @@ -120,7 +115,7 @@ class OC_Image implements \OCP\IImage { */ public function widthTopLeft(): int { $o = $this->getOrientation(); - $this->logger->debug('OC_Image->widthTopLeft() Orientation: ' . $o, ['app' => 'core']); + $this->logger->debug('Image->widthTopLeft() Orientation: ' . $o, ['app' => 'core']); switch ($o) { case -1: case 1: @@ -144,7 +139,7 @@ class OC_Image implements \OCP\IImage { */ public function heightTopLeft(): int { $o = $this->getOrientation(); - $this->logger->debug('OC_Image->heightTopLeft() Orientation: ' . $o, ['app' => 'core']); + $this->logger->debug('Image->heightTopLeft() Orientation: ' . $o, ['app' => 'core']); switch ($o) { case -1: case 1: @@ -171,7 +166,9 @@ class OC_Image implements \OCP\IImage { if ($mimeType === null) { $mimeType = $this->mimeType(); } - header('Content-Type: ' . $mimeType); + if ($mimeType !== null) { + header('Content-Type: ' . $mimeType); + } return $this->_output(null, $mimeType); } @@ -201,13 +198,10 @@ class OC_Image implements \OCP\IImage { /** * Outputs/saves the image. * - * @param string $filePath - * @param string $mimeType - * @return bool - * @throws Exception + * @throws \Exception */ private function _output(?string $filePath = null, ?string $mimeType = null): bool { - if ($filePath) { + if ($filePath !== null && $filePath !== '') { if (!file_exists(dirname($filePath))) { mkdir(dirname($filePath), 0777, true); } @@ -247,7 +241,7 @@ class OC_Image implements \OCP\IImage { $imageType = IMAGETYPE_WEBP; break; default: - throw new Exception('\OC_Image::_output(): "' . $mimeType . '" is not supported when forcing a specific output format'); + throw new \Exception('Image::_output(): "' . $mimeType . '" is not supported when forcing a specific output format'); } } @@ -266,7 +260,7 @@ class OC_Image implements \OCP\IImage { if (function_exists('imagexbm')) { $retVal = imagexbm($this->resource, $filePath); } else { - throw new Exception('\OC_Image::_output(): imagexbm() is not supported.'); + throw new \Exception('Image::_output(): imagexbm() is not supported.'); } break; @@ -334,27 +328,27 @@ class OC_Image implements \OCP\IImage { } ob_start(); switch ($this->mimeType) { - case "image/png": + case 'image/png': $res = imagepng($this->resource); break; - case "image/jpeg": + case 'image/jpeg': imageinterlace($this->resource, true); $quality = $this->getJpegQuality(); $res = imagejpeg($this->resource, null, $quality); break; - case "image/gif": + case 'image/gif': $res = imagegif($this->resource); break; - case "image/webp": + case 'image/webp': $res = imagewebp($this->resource, null, $this->getWebpQuality()); break; default: $res = imagepng($this->resource); - $this->logger->info('OC_Image->data. Could not guess mime-type, defaulting to png', ['app' => 'core']); + $this->logger->info('Image->data. Could not guess mime-type, defaulting to png', ['app' => 'core']); break; } if (!$res) { - $this->logger->error('OC_Image->data. Error getting image data.', ['app' => 'core']); + $this->logger->error('Image->data. Error getting image data.', ['app' => 'core']); } return ob_get_clean(); } @@ -363,31 +357,34 @@ class OC_Image implements \OCP\IImage { * @return string - base64 encoded, which is suitable for embedding in a VCard. */ public function __toString(): string { - return base64_encode($this->data()); + $data = $this->data(); + if ($data === null) { + return ''; + } else { + return base64_encode($data); + } } - /** - * @return int - */ protected function getJpegQuality(): int { - $quality = $this->config->getAppValue('preview', 'jpeg_quality', (string) self::DEFAULT_JPEG_QUALITY); - // TODO: remove when getAppValue is type safe - if ($quality === null) { - $quality = self::DEFAULT_JPEG_QUALITY; - } - return min(100, max(10, (int) $quality)); + $quality = $this->appConfig->getValueInt('preview', 'jpeg_quality', self::DEFAULT_JPEG_QUALITY); + return min(100, max(10, $quality)); } - /** - * @return int - */ protected function getWebpQuality(): int { - $quality = $this->config->getAppValue('preview', 'webp_quality', (string) self::DEFAULT_WEBP_QUALITY); - // TODO: remove when getAppValue is type safe - if ($quality === null) { - $quality = self::DEFAULT_WEBP_QUALITY; + $quality = $this->appConfig->getValueInt('preview', 'webp_quality', self::DEFAULT_WEBP_QUALITY); + return min(100, max(10, $quality)); + } + + private function isValidExifData(array $exif): bool { + if (!isset($exif['Orientation'])) { + return false; } - return min(100, max(10, (int) $quality)); + + if (!is_numeric($exif['Orientation'])) { + return false; + } + + return true; } /** @@ -402,47 +399,41 @@ class OC_Image implements \OCP\IImage { } if ($this->imageType !== IMAGETYPE_JPEG) { - $this->logger->debug('OC_Image->fixOrientation() Image is not a JPEG.', ['app' => 'core']); + $this->logger->debug('Image->fixOrientation() Image is not a JPEG.', ['app' => 'core']); return -1; } if (!is_callable('exif_read_data')) { - $this->logger->debug('OC_Image->fixOrientation() Exif module not enabled.', ['app' => 'core']); + $this->logger->debug('Image->fixOrientation() Exif module not enabled.', ['app' => 'core']); return -1; } if (!$this->valid()) { - $this->logger->debug('OC_Image->fixOrientation() No image loaded.', ['app' => 'core']); + $this->logger->debug('Image->fixOrientation() No image loaded.', ['app' => 'core']); return -1; } if (is_null($this->filePath) || !is_readable($this->filePath)) { - $this->logger->debug('OC_Image->fixOrientation() No readable file path set.', ['app' => 'core']); + $this->logger->debug('Image->fixOrientation() No readable file path set.', ['app' => 'core']); return -1; } $exif = @exif_read_data($this->filePath, 'IFD0'); - if (!$exif) { - return -1; - } - if (!isset($exif['Orientation'])) { + if ($exif === false || !$this->isValidExifData($exif)) { return -1; } $this->exif = $exif; - return $exif['Orientation']; + return (int)$exif['Orientation']; } - public function readExif($data): void { + public function readExif(string $data): void { if (!is_callable('exif_read_data')) { - $this->logger->debug('OC_Image->fixOrientation() Exif module not enabled.', ['app' => 'core']); + $this->logger->debug('Image->fixOrientation() Exif module not enabled.', ['app' => 'core']); return; } if (!$this->valid()) { - $this->logger->debug('OC_Image->fixOrientation() No image loaded.', ['app' => 'core']); + $this->logger->debug('Image->fixOrientation() No image loaded.', ['app' => 'core']); return; } $exif = @exif_read_data('data://image/jpeg;base64,' . base64_encode($data)); - if (!$exif) { - return; - } - if (!isset($exif['Orientation'])) { + if ($exif === false || !$this->isValidExifData($exif)) { return; } $this->exif = $exif; @@ -460,7 +451,7 @@ class OC_Image implements \OCP\IImage { return false; } $o = $this->getOrientation(); - $this->logger->debug('OC_Image->fixOrientation() Orientation: ' . $o, ['app' => 'core']); + $this->logger->debug('Image->fixOrientation() Orientation: ' . $o, ['app' => 'core']); $rotate = 0; $flip = false; switch ($o) { @@ -507,15 +498,15 @@ class OC_Image implements \OCP\IImage { $this->resource = $res; return true; } else { - $this->logger->debug('OC_Image->fixOrientation() Error during alpha-saving', ['app' => 'core']); + $this->logger->debug('Image->fixOrientation() Error during alpha-saving', ['app' => 'core']); return false; } } else { - $this->logger->debug('OC_Image->fixOrientation() Error during alpha-blending', ['app' => 'core']); + $this->logger->debug('Image->fixOrientation() Error during alpha-blending', ['app' => 'core']); return false; } } else { - $this->logger->debug('OC_Image->fixOrientation() Error during orientation fixing', ['app' => 'core']); + $this->logger->debug('Image->fixOrientation() Error during orientation fixing', ['app' => 'core']); return false; } } @@ -569,7 +560,7 @@ class OC_Image implements \OCP\IImage { private function checkImageSize($path) { $size = @getimagesize($path); if (!$size) { - return true; + return false; } $width = $size[0]; @@ -590,7 +581,7 @@ class OC_Image implements \OCP\IImage { private function checkImageDataSize($data) { $size = @getimagesizefromstring($data); if (!$size) { - return true; + return false; } $width = $size[0]; @@ -626,10 +617,10 @@ class OC_Image implements \OCP\IImage { imagealphablending($this->resource, true); imagesavealpha($this->resource, true); } else { - $this->logger->debug('OC_Image->loadFromFile, GIF image not valid: ' . $imagePath, ['app' => 'core']); + $this->logger->debug('Image->loadFromFile, GIF image not valid: ' . $imagePath, ['app' => 'core']); } } else { - $this->logger->debug('OC_Image->loadFromFile, GIF images not supported: ' . $imagePath, ['app' => 'core']); + $this->logger->debug('Image->loadFromFile, GIF images not supported: ' . $imagePath, ['app' => 'core']); } break; case IMAGETYPE_JPEG: @@ -637,13 +628,13 @@ class OC_Image implements \OCP\IImage { if (!$this->checkImageSize($imagePath)) { return false; } - if (getimagesize($imagePath) !== false) { + if (@getimagesize($imagePath) !== false) { $this->resource = @imagecreatefromjpeg($imagePath); } else { - $this->logger->debug('OC_Image->loadFromFile, JPG image not valid: ' . $imagePath, ['app' => 'core']); + $this->logger->debug('Image->loadFromFile, JPG image not valid: ' . $imagePath, ['app' => 'core']); } } else { - $this->logger->debug('OC_Image->loadFromFile, JPG images not supported: ' . $imagePath, ['app' => 'core']); + $this->logger->debug('Image->loadFromFile, JPG images not supported: ' . $imagePath, ['app' => 'core']); } break; case IMAGETYPE_PNG: @@ -657,10 +648,10 @@ class OC_Image implements \OCP\IImage { imagealphablending($this->resource, true); imagesavealpha($this->resource, true); } else { - $this->logger->debug('OC_Image->loadFromFile, PNG image not valid: ' . $imagePath, ['app' => 'core']); + $this->logger->debug('Image->loadFromFile, PNG image not valid: ' . $imagePath, ['app' => 'core']); } } else { - $this->logger->debug('OC_Image->loadFromFile, PNG images not supported: ' . $imagePath, ['app' => 'core']); + $this->logger->debug('Image->loadFromFile, PNG images not supported: ' . $imagePath, ['app' => 'core']); } break; case IMAGETYPE_XBM: @@ -670,7 +661,7 @@ class OC_Image implements \OCP\IImage { } $this->resource = @imagecreatefromxbm($imagePath); } else { - $this->logger->debug('OC_Image->loadFromFile, XBM/XPM images not supported: ' . $imagePath, ['app' => 'core']); + $this->logger->debug('Image->loadFromFile, XBM/XPM images not supported: ' . $imagePath, ['app' => 'core']); } break; case IMAGETYPE_WBMP: @@ -680,7 +671,7 @@ class OC_Image implements \OCP\IImage { } $this->resource = @imagecreatefromwbmp($imagePath); } else { - $this->logger->debug('OC_Image->loadFromFile, WBMP images not supported: ' . $imagePath, ['app' => 'core']); + $this->logger->debug('Image->loadFromFile, WBMP images not supported: ' . $imagePath, ['app' => 'core']); } break; case IMAGETYPE_BMP: @@ -691,9 +682,56 @@ class OC_Image implements \OCP\IImage { if (!$this->checkImageSize($imagePath)) { return false; } - $this->resource = @imagecreatefromwebp($imagePath); + + // Check for animated header before generating preview since libgd does not handle them well + // Adapted from here: https://stackoverflow.com/a/68491679/4085517 (stripped to only to check for animations + added additional error checking) + // Header format details here: https://developers.google.com/speed/webp/docs/riff_container + + // Load up the header data, if any + $fp = fopen($imagePath, 'rb'); + if (!$fp) { + return false; + } + $data = fread($fp, 90); + if ($data === false) { + return false; + } + fclose($fp); + unset($fp); + + $headerFormat = 'A4Riff/' . // get n string + 'I1Filesize/' . // get integer (file size but not actual size) + 'A4Webp/' . // get n string + 'A4Vp/' . // get n string + 'A74Chunk'; + + $header = unpack($headerFormat, $data); + unset($data, $headerFormat); + if ($header === false) { + return false; + } + + // Check if we're really dealing with a valid WEBP header rather than just one suffixed ".webp" + if (!isset($header['Riff']) || strtoupper($header['Riff']) !== 'RIFF') { + return false; + } + if (!isset($header['Webp']) || strtoupper($header['Webp']) !== 'WEBP') { + return false; + } + if (!isset($header['Vp']) || strpos(strtoupper($header['Vp']), 'VP8') === false) { + return false; + } + + // Check for animation indicators + if (strpos(strtoupper($header['Chunk']), 'ANIM') !== false || strpos(strtoupper($header['Chunk']), 'ANMF') !== false) { + // Animated so don't let it reach libgd + $this->logger->debug('Image->loadFromFile, animated WEBP images not supported: ' . $imagePath, ['app' => 'core']); + } else { + // We're safe so give it to libgd + $this->resource = @imagecreatefromwebp($imagePath); + } } else { - $this->logger->debug('OC_Image->loadFromFile, webp images not supported: ' . $imagePath, ['app' => 'core']); + $this->logger->debug('Image->loadFromFile, WEBP images not supported: ' . $imagePath, ['app' => 'core']); } break; /* @@ -729,7 +767,7 @@ class OC_Image implements \OCP\IImage { } $this->resource = @imagecreatefromstring($data); $iType = IMAGETYPE_PNG; - $this->logger->debug('OC_Image->loadFromFile, Default', ['app' => 'core']); + $this->logger->debug('Image->loadFromFile, Default', ['app' => 'core']); break; } if ($this->valid()) { @@ -741,12 +779,9 @@ class OC_Image implements \OCP\IImage { } /** - * Loads an image from a string of data. - * - * @param string $str A string of image data as read from a file. - * @return bool|\GdImage An image resource or false on error + * @inheritDoc */ - public function loadFromData(string $str) { + public function loadFromData(string $str): GdImage|false { if (!$this->checkImageDataSize($str)) { return false; } @@ -760,7 +795,7 @@ class OC_Image implements \OCP\IImage { } if (!$this->resource) { - $this->logger->debug('OC_Image->loadFromFile, could not load', ['app' => 'core']); + $this->logger->debug('Image->loadFromFile, could not load', ['app' => 'core']); return false; } return $this->resource; @@ -783,7 +818,7 @@ class OC_Image implements \OCP\IImage { $this->mimeType = $this->fileInfo->buffer($data); } if (!$this->resource) { - $this->logger->debug('OC_Image->loadFromBase64, could not load', ['app' => 'core']); + $this->logger->debug('Image->loadFromBase64, could not load', ['app' => 'core']); return false; } return $this->resource; @@ -809,11 +844,7 @@ class OC_Image implements \OCP\IImage { return $this->valid(); } - /** - * @param $maxSize - * @return bool|\GdImage - */ - private function resizeNew(int $maxSize) { + private function resizeNew(int $maxSize): \GdImage|false { if (!$this->valid()) { $this->logger->debug(__METHOD__ . '(): No image loaded', ['app' => 'core']); return false; @@ -849,12 +880,7 @@ class OC_Image implements \OCP\IImage { return $this->valid(); } - /** - * @param int $width - * @param int $height - * @return bool|\GdImage - */ - public function preciseResizeNew(int $width, int $height) { + public function preciseResizeNew(int $width, int $height): \GdImage|false { if (!($width > 0) || !($height > 0)) { $this->logger->info(__METHOD__ . '(): Requested image size not bigger than 0', ['app' => 'core']); return false; @@ -873,7 +899,11 @@ class OC_Image implements \OCP\IImage { // preserve transparency if ($this->imageType == IMAGETYPE_GIF or $this->imageType == IMAGETYPE_PNG) { - imagecolortransparent($process, imagecolorallocatealpha($process, 0, 0, 0, 127)); + $alpha = imagecolorallocatealpha($process, 0, 0, 0, 127); + if ($alpha === false) { + $alpha = null; + } + imagecolortransparent($process, $alpha); imagealphablending($process, false); imagesavealpha($process, true); } @@ -895,7 +925,7 @@ class OC_Image implements \OCP\IImage { */ public function centerCrop(int $size = 0): bool { if (!$this->valid()) { - $this->logger->debug('OC_Image->centerCrop, No image loaded', ['app' => 'core']); + $this->logger->debug('Image->centerCrop, No image loaded', ['app' => 'core']); return false; } $widthOrig = imagesx($this->resource); @@ -907,10 +937,10 @@ class OC_Image implements \OCP\IImage { $width = $height = min($widthOrig, $heightOrig); if ($ratioOrig > 1) { - $x = (int) (($widthOrig / 2) - ($width / 2)); + $x = (int)(($widthOrig / 2) - ($width / 2)); $y = 0; } else { - $y = (int) (($heightOrig / 2) - ($height / 2)); + $y = (int)(($heightOrig / 2) - ($height / 2)); $x = 0; } if ($size > 0) { @@ -922,20 +952,24 @@ class OC_Image implements \OCP\IImage { } $process = imagecreatetruecolor($targetWidth, $targetHeight); if ($process === false) { - $this->logger->debug('OC_Image->centerCrop, Error creating true color image', ['app' => 'core']); + $this->logger->debug('Image->centerCrop, Error creating true color image', ['app' => 'core']); return false; } // preserve transparency if ($this->imageType == IMAGETYPE_GIF or $this->imageType == IMAGETYPE_PNG) { - imagecolortransparent($process, imagecolorallocatealpha($process, 0, 0, 0, 127) ?: null); + $alpha = imagecolorallocatealpha($process, 0, 0, 0, 127); + if ($alpha === false) { + $alpha = null; + } + imagecolortransparent($process, $alpha); imagealphablending($process, false); imagesavealpha($process, true); } $result = imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $targetWidth, $targetHeight, $width, $height); if ($result === false) { - $this->logger->debug('OC_Image->centerCrop, Error re-sampling process image ' . $width . 'x' . $height, ['app' => 'core']); + $this->logger->debug('Image->centerCrop, Error re-sampling process image ' . $width . 'x' . $height, ['app' => 'core']); return false; } imagedestroy($this->resource); @@ -985,7 +1019,11 @@ class OC_Image implements \OCP\IImage { // preserve transparency if ($this->imageType == IMAGETYPE_GIF or $this->imageType == IMAGETYPE_PNG) { - imagecolortransparent($process, imagecolorallocatealpha($process, 0, 0, 0, 127) ?: null); + $alpha = imagecolorallocatealpha($process, 0, 0, 0, 127); + if ($alpha === false) { + $alpha = null; + } + imagecolortransparent($process, $alpha); imagealphablending($process, false); imagesavealpha($process, true); } @@ -1046,11 +1084,19 @@ class OC_Image implements \OCP\IImage { } public function copy(): IImage { - $image = new OC_Image(null, $this->logger, $this->config); + $image = new self($this->logger, $this->appConfig, $this->config); + if (!$this->valid()) { + /* image is invalid, return an empty one */ + return $image; + } $image->resource = imagecreatetruecolor($this->width(), $this->height()); + if (!$image->valid()) { + /* image creation failed, cannot copy in it */ + return $image; + } imagecopy( - $image->resource(), - $this->resource(), + $image->resource, + $this->resource, 0, 0, 0, @@ -1063,7 +1109,7 @@ class OC_Image implements \OCP\IImage { } public function cropCopy(int $x, int $y, int $w, int $h): IImage { - $image = new OC_Image(null, $this->logger, $this->config); + $image = new self($this->logger, $this->appConfig, $this->config); $image->imageType = $this->imageType; $image->mimeType = $this->mimeType; $image->resource = $this->cropNew($x, $y, $w, $h); @@ -1072,7 +1118,7 @@ class OC_Image implements \OCP\IImage { } public function preciseResizeCopy(int $width, int $height): IImage { - $image = new OC_Image(null, $this->logger, $this->config); + $image = new self($this->logger, $this->appConfig, $this->config); $image->imageType = $this->imageType; $image->mimeType = $this->mimeType; $image->resource = $this->preciseResizeNew($width, $height); @@ -1081,7 +1127,7 @@ class OC_Image implements \OCP\IImage { } public function resizeCopy(int $maxSize): IImage { - $image = new OC_Image(null, $this->logger, $this->config); + $image = new self($this->logger, $this->appConfig, $this->config); $image->imageType = $this->imageType; $image->mimeType = $this->mimeType; $image->resource = $this->resizeNew($maxSize); diff --git a/lib/private/Installer.php b/lib/private/Installer.php index ad80b26d8bc..e0f7644304e 100644 --- a/lib/private/Installer.php +++ b/lib/private/Installer.php @@ -499,7 +499,7 @@ class Installer { while (false !== ($filename = readdir($dir))) { if ($filename[0] !== '.' and is_dir($app_dir['path']."/$filename")) { if (file_exists($app_dir['path']."/$filename/appinfo/info.xml")) { - if ($config->getAppValue($filename, "installed_version", null) === null) { + if ($config->getAppValue($filename, 'installed_version', null) === null) { $enabled = $appManager->isDefaultEnabled($filename); if (($enabled || in_array($filename, $appManager->getAlwaysEnabledApps())) && $config->getAppValue($filename, 'enabled') !== 'no') { diff --git a/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php index d38ccf497f4..6443c43d210 100644 --- a/lib/private/IntegrityCheck/Checker.php +++ b/lib/private/IntegrityCheck/Checker.php @@ -46,7 +46,7 @@ class Checker { private ?IConfig $config, private ?IAppConfig $appConfig, ICacheFactory $cacheFactory, - private ?IAppManager $appManager, + private IAppManager $appManager, private IMimeTypeDetector $mimeTypeDetector, ) { $this->cache = $cacheFactory->createDistributed(self::CACHE_KEY); @@ -536,7 +536,7 @@ class Checker { public function runInstanceVerification() { $this->cleanResults(); $this->verifyCoreSignature(); - $appIds = $this->appLocator->getAllApps(); + $appIds = $this->appManager->getAllAppsInAppsFolders(); foreach ($appIds as $appId) { // If an application is shipped a valid signature is required $isShipped = $this->appManager->isShipped($appId); diff --git a/lib/private/IntegrityCheck/Helpers/AppLocator.php b/lib/private/IntegrityCheck/Helpers/AppLocator.php index 3da5cc13227..148a3aeda76 100644 --- a/lib/private/IntegrityCheck/Helpers/AppLocator.php +++ b/lib/private/IntegrityCheck/Helpers/AppLocator.php @@ -30,13 +30,4 @@ class AppLocator { } return $path; } - - /** - * Providers \OC_App::getAllApps() - * - * @return array - */ - public function getAllApps(): array { - return \OC_App::getAllApps(); - } } diff --git a/lib/private/L10N/Factory.php b/lib/private/L10N/Factory.php index 6b6dc5d3b40..fc76a15b07b 100644 --- a/lib/private/L10N/Factory.php +++ b/lib/private/L10N/Factory.php @@ -81,7 +81,7 @@ class Factory implements IFactory { */ public function get($app, $lang = null, $locale = null) { return new LazyL10N(function () use ($app, $lang, $locale) { - $app = \OC_App::cleanAppId($app); + $app = $this->appManager->cleanAppId($app); if ($lang !== null) { $lang = str_replace(['\0', '/', '\\', '..'], '', $lang); } diff --git a/lib/private/L10N/L10N.php b/lib/private/L10N/L10N.php index 39d778f80d6..50db373a65d 100644 --- a/lib/private/L10N/L10N.php +++ b/lib/private/L10N/L10N.php @@ -83,7 +83,7 @@ class L10N implements IL10N { $parameters = [$parameters]; } - return (string) new L10NString($this, $text, $parameters); + return (string)new L10NString($this, $text, $parameters); } /** @@ -104,14 +104,14 @@ class L10N implements IL10N { public function n(string $text_singular, string $text_plural, int $count, array $parameters = []): string { $identifier = "_{$text_singular}_::_{$text_plural}_"; if (isset($this->translations[$identifier])) { - return (string) new L10NString($this, $identifier, $parameters, $count); + return (string)new L10NString($this, $identifier, $parameters, $count); } if ($count === 1) { - return (string) new L10NString($this, $text_singular, $parameters, $count); + return (string)new L10NString($this, $text_singular, $parameters, $count); } - return (string) new L10NString($this, $text_plural, $parameters, $count); + return (string)new L10NString($this, $text_plural, $parameters, $count); } /** @@ -146,10 +146,10 @@ class L10N implements IL10N { } if ($type === 'firstday') { - return (int) Calendar::getFirstWeekday($this->locale); + return (int)Calendar::getFirstWeekday($this->locale); } if ($type === 'jsdate') { - return (string) Calendar::getDateFormat('short', $this->locale); + return (string)Calendar::getDateFormat('short', $this->locale); } $value = new \DateTime(); @@ -167,13 +167,13 @@ class L10N implements IL10N { $width = $options['width']; switch ($type) { case 'date': - return (string) Calendar::formatDate($value, $width, $this->locale); + return (string)Calendar::formatDate($value, $width, $this->locale); case 'datetime': - return (string) Calendar::formatDatetime($value, $width, $this->locale); + return (string)Calendar::formatDatetime($value, $width, $this->locale); case 'time': - return (string) Calendar::formatTime($value, $width, $this->locale); + return (string)Calendar::formatTime($value, $width, $this->locale); case 'weekdayName': - return (string) Calendar::getWeekdayName($value, $width, $this->locale); + return (string)Calendar::getWeekdayName($value, $width, $this->locale); default: return false; } diff --git a/lib/private/LDAP/NullLDAPProviderFactory.php b/lib/private/LDAP/NullLDAPProviderFactory.php index 55561b5692e..60588e4d15b 100644 --- a/lib/private/LDAP/NullLDAPProviderFactory.php +++ b/lib/private/LDAP/NullLDAPProviderFactory.php @@ -16,7 +16,7 @@ class NullLDAPProviderFactory implements ILDAPProviderFactory { } public function getLDAPProvider() { - throw new \Exception("No LDAP provider is available"); + throw new \Exception('No LDAP provider is available'); } public function isAvailable(): bool { diff --git a/lib/private/LargeFileHelper.php b/lib/private/LargeFileHelper.php index 4d96e79ead4..238fb0790b8 100755 --- a/lib/private/LargeFileHelper.php +++ b/lib/private/LargeFileHelper.php @@ -153,7 +153,7 @@ class LargeFileHelper { // For file sizes between 2 GiB and 4 GiB, filesize() will return a // negative int, as the PHP data type int is signed. Interpret the // returned int as an unsigned integer and put it into a float. - return (float) sprintf('%u', $result); + return (float)sprintf('%u', $result); } return $result; } diff --git a/lib/private/Lock/MemcacheLockingProvider.php b/lib/private/Lock/MemcacheLockingProvider.php index 883abb5da98..b249e08d717 100644 --- a/lib/private/Lock/MemcacheLockingProvider.php +++ b/lib/private/Lock/MemcacheLockingProvider.php @@ -62,8 +62,8 @@ class MemcacheLockingProvider extends AbstractLockingProvider { if ($type === self::LOCK_SHARED) { // save the old TTL to for `restoreTTL` $this->oldTTLs[$path] = [ - "ttl" => $this->getTTL($path), - "time" => $this->timeFactory->getTime() + 'ttl' => $this->getTTL($path), + 'time' => $this->timeFactory->getTime() ]; if (!$this->memcache->inc($path)) { throw new LockedException($path, null, $this->getExistingLockForException($path), $readablePath); diff --git a/lib/private/Log.php b/lib/private/Log.php index c7684a1aefd..4f6003cf53d 100644 --- a/lib/private/Log.php +++ b/lib/private/Log.php @@ -14,6 +14,7 @@ use OC\AppFramework\Bootstrap\Coordinator; use OC\Log\ExceptionSerializer; use OCP\EventDispatcher\IEventDispatcher; use OCP\ILogger; +use OCP\IRequest; use OCP\IUserSession; use OCP\Log\BeforeMessageLoggedEvent; use OCP\Log\IDataLogger; @@ -40,13 +41,9 @@ class Log implements ILogger, IDataLogger { public function __construct( private IWriter $logger, private SystemConfig $config, - private ?Normalizer $normalizer = null, + private Normalizer $normalizer = new Normalizer(), private ?IRegistry $crashReporters = null ) { - // FIXME: php8.1 allows "private Normalizer $normalizer = new Normalizer()," in initializer - if ($normalizer === null) { - $this->normalizer = new Normalizer(); - } } public function setEventDispatcher(IEventDispatcher $eventDispatcher): void { @@ -153,7 +150,7 @@ class Log implements ILogger, IDataLogger { * @param array $context */ public function log(int $level, string $message, array $context = []): void { - $minLevel = $this->getLogLevel($context); + $minLevel = $this->getLogLevel($context, $message); if ($level < $minLevel && (($this->crashReporters?->hasReporters() ?? false) === false) && (($this->eventDispatcher?->hasListeners(BeforeMessageLoggedEvent::class) ?? false) === false)) { @@ -194,9 +191,25 @@ class Log implements ILogger, IDataLogger { } } - public function getLogLevel($context): int { + public function getLogLevel(array $context, string $message): int { + /** + * @psalm-var array{ + * shared_secret?: string, + * users?: string[], + * apps?: string[], + * matches?: array<array-key, array{ + * shared_secret?: string, + * users?: string[], + * apps?: string[], + * message?: string, + * loglevel: 0|1|2|3|4, + * }> + * } $logCondition + */ $logCondition = $this->config->getValue('log.condition', []); + $userId = false; + /** * check for a special log condition - this enables an increased log on * a per request/user base @@ -206,21 +219,8 @@ class Log implements ILogger, IDataLogger { $this->logConditionSatisfied = false; if (!empty($logCondition)) { // check for secret token in the request - if (isset($logCondition['shared_secret'])) { - $request = \OC::$server->getRequest(); - - if ($request->getMethod() === 'PUT' && - !str_contains($request->getHeader('Content-Type'), 'application/x-www-form-urlencoded') && - !str_contains($request->getHeader('Content-Type'), 'application/json')) { - $logSecretRequest = ''; - } else { - $logSecretRequest = $request->getParam('log_secret', ''); - } - - // if token is found in the request change set the log condition to satisfied - if ($request && hash_equals($logCondition['shared_secret'], $logSecretRequest)) { - $this->logConditionSatisfied = true; - } + if (isset($logCondition['shared_secret']) && $this->checkLogSecret($logCondition['shared_secret'])) { + $this->logConditionSatisfied = true; } // check for user @@ -233,6 +233,8 @@ class Log implements ILogger, IDataLogger { } elseif (in_array($user->getUID(), $logCondition['users'], true)) { // if the user matches set the log condition to satisfied $this->logConditionSatisfied = true; + } else { + $userId = $user->getUID(); } } } @@ -243,6 +245,11 @@ class Log implements ILogger, IDataLogger { return ILogger::DEBUG; } + if ($userId === false && isset($logCondition['matches'])) { + $user = \OCP\Server::get(IUserSession::class)->getUser(); + $userId = $user === null ? false : $user->getUID(); + } + if (isset($context['app'])) { /** * check log condition based on the context of each log message @@ -253,16 +260,49 @@ class Log implements ILogger, IDataLogger { } } - $configLogLevel = $this->config->getValue('loglevel', ILogger::WARN); - if (is_numeric($configLogLevel)) { - return min((int)$configLogLevel, ILogger::FATAL); + if (!isset($logCondition['matches'])) { + $configLogLevel = $this->config->getValue('loglevel', ILogger::WARN); + if (is_numeric($configLogLevel)) { + return min((int)$configLogLevel, ILogger::FATAL); + } + + // Invalid configuration, warn the user and fall back to default level of WARN + error_log('Nextcloud configuration: "loglevel" is not a valid integer'); + return ILogger::WARN; + } + + foreach ($logCondition['matches'] as $option) { + if ( + (!isset($option['shared_secret']) || $this->checkLogSecret($option['shared_secret'])) + && (!isset($option['users']) || in_array($userId, $option['users'], true)) + && (!isset($option['apps']) || (isset($context['app']) && in_array($context['app'], $option['apps'], true))) + && (!isset($option['message']) || str_contains($message, $option['message'])) + ) { + if (!isset($option['apps']) && !isset($option['loglevel']) && !isset($option['message'])) { + /* Only user and/or secret are listed as conditions, we can cache the result for the rest of the request */ + $this->logConditionSatisfied = true; + return ILogger::DEBUG; + } + return $option['loglevel'] ?? ILogger::DEBUG; + } } - // Invalid configuration, warn the user and fall back to default level of WARN - error_log('Nextcloud configuration: "loglevel" is not a valid integer'); return ILogger::WARN; } + protected function checkLogSecret(string $conditionSecret): bool { + $request = \OCP\Server::get(IRequest::class); + + if ($request->getMethod() === 'PUT' && + !str_contains($request->getHeader('Content-Type'), 'application/x-www-form-urlencoded') && + !str_contains($request->getHeader('Content-Type'), 'application/json')) { + return hash_equals($conditionSecret, ''); + } + + // if token is found in the request change set the log condition to satisfied + return hash_equals($conditionSecret, $request->getParam('log_secret', '')); + } + /** * Logs an exception very detailed * @@ -275,7 +315,7 @@ class Log implements ILogger, IDataLogger { $app = $context['app'] ?? 'no app in context'; $level = $context['level'] ?? ILogger::ERROR; - $minLevel = $this->getLogLevel($context); + $minLevel = $this->getLogLevel($context, $context['message'] ?? $exception->getMessage()); if ($level < $minLevel && (($this->crashReporters?->hasReporters() ?? false) === false) && (($this->eventDispatcher?->hasListeners(BeforeMessageLoggedEvent::class) ?? false) === false)) { @@ -286,7 +326,7 @@ class Log implements ILogger, IDataLogger { try { $serializer = $this->getSerializer(); } catch (Throwable $e) { - $this->error("Failed to load ExceptionSerializer serializer while trying to log " . $exception->getMessage()); + $this->error('Failed to load ExceptionSerializer serializer while trying to log ' . $exception->getMessage()); return; } $data = $context; @@ -320,7 +360,7 @@ class Log implements ILogger, IDataLogger { $app = $context['app'] ?? 'no app in context'; $level = $context['level'] ?? ILogger::ERROR; - $minLevel = $this->getLogLevel($context); + $minLevel = $this->getLogLevel($context, $message); array_walk($context, [$this->normalizer, 'format']); diff --git a/lib/private/Log/File.php b/lib/private/Log/File.php index 28cc856b980..bc14de4ffdf 100644 --- a/lib/private/Log/File.php +++ b/lib/private/Log/File.php @@ -73,7 +73,7 @@ class File extends LogDetails implements IWriter, IFileBased { * get entries from the log in reverse chronological order */ public function getEntries(int $limit = 50, int $offset = 0): array { - $minLevel = $this->config->getValue("loglevel", ILogger::WARN); + $minLevel = $this->config->getValue('loglevel', ILogger::WARN); $entries = []; $handle = @fopen($this->logFile, 'rb'); if ($handle) { diff --git a/lib/private/Log/LogDetails.php b/lib/private/Log/LogDetails.php index bf2c1a22c49..bd18eb983db 100644 --- a/lib/private/Log/LogDetails.php +++ b/lib/private/Log/LogDetails.php @@ -22,7 +22,7 @@ abstract class LogDetails { } catch (\Exception $e) { $timezone = new \DateTimeZone('UTC'); } - $time = \DateTime::createFromFormat("U.u", number_format(microtime(true), 4, ".", "")); + $time = \DateTime::createFromFormat('U.u', number_format(microtime(true), 4, '.', '')); if ($time === false) { $time = new \DateTime('now', $timezone); } else { @@ -37,7 +37,7 @@ abstract class LogDetails { $url = ($request->getRequestUri() !== '') ? $request->getRequestUri() : '--'; $method = is_string($request->getMethod()) ? $request->getMethod() : '--'; if ($this->config->getValue('installed', false)) { - $user = \OC_User::getUser() ? \OC_User::getUser() : '--'; + $user = \OC_User::getUser() ?? '--'; } else { $user = '--'; } diff --git a/lib/private/Log/PsrLoggerAdapter.php b/lib/private/Log/PsrLoggerAdapter.php index 16e609eefdb..79e9d4d9621 100644 --- a/lib/private/Log/PsrLoggerAdapter.php +++ b/lib/private/Log/PsrLoggerAdapter.php @@ -14,6 +14,7 @@ use OCP\ILogger; use OCP\Log\IDataLogger; use Psr\Log\InvalidArgumentException; use Psr\Log\LoggerInterface; +use Psr\Log\LogLevel; use Throwable; use function array_key_exists; use function array_merge; @@ -24,6 +25,20 @@ final class PsrLoggerAdapter implements LoggerInterface, IDataLogger { ) { } + public static function logLevelToInt(string $level): int { + return match ($level) { + LogLevel::ALERT => ILogger::ERROR, + LogLevel::CRITICAL => ILogger::ERROR, + LogLevel::DEBUG => ILogger::DEBUG, + LogLevel::EMERGENCY => ILogger::FATAL, + LogLevel::ERROR => ILogger::ERROR, + LogLevel::INFO => ILogger::INFO, + LogLevel::NOTICE => ILogger::INFO, + LogLevel::WARNING => ILogger::WARN, + default => throw new InvalidArgumentException('Unsupported custom log level'), + }; + } + public function setEventDispatcher(IEventDispatcher $eventDispatcher): void { $this->logger->setEventDispatcher($eventDispatcher); } @@ -35,21 +50,11 @@ final class PsrLoggerAdapter implements LoggerInterface, IDataLogger { /** * System is unusable. * - * @param $message + * @param $message * @param mixed[] $context */ public function emergency($message, array $context = []): void { - if ($this->containsThrowable($context)) { - $this->logger->logException($context['exception'], array_merge( - [ - 'message' => (string)$message, - 'level' => ILogger::FATAL, - ], - $context - )); - } else { - $this->logger->emergency((string)$message, $context); - } + $this->log(LogLevel::EMERGENCY, (string)$message, $context); } /** @@ -58,21 +63,11 @@ final class PsrLoggerAdapter implements LoggerInterface, IDataLogger { * Example: Entire website down, database unavailable, etc. This should * trigger the SMS alerts and wake you up. * - * @param $message + * @param $message * @param mixed[] $context */ public function alert($message, array $context = []): void { - if ($this->containsThrowable($context)) { - $this->logger->logException($context['exception'], array_merge( - [ - 'message' => (string)$message, - 'level' => ILogger::ERROR, - ], - $context - )); - } else { - $this->logger->alert((string)$message, $context); - } + $this->log(LogLevel::ALERT, (string)$message, $context); } /** @@ -80,42 +75,22 @@ final class PsrLoggerAdapter implements LoggerInterface, IDataLogger { * * Example: Application component unavailable, unexpected exception. * - * @param $message + * @param $message * @param mixed[] $context */ public function critical($message, array $context = []): void { - if ($this->containsThrowable($context)) { - $this->logger->logException($context['exception'], array_merge( - [ - 'message' => (string)$message, - 'level' => ILogger::ERROR, - ], - $context - )); - } else { - $this->logger->critical((string)$message, $context); - } + $this->log(LogLevel::CRITICAL, (string)$message, $context); } /** * Runtime errors that do not require immediate action but should typically * be logged and monitored. * - * @param $message + * @param $message * @param mixed[] $context */ public function error($message, array $context = []): void { - if ($this->containsThrowable($context)) { - $this->logger->logException($context['exception'], array_merge( - [ - 'message' => (string)$message, - 'level' => ILogger::ERROR, - ], - $context - )); - } else { - $this->logger->error((string)$message, $context); - } + $this->log(LogLevel::ERROR, (string)$message, $context); } /** @@ -124,41 +99,21 @@ final class PsrLoggerAdapter implements LoggerInterface, IDataLogger { * Example: Use of deprecated APIs, poor use of an API, undesirable things * that are not necessarily wrong. * - * @param $message + * @param $message * @param mixed[] $context */ public function warning($message, array $context = []): void { - if ($this->containsThrowable($context)) { - $this->logger->logException($context['exception'], array_merge( - [ - 'message' => (string)$message, - 'level' => ILogger::WARN, - ], - $context - )); - } else { - $this->logger->warning((string)$message, $context); - } + $this->log(LogLevel::WARNING, (string)$message, $context); } /** * Normal but significant events. * - * @param $message + * @param $message * @param mixed[] $context */ public function notice($message, array $context = []): void { - if ($this->containsThrowable($context)) { - $this->logger->logException($context['exception'], array_merge( - [ - 'message' => (string)$message, - 'level' => ILogger::INFO, - ], - $context - )); - } else { - $this->logger->notice((string)$message, $context); - } + $this->log(LogLevel::NOTICE, (string)$message, $context); } /** @@ -166,55 +121,41 @@ final class PsrLoggerAdapter implements LoggerInterface, IDataLogger { * * Example: User logs in, SQL logs. * - * @param $message + * @param $message * @param mixed[] $context */ public function info($message, array $context = []): void { - if ($this->containsThrowable($context)) { - $this->logger->logException($context['exception'], array_merge( - [ - 'message' => (string)$message, - 'level' => ILogger::INFO, - ], - $context - )); - } else { - $this->logger->info((string)$message, $context); - } + $this->log(LogLevel::INFO, (string)$message, $context); } /** * Detailed debug information. * - * @param $message + * @param $message * @param mixed[] $context */ public function debug($message, array $context = []): void { - if ($this->containsThrowable($context)) { - $this->logger->logException($context['exception'], array_merge( - [ - 'message' => (string)$message, - 'level' => ILogger::DEBUG, - ], - $context - )); - } else { - $this->logger->debug((string)$message, $context); - } + $this->log(LogLevel::DEBUG, (string)$message, $context); } /** * Logs with an arbitrary level. * * @param mixed $level - * @param $message + * @param $message * @param mixed[] $context * * @throws InvalidArgumentException */ public function log($level, $message, array $context = []): void { + if (is_string($level)) { + $level = self::logLevelToInt($level); + } + if (isset($context['level']) && is_string($context['level'])) { + $context['level'] = self::logLevelToInt($context['level']); + } if (!is_int($level) || $level < ILogger::DEBUG || $level > ILogger::FATAL) { - throw new InvalidArgumentException('Nextcloud allows only integer log levels'); + throw new InvalidArgumentException('Unsupported custom log level'); } if ($this->containsThrowable($context)) { $this->logger->logException($context['exception'], array_merge( diff --git a/lib/private/Mail/EMailTemplate.php b/lib/private/Mail/EMailTemplate.php index 80740e14aca..2cb222fd137 100644 --- a/lib/private/Mail/EMailTemplate.php +++ b/lib/private/Mail/EMailTemplate.php @@ -76,7 +76,7 @@ EOF; <tbody> <tr style="padding:0;text-align:left;vertical-align:top"> <center data-parsed="" style="background-color:%s;min-width:175px;max-height:175px; padding:35px 0px;border-radius:200px"> - <img class="logo float-center" src="%s" alt="%s" align="center" style="-ms-interpolation-mode:bicubic;clear:both;display:block;float:none;margin:0 auto;outline:0;text-align:center;text-decoration:none;max-height:105px;max-width:105px;width:auto;height:auto"> + <img class="logo float-center" src="%s" alt="%s" align="center" style="-ms-interpolation-mode:bicubic;clear:both;display:block;float:none;margin:0 auto;outline:0;text-align:center;text-decoration:none;max-height:105px;max-width:105px;width:auto;height:auto"%s> </center> </tr> </tbody> @@ -190,26 +190,26 @@ EOF; <tr style="padding:0;text-align:left;vertical-align:top"> <th style="Margin:0;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left"> <center data-parsed="" style="min-width:490px;width:100%%"> - <table class="button btn default primary float-center" style="Margin:0 0 30px 0;border-collapse:collapse;border-spacing:0;display:inline-block;float:none;margin:0 0 30px 0;margin-right:15px;max-height:60px;max-width:300px;padding:0;text-align:center;vertical-align:top;width:auto;background:%1\$s;background-color:%1\$s;color:#fefefe;"> + <table class="button btn default primary float-center" style="Margin:0 0 30px 0;border-collapse:collapse;border-spacing:0;display:inline-block;float:none;margin:0 0 30px 0;margin-right:15px;border-radius:8px;max-width:300px;padding:0;text-align:center;vertical-align:top;width:auto;background:%1\$s;background-color:%1\$s;color:#fefefe;"> <tr style="padding:0;text-align:left;vertical-align:top"> - <td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word"> + <td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:normal;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word"> <table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%%"> <tr style="padding:0;text-align:left;vertical-align:top"> - <td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border:0 solid %2\$s;border-collapse:collapse!important;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word"> - <a href="%3\$s" style="Margin:0;border:0 solid %4\$s;border-radius:2px;color:%5\$s;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:regular;line-height:1.3;margin:0;padding:10px 25px 10px 25px;text-align:left;outline:1px solid %6\$s;text-decoration:none">%7\$s</a> + <td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border:0 solid %2\$s;border-collapse:collapse!important;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:normal;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word"> + <a href="%3\$s" style="Margin:0;border:0 solid %4\$s;color:%5\$s;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:regular;line-height:normal;margin:0;padding:8px;text-align:left;outline:1px solid %6\$s;text-decoration:none">%7\$s</a> </td> </tr> </table> </td> </tr> </table> - <table class="button btn default secondary float-center" style="Margin:0 0 30px 0;border-collapse:collapse;border-spacing:0;display:inline-block;float:none;margin:0 0 30px 0;max-height:40px;max-width:300px;padding:0;text-align:center;vertical-align:top;width:auto"> + <table class="button btn default secondary float-center" style="Margin:0 0 30px 0;border-collapse:collapse;border-spacing:0;display:inline-block;float:none;background-color: #ccc;margin:0 0 30px 0;max-height:40px;max-width:300px;padding:1px;border-radius:8px;text-align:center;vertical-align:top;width:auto"> <tr style="padding:0;text-align:left;vertical-align:top"> - <td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word"> + <td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:normal;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word"> <table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%%"> <tr style="padding:0;text-align:left;vertical-align:top"> - <td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;background:#777;border:0 solid #777;border-collapse:collapse!important;color:#fefefe;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word"> - <a href="%8\$s" style="Margin:0;background-color:#fff;border:0 solid #777;border-radius:2px;color:#6C6C6C!important;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:regular;line-height:1.3;margin:0;outline:1px solid #CBCBCB;padding:10px 25px 10px 25px;text-align:left;text-decoration:none">%9\$s</a> + <td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border:0 solid #777;border-collapse:collapse!important;color:#fefefe;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:normal;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word"> + <a href="%8\$s" style="Margin:0;background-color:#fff;border:0 solid #777;color:#6C6C6C!important;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:regular;line-height:normal;margin:0;border-radius: 7px;padding:8px;text-align:left;text-decoration:none">%9\$s</a> </td> </tr> </table> @@ -243,13 +243,13 @@ EOF; <tr style="padding:0;text-align:left;vertical-align:top"> <th style="Margin:0;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left"> <center data-parsed="" style="min-width:490px;width:100%%"> - <table class="button btn default primary float-center" style="Margin:0;border-collapse:collapse;border-spacing:0;display:inline-block;float:none;margin:0;max-height:60px;padding:0;text-align:center;vertical-align:top;width:auto;background:%1\$s;color:#fefefe;background-color:%1\$s;"> + <table class="button btn default primary float-center" style="Margin:0;border-collapse:collapse;border-spacing:0;display:inline-block;float:none;margin:0;border-radius:8px;padding:0;text-align:center;vertical-align:top;width:auto;background:%1\$s;color:#fefefe;background-color:%1\$s;"> <tr style="padding:0;text-align:left;vertical-align:top"> - <td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word"> + <td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:normal;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word"> <table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%%"> <tr style="padding:0;text-align:left;vertical-align:top"> - <td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border:0 solid %2\$s;border-collapse:collapse!important;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word"> - <a href="%3\$s" style="Margin:0;border:0 solid %4\$s;border-radius:2px;color:%5\$s;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:regular;line-height:1.3;margin:0;padding:10px 25px 10px 25px;text-align:left;outline:1px solid %5\$s;text-decoration:none">%7\$s</a> + <td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border:0 solid %2\$s;border-collapse:collapse!important;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:normal;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word"> + <a href="%3\$s" style="Margin:0;border:0 solid %4\$s;color:%5\$s;display:inline-block;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:regular;line-height:normal;margin:0;padding:8px;text-align:left;outline:1px solid %5\$s;text-decoration:none">%7\$s</a> </td> </tr> </table> @@ -308,6 +308,8 @@ EOF; protected Defaults $themingDefaults, protected IURLGenerator $urlGenerator, protected IFactory $l10nFactory, + protected ?int $logoWidth, + protected ?int $logoHeight, protected string $emailId, protected array $data, ) { @@ -330,15 +332,21 @@ EOF; } $this->headerAdded = true; + $logoSizeDimensions = ''; + if ($this->logoWidth && $this->logoHeight) { + // Provide a logo size when we have the dimensions so that it displays nicely in Outlook + $logoSizeDimensions = ' width="' . $this->logoWidth . '" height="' . $this->logoHeight . '"'; + } + $logoUrl = $this->urlGenerator->getAbsoluteURL($this->themingDefaults->getLogo(false)); - $this->htmlBody .= vsprintf($this->header, [$this->themingDefaults->getDefaultColorPrimary(), $logoUrl, $this->themingDefaults->getName()]); + $this->htmlBody .= vsprintf($this->header, [$this->themingDefaults->getDefaultColorPrimary(), $logoUrl, $this->themingDefaults->getName(), $logoSizeDimensions]); } /** * Adds a heading to the email * * @param string|bool $plainTitle Title that is used in the plain text email - * if empty the $title is used, if false none will be used + * if empty the $title is used, if false none will be used */ public function addHeading(string $title, $plainTitle = ''): void { if ($this->footerAdded) { @@ -371,7 +379,7 @@ EOF; * * @param string $text Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email * @param string|bool $plainText Text that is used in the plain text email - * if empty the $text is used, if false none will be used + * if empty the $text is used, if false none will be used */ public function addBodyText(string $text, $plainText = ''): void { if ($this->footerAdded) { @@ -398,9 +406,9 @@ EOF; * @param string $metaInfo Note: When $plainMetaInfo falls back to this, HTML is automatically escaped in the HTML email * @param string $icon Absolute path, must be 16*16 pixels * @param string|bool $plainText Text that is used in the plain text email - * if empty or true the $text is used, if false none will be used + * if empty or true the $text is used, if false none will be used * @param string|bool $plainMetaInfo Meta info that is used in the plain text email - * if empty or true the $metaInfo is used, if false none will be used + * if empty or true the $metaInfo is used, if false none will be used * @param integer $plainIndent plainIndent If > 0, Indent plainText by this amount. * @since 12.0.0 */ @@ -417,7 +425,7 @@ EOF; if ($plainText === '' || $plainText === true) { $plainText = $text; $text = htmlspecialchars($text); - $text = str_replace("\n", "<br/>", $text); // convert newlines to HTML breaks + $text = str_replace("\n", '<br/>', $text); // convert newlines to HTML breaks } if ($plainMetaInfo === '' || $plainMetaInfo === true) { $plainMetaInfo = $metaInfo; @@ -528,7 +536,7 @@ EOF; * @param string $text Text of button; Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email * @param string $url URL of button * @param string|false $plainText Text of button in plain text version - * if empty the $text is used, if false none will be used + * if empty the $text is used, if false none will be used * * @since 12.0.0 */ diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php index e866cbfdbbc..0a818b847aa 100644 --- a/lib/private/Mail/Mailer.php +++ b/lib/private/Mail/Mailer.php @@ -52,6 +52,12 @@ use Symfony\Component\Mime\Exception\RfcComplianceException; * @package OC\Mail */ class Mailer implements IMailer { + // Do not move this block or change it's content without contacting the release crew + public const DEFAULT_DIMENSIONS = '252x120'; + // Do not move this block or change it's content without contacting the release crew + + public const MAX_LOGO_SIZE = 105; + private ?MailerInterface $instance = null; public function __construct( @@ -97,6 +103,31 @@ class Mailer implements IMailer { * @since 12.0.0 */ public function createEMailTemplate(string $emailId, array $data = []): IEMailTemplate { + $logoDimensions = $this->config->getAppValue('theming', 'logoDimensions', self::DEFAULT_DIMENSIONS); + if (str_contains($logoDimensions, 'x')) { + [$width, $height] = explode('x', $logoDimensions); + $width = (int)$width; + $height = (int)$height; + + if ($width > self::MAX_LOGO_SIZE || $height > self::MAX_LOGO_SIZE) { + if ($width === $height) { + $logoWidth = self::MAX_LOGO_SIZE; + $logoHeight = self::MAX_LOGO_SIZE; + } elseif ($width > $height) { + $logoWidth = self::MAX_LOGO_SIZE; + $logoHeight = (int)(($height / $width) * self::MAX_LOGO_SIZE); + } else { + $logoWidth = (int)(($width / $height) * self::MAX_LOGO_SIZE); + $logoHeight = self::MAX_LOGO_SIZE; + } + } else { + $logoWidth = $width; + $logoHeight = $height; + } + } else { + $logoWidth = $logoHeight = null; + } + $class = $this->config->getSystemValueString('mail_template_class', ''); if ($class !== '' && class_exists($class) && is_a($class, EMailTemplate::class, true)) { @@ -104,6 +135,8 @@ class Mailer implements IMailer { $this->defaults, $this->urlGenerator, $this->l10nFactory, + $logoWidth, + $logoHeight, $emailId, $data ); @@ -113,6 +146,8 @@ class Mailer implements IMailer { $this->defaults, $this->urlGenerator, $this->l10nFactory, + $logoWidth, + $logoHeight, $emailId, $data ); diff --git a/lib/private/Mail/Provider/Manager.php b/lib/private/Mail/Provider/Manager.php new file mode 100644 index 00000000000..14ffeac287b --- /dev/null +++ b/lib/private/Mail/Provider/Manager.php @@ -0,0 +1,255 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OC\Mail\Provider; + +use OC\AppFramework\Bootstrap\Coordinator; +use OCP\Mail\Provider\IManager; +use OCP\Mail\Provider\IProvider; +use OCP\Mail\Provider\IService; +use Psr\Container\ContainerInterface; +use Psr\Log\LoggerInterface; +use Throwable; + +class Manager implements IManager { + + protected ?array $providersCollection = null; + + public function __construct( + private Coordinator $coordinator, + private ContainerInterface $container, + private LoggerInterface $logger, + ) { + } + + /** + * Determine if any mail providers are registered + * + * @since 30.0.0 + * + * @return bool + */ + public function has(): bool { + + // return true if collection has any providers + return !empty($this->providers()); + + } + + /** + * Retrieve a count of how many mail providers are registered + * + * @since 30.0.0 + * + * @return int + */ + public function count(): int { + + // return count of providers in collection + return count($this->providers()); + + } + + /** + * Retrieve which mail providers are registered + * + * @since 30.0.0 + * + * @return array<string,string> collection of provider id and label ['jmap' => 'JMap Connector'] + */ + public function types(): array { + + // construct types collection + $types = []; + // extract id and name from providers collection + foreach ($this->providers() as $entry) { + $types[$entry->id()] = $entry->label(); + } + // return types collection + return $types; + + } + + /** + * Retrieve all registered mail providers + * + * @since 30.0.0 + * + * @return array<string,IProvider> collection of provider id and object ['jmap' => IProviderObject] + */ + public function providers(): array { + + // evaluate if we already have a cached collection of providers and return the collection if we do + if (is_array($this->providersCollection)) { + return $this->providersCollection; + } + // retrieve server registration context + $context = $this->coordinator->getRegistrationContext(); + // evaluate if registration context was returned + if ($context === null) { + return []; + } + // initilize cached collection + $this->providersCollection = []; + // iterate through all registered mail providers + foreach ($context->getMailProviders() as $entry) { + try { + /** @var IProvider $provider */ + // object provider + $provider = $this->container->get($entry->getService()); + // add provider to cache collection + $this->providersCollection[$provider->id()] = $provider; + } catch (Throwable $e) { + $this->logger->error( + 'Could not load mail provider ' . $entry->getService() . ': ' . $e->getMessage(), + ['exception' => $e] + ); + } + } + // return mail provider collection + return $this->providersCollection; + + } + + /** + * Retrieve a provider with a specific id + * + * @since 30.0.0 + * + * @param string $providerId provider id + * + * @return IProvider|null + */ + public function findProviderById(string $providerId): IProvider|null { + + // evaluate if we already have a cached collection of providers + if (!is_array($this->providersCollection)) { + $this->providers(); + } + + if (isset($this->providersCollection[$providerId])) { + return $this->providersCollection[$providerId]; + } + // return null if provider was not found + return null; + + } + + /** + * Retrieve all services for all registered mail providers + * + * @since 30.0.0 + * + * @param string $userId user id + * + * @return array<string,array<string,IService>> collection of provider id, service id and object ['jmap' => ['Service1' => IServiceObject]] + */ + public function services(string $userId): array { + + // initilize collection + $services = []; + // retrieve and iterate through mail providers + foreach ($this->providers() as $entry) { + // retrieve collection of services + $mailServices = $entry->listServices($userId); + // evaluate if mail services collection is not empty and add results to services collection + if (!empty($mailServices)) { + $services[$entry->id()] = $mailServices; + } + } + // return collection + return $services; + + } + + /** + * Retrieve a service with a specific id + * + * @since 30.0.0 + * + * @param string $userId user id + * @param string $serviceId service id + * @param string $providerId provider id + * + * @return IService|null returns service object or null if none found + */ + public function findServiceById(string $userId, string $serviceId, ?string $providerId = null): IService|null { + + // evaluate if provider id was specified + if ($providerId !== null) { + // find provider + $provider = $this->findProviderById($providerId); + // evaluate if provider was found + if ($provider instanceof IProvider) { + // find service with specific id + $service = $provider->findServiceById($userId, $serviceId); + // evaluate if mail service was found + if ($service instanceof IService) { + return $service; + } + } + } else { + // retrieve and iterate through mail providers + foreach ($this->providers() as $provider) { + // find service with specific id + $service = $provider->findServiceById($userId, $serviceId); + // evaluate if mail service was found + if ($service instanceof IService) { + return $service; + } + } + } + + // return null if no match was found + return null; + + } + + /** + * Retrieve a service for a specific mail address + * returns first service with specific primary address + * + * @since 30.0.0 + * + * @param string $userId user id + * @param string $address mail address (e.g. test@example.com) + * @param string $providerId provider id + * + * @return IService|null returns service object or null if none found + */ + public function findServiceByAddress(string $userId, string $address, ?string $providerId = null): IService|null { + + // evaluate if provider id was specified + if ($providerId !== null) { + // find provider + $provider = $this->findProviderById($providerId); + // evaluate if provider was found + if ($provider instanceof IProvider) { + // find service with specific mail address + $service = $provider->findServiceByAddress($userId, $address); + // evaluate if mail service was found + if ($service instanceof IService) { + return $service; + } + } + } else { + // retrieve and iterate through mail providers + foreach ($this->providers() as $provider) { + // find service with specific mail address + $service = $provider->findServiceByAddress($userId, $address); + // evaluate if mail service was found + if ($service instanceof IService) { + return $service; + } + } + } + // return null if no match was found + return null; + + } +} diff --git a/lib/private/Memcache/APCu.php b/lib/private/Memcache/APCu.php index 7f6a73354ee..024462d227b 100644 --- a/lib/private/Memcache/APCu.php +++ b/lib/private/Memcache/APCu.php @@ -25,6 +25,9 @@ class APCu extends Cache implements IMemcache { } public function set($key, $value, $ttl = 0) { + if ($ttl === 0) { + $ttl = self::DEFAULT_TTL; + } return apcu_store($this->getPrefix() . $key, $value, $ttl); } @@ -56,6 +59,9 @@ class APCu extends Cache implements IMemcache { * @return bool */ public function add($key, $value, $ttl = 0) { + if ($ttl === 0) { + $ttl = self::DEFAULT_TTL; + } return apcu_add($this->getPrefix() . $key, $value, $ttl); } @@ -67,22 +73,8 @@ class APCu extends Cache implements IMemcache { * @return int | bool */ public function inc($key, $step = 1) { - $this->add($key, 0); - /** - * TODO - hack around a PHP 7 specific issue in APCu - * - * on PHP 7 the apcu_inc method on a non-existing object will increment - * "0" and result in "1" as value - therefore we check for existence - * first - * - * on PHP 5.6 this is not the case - * - * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221 - * for details - */ - return apcu_exists($this->getPrefix() . $key) - ? apcu_inc($this->getPrefix() . $key, $step) - : false; + $success = null; + return apcu_inc($this->getPrefix() . $key, $step, $success, self::DEFAULT_TTL); } /** @@ -93,18 +85,6 @@ class APCu extends Cache implements IMemcache { * @return int | bool */ public function dec($key, $step = 1) { - /** - * TODO - hack around a PHP 7 specific issue in APCu - * - * on PHP 7 the apcu_dec method on a non-existing object will decrement - * "0" and result in "-1" as value - therefore we check for existence - * first - * - * on PHP 5.6 this is not the case - * - * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221 - * for details - */ return apcu_exists($this->getPrefix() . $key) ? apcu_dec($this->getPrefix() . $key, $step) : false; diff --git a/lib/private/Memcache/CADTrait.php b/lib/private/Memcache/CADTrait.php index bb010e238dc..3bf94246338 100644 --- a/lib/private/Memcache/CADTrait.php +++ b/lib/private/Memcache/CADTrait.php @@ -35,4 +35,21 @@ trait CADTrait { return false; } } + + public function ncad(string $key, mixed $old): bool { + //no native cad, emulate with locking + if ($this->add($key . '_lock', true)) { + $value = $this->get($key); + if ($value !== null && $value !== $old) { + $this->remove($key); + $this->remove($key . '_lock'); + return true; + } else { + $this->remove($key . '_lock'); + return false; + } + } else { + return false; + } + } } diff --git a/lib/private/Memcache/Factory.php b/lib/private/Memcache/Factory.php index c0f4f787200..370130912d6 100644 --- a/lib/private/Memcache/Factory.php +++ b/lib/private/Memcache/Factory.php @@ -6,6 +6,7 @@ */ namespace OC\Memcache; +use Closure; use OCP\Cache\CappedMemoryCache; use OCP\ICache; use OCP\ICacheFactory; @@ -16,7 +17,7 @@ use Psr\Log\LoggerInterface; class Factory implements ICacheFactory { public const NULL_CACHE = NullCache::class; - private string $globalPrefix; + private ?string $globalPrefix = null; private LoggerInterface $logger; @@ -40,17 +41,23 @@ class Factory implements ICacheFactory { private IProfiler $profiler; /** - * @param string $globalPrefix + * @param Closure $globalPrefixClosure * @param LoggerInterface $logger * @param ?class-string<ICache> $localCacheClass * @param ?class-string<ICache> $distributedCacheClass * @param ?class-string<IMemcache> $lockingCacheClass * @param string $logFile */ - public function __construct(string $globalPrefix, LoggerInterface $logger, IProfiler $profiler, - ?string $localCacheClass = null, ?string $distributedCacheClass = null, ?string $lockingCacheClass = null, string $logFile = '') { + public function __construct( + private Closure $globalPrefixClosure, + LoggerInterface $logger, + IProfiler $profiler, + ?string $localCacheClass = null, + ?string $distributedCacheClass = null, + ?string $lockingCacheClass = null, + string $logFile = '' + ) { $this->logFile = $logFile; - $this->globalPrefix = $globalPrefix; if (!$localCacheClass) { $localCacheClass = self::NULL_CACHE; @@ -59,6 +66,7 @@ class Factory implements ICacheFactory { if (!$distributedCacheClass) { $distributedCacheClass = $localCacheClass; } + $distributedCacheClass = ltrim($distributedCacheClass, '\\'); $missingCacheMessage = 'Memcache {class} not available for {use} cache'; @@ -85,6 +93,13 @@ class Factory implements ICacheFactory { $this->profiler = $profiler; } + private function getGlobalPrefix(): ?string { + if (is_null($this->globalPrefix)) { + $this->globalPrefix = ($this->globalPrefixClosure)(); + } + return $this->globalPrefix; + } + /** * create a cache instance for storing locks * @@ -92,8 +107,13 @@ class Factory implements ICacheFactory { * @return IMemcache */ public function createLocking(string $prefix = ''): IMemcache { + $globalPrefix = $this->getGlobalPrefix(); + if (is_null($globalPrefix)) { + return new ArrayCache($prefix); + } + assert($this->lockingCacheClass !== null); - $cache = new $this->lockingCacheClass($this->globalPrefix . '/' . $prefix); + $cache = new $this->lockingCacheClass($globalPrefix . '/' . $prefix); if ($this->lockingCacheClass === Redis::class && $this->profiler->isEnabled()) { // We only support the profiler with Redis $cache = new ProfilerWrapperCache($cache, 'Locking'); @@ -114,8 +134,13 @@ class Factory implements ICacheFactory { * @return ICache */ public function createDistributed(string $prefix = ''): ICache { + $globalPrefix = $this->getGlobalPrefix(); + if (is_null($globalPrefix)) { + return new ArrayCache($prefix); + } + assert($this->distributedCacheClass !== null); - $cache = new $this->distributedCacheClass($this->globalPrefix . '/' . $prefix); + $cache = new $this->distributedCacheClass($globalPrefix . '/' . $prefix); if ($this->distributedCacheClass === Redis::class && $this->profiler->isEnabled()) { // We only support the profiler with Redis $cache = new ProfilerWrapperCache($cache, 'Distributed'); @@ -136,8 +161,13 @@ class Factory implements ICacheFactory { * @return ICache */ public function createLocal(string $prefix = ''): ICache { + $globalPrefix = $this->getGlobalPrefix(); + if (is_null($globalPrefix)) { + return new ArrayCache($prefix); + } + assert($this->localCacheClass !== null); - $cache = new $this->localCacheClass($this->globalPrefix . '/' . $prefix); + $cache = new $this->localCacheClass($globalPrefix . '/' . $prefix); if ($this->localCacheClass === Redis::class && $this->profiler->isEnabled()) { // We only support the profiler with Redis $cache = new ProfilerWrapperCache($cache, 'Local'); diff --git a/lib/private/Memcache/LoggerWrapperCache.php b/lib/private/Memcache/LoggerWrapperCache.php index 11497e2a5d8..c2a06731910 100644 --- a/lib/private/Memcache/LoggerWrapperCache.php +++ b/lib/private/Memcache/LoggerWrapperCache.php @@ -150,6 +150,17 @@ class LoggerWrapperCache extends Cache implements IMemcacheTTL { } /** @inheritDoc */ + public function ncad(string $key, mixed $old): bool { + file_put_contents( + $this->logFile, + $this->getNameSpace() . '::ncad::' . $key . "\n", + FILE_APPEND + ); + + return $this->wrappedCache->cad($key, $old); + } + + /** @inheritDoc */ public function setTTL(string $key, int $ttl) { $this->wrappedCache->setTTL($key, $ttl); } diff --git a/lib/private/Memcache/NullCache.php b/lib/private/Memcache/NullCache.php index ab5c491913a..b667869bf0d 100644 --- a/lib/private/Memcache/NullCache.php +++ b/lib/private/Memcache/NullCache.php @@ -43,6 +43,11 @@ class NullCache extends Cache implements \OCP\IMemcache { return true; } + public function ncad(string $key, mixed $old): bool { + return true; + } + + public function clear($prefix = '') { return true; } diff --git a/lib/private/Memcache/ProfilerWrapperCache.php b/lib/private/Memcache/ProfilerWrapperCache.php index 84e3d880a0c..97d9d828a32 100644 --- a/lib/private/Memcache/ProfilerWrapperCache.php +++ b/lib/private/Memcache/ProfilerWrapperCache.php @@ -18,7 +18,7 @@ use OCP\IMemcacheTTL; * @template-implements \ArrayAccess<string,mixed> */ class ProfilerWrapperCache extends AbstractDataCollector implements IMemcacheTTL, \ArrayAccess { - /** @var Redis $wrappedCache*/ + /** @var Redis $wrappedCache */ protected $wrappedCache; /** @var string $prefix */ @@ -167,6 +167,18 @@ class ProfilerWrapperCache extends AbstractDataCollector implements IMemcacheTTL } /** @inheritDoc */ + public function ncad(string $key, mixed $old): bool { + $start = microtime(true); + $ret = $this->wrappedCache->ncad($key, $old); + $this->data['queries'][] = [ + 'start' => $start, + 'end' => microtime(true), + 'op' => $this->getPrefix() . '::ncad::' . $key, + ]; + return $ret; + } + + /** @inheritDoc */ public function setTTL(string $key, int $ttl) { $this->wrappedCache->setTTL($key, $ttl); } diff --git a/lib/private/Memcache/Redis.php b/lib/private/Memcache/Redis.php index cbafadc3b1b..711531e0ac2 100644 --- a/lib/private/Memcache/Redis.php +++ b/lib/private/Memcache/Redis.php @@ -23,13 +23,16 @@ class Redis extends Cache implements IMemcacheTTL { 'if redis.call("get", KEYS[1]) == ARGV[1] then return redis.call("del", KEYS[1]) else return 0 end', 'cf0e94b2e9ffc7e04395cf88f7583fc309985910', ], + 'ncad' => [ + 'if redis.call("get", KEYS[1]) ~= ARGV[1] then return redis.call("del", KEYS[1]) else return 0 end', + '75526f8048b13ce94a41b58eee59c664b4990ab2', + ], 'caSetTtl' => [ 'if redis.call("get", KEYS[1]) == ARGV[1] then redis.call("expire", KEYS[1], ARGV[2]) return 1 else return 0 end', 'fa4acbc946d23ef41d7d3910880b60e6e4972d72', ], ]; - private const DEFAULT_TTL = 24 * 60 * 60; // 1 day private const MAX_TTL = 30 * 24 * 60 * 60; // 1 month /** @@ -165,6 +168,12 @@ class Redis extends Cache implements IMemcacheTTL { return $this->evalLua('cad', [$key], [$old]) > 0; } + public function ncad(string $key, mixed $old): bool { + $old = self::encodeValue($old); + + return $this->evalLua('ncad', [$key], [$old]) > 0; + } + public function setTTL($key, $ttl) { if ($ttl === 0) { // having infinite TTL can lead to leaked keys as the prefix changes with version upgrades @@ -203,10 +212,10 @@ class Redis extends Cache implements IMemcacheTTL { } protected static function encodeValue(mixed $value): string { - return is_int($value) ? (string) $value : json_encode($value); + return is_int($value) ? (string)$value : json_encode($value); } protected static function decodeValue(string $value): mixed { - return is_numeric($value) ? (int) $value : json_decode($value, true); + return is_numeric($value) ? (int)$value : json_decode($value, true); } } diff --git a/lib/private/Migration/Exceptions/AttributeException.php b/lib/private/Migration/Exceptions/AttributeException.php new file mode 100644 index 00000000000..3daf99032ad --- /dev/null +++ b/lib/private/Migration/Exceptions/AttributeException.php @@ -0,0 +1,17 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OC\Migration\Exceptions; + +use Exception; + +/** + * @since 30.0.0 + */ +class AttributeException extends Exception { +} diff --git a/lib/private/Migration/MetadataManager.php b/lib/private/Migration/MetadataManager.php new file mode 100644 index 00000000000..cdaa604ce5a --- /dev/null +++ b/lib/private/Migration/MetadataManager.php @@ -0,0 +1,168 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-only + */ +namespace OC\Migration; + +use OC\DB\Connection; +use OC\DB\MigrationService; +use OC\Migration\Exceptions\AttributeException; +use OCP\App\IAppManager; +use OCP\Migration\Attributes\GenericMigrationAttribute; +use OCP\Migration\Attributes\MigrationAttribute; +use Psr\Log\LoggerInterface; +use ReflectionClass; + +/** + * Helps managing DB Migrations' Metadata + * + * @since 30.0.0 + */ +class MetadataManager { + public function __construct( + private readonly IAppManager $appManager, + private readonly Connection $connection, + private readonly LoggerInterface $logger, + ) { + } + + /** + * We get all migrations from an app (or 'core'), and + * for each migration files we extract its attributes + * + * @param string $appId + * + * @return array<string, MigrationAttribute[]> + * @since 30.0.0 + */ + public function extractMigrationAttributes(string $appId): array { + $ms = new MigrationService($appId, $this->connection); + + $metadata = []; + foreach ($ms->getAvailableVersions() as $version) { + $metadata[$version] = []; + $class = new ReflectionClass($ms->createInstance($version)); + $attributes = $class->getAttributes(); + foreach ($attributes as $attribute) { + $item = $attribute->newInstance(); + if ($item instanceof MigrationAttribute) { + $metadata[$version][] = $item; + } + } + } + + return $metadata; + } + + /** + * convert direct data from release metadata into a list of Migrations' Attribute + * + * @param array<array-key, array<array-key, array>> $metadata + * @param bool $filterKnownMigrations ignore metadata already done in local instance + * + * @return array{apps: array<array-key, array<string, MigrationAttribute[]>>, core: array<string, MigrationAttribute[]>} + * @since 30.0.0 + */ + public function getMigrationsAttributesFromReleaseMetadata( + array $metadata, + bool $filterKnownMigrations = false + ): array { + $appsAttributes = []; + foreach (array_keys($metadata['apps']) as $appId) { + if ($filterKnownMigrations && !$this->appManager->isInstalled($appId)) { + continue; // if not interested and app is not installed + } + + $done = ($filterKnownMigrations) ? $this->getKnownMigrations($appId) : []; + $appsAttributes[$appId] = $this->parseMigrations($metadata['apps'][$appId] ?? [], $done); + } + + $done = ($filterKnownMigrations) ? $this->getKnownMigrations('core') : []; + return [ + 'core' => $this->parseMigrations($metadata['core'] ?? [], $done), + 'apps' => $appsAttributes + ]; + } + + /** + * returns list of installed apps that does not support migrations metadata (yet) + * + * @param array<array-key, array<array-key, array>> $metadata + * + * @return string[] + * @since 30.0.0 + */ + public function getUnsupportedApps(array $metadata): array { + return array_values(array_diff($this->appManager->getInstalledApps(), array_keys($metadata['apps']))); + } + + /** + * convert raw data to a list of MigrationAttribute + * + * @param array $migrations + * @param array $ignoreMigrations + * + * @return array<string, MigrationAttribute[]> + */ + private function parseMigrations(array $migrations, array $ignoreMigrations = []): array { + $parsed = []; + foreach (array_keys($migrations) as $entry) { + if (in_array($entry, $ignoreMigrations)) { + continue; + } + + $parsed[$entry] = []; + foreach ($migrations[$entry] as $item) { + try { + $parsed[$entry][] = $this->createAttribute($item); + } catch (AttributeException $e) { + $this->logger->warning('exception while trying to create attribute', ['exception' => $e, 'item' => json_encode($item)]); + $parsed[$entry][] = new GenericMigrationAttribute($item); + } + } + } + + return $parsed; + } + + /** + * returns migrations already done + * + * @param string $appId + * + * @return array + * @throws \Exception + */ + private function getKnownMigrations(string $appId): array { + $ms = new MigrationService($appId, $this->connection); + return $ms->getMigratedVersions(); + } + + /** + * generate (deserialize) a MigrationAttribute from a serialized version + * + * @param array $item + * + * @return MigrationAttribute + * @throws AttributeException + */ + private function createAttribute(array $item): MigrationAttribute { + $class = $item['class'] ?? ''; + $namespace = 'OCP\Migration\Attributes\\'; + if (!str_starts_with($class, $namespace) + || !ctype_alpha(substr($class, strlen($namespace)))) { + throw new AttributeException('class name does not looks valid'); + } + + try { + $attribute = new $class($item['table'] ?? ''); + return $attribute->import($item); + } catch (\Error) { + throw new AttributeException('cannot import Attribute'); + } + } +} diff --git a/lib/private/NaturalSort.php b/lib/private/NaturalSort.php index 120e05a8eb2..9b097340b63 100644 --- a/lib/private/NaturalSort.php +++ b/lib/private/NaturalSort.php @@ -82,7 +82,7 @@ class NaturalSort { * @param string $a first string to compare * @param string $b second string to compare * @return int -1 if $b comes before $a, 1 if $a comes before $b - * or 0 if the strings are identical + * or 0 if the strings are identical */ public function compare($a, $b) { // Needed because PHP doesn't sort correctly when numbers are enclosed in diff --git a/lib/private/NavigationManager.php b/lib/private/NavigationManager.php index 5d71c83e77a..169c7aaf350 100644 --- a/lib/private/NavigationManager.php +++ b/lib/private/NavigationManager.php @@ -7,6 +7,7 @@ */ namespace OC; +use InvalidArgumentException; use OC\App\AppManager; use OC\Group\Manager; use OCP\App\IAppManager; @@ -14,8 +15,10 @@ use OCP\IConfig; use OCP\IGroupManager; use OCP\INavigationManager; use OCP\IURLGenerator; +use OCP\IUser; use OCP\IUserSession; use OCP\L10N\IFactory; +use Psr\Log\LoggerInterface; /** * Manages the ownCloud navigation @@ -41,25 +44,26 @@ class NavigationManager implements INavigationManager { private $groupManager; /** @var IConfig */ private $config; - /** The default app for the current user (cached for the `add` function) */ - private ?string $defaultApp; /** User defined app order (cached for the `add` function) */ private array $customAppOrder; + private LoggerInterface $logger; - public function __construct(IAppManager $appManager, + public function __construct( + IAppManager $appManager, IURLGenerator $urlGenerator, IFactory $l10nFac, IUserSession $userSession, IGroupManager $groupManager, - IConfig $config) { + IConfig $config, + LoggerInterface $logger, + ) { $this->appManager = $appManager; $this->urlGenerator = $urlGenerator; $this->l10nFac = $l10nFac; $this->userSession = $userSession; $this->groupManager = $groupManager; $this->config = $config; - - $this->defaultApp = null; + $this->logger = $logger; } /** @@ -92,13 +96,22 @@ class NavigationManager implements INavigationManager { $entry['app'] = $id; } - // This is the default app that will always be shown first - $entry['default'] = ($entry['app'] ?? false) === $this->defaultApp; // Set order from user defined app order $entry['order'] = (int)($this->customAppOrder[$id]['order'] ?? $entry['order'] ?? 100); } $this->entries[$id] = $entry; + + // Needs to be done after adding the new entry to account for the default entries containing this new entry. + $this->updateDefaultEntries(); + } + + private function updateDefaultEntries() { + foreach ($this->entries as $id => $entry) { + if ($entry['type'] === 'link') { + $this->entries[$id]['default'] = $id === $this->getDefaultEntryIdForUser($this->userSession->getUser(), false); + } + } } /** @@ -156,10 +169,10 @@ class NavigationManager implements INavigationManager { unset($navEntry); } - $activeApp = $this->getActiveEntry(); - if ($activeApp !== null) { + $activeEntry = $this->getActiveEntry(); + if ($activeEntry !== null) { foreach ($list as $index => &$navEntry) { - if ($navEntry['id'] == $activeApp) { + if ($navEntry['id'] == $activeEntry) { $navEntry['active'] = true; } else { $navEntry['active'] = false; @@ -213,8 +226,6 @@ class NavigationManager implements INavigationManager { ]); } - $this->defaultApp = $this->appManager->getDefaultAppForUser($this->userSession->getUser(), false); - if ($this->userSession->isLoggedIn()) { // Profile $this->add([ @@ -401,4 +412,83 @@ class NavigationManager implements INavigationManager { public function setUnreadCounter(string $id, int $unreadCounter): void { $this->unreadCounters[$id] = $unreadCounter; } + + public function get(string $id): array|null { + $this->init(); + foreach ($this->closureEntries as $c) { + $this->add($c()); + } + $this->closureEntries = []; + + return $this->entries[$id]; + } + + public function getDefaultEntryIdForUser(?IUser $user = null, bool $withFallbacks = true): string { + $this->init(); + // Disable fallbacks here, as we need to override them with the user defaults if none are configured. + $defaultEntryIds = $this->getDefaultEntryIds(false); + + $user ??= $this->userSession->getUser(); + + if ($user !== null) { + $userDefaultEntryIds = explode(',', $this->config->getUserValue($user->getUID(), 'core', 'defaultapp')); + $defaultEntryIds = array_filter(array_merge($userDefaultEntryIds, $defaultEntryIds)); + if (empty($defaultEntryIds) && $withFallbacks) { + /* Fallback on user defined apporder */ + $customOrders = json_decode($this->config->getUserValue($user->getUID(), 'core', 'apporder', '[]'), true, flags: JSON_THROW_ON_ERROR); + if (!empty($customOrders)) { + // filter only entries with app key (when added using closures or NavigationManager::add the app is not guaranteed to be set) + $customOrders = array_filter($customOrders, static fn ($entry) => isset($entry['app'])); + // sort apps by order + usort($customOrders, static fn ($a, $b) => $a['order'] - $b['order']); + // set default apps to sorted apps + $defaultEntryIds = array_map(static fn ($entry) => $entry['app'], $customOrders); + } + } + } + + if (empty($defaultEntryIds) && $withFallbacks) { + $defaultEntryIds = ['dashboard','files']; + } + + $entryIds = array_keys($this->entries); + + // Find the first app that is enabled for the current user + foreach ($defaultEntryIds as $defaultEntryId) { + if (in_array($defaultEntryId, $entryIds, true)) { + return $defaultEntryId; + } + } + + // Set fallback to always-enabled files app + return $withFallbacks ? 'files' : ''; + } + + public function getDefaultEntryIds(bool $withFallbacks = true): array { + $this->init(); + $storedIds = explode(',', $this->config->getSystemValueString('defaultapp', $withFallbacks ? 'dashboard,files' : '')); + $ids = []; + $entryIds = array_keys($this->entries); + foreach ($storedIds as $id) { + if (in_array($id, $entryIds, true)) { + $ids[] = $id; + break; + } + } + return array_filter($ids); + } + + public function setDefaultEntryIds(array $ids): void { + $this->init(); + $entryIds = array_keys($this->entries); + + foreach ($ids as $id) { + if (!in_array($id, $entryIds, true)) { + $this->logger->debug('Cannot set unavailable entry as default entry', ['missing_entry' => $id]); + throw new InvalidArgumentException('Entry not available'); + } + } + + $this->config->setSystemValue('defaultapp', join(',', $ids)); + } } diff --git a/lib/private/Notification/Manager.php b/lib/private/Notification/Manager.php index 7d042e6f8d8..8edbca0380d 100644 --- a/lib/private/Notification/Manager.php +++ b/lib/private/Notification/Manager.php @@ -68,7 +68,7 @@ class Manager implements IManager { } /** * @param string $appClass The service must implement IApp, otherwise a - * \InvalidArgumentException is thrown later + * \InvalidArgumentException is thrown later * @since 17.0.0 */ public function registerApp(string $appClass): void { @@ -78,8 +78,8 @@ class Manager implements IManager { /** * @param \Closure $service The service must implement INotifier, otherwise a * \InvalidArgumentException is thrown later - * @param \Closure $info An array with the keys 'id' and 'name' containing - * the app id and the app name + * @param \Closure $info An array with the keys 'id' and 'name' containing + * the app id and the app name * @deprecated 17.0.0 use registerNotifierService instead. * @since 8.2.0 - Parameter $info was added in 9.0.0 */ @@ -93,7 +93,7 @@ class Manager implements IManager { /** * @param string $notifierService The service must implement INotifier, otherwise a - * \InvalidArgumentException is thrown later + * \InvalidArgumentException is thrown later * @since 17.0.0 */ public function registerNotifierService(string $notifierService): void { diff --git a/lib/private/OCM/Model/OCMProvider.php b/lib/private/OCM/Model/OCMProvider.php index 17a356428f7..9bda95ebc17 100644 --- a/lib/private/OCM/Model/OCMProvider.php +++ b/lib/private/OCM/Model/OCMProvider.php @@ -163,8 +163,8 @@ class OCMProvider implements IOCMProvider { */ public function import(array $data): static { $this->setEnabled(is_bool($data['enabled'] ?? '') ? $data['enabled'] : false) - ->setApiVersion((string)($data['apiVersion'] ?? '')) - ->setEndPoint($data['endPoint'] ?? ''); + ->setApiVersion((string)($data['apiVersion'] ?? '')) + ->setEndPoint($data['endPoint'] ?? ''); $resources = []; foreach (($data['resourceTypes'] ?? []) as $resourceData) { diff --git a/lib/private/OCM/Model/OCMResource.php b/lib/private/OCM/Model/OCMResource.php index c69763ca4ba..68f9ee18f79 100644 --- a/lib/private/OCM/Model/OCMResource.php +++ b/lib/private/OCM/Model/OCMResource.php @@ -85,8 +85,8 @@ class OCMResource implements IOCMResource { */ public function import(array $data): static { return $this->setName((string)($data['name'] ?? '')) - ->setShareTypes($data['shareTypes'] ?? []) - ->setProtocols($data['protocols'] ?? []); + ->setShareTypes($data['shareTypes'] ?? []) + ->setProtocols($data['protocols'] ?? []); } /** diff --git a/lib/private/OCS/ApiHelper.php b/lib/private/OCS/ApiHelper.php new file mode 100644 index 00000000000..f69b540eafa --- /dev/null +++ b/lib/private/OCS/ApiHelper.php @@ -0,0 +1,80 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-FileCopyrightText: 2016 ownCloud, Inc. + * SPDX-License-Identifier: AGPL-3.0-only + */ + +namespace OC\OCS; + +use OC\AppFramework\OCS\V1Response; +use OC\AppFramework\OCS\V2Response; +use OCP\AppFramework\Http\DataResponse; +use OCP\AppFramework\OCSController; +use OCP\IRequest; +use OCP\Server; + +class ApiHelper { + /** + * Respond to a call + * @psalm-taint-escape html + * @param int $overrideHttpStatusCode force the HTTP status code, only used for the special case of maintenance mode which return 503 even for v1 + */ + public static function respond(int $statusCode, string $statusMessage, array $headers = [], ?int $overrideHttpStatusCode = null): void { + $request = Server::get(IRequest::class); + $format = $request->getParam('format', 'xml'); + if (self::isV2($request)) { + $response = new V2Response(new DataResponse([], $statusCode, $headers), $format, $statusMessage); + } else { + $response = new V1Response(new DataResponse([], $statusCode, $headers), $format, $statusMessage); + } + + // Send 401 headers if unauthorised + if ($response->getOCSStatus() === OCSController::RESPOND_UNAUTHORISED) { + // If request comes from JS return dummy auth request + if ($request->getHeader('X-Requested-With') === 'XMLHttpRequest') { + header('WWW-Authenticate: DummyBasic realm="Authorisation Required"'); + } else { + header('WWW-Authenticate: Basic realm="Authorisation Required"'); + } + http_response_code(401); + } + + foreach ($response->getHeaders() as $name => $value) { + header($name . ': ' . $value); + } + + http_response_code($overrideHttpStatusCode ?? $response->getStatus()); + + self::setContentType($format); + $body = $response->render(); + echo $body; + } + + /** + * Based on the requested format the response content type is set + */ + public static function setContentType(?string $format = null): void { + $format ??= Server::get(IRequest::class)->getParam('format', 'xml'); + if ($format === 'xml') { + header('Content-type: text/xml; charset=UTF-8'); + return; + } + + if ($format === 'json') { + header('Content-Type: application/json; charset=utf-8'); + return; + } + + header('Content-Type: application/octet-stream; charset=utf-8'); + } + + protected static function isV2(IRequest $request): bool { + $script = $request->getScriptName(); + + return str_ends_with($script, '/ocs/v2.php'); + } +} diff --git a/lib/private/OCS/Exception.php b/lib/private/OCS/Exception.php deleted file mode 100644 index eca8ec26df0..00000000000 --- a/lib/private/OCS/Exception.php +++ /dev/null @@ -1,19 +0,0 @@ -<?php -/** - * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors - * SPDX-FileCopyrightText: 2016 ownCloud, Inc. - * SPDX-License-Identifier: AGPL-3.0-only - */ -namespace OC\OCS; - -class Exception extends \Exception { - public function __construct( - private Result $result, - ) { - parent::__construct(); - } - - public function getResult(): Result { - return $this->result; - } -} diff --git a/lib/private/OCS/Result.php b/lib/private/OCS/Result.php deleted file mode 100644 index 5460a8b275c..00000000000 --- a/lib/private/OCS/Result.php +++ /dev/null @@ -1,137 +0,0 @@ -<?php - -/** - * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors - * SPDX-FileCopyrightText: 2016 ownCloud, Inc. - * SPDX-License-Identifier: AGPL-3.0-only - */ -namespace OC\OCS; - -class Result { - protected array $data; - - /** @var null|string */ - protected ?string $message; - - /** @var int */ - protected int $statusCode; - - /** @var integer */ - protected $items; - - /** @var integer */ - protected $perPage; - - /** @var array */ - private array $headers = []; - - /** - * create the OCS_Result object - * - * @param mixed|null $data the data to return - * @param int $code - * @param string|null $message - * @param array $headers - */ - public function __construct(mixed $data = null, int $code = 100, ?string $message = null, array $headers = []) { - if ($data === null) { - $this->data = []; - } elseif (!is_array($data)) { - $this->data = [$this->data]; - } else { - $this->data = $data; - } - $this->statusCode = $code; - $this->message = $message; - $this->headers = $headers; - } - - /** - * optionally set the total number of items available - * - * @param int $items - */ - public function setTotalItems(int $items): void { - $this->items = $items; - } - - /** - * optionally set the number of items per page - * - * @param int $items - */ - public function setItemsPerPage(int $items): void { - $this->perPage = $items; - } - - /** - * get the status code - * @return int - */ - public function getStatusCode(): int { - return $this->statusCode; - } - - /** - * get the meta data for the result - * @return array - */ - public function getMeta(): array { - $meta = []; - $meta['status'] = $this->succeeded() ? 'ok' : 'failure'; - $meta['statuscode'] = $this->statusCode; - $meta['message'] = $this->message; - if ($this->items !== null) { - $meta['totalitems'] = $this->items; - } - if ($this->perPage !== null) { - $meta['itemsperpage'] = $this->perPage; - } - return $meta; - } - - /** - * get the result data - * @return array - */ - public function getData(): array { - return $this->data; - } - - /** - * return bool Whether the method succeeded - * @return bool - */ - public function succeeded(): bool { - return ($this->statusCode == 100); - } - - /** - * Adds a new header to the response - * - * @param string $name The name of the HTTP header - * @param string $value The value, null will delete it - * @return $this - */ - public function addHeader(string $name, ?string $value): static { - $name = trim($name); // always remove leading and trailing whitespace - // to be able to reliably check for security - // headers - - if (is_null($value)) { - unset($this->headers[$name]); - } else { - $this->headers[$name] = $value; - } - - return $this; - } - - /** - * Returns the set headers - * @return array the headers - */ - public function getHeaders(): array { - return $this->headers; - } -} diff --git a/lib/private/Preview/BackgroundCleanupJob.php b/lib/private/Preview/BackgroundCleanupJob.php index 49ff01486a3..44832a78eb9 100644 --- a/lib/private/Preview/BackgroundCleanupJob.php +++ b/lib/private/Preview/BackgroundCleanupJob.php @@ -64,6 +64,11 @@ class BackgroundCleanupJob extends TimedJob { } private function getOldPreviewLocations(): \Iterator { + if ($this->connection->getShardDefinition('filecache')) { + // sharding is new enough that we don't need to support this + return; + } + $qb = $this->connection->getQueryBuilder(); $qb->select('a.name') ->from('filecache', 'a') @@ -73,6 +78,8 @@ class BackgroundCleanupJob extends TimedJob { ->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('__%')) @@ -104,6 +111,15 @@ class BackgroundCleanupJob extends TimedJob { return []; } + if ($this->connection->getShardDefinition('filecache')) { + $chunks = $this->getAllPreviewIds($data['path'], 1000); + foreach ($chunks as $chunk) { + yield from $this->findMissingSources($chunk); + } + + return; + } + /* * This lovely like is the result of the way the new previews are stored * We take the md5 of the name (fileid) and split the first 7 chars. That way @@ -153,4 +169,46 @@ class BackgroundCleanupJob extends TimedJob { $cursor->closeCursor(); } + + private function getAllPreviewIds(string $previewRoot, int $chunkSize): \Iterator { + // See `getNewPreviewLocations` for some more info about the logic here + $like = $this->connection->escapeLikeParameter($previewRoot). '/_/_/_/_/_/_/_/%'; + + $qb = $this->connection->getQueryBuilder(); + $qb->select('name', 'fileid') + ->from('filecache') + ->where( + $qb->expr()->andX( + $qb->expr()->eq('storage', $qb->createNamedParameter($this->previewFolder->getStorageId())), + $qb->expr()->like('path', $qb->createNamedParameter($like)), + $qb->expr()->eq('mimetype', $qb->createNamedParameter($this->mimeTypeLoader->getId('httpd/unix-directory'))), + $qb->expr()->gt('fileid', $qb->createParameter('min_id')), + ) + ) + ->orderBy('fileid', 'ASC') + ->setMaxResults($chunkSize); + + $minId = 0; + while (true) { + $qb->setParameter('min_id', $minId); + $rows = $qb->executeQuery()->fetchAll(); + if (count($rows) > 0) { + $minId = $rows[count($rows) - 1]['fileid']; + yield array_map(function ($row) { + return (int)$row['name']; + }, $rows); + } else { + break; + } + } + } + + private function findMissingSources(array $ids): array { + $qb = $this->connection->getQueryBuilder(); + $qb->select('fileid') + ->from('filecache') + ->where($qb->expr()->in('fileid', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY))); + $found = $qb->executeQuery()->fetchAll(\PDO::FETCH_COLUMN); + return array_diff($ids, $found); + } } diff --git a/lib/private/Preview/Bitmap.php b/lib/private/Preview/Bitmap.php index c9fad50841f..a3d5fbfd4ec 100644 --- a/lib/private/Preview/Bitmap.php +++ b/lib/private/Preview/Bitmap.php @@ -61,7 +61,7 @@ abstract class Bitmap extends ProviderV2 { //new bitmap image object $image = new \OCP\Image(); - $image->loadFromData((string) $bp); + $image->loadFromData((string)$bp); //check if image object is valid return $image->valid() ? $image : null; } diff --git a/lib/private/Preview/Generator.php b/lib/private/Preview/Generator.php index 4083b9f4f61..c7eb3121825 100644 --- a/lib/private/Preview/Generator.php +++ b/lib/private/Preview/Generator.php @@ -80,6 +80,7 @@ class Generator { $height, $crop, $mode, + $mimeType, )); // since we only ask for one preview, and the generate method return the last one it created, it returns the one we want @@ -171,7 +172,7 @@ class Generator { $previewFiles[] = $preview; } } catch (\InvalidArgumentException $e) { - throw new NotFoundException("", 0, $e); + throw new NotFoundException('', 0, $e); } if ($preview->getSize() === 0) { @@ -272,13 +273,13 @@ class Generator { $hardwareConcurrency = self::getHardwareConcurrency(); switch ($type) { - case "preview_concurrency_all": + case 'preview_concurrency_all': $fallback = $hardwareConcurrency > 0 ? $hardwareConcurrency * 2 : 8; $concurrency_all = $this->config->getSystemValueInt($type, $fallback); - $concurrency_new = $this->getNumConcurrentPreviews("preview_concurrency_new"); + $concurrency_new = $this->getNumConcurrentPreviews('preview_concurrency_new'); $cached[$type] = max($concurrency_all, $concurrency_new); break; - case "preview_concurrency_new": + case 'preview_concurrency_new': $fallback = $hardwareConcurrency > 0 ? $hardwareConcurrency : 4; $cached[$type] = $this->config->getSystemValueInt($type, $fallback); break; diff --git a/lib/private/Preview/HEIC.php b/lib/private/Preview/HEIC.php index d198f11fdef..e5d73c943a4 100644 --- a/lib/private/Preview/HEIC.php +++ b/lib/private/Preview/HEIC.php @@ -31,7 +31,7 @@ class HEIC extends ProviderV2 { * {@inheritDoc} */ public function isAvailable(FileInfo $file): bool { - return in_array('HEIC', \Imagick::queryFormats("HEI*")); + return in_array('HEIC', \Imagick::queryFormats('HEI*')); } /** @@ -70,7 +70,7 @@ class HEIC extends ProviderV2 { //new bitmap image object $image = new \OCP\Image(); - $image->loadFromData((string) $bp); + $image->loadFromData((string)$bp); //check if image object is valid return $image->valid() ? $image : null; } diff --git a/lib/private/Preview/Imaginary.php b/lib/private/Preview/Imaginary.php index 23459be3b51..baa883f4bd9 100644 --- a/lib/private/Preview/Imaginary.php +++ b/lib/private/Preview/Imaginary.php @@ -40,7 +40,7 @@ class Imaginary extends ProviderV2 { } public static function supportedMimeTypes(): string { - return '/(image\/(bmp|x-bitmap|png|jpeg|gif|heic|heif|svg\+xml|tiff|webp)|application\/(pdf|illustrator))/'; + return '/(image\/(bmp|x-bitmap|png|jpeg|gif|heic|heif|svg\+xml|tiff|webp)|application\/illustrator)/'; } public function getCroppedThumbnail(File $file, int $maxX, int $maxY, bool $crop): ?IImage { diff --git a/lib/private/Preview/ImaginaryPDF.php b/lib/private/Preview/ImaginaryPDF.php new file mode 100644 index 00000000000..d26c6d1b7ff --- /dev/null +++ b/lib/private/Preview/ImaginaryPDF.php @@ -0,0 +1,14 @@ +<?php + +/** + * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OC\Preview; + +class ImaginaryPDF extends Imaginary { + public static function supportedMimeTypes(): string { + return '/application\/pdf/'; + } +} diff --git a/lib/private/Preview/MarkDown.php b/lib/private/Preview/MarkDown.php index 41a79455042..c20433a1ac0 100644 --- a/lib/private/Preview/MarkDown.php +++ b/lib/private/Preview/MarkDown.php @@ -52,7 +52,7 @@ class MarkDown extends TXT { $lines = preg_split("/\r\n|\n|\r/", $content); // Define text size of text file preview - $fontSize = $maxX ? (int) ((1 / ($maxX >= 512 ? 60 : 40) * $maxX)) : 10; + $fontSize = $maxX ? (int)((1 / ($maxX >= 512 ? 60 : 40) * $maxX)) : 10; $image = imagecreate($maxX, $maxY); imagecolorallocate($image, 255, 255, 255); diff --git a/lib/private/Preview/Movie.php b/lib/private/Preview/Movie.php index cfc05b8cce9..4a6104930d6 100644 --- a/lib/private/Preview/Movie.php +++ b/lib/private/Preview/Movie.php @@ -120,7 +120,7 @@ class Movie extends ProviderV2 { $proc = proc_open($cmd, [1 => ['pipe', 'w'], 2 => ['pipe', 'w']], $pipes); $returnCode = -1; - $output = ""; + $output = ''; if (is_resource($proc)) { $stdout = trim(stream_get_contents($pipes[1])); $stderr = trim(stream_get_contents($pipes[2])); diff --git a/lib/private/Preview/ProviderV2.php b/lib/private/Preview/ProviderV2.php index ca10aa67b36..7251dd70d17 100644 --- a/lib/private/Preview/ProviderV2.php +++ b/lib/private/Preview/ProviderV2.php @@ -71,6 +71,9 @@ abstract class ProviderV2 implements IProviderV2 { $absPath = \OC::$server->getTempManager()->getTemporaryFile(); $content = $file->fopen('r'); + if ($content === false) { + return false; + } if ($maxSize) { $content = stream_get_contents($content, $maxSize); diff --git a/lib/private/Preview/SVG.php b/lib/private/Preview/SVG.php index 73dc0488bf1..d9f7701f411 100644 --- a/lib/private/Preview/SVG.php +++ b/lib/private/Preview/SVG.php @@ -58,7 +58,7 @@ class SVG extends ProviderV2 { //new image object $image = new \OCP\Image(); - $image->loadFromData((string) $svg); + $image->loadFromData((string)$svg); //check if image object is valid if ($image->valid()) { $image->scaleDownToFit($maxX, $maxY); diff --git a/lib/private/Preview/TXT.php b/lib/private/Preview/TXT.php index 68597f8dbd0..1a1d64f3e08 100644 --- a/lib/private/Preview/TXT.php +++ b/lib/private/Preview/TXT.php @@ -50,7 +50,7 @@ class TXT extends ProviderV2 { $lines = preg_split("/\r\n|\n|\r/", $content); // Define text size of text file preview - $fontSize = $maxX ? (int) ((1 / 32) * $maxX) : 5; //5px + $fontSize = $maxX ? (int)((1 / 32) * $maxX) : 5; //5px $lineSize = ceil($fontSize * 1.5); $image = imagecreate($maxX, $maxY); @@ -67,7 +67,7 @@ class TXT extends ProviderV2 { $index = $index + 1; $x = 1; - $y = (int) ($index * $lineSize); + $y = (int)($index * $lineSize); if ($canUseTTF === true) { imagettftext($image, $fontSize, 0, $x, $y, $textColor, $fontFile, $line); diff --git a/lib/private/PreviewManager.php b/lib/private/PreviewManager.php index 4daf5b2dc1e..6f43687ceea 100644 --- a/lib/private/PreviewManager.php +++ b/lib/private/PreviewManager.php @@ -346,6 +346,7 @@ class PreviewManager implements IPreview { $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()); // SVG and Bitmap require imagick if ($this->imagickSupport->hasExtension()) { @@ -388,7 +389,7 @@ class PreviewManager implements IPreview { if (is_string($movieBinary)) { - $this->registerCoreProvider(Preview\Movie::class, '/video\/.*/', ["movieBinary" => $movieBinary]); + $this->registerCoreProvider(Preview\Movie::class, '/video\/.*/', ['movieBinary' => $movieBinary]); } } } diff --git a/lib/private/Profile/ProfileManager.php b/lib/private/Profile/ProfileManager.php index e575740f970..5e36a9c2f56 100644 --- a/lib/private/Profile/ProfileManager.php +++ b/lib/private/Profile/ProfileManager.php @@ -93,7 +93,7 @@ class ProfileManager implements IProfileManager { } $account = $this->accountManager->getAccount($user); - return (bool) filter_var( + return (bool)filter_var( $account->getProperty(IAccountManager::PROPERTY_PROFILE_ENABLED)->getValue(), FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE, diff --git a/lib/private/Profiler/FileProfilerStorage.php b/lib/private/Profiler/FileProfilerStorage.php index 8cb6f2e6f79..b4494ef7a37 100644 --- a/lib/private/Profiler/FileProfilerStorage.php +++ b/lib/private/Profiler/FileProfilerStorage.php @@ -46,7 +46,7 @@ class FileProfilerStorage { while (\count($result) < $limit && $line = $this->readLineFromFile($file)) { $values = str_getcsv($line); [$csvToken, $csvMethod, $csvUrl, $csvTime, $csvParent, $csvStatusCode] = $values; - $csvTime = (int) $csvTime; + $csvTime = (int)$csvTime; if ($url && !str_contains($csvUrl, $url) || $method && !str_contains($csvMethod, $method) || $statusCode && !str_contains($csvStatusCode, $statusCode)) { continue; diff --git a/lib/private/RedisFactory.php b/lib/private/RedisFactory.php index abfec608a39..dcb56cee9ef 100644 --- a/lib/private/RedisFactory.php +++ b/lib/private/RedisFactory.php @@ -10,10 +10,10 @@ namespace OC; use OCP\Diagnostics\IEventLogger; class RedisFactory { - public const REDIS_MINIMAL_VERSION = '3.1.3'; + public const REDIS_MINIMAL_VERSION = '4.0.0'; public const REDIS_EXTRA_PARAMETERS_MINIMAL_VERSION = '5.3.0'; - /** @var \Redis|\RedisCluster */ + /** @var \Redis|\RedisCluster */ private $instance; private SystemConfig $config; @@ -55,6 +55,7 @@ class RedisFactory { // # TLS support // # https://github.com/phpredis/phpredis/issues/1600 $connectionParameters = $this->getSslContext($config); + $persistent = $this->config->getValue('redis.persistent', true); // cluster config if ($isCluster) { @@ -64,9 +65,9 @@ class RedisFactory { // Support for older phpredis versions not supporting connectionParameters if ($connectionParameters !== null) { - $this->instance = new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout, true, $auth, $connectionParameters); + $this->instance = new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout, $persistent, $auth, $connectionParameters); } else { - $this->instance = new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout, true, $auth); + $this->instance = new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout, $persistent, $auth); } if (isset($config['failover_mode'])) { @@ -85,17 +86,25 @@ class RedisFactory { $connectionParameters = [ 'stream' => $this->getSslContext($config) ]; - /** - * even though the stubs and documentation don't want you to know this, - * pconnect does have the same $connectionParameters argument connect has - * - * https://github.com/phpredis/phpredis/blob/0264de1824b03fb2d0ad515b4d4ec019cd2dae70/redis.c#L710-L730 - * - * @psalm-suppress TooManyArguments - */ - $this->instance->pconnect($host, $port, $timeout, null, 0, $readTimeout, $connectionParameters); + if ($persistent) { + /** + * even though the stubs and documentation don't want you to know this, + * pconnect does have the same $connectionParameters argument connect has + * + * https://github.com/phpredis/phpredis/blob/0264de1824b03fb2d0ad515b4d4ec019cd2dae70/redis.c#L710-L730 + * + * @psalm-suppress TooManyArguments + */ + $this->instance->pconnect($host, $port, $timeout, null, 0, $readTimeout, $connectionParameters); + } else { + $this->instance->connect($host, $port, $timeout, null, 0, $readTimeout, $connectionParameters); + } } else { - $this->instance->pconnect($host, $port, $timeout, null, 0, $readTimeout); + if ($persistent) { + $this->instance->pconnect($host, $port, $timeout, null, 0, $readTimeout); + } else { + $this->instance->connect($host, $port, $timeout, null, 0, $readTimeout); + } } diff --git a/lib/private/Remote/Instance.php b/lib/private/Remote/Instance.php index 4ae734521cf..ac3233b93c9 100644 --- a/lib/private/Remote/Instance.php +++ b/lib/private/Remote/Instance.php @@ -46,7 +46,7 @@ class Instance implements IInstance { } /** - * @return string The of of the remote server with protocol + * @return string The of the remote server with protocol */ public function getFullUrl() { return $this->getProtocol() . '://' . $this->getUrl(); diff --git a/lib/private/Repair.php b/lib/private/Repair.php index ed9cd400f61..630ee249209 100644 --- a/lib/private/Repair.php +++ b/lib/private/Repair.php @@ -27,7 +27,6 @@ use OC\Repair\Events\RepairStartEvent; use OC\Repair\Events\RepairStepEvent; use OC\Repair\Events\RepairWarningEvent; use OC\Repair\MoveUpdaterStepFile; -use OC\Repair\NC11\FixMountStorages; use OC\Repair\NC13\AddLogRotateJob; use OC\Repair\NC14\AddPreviewBackgroundCleanupJob; use OC\Repair\NC16\AddClenupLoginFlowV2BackgroundJob; @@ -42,6 +41,7 @@ use OC\Repair\NC21\ValidatePhoneNumber; use OC\Repair\NC22\LookupServerSendCheck; use OC\Repair\NC24\AddTokenCleanupJob; use OC\Repair\NC25\AddMissingSecretJob; +use OC\Repair\NC30\RemoveLegacyDatadirFile; use OC\Repair\OldGroupMembershipShares; use OC\Repair\Owncloud\CleanPreviews; use OC\Repair\Owncloud\DropAccountTermsTable; @@ -52,6 +52,7 @@ use OC\Repair\Owncloud\UpdateLanguageCodes; use OC\Repair\RemoveLinkShares; use OC\Repair\RepairDavShares; use OC\Repair\RepairInvalidShares; +use OC\Repair\RepairLogoDimension; use OC\Repair\RepairMimeTypes; use OC\Template\JSCombiner; use OCA\DAV\Migration\DeleteSchedulingObjects; @@ -98,7 +99,7 @@ class Repair implements IOutput { try { $step->run($this); } catch (\Exception $e) { - $this->logger->error("Exception while executing repair step " . $step->getName(), ['exception' => $e]); + $this->logger->error('Exception while executing repair step ' . $step->getName(), ['exception' => $e]); $this->dispatcher->dispatchTyped(new RepairErrorEvent($e->getMessage())); } } @@ -162,7 +163,6 @@ class Repair implements IOutput { \OC::$server->getConfig() ), new MigrateOauthTables(\OC::$server->get(Connection::class)), - new FixMountStorages(\OC::$server->getDatabaseConnection()), new UpdateLanguageCodes(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()), new AddLogRotateJob(\OC::$server->getJobList()), new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OCP\Server::get(JSCombiner::class)), @@ -187,6 +187,8 @@ class Repair implements IOutput { \OCP\Server::get(AddRemoveOldTasksBackgroundJob::class), \OCP\Server::get(AddMetadataGenerationJob::class), \OCP\Server::get(AddAppConfigLazyMigration::class), + \OCP\Server::get(RepairLogoDimension::class), + \OCP\Server::get(RemoveLegacyDatadirFile::class), ]; } diff --git a/lib/private/Repair/CleanTags.php b/lib/private/Repair/CleanTags.php index f2fc8156f29..258808cb28a 100644 --- a/lib/private/Repair/CleanTags.php +++ b/lib/private/Repair/CleanTags.php @@ -107,7 +107,7 @@ class CleanTags implements IRepairStep { $output, '%d tags for delete files have been removed.', 'vcategory_to_object', 'objid', - 'filecache', 'fileid', 'path_hash' + 'filecache', 'fileid', 'fileid' ); } @@ -147,8 +147,8 @@ class CleanTags implements IRepairStep { * @param string $deleteId * @param string $sourceTable * @param string $sourceId - * @param string $sourceNullColumn If this column is null in the source table, - * the entry is deleted in the $deleteTable + * @param string $sourceNullColumn If this column is null in the source table, + * the entry is deleted in the $deleteTable */ protected function deleteOrphanEntries(IOutput $output, $repairInfo, $deleteTable, $deleteId, $sourceTable, $sourceId, $sourceNullColumn) { $qb = $this->connection->getQueryBuilder(); @@ -166,19 +166,20 @@ class CleanTags implements IRepairStep { $orphanItems = []; while ($row = $result->fetch()) { - $orphanItems[] = (int) $row[$deleteId]; + $orphanItems[] = (int)$row[$deleteId]; } + $deleteQuery = $this->connection->getQueryBuilder(); + $deleteQuery->delete($deleteTable) + ->where( + $deleteQuery->expr()->eq('type', $deleteQuery->expr()->literal('files')) + ) + ->andWhere($deleteQuery->expr()->in($deleteId, $deleteQuery->createParameter('ids'))); if (!empty($orphanItems)) { $orphanItemsBatch = array_chunk($orphanItems, 200); foreach ($orphanItemsBatch as $items) { - $qb->delete($deleteTable) - ->where( - $qb->expr()->eq('type', $qb->expr()->literal('files')) - ) - ->andWhere($qb->expr()->in($deleteId, $qb->createParameter('ids'))); - $qb->setParameter('ids', $items, IQueryBuilder::PARAM_INT_ARRAY); - $qb->execute(); + $deleteQuery->setParameter('ids', $items, IQueryBuilder::PARAM_INT_ARRAY); + $deleteQuery->executeStatement(); } } diff --git a/lib/private/Repair/Collation.php b/lib/private/Repair/Collation.php index 0affb3b1ca9..9557aabd718 100644 --- a/lib/private/Repair/Collation.php +++ b/lib/private/Repair/Collation.php @@ -8,7 +8,6 @@ namespace OC\Repair; use Doctrine\DBAL\Exception\DriverException; -use Doctrine\DBAL\Platforms\MySQLPlatform; use OCP\IConfig; use OCP\IDBConnection; use OCP\Migration\IOutput; @@ -16,7 +15,7 @@ use OCP\Migration\IRepairStep; use Psr\Log\LoggerInterface; class Collation implements IRepairStep { - /** @var IConfig */ + /** @var IConfig */ protected $config; protected LoggerInterface $logger; @@ -50,7 +49,7 @@ class Collation implements IRepairStep { * Fix mime types */ public function run(IOutput $output) { - if (!$this->connection->getDatabasePlatform() instanceof MySQLPlatform) { + if ($this->connection->getDatabaseProvider() !== IDBConnection::PLATFORM_MYSQL) { $output->info('Not a mysql database -> nothing to do'); return; } @@ -93,14 +92,14 @@ class Collation implements IRepairStep { * @return string[] */ protected function getAllNonUTF8BinTables(IDBConnection $connection) { - $dbName = $this->config->getSystemValueString("dbname"); + $dbName = $this->config->getSystemValueString('dbname'); $characterSet = $this->config->getSystemValueBool('mysql.utf8mb4', false) ? 'utf8mb4' : 'utf8'; // fetch tables by columns $statement = $connection->executeQuery( - "SELECT DISTINCT(TABLE_NAME) AS `table`" . - " FROM INFORMATION_SCHEMA . COLUMNS" . - " WHERE TABLE_SCHEMA = ?" . + 'SELECT DISTINCT(TABLE_NAME) AS `table`' . + ' FROM INFORMATION_SCHEMA . COLUMNS' . + ' WHERE TABLE_SCHEMA = ?' . " AND (COLLATION_NAME <> '" . $characterSet . "_bin' OR CHARACTER_SET_NAME <> '" . $characterSet . "')" . " AND TABLE_NAME LIKE '*PREFIX*%'", [$dbName] @@ -113,9 +112,9 @@ class Collation implements IRepairStep { // fetch tables by collation $statement = $connection->executeQuery( - "SELECT DISTINCT(TABLE_NAME) AS `table`" . - " FROM INFORMATION_SCHEMA . TABLES" . - " WHERE TABLE_SCHEMA = ?" . + 'SELECT DISTINCT(TABLE_NAME) AS `table`' . + ' FROM INFORMATION_SCHEMA . TABLES' . + ' WHERE TABLE_SCHEMA = ?' . " AND TABLE_COLLATION <> '" . $characterSet . "_bin'" . " AND TABLE_NAME LIKE '*PREFIX*%'", [$dbName] diff --git a/lib/private/Repair/NC11/FixMountStorages.php b/lib/private/Repair/NC11/FixMountStorages.php deleted file mode 100644 index b1663102d2f..00000000000 --- a/lib/private/Repair/NC11/FixMountStorages.php +++ /dev/null @@ -1,60 +0,0 @@ -<?php -/** - * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors - * SPDX-License-Identifier: AGPL-3.0-or-later - */ -namespace OC\Repair\NC11; - -use OCP\DB\QueryBuilder\IQueryBuilder; -use OCP\IDBConnection; -use OCP\Migration\IOutput; -use OCP\Migration\IRepairStep; - -class FixMountStorages implements IRepairStep { - /** @var IDBConnection */ - private $db; - - /** - * @param IDBConnection $db - */ - public function __construct(IDBConnection $db) { - $this->db = $db; - } - - /** - * @return string - */ - public function getName() { - return 'Fix potential broken mount points'; - } - - public function run(IOutput $output) { - $query = $this->db->getQueryBuilder(); - $query->select('m.id', 'f.storage') - ->from('mounts', 'm') - ->leftJoin('m', 'filecache', 'f', $query->expr()->eq('m.root_id', 'f.fileid')) - ->where($query->expr()->neq('m.storage_id', 'f.storage')); - - $update = $this->db->getQueryBuilder(); - $update->update('mounts') - ->set('storage_id', $update->createParameter('storage')) - ->where($query->expr()->eq('id', $update->createParameter('mount'))); - - $result = $query->execute(); - $entriesUpdated = 0; - while ($row = $result->fetch()) { - $update->setParameter('storage', $row['storage'], IQueryBuilder::PARAM_INT) - ->setParameter('mount', $row['id'], IQueryBuilder::PARAM_INT); - $update->execute(); - $entriesUpdated++; - } - $result->closeCursor(); - - if ($entriesUpdated > 0) { - $output->info($entriesUpdated . ' mounts updated'); - return; - } - - $output->info('No mounts updated'); - } -} diff --git a/lib/private/Repair/NC25/AddMissingSecretJob.php b/lib/private/Repair/NC25/AddMissingSecretJob.php index b407ef2a2a9..46b89d5f6f7 100644 --- a/lib/private/Repair/NC25/AddMissingSecretJob.php +++ b/lib/private/Repair/NC25/AddMissingSecretJob.php @@ -33,7 +33,7 @@ class AddMissingSecretJob implements IRepairStep { try { $this->config->setSystemValue('passwordsalt', $this->random->generate(30)); } catch (HintException $e) { - $output->warning("passwordsalt is missing from your config.php and your config.php is read only. Please fix it manually."); + $output->warning('passwordsalt is missing from your config.php and your config.php is read only. Please fix it manually.'); } } @@ -42,7 +42,7 @@ class AddMissingSecretJob implements IRepairStep { try { $this->config->setSystemValue('secret', $this->random->generate(48)); } catch (HintException $e) { - $output->warning("secret is missing from your config.php and your config.php is read only. Please fix it manually."); + $output->warning('secret is missing from your config.php and your config.php is read only. Please fix it manually.'); } } } diff --git a/lib/private/Repair/NC30/RemoveLegacyDatadirFile.php b/lib/private/Repair/NC30/RemoveLegacyDatadirFile.php new file mode 100644 index 00000000000..623163927bd --- /dev/null +++ b/lib/private/Repair/NC30/RemoveLegacyDatadirFile.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 OC\Repair\NC30; + +use OCP\IConfig; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; + +class RemoveLegacyDatadirFile implements IRepairStep { + + public function __construct( + private IConfig $config, + ) { + } + + public function getName(): string { + return 'Remove legacy ".ocdata" file'; + } + + public function run(IOutput $output): void { + $ocdata = $this->config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data') . '/.ocdata'; + if (file_exists($ocdata)) { + unlink($ocdata); + } + } +} diff --git a/lib/private/Repair/OldGroupMembershipShares.php b/lib/private/Repair/OldGroupMembershipShares.php index 54f2078395e..027f179596c 100644 --- a/lib/private/Repair/OldGroupMembershipShares.php +++ b/lib/private/Repair/OldGroupMembershipShares.php @@ -57,9 +57,9 @@ class OldGroupMembershipShares implements IRepairStep { ->from('share', 's1') ->where($query->expr()->isNotNull('s1.parent')) // \OC\Share\Constant::$shareTypeGroupUserUnique === 2 - ->andWhere($query->expr()->eq('s1.share_type', $query->expr()->literal(2))) - ->andWhere($query->expr()->isNotNull('s2.id')) - ->andWhere($query->expr()->eq('s2.share_type', $query->expr()->literal(IShare::TYPE_GROUP))) + ->andWhere($query->expr()->eq('s1.share_type', $query->expr()->literal(2))) + ->andWhere($query->expr()->isNotNull('s2.id')) + ->andWhere($query->expr()->eq('s2.share_type', $query->expr()->literal(IShare::TYPE_GROUP))) ->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id')); $deleteQuery = $this->connection->getQueryBuilder(); @@ -69,7 +69,7 @@ class OldGroupMembershipShares implements IRepairStep { $result = $query->execute(); while ($row = $result->fetch()) { if (!$this->isMember($row['group'], $row['user'])) { - $deletedEntries += $deleteQuery->setParameter('share', (int) $row['id']) + $deletedEntries += $deleteQuery->setParameter('share', (int)$row['id']) ->execute(); } } diff --git a/lib/private/Repair/Owncloud/MigrateOauthTables.php b/lib/private/Repair/Owncloud/MigrateOauthTables.php index e8728cd2f66..94ec0eba3e6 100644 --- a/lib/private/Repair/Owncloud/MigrateOauthTables.php +++ b/lib/private/Repair/Owncloud/MigrateOauthTables.php @@ -32,11 +32,11 @@ class MigrateOauthTables implements IRepairStep { public function run(IOutput $output) { $schema = new SchemaWrapper($this->db); if (!$schema->hasTable('oauth2_clients')) { - $output->info("oauth2_clients table does not exist."); + $output->info('oauth2_clients table does not exist.'); return; } - $output->info("Update the oauth2_access_tokens table schema."); + $output->info('Update the oauth2_access_tokens table schema.'); $schema = new SchemaWrapper($this->db); $table = $schema->getTable('oauth2_access_tokens'); if (!$table->hasColumn('hashed_code')) { @@ -58,7 +58,7 @@ class MigrateOauthTables implements IRepairStep { $table->addIndex(['client_id'], 'oauth2_access_client_id_idx'); } - $output->info("Update the oauth2_clients table schema."); + $output->info('Update the oauth2_clients table schema.'); $schema = new SchemaWrapper($this->db); $table = $schema->getTable('oauth2_clients'); if ($table->getColumn('name')->getLength() !== 64) { @@ -114,7 +114,7 @@ class MigrateOauthTables implements IRepairStep { $result->closeCursor(); // 2. Insert them into the client_identifier column. - foreach ($identifiers as ["id" => $id, "identifier" => $clientIdentifier]) { + foreach ($identifiers as ['id' => $id, 'identifier' => $clientIdentifier]) { $insertQuery = $this->db->getQueryBuilder(); $insertQuery->update('oauth2_clients') ->set('client_identifier', $insertQuery->createNamedParameter($clientIdentifier, IQueryBuilder::PARAM_STR)) @@ -122,7 +122,7 @@ class MigrateOauthTables implements IRepairStep { ->executeStatement(); } - $output->info("Drop the identifier column."); + $output->info('Drop the identifier column.'); $schema = new SchemaWrapper($this->db); $table = $schema->getTable('oauth2_clients'); $table->dropColumn('identifier'); diff --git a/lib/private/Repair/Owncloud/SaveAccountsTableData.php b/lib/private/Repair/Owncloud/SaveAccountsTableData.php index 1b6da7c858f..08665687b29 100644 --- a/lib/private/Repair/Owncloud/SaveAccountsTableData.php +++ b/lib/private/Repair/Owncloud/SaveAccountsTableData.php @@ -150,7 +150,7 @@ class SaveAccountsTableData implements IRepairStep { * @throws \UnexpectedValueException */ protected function migrateUserInfo(IQueryBuilder $update, $userdata) { - $state = (int) $userdata['state']; + $state = (int)$userdata['state']; if ($state === 3) { // Deleted user, ignore return; diff --git a/lib/private/Repair/RemoveLinkShares.php b/lib/private/Repair/RemoveLinkShares.php index f128b6f731b..634494acb2f 100644 --- a/lib/private/Repair/RemoveLinkShares.php +++ b/lib/private/Repair/RemoveLinkShares.php @@ -111,7 +111,7 @@ class RemoveLinkShares implements IRepairStep { $data = $result->fetch(); $result->closeCursor(); - return (int) $data['total']; + return (int)$data['total']; } /** @@ -180,7 +180,7 @@ class RemoveLinkShares implements IRepairStep { $users = array_keys($this->userToNotify); foreach ($users as $user) { - $notification->setUser((string) $user); + $notification->setUser((string)$user); $this->notificationManager->notify($notification); } } diff --git a/lib/private/Repair/RepairInvalidShares.php b/lib/private/Repair/RepairInvalidShares.php index f28ae1c45fb..71e6359da5b 100644 --- a/lib/private/Repair/RepairInvalidShares.php +++ b/lib/private/Repair/RepairInvalidShares.php @@ -65,7 +65,7 @@ class RepairInvalidShares implements IRepairStep { $query->select('s1.parent') ->from('share', 's1') ->where($query->expr()->isNotNull('s1.parent')) - ->andWhere($query->expr()->isNull('s2.id')) + ->andWhere($query->expr()->isNull('s2.id')) ->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id')) ->groupBy('s1.parent') ->setMaxResults(self::CHUNK_SIZE); @@ -80,7 +80,7 @@ class RepairInvalidShares implements IRepairStep { $result = $query->execute(); while ($row = $result->fetch()) { $deletedInLastChunk++; - $deletedEntries += $deleteQuery->setParameter('parent', (int) $row['parent']) + $deletedEntries += $deleteQuery->setParameter('parent', (int)$row['parent']) ->execute(); } $result->closeCursor(); diff --git a/lib/private/Repair/RepairLogoDimension.php b/lib/private/Repair/RepairLogoDimension.php new file mode 100644 index 00000000000..854aeb3ab07 --- /dev/null +++ b/lib/private/Repair/RepairLogoDimension.php @@ -0,0 +1,82 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OC\Repair; + +use OCA\Theming\ImageManager; +use OCP\Files\NotFoundException; +use OCP\Files\NotPermittedException; +use OCP\IConfig; +use OCP\Migration\IOutput; +use OCP\Migration\IRepairStep; +use OCP\Server; + +class RepairLogoDimension implements IRepairStep { + public function __construct( + protected IConfig $config, + ) { + } + + public function getName(): string { + return 'Cache logo dimension to fix size in emails on Outlook'; + } + + public function run(IOutput $output): void { + $logoDimensions = $this->config->getAppValue('theming', 'logoDimensions'); + if (preg_match('/^\d+x\d+$/', $logoDimensions)) { + $output->info('Logo dimensions are already known'); + return; + } + + try { + /** @var ImageManager $imageManager */ + $imageManager = Server::get(ImageManager::class); + } catch (\Throwable) { + $output->info('Theming is disabled'); + return; + } + + if (!$imageManager->hasImage('logo')) { + $output->info('Theming is not used to provide a logo'); + return; + } + + try { + try { + $simpleFile = $imageManager->getImage('logo', false); + $image = @imagecreatefromstring($simpleFile->getContent()); + } catch (NotFoundException|NotPermittedException) { + $simpleFile = $imageManager->getImage('logo'); + $image = false; + } + } catch (NotFoundException|NotPermittedException) { + $output->info('Theming is not used to provide a logo'); + return; + } + + $dimensions = ''; + if ($image !== false) { + $dimensions = imagesx($image) . 'x' . imagesy($image); + } elseif (str_starts_with($simpleFile->getMimeType(), 'image/svg')) { + $matched = preg_match('/viewbox=["\']\d* \d* (\d*\.?\d*) (\d*\.?\d*)["\']/i', $simpleFile->getContent(), $matches); + if ($matched) { + $dimensions = $matches[1] . 'x' . $matches[2]; + } + } + + if (!$dimensions) { + $output->warning('Failed to read dimensions from logo'); + $this->config->deleteAppValue('theming', 'logoDimensions'); + return; + } + + $dimensions = imagesx($image) . 'x' . imagesy($image); + $this->config->setAppValue('theming', 'logoDimensions', $dimensions); + $output->info('Updated logo dimensions: ' . $dimensions); + } +} diff --git a/lib/private/Repair/RepairMimeTypes.php b/lib/private/Repair/RepairMimeTypes.php index 2eece761c8d..6932299dc4a 100644 --- a/lib/private/Repair/RepairMimeTypes.php +++ b/lib/private/Repair/RepairMimeTypes.php @@ -58,6 +58,7 @@ class RepairMimeTypes implements IRepairStep { $update = $this->connection->getQueryBuilder(); $update->update('filecache') + ->runAcrossAllShards() ->set('mimetype', $update->createParameter('mimetype')) ->where($update->expr()->neq('mimetype', $update->createParameter('mimetype'), IQueryBuilder::PARAM_INT)) ->andWhere($update->expr()->neq('mimetype', $update->createParameter('folder'), IQueryBuilder::PARAM_INT)) @@ -226,10 +227,10 @@ class RepairMimeTypes implements IRepairStep { */ private function introduceFlatOpenDocumentType(): IResult|int|null { $updatedMimetypes = [ - "fodt" => "application/vnd.oasis.opendocument.text-flat-xml", - "fods" => "application/vnd.oasis.opendocument.spreadsheet-flat-xml", - "fodg" => "application/vnd.oasis.opendocument.graphics-flat-xml", - "fodp" => "application/vnd.oasis.opendocument.presentation-flat-xml", + 'fodt' => 'application/vnd.oasis.opendocument.text-flat-xml', + 'fods' => 'application/vnd.oasis.opendocument.spreadsheet-flat-xml', + 'fodg' => 'application/vnd.oasis.opendocument.graphics-flat-xml', + 'fodp' => 'application/vnd.oasis.opendocument.presentation-flat-xml', ]; return $this->updateMimetypes($updatedMimetypes); @@ -251,8 +252,8 @@ class RepairMimeTypes implements IRepairStep { */ private function introduceOnlyofficeFormType(): IResult|int|null { $updatedMimetypes = [ - "oform" => "application/vnd.openxmlformats-officedocument.wordprocessingml.document.oform", - "docxf" => "application/vnd.openxmlformats-officedocument.wordprocessingml.document.docxf", + 'oform' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document.oform', + 'docxf' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document.docxf', ]; return $this->updateMimetypes($updatedMimetypes); diff --git a/lib/private/RichObjectStrings/Validator.php b/lib/private/RichObjectStrings/Validator.php index 41c2456ba27..197f48ed48c 100644 --- a/lib/private/RichObjectStrings/Validator.php +++ b/lib/private/RichObjectStrings/Validator.php @@ -78,6 +78,15 @@ class Validator implements IValidator { if (!empty($missingKeys)) { throw new InvalidObjectExeption('Object is invalid, missing keys:'.json_encode($missingKeys)); } + + foreach ($parameter as $key => $value) { + if (!is_string($key)) { + throw new InvalidObjectExeption('Object is invalid, key ' . $key . ' is not a string'); + } + if (!is_string($value)) { + throw new InvalidObjectExeption('Object is invalid, value ' . $value . ' is not a string'); + } + } } /** diff --git a/lib/private/Route/Route.php b/lib/private/Route/Route.php index 2fef3b10806..ab5a1f6b59a 100644 --- a/lib/private/Route/Route.php +++ b/lib/private/Route/Route.php @@ -128,7 +128,7 @@ class Route extends SymfonyRoute implements IRoute { */ public function actionInclude($file) { $function = function ($param) use ($file) { - unset($param["_route"]); + unset($param['_route']); $_GET = array_merge($_GET, $param); unset($param); require_once "$file"; diff --git a/lib/private/Route/Router.php b/lib/private/Route/Router.php index b04b6a4d21c..ba369eecac0 100644 --- a/lib/private/Route/Router.php +++ b/lib/private/Route/Router.php @@ -104,42 +104,39 @@ class Router implements IRouter { */ public function loadRoutes($app = null) { if (is_string($app)) { - $app = \OC_App::cleanAppId($app); + $app = $this->appManager->cleanAppId($app); } $requestedApp = $app; if ($this->loaded) { return; } + $this->eventLogger->start('route:load:' . $requestedApp, 'Loading Routes for ' . $requestedApp); if (is_null($app)) { $this->loaded = true; $routingFiles = $this->getRoutingFiles(); + + foreach (\OC_App::getEnabledApps() as $enabledApp) { + $this->loadAttributeRoutes($enabledApp); + } } else { if (isset($this->loadedApps[$app])) { return; } - $appPath = \OC_App::getAppPath($app); - $file = $appPath . '/appinfo/routes.php'; - if ($appPath !== false && file_exists($file)) { - $routingFiles = [$app => $file]; - } else { + try { + $appPath = $this->appManager->getAppPath($app); + $file = $appPath . '/appinfo/routes.php'; + if (file_exists($file)) { + $routingFiles = [$app => $file]; + } else { + $routingFiles = []; + } + } catch (AppPathNotFoundException) { $routingFiles = []; } - } - $this->eventLogger->start('route:load:' . $requestedApp, 'Loading Routes for ' . $requestedApp); - if ($requestedApp !== null && in_array($requestedApp, \OC_App::getEnabledApps())) { - $routes = $this->getAttributeRoutes($requestedApp); - if (count($routes) > 0) { - $this->useCollection($requestedApp); - $this->setupRoutes($routes, $requestedApp); - $collection = $this->getCollection($requestedApp); - $this->root->addCollection($collection); - - // Also add the OCS collection - $collection = $this->getCollection($requestedApp . '.ocs'); - $collection->addPrefix('/ocsapp'); - $this->root->addCollection($collection); + if ($this->appManager->isEnabledForUser($app)) { + $this->loadAttributeRoutes($app); } } @@ -245,14 +242,14 @@ class Router implements IRouter { // empty string / 'apps' / $app / rest of the route [, , $app,] = explode('/', $url, 4); - $app = \OC_App::cleanAppId($app); + $app = $this->appManager->cleanAppId($app); \OC::$REQUESTEDAPP = $app; $this->loadRoutes($app); } elseif (str_starts_with($url, '/ocsapp/apps/')) { // empty string / 'ocsapp' / 'apps' / $app / rest of the route [, , , $app,] = explode('/', $url, 5); - $app = \OC_App::cleanAppId($app); + $app = $this->appManager->cleanAppId($app); \OC::$REQUESTEDAPP = $app; $this->loadRoutes($app); } elseif (str_starts_with($url, '/settings/')) { @@ -413,6 +410,23 @@ class Router implements IRouter { return $routeName; } + private function loadAttributeRoutes(string $app): void { + $routes = $this->getAttributeRoutes($app); + if (count($routes) === 0) { + return; + } + + $this->useCollection($app); + $this->setupRoutes($routes, $app); + $collection = $this->getCollection($app); + $this->root->addCollection($collection); + + // Also add the OCS collection + $collection = $this->getCollection($app . '.ocs'); + $collection->addPrefix('/ocsapp'); + $this->root->addCollection($collection); + } + /** * @throws ReflectionException */ @@ -423,7 +437,11 @@ class Router implements IRouter { $appControllerPath = __DIR__ . '/../../../core/Controller'; $appNameSpace = 'OC\\Core'; } else { - $appControllerPath = \OC_App::getAppPath($app) . '/lib/Controller'; + try { + $appControllerPath = $this->appManager->getAppPath($app) . '/lib/Controller'; + } catch (AppPathNotFoundException) { + return []; + } $appNameSpace = App::buildAppNamespace($app); } diff --git a/lib/private/Search.php b/lib/private/Search.php deleted file mode 100644 index d51a305b331..00000000000 --- a/lib/private/Search.php +++ /dev/null @@ -1,100 +0,0 @@ -<?php - -/** - * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors - * SPDX-FileCopyrightText: 2016 ownCloud, Inc. - * SPDX-License-Identifier: AGPL-3.0-only - */ -namespace OC; - -use OCP\ISearch; -use OCP\Search\PagedProvider; -use OCP\Search\Provider; -use Psr\Log\LoggerInterface; - -/** - * Provide an interface to all search providers - */ -class Search implements ISearch { - /** @var Provider[] */ - private $providers = []; - private $registeredProviders = []; - - /** - * Search all providers for $query - * @param string $query - * @param string[] $inApps optionally limit results to the given apps - * @param int $page pages start at page 1 - * @param int $size, 0 = all - * @return array An array of OC\Search\Result's - */ - public function searchPaged($query, array $inApps = [], $page = 1, $size = 30) { - $this->initProviders(); - $results = []; - foreach ($this->providers as $provider) { - if (! $provider->providesResultsFor($inApps)) { - continue; - } - if ($provider instanceof PagedProvider) { - $results = array_merge($results, $provider->searchPaged($query, $page, $size)); - } elseif ($provider instanceof Provider) { - $providerResults = $provider->search($query); - if ($size > 0) { - $slicedResults = array_slice($providerResults, ($page - 1) * $size, $size); - $results = array_merge($results, $slicedResults); - } else { - $results = array_merge($results, $providerResults); - } - } else { - \OCP\Server::get(LoggerInterface::class)->warning('Ignoring Unknown search provider', ['provider' => $provider]); - } - } - return $results; - } - - /** - * Remove all registered search providers - */ - public function clearProviders() { - $this->providers = []; - $this->registeredProviders = []; - } - - /** - * Remove one existing search provider - * @param string $provider class name of a OC\Search\Provider - */ - public function removeProvider($provider) { - $this->registeredProviders = array_filter( - $this->registeredProviders, - function ($element) use ($provider) { - return ($element['class'] != $provider); - } - ); - // force regeneration of providers on next search - $this->providers = []; - } - - /** - * Register a new search provider to search with - * @param string $class class name of a OC\Search\Provider - * @param array $options optional - */ - public function registerProvider($class, array $options = []) { - $this->registeredProviders[] = ['class' => $class, 'options' => $options]; - } - - /** - * Create instances of all the registered search providers - */ - private function initProviders() { - if (! empty($this->providers)) { - return; - } - foreach ($this->registeredProviders as $provider) { - $class = $provider['class']; - $options = $provider['options']; - $this->providers[] = new $class($options); - } - } -} diff --git a/lib/private/Search/FilterFactory.php b/lib/private/Search/FilterFactory.php index 1317dd759af..1466042291d 100644 --- a/lib/private/Search/FilterFactory.php +++ b/lib/private/Search/FilterFactory.php @@ -27,7 +27,7 @@ final class FilterFactory { FilterDefinition::TYPE_NC_USER => new Filter\UserFilter($filter, \OC::$server->get(IUserManager::class)), FilterDefinition::TYPE_PERSON => self::getPerson($filter), FilterDefinition::TYPE_STRING => new Filter\StringFilter($filter), - FilterDefinition::TYPE_STRINGS => new Filter\StringsFilter(... (array) $filter), + FilterDefinition::TYPE_STRINGS => new Filter\StringsFilter(... (array)$filter), default => throw new RuntimeException('Invalid filter type '. $type), }; } diff --git a/lib/private/Search/Provider/File.php b/lib/private/Search/Provider/File.php deleted file mode 100644 index ca4b1b8677f..00000000000 --- a/lib/private/Search/Provider/File.php +++ /dev/null @@ -1,87 +0,0 @@ -<?php - -/** - * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors - * SPDX-FileCopyrightText: 2016 ownCloud, Inc. - * SPDX-License-Identifier: AGPL-3.0-only - */ -namespace OC\Search\Provider; - -use OC\Files\Search\SearchComparison; -use OC\Files\Search\SearchOrder; -use OC\Files\Search\SearchQuery; -use OCP\Files\FileInfo; -use OCP\Files\IRootFolder; -use OCP\Files\Search\ISearchComparison; -use OCP\Files\Search\ISearchOrder; -use OCP\IUserSession; -use OCP\Search\PagedProvider; - -/** - * Provide search results from the 'files' app - * @deprecated 20.0.0 - */ -class File extends PagedProvider { - /** - * Search for files and folders matching the given query - * - * @param string $query - * @param int|null $limit - * @param int|null $offset - * @return \OCP\Search\Result[] - * @deprecated 20.0.0 - */ - public function search($query, ?int $limit = null, ?int $offset = null) { - /** @var IRootFolder $rootFolder */ - $rootFolder = \OCP\Server::get(IRootFolder::class); - /** @var IUserSession $userSession */ - $userSession = \OCP\Server::get(IUserSession::class); - $user = $userSession->getUser(); - if (!$user) { - return []; - } - $userFolder = $rootFolder->getUserFolder($user->getUID()); - $fileQuery = new SearchQuery( - new SearchComparison(ISearchComparison::COMPARE_LIKE, 'name', '%' . $query . '%'), - (int)$limit, - (int)$offset, - [ - new SearchOrder(ISearchOrder::DIRECTION_DESCENDING, 'mtime'), - ], - $user - ); - $files = $userFolder->search($fileQuery); - $results = []; - // edit results - foreach ($files as $fileData) { - // create audio result - if ($fileData->getMimePart() === 'audio') { - $result = new \OC\Search\Result\Audio($fileData); - } - // create image result - elseif ($fileData->getMimePart() === 'image') { - $result = new \OC\Search\Result\Image($fileData); - } - // create folder result - elseif ($fileData->getMimetype() === FileInfo::MIMETYPE_FOLDER) { - $result = new \OC\Search\Result\Folder($fileData); - } - // or create file result - else { - $result = new \OC\Search\Result\File($fileData); - } - // add to results - $results[] = $result; - } - // return - return $results; - } - - public function searchPaged($query, $page, $size) { - if ($size === 0) { - return $this->search($query); - } else { - return $this->search($query, $size, ($page - 1) * $size); - } - } -} diff --git a/lib/private/Search/Result/Audio.php b/lib/private/Search/Result/Audio.php deleted file mode 100644 index 42b8ac75da0..00000000000 --- a/lib/private/Search/Result/Audio.php +++ /dev/null @@ -1,25 +0,0 @@ -<?php - -/** - * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors - * SPDX-FileCopyrightText: 2016 ownCloud, Inc. - * SPDX-License-Identifier: AGPL-3.0-only - */ -namespace OC\Search\Result; - -/** - * A found audio file - * @deprecated 20.0.0 - */ -class Audio extends File { - /** - * Type name; translated in templates - * @var string - * @deprecated 20.0.0 - */ - public $type = 'audio'; - - /** - * @TODO add ID3 information - */ -} diff --git a/lib/private/Search/Result/File.php b/lib/private/Search/Result/File.php deleted file mode 100644 index f1346481b86..00000000000 --- a/lib/private/Search/Result/File.php +++ /dev/null @@ -1,132 +0,0 @@ -<?php - -/** - * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors - * SPDX-FileCopyrightText: 2016 ownCloud, Inc. - * SPDX-License-Identifier: AGPL-3.0-only - */ -namespace OC\Search\Result; - -use OCP\Files\FileInfo; -use OCP\Files\Folder; -use OCP\IPreview; -use OCP\IUserSession; - -/** - * A found file - * @deprecated 20.0.0 - */ -class File extends \OCP\Search\Result { - /** - * Type name; translated in templates - * @var string - * @deprecated 20.0.0 - */ - public $type = 'file'; - - /** - * Path to file - * @var string - * @deprecated 20.0.0 - */ - public $path; - - /** - * Size, in bytes - * @var int - * @deprecated 20.0.0 - */ - public $size; - - /** - * Date modified, in human readable form - * @var string - * @deprecated 20.0.0 - */ - public $modified; - - /** - * File mime type - * @var string - * @deprecated 20.0.0 - */ - public $mime_type; - - /** - * File permissions: - * - * @var string - * @deprecated 20.0.0 - */ - public $permissions; - - /** - * Has a preview - * - * @var string - * @deprecated 20.0.0 - */ - public $has_preview; - - /** - * Create a new file search result - * @param FileInfo $data file data given by provider - * @deprecated 20.0.0 - */ - public function __construct(FileInfo $data) { - $path = $this->getRelativePath($data->getPath()); - - $this->id = $data->getId(); - $this->name = $data->getName(); - $this->link = \OC::$server->getURLGenerator()->linkToRoute( - 'files.view.index', - [ - 'dir' => dirname($path), - 'scrollto' => $data->getName(), - ] - ); - $this->permissions = $data->getPermissions(); - $this->path = $path; - $this->size = $data->getSize(); - $this->modified = $data->getMtime(); - $this->mime_type = $data->getMimetype(); - $this->has_preview = $this->hasPreview($data); - } - - /** - * @var Folder $userFolderCache - * @deprecated 20.0.0 - */ - protected static $userFolderCache = null; - - /** - * converts a path relative to the users files folder - * eg /user/files/foo.txt -> /foo.txt - * @param string $path - * @return string relative path - * @deprecated 20.0.0 - */ - protected function getRelativePath($path) { - if (!isset(self::$userFolderCache)) { - $userSession = \OC::$server->get(IUserSession::class); - $userID = $userSession->getUser()->getUID(); - self::$userFolderCache = \OC::$server->getUserFolder($userID); - } - $relativePath = self::$userFolderCache->getRelativePath($path); - if ($relativePath === null) { - throw new \Exception("Search result not in user folder"); - } - return $relativePath; - } - - /** - * Is the preview available - * @param FileInfo $data - * @return bool - * @deprecated 20.0.0 - */ - protected function hasPreview($data) { - $previewManager = \OC::$server->get(IPreview::class); - return $previewManager->isAvailable($data); - } -} diff --git a/lib/private/Search/Result/Folder.php b/lib/private/Search/Result/Folder.php deleted file mode 100644 index 37de0a031a7..00000000000 --- a/lib/private/Search/Result/Folder.php +++ /dev/null @@ -1,21 +0,0 @@ -<?php - -/** - * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors - * SPDX-FileCopyrightText: 2016 ownCloud, Inc. - * SPDX-License-Identifier: AGPL-3.0-only - */ -namespace OC\Search\Result; - -/** - * A found folder - * @deprecated 20.0.0 - */ -class Folder extends File { - /** - * Type name; translated in templates - * @var string - * @deprecated 20.0.0 - */ - public $type = 'folder'; -} diff --git a/lib/private/Search/Result/Image.php b/lib/private/Search/Result/Image.php deleted file mode 100644 index e1333424017..00000000000 --- a/lib/private/Search/Result/Image.php +++ /dev/null @@ -1,25 +0,0 @@ -<?php - -/** - * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors - * SPDX-FileCopyrightText: 2016 ownCloud, Inc. - * SPDX-License-Identifier: AGPL-3.0-only - */ -namespace OC\Search\Result; - -/** - * A found image file - * @deprecated 20.0.0 - */ -class Image extends File { - /** - * Type name; translated in templates - * @var string - * @deprecated 20.0.0 - */ - public $type = 'image'; - - /** - * @TODO add EXIF information - */ -} diff --git a/lib/private/Search/SearchQuery.php b/lib/private/Search/SearchQuery.php index a78443922ae..791edb7a0f7 100644 --- a/lib/private/Search/SearchQuery.php +++ b/lib/private/Search/SearchQuery.php @@ -25,7 +25,7 @@ class SearchQuery implements ISearchQuery { private int $limit = self::LIMIT_DEFAULT, private int|string|null $cursor = null, private string $route = '', - private array $routeParameters = [], + private array $routeParameters = [], ) { } diff --git a/lib/private/Security/Bruteforce/Backend/DatabaseBackend.php b/lib/private/Security/Bruteforce/Backend/DatabaseBackend.php index 0e272d94d0d..33c2a3aae62 100644 --- a/lib/private/Security/Bruteforce/Backend/DatabaseBackend.php +++ b/lib/private/Security/Bruteforce/Backend/DatabaseBackend.php @@ -45,7 +45,7 @@ class DatabaseBackend implements IBackend { $row = $result->fetch(); $result->closeCursor(); - return (int) $row['attempts']; + return (int)$row['attempts']; } /** diff --git a/lib/private/Security/Bruteforce/Backend/MemoryCacheBackend.php b/lib/private/Security/Bruteforce/Backend/MemoryCacheBackend.php index 32571c72fae..bf076240bf8 100644 --- a/lib/private/Security/Bruteforce/Backend/MemoryCacheBackend.php +++ b/lib/private/Security/Bruteforce/Backend/MemoryCacheBackend.php @@ -19,7 +19,7 @@ class MemoryCacheBackend implements IBackend { ICacheFactory $cacheFactory, private ITimeFactory $timeFactory, ) { - $this->cache = $cacheFactory->createDistributed(__CLASS__); + $this->cache = $cacheFactory->createDistributed(self::class); } private function hash( diff --git a/lib/private/Security/Bruteforce/Throttler.php b/lib/private/Security/Bruteforce/Throttler.php index 7e310035ce4..596fcf408fa 100644 --- a/lib/private/Security/Bruteforce/Throttler.php +++ b/lib/private/Security/Bruteforce/Throttler.php @@ -176,7 +176,7 @@ class Throttler implements IThrottler { return 0; } - $maxAgeTimestamp = (int) ($this->timeFactory->getTime() - 3600 * $maxAgeHours); + $maxAgeTimestamp = (int)($this->timeFactory->getTime() - 3600 * $maxAgeHours); return $this->backend->getAttempts( $ipAddress->getSubnet(), @@ -204,7 +204,7 @@ class Throttler implements IThrottler { if ($delay > self::MAX_DELAY) { return self::MAX_DELAY_MS; } - return (int) \ceil($delay * 1000); + return (int)\ceil($delay * 1000); } /** diff --git a/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php b/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php index 0f637e5afd6..993f74ae0e4 100644 --- a/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php +++ b/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php @@ -30,7 +30,11 @@ class ContentSecurityPolicyNonceManager { public function getNonce(): string { if ($this->nonce === '') { if (empty($this->request->server['CSP_NONCE'])) { - $this->nonce = base64_encode($this->csrfTokenManager->getToken()->getEncryptedValue()); + // Get the token from the CSRF token, we only use the "shared secret" part + // as the first part does not add any security / entropy to the token + // so it can be ignored to keep the nonce short while keeping the same randomness + $csrfSecret = explode(':', ($this->csrfTokenManager->getToken()->getEncryptedValue())); + $this->nonce = end($csrfSecret); } else { $this->nonce = $this->request->server['CSP_NONCE']; } diff --git a/lib/private/Security/CertificateManager.php b/lib/private/Security/CertificateManager.php index f9fd2b160b8..00babff735f 100644 --- a/lib/private/Security/CertificateManager.php +++ b/lib/private/Security/CertificateManager.php @@ -8,7 +8,6 @@ declare(strict_types=1); */ namespace OC\Security; -use OC\Files\Filesystem; use OC\Files\View; use OCP\ICertificate; use OCP\ICertificateManager; @@ -150,20 +149,19 @@ class CertificateManager implements ICertificateManager { * @throws \Exception If the certificate could not get added */ public function addCertificate(string $certificate, string $name): ICertificate { - if (!Filesystem::isValidPath($name) or Filesystem::isFileBlacklisted($name)) { - throw new \Exception('Filename is not valid'); - } + $path = $this->getPathToCertificates() . 'uploads/' . $name; + $directory = dirname($path); + + $this->view->verifyPath($directory, basename($path)); $this->bundlePath = null; - $dir = $this->getPathToCertificates() . 'uploads/'; - if (!$this->view->file_exists($dir)) { - $this->view->mkdir($dir); + if (!$this->view->file_exists($directory)) { + $this->view->mkdir($directory); } try { - $file = $dir . $name; $certificateObject = new Certificate($certificate, $name); - $this->view->file_put_contents($file, $certificate); + $this->view->file_put_contents($path, $certificate); $this->createCertificateBundle(); return $certificateObject; } catch (\Exception $e) { @@ -175,14 +173,17 @@ class CertificateManager implements ICertificateManager { * Remove the certificate and re-generate the certificate bundle */ public function removeCertificate(string $name): bool { - if (!Filesystem::isValidPath($name)) { + $path = $this->getPathToCertificates() . 'uploads/' . $name; + + try { + $this->view->verifyPath(dirname($path), basename($path)); + } catch (\Exception) { return false; } - $this->bundlePath = null; - $path = $this->getPathToCertificates() . 'uploads/'; - if ($this->view->file_exists($path . $name)) { - $this->view->unlink($path . $name); + $this->bundlePath = null; + if ($this->view->file_exists($path)) { + $this->view->unlink($path); $this->createCertificateBundle(); } return true; diff --git a/lib/private/Security/Ip/Address.php b/lib/private/Security/Ip/Address.php new file mode 100644 index 00000000000..1df94e0a9c7 --- /dev/null +++ b/lib/private/Security/Ip/Address.php @@ -0,0 +1,48 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OC\Security\Ip; + +use InvalidArgumentException; +use IPLib\Address\AddressInterface; +use IPLib\Factory; +use OCP\Security\Ip\IAddress; +use OCP\Security\Ip\IRange; + +/** + * @since 30.0.0 + */ +class Address implements IAddress { + private readonly AddressInterface $ip; + + public function __construct(string $ip) { + $ip = Factory::parseAddressString($ip); + if ($ip === null) { + throw new InvalidArgumentException('Given IP address can’t be parsed'); + } + $this->ip = $ip; + } + + public static function isValid(string $ip): bool { + return Factory::parseAddressString($ip) !== null; + } + + public function matches(IRange... $ranges): bool { + foreach ($ranges as $range) { + if ($range->contains($this)) { + return true; + } + } + + return false; + } + + public function __toString(): string { + return $this->ip->toString(); + } +} diff --git a/lib/private/Security/Ip/Factory.php b/lib/private/Security/Ip/Factory.php new file mode 100644 index 00000000000..1eedcf27a09 --- /dev/null +++ b/lib/private/Security/Ip/Factory.php @@ -0,0 +1,23 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OC\Security\Ip; + +use OCP\Security\Ip\IAddress; +use OCP\Security\Ip\IFactory; +use OCP\Security\Ip\IRange; + +class Factory implements IFactory { + public function rangeFromString(string $range): IRange { + return new Range($range); + } + + public function addressFromString(string $ip): IAddress { + return new Address($ip); + } +} diff --git a/lib/private/Security/Ip/Range.php b/lib/private/Security/Ip/Range.php new file mode 100644 index 00000000000..39c03677f81 --- /dev/null +++ b/lib/private/Security/Ip/Range.php @@ -0,0 +1,39 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OC\Security\Ip; + +use InvalidArgumentException; +use IPLib\Factory; +use IPLib\Range\RangeInterface; +use OCP\Security\Ip\IAddress; +use OCP\Security\Ip\IRange; + +class Range implements IRange { + private readonly RangeInterface $range; + + public function __construct(string $range) { + $range = Factory::parseRangeString($range); + if ($range === null) { + throw new InvalidArgumentException('Given range can’t be parsed'); + } + $this->range = $range; + } + + public static function isValid(string $range): bool { + return Factory::parseRangeString($range) !== null; + } + + public function contains(IAddress $address): bool { + return $this->range->contains(Factory::parseAddressString((string)$address)); + } + + public function __toString(): string { + return $this->range->toString(); + } +} diff --git a/lib/private/Security/Ip/RemoteAddress.php b/lib/private/Security/Ip/RemoteAddress.php new file mode 100644 index 00000000000..cef511099b1 --- /dev/null +++ b/lib/private/Security/Ip/RemoteAddress.php @@ -0,0 +1,71 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OC\Security\Ip; + +use OCP\IConfig; +use OCP\IRequest; +use OCP\Security\Ip\IAddress; +use OCP\Security\Ip\IRange; +use OCP\Security\Ip\IRemoteAddress; + +class RemoteAddress implements IRemoteAddress, IAddress { + public const SETTING_NAME = 'allowed_admin_ranges'; + + private readonly ?IAddress $ip; + + public function __construct( + private IConfig $config, + IRequest $request, + ) { + $remoteAddress = $request->getRemoteAddress(); + $this->ip = $remoteAddress === '' + ? null + : new Address($remoteAddress); + } + + public static function isValid(string $ip): bool { + return Address::isValid($ip); + } + + public function matches(IRange... $ranges): bool { + return $this->ip === null + ? true + : $this->ip->matches(... $ranges); + } + + public function allowsAdminActions(): bool { + if ($this->ip === null) { + return true; + } + + $allowedAdminRanges = $this->config->getSystemValue(self::SETTING_NAME, false); + + // Don't apply restrictions on empty or invalid configuration + if ( + $allowedAdminRanges === false + || !is_array($allowedAdminRanges) + || empty($allowedAdminRanges) + ) { + return true; + } + + foreach ($allowedAdminRanges as $allowedAdminRange) { + if ((new Range($allowedAdminRange))->contains($this->ip)) { + return true; + } + } + + return false; + } + + public function __toString(): string { + return (string)$this->ip; + } +} diff --git a/lib/private/Security/RateLimiting/Backend/MemoryCacheBackend.php b/lib/private/Security/RateLimiting/Backend/MemoryCacheBackend.php index 84eb9fbd084..4c33b49d05e 100644 --- a/lib/private/Security/RateLimiting/Backend/MemoryCacheBackend.php +++ b/lib/private/Security/RateLimiting/Backend/MemoryCacheBackend.php @@ -27,7 +27,7 @@ class MemoryCacheBackend implements IBackend { ICacheFactory $cacheFactory, private ITimeFactory $timeFactory, ) { - $this->cache = $cacheFactory->createDistributed(__CLASS__); + $this->cache = $cacheFactory->createDistributed(self::class); } private function hash( diff --git a/lib/private/Security/SecureRandom.php b/lib/private/Security/SecureRandom.php index 459d43475b7..b2a3d19ce74 100644 --- a/lib/private/Security/SecureRandom.php +++ b/lib/private/Security/SecureRandom.php @@ -24,7 +24,7 @@ class SecureRandom implements ISecureRandom { * Generate a secure random string of specified length. * @param int $length The length of the generated string * @param string $characters An optional list of characters to use if no character list is - * specified all valid base64 characters are used. + * specified all valid base64 characters are used. * @throws \LengthException if an invalid length is requested */ public function generate( diff --git a/lib/private/Server.php b/lib/private/Server.php index bcdf482f02d..c514a4b93ff 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -100,6 +100,7 @@ use OC\Security\CSP\ContentSecurityPolicyNonceManager; use OC\Security\CSRF\CsrfTokenManager; use OC\Security\CSRF\TokenStorage\SessionStorage; use OC\Security\Hasher; +use OC\Security\Ip\RemoteAddress; use OC\Security\RateLimiting\Limiter; use OC\Security\SecureRandom; use OC\Security\TrustedDomainHelper; @@ -184,7 +185,6 @@ use OCP\IPhoneNumberUtil; use OCP\IPreview; use OCP\IRequest; use OCP\IRequestId; -use OCP\ISearch; use OCP\IServerContainer; use OCP\ISession; use OCP\ITagManager; @@ -213,6 +213,7 @@ use OCP\Security\IContentSecurityPolicyManager; use OCP\Security\ICredentialsManager; use OCP\Security\ICrypto; use OCP\Security\IHasher; +use OCP\Security\Ip\IRemoteAddress; use OCP\Security\ISecureRandom; use OCP\Security\ITrustedDomainHelper; use OCP\Security\RateLimiting\ILimiter; @@ -464,7 +465,8 @@ class Server extends ServerContainer implements IServerContainer { $this->get(IUserManager::class), $this->get(IEventDispatcher::class), $this->get(LoggerInterface::class), - $this->get(ICacheFactory::class) + $this->get(ICacheFactory::class), + $this->get(IRemoteAddress::class), ); return $groupManager; }); @@ -487,7 +489,7 @@ class Server extends ServerContainer implements IServerContainer { $this->registerService(\OC\User\Session::class, function (Server $c) { $manager = $c->get(IUserManager::class); - $session = new \OC\Session\Memory(''); + $session = new \OC\Session\Memory(); $timeFactory = new TimeFactory(); // Token providers might require a working database. This code // might however be called when Nextcloud is not yet setup. @@ -506,7 +508,7 @@ class Server extends ServerContainer implements IServerContainer { $c->get(ISecureRandom::class), $c->get('LockdownManager'), $c->get(LoggerInterface::class), - $c->get(IEventDispatcher::class) + $c->get(IEventDispatcher::class), ); /** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */ $userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) { @@ -635,44 +637,51 @@ class Server extends ServerContainer implements IServerContainer { $this->registerService(Factory::class, function (Server $c) { $profiler = $c->get(IProfiler::class); - $arrayCacheFactory = new \OC\Memcache\Factory('', $c->get(LoggerInterface::class), + $arrayCacheFactory = new \OC\Memcache\Factory(fn () => '', $c->get(LoggerInterface::class), $profiler, ArrayCache::class, ArrayCache::class, ArrayCache::class ); - /** @var \OCP\IConfig $config */ - $config = $c->get(\OCP\IConfig::class); - - if ($config->getSystemValueBool('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) { - if (!$config->getSystemValueBool('log_query')) { - try { - $v = \OC_App::getAppVersions(); - } catch (\Doctrine\DBAL\Exception $e) { - // Database service probably unavailable - // Probably related to https://github.com/nextcloud/server/issues/37424 - return $arrayCacheFactory; + /** @var SystemConfig $config */ + $config = $c->get(SystemConfig::class); + + if ($config->getValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) { + $logQuery = $config->getValue('log_query'); + $prefixClosure = function () use ($logQuery) { + if (!$logQuery) { + try { + $v = \OC_App::getAppVersions(); + } catch (\Doctrine\DBAL\Exception $e) { + // Database service probably unavailable + // Probably related to https://github.com/nextcloud/server/issues/37424 + return null; + } + } else { + // If the log_query is enabled, we can not get the app versions + // as that does a query, which will be logged and the logging + // depends on redis and here we are back again in the same function. + $v = [ + 'log_query' => 'enabled', + ]; } - } else { - // If the log_query is enabled, we can not get the app versions - // as that does a query, which will be logged and the logging - // depends on redis and here we are back again in the same function. - $v = [ - 'log_query' => 'enabled', - ]; - } - $v['core'] = implode(',', \OC_Util::getVersion()); - $version = implode(',', $v); - $instanceId = \OC_Util::getInstanceId(); - $path = \OC::$SERVERROOT; - $prefix = md5($instanceId . '-' . $version . '-' . $path); - return new \OC\Memcache\Factory($prefix, + $v['core'] = implode(',', \OC_Util::getVersion()); + $version = implode(',', $v); + $instanceId = \OC_Util::getInstanceId(); + $path = \OC::$SERVERROOT; + return md5($instanceId . '-' . $version . '-' . $path); + }; + return new \OC\Memcache\Factory($prefixClosure, $c->get(LoggerInterface::class), $profiler, - $config->getSystemValue('memcache.local', null), - $config->getSystemValue('memcache.distributed', null), - $config->getSystemValue('memcache.locking', null), - $config->getSystemValueString('redis_log_file') + /** @psalm-taint-escape callable */ + $config->getValue('memcache.local', null), + /** @psalm-taint-escape callable */ + $config->getValue('memcache.distributed', null), + /** @psalm-taint-escape callable */ + $config->getValue('memcache.locking', null), + /** @psalm-taint-escape callable */ + $config->getValue('redis_log_file') ); } return $arrayCacheFactory; @@ -733,7 +742,7 @@ class Server extends ServerContainer implements IServerContainer { $logger = $factory->get($logType); $registry = $c->get(\OCP\Support\CrashReport\IRegistry::class); - return new Log($logger, $this->get(SystemConfig::class), null, $registry); + return new Log($logger, $this->get(SystemConfig::class), crashReporters: $registry); }); $this->registerAlias(ILogger::class, \OC\Log::class); /** @deprecated 19.0.0 */ @@ -762,10 +771,6 @@ class Server extends ServerContainer implements IServerContainer { /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('Router', IRouter::class); - $this->registerAlias(ISearch::class, Search::class); - /** @deprecated 19.0.0 */ - $this->registerDeprecatedAlias('Search', ISearch::class); - $this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) { $config = $c->get(\OCP\IConfig::class); if (ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) { @@ -806,7 +811,7 @@ class Server extends ServerContainer implements IServerContainer { $this->registerAlias(IDBConnection::class, ConnectionAdapter::class); $this->registerService(Connection::class, function (Server $c) { $systemConfig = $c->get(SystemConfig::class); - $factory = new \OC\DB\ConnectionFactory($systemConfig); + $factory = new \OC\DB\ConnectionFactory($systemConfig, $c->get(ICacheFactory::class)); $type = $systemConfig->getValue('dbtype', 'sqlite'); if (!$factory->isValidType($type)) { throw new \OC\DatabaseException('Invalid database type'); @@ -949,10 +954,10 @@ class Server extends ServerContainer implements IServerContainer { if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) { $config = $c->get(\OCP\IConfig::class); $appConfig = $c->get(\OCP\IAppConfig::class); - $appManager = $c->get(IAppManager::class); } else { $config = $appConfig = $appManager = null; } + $appManager = $c->get(IAppManager::class); return new Checker( new EnvironmentHelper(), @@ -1023,6 +1028,9 @@ class Server extends ServerContainer implements IServerContainer { /** @deprecated 19.0.0 */ $this->registerDeprecatedAlias('Mailer', IMailer::class); + /** @since 30.0.0 */ + $this->registerAlias(\OCP\Mail\Provider\IManager::class, \OC\Mail\Provider\Manager::class); + /** @deprecated 21.0.0 */ $this->registerDeprecatedAlias('LDAPProvider', ILDAPProvider::class); @@ -1159,6 +1167,7 @@ class Server extends ServerContainer implements IServerContainer { ); return new ThemingDefaults( $c->get(\OCP\IConfig::class), + $c->get(\OCP\IAppConfig::class), $c->getL10N('theming'), $c->get(IUserSession::class), $c->get(IURLGenerator::class), @@ -1371,6 +1380,8 @@ class Server extends ServerContainer implements IServerContainer { $this->registerAlias(\OCP\Files\AppData\IAppDataFactory::class, \OC\Files\AppData\Factory::class); + $this->registerAlias(\OCP\Files\IFilenameValidator::class, \OC\Files\FilenameValidator::class); + $this->registerAlias(IBinaryFinder::class, BinaryFinder::class); $this->registerAlias(\OCP\Share\IPublicShareTemplateFactory::class, \OC\Share20\PublicShareTemplateFactory::class); @@ -1401,6 +1412,10 @@ class Server extends ServerContainer implements IServerContainer { $this->registerAlias(\OCP\TaskProcessing\IManager::class, \OC\TaskProcessing\Manager::class); + $this->registerAlias(IRemoteAddress::class, RemoteAddress::class); + + $this->registerAlias(\OCP\Security\Ip\IFactory::class, \OC\Security\Ip\Factory::class); + $this->connectDispatcher(); } @@ -1798,16 +1813,6 @@ class Server extends ServerContainer implements IServerContainer { } /** - * Returns a search instance - * - * @return ISearch - * @deprecated 20.0.0 - */ - public function getSearch() { - return $this->get(ISearch::class); - } - - /** * Returns a SecureRandom instance * * @return \OCP\Security\ISecureRandom diff --git a/lib/private/Session/Internal.php b/lib/private/Session/Internal.php index 4384b0ab5c0..b465bcd3eda 100644 --- a/lib/private/Session/Internal.php +++ b/lib/private/Session/Internal.php @@ -11,7 +11,11 @@ namespace OC\Session; use OC\Authentication\Token\IProvider; use OCP\Authentication\Exceptions\InvalidTokenException; +use OCP\ILogger; use OCP\Session\Exceptions\SessionNotAvailableException; +use Psr\Log\LoggerInterface; +use function call_user_func_array; +use function microtime; /** * Class Internal @@ -25,9 +29,13 @@ class Internal extends Session { * @param string $name * @throws \Exception */ - public function __construct(string $name) { + public function __construct( + string $name, + private ?LoggerInterface $logger, + ) { set_error_handler([$this, 'trapError']); $this->invoke('session_name', [$name]); + $this->invoke('session_cache_limiter', ['']); try { $this->startSession(); } catch (\Exception $e) { @@ -183,11 +191,31 @@ class Internal extends Session { */ private function invoke(string $functionName, array $parameters = [], bool $silence = false) { try { + $timeBefore = microtime(true); if ($silence) { - return @call_user_func_array($functionName, $parameters); + $result = @call_user_func_array($functionName, $parameters); } else { - return call_user_func_array($functionName, $parameters); + $result = call_user_func_array($functionName, $parameters); } + $timeAfter = microtime(true); + $timeSpent = $timeAfter - $timeBefore; + if ($timeSpent > 0.1) { + $logLevel = match (true) { + $timeSpent > 25 => ILogger::ERROR, + $timeSpent > 10 => ILogger::WARN, + $timeSpent > 0.5 => ILogger::INFO, + default => ILogger::DEBUG, + }; + $this->logger?->log( + $logLevel, + "Slow session operation $functionName detected", + [ + 'parameters' => $parameters, + 'timeSpent' => $timeSpent, + ], + ); + } + return $result; } catch (\Error $e) { $this->trapError($e->getCode(), $e->getMessage()); } diff --git a/lib/private/Session/Memory.php b/lib/private/Session/Memory.php index eb10ebe05b4..395711836f5 100644 --- a/lib/private/Session/Memory.php +++ b/lib/private/Session/Memory.php @@ -20,11 +20,6 @@ use OCP\Session\Exceptions\SessionNotAvailableException; class Memory extends Session { protected $data; - public function __construct(string $name) { - //no need to use $name since all data is already scoped to this instance - $this->data = []; - } - /** * @param string $key * @param integer $value diff --git a/lib/private/Session/Session.php b/lib/private/Session/Session.php index 3006eceecba..b7510b63683 100644 --- a/lib/private/Session/Session.php +++ b/lib/private/Session/Session.php @@ -20,13 +20,6 @@ abstract class Session implements \ArrayAccess, ISession { protected $sessionClosed = false; /** - * $name serves as a namespace for the session keys - * - * @param string $name - */ - abstract public function __construct(string $name); - - /** * @param mixed $offset * @return bool */ diff --git a/lib/private/Settings/Section.php b/lib/private/Settings/Section.php index 4f8234254b1..9cc6523b9ae 100644 --- a/lib/private/Settings/Section.php +++ b/lib/private/Settings/Section.php @@ -32,7 +32,7 @@ class Section implements IIconSection { /** * @return string The ID of the section. It is supposed to be a lower case string, - * e.g. 'ldap' + * e.g. 'ldap' */ public function getID() { return $this->id; @@ -40,7 +40,7 @@ class Section implements IIconSection { /** * @return string The translated name as it should be displayed, e.g. 'LDAP / AD - * integration'. Use the L10N service to translate it. + * integration'. Use the L10N service to translate it. */ public function getName() { return $this->name; @@ -48,8 +48,8 @@ class Section implements IIconSection { /** * @return int whether the form should be rather on the top or bottom of - * the settings navigation. The sections are arranged in ascending order of - * the priority values. It is required to return a value between 0 and 99. + * the settings navigation. The sections are arranged in ascending order of + * the priority values. It is required to return a value between 0 and 99. * * E.g.: 70 */ @@ -59,7 +59,7 @@ class Section implements IIconSection { /** * @return string The relative path to an 16*16 icon describing the section. - * e.g. '/core/img/places/files.svg' + * e.g. '/core/img/places/files.svg' * * @since 12 */ diff --git a/lib/private/Setup.php b/lib/private/Setup.php index a5683655447..fb054bca4e0 100644 --- a/lib/private/Setup.php +++ b/lib/private/Setup.php @@ -147,7 +147,7 @@ class Setup { * a few system checks. * * @return array of system info, including an "errors" value - * in case of errors/warnings + * in case of errors/warnings */ public function getSystemInfo(bool $allowAllDatabases = false): array { $databases = $this->getSupportedDatabases($allowAllDatabases); @@ -230,7 +230,7 @@ class Setup { $error[] = $l->t('Set an admin password.'); } if (empty($options['directory'])) { - $options['directory'] = \OC::$SERVERROOT . "/data"; + $options['directory'] = \OC::$SERVERROOT . '/data'; } if (!isset(self::$dbSetupClasses[$dbType])) { @@ -248,7 +248,7 @@ class Setup { // validate the data directory if ((!is_dir($dataDir) && !mkdir($dataDir)) || !is_writable($dataDir)) { - $error[] = $l->t("Cannot create or write into the data directory %s", [$dataDir]); + $error[] = $l->t('Cannot create or write into the data directory %s', [$dataDir]); } if (!empty($error)) { @@ -360,9 +360,12 @@ class Setup { Installer::installShippedApps(false, $output); // create empty file in data dir, so we can later find - // out that this is indeed an ownCloud data directory + // out that this is indeed a Nextcloud data directory $this->outputDebug($output, 'Setup data directory'); - file_put_contents($config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data') . '/.ocdata', ''); + file_put_contents( + $config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data') . '/.ncdata', + "# Nextcloud data directory\n# Do not change this file", + ); // Update .htaccess files self::updateHtaccess(); @@ -389,7 +392,7 @@ class Setup { $userSession->login($username, $password); $user = $userSession->getUser(); if (!$user) { - $error[] = "No account found in session."; + $error[] = 'No account found in session.'; return $error; } $userSession->createSessionToken($request, $user->getUID(), $username, $password); @@ -481,7 +484,7 @@ class Setup { $content .= "\n Options -MultiViews"; $content .= "\n RewriteRule ^core/js/oc.js$ index.php [PT,E=PATH_INFO:$1]"; $content .= "\n RewriteRule ^core/preview.png$ index.php [PT,E=PATH_INFO:$1]"; - $content .= "\n RewriteCond %{REQUEST_FILENAME} !\\.(css|js|mjs|svg|gif|png|html|ttf|woff2?|ico|jpg|jpeg|map|webm|mp4|mp3|ogg|wav|flac|wasm|tflite)$"; + $content .= "\n RewriteCond %{REQUEST_FILENAME} !\\.(css|js|mjs|svg|gif|ico|jpg|jpeg|png|webp|html|otf|ttf|woff2?|map|webm|mp4|mp3|ogg|wav|flac|wasm|tflite)$"; $content .= "\n RewriteCond %{REQUEST_FILENAME} !/core/ajax/update\\.php"; $content .= "\n RewriteCond %{REQUEST_FILENAME} !/core/img/(favicon\\.ico|manifest\\.json)$"; $content .= "\n RewriteCond %{REQUEST_FILENAME} !/(cron|public|remote|status)\\.php"; @@ -506,7 +509,7 @@ class Setup { $df = disk_free_space(\OC::$SERVERROOT); $size = strlen($content) + 10240; if ($df !== false && $df < (float)$size) { - throw new \Exception(\OC::$SERVERROOT . " does not have enough space for writing the htaccess file! Not writing it back!"); + throw new \Exception(\OC::$SERVERROOT . ' does not have enough space for writing the htaccess file! Not writing it back!'); } } //suppress errors in case we don't have permissions for it @@ -539,7 +542,7 @@ class Setup { $content .= "# Section for Apache 2.2 to 2.6\n"; $content .= "<IfModule mod_autoindex.c>\n"; $content .= " IndexIgnore *\n"; - $content .= "</IfModule>"; + $content .= '</IfModule>'; $baseDir = Server::get(IConfig::class)->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data'); file_put_contents($baseDir . '/.htaccess', $content); diff --git a/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php index e96ca8a2f3e..b1d93f55cc0 100644 --- a/lib/private/Setup/AbstractDatabase.php +++ b/lib/private/Setup/AbstractDatabase.php @@ -50,14 +50,14 @@ abstract class AbstractDatabase { public function validate($config) { $errors = []; if (empty($config['dbuser']) && empty($config['dbname'])) { - $errors[] = $this->trans->t("Enter the database Login and name for %s", [$this->dbprettyname]); + $errors[] = $this->trans->t('Enter the database Login and name for %s', [$this->dbprettyname]); } elseif (empty($config['dbuser'])) { - $errors[] = $this->trans->t("Enter the database Login for %s", [$this->dbprettyname]); + $errors[] = $this->trans->t('Enter the database Login for %s', [$this->dbprettyname]); } elseif (empty($config['dbname'])) { - $errors[] = $this->trans->t("Enter the database name for %s", [$this->dbprettyname]); + $errors[] = $this->trans->t('Enter the database name for %s', [$this->dbprettyname]); } if (substr_count($config['dbname'], '.') >= 1) { - $errors[] = $this->trans->t("You cannot use dots in the database name %s", [$this->dbprettyname]); + $errors[] = $this->trans->t('You cannot use dots in the database name %s', [$this->dbprettyname]); } return $errors; } @@ -70,9 +70,9 @@ abstract class AbstractDatabase { $dbPort = !empty($config['dbport']) ? $config['dbport'] : ''; $dbTablePrefix = $config['dbtableprefix'] ?? 'oc_'; - $createUserConfig = $this->config->getValue("setup_create_db_user", true); + $createUserConfig = $this->config->getValue('setup_create_db_user', true); // accept `false` both as bool and string, since setting config values from env will result in a string - $this->tryCreateDbUser = $createUserConfig !== false && $createUserConfig !== "false"; + $this->tryCreateDbUser = $createUserConfig !== false && $createUserConfig !== 'false'; $this->config->setValues([ 'dbname' => $dbName, @@ -133,7 +133,7 @@ abstract class AbstractDatabase { abstract public function setupDatabase($username); public function runMigrations(?IOutput $output = null) { - if (!is_dir(\OC::$SERVERROOT."/core/Migrations")) { + if (!is_dir(\OC::$SERVERROOT.'/core/Migrations')) { return; } $ms = new MigrationService('core', \OC::$server->get(Connection::class), $output); diff --git a/lib/private/Setup/OCI.php b/lib/private/Setup/OCI.php index 3a0fa34d8d1..47e5e5436a5 100644 --- a/lib/private/Setup/OCI.php +++ b/lib/private/Setup/OCI.php @@ -31,11 +31,11 @@ class OCI extends AbstractDatabase { public function validate($config) { $errors = []; if (empty($config['dbuser']) && empty($config['dbname'])) { - $errors[] = $this->trans->t("Enter the database Login and name for %s", [$this->dbprettyname]); + $errors[] = $this->trans->t('Enter the database Login and name for %s', [$this->dbprettyname]); } elseif (empty($config['dbuser'])) { - $errors[] = $this->trans->t("Enter the database Login for %s", [$this->dbprettyname]); + $errors[] = $this->trans->t('Enter the database Login for %s', [$this->dbprettyname]); } elseif (empty($config['dbname'])) { - $errors[] = $this->trans->t("Enter the database name for %s", [$this->dbprettyname]); + $errors[] = $this->trans->t('Enter the database name for %s', [$this->dbprettyname]); } return $errors; } diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php index 4ece8957ce6..73f2dfe0623 100644 --- a/lib/private/Setup/PostgreSQL.php +++ b/lib/private/Setup/PostgreSQL.php @@ -51,16 +51,6 @@ class PostgreSQL extends AbstractDatabase { $this->dbPassword = \OC::$server->get(ISecureRandom::class)->generate(30, ISecureRandom::CHAR_ALPHANUMERIC); $this->createDBUser($connection); - - // Go to the main database and grant create on the public schema - // The code below is implemented to make installing possible with PostgreSQL version 15: - // https://www.postgresql.org/docs/release/15.0/ - // From the release notes: For new databases having no need to defend against insider threats, granting CREATE permission will yield the behavior of prior releases - // Therefore we assume that the database is only used by one user/service which is Nextcloud - // Additional services should get installed in a separate database in order to stay secure - // Also see https://www.postgresql.org/docs/15/ddl-schemas.html#DDL-SCHEMAS-PATTERNS - $connectionMainDatabase->executeQuery('GRANT CREATE ON SCHEMA public TO "' . addslashes($this->dbUser) . '"'); - $connectionMainDatabase->close(); } } @@ -73,6 +63,20 @@ class PostgreSQL extends AbstractDatabase { $this->createDatabase($connection); // the connection to dbname=postgres is not needed anymore $connection->close(); + + if ($this->tryCreateDbUser) { + if ($canCreateRoles) { + // Go to the main database and grant create on the public schema + // The code below is implemented to make installing possible with PostgreSQL version 15: + // https://www.postgresql.org/docs/release/15.0/ + // From the release notes: For new databases having no need to defend against insider threats, granting CREATE permission will yield the behavior of prior releases + // Therefore we assume that the database is only used by one user/service which is Nextcloud + // Additional services should get installed in a separate database in order to stay secure + // Also see https://www.postgresql.org/docs/15/ddl-schemas.html#DDL-SCHEMAS-PATTERNS + $connectionMainDatabase->executeQuery('GRANT CREATE ON SCHEMA public TO "' . addslashes($this->dbUser) . '"'); + $connectionMainDatabase->close(); + } + } } catch (\Exception $e) { $this->logger->warning('Error trying to connect as "postgres", assuming database is setup and tables need to be created', [ 'exception' => $e, @@ -101,7 +105,7 @@ class PostgreSQL extends AbstractDatabase { private function createDatabase(Connection $connection) { if (!$this->databaseExists($connection)) { //The database does not exists... let's create it - $query = $connection->prepare("CREATE DATABASE " . addslashes($this->dbName) . " OWNER \"" . addslashes($this->dbUser) . '"'); + $query = $connection->prepare('CREATE DATABASE ' . addslashes($this->dbName) . ' OWNER "' . addslashes($this->dbUser) . '"'); try { $query->execute(); } catch (DatabaseException $e) { @@ -110,7 +114,7 @@ class PostgreSQL extends AbstractDatabase { ]); } } else { - $query = $connection->prepare("REVOKE ALL PRIVILEGES ON DATABASE " . addslashes($this->dbName) . " FROM PUBLIC"); + $query = $connection->prepare('REVOKE ALL PRIVILEGES ON DATABASE ' . addslashes($this->dbName) . ' FROM PUBLIC'); try { $query->execute(); } catch (DatabaseException $e) { @@ -151,7 +155,7 @@ class PostgreSQL extends AbstractDatabase { } // create the user - $query = $connection->prepare("CREATE USER \"" . addslashes($this->dbUser) . "\" CREATEDB PASSWORD '" . addslashes($this->dbPassword) . "'"); + $query = $connection->prepare('CREATE USER "' . addslashes($this->dbUser) . "\" CREATEDB PASSWORD '" . addslashes($this->dbPassword) . "'"); $query->execute(); if ($this->databaseExists($connection)) { $query = $connection->prepare('GRANT CONNECT ON DATABASE ' . addslashes($this->dbName) . ' TO "' . addslashes($this->dbUser) . '"'); diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index acf4e6bd9f4..3ea429dfe3d 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -20,6 +20,7 @@ use OCP\Files\IRootFolder; use OCP\Files\Node; use OCP\IDBConnection; use OCP\IGroupManager; +use OCP\IL10N; use OCP\IURLGenerator; use OCP\IUser; use OCP\IUserManager; @@ -27,8 +28,10 @@ use OCP\L10N\IFactory; use OCP\Mail\IMailer; use OCP\Share\Exceptions\ShareNotFound; use OCP\Share\IAttributes; +use OCP\Share\IManager; use OCP\Share\IShare; -use OCP\Share\IShareProvider; +use OCP\Share\IShareProviderSupportsAccept; +use OCP\Share\IShareProviderWithNotification; use Psr\Log\LoggerInterface; use function str_starts_with; @@ -37,56 +40,23 @@ use function str_starts_with; * * @package OC\Share20 */ -class DefaultShareProvider implements IShareProvider { +class DefaultShareProvider implements IShareProviderWithNotification, IShareProviderSupportsAccept { // Special share type for user modified group shares public const SHARE_TYPE_USERGROUP = 2; - /** @var IDBConnection */ - private $dbConn; - - /** @var IUserManager */ - private $userManager; - - /** @var IGroupManager */ - private $groupManager; - - /** @var IRootFolder */ - private $rootFolder; - - /** @var IMailer */ - private $mailer; - - /** @var Defaults */ - private $defaults; - - /** @var IFactory */ - private $l10nFactory; - - /** @var IURLGenerator */ - private $urlGenerator; - - private ITimeFactory $timeFactory; - public function __construct( - IDBConnection $connection, - IUserManager $userManager, - IGroupManager $groupManager, - IRootFolder $rootFolder, - IMailer $mailer, - Defaults $defaults, - IFactory $l10nFactory, - IURLGenerator $urlGenerator, - ITimeFactory $timeFactory, + private IDBConnection $dbConn, + private IUserManager $userManager, + private IGroupManager $groupManager, + private IRootFolder $rootFolder, + private IMailer $mailer, + private Defaults $defaults, + private IFactory $l10nFactory, + private IURLGenerator $urlGenerator, + private ITimeFactory $timeFactory, + private LoggerInterface $logger, + private IManager $shareManager, ) { - $this->dbConn = $connection; - $this->userManager = $userManager; - $this->groupManager = $groupManager; - $this->rootFolder = $rootFolder; - $this->mailer = $mailer; - $this->defaults = $defaults; - $this->l10nFactory = $l10nFactory; - $this->urlGenerator = $urlGenerator; - $this->timeFactory = $timeFactory; } /** @@ -127,6 +97,8 @@ class DefaultShareProvider implements IShareProvider { if ($expirationDate !== null) { $qb->setValue('expiration', $qb->createNamedParameter($expirationDate, 'datetime')); } + + $qb->setValue('reminder_sent', $qb->createNamedParameter($share->getReminderSent(), IQueryBuilder::PARAM_BOOL)); } elseif ($share->getShareType() === IShare::TYPE_GROUP) { //Set the GID of the group we share with $qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith())); @@ -253,6 +225,7 @@ class DefaultShareProvider implements IShareProvider { ->set('expiration', $qb->createNamedParameter($expirationDate, IQueryBuilder::PARAM_DATE)) ->set('note', $qb->createNamedParameter($share->getNote())) ->set('accepted', $qb->createNamedParameter($share->getStatus())) + ->set('reminder_sent', $qb->createNamedParameter($share->getReminderSent(), IQueryBuilder::PARAM_BOOL)) ->execute(); } elseif ($share->getShareType() === IShare::TYPE_GROUP) { $qb = $this->dbConn->getQueryBuilder(); @@ -639,7 +612,7 @@ class DefaultShareProvider implements IShareProvider { public function getSharesInFolder($userId, Folder $node, $reshares, $shallow = true) { if (!$shallow) { - throw new \Exception("non-shallow getSharesInFolder is no longer supported"); + throw new \Exception('non-shallow getSharesInFolder is no longer supported'); } $qb = $this->dbConn->getQueryBuilder(); @@ -702,6 +675,7 @@ class DefaultShareProvider implements IShareProvider { foreach ($chunks as $chunk) { $qb->setParameter('chunk', $chunk, IQueryBuilder::PARAM_INT_ARRAY); + $a = $qb->getSQL(); $cursor = $qb->executeQuery(); while ($data = $cursor->fetch()) { $shares[$data['fileid']][] = $this->createShare($data); @@ -803,7 +777,7 @@ class DefaultShareProvider implements IShareProvider { // If the recipient is set for a group share resolve to that user if ($recipientId !== null && $share->getShareType() === IShare::TYPE_GROUP) { - $share = $this->resolveGroupShares([(int) $share->getId() => $share], $recipientId)[0]; + $share = $this->resolveGroupShares([(int)$share->getId() => $share], $recipientId)[0]; } return $share; @@ -912,9 +886,9 @@ class DefaultShareProvider implements IShareProvider { while ($data = $cursor->fetch()) { if ($data['fileid'] && $data['path'] === null) { - $data['path'] = (string) $data['path']; - $data['name'] = (string) $data['name']; - $data['checksum'] = (string) $data['checksum']; + $data['path'] = (string)$data['path']; + $data['name'] = (string)$data['name']; + $data['checksum'] = (string)$data['checksum']; } if ($this->isAccessibleResult($data)) { $shares[] = $this->createShare($data); @@ -1035,7 +1009,7 @@ class DefaultShareProvider implements IShareProvider { } /** - * Create a share object from an database row + * Create a share object from a database row * * @param mixed[] $data * @return \OCP\Share\IShare @@ -1097,6 +1071,7 @@ class DefaultShareProvider implements IShareProvider { $share->setProviderId($this->identifier()); $share->setHideDownload((int)$data['hide_download'] === 1); + $share->setReminderSent((bool)$data['reminder_sent']); return $share; } @@ -1200,7 +1175,7 @@ class DefaultShareProvider implements IShareProvider { ); } else { $e = new \InvalidArgumentException('Default share provider tried to delete all shares for type: ' . $shareType); - \OCP\Server::get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]); + $this->logger->error($e->getMessage(), ['exception' => $e]); return; } @@ -1232,10 +1207,14 @@ class DefaultShareProvider implements IShareProvider { if (!empty($ids)) { $chunks = array_chunk($ids, 100); + + $qb = $this->dbConn->getQueryBuilder(); + $qb->delete('share') + ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP))) + ->andWhere($qb->expr()->in('parent', $qb->createParameter('parents'))); + foreach ($chunks as $chunk) { - $qb->delete('share') - ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP))) - ->andWhere($qb->expr()->in('parent', $qb->createNamedParameter($chunk, IQueryBuilder::PARAM_INT_ARRAY))); + $qb->setParameter('parents', $chunk, IQueryBuilder::PARAM_INT_ARRAY); $qb->execute(); } } @@ -1255,6 +1234,7 @@ class DefaultShareProvider implements IShareProvider { * * @param string $uid * @param string $gid + * @return void */ public function userDeletedFromGroup($uid, $gid) { /* @@ -1266,7 +1246,7 @@ class DefaultShareProvider implements IShareProvider { ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_GROUP))) ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid))); - $cursor = $qb->execute(); + $cursor = $qb->executeQuery(); $ids = []; while ($row = $cursor->fetch()) { $ids[] = (int)$row['id']; @@ -1275,15 +1255,58 @@ class DefaultShareProvider implements IShareProvider { if (!empty($ids)) { $chunks = array_chunk($ids, 100); + + /* + * Delete all special shares with this user for the found group shares + */ + $qb = $this->dbConn->getQueryBuilder(); + $qb->delete('share') + ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP))) + ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($uid))) + ->andWhere($qb->expr()->in('parent', $qb->createParameter('parents'))); + foreach ($chunks as $chunk) { - /* - * Delete all special shares with this users for the found group shares - */ - $qb->delete('share') - ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_USERGROUP))) - ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($uid))) - ->andWhere($qb->expr()->in('parent', $qb->createNamedParameter($chunk, IQueryBuilder::PARAM_INT_ARRAY))); - $qb->execute(); + $qb->setParameter('parents', $chunk, IQueryBuilder::PARAM_INT_ARRAY); + $qb->executeStatement(); + } + } + + if ($this->shareManager->shareWithGroupMembersOnly()) { + $user = $this->userManager->get($uid); + if ($user === null) { + return; + } + $userGroups = $this->groupManager->getUserGroupIds($user); + $userGroups = array_diff($userGroups, $this->shareManager->shareWithGroupMembersOnlyExcludeGroupsList()); + + // Delete user shares received by the user from users in the group. + $userReceivedShares = $this->shareManager->getSharedWith($uid, IShare::TYPE_USER, null, -1); + foreach ($userReceivedShares as $share) { + $owner = $this->userManager->get($share->getSharedBy()); + if ($owner === null) { + continue; + } + $ownerGroups = $this->groupManager->getUserGroupIds($owner); + $mutualGroups = array_intersect($userGroups, $ownerGroups); + + if (count($mutualGroups) === 0) { + $this->shareManager->deleteShare($share); + } + } + + // Delete user shares from the user to users in the group. + $userEmittedShares = $this->shareManager->getSharesBy($uid, IShare::TYPE_USER, null, true, -1); + foreach ($userEmittedShares as $share) { + $recipient = $this->userManager->get($share->getSharedWith()); + if ($recipient === null) { + continue; + } + $recipientGroups = $this->groupManager->getUserGroupIds($recipient); + $mutualGroups = array_intersect($userGroups, $recipientGroups); + + if (count($mutualGroups) === 0) { + $this->shareManager->deleteShare($share); + } } } } @@ -1371,8 +1394,8 @@ class DefaultShareProvider implements IShareProvider { protected function filterSharesOfUser(array $shares) { // Group shares when the user has a share exception foreach ($shares as $id => $share) { - $type = (int) $share['share_type']; - $permissions = (int) $share['permissions']; + $type = (int)$share['share_type']; + $permissions = (int)$share['permissions']; if ($type === IShare::TYPE_USERGROUP) { unset($shares[$share['parent']]); @@ -1416,6 +1439,131 @@ class DefaultShareProvider implements IShareProvider { } } + public function sendMailNotification(IShare $share): bool { + try { + // Check user + $user = $this->userManager->get($share->getSharedWith()); + if ($user === null) { + $this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because user could not be found.', ['app' => 'share']); + return false; + } + + // Handle user shares + if ($share->getShareType() === IShare::TYPE_USER) { + // Check email address + $emailAddress = $user->getEMailAddress(); + if ($emailAddress === null || $emailAddress === '') { + $this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because email address is not set.', ['app' => 'share']); + return false; + } + + $userLang = $this->l10nFactory->getUserLanguage($user); + $l = $this->l10nFactory->get('lib', $userLang); + $this->sendUserShareMail( + $l, + $share->getNode()->getName(), + $this->urlGenerator->linkToRouteAbsolute('files_sharing.Accept.accept', ['shareId' => $share->getFullId()]), + $share->getSharedBy(), + $emailAddress, + $share->getExpirationDate(), + $share->getNote() + ); + $this->logger->debug('Sent share notification to ' . $emailAddress . ' for share with ID ' . $share->getId() . '.', ['app' => 'share']); + return true; + } + } catch (\Exception $e) { + $this->logger->error('Share notification mail could not be sent.', ['exception' => $e]); + } + + return false; + } + + /** + * Send mail notifications for the user share type + * + * @param IL10N $l Language of the recipient + * @param string $filename file/folder name + * @param string $link link to the file/folder + * @param string $initiator user ID of share sender + * @param string $shareWith email address of share receiver + * @param \DateTime|null $expiration + * @param string $note + * @throws \Exception + */ + protected function sendUserShareMail( + IL10N $l, + $filename, + $link, + $initiator, + $shareWith, + ?\DateTime $expiration = null, + $note = '') { + $initiatorUser = $this->userManager->get($initiator); + $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator; + + $message = $this->mailer->createMessage(); + + $emailTemplate = $this->mailer->createEMailTemplate('files_sharing.RecipientNotification', [ + 'filename' => $filename, + 'link' => $link, + 'initiator' => $initiatorDisplayName, + 'expiration' => $expiration, + 'shareWith' => $shareWith, + ]); + + $emailTemplate->setSubject($l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename])); + $emailTemplate->addHeader(); + $emailTemplate->addHeading($l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename]), false); + $text = $l->t('%1$s shared »%2$s« with you.', [$initiatorDisplayName, $filename]); + + if ($note !== '') { + $emailTemplate->addBodyText(htmlspecialchars($note), $note); + } + + $emailTemplate->addBodyText( + htmlspecialchars($text . ' ' . $l->t('Click the button below to open it.')), + $text + ); + $emailTemplate->addBodyButton( + $l->t('Open »%s«', [$filename]), + $link + ); + + $message->setTo([$shareWith]); + + // The "From" contains the sharers name + $instanceName = $this->defaults->getName(); + $senderName = $l->t( + '%1$s via %2$s', + [ + $initiatorDisplayName, + $instanceName, + ] + ); + $message->setFrom([\OCP\Util::getDefaultEmailAddress('noreply') => $senderName]); + + // The "Reply-To" is set to the sharer if an mail address is configured + // also the default footer contains a "Do not reply" which needs to be adjusted. + if ($initiatorUser) { + $initiatorEmail = $initiatorUser->getEMailAddress(); + if ($initiatorEmail !== null) { + $message->setReplyTo([$initiatorEmail => $initiatorDisplayName]); + $emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : '')); + } else { + $emailTemplate->addFooter(); + } + } else { + $emailTemplate->addFooter(); + } + + $message->useTemplate($emailTemplate); + $failedRecipients = $this->mailer->send($message); + if (!empty($failedRecipients)) { + $this->logger->error('Share notification mail could not be sent to: ' . implode(', ', $failedRecipients)); + return; + } + } + /** * send note by mail * @@ -1529,7 +1677,7 @@ class DefaultShareProvider implements IShareProvider { * * @return IShare the modified share */ - private function updateShareAttributes(IShare $share, ?string $data): IShare { + protected function updateShareAttributes(IShare $share, ?string $data): IShare { if ($data !== null && $data !== '') { $attributes = new ShareAttributes(); $compressedAttributes = \json_decode($data, true); @@ -1552,7 +1700,7 @@ class DefaultShareProvider implements IShareProvider { /** * Format IAttributes to database format (JSON string) */ - private function formatShareAttributes(?IAttributes $attributes): ?string { + protected function formatShareAttributes(?IAttributes $attributes): ?string { if ($attributes === null || empty($attributes->toArray())) { return null; } @@ -1562,7 +1710,7 @@ class DefaultShareProvider implements IShareProvider { $compressedAttributes[] = [ 0 => $attribute['scope'], 1 => $attribute['key'], - 2 => $attribute['enabled'] + 2 => $attribute['value'] ]; } return \json_encode($compressedAttributes); diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index 7879c137db2..5457e8024a4 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -11,6 +11,7 @@ use OC\Files\Mount\MoveableMount; use OC\KnownUser\KnownUserService; use OC\Share20\Exception\ProviderException; use OCA\Files_Sharing\AppInfo\Application; +use OCA\Files_Sharing\SharedStorage; use OCP\EventDispatcher\IEventDispatcher; use OCP\Files\File; use OCP\Files\Folder; @@ -44,6 +45,8 @@ use OCP\Share\IManager; use OCP\Share\IProviderFactory; use OCP\Share\IShare; use OCP\Share\IShareProvider; +use OCP\Share\IShareProviderSupportsAccept; +use OCP\Share\IShareProviderWithNotification; use Psr\Log\LoggerInterface; /** @@ -100,7 +103,7 @@ class Manager implements IManager { if ($password === null) { // No password is set, check if this is allowed. if ($this->shareApiLinkEnforcePassword()) { - throw new \InvalidArgumentException('Passwords are enforced for link and mail shares'); + throw new \InvalidArgumentException($this->l->t('Passwords are enforced for link and mail shares')); } return; @@ -127,63 +130,63 @@ class Manager implements IManager { if ($share->getShareType() === IShare::TYPE_USER) { // We expect a valid user as sharedWith for user shares if (!$this->userManager->userExists($share->getSharedWith())) { - throw new \InvalidArgumentException('SharedWith is not a valid user'); + throw new \InvalidArgumentException($this->l->t('SharedWith is not a valid user')); } } elseif ($share->getShareType() === IShare::TYPE_GROUP) { // We expect a valid group as sharedWith for group shares if (!$this->groupManager->groupExists($share->getSharedWith())) { - throw new \InvalidArgumentException('SharedWith is not a valid group'); + throw new \InvalidArgumentException($this->l->t('SharedWith is not a valid group')); } } elseif ($share->getShareType() === IShare::TYPE_LINK) { // No check for TYPE_EMAIL here as we have a recipient for them if ($share->getSharedWith() !== null) { - throw new \InvalidArgumentException('SharedWith should be empty'); + throw new \InvalidArgumentException($this->l->t('SharedWith should be empty')); } } elseif ($share->getShareType() === IShare::TYPE_EMAIL) { if ($share->getSharedWith() === null) { - throw new \InvalidArgumentException('SharedWith should not be empty'); + throw new \InvalidArgumentException($this->l->t('SharedWith should not be empty')); } } elseif ($share->getShareType() === IShare::TYPE_REMOTE) { if ($share->getSharedWith() === null) { - throw new \InvalidArgumentException('SharedWith should not be empty'); + throw new \InvalidArgumentException($this->l->t('SharedWith should not be empty')); } } elseif ($share->getShareType() === IShare::TYPE_REMOTE_GROUP) { if ($share->getSharedWith() === null) { - throw new \InvalidArgumentException('SharedWith should not be empty'); + throw new \InvalidArgumentException($this->l->t('SharedWith should not be empty')); } } elseif ($share->getShareType() === IShare::TYPE_CIRCLE) { $circle = \OCA\Circles\Api\v1\Circles::detailsCircle($share->getSharedWith()); if ($circle === null) { - throw new \InvalidArgumentException('SharedWith is not a valid circle'); + throw new \InvalidArgumentException($this->l->t('SharedWith is not a valid circle')); } } elseif ($share->getShareType() === IShare::TYPE_ROOM) { } elseif ($share->getShareType() === IShare::TYPE_DECK) { } elseif ($share->getShareType() === IShare::TYPE_SCIENCEMESH) { } else { // We cannot handle other types yet - throw new \InvalidArgumentException('unknown share type'); + throw new \InvalidArgumentException($this->l->t('Unknown share type')); } // Verify the initiator of the share is set if ($share->getSharedBy() === null) { - throw new \InvalidArgumentException('SharedBy should be set'); + throw new \InvalidArgumentException($this->l->t('SharedBy should be set')); } // Cannot share with yourself if ($share->getShareType() === IShare::TYPE_USER && $share->getSharedWith() === $share->getSharedBy()) { - throw new \InvalidArgumentException('Cannot share with yourself'); + throw new \InvalidArgumentException($this->l->t('Cannot share with yourself')); } // The path should be set if ($share->getNode() === null) { - throw new \InvalidArgumentException('Path should be set'); + throw new \InvalidArgumentException($this->l->t('Path should be set')); } // And it should be a file or a folder if (!($share->getNode() instanceof \OCP\Files\File) && !($share->getNode() instanceof \OCP\Files\Folder)) { - throw new \InvalidArgumentException('Path should be either a file or a folder'); + throw new \InvalidArgumentException($this->l->t('Path should be either a file or a folder')); } // And you cannot share your rootfolder @@ -193,18 +196,17 @@ class Manager implements IManager { $userFolder = $this->rootFolder->getUserFolder($share->getShareOwner()); } if ($userFolder->getId() === $share->getNode()->getId()) { - throw new \InvalidArgumentException('You cannot share your root folder'); + throw new \InvalidArgumentException($this->l->t('You cannot share your root folder')); } // Check if we actually have share permissions if (!$share->getNode()->isShareable()) { - $message_t = $this->l->t('You are not allowed to share %s', [$share->getNode()->getName()]); - throw new GenericShareException($message_t, $message_t, 404); + throw new GenericShareException($this->l->t('You are not allowed to share %s', [$share->getNode()->getName()]), code: 404); } // Permissions should be set if ($share->getPermissions() === null) { - throw new \InvalidArgumentException('A share requires permissions'); + throw new \InvalidArgumentException($this->l->t('A share requires permissions')); } $permissions = 0; @@ -222,8 +224,7 @@ class Manager implements IManager { // Check that we do not share with more permissions than we have if ($share->getPermissions() & ~$permissions) { $path = $userFolder->getRelativePath($share->getNode()->getPath()); - $message_t = $this->l->t('Cannot increase permissions of %s', [$path]); - throw new GenericShareException($message_t, $message_t, 404); + throw new GenericShareException($this->l->t('Cannot increase permissions of %s', [$path]), code: 404); } @@ -233,17 +234,15 @@ class Manager implements IManager { || $share->getShareType() === IShare::TYPE_EMAIL; if (!$noReadPermissionRequired && ($share->getPermissions() & \OCP\Constants::PERMISSION_READ) === 0) { - throw new \InvalidArgumentException('Shares need at least read permissions'); + throw new \InvalidArgumentException($this->l->t('Shares need at least read permissions')); } if ($share->getNode() instanceof \OCP\Files\File) { if ($share->getPermissions() & \OCP\Constants::PERMISSION_DELETE) { - $message_t = $this->l->t('Files cannot be shared with delete permissions'); - throw new GenericShareException($message_t); + throw new GenericShareException($this->l->t('Files cannot be shared with delete permissions')); } if ($share->getPermissions() & \OCP\Constants::PERMISSION_CREATE) { - $message_t = $this->l->t('Files cannot be shared with create permissions'); - throw new GenericShareException($message_t); + throw new GenericShareException($this->l->t('Files cannot be shared with create permissions')); } } } @@ -276,7 +275,7 @@ class Manager implements IManager { // If $expirationDate is falsy, noExpirationDate is true and expiration not enforced // Then skip expiration date validation as null is accepted - if(!$share->getNoExpirationDate() || $isEnforced) { + if (!$share->getNoExpirationDate() || $isEnforced) { if ($expirationDate !== null) { $expirationDate->setTimezone($this->dateTimeZone->getTimeZone()); $expirationDate->setTime(0, 0, 0); @@ -284,8 +283,7 @@ class Manager implements IManager { $date = new \DateTime('now', $this->dateTimeZone->getTimeZone()); $date->setTime(0, 0, 0); if ($date >= $expirationDate) { - $message = $this->l->t('Expiration date is in the past'); - throw new GenericShareException($message, $message, 404); + throw new GenericShareException($this->l->t('Expiration date is in the past'), code: 404); } } @@ -310,15 +308,14 @@ class Manager implements IManager { // If we enforce the expiration date check that is does not exceed if ($isEnforced) { if (empty($expirationDate)) { - throw new \InvalidArgumentException('Expiration date is enforced'); + throw new \InvalidArgumentException($this->l->t('Expiration date is enforced')); } $date = new \DateTime('now', $this->dateTimeZone->getTimeZone()); $date->setTime(0, 0, 0); $date->add(new \DateInterval('P' . $defaultExpireDays . 'D')); if ($date < $expirationDate) { - $message = $this->l->n('Cannot set expiration date more than %n day in the future', 'Cannot set expiration date more than %n days in the future', $defaultExpireDays); - throw new GenericShareException($message, $message, 404); + throw new GenericShareException($this->l->n('Cannot set expiration date more than %n day in the future', 'Cannot set expiration date more than %n days in the future', $defaultExpireDays), code: 404); } } } @@ -356,7 +353,7 @@ class Manager implements IManager { // If $expirationDate is falsy, noExpirationDate is true and expiration not enforced // Then skip expiration date validation as null is accepted - if(!($share->getNoExpirationDate() && !$isEnforced)) { + if (!($share->getNoExpirationDate() && !$isEnforced)) { if ($expirationDate !== null) { $expirationDate->setTimezone($this->dateTimeZone->getTimeZone()); $expirationDate->setTime(0, 0, 0); @@ -364,8 +361,7 @@ class Manager implements IManager { $date = new \DateTime('now', $this->dateTimeZone->getTimeZone()); $date->setTime(0, 0, 0); if ($date >= $expirationDate) { - $message = $this->l->t('Expiration date is in the past'); - throw new GenericShareException($message, $message, 404); + throw new GenericShareException($this->l->t('Expiration date is in the past'), code: 404); } } @@ -391,15 +387,17 @@ class Manager implements IManager { // If we enforce the expiration date check that is does not exceed if ($isEnforced) { if (empty($expirationDate)) { - throw new \InvalidArgumentException('Expiration date is enforced'); + throw new \InvalidArgumentException($this->l->t('Expiration date is enforced')); } $date = new \DateTime('now', $this->dateTimeZone->getTimeZone()); $date->setTime(0, 0, 0); $date->add(new \DateInterval('P' . $this->shareApiLinkDefaultExpireDays() . 'D')); if ($date < $expirationDate) { - $message = $this->l->n('Cannot set expiration date more than %n day in the future', 'Cannot set expiration date more than %n days in the future', $this->shareApiLinkDefaultExpireDays()); - throw new GenericShareException($message, $message, 404); + throw new GenericShareException( + $this->l->n('Cannot set expiration date more than %n day in the future', 'Cannot set expiration date more than %n days in the future', $this->shareApiLinkDefaultExpireDays()), + code: 404, + ); } } @@ -445,8 +443,7 @@ class Manager implements IManager { $groups = array_diff($groups, $excludedGroups); if (empty($groups)) { - $message_t = $this->l->t('Sharing is only allowed with group members'); - throw new \Exception($message_t); + throw new \Exception($this->l->t('Sharing is only allowed with group members')); } } @@ -469,8 +466,7 @@ class Manager implements IManager { // Identical share already exists if ($existingShare->getSharedWith() === $share->getSharedWith() && $existingShare->getShareType() === $share->getShareType()) { - $message = $this->l->t('Sharing %s failed, because this item is already shared with the account %s', [$share->getNode()->getName(), $share->getSharedWithDisplayName()]); - throw new AlreadySharedException($message, $existingShare); + throw new AlreadySharedException($this->l->t('Sharing %s failed, because this item is already shared with the account %s', [$share->getNode()->getName(), $share->getSharedWithDisplayName()]), $existingShare); } // The share is already shared with this user via a group share @@ -480,8 +476,7 @@ class Manager implements IManager { $user = $this->userManager->get($share->getSharedWith()); if ($group->inGroup($user) && $existingShare->getShareOwner() !== $share->getShareOwner()) { - $message = $this->l->t('Sharing %s failed, because this item is already shared with the account %s', [$share->getNode()->getName(), $share->getSharedWithDisplayName()]); - throw new AlreadySharedException($message, $existingShare); + throw new AlreadySharedException($this->l->t('Sharing %s failed, because this item is already shared with the account %s', [$share->getNode()->getName(), $share->getSharedWithDisplayName()]), $existingShare); } } } @@ -497,7 +492,7 @@ class Manager implements IManager { protected function groupCreateChecks(IShare $share) { // Verify group shares are allowed if (!$this->allowGroupSharing()) { - throw new \Exception('Group sharing is now allowed'); + throw new \Exception($this->l->t('Group sharing is now allowed')); } // Verify if the user can share with this group @@ -508,7 +503,7 @@ class Manager implements IManager { // optional excluded groups $excludedGroups = $this->shareWithGroupMembersOnlyExcludeGroupsList(); if (is_null($sharedWith) || in_array($share->getSharedWith(), $excludedGroups) || !$sharedWith->inGroup($sharedBy)) { - throw new \Exception('Sharing is only allowed within your own groups'); + throw new \Exception($this->l->t('Sharing is only allowed within your own groups')); } } @@ -529,7 +524,7 @@ class Manager implements IManager { } if ($existingShare->getSharedWith() === $share->getSharedWith() && $existingShare->getShareType() === $share->getShareType()) { - throw new AlreadySharedException('Path is already shared with this group', $existingShare); + throw new AlreadySharedException($this->l->t('Path is already shared with this group'), $existingShare); } } } @@ -543,13 +538,13 @@ class Manager implements IManager { protected function linkCreateChecks(IShare $share) { // Are link shares allowed? if (!$this->shareApiAllowLinks()) { - throw new \Exception('Link sharing is not allowed'); + throw new \Exception($this->l->t('Link sharing is not allowed')); } // Check if public upload is allowed if ($share->getNodeType() === 'folder' && !$this->shareApiLinkAllowPublicUpload() && ($share->getPermissions() & (\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE))) { - throw new \InvalidArgumentException('Public upload is not allowed'); + throw new \InvalidArgumentException($this->l->t('Public upload is not allowed')); } } @@ -568,7 +563,7 @@ class Manager implements IManager { // No sense in checking if the method is not there. if (method_exists($share, 'setParent')) { $storage = $share->getNode()->getStorage(); - if ($storage->instanceOfStorage('\OCA\Files_Sharing\ISharedStorage')) { + if ($storage->instanceOfStorage(SharedStorage::class)) { /** @var \OCA\Files_Sharing\SharedStorage $storage */ $share->setParent($storage->getShareId()); } @@ -584,7 +579,7 @@ class Manager implements IManager { $mounts = $this->mountManager->findIn($path->getPath()); foreach ($mounts as $mount) { if ($mount->getStorage()->instanceOfStorage('\OCA\Files_Sharing\ISharedStorage')) { - throw new \InvalidArgumentException('Path contains files shared with you'); + throw new \InvalidArgumentException($this->l->t('Path contains files shared with you')); } } } @@ -598,11 +593,11 @@ class Manager implements IManager { */ protected function canShare(IShare $share) { if (!$this->shareApiEnabled()) { - throw new \Exception('Sharing is disabled'); + throw new \Exception($this->l->t('Sharing is disabled')); } if ($this->sharingDisabledForUser($share->getSharedBy())) { - throw new \Exception('Sharing is disabled for you'); + throw new \Exception($this->l->t('Sharing is disabled for you')); } } @@ -655,7 +650,7 @@ class Manager implements IManager { // Verify the expiration date $share = $this->validateExpirationDateInternal($share); } elseif ($share->getShareType() === IShare::TYPE_REMOTE || $share->getShareType() === IShare::TYPE_REMOTE_GROUP) { - //Verify the expiration date + // Verify the expiration date $share = $this->validateExpirationDateInternal($share); } elseif ($share->getShareType() === IShare::TYPE_LINK || $share->getShareType() === IShare::TYPE_EMAIL) { @@ -686,7 +681,7 @@ class Manager implements IManager { // Cannot share with the owner if ($share->getShareType() === IShare::TYPE_USER && $share->getSharedWith() === $share->getShareOwner()) { - throw new \InvalidArgumentException('Cannot share with the share owner'); + throw new \InvalidArgumentException($this->l->t('Cannot share with the share owner')); } // Generate the target @@ -721,7 +716,8 @@ class Manager implements IManager { $share->setTarget($target); } } catch (AlreadySharedException $e) { - // if a share for the same target already exists, dont create a new one, but do trigger the hooks and notifications again + // If a share for the same target already exists, dont create a new one, + // but do trigger the hooks and notifications again $oldShare = $share; // Reuse the node we already have @@ -732,123 +728,23 @@ class Manager implements IManager { // Post share event $this->dispatcher->dispatchTyped(new ShareCreatedEvent($share)); - if ($this->config->getSystemValueBool('sharing.enable_share_mail', true) - && $share->getShareType() === IShare::TYPE_USER) { - $mailSend = $share->getMailSend(); - if ($mailSend === true) { - $user = $this->userManager->get($share->getSharedWith()); - if ($user !== null) { - $emailAddress = $user->getEMailAddress(); - if ($emailAddress !== null && $emailAddress !== '') { - $userLang = $this->l10nFactory->getUserLanguage($user); - $l = $this->l10nFactory->get('lib', $userLang); - $this->sendMailNotification( - $l, - $share->getNode()->getName(), - $this->urlGenerator->linkToRouteAbsolute('files_sharing.Accept.accept', ['shareId' => $share->getFullId()]), - $share->getSharedBy(), - $emailAddress, - $share->getExpirationDate(), - $share->getNote() - ); - $this->logger->debug('Sent share notification to ' . $emailAddress . ' for share with ID ' . $share->getId(), ['app' => 'share']); - } else { - $this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because email address is not set.', ['app' => 'share']); - } + // Send email if needed + if ($this->config->getSystemValueBool('sharing.enable_share_mail', true)) { + if ($share->getMailSend()) { + $provider = $this->factory->getProviderForType($share->getShareType()); + if ($provider instanceof IShareProviderWithNotification) { + $provider->sendMailNotification($share); } else { - $this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because user could not be found.', ['app' => 'share']); + $this->logger->debug('Share notification not sent because the provider does not support it.', ['app' => 'share']); } } else { $this->logger->debug('Share notification not sent because mailsend is false.', ['app' => 'share']); } - } - - return $share; - } - - /** - * Send mail notifications - * - * This method will catch and log mail transmission errors - * - * @param IL10N $l Language of the recipient - * @param string $filename file/folder name - * @param string $link link to the file/folder - * @param string $initiator user ID of share sender - * @param string $shareWith email address of share receiver - * @param \DateTime|null $expiration - */ - protected function sendMailNotification(IL10N $l, - $filename, - $link, - $initiator, - $shareWith, - ?\DateTime $expiration = null, - $note = '') { - $initiatorUser = $this->userManager->get($initiator); - $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator; - - $message = $this->mailer->createMessage(); - - $emailTemplate = $this->mailer->createEMailTemplate('files_sharing.RecipientNotification', [ - 'filename' => $filename, - 'link' => $link, - 'initiator' => $initiatorDisplayName, - 'expiration' => $expiration, - 'shareWith' => $shareWith, - ]); - - $emailTemplate->setSubject($l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename])); - $emailTemplate->addHeader(); - $emailTemplate->addHeading($l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename]), false); - $text = $l->t('%1$s shared »%2$s« with you.', [$initiatorDisplayName, $filename]); - - if ($note !== '') { - $emailTemplate->addBodyText(htmlspecialchars($note), $note); - } - - $emailTemplate->addBodyText( - htmlspecialchars($text . ' ' . $l->t('Click the button below to open it.')), - $text - ); - $emailTemplate->addBodyButton( - $l->t('Open »%s«', [$filename]), - $link - ); - - $message->setTo([$shareWith]); - - // The "From" contains the sharers name - $instanceName = $this->defaults->getName(); - $senderName = $l->t( - '%1$s via %2$s', - [ - $initiatorDisplayName, - $instanceName, - ] - ); - $message->setFrom([\OCP\Util::getDefaultEmailAddress('noreply') => $senderName]); - - // The "Reply-To" is set to the sharer if an mail address is configured - // also the default footer contains a "Do not reply" which needs to be adjusted. - $initiatorEmail = $initiatorUser->getEMailAddress(); - if ($initiatorEmail !== null) { - $message->setReplyTo([$initiatorEmail => $initiatorDisplayName]); - $emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan($l->getLanguageCode()) !== '' ? ' - ' . $this->defaults->getSlogan($l->getLanguageCode()) : '')); } else { - $emailTemplate->addFooter('', $l->getLanguageCode()); + $this->logger->debug('Share notification not sent because sharing notification emails is disabled.', ['app' => 'share']); } - $message->useTemplate($emailTemplate); - try { - $failedRecipients = $this->mailer->send($message); - if (!empty($failedRecipients)) { - $this->logger->error('Share notification mail could not be sent to: ' . implode(', ', $failedRecipients)); - return; - } - } catch (\Exception $e) { - $this->logger->error('Share notification mail could not be sent', ['exception' => $e]); - } + return $share; } /** @@ -866,24 +762,24 @@ class Manager implements IManager { try { $originalShare = $this->getShareById($share->getFullId()); } catch (\UnexpectedValueException $e) { - throw new \InvalidArgumentException('Share does not have a full id'); + throw new \InvalidArgumentException($this->l->t('Share does not have a full ID')); } // We cannot change the share type! if ($share->getShareType() !== $originalShare->getShareType()) { - throw new \InvalidArgumentException('Cannot change share type'); + throw new \InvalidArgumentException($this->l->t('Cannot change share type')); } // We can only change the recipient on user shares if ($share->getSharedWith() !== $originalShare->getSharedWith() && $share->getShareType() !== IShare::TYPE_USER) { - throw new \InvalidArgumentException('Can only update recipient on user shares'); + throw new \InvalidArgumentException($this->l->t('Can only update recipient on user shares')); } // Cannot share with the owner if ($share->getShareType() === IShare::TYPE_USER && $share->getSharedWith() === $share->getShareOwner()) { - throw new \InvalidArgumentException('Cannot share with the share owner'); + throw new \InvalidArgumentException($this->l->t('Cannot share with the share owner')); } $this->generalCreateChecks($share, true); @@ -892,7 +788,7 @@ class Manager implements IManager { $this->userCreateChecks($share); if ($share->getExpirationDate() != $originalShare->getExpirationDate()) { - //Verify the expiration date + // Verify the expiration date $this->validateExpirationDateInternal($share); $expirationDateUpdated = true; } @@ -900,7 +796,7 @@ class Manager implements IManager { $this->groupCreateChecks($share); if ($share->getExpirationDate() != $originalShare->getExpirationDate()) { - //Verify the expiration date + // Verify the expiration date $this->validateExpirationDateInternal($share); $expirationDateUpdated = true; } @@ -918,7 +814,7 @@ class Manager implements IManager { * Cannot enable the getSendPasswordByTalk if there is no password set */ if (empty($plainTextPassword) && $share->getSendPasswordByTalk()) { - throw new \InvalidArgumentException('Cannot enable sending the password by Talk with an empty password'); + throw new \InvalidArgumentException($this->l->t('Cannot enable sending the password by Talk with an empty password')); } /** @@ -928,10 +824,10 @@ class Manager implements IManager { */ if (!$updatedPassword && $share->getShareType() === IShare::TYPE_EMAIL) { if (!$originalShare->getSendPasswordByTalk() && $share->getSendPasswordByTalk()) { - throw new \InvalidArgumentException('Cannot enable sending the password by Talk without setting a new password'); + throw new \InvalidArgumentException($this->l->t('Cannot enable sending the password by Talk without setting a new password')); } if ($originalShare->getSendPasswordByTalk() && !$share->getSendPasswordByTalk()) { - throw new \InvalidArgumentException('Cannot disable sending the password by Talk without setting a new password'); + throw new \InvalidArgumentException($this->l->t('Cannot disable sending the password by Talk without setting a new password')); } } @@ -942,7 +838,7 @@ class Manager implements IManager { } } elseif ($share->getShareType() === IShare::TYPE_REMOTE || $share->getShareType() === IShare::TYPE_REMOTE_GROUP) { if ($share->getExpirationDate() != $originalShare->getExpirationDate()) { - //Verify the expiration date + // Verify the expiration date $this->validateExpirationDateInternal($share); $expirationDateUpdated = true; } @@ -1004,17 +900,17 @@ class Manager implements IManager { * @param IShare $share * @param string $recipientId * @return IShare The share object - * @throws \InvalidArgumentException + * @throws \InvalidArgumentException Thrown if the provider does not implement `IShareProviderSupportsAccept` * @since 9.0.0 */ public function acceptShare(IShare $share, string $recipientId): IShare { [$providerId,] = $this->splitFullId($share->getFullId()); $provider = $this->factory->getProvider($providerId); - if (!method_exists($provider, 'acceptShare')) { - // TODO FIX ME - throw new \InvalidArgumentException('Share provider does not support accepting'); + if (!($provider instanceof IShareProviderSupportsAccept)) { + throw new \InvalidArgumentException($this->l->t('Share provider does not support accepting')); } + /** @var IShareProvider&IShareProviderSupportsAccept $provider */ $provider->acceptShare($share, $recipientId); $event = new ShareAcceptedEvent($share); @@ -1029,7 +925,7 @@ class Manager implements IManager { * * @param IShare $share the share to update its password. * @param IShare $originalShare the original share to compare its - * password with. + * password with. * @return boolean whether the password was updated or not. */ private function updateSharePasswordIfNeeded(IShare $share, IShare $originalShare) { @@ -1041,7 +937,7 @@ class Manager implements IManager { // Password updated. if ($passwordsAreDifferent) { - //Verify the password + // Verify the password $this->verifyPassword($share->getPassword()); // If a password is set. Hash it! @@ -1125,7 +1021,7 @@ class Manager implements IManager { try { $share->getFullId(); } catch (\UnexpectedValueException $e) { - throw new \InvalidArgumentException('Share does not have a full id'); + throw new \InvalidArgumentException($this->l->t('Share does not have a full ID')); } $this->dispatcher->dispatchTyped(new BeforeShareDeletedEvent($share)); @@ -1172,21 +1068,21 @@ class Manager implements IManager { public function moveShare(IShare $share, $recipientId) { if ($share->getShareType() === IShare::TYPE_LINK || $share->getShareType() === IShare::TYPE_EMAIL) { - throw new \InvalidArgumentException('Cannot change target of link share'); + throw new \InvalidArgumentException($this->l->t('Cannot change target of link share')); } if ($share->getShareType() === IShare::TYPE_USER && $share->getSharedWith() !== $recipientId) { - throw new \InvalidArgumentException('Invalid recipient'); + throw new \InvalidArgumentException($this->l->t('Invalid recipient')); } if ($share->getShareType() === IShare::TYPE_GROUP) { $sharedWith = $this->groupManager->get($share->getSharedWith()); if (is_null($sharedWith)) { - throw new \InvalidArgumentException('Group "' . $share->getSharedWith() . '" does not exist'); + throw new \InvalidArgumentException($this->l->t('Group "%s" does not exist', [$share->getSharedWith()])); } $recipient = $this->userManager->get($recipientId); if (!$sharedWith->inGroup($recipient)) { - throw new \InvalidArgumentException('Invalid recipient'); + throw new \InvalidArgumentException($this->l->t('Invalid recipient')); } } @@ -1199,7 +1095,7 @@ class Manager implements IManager { public function getSharesInFolder($userId, Folder $node, $reshares = false, $shallow = true) { $providers = $this->factory->getAllProviders(); if (!$shallow) { - throw new \Exception("non-shallow getSharesInFolder is no longer supported"); + throw new \Exception('non-shallow getSharesInFolder is no longer supported'); } return array_reduce($providers, function ($shares, IShareProvider $provider) use ($userId, $node, $reshares) { @@ -1222,7 +1118,7 @@ class Manager implements IManager { if ($path !== null && !($path instanceof \OCP\Files\File) && !($path instanceof \OCP\Files\Folder)) { - throw new \InvalidArgumentException('invalid path'); + throw new \InvalidArgumentException($this->l->t('Invalid path')); } try { @@ -1246,7 +1142,7 @@ class Manager implements IManager { try { $this->checkShare($share); } catch (ShareNotFound $e) { - //Ignore since this basically means the share is deleted + // Ignore since this basically means the share is deleted continue; } diff --git a/lib/private/Share20/ProviderFactory.php b/lib/private/Share20/ProviderFactory.php index 9716d1e7556..e1a2c9a5375 100644 --- a/lib/private/Share20/ProviderFactory.php +++ b/lib/private/Share20/ProviderFactory.php @@ -44,9 +44,9 @@ class ProviderFactory implements IProviderFactory { private $defaultProvider = null; /** @var FederatedShareProvider */ private $federatedProvider = null; - /** @var ShareByMailProvider */ + /** @var ShareByMailProvider */ private $shareByMailProvider; - /** @var \OCA\Circles\ShareByCircleProvider */ + /** @var \OCA\Circles\ShareByCircleProvider */ private $shareByCircleProvider = null; /** @var bool */ private $circlesAreNotAvailable = false; @@ -87,6 +87,8 @@ class ProviderFactory implements IProviderFactory { $this->serverContainer->get(IFactory::class), $this->serverContainer->getURLGenerator(), $this->serverContainer->query(ITimeFactory::class), + $this->serverContainer->get(LoggerInterface::class), + $this->serverContainer->get(IManager::class), ); } diff --git a/lib/private/Share20/Share.php b/lib/private/Share20/Share.php index ac95e3ac0d4..1c0b21b8038 100644 --- a/lib/private/Share20/Share.php +++ b/lib/private/Share20/Share.php @@ -72,6 +72,7 @@ class Share implements IShare { private $nodeCacheEntry; /** @var bool */ private $hideDownload = false; + private bool $reminderSent = false; private bool $noExpirationDate = false; @@ -191,7 +192,7 @@ class Share implements IShare { } if ($this->fileId === null) { - throw new NotFoundException("Share source not found"); + throw new NotFoundException('Share source not found'); } else { return $this->fileId; } @@ -613,4 +614,13 @@ class Share implements IShare { public function getHideDownload(): bool { return $this->hideDownload; } + + public function setReminderSent(bool $reminderSent): IShare { + $this->reminderSent = $reminderSent; + return $this; + } + + public function getReminderSent(): bool { + return $this->reminderSent; + } } diff --git a/lib/private/Share20/ShareAttributes.php b/lib/private/Share20/ShareAttributes.php index abbbd36759b..96da1e336e3 100644 --- a/lib/private/Share20/ShareAttributes.php +++ b/lib/private/Share20/ShareAttributes.php @@ -20,18 +20,18 @@ class ShareAttributes implements IAttributes { /** * @inheritdoc */ - public function setAttribute($scope, $key, $enabled) { + public function setAttribute(string $scope, string $key, mixed $value): IAttributes { if (!\array_key_exists($scope, $this->attributes)) { $this->attributes[$scope] = []; } - $this->attributes[$scope][$key] = $enabled; + $this->attributes[$scope][$key] = $value; return $this; } /** * @inheritdoc */ - public function getAttribute($scope, $key) { + public function getAttribute(string $scope, string $key): mixed { if (\array_key_exists($scope, $this->attributes) && \array_key_exists($key, $this->attributes[$scope])) { return $this->attributes[$scope][$key]; @@ -42,14 +42,14 @@ class ShareAttributes implements IAttributes { /** * @inheritdoc */ - public function toArray() { + public function toArray(): array { $result = []; foreach ($this->attributes as $scope => $keys) { - foreach ($keys as $key => $enabled) { + foreach ($keys as $key => $value) { $result[] = [ - "scope" => $scope, - "key" => $key, - "enabled" => $enabled + 'scope' => $scope, + 'key' => $key, + 'value' => $value, ]; } } diff --git a/lib/private/SpeechToText/SpeechToTextManager.php b/lib/private/SpeechToText/SpeechToTextManager.php index d6cda473875..d69add2d80b 100644 --- a/lib/private/SpeechToText/SpeechToTextManager.php +++ b/lib/private/SpeechToText/SpeechToTextManager.php @@ -24,6 +24,9 @@ use OCP\SpeechToText\ISpeechToTextManager; use OCP\SpeechToText\ISpeechToTextProvider; use OCP\SpeechToText\ISpeechToTextProviderWithId; use OCP\SpeechToText\ISpeechToTextProviderWithUserId; +use OCP\TaskProcessing\IManager as ITaskProcessingManager; +use OCP\TaskProcessing\Task; +use OCP\TaskProcessing\TaskTypes\AudioToText; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; use Psr\Log\LoggerInterface; @@ -41,6 +44,7 @@ class SpeechToTextManager implements ISpeechToTextManager { private IJobList $jobList, private IConfig $config, private IUserSession $userSession, + private ITaskProcessingManager $taskProcessingManager, ) { } @@ -112,7 +116,30 @@ class SpeechToTextManager implements ISpeechToTextManager { } } - public function transcribeFile(File $file): string { + public function transcribeFile(File $file, ?string $userId = null, string $appId = 'core'): string { + // try to run a TaskProcessing core:audio2text task + // this covers scheduling as well because OC\SpeechToText\TranscriptionJob calls this method + try { + if (isset($this->taskProcessingManager->getAvailableTaskTypes()['core:audio2text'])) { + $taskProcessingTask = new Task( + AudioToText::ID, + ['input' => $file->getId()], + $appId, + $userId, + 'from-SpeechToTextManager||' . $file->getId() . '||' . ($userId ?? '') . '||' . $appId, + ); + $resultTask = $this->taskProcessingManager->runTask($taskProcessingTask); + if ($resultTask->getStatus() === Task::STATUS_SUCCESSFUL) { + $output = $resultTask->getOutput(); + if (isset($output['output']) && is_string($output['output'])) { + return $output['output']; + } + } + } + } catch (Throwable $e) { + throw new RuntimeException('Failed to run a Speech-to-text job from STTManager with TaskProcessing for file ' . $file->getId(), 0, $e); + } + if (!$this->hasProviders()) { throw new PreConditionNotMetException('No SpeechToText providers have been registered'); } diff --git a/lib/private/SpeechToText/TranscriptionJob.php b/lib/private/SpeechToText/TranscriptionJob.php index a46fd737865..6e899ef6e96 100644 --- a/lib/private/SpeechToText/TranscriptionJob.php +++ b/lib/private/SpeechToText/TranscriptionJob.php @@ -63,7 +63,7 @@ class TranscriptionJob extends QueuedJob { ); return; } - $result = $this->speechToTextManager->transcribeFile($file); + $result = $this->speechToTextManager->transcribeFile($file, $userId, $appId); $this->eventDispatcher->dispatchTyped( new TranscriptionSuccessfulEvent( $fileId, diff --git a/lib/private/StreamImage.php b/lib/private/StreamImage.php index 9290bf38b0f..34fe590efbd 100644 --- a/lib/private/StreamImage.php +++ b/lib/private/StreamImage.php @@ -133,4 +133,12 @@ class StreamImage implements IStreamImage { public function resizeCopy(int $maxSize): IImage { throw new \BadMethodCallException('Not implemented'); } + + public function loadFromData(string $str): \GdImage|false { + throw new \BadMethodCallException('Not implemented'); + } + + public function readExif(string $data): void { + throw new \BadMethodCallException('Not implemented'); + } } diff --git a/lib/private/Streamer.php b/lib/private/Streamer.php index 4eca1105002..1f510f730ee 100644 --- a/lib/private/Streamer.php +++ b/lib/private/Streamer.php @@ -32,7 +32,7 @@ class Streamer { * @param IRequest $request * @param int|float $size The size of the files in bytes * @param int $numberOfFiles The number of files (and directories) that will - * be included in the streamed file + * be included in the streamed file */ public function __construct(IRequest $request, int|float $size, int $numberOfFiles) { /** diff --git a/lib/private/SubAdmin.php b/lib/private/SubAdmin.php index 9ffa0ab03a3..c025ab7b012 100644 --- a/lib/private/SubAdmin.php +++ b/lib/private/SubAdmin.php @@ -233,6 +233,11 @@ class SubAdmin extends PublicEmitter implements ISubAdmin { return true; } + // Check if the user is already an admin + if ($this->groupManager->isDelegatedAdmin($user->getUID())) { + return true; + } + $qb = $this->dbConn->getQueryBuilder(); $result = $qb->select('gid') diff --git a/lib/private/SystemConfig.php b/lib/private/SystemConfig.php index 310433474ec..ed77526c29c 100644 --- a/lib/private/SystemConfig.php +++ b/lib/private/SystemConfig.php @@ -50,6 +50,7 @@ class SystemConfig { 'github.client_secret' => true, 'log.condition' => [ 'shared_secret' => true, + 'matches' => true, ], 'license-key' => true, 'redis' => [ @@ -114,6 +115,24 @@ class SystemConfig { } /** + * Since system config is admin controlled, we can tell psalm to ignore any taint + * + * @psalm-taint-escape sql + * @psalm-taint-escape html + * @psalm-taint-escape ldap + * @psalm-taint-escape callable + * @psalm-taint-escape file + * @psalm-taint-escape ssrf + * @psalm-taint-escape cookie + * @psalm-taint-escape header + * @psalm-taint-escape has_quotes + * @psalm-pure + */ + public static function trustSystemConfig(mixed $value): mixed { + return $value; + } + + /** * Lists all available config keys * @return array an array of key names */ @@ -149,7 +168,7 @@ class SystemConfig { * @return mixed the value or $default */ public function getValue($key, $default = '') { - return $this->config->getValue($key, $default); + return $this->trustSystemConfig($this->config->getValue($key, $default)); } /** diff --git a/lib/private/SystemTag/SystemTagObjectMapper.php b/lib/private/SystemTag/SystemTagObjectMapper.php index 10117eebeaa..157948e6e0c 100644 --- a/lib/private/SystemTag/SystemTagObjectMapper.php +++ b/lib/private/SystemTag/SystemTagObjectMapper.php @@ -234,7 +234,7 @@ class SystemTagObjectMapper implements ISystemTagObjectMapper { return ((int)$row[0] === \count($objIds)); } - return (bool) $row; + return (bool)$row; } /** diff --git a/lib/private/TagManager.php b/lib/private/TagManager.php index 3258ce50bc5..f99653f2c05 100644 --- a/lib/private/TagManager.php +++ b/lib/private/TagManager.php @@ -43,7 +43,7 @@ class TagManager implements ITagManager, IEventListener { * @param array $defaultTags An array of default tags to be used if none are stored. * @param boolean $includeShared Whether to include tags for items shared with this user by others. * @param string $userId user for which to retrieve the tags, defaults to the currently - * logged in user + * logged in user * @return \OCP\ITags * * since 20.0.0 $includeShared isn't used anymore diff --git a/lib/private/Tagging/Tag.php b/lib/private/Tagging/Tag.php index ae770beb62f..55a3a410281 100644 --- a/lib/private/Tagging/Tag.php +++ b/lib/private/Tagging/Tag.php @@ -45,14 +45,16 @@ class Tag extends Entity { * @todo migrate existing database columns to the correct names * to be able to drop this direct mapping */ - public function columnToProperty($columnName) { + public function columnToProperty(string $columnName): string { if ($columnName === 'category') { return 'name'; - } elseif ($columnName === 'uid') { + } + + if ($columnName === 'uid') { return 'owner'; - } else { - return parent::columnToProperty($columnName); } + + return parent::columnToProperty($columnName); } /** @@ -61,13 +63,15 @@ class Tag extends Entity { * @param string $property the name of the property * @return string the column name */ - public function propertyToColumn($property) { + public function propertyToColumn(string $property): string { if ($property === 'name') { return 'category'; - } elseif ($property === 'owner') { + } + + if ($property === 'owner') { return 'uid'; - } else { - return parent::propertyToColumn($property); } + + return parent::propertyToColumn($property); } } diff --git a/lib/private/Tags.php b/lib/private/Tags.php index 420cabc36b9..6a31ac94ef6 100644 --- a/lib/private/Tags.php +++ b/lib/private/Tags.php @@ -149,7 +149,7 @@ class Tags implements ITags { * * @param array $objIds array of object ids * @return array|false of tags id as key to array of tag names - * or false if an error occurred + * or false if an error occurred */ public function getTagsForObjects(array $objIds) { $entries = []; @@ -248,8 +248,7 @@ class Tags implements ITags { * @param string $user The user whose tags are to be checked. */ public function userHasTag(string $name, string $user): bool { - $key = $this->array_searchi($name, $this->getTagsForUser($user)); - return ($key !== false) ? $this->tags[$key]->getId() : false; + return $this->array_searchi($name, $this->getTagsForUser($user)) !== false; } /** @@ -343,7 +342,7 @@ class Tags implements ITags { * Add a list of new tags. * * @param string|string[] $names A string with a name or an array of strings containing - * the name(s) of the tag(s) to add. + * the name(s) of the tag(s) to add. * @param bool $sync When true, save the tags * @param int|null $id int Optional object id to add to this|these tag(s) * @return bool Returns false on error. diff --git a/lib/private/Talk/Broker.php b/lib/private/Talk/Broker.php index fc8e0280043..86e7e7ff4c1 100644 --- a/lib/private/Talk/Broker.php +++ b/lib/private/Talk/Broker.php @@ -47,7 +47,7 @@ class Broker implements IBroker { $context = $this->coordinator->getRegistrationContext(); if ($context === null) { // Backend requested too soon, e.g. from the bootstrap `register` method of an app - throw new RuntimeException("Not all apps have been registered yet"); + throw new RuntimeException('Not all apps have been registered yet'); } $backendRegistration = $context->getTalkBackendRegistration(); if ($backendRegistration === null) { @@ -63,7 +63,7 @@ class Broker implements IBroker { // Remember and return return $this->hasBackend = true; } catch (Throwable $e) { - $this->logger->error("Talk backend {class} could not be loaded: " . $e->getMessage(), [ + $this->logger->error('Talk backend {class} could not be loaded: ' . $e->getMessage(), [ 'class' => $backendRegistration->getService(), 'exception' => $e, ]); @@ -81,7 +81,7 @@ class Broker implements IBroker { array $moderators, ?IConversationOptions $options = null): IConversation { if (!$this->hasBackend()) { - throw new NoBackendException("The Talk broker has no registered backend"); + throw new NoBackendException('The Talk broker has no registered backend'); } return $this->backend->createConversation( @@ -93,7 +93,7 @@ class Broker implements IBroker { public function deleteConversation(string $id): void { if (!$this->hasBackend()) { - throw new NoBackendException("The Talk broker has no registered backend"); + throw new NoBackendException('The Talk broker has no registered backend'); } $this->backend->deleteConversation($id); diff --git a/lib/private/TaskProcessing/Db/Task.php b/lib/private/TaskProcessing/Db/Task.php index 1ac40327899..6787c11344a 100644 --- a/lib/private/TaskProcessing/Db/Task.php +++ b/lib/private/TaskProcessing/Db/Task.php @@ -35,6 +35,16 @@ use OCP\TaskProcessing\Task as OCPTask; * @method null|string getErrorMessage() * @method setProgress(null|float $progress) * @method null|float getProgress() + * @method setWebhookUri(string $webhookUri) + * @method string getWebhookUri() + * @method setWebhookMethod(string $webhookMethod) + * @method string getWebhookMethod() + * @method setScheduledAt(int $scheduledAt) + * @method int getScheduledAt() + * @method setStartedAt(int $startedAt) + * @method int getStartedAt() + * @method setEndedAt(int $endedAt) + * @method int getEndedAt() */ class Task extends Entity { protected $lastUpdated; @@ -48,16 +58,21 @@ class Task extends Entity { protected $completionExpectedAt; protected $errorMessage; protected $progress; + protected $webhookUri; + protected $webhookMethod; + protected $scheduledAt; + protected $startedAt; + protected $endedAt; /** * @var string[] */ - public static array $columns = ['id', 'last_updated', 'type', 'input', 'output', 'status', 'user_id', 'app_id', 'custom_id', 'completion_expected_at', 'error_message', 'progress']; + public static array $columns = ['id', 'last_updated', 'type', 'input', 'output', 'status', 'user_id', 'app_id', 'custom_id', 'completion_expected_at', 'error_message', 'progress', 'webhook_uri', 'webhook_method', 'scheduled_at', 'started_at', 'ended_at']; /** * @var string[] */ - public static array $fields = ['id', 'lastUpdated', 'type', 'input', 'output', 'status', 'userId', 'appId', 'customId', 'completionExpectedAt', 'errorMessage', 'progress']; + public static array $fields = ['id', 'lastUpdated', 'type', 'input', 'output', 'status', 'userId', 'appId', 'customId', 'completionExpectedAt', 'errorMessage', 'progress', 'webhookUri', 'webhookMethod', 'scheduledAt', 'startedAt', 'endedAt']; public function __construct() { @@ -74,6 +89,11 @@ class Task extends Entity { $this->addType('completionExpectedAt', 'datetime'); $this->addType('errorMessage', 'string'); $this->addType('progress', 'float'); + $this->addType('webhookUri', 'string'); + $this->addType('webhookMethod', 'string'); + $this->addType('scheduledAt', 'integer'); + $this->addType('startedAt', 'integer'); + $this->addType('endedAt', 'integer'); } public function toRow(): array { @@ -97,6 +117,11 @@ class Task extends Entity { 'customId' => $task->getCustomId(), 'completionExpectedAt' => $task->getCompletionExpectedAt(), 'progress' => $task->getProgress(), + 'webhookUri' => $task->getWebhookUri(), + 'webhookMethod' => $task->getWebhookMethod(), + 'scheduledAt' => $task->getScheduledAt(), + 'startedAt' => $task->getStartedAt(), + 'endedAt' => $task->getEndedAt(), ]); return $taskEntity; } @@ -114,6 +139,11 @@ class Task extends Entity { $task->setCompletionExpectedAt($this->getCompletionExpectedAt()); $task->setErrorMessage($this->getErrorMessage()); $task->setProgress($this->getProgress()); + $task->setWebhookUri($this->getWebhookUri()); + $task->setWebhookMethod($this->getWebhookMethod()); + $task->setScheduledAt($this->getScheduledAt()); + $task->setStartedAt($this->getStartedAt()); + $task->setEndedAt($this->getEndedAt()); return $task; } } diff --git a/lib/private/TaskProcessing/Db/TaskMapper.php b/lib/private/TaskProcessing/Db/TaskMapper.php index 86b2a2fcc59..2bdee4fa134 100644 --- a/lib/private/TaskProcessing/Db/TaskMapper.php +++ b/lib/private/TaskProcessing/Db/TaskMapper.php @@ -59,16 +59,16 @@ class TaskMapper extends QBMapper { ->setMaxResults(1) ->orderBy('last_updated', 'ASC'); - if (count($taskTypes) > 0) { - $filter = $qb->expr()->orX(); + if (!empty($taskTypes)) { + $filter = []; foreach ($taskTypes as $taskType) { - $filter->add($qb->expr()->eq('type', $qb->createPositionalParameter($taskType))); + $filter[] = $qb->expr()->eq('type', $qb->createPositionalParameter($taskType)); } - $qb->andWhere($filter); + $qb->andWhere($qb->expr()->orX(...$filter)); } - if (count($taskIdsToIgnore) > 0) { + if (!empty($taskIdsToIgnore)) { $qb->andWhere($qb->expr()->notIn('id', $qb->createNamedParameter($taskIdsToIgnore, IQueryBuilder::PARAM_INT_ARRAY))); } @@ -137,6 +137,51 @@ class TaskMapper extends QBMapper { } /** + * @param string|null $userId + * @param string|null $taskType + * @param string|null $appId + * @param string|null $customId + * @param int|null $status + * @param int|null $scheduleAfter + * @param int|null $endedBefore + * @return list<Task> + * @throws Exception + */ + public function findTasks( + ?string $userId, ?string $taskType = null, ?string $appId = null, ?string $customId = null, + ?int $status = null, ?int $scheduleAfter = null, ?int $endedBefore = null): array { + $qb = $this->db->getQueryBuilder(); + $qb->select(Task::$columns) + ->from($this->tableName); + + // empty string: no userId filter + if ($userId !== '') { + $qb->where($qb->expr()->eq('user_id', $qb->createPositionalParameter($userId))); + } + if ($taskType !== null) { + $qb->andWhere($qb->expr()->eq('type', $qb->createPositionalParameter($taskType))); + } + if ($appId !== null) { + $qb->andWhere($qb->expr()->eq('app_id', $qb->createPositionalParameter($appId))); + } + if ($customId !== null) { + $qb->andWhere($qb->expr()->eq('custom_id', $qb->createPositionalParameter($customId))); + } + if ($status !== null) { + $qb->andWhere($qb->expr()->eq('status', $qb->createPositionalParameter($status, IQueryBuilder::PARAM_INT))); + } + if ($scheduleAfter !== null) { + $qb->andWhere($qb->expr()->isNotNull('scheduled_at')); + $qb->andWhere($qb->expr()->gt('scheduled_at', $qb->createPositionalParameter($scheduleAfter, IQueryBuilder::PARAM_INT))); + } + if ($endedBefore !== null) { + $qb->andWhere($qb->expr()->isNotNull('ended_at')); + $qb->andWhere($qb->expr()->lt('ended_at', $qb->createPositionalParameter($endedBefore, IQueryBuilder::PARAM_INT))); + } + return array_values($this->findEntities($qb)); + } + + /** * @param int $timeout * @return int the number of deleted tasks * @throws Exception diff --git a/lib/private/TaskProcessing/Manager.php b/lib/private/TaskProcessing/Manager.php index f0d1d4ba51a..29153ca56f9 100644 --- a/lib/private/TaskProcessing/Manager.php +++ b/lib/private/TaskProcessing/Manager.php @@ -9,21 +9,29 @@ declare(strict_types=1); namespace OC\TaskProcessing; +use GuzzleHttp\Exception\ClientException; +use GuzzleHttp\Exception\ServerException; use OC\AppFramework\Bootstrap\Coordinator; use OC\Files\SimpleFS\SimpleFile; use OC\TaskProcessing\Db\TaskMapper; +use OCP\App\IAppManager; use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Db\MultipleObjectsReturnedException; use OCP\BackgroundJob\IJobList; use OCP\DB\Exception; use OCP\EventDispatcher\IEventDispatcher; use OCP\Files\AppData\IAppDataFactory; +use OCP\Files\Config\IUserMountCache; use OCP\Files\File; use OCP\Files\GenericFileException; use OCP\Files\IAppData; +use OCP\Files\InvalidPathException; use OCP\Files\IRootFolder; +use OCP\Files\Node; use OCP\Files\NotPermittedException; use OCP\Files\SimpleFS\ISimpleFile; +use OCP\Http\Client\IClientService; +use OCP\IConfig; use OCP\IL10N; use OCP\IServerContainer; use OCP\L10N\IFactory; @@ -42,6 +50,7 @@ use OCP\TaskProcessing\IProvider; use OCP\TaskProcessing\ISynchronousProvider; use OCP\TaskProcessing\ITaskType; use OCP\TaskProcessing\ShapeDescriptor; +use OCP\TaskProcessing\ShapeEnumValue; use OCP\TaskProcessing\Task; use OCP\TaskProcessing\TaskTypes\AudioToText; use OCP\TaskProcessing\TaskTypes\TextToImage; @@ -49,6 +58,8 @@ use OCP\TaskProcessing\TaskTypes\TextToText; use OCP\TaskProcessing\TaskTypes\TextToTextHeadline; use OCP\TaskProcessing\TaskTypes\TextToTextSummary; use OCP\TaskProcessing\TaskTypes\TextToTextTopics; +use Psr\Container\ContainerExceptionInterface; +use Psr\Container\NotFoundExceptionInterface; use Psr\Log\LoggerInterface; class Manager implements IManager { @@ -57,15 +68,17 @@ class Manager implements IManager { public const LEGACY_PREFIX_TEXTTOIMAGE = 'legacy:TextToImage:'; public const LEGACY_PREFIX_SPEECHTOTEXT = 'legacy:SpeechToText:'; - /** @var list<IProvider>|null */ + /** @var list<IProvider>|null */ private ?array $providers = null; - /** @var array<string,array{name: string, description: string, inputShape: array<string, ShapeDescriptor>, optionalInputShape: array<string, ShapeDescriptor>, outputShape: array<string, ShapeDescriptor>, optionalOutputShape: array<string, ShapeDescriptor>}>|null */ + /** + * @var array<array-key,array{name: string, description: string, inputShape: ShapeDescriptor[], inputShapeEnumValues: ShapeEnumValue[][], inputShapeDefaults: array<array-key, numeric|string>, optionalInputShape: ShapeDescriptor[], optionalInputShapeEnumValues: ShapeEnumValue[][], optionalInputShapeDefaults: array<array-key, numeric|string>, outputShape: ShapeDescriptor[], outputShapeEnumValues: ShapeEnumValue[][], optionalOutputShape: ShapeDescriptor[], optionalOutputShapeEnumValues: ShapeEnumValue[][]}> + */ private ?array $availableTaskTypes = null; private IAppData $appData; - public function __construct( + private IConfig $config, private Coordinator $coordinator, private IServerContainer $serverContainer, private LoggerInterface $logger, @@ -74,19 +87,43 @@ class Manager implements IManager { private IEventDispatcher $dispatcher, IAppDataFactory $appDataFactory, private IRootFolder $rootFolder, - private \OCP\TextProcessing\IManager $textProcessingManager, private \OCP\TextToImage\IManager $textToImageManager, - private \OCP\SpeechToText\ISpeechToTextManager $speechToTextManager, - private \OCP\Share\IManager $shareManager, + private IUserMountCache $userMountCache, + private IClientService $clientService, + private IAppManager $appManager, ) { $this->appData = $appDataFactory->get('core'); } + /** - * @return IProvider[] + * This is almost a copy of textProcessingManager->getProviders + * to avoid a dependency cycle between TextProcessingManager and TaskProcessingManager */ + private function _getRawTextProcessingProviders(): array { + $context = $this->coordinator->getRegistrationContext(); + if ($context === null) { + return []; + } + + $providers = []; + + foreach ($context->getTextProcessingProviders() as $providerServiceRegistration) { + $class = $providerServiceRegistration->getService(); + try { + $providers[$class] = $this->serverContainer->get($class); + } catch (\Throwable $e) { + $this->logger->error('Failed to load Text processing provider ' . $class, [ + 'exception' => $e, + ]); + } + } + + return $providers; + } + private function _getTextProcessingProviders(): array { - $oldProviders = $this->textProcessingManager->getProviders(); + $oldProviders = $this->_getRawTextProcessingProviders(); $newProviders = []; foreach ($oldProviders as $oldProvider) { $provider = new class($oldProvider) implements IProvider, ISynchronousProvider { @@ -138,10 +175,34 @@ class Manager implements IManager { } try { return ['output' => $this->provider->process($input['input'])]; - } catch(\RuntimeException $e) { + } catch (\RuntimeException $e) { throw new ProcessingException($e->getMessage(), 0, $e); } } + + public function getInputShapeEnumValues(): array { + return []; + } + + public function getInputShapeDefaults(): array { + return []; + } + + public function getOptionalInputShapeEnumValues(): array { + return []; + } + + public function getOptionalInputShapeDefaults(): array { + return []; + } + + public function getOutputShapeEnumValues(): array { + return []; + } + + public function getOptionalOutputShapeEnumValues(): array { + return []; + } }; $newProviders[$provider->getId()] = $provider; } @@ -153,7 +214,7 @@ class Manager implements IManager { * @return ITaskType[] */ private function _getTextProcessingTaskTypes(): array { - $oldProviders = $this->textProcessingManager->getProviders(); + $oldProviders = $this->_getRawTextProcessingProviders(); $newTaskTypes = []; foreach ($oldProviders as $oldProvider) { // These are already implemented in the TaskProcessing realm @@ -245,7 +306,7 @@ class Manager implements IManager { public function process(?string $userId, array $input, callable $reportProgress): array { try { $folder = $this->appData->getFolder('text2image'); - } catch(\OCP\Files\NotFoundException) { + } catch (\OCP\Files\NotFoundException) { $folder = $this->appData->newFolder('text2image'); } $resources = []; @@ -276,6 +337,30 @@ class Manager implements IManager { } return ['images' => array_map(fn (ISimpleFile $file) => $file->getContent(), $files)]; } + + public function getInputShapeEnumValues(): array { + return []; + } + + public function getInputShapeDefaults(): array { + return []; + } + + public function getOptionalInputShapeEnumValues(): array { + return []; + } + + public function getOptionalInputShapeDefaults(): array { + return []; + } + + public function getOutputShapeEnumValues(): array { + return []; + } + + public function getOptionalOutputShapeEnumValues(): array { + return []; + } }; $newProviders[$newProvider->getId()] = $newProvider; } @@ -283,12 +368,35 @@ class Manager implements IManager { return $newProviders; } + /** + * This is almost a copy of SpeechToTextManager->getProviders + * to avoid a dependency cycle between SpeechToTextManager and TaskProcessingManager + */ + private function _getRawSpeechToTextProviders(): array { + $context = $this->coordinator->getRegistrationContext(); + if ($context === null) { + return []; + } + $providers = []; + foreach ($context->getSpeechToTextProviders() as $providerServiceRegistration) { + $class = $providerServiceRegistration->getService(); + try { + $providers[$class] = $this->serverContainer->get($class); + } catch (NotFoundExceptionInterface|ContainerExceptionInterface|\Throwable $e) { + $this->logger->error('Failed to load SpeechToText provider ' . $class, [ + 'exception' => $e, + ]); + } + } + + return $providers; + } /** * @return IProvider[] */ private function _getSpeechToTextProviders(): array { - $oldProviders = $this->speechToTextManager->getProviders(); + $oldProviders = $this->_getRawSpeechToTextProviders(); $newProviders = []; foreach ($oldProviders as $oldProvider) { $newProvider = new class($oldProvider, $this->rootFolder, $this->appData) implements IProvider, ISynchronousProvider { @@ -331,6 +439,9 @@ class Manager implements IManager { } public function process(?string $userId, array $input, callable $reportProgress): array { + if ($this->provider instanceof \OCP\SpeechToText\ISpeechToTextProviderWithUserId) { + $this->provider->setUserId($userId); + } try { $result = $this->provider->transcribeFile($input['input']); } catch (\RuntimeException $e) { @@ -338,6 +449,30 @@ class Manager implements IManager { } return ['output' => $result]; } + + public function getInputShapeEnumValues(): array { + return []; + } + + public function getInputShapeDefaults(): array { + return []; + } + + public function getOptionalInputShapeEnumValues(): array { + return []; + } + + public function getOptionalInputShapeDefaults(): array { + return []; + } + + public function getOutputShapeEnumValues(): array { + return []; + } + + public function getOptionalOutputShapeEnumValues(): array { + return []; + } }; $newProviders[$newProvider->getId()] = $newProvider; } @@ -397,6 +532,8 @@ class Manager implements IManager { \OCP\TaskProcessing\TaskTypes\TextToTextFormalization::ID => \OCP\Server::get(\OCP\TaskProcessing\TaskTypes\TextToTextFormalization::class), \OCP\TaskProcessing\TaskTypes\TextToTextSimplification::ID => \OCP\Server::get(\OCP\TaskProcessing\TaskTypes\TextToTextSimplification::class), \OCP\TaskProcessing\TaskTypes\TextToTextChat::ID => \OCP\Server::get(\OCP\TaskProcessing\TaskTypes\TextToTextChat::class), + \OCP\TaskProcessing\TaskTypes\TextToTextTranslate::ID => \OCP\Server::get(\OCP\TaskProcessing\TaskTypes\TextToTextTranslate::class), + \OCP\TaskProcessing\TaskTypes\TextToTextReformulation::ID => \OCP\Server::get(\OCP\TaskProcessing\TaskTypes\TextToTextReformulation::class), \OCP\TaskProcessing\TaskTypes\TextToImage::ID => \OCP\Server::get(\OCP\TaskProcessing\TaskTypes\TextToImage::class), \OCP\TaskProcessing\TaskTypes\AudioToText::ID => \OCP\Server::get(\OCP\TaskProcessing\TaskTypes\AudioToText::class), \OCP\TaskProcessing\TaskTypes\ContextWrite::ID => \OCP\Server::get(\OCP\TaskProcessing\TaskTypes\ContextWrite::class), @@ -426,21 +563,40 @@ class Manager implements IManager { /** * @param ShapeDescriptor[] $spec + * @param array<array-key, string|numeric> $defaults + * @param array<array-key, ShapeEnumValue[]> $enumValues * @param array $io + * @param bool $optional * @return void * @throws ValidationException */ - private function validateInput(array $spec, array $io, bool $optional = false): void { + private static function validateInput(array $spec, array $defaults, array $enumValues, array $io, bool $optional = false): void { foreach ($spec as $key => $descriptor) { $type = $descriptor->getShapeType(); if (!isset($io[$key])) { if ($optional) { continue; } + if (isset($defaults[$key])) { + if (EShapeType::getScalarType($type) !== $type) { + throw new ValidationException('Provider tried to set a default value for a non-scalar slot'); + } + if (EShapeType::isFileType($type)) { + throw new ValidationException('Provider tried to set a default value for a slot that is not text or number'); + } + $type->validateInput($defaults[$key]); + continue; + } throw new ValidationException('Missing key: "' . $key . '"'); } try { $type->validateInput($io[$key]); + if ($type === EShapeType::Enum) { + if (!isset($enumValues[$key])) { + throw new ValidationException('Provider did not provide enum values for an enum slot: "' . $key .'"'); + } + $type->validateEnum($io[$key], $enumValues[$key]); + } } catch (ValidationException $e) { throw new ValidationException('Failed to validate input key "' . $key . '": ' . $e->getMessage()); } @@ -448,13 +604,26 @@ class Manager implements IManager { } /** + * Takes task input data and replaces fileIds with File objects + * + * @param array<array-key, list<numeric|string>|numeric|string> $input + * @param array<array-key, numeric|string> ...$defaultSpecs the specs + * @return array<array-key, list<numeric|string>|numeric|string> + */ + public function fillInputDefaults(array $input, ...$defaultSpecs): array { + $spec = array_reduce($defaultSpecs, fn ($carry, $spec) => array_merge($carry, $spec), []); + return array_merge($spec, $input); + } + + /** * @param ShapeDescriptor[] $spec + * @param array<array-key, ShapeEnumValue[]> $enumValues * @param array $io * @param bool $optional * @return void * @throws ValidationException */ - private function validateOutput(array $spec, array $io, bool $optional = false): void { + private static function validateOutputWithFileIds(array $spec, array $enumValues, array $io, bool $optional = false): void { foreach ($spec as $key => $descriptor) { $type = $descriptor->getShapeType(); if (!isset($io[$key])) { @@ -464,7 +633,38 @@ class Manager implements IManager { throw new ValidationException('Missing key: "' . $key . '"'); } try { - $type->validateOutput($io[$key]); + $type->validateOutputWithFileIds($io[$key]); + if (isset($enumValues[$key])) { + $type->validateEnum($io[$key], $enumValues[$key]); + } + } catch (ValidationException $e) { + throw new ValidationException('Failed to validate output key "' . $key . '": ' . $e->getMessage()); + } + } + } + + /** + * @param ShapeDescriptor[] $spec + * @param array<array-key, ShapeEnumValue[]> $enumValues + * @param array $io + * @param bool $optional + * @return void + * @throws ValidationException + */ + private static function validateOutputWithFileData(array $spec, array $enumValues, array $io, bool $optional = false): void { + foreach ($spec as $key => $descriptor) { + $type = $descriptor->getShapeType(); + if (!isset($io[$key])) { + if ($optional) { + continue; + } + throw new ValidationException('Missing key: "' . $key . '"'); + } + try { + $type->validateOutputWithFileData($io[$key]); + if (isset($enumValues[$key])) { + $type->validateEnum($io[$key], $enumValues[$key]); + } } catch (ValidationException $e) { throw new ValidationException('Failed to validate output key "' . $key . '": ' . $e->getMessage()); } @@ -496,12 +696,24 @@ class Manager implements IManager { return $this->providers; } - public function getPreferredProvider(string $taskType) { - $providers = $this->getProviders(); - foreach ($providers as $provider) { - if ($provider->getTaskTypeId() === $taskType) { - return $provider; + 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); + $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; + } + } + // By default, use the first available provider + foreach ($providers as $provider) { + if ($provider->getTaskTypeId() === $taskTypeId) { + return $provider; + } } + } catch (\JsonException $e) { + $this->logger->warning('Failed to parse provider preferences while getting preferred provider for task type ' . $taskTypeId, ['exception' => $e]); } throw new \OCP\TaskProcessing\Exception\Exception('No matching provider found'); } @@ -509,22 +721,32 @@ class Manager implements IManager { public function getAvailableTaskTypes(): array { if ($this->availableTaskTypes === null) { $taskTypes = $this->_getTaskTypes(); - $providers = $this->getProviders(); $availableTaskTypes = []; - foreach ($providers as $provider) { - if (!isset($taskTypes[$provider->getTaskTypeId()])) { + foreach ($taskTypes as $taskType) { + try { + $provider = $this->getPreferredProvider($taskType->getId()); + } catch (\OCP\TaskProcessing\Exception\Exception $e) { continue; } - $taskType = $taskTypes[$provider->getTaskTypeId()]; - $availableTaskTypes[$provider->getTaskTypeId()] = [ - 'name' => $taskType->getName(), - 'description' => $taskType->getDescription(), - 'inputShape' => $taskType->getInputShape(), - 'optionalInputShape' => $provider->getOptionalInputShape(), - 'outputShape' => $taskType->getOutputShape(), - 'optionalOutputShape' => $provider->getOptionalOutputShape(), - ]; + try { + $availableTaskTypes[$provider->getTaskTypeId()] = [ + 'name' => $taskType->getName(), + 'description' => $taskType->getDescription(), + 'optionalInputShape' => $provider->getOptionalInputShape(), + 'inputShapeEnumValues' => $provider->getInputShapeEnumValues(), + 'inputShapeDefaults' => $provider->getInputShapeDefaults(), + 'inputShape' => $taskType->getInputShape(), + 'optionalInputShapeEnumValues' => $provider->getOptionalInputShapeEnumValues(), + 'optionalInputShapeDefaults' => $provider->getOptionalInputShapeDefaults(), + 'outputShape' => $taskType->getOutputShape(), + 'outputShapeEnumValues' => $provider->getOutputShapeEnumValues(), + 'optionalOutputShape' => $provider->getOptionalOutputShape(), + 'optionalOutputShapeEnumValues' => $provider->getOptionalOutputShapeEnumValues(), + ]; + } catch (\Throwable $e) { + $this->logger->error('Failed to set up TaskProcessing provider ' . $provider::class, ['exception' => $e]); + } } $this->availableTaskTypes = $availableTaskTypes; @@ -541,59 +763,69 @@ class Manager implements IManager { if (!$this->canHandleTask($task)) { throw new \OCP\TaskProcessing\Exception\PreConditionNotMetException('No task processing provider is installed that can handle this task type: ' . $task->getTaskTypeId()); } - $taskTypes = $this->getAvailableTaskTypes(); - $inputShape = $taskTypes[$task->getTaskTypeId()]['inputShape']; - $optionalInputShape = $taskTypes[$task->getTaskTypeId()]['optionalInputShape']; - // validate input - $this->validateInput($inputShape, $task->getInput()); - $this->validateInput($optionalInputShape, $task->getInput(), true); - // authenticate access to mentioned files - $ids = []; - foreach ($inputShape + $optionalInputShape as $key => $descriptor) { - if (in_array(EShapeType::getScalarType($descriptor->getShapeType()), [EShapeType::File, EShapeType::Image, EShapeType::Audio, EShapeType::Video], true)) { - /** @var list<int>|int $inputSlot */ - $inputSlot = $task->getInput()[$key]; - if (is_array($inputSlot)) { - $ids += $inputSlot; - } else { - $ids[] = $inputSlot; - } - } - } - foreach ($ids as $fileId) { - $node = $this->rootFolder->getFirstNodeById($fileId); - if ($node === null) { - $node = $this->rootFolder->getFirstNodeByIdInPath($fileId, '/' . $this->rootFolder->getAppDataDirectoryName() . '/'); - if ($node === null) { - throw new ValidationException('Could not find file ' . $fileId); - } - } - /** @var array{users:array<string,array{node_id:int, node_path: string}>, remote: array<string,array{node_id:int, node_path: string}>, mail: array<string,array{node_id:int, node_path: string}>} $accessList */ - $accessList = $this->shareManager->getAccessList($node, true, true); - $userIds = array_map(fn ($id) => strval($id), array_keys($accessList['users'])); - if (!in_array($task->getUserId(), $userIds)) { - throw new UnauthorizedException('User ' . $task->getUserId() . ' does not have access to file ' . $fileId); - } - } - // remove superfluous keys and set input - $task->setInput($this->removeSuperfluousArrayKeys($task->getInput(), $inputShape, $optionalInputShape)); + $this->prepareTask($task); $task->setStatus(Task::STATUS_SCHEDULED); - $provider = $this->getPreferredProvider($task->getTaskTypeId()); - // calculate expected completion time - $completionExpectedAt = new \DateTime('now'); - $completionExpectedAt->add(new \DateInterval('PT'.$provider->getExpectedRuntime().'S')); - $task->setCompletionExpectedAt($completionExpectedAt); - // create a db entity and insert into db table - $taskEntity = \OC\TaskProcessing\Db\Task::fromPublicTask($task); - $this->taskMapper->insert($taskEntity); - // make sure the scheduler knows the id - $task->setId($taskEntity->getId()); + $this->storeTask($task); // schedule synchronous job if the provider is synchronous + $provider = $this->getPreferredProvider($task->getTaskTypeId()); if ($provider instanceof ISynchronousProvider) { $this->jobList->add(SynchronousBackgroundJob::class, null); } } + public function runTask(Task $task): Task { + if (!$this->canHandleTask($task)) { + throw new \OCP\TaskProcessing\Exception\PreConditionNotMetException('No task processing provider is installed that can handle this task type: ' . $task->getTaskTypeId()); + } + + $provider = $this->getPreferredProvider($task->getTaskTypeId()); + if ($provider instanceof ISynchronousProvider) { + $this->prepareTask($task); + $task->setStatus(Task::STATUS_SCHEDULED); + $this->storeTask($task); + $this->processTask($task, $provider); + $task = $this->getTask($task->getId()); + } else { + $this->scheduleTask($task); + // poll task + while ($task->getStatus() === Task::STATUS_SCHEDULED || $task->getStatus() === Task::STATUS_RUNNING) { + sleep(1); + $task = $this->getTask($task->getId()); + } + } + return $task; + } + + public function processTask(Task $task, ISynchronousProvider $provider): bool { + try { + try { + $input = $this->prepareInputData($task); + } catch (GenericFileException|NotPermittedException|LockedException|ValidationException|UnauthorizedException $e) { + $this->logger->warning('Failed to prepare input data for a TaskProcessing task with synchronous provider ' . $provider->getId(), ['exception' => $e]); + $this->setTaskResult($task->getId(), $e->getMessage(), null); + return false; + } + try { + $this->setTaskStatus($task, Task::STATUS_RUNNING); + $output = $provider->process($task->getUserId(), $input, fn (float $progress) => $this->setTaskProgress($task->getId(), $progress)); + } catch (ProcessingException $e) { + $this->logger->warning('Failed to process a TaskProcessing task with synchronous provider ' . $provider->getId(), ['exception' => $e]); + $this->setTaskResult($task->getId(), $e->getMessage(), null); + return false; + } catch (\Throwable $e) { + $this->logger->error('Unknown error while processing TaskProcessing task', ['exception' => $e]); + $this->setTaskResult($task->getId(), $e->getMessage(), null); + return false; + } + $this->setTaskResult($task->getId(), null, $output); + } catch (NotFoundException $e) { + $this->logger->info('Could not find task anymore after execution. Moving on.', ['exception' => $e]); + } catch (Exception $e) { + $this->logger->error('Failed to report result of TaskProcessing task', ['exception' => $e]); + } + return true; + } + public function deleteTask(Task $task): void { $taskEntity = \OC\TaskProcessing\Db\Task::fromPublicTask($task); $this->taskMapper->delete($taskEntity); @@ -618,9 +850,11 @@ class Manager implements IManager { return; } $task->setStatus(Task::STATUS_CANCELLED); + $task->setEndedAt(time()); $taskEntity = \OC\TaskProcessing\Db\Task::fromPublicTask($task); try { $this->taskMapper->update($taskEntity); + $this->runWebhook($task); } catch (\OCP\DB\Exception $e) { throw new \OCP\TaskProcessing\Exception\Exception('There was a problem finding the task', 0, $e); } @@ -632,6 +866,10 @@ class Manager implements IManager { if ($task->getStatus() === Task::STATUS_CANCELLED) { return false; } + // only set the start time if the task is going from scheduled to running + if ($task->getstatus() === Task::STATUS_SCHEDULED) { + $task->setStartedAt(time()); + } $task->setStatus(Task::STATUS_RUNNING); $task->setProgress($progress); $taskEntity = \OC\TaskProcessing\Db\Task::fromPublicTask($task); @@ -643,7 +881,7 @@ class Manager implements IManager { return true; } - public function setTaskResult(int $id, ?string $error, ?array $result): void { + public function setTaskResult(int $id, ?string $error, ?array $result, bool $isUsingFileIds = false): void { // TODO: Not sure if we should rather catch the exceptions of getTask here and fail silently $task = $this->getTask($id); if ($task->getStatus() === Task::STATUS_CANCELLED) { @@ -652,42 +890,74 @@ class Manager implements IManager { } if ($error !== null) { $task->setStatus(Task::STATUS_FAILED); - $task->setErrorMessage($error); + $task->setEndedAt(time()); + // truncate error message to 1000 characters + $task->setErrorMessage(mb_substr($error, 0, 1000)); $this->logger->warning('A TaskProcessing ' . $task->getTaskTypeId() . ' task with id ' . $id . ' failed with the following message: ' . $error); } elseif ($result !== null) { $taskTypes = $this->getAvailableTaskTypes(); $outputShape = $taskTypes[$task->getTaskTypeId()]['outputShape']; + $outputShapeEnumValues = $taskTypes[$task->getTaskTypeId()]['outputShapeEnumValues']; $optionalOutputShape = $taskTypes[$task->getTaskTypeId()]['optionalOutputShape']; + $optionalOutputShapeEnumValues = $taskTypes[$task->getTaskTypeId()]['optionalOutputShapeEnumValues']; try { // validate output - $this->validateOutput($outputShape, $result); - $this->validateOutput($optionalOutputShape, $result, true); + if (!$isUsingFileIds) { + $this->validateOutputWithFileData($outputShape, $outputShapeEnumValues, $result); + $this->validateOutputWithFileData($optionalOutputShape, $optionalOutputShapeEnumValues, $result, true); + } else { + $this->validateOutputWithFileIds($outputShape, $outputShapeEnumValues, $result); + $this->validateOutputWithFileIds($optionalOutputShape, $optionalOutputShapeEnumValues, $result, true); + } $output = $this->removeSuperfluousArrayKeys($result, $outputShape, $optionalOutputShape); // extract raw data and put it in files, replace it with file ids - $output = $this->encapsulateOutputFileData($output, $outputShape, $optionalOutputShape); + if (!$isUsingFileIds) { + $output = $this->encapsulateOutputFileData($output, $outputShape, $optionalOutputShape); + } else { + $this->validateOutputFileIds($output, $outputShape, $optionalOutputShape); + } + // Turn file objects into IDs + foreach ($output as $key => $value) { + if ($value instanceof Node) { + $output[$key] = $value->getId(); + } + if (is_array($value) && $value[0] instanceof Node) { + $output[$key] = array_map(fn ($node) => $node->getId(), $value); + } + } $task->setOutput($output); $task->setProgress(1); $task->setStatus(Task::STATUS_SUCCESSFUL); + $task->setEndedAt(time()); } catch (ValidationException $e) { $task->setProgress(1); $task->setStatus(Task::STATUS_FAILED); + $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]); } catch (NotPermittedException $e) { $task->setProgress(1); $task->setStatus(Task::STATUS_FAILED); + $task->setEndedAt(time()); $error = 'The task was processed successfully but storing the output in a file failed'; $task->setErrorMessage($error); $this->logger->error($error, ['exception' => $e]); - + } catch (InvalidPathException|\OCP\Files\NotFoundException $e) { + $task->setProgress(1); + $task->setStatus(Task::STATUS_FAILED); + $task->setEndedAt(time()); + $error = 'The task was processed successfully but the result file could not be found'; + $task->setErrorMessage($error); + $this->logger->error($error, ['exception' => $e]); } } $taskEntity = \OC\TaskProcessing\Db\Task::fromPublicTask($task); try { $this->taskMapper->update($taskEntity); + $this->runWebhook($task); } catch (\OCP\DB\Exception $e) { - throw new \OCP\TaskProcessing\Exception\Exception('There was a problem finding the task', 0, $e); + throw new \OCP\TaskProcessing\Exception\Exception($e->getMessage()); } if ($task->getStatus() === Task::STATUS_SUCCESSFUL) { $event = new TaskSuccessfulEvent($task); @@ -711,16 +981,13 @@ class Manager implements IManager { } /** - * Takes task input or output data and replaces fileIds with base64 data + * Takes task input data and replaces fileIds with File objects * * @param string|null $userId * @param array<array-key, list<numeric|string>|numeric|string> $input * @param ShapeDescriptor[] ...$specs the specs * @return array<array-key, list<File|numeric|string>|numeric|string|File> - * @throws GenericFileException - * @throws LockedException - * @throws NotPermittedException - * @throws ValidationException + * @throws GenericFileException|LockedException|NotPermittedException|ValidationException|UnauthorizedException */ public function fillInputFileData(?string $userId, array $input, ...$specs): array { if ($userId !== null) { @@ -728,7 +995,7 @@ class Manager implements IManager { } $newInputOutput = []; $spec = array_reduce($specs, fn ($carry, $spec) => $carry + $spec, []); - foreach($spec as $key => $descriptor) { + foreach ($spec as $key => $descriptor) { $type = $descriptor->getShapeType(); if (!isset($input[$key])) { continue; @@ -737,31 +1004,17 @@ class Manager implements IManager { $newInputOutput[$key] = $input[$key]; continue; } - if ($type->value < 10) { - $node = $this->rootFolder->getFirstNodeById((int)$input[$key]); - if ($node === null) { - $node = $this->rootFolder->getFirstNodeByIdInPath((int)$input[$key], '/' . $this->rootFolder->getAppDataDirectoryName() . '/'); - if (!$node instanceof File) { - throw new ValidationException('File id given for key "' . $key . '" is not a file'); - } - } elseif (!$node instanceof File) { - throw new ValidationException('File id given for key "' . $key . '" is not a file'); - } - // TODO: Validate if userId has access to this file + if (EShapeType::getScalarType($type) === $type) { + // is scalar + $node = $this->validateFileId((int)$input[$key]); + $this->validateUserAccessToFile($input[$key], $userId); $newInputOutput[$key] = $node; } else { + // is list $newInputOutput[$key] = []; foreach ($input[$key] as $item) { - $node = $this->rootFolder->getFirstNodeById((int)$item); - if ($node === null) { - $node = $this->rootFolder->getFirstNodeByIdInPath((int)$item, '/' . $this->rootFolder->getAppDataDirectoryName() . '/'); - if (!$node instanceof File) { - throw new ValidationException('File id given for key "' . $key . '" is not a file'); - } - } elseif (!$node instanceof File) { - throw new ValidationException('File id given for key "' . $key . '" is not a file'); - } - // TODO: Validate if userId has access to this file + $node = $this->validateFileId((int)$item); + $this->validateUserAccessToFile($item, $userId); $newInputOutput[$key][] = $node; } } @@ -793,6 +1046,20 @@ class Manager implements IManager { } } + public function getTasks( + ?string $userId, ?string $taskTypeId = null, ?string $appId = null, ?string $customId = null, + ?int $status = null, ?int $scheduleAfter = null, ?int $endedBefore = null + ): array { + try { + $taskEntities = $this->taskMapper->findTasks($userId, $taskTypeId, $appId, $customId, $status, $scheduleAfter, $endedBefore); + return array_map(fn ($taskEntity): Task => $taskEntity->toPublicTask(), $taskEntities); + } catch (\OCP\DB\Exception $e) { + throw new \OCP\TaskProcessing\Exception\Exception('There was a problem finding the tasks', 0, $e); + } catch (\JsonException $e) { + throw new \OCP\TaskProcessing\Exception\Exception('There was a problem parsing JSON after finding the tasks', 0, $e); + } + } + public function getUserTasksByApp(?string $userId, string $appId, ?string $customId = null): array { try { $taskEntities = $this->taskMapper->findUserTasksByApp($userId, $appId, $customId); @@ -820,7 +1087,7 @@ class Manager implements IManager { $folder = $this->appData->newFolder('TaskProcessing'); } $spec = array_reduce($specs, fn ($carry, $spec) => $carry + $spec, []); - foreach($spec as $key => $descriptor) { + foreach ($spec as $key => $descriptor) { $type = $descriptor->getShapeType(); if (!isset($output[$key])) { continue; @@ -829,15 +1096,15 @@ class Manager implements IManager { $newOutput[$key] = $output[$key]; continue; } - if ($type->value < 10) { + if (EShapeType::getScalarType($type) === $type) { /** @var SimpleFile $file */ - $file = $folder->newFile((string) rand(0, 10000000), $output[$key]); + $file = $folder->newFile(time() . '-' . rand(1, 100000), $output[$key]); $newOutput[$key] = $file->getId(); // polymorphic call to SimpleFile } else { $newOutput = []; foreach ($output[$key] as $item) { /** @var SimpleFile $file */ - $file = $folder->newFile((string) rand(0, 10000000), $item); + $file = $folder->newFile(time() . '-' . rand(1, 100000), $item); $newOutput[$key][] = $file->getId(); } } @@ -851,16 +1118,13 @@ class Manager implements IManager { * @throws GenericFileException * @throws LockedException * @throws NotPermittedException - * @throws ValidationException + * @throws ValidationException|UnauthorizedException */ public function prepareInputData(Task $task): array { $taskTypes = $this->getAvailableTaskTypes(); $inputShape = $taskTypes[$task->getTaskTypeId()]['inputShape']; $optionalInputShape = $taskTypes[$task->getTaskTypeId()]['optionalInputShape']; $input = $task->getInput(); - // validate input, again for good measure (should have been validated in scheduleTask) - $this->validateInput($inputShape, $input); - $this->validateInput($optionalInputShape, $input, true); $input = $this->removeSuperfluousArrayKeys($input, $inputShape, $optionalInputShape); $input = $this->fillInputFileData($task->getUserId(), $input, $inputShape, $optionalInputShape); return $input; @@ -880,8 +1144,218 @@ class Manager implements IManager { * @throws Exception */ public function setTaskStatus(Task $task, int $status): void { + $currentTaskStatus = $task->getStatus(); + if ($currentTaskStatus === Task::STATUS_SCHEDULED && $status === Task::STATUS_RUNNING) { + $task->setStartedAt(time()); + } elseif ($currentTaskStatus === Task::STATUS_RUNNING && ($status === Task::STATUS_FAILED || $status === Task::STATUS_CANCELLED)) { + $task->setEndedAt(time()); + } elseif ($currentTaskStatus === Task::STATUS_UNKNOWN && $status === Task::STATUS_SCHEDULED) { + $task->setScheduledAt(time()); + } $task->setStatus($status); $taskEntity = \OC\TaskProcessing\Db\Task::fromPublicTask($task); $this->taskMapper->update($taskEntity); } + + /** + * Validate input, fill input default values, set completionExpectedAt, set scheduledAt + * + * @param Task $task + * @return void + * @throws UnauthorizedException + * @throws ValidationException + * @throws \OCP\TaskProcessing\Exception\Exception + */ + private function prepareTask(Task $task): void { + $taskTypes = $this->getAvailableTaskTypes(); + $taskType = $taskTypes[$task->getTaskTypeId()]; + $inputShape = $taskType['inputShape']; + $inputShapeDefaults = $taskType['inputShapeDefaults']; + $inputShapeEnumValues = $taskType['inputShapeEnumValues']; + $optionalInputShape = $taskType['optionalInputShape']; + $optionalInputShapeEnumValues = $taskType['optionalInputShapeEnumValues']; + $optionalInputShapeDefaults = $taskType['optionalInputShapeDefaults']; + // validate input + $this->validateInput($inputShape, $inputShapeDefaults, $inputShapeEnumValues, $task->getInput()); + $this->validateInput($optionalInputShape, $optionalInputShapeDefaults, $optionalInputShapeEnumValues, $task->getInput(), true); + // authenticate access to mentioned files + $ids = []; + foreach ($inputShape + $optionalInputShape as $key => $descriptor) { + if (in_array(EShapeType::getScalarType($descriptor->getShapeType()), [EShapeType::File, EShapeType::Image, EShapeType::Audio, EShapeType::Video], true)) { + /** @var list<int>|int $inputSlot */ + $inputSlot = $task->getInput()[$key]; + if (is_array($inputSlot)) { + $ids += $inputSlot; + } else { + $ids[] = $inputSlot; + } + } + } + foreach ($ids as $fileId) { + $this->validateFileId($fileId); + $this->validateUserAccessToFile($fileId, $task->getUserId()); + } + // remove superfluous keys and set input + $input = $this->removeSuperfluousArrayKeys($task->getInput(), $inputShape, $optionalInputShape); + $inputWithDefaults = $this->fillInputDefaults($input, $inputShapeDefaults, $optionalInputShapeDefaults); + $task->setInput($inputWithDefaults); + $task->setScheduledAt(time()); + $provider = $this->getPreferredProvider($task->getTaskTypeId()); + // calculate expected completion time + $completionExpectedAt = new \DateTime('now'); + $completionExpectedAt->add(new \DateInterval('PT'.$provider->getExpectedRuntime().'S')); + $task->setCompletionExpectedAt($completionExpectedAt); + } + + /** + * Store the task in the DB and set its ID in the \OCP\TaskProcessing\Task input param + * + * @param Task $task + * @return void + * @throws Exception + * @throws \JsonException + */ + private function storeTask(Task $task): void { + // create a db entity and insert into db table + $taskEntity = \OC\TaskProcessing\Db\Task::fromPublicTask($task); + $this->taskMapper->insert($taskEntity); + // make sure the scheduler knows the id + $task->setId($taskEntity->getId()); + } + + /** + * @param array $output + * @param ShapeDescriptor[] ...$specs the specs that define which keys to keep + * @return array + * @throws NotPermittedException + */ + private function validateOutputFileIds(array $output, ...$specs): array { + $newOutput = []; + $spec = array_reduce($specs, fn ($carry, $spec) => $carry + $spec, []); + foreach ($spec as $key => $descriptor) { + $type = $descriptor->getShapeType(); + if (!isset($output[$key])) { + continue; + } + if (!in_array(EShapeType::getScalarType($type), [EShapeType::Image, EShapeType::Audio, EShapeType::Video, EShapeType::File], true)) { + $newOutput[$key] = $output[$key]; + continue; + } + if (EShapeType::getScalarType($type) === $type) { + // Is scalar file ID + $newOutput[$key] = $this->validateFileId($output[$key]); + } else { + // Is list of file IDs + $newOutput = []; + foreach ($output[$key] as $item) { + $newOutput[$key][] = $this->validateFileId($item); + } + } + } + return $newOutput; + } + + /** + * @param mixed $id + * @return File + * @throws ValidationException + */ + private function validateFileId(mixed $id): File { + $node = $this->rootFolder->getFirstNodeById($id); + if ($node === null) { + $node = $this->rootFolder->getFirstNodeByIdInPath($id, '/' . $this->rootFolder->getAppDataDirectoryName() . '/'); + if ($node === null) { + throw new ValidationException('Could not find file ' . $id); + } elseif (!$node instanceof File) { + throw new ValidationException('File with id "' . $id . '" is not a file'); + } + } elseif (!$node instanceof File) { + throw new ValidationException('File with id "' . $id . '" is not a file'); + } + return $node; + } + + /** + * @param mixed $fileId + * @param string|null $userId + * @return void + * @throws UnauthorizedException + */ + private function validateUserAccessToFile(mixed $fileId, ?string $userId): void { + if ($userId === null) { + throw new UnauthorizedException('User does not have access to file ' . $fileId); + } + $mounts = $this->userMountCache->getMountsForFileId($fileId); + $userIds = array_map(fn ($mount) => $mount->getUser()->getUID(), $mounts); + if (!in_array($userId, $userIds)) { + throw new UnauthorizedException('User ' . $userId . ' does not have access to file ' . $fileId); + } + } + + /** + * Make a request to the task's webhookUri if necessary + * + * @param Task $task + */ + private function runWebhook(Task $task): void { + $uri = $task->getWebhookUri(); + $method = $task->getWebhookMethod(); + + if (!$uri || !$method) { + return; + } + + if (in_array($method, ['HTTP:GET', 'HTTP:POST', 'HTTP:PUT', 'HTTP:DELETE'], true)) { + $client = $this->clientService->newClient(); + $httpMethod = preg_replace('/^HTTP:/', '', $method); + $options = [ + 'timeout' => 30, + 'body' => json_encode([ + 'task' => $task->jsonSerialize(), + ]), + 'headers' => ['Content-Type' => 'application/json'], + ]; + try { + $client->request($httpMethod, $uri, $options); + } catch (ClientException|ServerException $e) { + $this->logger->warning('Task processing HTTP webhook failed for task ' . $task->getId() . '. Request failed', ['exception' => $e]); + } catch (\Exception|\Throwable $e) { + $this->logger->warning('Task processing HTTP webhook failed for task ' . $task->getId() . '. Unknown error', ['exception' => $e]); + } + } elseif (str_starts_with($method, 'AppAPI:') && str_starts_with($uri, '/')) { + $parsedMethod = explode(':', $method, 4); + if (count($parsedMethod) < 3) { + $this->logger->warning('Task processing AppAPI webhook failed for task ' . $task->getId() . '. Invalid method: ' . $method); + } + [, $exAppId, $httpMethod] = $parsedMethod; + if (!$this->appManager->isInstalled('app_api')) { + $this->logger->warning('Task processing AppAPI webhook failed for task ' . $task->getId() . '. AppAPI is disabled or not installed.'); + return; + } + try { + $appApiFunctions = \OCP\Server::get(\OCA\AppAPI\PublicFunctions::class); + } catch (ContainerExceptionInterface|NotFoundExceptionInterface) { + $this->logger->warning('Task processing AppAPI webhook failed for task ' . $task->getId() . '. Could not get AppAPI public functions.'); + return; + } + $exApp = $appApiFunctions->getExApp($exAppId); + if ($exApp === null) { + $this->logger->warning('Task processing AppAPI webhook failed for task ' . $task->getId() . '. ExApp ' . $exAppId . ' is missing.'); + return; + } elseif (!$exApp['enabled']) { + $this->logger->warning('Task processing AppAPI webhook failed for task ' . $task->getId() . '. ExApp ' . $exAppId . ' is disabled.'); + return; + } + $requestParams = [ + 'task' => $task->jsonSerialize(), + ]; + $requestOptions = [ + 'timeout' => 30, + ]; + $response = $appApiFunctions->exAppRequest($exAppId, $uri, $task->getUserId(), $httpMethod, $requestParams, $requestOptions); + if (is_array($response) && isset($response['error'])) { + $this->logger->warning('Task processing AppAPI webhook failed for task ' . $task->getId() . '. Error during request to ExApp(' . $exAppId . '): ', $response['error']); + } + } + } } diff --git a/lib/private/TaskProcessing/RemoveOldTasksBackgroundJob.php b/lib/private/TaskProcessing/RemoveOldTasksBackgroundJob.php index 823ea09a622..acec2f46c05 100644 --- a/lib/private/TaskProcessing/RemoveOldTasksBackgroundJob.php +++ b/lib/private/TaskProcessing/RemoveOldTasksBackgroundJob.php @@ -65,7 +65,7 @@ class RemoveOldTasksBackgroundJob extends TimedJob { * @return void */ private function clearFilesOlderThan(ISimpleFolder $folder, int $ageInSeconds): void { - foreach($folder->getDirectoryListing() as $file) { + foreach ($folder->getDirectoryListing() as $file) { if ($file->getMTime() < time() - $ageInSeconds) { try { $file->delete(); diff --git a/lib/private/TaskProcessing/SynchronousBackgroundJob.php b/lib/private/TaskProcessing/SynchronousBackgroundJob.php index 7f1ab623190..de3b424176c 100644 --- a/lib/private/TaskProcessing/SynchronousBackgroundJob.php +++ b/lib/private/TaskProcessing/SynchronousBackgroundJob.php @@ -9,13 +9,8 @@ namespace OC\TaskProcessing; use OCP\AppFramework\Utility\ITimeFactory; use OCP\BackgroundJob\IJobList; use OCP\BackgroundJob\QueuedJob; -use OCP\Files\GenericFileException; -use OCP\Files\NotPermittedException; -use OCP\Lock\LockedException; use OCP\TaskProcessing\Exception\Exception; use OCP\TaskProcessing\Exception\NotFoundException; -use OCP\TaskProcessing\Exception\ProcessingException; -use OCP\TaskProcessing\Exception\ValidationException; use OCP\TaskProcessing\IManager; use OCP\TaskProcessing\ISynchronousProvider; use OCP\TaskProcessing\Task; @@ -42,55 +37,41 @@ class SynchronousBackgroundJob extends QueuedJob { if (!$provider instanceof ISynchronousProvider) { continue; } - $taskType = $provider->getTaskTypeId(); + $taskTypeId = $provider->getTaskTypeId(); + // only use this provider if it is the preferred one + $preferredProvider = $this->taskProcessingManager->getPreferredProvider($taskTypeId); + if ($provider->getId() !== $preferredProvider->getId()) { + continue; + } try { - $task = $this->taskProcessingManager->getNextScheduledTask([$taskType]); + $task = $this->taskProcessingManager->getNextScheduledTask([$taskTypeId]); } catch (NotFoundException $e) { continue; } catch (Exception $e) { $this->logger->error('Unknown error while retrieving scheduled TaskProcessing tasks', ['exception' => $e]); continue; } - try { - try { - $input = $this->taskProcessingManager->prepareInputData($task); - } catch (GenericFileException|NotPermittedException|LockedException|ValidationException $e) { - $this->logger->warning('Failed to prepare input data for a TaskProcessing task with synchronous provider ' . $provider->getId(), ['exception' => $e]); - $this->taskProcessingManager->setTaskResult($task->getId(), $e->getMessage(), null); - // Schedule again - $this->jobList->add(self::class, $argument); - return; - } - try { - $this->taskProcessingManager->setTaskStatus($task, Task::STATUS_RUNNING); - $output = $provider->process($task->getUserId(), $input, fn (float $progress) => $this->taskProcessingManager->setTaskProgress($task->getId(), $progress)); - } catch (ProcessingException $e) { - $this->logger->warning('Failed to process a TaskProcessing task with synchronous provider ' . $provider->getId(), ['exception' => $e]); - $this->taskProcessingManager->setTaskResult($task->getId(), $e->getMessage(), null); - // Schedule again - $this->jobList->add(self::class, $argument); - return; - } catch (\Throwable $e) { - $this->logger->error('Unknown error while processing TaskProcessing task', ['exception' => $e]); - $this->taskProcessingManager->setTaskResult($task->getId(), $e->getMessage(), null); - // Schedule again - $this->jobList->add(self::class, $argument); - return; - } - $this->taskProcessingManager->setTaskResult($task->getId(), null, $output); - } catch (NotFoundException $e) { - $this->logger->info('Could not find task anymore after execution. Moving on.', ['exception' => $e]); - } catch (Exception $e) { - $this->logger->error('Failed to report result of TaskProcessing task', ['exception' => $e]); + if (!$this->taskProcessingManager->processTask($task, $provider)) { + // Schedule again + $this->jobList->add(self::class, $argument); } } + // check if this job needs to be scheduled again: + // if there is at least one preferred synchronous provider that has a scheduled task $synchronousProviders = array_filter($providers, fn ($provider) => $provider instanceof ISynchronousProvider); - $taskTypes = array_values(array_map(fn ($provider) => - $provider->getTaskTypeId(), - $synchronousProviders - )); + $synchronousPreferredProviders = array_filter($synchronousProviders, function ($provider) { + $taskTypeId = $provider->getTaskTypeId(); + $preferredProvider = $this->taskProcessingManager->getPreferredProvider($taskTypeId); + return $provider->getId() === $preferredProvider->getId(); + }); + $taskTypes = array_values( + array_map( + fn ($provider) => $provider->getTaskTypeId(), + $synchronousPreferredProviders + ) + ); $taskTypesWithTasks = array_filter($taskTypes, function ($taskType) { try { $this->taskProcessingManager->getNextScheduledTask([$taskType]); diff --git a/lib/private/TempManager.php b/lib/private/TempManager.php index 68a53f493db..f55d722d9d9 100644 --- a/lib/private/TempManager.php +++ b/lib/private/TempManager.php @@ -138,7 +138,7 @@ class TempManager implements ITempManager { \OC_Helper::rmdirr($file); } catch (\UnexpectedValueException $ex) { $this->log->warning( - "Error deleting temporary file/folder: {file} - Reason: {error}", + 'Error deleting temporary file/folder: {file} - Reason: {error}', [ 'file' => $file, 'error' => $ex->getMessage(), @@ -216,7 +216,7 @@ class TempManager implements ITempManager { } } - $temp = tempnam(dirname(__FILE__), ''); + $temp = tempnam(__DIR__, ''); if (file_exists($temp)) { unlink($temp); return dirname($temp); diff --git a/lib/private/Template/Base.php b/lib/private/Template/Base.php index 2adf9172f6b..b48c10143cf 100644 --- a/lib/private/Template/Base.php +++ b/lib/private/Template/Base.php @@ -24,11 +24,14 @@ class Base { * @param string $template * @param string $requestToken * @param \OCP\IL10N $l10n + * @param string $cspNonce * @param Defaults $theme */ - public function __construct($template, $requestToken, $l10n, $theme) { - $this->vars = []; - $this->vars['requesttoken'] = $requestToken; + public function __construct($template, $requestToken, $l10n, $theme, $cspNonce) { + $this->vars = [ + 'cspNonce' => $cspNonce, + 'requesttoken' => $requestToken, + ]; $this->l10n = $l10n; $this->template = $template; $this->theme = $theme; diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php index a41e99ae8c4..a4984eaf930 100644 --- a/lib/private/Template/JSConfigHelper.php +++ b/lib/private/Template/JSConfigHelper.php @@ -10,7 +10,9 @@ namespace OC\Template; use bantu\IniGetWrapper\IniGetWrapper; use OC\Authentication\Token\IProvider; use OC\CapabilitiesManager; +use OC\Files\FilenameValidator; use OC\Share\Share; +use OCA\Provisioning_API\Controller\AUserData; use OCP\App\AppPathNotFoundException; use OCP\App\IAppManager; use OCP\Authentication\Exceptions\ExpiredTokenException; @@ -51,6 +53,7 @@ class JSConfigHelper { protected CapabilitiesManager $capabilitiesManager, protected IInitialStateService $initialStateService, protected IProvider $tokenProvider, + protected FilenameValidator $filenameValidator, ) { } @@ -131,10 +134,16 @@ class JSConfigHelper { $capabilities = $this->capabilitiesManager->getCapabilities(false, true); + $userFirstDay = $this->config->getUserValue($uid, 'core', AUserData::USER_FIELD_FIRST_DAY_OF_WEEK, null); + $firstDay = (int)($userFirstDay ?? $this->l->l('firstday', null)); + $config = [ - 'auto_logout' => $this->config->getSystemValue('auto_logout', false), + /** @deprecated 30.0.0 - use files capabilities instead */ 'blacklist_files_regex' => FileInfo::BLACKLIST_FILES_REGEX, - 'forbidden_filename_characters' => Util::getForbiddenFileNameChars(), + /** @deprecated 30.0.0 - use files capabilities instead */ + 'forbidden_filename_characters' => $this->filenameValidator->getForbiddenCharacters(), + + 'auto_logout' => $this->config->getSystemValue('auto_logout', false), 'loglevel' => $this->config->getSystemValue('loglevel_frontend', $this->config->getSystemValue('loglevel', ILogger::WARN) ), @@ -151,16 +160,16 @@ class JSConfigHelper { ]; $array = [ - "_oc_debug" => $this->config->getSystemValue('debug', false) ? 'true' : 'false', - "_oc_isadmin" => $uid !== null && $this->groupManager->isAdmin($uid) ? 'true' : 'false', - "backendAllowsPasswordConfirmation" => $userBackendAllowsPasswordConfirmation ? 'true' : 'false', - "oc_dataURL" => is_string($dataLocation) ? "\"" . $dataLocation . "\"" : 'false', - "_oc_webroot" => "\"" . \OC::$WEBROOT . "\"", - "_oc_appswebroots" => str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution - "datepickerFormatDate" => json_encode($this->l->l('jsdate', null)), + '_oc_debug' => $this->config->getSystemValue('debug', false) ? 'true' : 'false', + '_oc_isadmin' => $uid !== null && $this->groupManager->isAdmin($uid) ? 'true' : 'false', + 'backendAllowsPasswordConfirmation' => $userBackendAllowsPasswordConfirmation ? 'true' : 'false', + 'oc_dataURL' => is_string($dataLocation) ? '"' . $dataLocation . '"' : 'false', + '_oc_webroot' => '"' . \OC::$WEBROOT . '"', + '_oc_appswebroots' => str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution + 'datepickerFormatDate' => json_encode($this->l->l('jsdate', null)), 'nc_lastLogin' => $lastConfirmTimestamp, 'nc_pageLoad' => time(), - "dayNames" => json_encode([ + 'dayNames' => json_encode([ $this->l->t('Sunday'), $this->l->t('Monday'), $this->l->t('Tuesday'), @@ -169,7 +178,7 @@ class JSConfigHelper { $this->l->t('Friday'), $this->l->t('Saturday') ]), - "dayNamesShort" => json_encode([ + 'dayNamesShort' => json_encode([ $this->l->t('Sun.'), $this->l->t('Mon.'), $this->l->t('Tue.'), @@ -178,7 +187,7 @@ class JSConfigHelper { $this->l->t('Fri.'), $this->l->t('Sat.') ]), - "dayNamesMin" => json_encode([ + 'dayNamesMin' => json_encode([ $this->l->t('Su'), $this->l->t('Mo'), $this->l->t('Tu'), @@ -187,7 +196,7 @@ class JSConfigHelper { $this->l->t('Fr'), $this->l->t('Sa') ]), - "monthNames" => json_encode([ + 'monthNames' => json_encode([ $this->l->t('January'), $this->l->t('February'), $this->l->t('March'), @@ -201,7 +210,7 @@ class JSConfigHelper { $this->l->t('November'), $this->l->t('December') ]), - "monthNamesShort" => json_encode([ + 'monthNamesShort' => json_encode([ $this->l->t('Jan.'), $this->l->t('Feb.'), $this->l->t('Mar.'), @@ -215,9 +224,9 @@ class JSConfigHelper { $this->l->t('Nov.'), $this->l->t('Dec.') ]), - "firstDay" => json_encode($this->l->l('firstday', null)), - "_oc_config" => json_encode($config), - "oc_appconfig" => json_encode([ + 'firstDay' => json_encode($firstDay), + '_oc_config' => json_encode($config), + 'oc_appconfig' => json_encode([ 'core' => [ 'defaultExpireDateEnabled' => $defaultExpireDateEnabled, 'defaultExpireDate' => $defaultExpireDate, @@ -237,7 +246,7 @@ class JSConfigHelper { 'defaultRemoteExpireDateEnforced' => $defaultRemoteExpireDateEnforced, ] ]), - "_theme" => json_encode([ + '_theme' => json_encode([ 'entity' => $this->defaults->getEntity(), 'name' => $this->defaults->getName(), 'productName' => $this->defaults->getProductName(), @@ -272,7 +281,7 @@ class JSConfigHelper { $result = ''; // Echo it - foreach ($array as $setting => $value) { + foreach ($array as $setting => $value) { $result .= 'var '. $setting . '='. $value . ';' . PHP_EOL; } diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index 27e988711be..0ef4ec197cf 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -8,7 +8,9 @@ namespace OC; use bantu\IniGetWrapper\IniGetWrapper; +use OC\AppFramework\Http\Request; use OC\Authentication\Token\IProvider; +use OC\Files\FilenameValidator; use OC\Search\SearchQuery; use OC\Template\CSSResourceLocator; use OC\Template\JSConfigHelper; @@ -19,6 +21,7 @@ use OCP\Defaults; use OCP\IConfig; use OCP\IInitialStateService; use OCP\INavigationManager; +use OCP\IRequest; use OCP\IURLGenerator; use OCP\IUserSession; use OCP\L10N\IFactory; @@ -74,7 +77,7 @@ class TemplateLayout extends \OC_Template { } $this->initialState->provideInitialState('core', 'active-app', $this->navigationManager->getActiveEntry()); - $this->initialState->provideInitialState('core', 'apps', $this->navigationManager->getAll()); + $this->initialState->provideInitialState('core', 'apps', array_values($this->navigationManager->getAll())); if ($this->config->getSystemValueBool('unified_search.enabled', false) || !$this->config->getSystemValueBool('enable_non-accessible_features', true)) { $this->initialState->provideInitialState('unified-search', 'limit-default', (int)$this->config->getAppValue('core', 'unified-search.limit-default', (string)SearchQuery::LIMIT_DEFAULT)); @@ -96,11 +99,10 @@ class TemplateLayout extends \OC_Template { $logoUrl = $this->config->getSystemValueString('logo_url', ''); $this->assign('logoUrl', $logoUrl); - // Set default app name - $defaultApp = \OC::$server->getAppManager()->getDefaultAppForUser(); - $defaultAppInfo = \OC::$server->getAppManager()->getAppInfo($defaultApp); - $l10n = \OC::$server->get(IFactory::class)->get($defaultApp); - $this->assign('defaultAppName', $l10n->t($defaultAppInfo['name'])); + // Set default entry name + $defaultEntryId = \OCP\Server::get(INavigationManager::class)->getDefaultEntryIdForUser(); + $defaultEntry = \OCP\Server::get(INavigationManager::class)->get($defaultEntryId); + $this->assign('defaultAppName', $defaultEntry['name']); // Add navigation entry $this->assign('application', ''); @@ -228,6 +230,7 @@ class TemplateLayout extends \OC_Template { \OC::$server->get(CapabilitiesManager::class), \OCP\Server::get(IInitialStateService::class), \OCP\Server::get(IProvider::class), + \OCP\Server::get(FilenameValidator::class), ); $config = $jsConfigHelper->getConfig(); if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) { @@ -284,6 +287,13 @@ class TemplateLayout extends \OC_Template { } } + $request = \OCP\Server::get(IRequest::class); + if ($request->isUserAgent([Request::USER_AGENT_CLIENT_IOS, Request::USER_AGENT_SAFARI, Request::USER_AGENT_SAFARI_MOBILE])) { + // Prevent auto zoom with iOS but still allow user zoom + // On chrome (and others) this does not work (will also disable user zoom) + $this->assign('viewport_maximum_scale', '1.0'); + } + $this->assign('initialStates', $this->initialState->getInitialStates()); $this->assign('id-app-content', $renderAs === TemplateResponse::RENDER_AS_USER ? '#app-content' : '#content'); @@ -298,7 +308,7 @@ class TemplateLayout extends \OC_Template { protected function getVersionHashSuffix($path = false, $file = false) { if ($this->config->getSystemValueBool('debug', false)) { // allows chrome workspace mapping in debug mode - return ""; + return ''; } $themingSuffix = ''; $v = []; diff --git a/lib/private/TextProcessing/Manager.php b/lib/private/TextProcessing/Manager.php index 44387662937..9801a99ddec 100644 --- a/lib/private/TextProcessing/Manager.php +++ b/lib/private/TextProcessing/Manager.php @@ -20,13 +20,22 @@ use OCP\DB\Exception; use OCP\IConfig; use OCP\IServerContainer; use OCP\PreConditionNotMetException; +use OCP\TaskProcessing\IManager as TaskProcessingIManager; +use OCP\TaskProcessing\TaskTypes\TextToText; +use OCP\TaskProcessing\TaskTypes\TextToTextHeadline; +use OCP\TaskProcessing\TaskTypes\TextToTextSummary; +use OCP\TaskProcessing\TaskTypes\TextToTextTopics; use OCP\TextProcessing\Exception\TaskFailureException; +use OCP\TextProcessing\FreePromptTaskType; +use OCP\TextProcessing\HeadlineTaskType; use OCP\TextProcessing\IManager; use OCP\TextProcessing\IProvider; use OCP\TextProcessing\IProviderWithExpectedRuntime; use OCP\TextProcessing\IProviderWithId; +use OCP\TextProcessing\SummaryTaskType; use OCP\TextProcessing\Task; use OCP\TextProcessing\Task as OCPTask; +use OCP\TextProcessing\TopicsTaskType; use Psr\Log\LoggerInterface; use RuntimeException; use Throwable; @@ -42,6 +51,7 @@ class Manager implements IManager { private IJobList $jobList, private TaskMapper $taskMapper, private IConfig $config, + private TaskProcessingIManager $taskProcessingManager, ) { } @@ -98,6 +108,55 @@ class Manager implements IManager { * @inheritDoc */ public function runTask(OCPTask $task): string { + // try to run a task processing task if possible + $taskTypeClass = $task->getType(); + $taskProcessingCompatibleTaskTypes = [ + FreePromptTaskType::class => TextToText::ID, + HeadlineTaskType::class => TextToTextHeadline::ID, + SummaryTaskType::class => TextToTextSummary::ID, + TopicsTaskType::class => TextToTextTopics::ID, + ]; + if (isset($taskProcessingCompatibleTaskTypes[$taskTypeClass]) && isset($this->taskProcessingManager->getAvailableTaskTypes()[$taskProcessingCompatibleTaskTypes[$taskTypeClass]])) { + try { + $taskProcessingTaskTypeId = $taskProcessingCompatibleTaskTypes[$taskTypeClass]; + $taskProcessingTask = new \OCP\TaskProcessing\Task( + $taskProcessingTaskTypeId, + ['input' => $task->getInput()], + $task->getAppId(), + $task->getUserId(), + $task->getIdentifier(), + ); + + $task->setStatus(OCPTask::STATUS_RUNNING); + if ($task->getId() === null) { + $taskEntity = $this->taskMapper->insert(DbTask::fromPublicTask($task)); + $task->setId($taskEntity->getId()); + } else { + $this->taskMapper->update(DbTask::fromPublicTask($task)); + } + $this->logger->debug('Running a TextProcessing (' . $taskTypeClass . ') task with TaskProcessing'); + $taskProcessingResultTask = $this->taskProcessingManager->runTask($taskProcessingTask); + if ($taskProcessingResultTask->getStatus() === \OCP\TaskProcessing\Task::STATUS_SUCCESSFUL) { + $output = $taskProcessingResultTask->getOutput(); + if (isset($output['output']) && is_string($output['output'])) { + $task->setOutput($output['output']); + $task->setStatus(OCPTask::STATUS_SUCCESSFUL); + $this->taskMapper->update(DbTask::fromPublicTask($task)); + return $output['output']; + } + } + } catch (\Throwable $e) { + $this->logger->error('TextProcessing to TaskProcessing failed', ['exception' => $e]); + $task->setStatus(OCPTask::STATUS_FAILED); + $this->taskMapper->update(DbTask::fromPublicTask($task)); + throw new TaskFailureException('TextProcessing to TaskProcessing failed: ' . $e->getMessage(), 0, $e); + } + $task->setStatus(OCPTask::STATUS_FAILED); + $this->taskMapper->update(DbTask::fromPublicTask($task)); + throw new TaskFailureException('Could not run task'); + } + + // try to run the text processing task if (!$this->canHandleTask($task)) { throw new PreConditionNotMetException('No text processing provider is installed that can handle this task'); } @@ -123,7 +182,7 @@ class Manager implements IManager { $this->taskMapper->update(DbTask::fromPublicTask($task)); return $output; } catch (\Throwable $e) { - $this->logger->info('LanguageModel call using provider ' . $provider->getName() . ' failed', ['exception' => $e]); + $this->logger->error('LanguageModel call using provider ' . $provider->getName() . ' failed', ['exception' => $e]); $task->setStatus(OCPTask::STATUS_FAILED); $this->taskMapper->update(DbTask::fromPublicTask($task)); throw new TaskFailureException('LanguageModel call using provider ' . $provider->getName() . ' failed: ' . $e->getMessage(), 0, $e); @@ -169,7 +228,7 @@ class Manager implements IManager { throw new PreConditionNotMetException('No LanguageModel provider is installed that can handle this task'); } [$provider,] = $this->getPreferredProviders($task); - $maxExecutionTime = (int) ini_get('max_execution_time'); + $maxExecutionTime = (int)ini_get('max_execution_time'); // Offload the task to a background job if the expected runtime of the likely provider is longer than 80% of our max execution time // or if the provider doesn't provide a getExpectedRuntime() method if (!$provider instanceof IProviderWithExpectedRuntime || $provider->getExpectedRuntime() > $maxExecutionTime * 0.8) { diff --git a/lib/private/TextToImage/Manager.php b/lib/private/TextToImage/Manager.php index 6ad3592a1b7..88dc108f380 100644 --- a/lib/private/TextToImage/Manager.php +++ b/lib/private/TextToImage/Manager.php @@ -119,21 +119,21 @@ class Manager implements IManager { } try { $folder = $this->appData->getFolder('text2image'); - } catch(NotFoundException) { + } catch (NotFoundException) { $this->logger->debug('Creating folder in appdata for Text2Image results'); $folder = $this->appData->newFolder('text2image'); } try { - $folder = $folder->getFolder((string) $task->getId()); - } catch(NotFoundException) { + $folder = $folder->getFolder((string)$task->getId()); + } catch (NotFoundException) { $this->logger->debug('Creating new folder in appdata Text2Image results folder'); - $folder = $folder->newFolder((string) $task->getId()); + $folder = $folder->newFolder((string)$task->getId()); } $this->logger->debug('Creating result files for Text2Image task'); $resources = []; $files = []; for ($i = 0; $i < $task->getNumberOfImages(); $i++) { - $file = $folder->newFile((string) $i); + $file = $folder->newFile((string)$i); $files[] = $file; $resource = $file->write(); if ($resource !== false && $resource !== true && is_resource($resource)) { @@ -162,7 +162,7 @@ class Manager implements IManager { if (isset($files, $files[$i])) { try { $files[$i]->delete(); - } catch(NotPermittedException $e) { + } catch (NotPermittedException $e) { $this->logger->warning('Failed to clean up Text2Image result file after error', ['exception' => $e]); } } @@ -216,7 +216,7 @@ class Manager implements IManager { throw new PreConditionNotMetException('No text to image provider is installed that can handle this task'); } $providers = $this->getPreferredProviders(); - $maxExecutionTime = (int) ini_get('max_execution_time'); + $maxExecutionTime = (int)ini_get('max_execution_time'); // Offload the task to a background job if the expected runtime of the likely provider is longer than 80% of our max execution time if ($providers[0]->getExpectedRuntime() > $maxExecutionTime * 0.8) { $this->scheduleTask($task); diff --git a/lib/private/TextToImage/RemoveOldTasksBackgroundJob.php b/lib/private/TextToImage/RemoveOldTasksBackgroundJob.php index 525d68df22b..7d9170090b7 100644 --- a/lib/private/TextToImage/RemoveOldTasksBackgroundJob.php +++ b/lib/private/TextToImage/RemoveOldTasksBackgroundJob.php @@ -55,7 +55,7 @@ class RemoveOldTasksBackgroundJob extends TimedJob { } } catch (Exception $e) { $this->logger->warning('Failed to delete stale text to image tasks', ['exception' => $e]); - } catch(NotFoundException) { + } catch (NotFoundException) { // noop } } diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php index ab568a3296d..24454806e02 100644 --- a/lib/private/URLGenerator.php +++ b/lib/private/URLGenerator.php @@ -14,6 +14,7 @@ use OCP\App\AppPathNotFoundException; use OCP\App\IAppManager; use OCP\ICacheFactory; use OCP\IConfig; +use OCP\INavigationManager; use OCP\IRequest; use OCP\IURLGenerator; use OCP\IUserSession; @@ -36,6 +37,7 @@ class URLGenerator implements IURLGenerator { /** @var null|string */ private $baseUrl = null; private ?IAppManager $appManager = null; + private ?INavigationManager $navigationManager = null; public function __construct(IConfig $config, IUserSession $userSession, @@ -58,6 +60,14 @@ class URLGenerator implements IURLGenerator { return $this->appManager; } + private function getNavigationManager(): INavigationManager { + if ($this->navigationManager !== null) { + return $this->navigationManager; + } + $this->navigationManager = \OCP\Server::get(INavigationManager::class); + return $this->navigationManager; + } + /** * Creates an url using a defined route * @@ -112,7 +122,7 @@ class URLGenerator implements IURLGenerator { * @param string $appName app * @param string $file file * @param array $args array with param=>value, will be appended to the returned url - * The value of $args will be urlencoded + * The value of $args will be urlencoded * @return string the url * * Returns a url to the given app and file. @@ -245,7 +255,7 @@ class URLGenerator implements IURLGenerator { /** * Makes an URL absolute - * @param string $url the url in the ownCloud host + * @param string $url the url in the Nextcloud host * @return string the absolute version of the url */ public function getAbsoluteURL(string $url): string { @@ -254,7 +264,7 @@ class URLGenerator implements IURLGenerator { if (\OC::$CLI && !\defined('PHPUNIT_RUN')) { return rtrim($this->config->getSystemValueString('overwrite.cli.url'), '/') . '/' . ltrim($url, '/'); } - // The ownCloud web root can already be prepended. + // The Nextcloud web root could already be prepended. if (\OC::$WEBROOT !== '' && str_starts_with($url, \OC::$WEBROOT)) { $url = substr($url, \strlen(\OC::$WEBROOT)); } @@ -288,14 +298,17 @@ class URLGenerator implements IURLGenerator { return $this->getAbsoluteURL($defaultPage); } - $appId = $this->getAppManager()->getDefaultAppForUser(); - - if ($this->config->getSystemValueBool('htaccess.IgnoreFrontController', false) - || getenv('front_controller_active') === 'true') { - return $this->getAbsoluteURL('/apps/' . $appId . '/'); + $entryId = $this->getNavigationManager()->getDefaultEntryIdForUser(); + $entry = $this->getNavigationManager()->get($entryId); + $href = (string)$entry['href']; + if ($href === '') { + throw new \InvalidArgumentException('Default navigation entry is missing href: ' . $entryId); + } + if (str_starts_with($href, '/index.php/') && ($this->config->getSystemValueBool('htaccess.IgnoreFrontController', false) || getenv('front_controller_active') === 'true')) { + $href = substr($href, 10); } - return $this->getAbsoluteURL('/index.php/apps/' . $appId . '/'); + return $this->getAbsoluteURL($href); } /** @@ -303,7 +316,7 @@ class URLGenerator implements IURLGenerator { */ public function getBaseUrl(): string { // BaseUrl can be equal to 'http(s)://' during the first steps of the initial setup. - if ($this->baseUrl === null || $this->baseUrl === "http://" || $this->baseUrl === "https://") { + if ($this->baseUrl === null || $this->baseUrl === 'http://' || $this->baseUrl === 'https://') { $this->baseUrl = $this->request->getServerProtocol() . '://' . $this->request->getServerHost() . \OC::$WEBROOT; } return $this->baseUrl; diff --git a/lib/private/Updater.php b/lib/private/Updater.php index 6d23e81aa63..2722c172f1a 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -147,7 +147,7 @@ class Updater extends BasicEmitter { // this should really be a JSON file require \OC::$SERVERROOT . '/version.php'; /** @var string $vendor */ - return (string) $vendor; + return (string)$vendor; } /** @@ -208,9 +208,12 @@ class Updater extends BasicEmitter { } // create empty file in data dir, so we can later find - // out that this is indeed an ownCloud data directory + // out that this is indeed a Nextcloud data directory // (in case it didn't exist before) - file_put_contents($this->config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data') . '/.ocdata', ''); + file_put_contents( + $this->config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data') . '/.ncdata', + "# Nextcloud data directory\n# Do not change this file", + ); // pre-upgrade repairs $repair = \OCP\Server::get(Repair::class); diff --git a/lib/private/Updater/Exceptions/ReleaseMetadataException.php b/lib/private/Updater/Exceptions/ReleaseMetadataException.php new file mode 100644 index 00000000000..bc82e4e03df --- /dev/null +++ b/lib/private/Updater/Exceptions/ReleaseMetadataException.php @@ -0,0 +1,17 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OC\Updater\Exceptions; + +use Exception; + +/** + * @since 30.0.0 + */ +class ReleaseMetadataException extends Exception { +} diff --git a/lib/private/Updater/ReleaseMetadata.php b/lib/private/Updater/ReleaseMetadata.php new file mode 100644 index 00000000000..665847037e7 --- /dev/null +++ b/lib/private/Updater/ReleaseMetadata.php @@ -0,0 +1,79 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OC\Updater; + +use Exception; +use JsonException; +use OC\Updater\Exceptions\ReleaseMetadataException; +use OCP\Http\Client\IClientService; + +/** retrieve releases metadata from official servers + * + * @since 30.0.0 + */ +class ReleaseMetadata { + public function __construct( + private readonly IClientService $clientService, + ) { + } + + /** + * returns metadata based on release version + * + * - version is a stable release, metadata is downloaded from official releases folder + * - version is not a table release, metadata is downloaded from official prereleases folder + * - version is a major version (30, 31, 32, ...), latest metadata are downloaded + * + * @param string $version + * + * @return array + * @throws ReleaseMetadataException + * @since 30.0.0 + */ + public function getMetadata(string $version): array { + if (!str_contains($version, '.')) { + $url = 'https://download.nextcloud.com/server/releases/latest-' . $version . '.metadata'; + } else { + [,,$minor] = explode('.', $version); + if (ctype_digit($minor)) { + $url = 'https://download.nextcloud.com/server/releases/nextcloud-' . $version . '.metadata'; + } else { + $url = 'https://download.nextcloud.com/server/prereleases/nextcloud-' . $version . '.metadata'; + } + } + return $this->downloadMetadata($url); + } + + /** + * download Metadata from a link + * + * @param string $url + * + * @return array + * @throws ReleaseMetadataException + * @since 30.0.0 + */ + public function downloadMetadata(string $url): array { + $client = $this->clientService->newClient(); + try { + $response = $client->get($url, [ + 'timeout' => 10, + 'connect_timeout' => 10 + ]); + } catch (Exception $e) { + throw new ReleaseMetadataException('could not reach metadata at ' . $url, previous: $e); + } + + try { + return json_decode($response->getBody(), true, flags: JSON_THROW_ON_ERROR); + } catch (JsonException) { + throw new ReleaseMetadataException('remote document is not valid'); + } + } +} diff --git a/lib/private/Updater/VersionCheck.php b/lib/private/Updater/VersionCheck.php index 9ad129db1a4..cc5ff63379c 100644 --- a/lib/private/Updater/VersionCheck.php +++ b/lib/private/Updater/VersionCheck.php @@ -61,7 +61,7 @@ class VersionCheck { $version['php_minor'] = PHP_MINOR_VERSION; $version['php_release'] = PHP_RELEASE_VERSION; $version['category'] = $this->computeCategory(); - $version['isSubscriber'] = (int) $this->registry->delegateHasValidSubscription(); + $version['isSubscriber'] = (int)$this->registry->delegateHasValidSubscription(); $versionString = implode('x', $version); //fetch xml data from updater diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php index cc7050f2da8..2d3808e9dc7 100644 --- a/lib/private/User/Database.php +++ b/lib/private/User/Database.php @@ -8,6 +8,7 @@ declare(strict_types=1); */ namespace OC\User; +use InvalidArgumentException; use OCP\AppFramework\Db\TTransactional; use OCP\Cache\CappedMemoryCache; use OCP\EventDispatcher\IEventDispatcher; @@ -21,6 +22,7 @@ use OCP\User\Backend\ICreateUserBackend; use OCP\User\Backend\IGetDisplayNameBackend; use OCP\User\Backend\IGetHomeBackend; use OCP\User\Backend\IGetRealUIDBackend; +use OCP\User\Backend\IPasswordHashBackend; use OCP\User\Backend\ISearchKnownUsersBackend; use OCP\User\Backend\ISetDisplayNameBackend; use OCP\User\Backend\ISetPasswordBackend; @@ -37,7 +39,8 @@ class Database extends ABackend implements IGetHomeBackend, ICountUsersBackend, ISearchKnownUsersBackend, - IGetRealUIDBackend { + IGetRealUIDBackend, + IPasswordHashBackend { /** @var CappedMemoryCache */ private $cache; @@ -61,7 +64,7 @@ class Database extends ABackend implements public function __construct($eventDispatcher = null, $table = 'users') { $this->cache = new CappedMemoryCache(); $this->table = $table; - $this->eventDispatcher = $eventDispatcher ? $eventDispatcher : \OCP\Server::get(IEventDispatcher::class); + $this->eventDispatcher = $eventDispatcher ?? \OCP\Server::get(IEventDispatcher::class); } /** @@ -105,7 +108,7 @@ class Database extends ABackend implements // Repopulate the cache $this->loadUser($uid); - return (bool) $result; + return (bool)$result; }, $this->dbConn); } @@ -176,6 +179,40 @@ class Database extends ABackend implements return false; } + public function getPasswordHash(string $userId): ?string { + $this->fixDI(); + if (!$this->userExists($userId)) { + return null; + } + if (!empty($this->cache[$userId]['password'])) { + return $this->cache[$userId]['password']; + } + $qb = $this->dbConn->getQueryBuilder(); + $qb->select('password') + ->from($this->table) + ->where($qb->expr()->eq('uid_lower', $qb->createNamedParameter(mb_strtolower($userId)))); + /** @var false|string $hash */ + $hash = $qb->executeQuery()->fetchOne(); + if ($hash === false) { + return null; + } + $this->cache[$userId]['password'] = $hash; + return $hash; + } + + public function setPasswordHash(string $userId, string $passwordHash): bool { + if (!\OCP\Server::get(IHasher::class)->validate($passwordHash)) { + throw new InvalidArgumentException(); + } + $this->fixDI(); + $result = $this->updatePassword($userId, $passwordHash); + if (!$result) { + return false; + } + $this->cache[$userId]['password'] = $passwordHash; + return true; + } + /** * Set display name * diff --git a/lib/private/User/LazyUser.php b/lib/private/User/LazyUser.php index 80b2bfe510f..cd3e268be48 100644 --- a/lib/private/User/LazyUser.php +++ b/lib/private/User/LazyUser.php @@ -73,6 +73,14 @@ class LazyUser implements IUser { return $this->getUser()->setPassword($password, $recoveryPassword); } + public function getPasswordHash(): ?string { + return $this->getUser()->getPasswordHash(); + } + + public function setPasswordHash(string $passwordHash): bool { + return $this->getUser()->setPasswordHash($passwordHash); + } + public function getHome() { return $this->getUser()->getHome(); } diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php index d93431a2699..9a84b102a99 100644 --- a/lib/private/User/Manager.php +++ b/lib/private/User/Manager.php @@ -455,7 +455,7 @@ class Manager extends PublicEmitter implements IUserManager { * returns how many users per backend exist (if supported by backend) * * @param boolean $hasLoggedIn when true only users that have a lastLogin - * entry in the preferences table will be affected + * entry in the preferences table will be affected * @return array<string, int> an array of backend class as key and count number as value */ public function countUsers() { @@ -486,7 +486,7 @@ class Manager extends PublicEmitter implements IUserManager { * * @param IGroup[] $groups an array of gid to search in * @return array|int an array of backend class as key and count number as value - * if $hasLoggedIn is true only an int is returned + * if $hasLoggedIn is true only an int is returned */ public function countUsersOfGroups(array $groups) { $users = []; @@ -506,7 +506,7 @@ class Manager extends PublicEmitter implements IUserManager { * @psalm-param \Closure(\OCP\IUser):?bool $callback * @param string $search * @param boolean $onlySeen when true only users that have a lastLogin entry - * in the preferences table will be affected + * in the preferences table will be affected * @since 9.0.0 */ public function callForAllUsers(\Closure $callback, $search = '', $onlySeen = false) { @@ -733,6 +733,49 @@ class Manager extends PublicEmitter implements IUserManager { } } + /** + * Gets the list of user ids sorted by lastLogin, from most recent to least recent + * + * @param int|null $limit how many users to fetch + * @param int $offset from which offset to fetch + * @param string $search search users based on search params + * @return list<string> list of user IDs + */ + public function getLastLoggedInUsers(?int $limit = null, int $offset = 0, string $search = ''): array { + $connection = \OC::$server->getDatabaseConnection(); + $queryBuilder = $connection->getQueryBuilder(); + $queryBuilder->selectDistinct('uid') + ->from('users', 'u') + ->leftJoin('u', 'preferences', 'p', $queryBuilder->expr()->andX( + $queryBuilder->expr()->eq('p.userid', 'uid'), + $queryBuilder->expr()->eq('p.appid', $queryBuilder->expr()->literal('login')), + $queryBuilder->expr()->eq('p.configkey', $queryBuilder->expr()->literal('lastLogin'))) + ); + if ($search !== '') { + $queryBuilder->leftJoin('u', 'preferences', 'p1', $queryBuilder->expr()->andX( + $queryBuilder->expr()->eq('p1.userid', 'uid'), + $queryBuilder->expr()->eq('p1.appid', $queryBuilder->expr()->literal('settings')), + $queryBuilder->expr()->eq('p1.configkey', $queryBuilder->expr()->literal('email'))) + ) + // sqlite doesn't like re-using a single named parameter here + ->where($queryBuilder->expr()->iLike('uid', $queryBuilder->createPositionalParameter('%' . $connection->escapeLikeParameter($search) . '%'))) + ->orWhere($queryBuilder->expr()->iLike('displayname', $queryBuilder->createPositionalParameter('%' . $connection->escapeLikeParameter($search) . '%'))) + ->orWhere($queryBuilder->expr()->iLike('p1.configvalue', $queryBuilder->createPositionalParameter('%' . $connection->escapeLikeParameter($search) . '%')) + ); + } + $queryBuilder->orderBy($queryBuilder->func()->lower('p.configvalue'), 'DESC') + ->addOrderBy('uid_lower', 'ASC') + ->setFirstResult($offset) + ->setMaxResults($limit); + + $result = $queryBuilder->executeQuery(); + /** @var list<string> $uids */ + $uids = $result->fetchAll(\PDO::FETCH_COLUMN); + $result->closeCursor(); + + return $uids; + } + private function verifyUid(string $uid, bool $checkDataDirectory = false): bool { $appdata = 'appdata_' . $this->config->getSystemValueString('instanceid'); @@ -740,7 +783,7 @@ class Manager extends PublicEmitter implements IUserManager { '.htaccess', 'files_external', '__groupfolders', - '.ocdata', + '.ncdata', 'owncloud.log', 'nextcloud.log', 'updater.log', diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php index e5d27172519..64e8f6dfdc8 100644 --- a/lib/private/User/Session.php +++ b/lib/private/User/Session.php @@ -19,6 +19,7 @@ use OC\Security\CSRF\CsrfTokenManager; use OC_User; use OC_Util; use OCA\DAV\Connector\Sabre\Auth; +use OCP\AppFramework\Db\TTransactional; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Authentication\Exceptions\ExpiredTokenException; use OCP\Authentication\Exceptions\InvalidTokenException; @@ -26,6 +27,7 @@ use OCP\EventDispatcher\GenericEvent; use OCP\EventDispatcher\IEventDispatcher; use OCP\Files\NotPermittedException; use OCP\IConfig; +use OCP\IDBConnection; use OCP\IRequest; use OCP\ISession; use OCP\IUser; @@ -62,53 +64,22 @@ use Psr\Log\LoggerInterface; * @package OC\User */ class Session implements IUserSession, Emitter { - /** @var Manager $manager */ - private $manager; - - /** @var ISession $session */ - private $session; - - /** @var ITimeFactory */ - private $timeFactory; - - /** @var IProvider */ - private $tokenProvider; - - /** @var IConfig */ - private $config; + use TTransactional; /** @var User $activeUser */ protected $activeUser; - /** @var ISecureRandom */ - private $random; - - /** @var ILockdownManager */ - private $lockdownManager; - - private LoggerInterface $logger; - /** @var IEventDispatcher */ - private $dispatcher; - - public function __construct(Manager $manager, - ISession $session, - ITimeFactory $timeFactory, - ?IProvider $tokenProvider, - IConfig $config, - ISecureRandom $random, - ILockdownManager $lockdownManager, - LoggerInterface $logger, - IEventDispatcher $dispatcher + public function __construct( + private Manager $manager, + private ISession $session, + private ITimeFactory $timeFactory, + private ?IProvider $tokenProvider, + private IConfig $config, + private ISecureRandom $random, + private ILockdownManager $lockdownManager, + private LoggerInterface $logger, + private IEventDispatcher $dispatcher, ) { - $this->manager = $manager; - $this->session = $session; - $this->timeFactory = $timeFactory; - $this->tokenProvider = $tokenProvider; - $this->config = $config; - $this->random = $random; - $this->lockdownManager = $lockdownManager; - $this->logger = $logger; - $this->dispatcher = $dispatcher; } /** @@ -674,8 +645,10 @@ class Session implements IUserSession, Emitter { $sessionId = $this->session->getId(); $pwd = $this->getPassword($password); // Make sure the current sessionId has no leftover tokens - $this->tokenProvider->invalidateToken($sessionId); - $this->tokenProvider->generateToken($sessionId, $uid, $loginName, $pwd, $name, IToken::TEMPORARY_TOKEN, $remember); + $this->atomic(function () use ($sessionId, $uid, $loginName, $pwd, $name, $remember) { + $this->tokenProvider->invalidateToken($sessionId); + $this->tokenProvider->generateToken($sessionId, $uid, $loginName, $pwd, $name, IToken::TEMPORARY_TOKEN, $remember); + }, \OCP\Server::get(IDBConnection::class)); return true; } catch (SessionNotAvailableException $ex) { // This can happen with OCC, where a memory session is used diff --git a/lib/private/User/User.php b/lib/private/User/User.php index 644d3e27f88..6f7ceb08532 100644 --- a/lib/private/User/User.php +++ b/lib/private/User/User.php @@ -25,6 +25,7 @@ use OCP\IUser; use OCP\IUserBackend; use OCP\Notification\IManager as INotificationManager; use OCP\User\Backend\IGetHomeBackend; +use OCP\User\Backend\IPasswordHashBackend; use OCP\User\Backend\IProvideAvatarBackend; use OCP\User\Backend\IProvideEnabledStateBackend; use OCP\User\Backend\ISetDisplayNameBackend; @@ -215,9 +216,9 @@ class User implements IUser { */ public function getLastLogin() { if ($this->lastLogin === null) { - $this->lastLogin = (int) $this->config->getUserValue($this->uid, 'login', 'lastLogin', 0); + $this->lastLogin = (int)$this->config->getUserValue($this->uid, 'login', 'lastLogin', 0); } - return (int) $this->lastLogin; + return (int)$this->lastLogin; } /** @@ -319,6 +320,20 @@ class User implements IUser { } } + public function getPasswordHash(): ?string { + if (!($this->backend instanceof IPasswordHashBackend)) { + return null; + } + return $this->backend->getPasswordHash($this->uid); + } + + public function setPasswordHash(string $passwordHash): bool { + if (!($this->backend instanceof IPasswordHashBackend)) { + return false; + } + return $this->backend->setPasswordHash($this->uid, $passwordHash); + } + /** * get the users home folder to mount * diff --git a/lib/private/legacy/OC_API.php b/lib/private/legacy/OC_API.php deleted file mode 100644 index bb2376d4ea0..00000000000 --- a/lib/private/legacy/OC_API.php +++ /dev/null @@ -1,162 +0,0 @@ -<?php - -/** - * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors - * SPDX-FileCopyrightText: 2016 ownCloud, Inc. - * SPDX-License-Identifier: AGPL-3.0-only - */ -use OCP\API; -use OCP\AppFramework\Http; - -class OC_API { - /** - * api actions - */ - protected static $actions = []; - - /** - * respond to a call - * @param \OC\OCS\Result $result - * @param string $format the format xml|json - * @psalm-taint-escape html - */ - public static function respond($result, $format = 'xml') { - $request = \OC::$server->getRequest(); - - // Send 401 headers if unauthorised - if ($result->getStatusCode() === \OCP\AppFramework\OCSController::RESPOND_UNAUTHORISED) { - // If request comes from JS return dummy auth request - if ($request->getHeader('X-Requested-With') === 'XMLHttpRequest') { - header('WWW-Authenticate: DummyBasic realm="Authorisation Required"'); - } else { - header('WWW-Authenticate: Basic realm="Authorisation Required"'); - } - http_response_code(401); - } - - foreach ($result->getHeaders() as $name => $value) { - header($name . ': ' . $value); - } - - $meta = $result->getMeta(); - $data = $result->getData(); - if (self::isV2($request)) { - $statusCode = self::mapStatusCodes($result->getStatusCode()); - if (!is_null($statusCode)) { - $meta['statuscode'] = $statusCode; - http_response_code($statusCode); - } - } - - self::setContentType($format); - $body = self::renderResult($format, $meta, $data); - echo $body; - } - - /** - * @param XMLWriter $writer - */ - private static function toXML($array, $writer) { - foreach ($array as $k => $v) { - if ($k[0] === '@') { - $writer->writeAttribute(substr($k, 1), $v); - continue; - } elseif (is_numeric($k)) { - $k = 'element'; - } - if (is_array($v)) { - $writer->startElement($k); - self::toXML($v, $writer); - $writer->endElement(); - } else { - $writer->writeElement($k, $v); - } - } - } - - public static function requestedFormat(): string { - $formats = ['json', 'xml']; - - $format = (isset($_GET['format']) && is_string($_GET['format']) && in_array($_GET['format'], $formats)) ? $_GET['format'] : 'xml'; - return $format; - } - - /** - * Based on the requested format the response content type is set - * @param string $format - */ - public static function setContentType($format = null) { - $format = is_null($format) ? self::requestedFormat() : $format; - if ($format === 'xml') { - header('Content-type: text/xml; charset=UTF-8'); - return; - } - - if ($format === 'json') { - header('Content-Type: application/json; charset=utf-8'); - return; - } - - header('Content-Type: application/octet-stream; charset=utf-8'); - } - - /** - * @param \OCP\IRequest $request - * @return bool - */ - protected static function isV2(\OCP\IRequest $request) { - $script = $request->getScriptName(); - - return str_ends_with($script, '/ocs/v2.php'); - } - - /** - * @param integer $sc - * @return int - */ - public static function mapStatusCodes($sc) { - switch ($sc) { - case \OCP\AppFramework\OCSController::RESPOND_NOT_FOUND: - return Http::STATUS_NOT_FOUND; - case \OCP\AppFramework\OCSController::RESPOND_SERVER_ERROR: - return Http::STATUS_INTERNAL_SERVER_ERROR; - case \OCP\AppFramework\OCSController::RESPOND_UNKNOWN_ERROR: - return Http::STATUS_INTERNAL_SERVER_ERROR; - case \OCP\AppFramework\OCSController::RESPOND_UNAUTHORISED: - // already handled for v1 - return null; - case 100: - return Http::STATUS_OK; - } - // any 2xx, 4xx and 5xx will be used as is - if ($sc >= 200 && $sc < 600) { - return $sc; - } - - return Http::STATUS_BAD_REQUEST; - } - - /** - * @param string $format - * @return string - */ - public static function renderResult($format, $meta, $data) { - $response = [ - 'ocs' => [ - 'meta' => $meta, - 'data' => $data, - ], - ]; - if ($format == 'json') { - return json_encode($response, JSON_HEX_TAG); - } - - $writer = new XMLWriter(); - $writer->openMemory(); - $writer->setIndent(true); - $writer->startDocument(); - self::toXML($response, $writer); - $writer->endDocument(); - return $writer->outputMemory(true); - } -} diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php index cb1a7b111c6..ef84d35d7bc 100644 --- a/lib/private/legacy/OC_App.php +++ b/lib/private/legacy/OC_App.php @@ -45,8 +45,7 @@ class OC_App { * @psalm-taint-escape html * @psalm-taint-escape has_quotes * - * @param string $app AppId that needs to be cleaned - * @return string + * @deprecated 31.0.0 use IAppManager::cleanAppId */ public static function cleanAppId(string $app): string { return str_replace(['<', '>', '"', "'", '\0', '/', '\\', '..'], '', $app); @@ -171,7 +170,7 @@ class OC_App { * * @param bool $forceRefresh whether to refresh the cache * @param bool $all whether to return apps for all users, not only the - * currently logged in one + * currently logged in one * @return string[] */ public static function getEnabledApps(bool $forceRefresh = false, bool $all = false): array { @@ -255,11 +254,13 @@ class OC_App { /** - * search for an app in all app-directories + * Find the apps root for an app id. + * + * If multiple copies are found, the apps root the latest version is returned. * * @param string $appId * @param bool $ignoreCache ignore cache and rebuild it - * @return false|string + * @return false|array{path: string, url: string} the apps root shape */ public static function findAppInDirectories(string $appId, bool $ignoreCache = false) { $sanitizedAppId = self::cleanAppId($appId); @@ -467,30 +468,10 @@ class OC_App { * get a list of all apps in the apps folder * * @return string[] an array of app names (string IDs) - * @todo: change the name of this method to getInstalledApps, which is more accurate + * @deprecated 31.0.0 Use IAppManager::getAllAppsInAppsFolders instead */ public static function getAllApps(): array { - $apps = []; - - foreach (OC::$APPSROOTS as $apps_dir) { - if (!is_readable($apps_dir['path'])) { - \OCP\Server::get(LoggerInterface::class)->warning('unable to read app folder : ' . $apps_dir['path'], ['app' => 'core']); - continue; - } - $dh = opendir($apps_dir['path']); - - if (is_resource($dh)) { - while (($file = readdir($dh)) !== false) { - if ($file[0] != '.' and is_dir($apps_dir['path'] . '/' . $file) and is_file($apps_dir['path'] . '/' . $file . '/appinfo/info.xml')) { - $apps[] = $file; - } - } - } - } - - $apps = array_unique($apps); - - return $apps; + return \OCP\Server::get(IAppManager::class)->getAllAppsInAppsFolders(); } /** @@ -511,9 +492,9 @@ class OC_App { * @return array */ public function listAllApps(): array { - $installedApps = OC_App::getAllApps(); - $appManager = \OC::$server->getAppManager(); + + $installedApps = $appManager->getAllAppsInAppsFolders(); //we don't want to show configuration for these $blacklist = $appManager->getAlwaysEnabledApps(); $appList = []; @@ -884,7 +865,7 @@ class OC_App { } elseif ($englishFallback !== false) { return $englishFallback; } - return (string) $fallback; + return (string)$fallback; } /** diff --git a/lib/private/legacy/OC_Files.php b/lib/private/legacy/OC_Files.php index 76d61a98558..8e23d70c690 100644 --- a/lib/private/legacy/OC_Files.php +++ b/lib/private/legacy/OC_Files.php @@ -43,7 +43,7 @@ class OC_Files { OC_Response::setContentDispositionHeader($name, 'attachment'); header('Content-Transfer-Encoding: binary', true); header('Expires: 0'); - header("Cache-Control: must-revalidate, post-check=0, pre-check=0"); + header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); $fileSize = \OC\Files\Filesystem::filesize($filename); $type = \OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename)); if ($fileSize > -1) { @@ -198,7 +198,8 @@ class OC_Files { } catch (\OCP\Files\ConnectionLostException $ex) { self::unlockAllTheFiles($dir, $files, $getType, $view, $filename); OC::$server->getLogger()->logException($ex, ['level' => \OCP\ILogger::DEBUG]); - \OC_Template::printErrorPage('Connection lost', $ex->getMessage(), 200); + /* We do not print anything here, the connection is already closed */ + die(); } catch (\Exception $ex) { self::unlockAllTheFiles($dir, $files, $getType, $view, $filename); OC::$server->getLogger()->logException($ex); @@ -334,8 +335,8 @@ class OC_Files { foreach ($rangeArray as $range) { echo "\r\n--".self::getBoundary()."\r\n". - "Content-type: ".$type."\r\n". - "Content-range: bytes ".$range['from']."-".$range['to']."/".$range['size']."\r\n\r\n"; + 'Content-type: '.$type."\r\n". + 'Content-range: bytes '.$range['from'].'-'.$range['to'].'/'.$range['size']."\r\n\r\n"; $view->readfilePart($filename, $range['from'], $range['to']); } echo "\r\n--".self::getBoundary()."--\r\n"; diff --git a/lib/private/legacy/OC_Helper.php b/lib/private/legacy/OC_Helper.php index 0c913709111..33cc966da2a 100644 --- a/lib/private/legacy/OC_Helper.php +++ b/lib/private/legacy/OC_Helper.php @@ -6,6 +6,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ use bantu\IniGetWrapper\IniGetWrapper; +use OC\Files\FilenameValidator; use OC\Files\Filesystem; use OCP\Files\Mount\IMountPoint; use OCP\IBinaryFinder; @@ -43,7 +44,7 @@ class OC_Helper { */ public static function humanFileSize(int|float $bytes): string { if ($bytes < 0) { - return "?"; + return '?'; } if ($bytes < 1024) { return "$bytes B"; @@ -116,18 +117,25 @@ class OC_Helper { * @return void */ public static function copyr($src, $dest) { + if (!file_exists($src)) { + return; + } + if (is_dir($src)) { if (!is_dir($dest)) { mkdir($dest); } $files = scandir($src); foreach ($files as $file) { - if ($file != "." && $file != "..") { + if ($file != '.' && $file != '..') { self::copyr("$src/$file", "$dest/$file"); } } - } elseif (file_exists($src) && !\OC\Files\Filesystem::isFileBlacklisted($src)) { - copy($src, $dest); + } else { + $validator = \OCP\Server::get(FilenameValidator::class); + if (!$validator->isForbidden($src)) { + copy($src, $dest); + } } } @@ -187,21 +195,21 @@ class OC_Helper { * @param bool $path * @internal param string $program name * @internal param string $optional search path, defaults to $PATH - * @return bool true if executable program found in path + * @return bool true if executable program found in path */ public static function canExecute($name, $path = false) { // path defaults to PATH from environment if not set if ($path === false) { - $path = getenv("PATH"); + $path = getenv('PATH'); } // we look for an executable file of that name - $exts = [""]; - $check_fn = "is_executable"; + $exts = ['']; + $check_fn = 'is_executable'; // Default check will be done with $path directories : $dirs = explode(PATH_SEPARATOR, $path); // WARNING : We have to check if open_basedir is enabled : $obd = OC::$server->get(IniGetWrapper::class)->getString('open_basedir'); - if ($obd != "none") { + if ($obd != 'none') { $obd_values = explode(PATH_SEPARATOR, $obd); if (count($obd_values) > 0 and $obd_values[0]) { // open_basedir is in effect ! @@ -508,13 +516,13 @@ class OC_Helper { $free = 0.0; } } catch (\Exception $e) { - if ($path === "") { + if ($path === '') { throw $e; } /** @var LoggerInterface $logger */ $logger = \OC::$server->get(LoggerInterface::class); - $logger->warning("Error while getting quota info, using root quota", ['exception' => $e]); - $rootInfo = self::getStorageInfo(""); + $logger->warning('Error while getting quota info, using root quota', ['exception' => $e]); + $rootInfo = self::getStorageInfo(''); $memcache->set($cacheKey, $rootInfo, 5 * 60); return $rootInfo; } diff --git a/lib/private/legacy/OC_Hook.php b/lib/private/legacy/OC_Hook.php index 2f6686f9126..5c36a253895 100644 --- a/lib/private/legacy/OC_Hook.php +++ b/lib/private/legacy/OC_Hook.php @@ -43,8 +43,8 @@ class OC_Hook { } // Connect the hook handler to the requested emitter self::$registered[$signalClass][$signalName][] = [ - "class" => $slotClass, - "name" => $slotName + 'class' => $slotClass, + 'name' => $slotName ]; // No chance for failure ;-) @@ -79,7 +79,7 @@ class OC_Hook { // Call all slots foreach (self::$registered[$signalClass][$signalName] as $i) { try { - call_user_func([ $i["class"], $i["name"] ], $params); + call_user_func([ $i['class'], $i['name'] ], $params); } catch (Exception $e) { self::$thrownExceptions[] = $e; \OC::$server->getLogger()->logException($e); diff --git a/lib/private/legacy/OC_Template.php b/lib/private/legacy/OC_Template.php index 5caa733b115..422709cec7d 100644 --- a/lib/private/legacy/OC_Template.php +++ b/lib/private/legacy/OC_Template.php @@ -43,6 +43,7 @@ class OC_Template extends \OC\Template\Base { $theme = OC_Util::getTheme(); $requestToken = (OC::$server->getSession() && $registerCall) ? \OCP\Util::callRegister() : ''; + $cspNonce = \OCP\Server::get(\OC\Security\CSP\ContentSecurityPolicyNonceManager::class)->getNonce(); $parts = explode('/', $app); // fix translation when app is something like core/lostpassword $l10n = \OC::$server->getL10N($parts[0]); @@ -56,7 +57,13 @@ class OC_Template extends \OC\Template\Base { $this->path = $path; $this->app = $app; - parent::__construct($template, $requestToken, $l10n, $themeDefaults); + parent::__construct( + $template, + $requestToken, + $l10n, + $themeDefaults, + $cspNonce, + ); } @@ -88,7 +95,7 @@ class OC_Template extends \OC\Template\Base { * @param string $tag tag name of the element * @param array $attributes array of attributes for the element * @param string $text the text content for the element. If $text is null then the - * element will be written as empty element. So use "" to get a closing tag. + * element will be written as empty element. So use "" to get a closing tag. */ public function addHeader($tag, $attributes, $text = null) { $this->headers[] = [ @@ -165,7 +172,7 @@ class OC_Template extends \OC\Template\Base { * @return boolean|null */ public static function printUserPage($application, $name, $parameters = []) { - $content = new OC_Template($application, $name, "user"); + $content = new OC_Template($application, $name, 'user'); foreach ($parameters as $key => $value) { $content->assign($key, $value); } @@ -180,7 +187,7 @@ class OC_Template extends \OC\Template\Base { * @return bool */ public static function printAdminPage($application, $name, $parameters = []) { - $content = new OC_Template($application, $name, "admin"); + $content = new OC_Template($application, $name, 'admin'); foreach ($parameters as $key => $value) { $content->assign($key, $value); } diff --git a/lib/private/legacy/OC_User.php b/lib/private/legacy/OC_User.php index d2978f6ad21..b8a00de84cc 100644 --- a/lib/private/legacy/OC_User.php +++ b/lib/private/legacy/OC_User.php @@ -142,7 +142,7 @@ class OC_User { public static function loginWithApache(\OCP\Authentication\IApacheBackend $backend) { $uid = $backend->getCurrentUserId(); $run = true; - OC_Hook::emit("OC_User", "pre_login", ["run" => &$run, "uid" => $uid, 'backend' => $backend]); + OC_Hook::emit('OC_User', 'pre_login', ['run' => &$run, 'uid' => $uid, 'backend' => $backend]); if ($uid) { if (self::getUser() !== $uid) { @@ -213,9 +213,9 @@ class OC_User { * Verify with Apache whether user is authenticated. * * @return boolean|null - * true: authenticated - * false: not authenticated - * null: not handled / no backend available + * true: authenticated + * false: not authenticated + * null: not handled / no backend available */ public static function handleApacheAuth() { $backend = self::findFirstActiveUsedBackend(); diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php index b7836e86d7b..84bb0b645d5 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -296,7 +296,7 @@ class OC_Util { private static function generatePath($application, $directory, $file) { if (is_null($file)) { $file = $application; - $application = ""; + $application = ''; } if (!empty($application)) { return "$application/$directory/$file"; @@ -322,7 +322,7 @@ class OC_Util { if ($application !== 'core' && $file !== null) { self::addTranslations($application); } - self::addExternalResource($application, $prepend, $path, "script"); + self::addExternalResource($application, $prepend, $path, 'script'); } /** @@ -335,7 +335,7 @@ class OC_Util { */ public static function addVendorScript($application, $file = null, $prepend = false) { $path = OC_Util::generatePath($application, 'vendor', $file); - self::addExternalResource($application, $prepend, $path, "script"); + self::addExternalResource($application, $prepend, $path, 'script'); } /** @@ -356,7 +356,7 @@ class OC_Util { } else { $path = "l10n/$languageCode"; } - self::addExternalResource($application, $prepend, $path, "script"); + self::addExternalResource($application, $prepend, $path, 'script'); } /** @@ -369,7 +369,7 @@ class OC_Util { */ public static function addStyle($application, $file = null, $prepend = false) { $path = OC_Util::generatePath($application, 'css', $file); - self::addExternalResource($application, $prepend, $path, "style"); + self::addExternalResource($application, $prepend, $path, 'style'); } /** @@ -382,7 +382,7 @@ class OC_Util { */ public static function addVendorStyle($application, $file = null, $prepend = false) { $path = OC_Util::generatePath($application, 'vendor', $file); - self::addExternalResource($application, $prepend, $path, "style"); + self::addExternalResource($application, $prepend, $path, 'style'); } /** @@ -394,8 +394,8 @@ class OC_Util { * @param string $type (script or style) * @return void */ - private static function addExternalResource($application, $prepend, $path, $type = "script") { - if ($type === "style") { + private static function addExternalResource($application, $prepend, $path, $type = 'script') { + if ($type === 'style') { if (!in_array($path, self::$styles)) { if ($prepend === true) { array_unshift(self::$styles, $path); @@ -403,7 +403,7 @@ class OC_Util { self::$styles[] = $path; } } - } elseif ($type === "script") { + } elseif ($type === 'script') { if (!in_array($path, self::$scripts)) { if ($prepend === true) { array_unshift(self::$scripts, $path); @@ -687,7 +687,7 @@ class OC_Util { /** * Check that the data directory exists and is valid by - * checking the existence of the ".ocdata" file. + * checking the existence of the ".ncdata" file. * * @param string $dataDirectory data directory path * @return array errors found @@ -701,11 +701,11 @@ class OC_Util { 'hint' => $l->t('Check the value of "datadirectory" in your configuration.') ]; } - if (!file_exists($dataDirectory . '/.ocdata')) { + + if (!file_exists($dataDirectory . '/.ncdata')) { $errors[] = [ 'error' => $l->t('Your data directory is invalid.'), - 'hint' => $l->t('Ensure there is a file called ".ocdata"' . - ' in the root of the data directory.') + 'hint' => $l->t('Ensure there is a file called "%1$s" in the root of the data directory. It should have the content: "%2$s"', ['.ncdata', '# Nextcloud data directory']), ]; } return $errors; @@ -991,7 +991,7 @@ class OC_Util { * @return string the theme */ public static function getTheme() { - $theme = \OC::$server->getSystemConfig()->getValue("theme", ''); + $theme = \OC::$server->getSystemConfig()->getValue('theme', ''); if ($theme === '') { if (is_dir(OC::$SERVERROOT . '/themes/default')) { @@ -1037,35 +1037,6 @@ class OC_Util { } /** - * Returns whether the given file name is valid - * - * @param string $file file name to check - * @return bool true if the file name is valid, false otherwise - * @deprecated use \OC\Files\View::verifyPath() - */ - public static function isValidFileName($file) { - $trimmed = trim($file); - if ($trimmed === '') { - return false; - } - if (\OC\Files\Filesystem::isIgnoredDir($trimmed)) { - return false; - } - - // detect part files - if (preg_match('/' . \OCP\Files\FileInfo::BLACKLIST_FILES_REGEX . '/', $trimmed) !== 0) { - return false; - } - - foreach (\OCP\Util::getForbiddenFileNameChars() as $char) { - if (str_contains($trimmed, $char)) { - return false; - } - } - return true; - } - - /** * Check whether the instance needs to perform an upgrade, * either when the core version is higher or any app requires * an upgrade. diff --git a/lib/private/legacy/template/functions.php b/lib/private/legacy/template/functions.php index 84ada2aa6d8..87b91639fd3 100644 --- a/lib/private/legacy/template/functions.php +++ b/lib/private/legacy/template/functions.php @@ -102,7 +102,7 @@ function print_unescaped($string) { * * @param string $app the appname * @param string|string[] $file the filename, - * if an array is given it will add all scripts + * if an array is given it will add all scripts */ function script($app, $file = null) { if (is_array($file)) { @@ -118,7 +118,7 @@ function script($app, $file = null) { * Shortcut for adding vendor scripts to a page * @param string $app the appname * @param string|string[] $file the filename, - * if an array is given it will add all scripts + * if an array is given it will add all scripts */ function vendor_script($app, $file = null) { if (is_array($file)) { @@ -134,7 +134,7 @@ function vendor_script($app, $file = null) { * Shortcut for adding styles to a page * @param string $app the appname * @param string|string[] $file the filename, - * if an array is given it will add all styles + * if an array is given it will add all styles */ function style($app, $file = null) { if (is_array($file)) { @@ -150,7 +150,7 @@ function style($app, $file = null) { * Shortcut for adding vendor styles to a page * @param string $app the appname * @param string|string[] $file the filename, - * if an array is given it will add all styles + * if an array is given it will add all styles */ function vendor_style($app, $file = null) { if (is_array($file)) { @@ -165,7 +165,7 @@ function vendor_style($app, $file = null) { /** * Shortcut for adding translations to a page * @param string $app the appname - * if an array is given it will add all styles + * if an array is given it will add all styles */ function translation($app) { OC_Util::addTranslations($app); @@ -175,7 +175,7 @@ function translation($app) { * Shortcut for HTML imports * @param string $app the appname * @param string|string[] $file the path relative to the app's component folder, - * if an array is given it will add all components + * if an array is given it will add all components */ function component($app, $file) { if (is_array($file)) { diff --git a/lib/public/Accounts/IAccount.php b/lib/public/Accounts/IAccount.php index 906fd8baf38..f9218f5fdf6 100644 --- a/lib/public/Accounts/IAccount.php +++ b/lib/public/Accounts/IAccount.php @@ -22,7 +22,7 @@ interface IAccount extends \JsonSerializable { * * @since 15.0.0 * - * @param string $property Must be one of the PROPERTY_ prefixed constants of \OCP\Accounts\IAccountManager + * @param string $property Must be one of the PROPERTY_ prefixed constants of \OCP\Accounts\IAccountManager * @param string $value * @param string $scope Must be one of the VISIBILITY_ prefixed constants of \OCP\Accounts\IAccountManager * @param string $verified \OCP\Accounts\IAccountManager::NOT_VERIFIED | \OCP\Accounts\IAccountManager::VERIFICATION_IN_PROGRESS | \OCP\Accounts\IAccountManager::VERIFIED diff --git a/lib/public/Accounts/IAccountManager.php b/lib/public/Accounts/IAccountManager.php index 9168e17ea10..33477db7679 100644 --- a/lib/public/Accounts/IAccountManager.php +++ b/lib/public/Accounts/IAccountManager.php @@ -228,9 +228,9 @@ interface IAccountManager { * Search for users based on account data * * @param string $property - property or property collection name – since - * NC 22 the implementation MAY add a fitting property collection into the - * search even if a property name was given e.g. email property and email - * collection) + * NC 22 the implementation MAY add a fitting property collection into the + * search even if a property name was given e.g. email property and email + * collection) * @param string[] $values * @return array * diff --git a/lib/public/Accounts/UserUpdatedEvent.php b/lib/public/Accounts/UserUpdatedEvent.php index 8be8a31b08f..fe9ea62a302 100644 --- a/lib/public/Accounts/UserUpdatedEvent.php +++ b/lib/public/Accounts/UserUpdatedEvent.php @@ -12,6 +12,8 @@ use OCP\EventDispatcher\Event; use OCP\IUser; /** + * This event is triggered when the account data of a user was updated. + * * @since 28.0.0 */ class UserUpdatedEvent extends Event { diff --git a/lib/public/Activity/ActivitySettings.php b/lib/public/Activity/ActivitySettings.php index 24e4681ee54..fa187164e19 100644 --- a/lib/public/Activity/ActivitySettings.php +++ b/lib/public/Activity/ActivitySettings.php @@ -38,8 +38,8 @@ abstract class ActivitySettings implements ISetting { /** * @return int whether the filter should be rather on the top or bottom of - * the admin section. The filters are arranged in ascending order of the - * priority values. It is required to return a value between 0 and 100. + * the admin section. The filters are arranged in ascending order of the + * priority values. It is required to return a value between 0 and 100. * @since 20.0.0 */ abstract public function getPriority(); diff --git a/lib/public/Activity/IEvent.php b/lib/public/Activity/IEvent.php index f204de599b9..eba426c5ecf 100644 --- a/lib/public/Activity/IEvent.php +++ b/lib/public/Activity/IEvent.php @@ -121,7 +121,7 @@ interface IEvent { * See https://github.com/nextcloud/server/issues/1706 for more information. * * @param string $subject - * @param array $parameters + * @param array<string, array<string, string>> $parameters * @return $this * @throws InvalidValueException if the subject or parameters are invalid * @since 11.0.0 @@ -136,7 +136,7 @@ interface IEvent { public function getRichSubject(): string; /** - * @return array[] + * @return array<string, array<string, string>> * @since 11.0.0 */ public function getRichSubjectParameters(): array; @@ -187,7 +187,7 @@ interface IEvent { * See https://github.com/nextcloud/server/issues/1706 for more information. * * @param string $message - * @param array $parameters + * @param array<string, array<string, string>> $parameters * @return $this * @throws \InvalidArgumentException if the message or parameters are invalid * @since 11.0.0 @@ -202,7 +202,7 @@ interface IEvent { public function getRichMessage(): string; /** - * @return array[] + * @return array<string, array<string, string>> * @since 11.0.0 */ public function getRichMessageParameters(): array; diff --git a/lib/public/Activity/IFilter.php b/lib/public/Activity/IFilter.php index 2f1f4ccda80..75d53650127 100644 --- a/lib/public/Activity/IFilter.php +++ b/lib/public/Activity/IFilter.php @@ -25,8 +25,8 @@ interface IFilter { /** * @return int whether the filter should be rather on the top or bottom of - * the admin section. The filters are arranged in ascending order of the - * priority values. It is required to return a value between 0 and 100. + * the admin section. The filters are arranged in ascending order of the + * priority values. It is required to return a value between 0 and 100. * @since 11.0.0 */ public function getPriority(); diff --git a/lib/public/Activity/ISetting.php b/lib/public/Activity/ISetting.php index 306a0d85632..c5c5c523477 100644 --- a/lib/public/Activity/ISetting.php +++ b/lib/public/Activity/ISetting.php @@ -25,8 +25,8 @@ interface ISetting { /** * @return int whether the filter should be rather on the top or bottom of - * the admin section. The filters are arranged in ascending order of the - * priority values. It is required to return a value between 0 and 100. + * the admin section. The filters are arranged in ascending order of the + * priority values. It is required to return a value between 0 and 100. * @since 11.0.0 */ public function getPriority(); diff --git a/lib/public/App/Events/AppDisableEvent.php b/lib/public/App/Events/AppDisableEvent.php index 00a74663667..5d16d42785e 100644 --- a/lib/public/App/Events/AppDisableEvent.php +++ b/lib/public/App/Events/AppDisableEvent.php @@ -11,6 +11,8 @@ namespace OCP\App\Events; use OCP\EventDispatcher\Event; /** + * This event is triggered when an app is disabled. + * * @since 27.0.0 */ class AppDisableEvent extends Event { diff --git a/lib/public/App/Events/AppEnableEvent.php b/lib/public/App/Events/AppEnableEvent.php index 70d42263d3e..fe1523d6a83 100644 --- a/lib/public/App/Events/AppEnableEvent.php +++ b/lib/public/App/Events/AppEnableEvent.php @@ -11,6 +11,8 @@ namespace OCP\App\Events; use OCP\EventDispatcher\Event; /** + * This event is triggered when an app is enabled. + * * @since 27.0.0 */ class AppEnableEvent extends Event { diff --git a/lib/public/App/Events/AppUpdateEvent.php b/lib/public/App/Events/AppUpdateEvent.php index de88d65b68b..344e7def080 100644 --- a/lib/public/App/Events/AppUpdateEvent.php +++ b/lib/public/App/Events/AppUpdateEvent.php @@ -11,6 +11,8 @@ namespace OCP\App\Events; use OCP\EventDispatcher\Event; /** + * This event is triggered when an app is updated. + * * @since 27.0.0 */ class AppUpdateEvent extends Event { diff --git a/lib/public/App/IAppManager.php b/lib/public/App/IAppManager.php index 508143426f5..580288fbff7 100644 --- a/lib/public/App/IAppManager.php +++ b/lib/public/App/IAppManager.php @@ -20,6 +20,11 @@ use OCP\IUser; */ interface IAppManager { /** + * @since 30.0.0 + */ + public const BACKEND_CALDAV = 'caldav'; + + /** * Returns the app information from "appinfo/info.xml". * * @param string|null $lang @@ -136,12 +141,10 @@ interface IAppManager { /** * Get the directory for the given app. * - * @param string $appId - * @return string * @since 11.0.0 * @throws AppPathNotFoundException */ - public function getAppPath($appId); + public function getAppPath(string $appId): string; /** * Get the web path for the given app. @@ -242,6 +245,8 @@ interface IAppManager { * * @since 25.0.6 * @since 28.0.0 Added optional $withFallbacks parameter + * @deprecated 31.0.0 + * Use @see \OCP\INavigationManager::getDefaultEntryIdForUser() instead */ public function getDefaultAppForUser(?IUser $user = null, bool $withFallbacks = true): string; @@ -250,6 +255,8 @@ interface IAppManager { * * @return string[] The default applications * @since 28.0.0 + * @deprecated 31.0.0 + * Use @see \OCP\INavigationManager::getDefaultEntryIds() instead */ public function getDefaultApps(): array; @@ -259,6 +266,38 @@ interface IAppManager { * @param string[] $appId * @throws \InvalidArgumentException If any of the apps is not installed * @since 28.0.0 + * @deprecated 31.0.0 + * Use @see \OCP\INavigationManager::setDefaultEntryIds() instead */ public function setDefaultApps(array $defaultApps): void; + + /** + * Check whether the given backend is required by at least one app. + * + * @param self::BACKEND_* $backend Name of the backend, one of `self::BACKEND_*` + * @return bool True if at least one app requires the backend + * + * @since 30.0.0 + */ + public function isBackendRequired(string $backend): bool; + + /** + * Clean the appId from forbidden characters + * + * @psalm-taint-escape file + * @psalm-taint-escape include + * @psalm-taint-escape html + * @psalm-taint-escape has_quotes + * + * @since 31.0.0 + */ + public function cleanAppId(string $app): string; + + /** + * Get a list of all apps in the apps folder + * + * @return list<string> an array of app names (string IDs) + * @since 31.0.0 + */ + public function getAllAppsInAppsFolders(): array; } diff --git a/lib/public/AppFramework/ApiController.php b/lib/public/AppFramework/ApiController.php index da1152090c6..dae80456e26 100644 --- a/lib/public/AppFramework/ApiController.php +++ b/lib/public/AppFramework/ApiController.php @@ -7,6 +7,7 @@ */ namespace OCP\AppFramework; +use OCP\AppFramework\Http\Attribute\NoAdminRequired; use OCP\AppFramework\Http\Attribute\NoCSRFRequired; use OCP\AppFramework\Http\Attribute\PublicPage; use OCP\AppFramework\Http\Response; @@ -26,13 +27,13 @@ abstract class ApiController extends Controller { * @param string $appName the name of the app * @param IRequest $request an instance of the request * @param string $corsMethods comma separated string of HTTP verbs which - * should be allowed for websites or webapps when calling your API, defaults to - * 'PUT, POST, GET, DELETE, PATCH' + * should be allowed for websites or webapps when calling your API, defaults to + * 'PUT, POST, GET, DELETE, PATCH' * @param string $corsAllowedHeaders comma separated string of HTTP headers - * which should be allowed for websites or webapps when calling your API, - * defaults to 'Authorization, Content-Type, Accept' + * which should be allowed for websites or webapps when calling your API, + * defaults to 'Authorization, Content-Type, Accept' * @param int $corsMaxAge number in seconds how long a preflighted OPTIONS - * request should be cached, defaults to 1728000 seconds + * request should be cached, defaults to 1728000 seconds * @since 7.0.0 */ public function __construct($appName, @@ -51,13 +52,11 @@ abstract class ApiController extends Controller { * This method implements a preflighted cors response for you that you can * link to for the options request * - * @NoAdminRequired - * @NoCSRFRequired - * @PublicPage * @since 7.0.0 */ #[NoCSRFRequired] #[PublicPage] + #[NoAdminRequired] public function preflightedCors() { if (isset($this->request->server['HTTP_ORIGIN'])) { $origin = $this->request->server['HTTP_ORIGIN']; diff --git a/lib/public/AppFramework/App.php b/lib/public/AppFramework/App.php index a8ba6b701f9..06404baea70 100644 --- a/lib/public/AppFramework/App.php +++ b/lib/public/AppFramework/App.php @@ -32,7 +32,7 @@ class App { * some_app_id -> OCA\SomeAppId * @param string $appId the app id * @param string $topNamespace the namespace which should be prepended to - * the transformed app id, defaults to OCA\ + * the transformed app id, defaults to OCA\ * @return string the starting namespace for the app * @since 8.0.0 */ diff --git a/lib/public/AppFramework/AuthPublicShareController.php b/lib/public/AppFramework/AuthPublicShareController.php index d6c088d4a0c..b79f530dc4d 100644 --- a/lib/public/AppFramework/AuthPublicShareController.php +++ b/lib/public/AppFramework/AuthPublicShareController.php @@ -46,9 +46,6 @@ abstract class AuthPublicShareController extends PublicShareController { } /** - * @PublicPage - * @NoCSRFRequired - * * Show the authentication page * The form has to submit to the authenticate method route * @@ -125,10 +122,6 @@ abstract class AuthPublicShareController extends PublicShareController { } /** - * @UseSession - * @PublicPage - * @BruteForceProtection(action=publicLinkAuth) - * * Authenticate the share * * @since 14.0.0 @@ -196,7 +189,7 @@ abstract class AuthPublicShareController extends PublicShareController { private function getRoute(string $function): string { $app = strtolower($this->appName); $class = (new \ReflectionClass($this))->getShortName(); - if (substr($class, -10) === 'Controller') { + if (str_ends_with($class, 'Controller')) { $class = substr($class, 0, -10); } return $app .'.'. $class .'.'. $function; diff --git a/lib/public/AppFramework/Bootstrap/IRegistrationContext.php b/lib/public/AppFramework/Bootstrap/IRegistrationContext.php index b86f7bcd76d..57e76f268d9 100644 --- a/lib/public/AppFramework/Bootstrap/IRegistrationContext.php +++ b/lib/public/AppFramework/Bootstrap/IRegistrationContext.php @@ -17,6 +17,7 @@ use OCP\Collaboration\Reference\IReferenceProvider; use OCP\EventDispatcher\IEventDispatcher; use OCP\Files\Template\ICustomTemplateProvider; use OCP\IContainer; +use OCP\Mail\Provider\IProvider as IMailProvider; use OCP\Notification\INotifier; use OCP\Preview\IProviderV2; use OCP\SpeechToText\ISpeechToTextProvider; @@ -412,4 +413,14 @@ interface IRegistrationContext { * @since 30.0.0 */ public function registerTaskProcessingTaskType(string $taskProcessingTaskTypeClass): void; + + /** + * Register a mail provider + * + * @param string $class + * @psalm-param class-string<IMailProvider> $class + * @since 30.0.0 + */ + public function registerMailProvider(string $class): void; + } diff --git a/lib/public/AppFramework/Controller.php b/lib/public/AppFramework/Controller.php index 44e8cecd810..99fed5350e5 100644 --- a/lib/public/AppFramework/Controller.php +++ b/lib/public/AppFramework/Controller.php @@ -123,7 +123,7 @@ abstract class Controller { /** * Serializes and formats a response * @param mixed $response the value that was returned from a controller and - * is not a Response instance + * is not a Response instance * @param string $format the format for which a formatter has been registered * @throws \DomainException if format does not match a registered formatter * @return Response diff --git a/lib/public/AppFramework/Db/Entity.php b/lib/public/AppFramework/Db/Entity.php index 46104e2faa4..f37107ac128 100644 --- a/lib/public/AppFramework/Db/Entity.php +++ b/lib/public/AppFramework/Db/Entity.php @@ -13,6 +13,7 @@ use function substr; /** * @method int getId() * @method void setId(int $id) + * @psalm-type AllowedTypes = 'json'|'blob'|'datetime'|'string'|'int'|'integer'|'bool'|'boolean'|'float'|'double'|'array'|'object' * @since 7.0.0 * @psalm-consistent-constructor */ @@ -23,12 +24,13 @@ abstract class Entity { public $id; private array $_updatedFields = []; + /** @var array<string, AllowedTypes> */ private array $_fieldTypes = ['id' => 'integer']; /** * Simple alternative constructor for building entities from a request * @param array $params the array which was obtained via $this->params('key') - * in the controller + * in the controller * @since 7.0.0 */ public static function fromParams(array $params): static { @@ -52,9 +54,8 @@ abstract class Entity { $instance = new static(); foreach ($row as $key => $value) { - $prop = ucfirst($instance->columnToProperty($key)); - $setter = 'set' . $prop; - $instance->$setter($value); + $prop = $instance->columnToProperty($key); + $instance->setter($prop, [$value]); } $instance->resetUpdatedFields(); @@ -64,10 +65,10 @@ abstract class Entity { /** - * @return array with attribute and type + * @return array<string, AllowedTypes> with attribute and type * @since 7.0.0 */ - public function getFieldTypes() { + public function getFieldTypes(): array { return $this->_fieldTypes; } @@ -76,50 +77,62 @@ abstract class Entity { * Marks the entity as clean needed for setting the id after the insertion * @since 7.0.0 */ - public function resetUpdatedFields() { + public function resetUpdatedFields(): void { $this->_updatedFields = []; } /** * Generic setter for properties + * + * @throws \InvalidArgumentException * @since 7.0.0 + * */ protected function setter(string $name, array $args): void { // setters should only work for existing attributes - if (property_exists($this, $name)) { - if ($args[0] === $this->$name) { - return; - } - $this->markFieldUpdated($name); - - // if type definition exists, cast to correct type - if ($args[0] !== null && array_key_exists($name, $this->_fieldTypes)) { - $type = $this->_fieldTypes[$name]; - if ($type === 'blob') { - // (B)LOB is treated as string when we read from the DB - if (is_resource($args[0])) { - $args[0] = stream_get_contents($args[0]); - } - $type = 'string'; + if (!property_exists($this, $name)) { + throw new \BadFunctionCallException($name . ' is not a valid attribute'); + } + + if ($args[0] === $this->$name) { + return; + } + $this->markFieldUpdated($name); + + // if type definition exists, cast to correct type + if ($args[0] !== null && array_key_exists($name, $this->_fieldTypes)) { + $type = $this->_fieldTypes[$name]; + if ($type === 'blob') { + // (B)LOB is treated as string when we read from the DB + if (is_resource($args[0])) { + $args[0] = stream_get_contents($args[0]); } + $type = 'string'; + } - if ($type === 'datetime') { - if (!$args[0] instanceof \DateTime) { - $args[0] = new \DateTime($args[0]); - } - } elseif ($type === 'json') { - if (!is_array($args[0])) { - $args[0] = json_decode($args[0], true); - } - } else { - settype($args[0], $type); + if ($type === 'datetime') { + if (!$args[0] instanceof \DateTime) { + $args[0] = new \DateTime($args[0]); } + } elseif ($type === 'json') { + if (!is_array($args[0])) { + $args[0] = json_decode($args[0], true); + } + } else { + $args[0] = match($type) { + 'string' => (string)$args[0], + 'bool', 'boolean', => (bool)$args[0], + 'int', 'integer', => (int)$args[0], + 'float' => (float)$args[0], + 'double' => (float)$args[0], + 'array' => (array)$args[0], + 'object' => (object)$args[0], + default => new \InvalidArgumentException() + }; } - $this->$name = $args[0]; - } else { - throw new \BadFunctionCallException($name . - ' is not a valid attribute'); } + $this->$name = $args[0]; + } /** @@ -182,16 +195,17 @@ abstract class Entity { /** * Transform a database columnname to a property + * * @param string $columnName the name of the column * @return string the property name * @since 7.0.0 */ - public function columnToProperty($columnName) { + public function columnToProperty(string $columnName): string { $parts = explode('_', $columnName); - $property = null; + $property = ''; foreach ($parts as $part) { - if ($property === null) { + if ($property === '') { $property = $part; } else { $property .= ucfirst($part); @@ -204,16 +218,17 @@ abstract class Entity { /** * Transform a property to a database column name + * * @param string $property the name of the property * @return string the column name * @since 7.0.0 */ - public function propertyToColumn($property) { + public function propertyToColumn(string $property): string { $parts = preg_split('/(?=[A-Z])/', $property); - $column = null; + $column = ''; foreach ($parts as $part) { - if ($column === null) { + if ($column === '') { $column = $part; } else { $column .= '_' . lcfirst($part); @@ -228,19 +243,20 @@ abstract class Entity { * @return array array of updated fields for update query * @since 7.0.0 */ - public function getUpdatedFields() { + public function getUpdatedFields(): array { return $this->_updatedFields; } /** - * Adds type information for a field so that its automatically casted to + * Adds type information for a field so that it's automatically cast to * that value once its being returned from the database + * * @param string $fieldName the name of the attribute - * @param string $type the type which will be used to call settype() + * @param AllowedTypes $type the type which will be used to match a cast * @since 7.0.0 */ - protected function addType($fieldName, $type) { + protected function addType(string $fieldName, string $type): void { $this->_fieldTypes[$fieldName] = $type; } @@ -248,12 +264,13 @@ abstract class Entity { /** * Slugify the value of a given attribute * Warning: This doesn't result in a unique value + * * @param string $attributeName the name of the attribute, which value should be slugified * @return string slugified value * @since 7.0.0 * @deprecated 24.0.0 */ - public function slugify($attributeName) { + public function slugify(string $attributeName): string { // toSlug should only work for existing attributes if (property_exists($this, $attributeName)) { $value = $this->$attributeName; @@ -262,9 +279,8 @@ abstract class Entity { $value = strtolower($value); // trim '-' return trim($value, '-'); - } else { - throw new \BadFunctionCallException($attributeName . - ' is not a valid attribute'); } + + throw new \BadFunctionCallException($attributeName . ' is not a valid attribute'); } } diff --git a/lib/public/AppFramework/Db/QBMapper.php b/lib/public/AppFramework/Db/QBMapper.php index 41160b29fa5..cd09a6b11b6 100644 --- a/lib/public/AppFramework/Db/QBMapper.php +++ b/lib/public/AppFramework/Db/QBMapper.php @@ -34,7 +34,7 @@ abstract class QBMapper { * @param IDBConnection $db Instance of the Db abstraction layer * @param string $tableName the name of the table. set this to allow entity * @param class-string<T>|null $entityClass the name of the entity that the sql should be - * mapped to queries without using sql + * mapped to queries without using sql * @since 14.0.0 */ public function __construct(IDBConnection $db, string $tableName, ?string $entityClass = null) { @@ -203,7 +203,7 @@ abstract class QBMapper { * Returns the type parameter for the QueryBuilder for a specific property * of the $entity * - * @param Entity $entity The entity to get the types from + * @param Entity $entity The entity to get the types from * @psalm-param T $entity * @param string $property The property of $entity to get the type for * @return int|string diff --git a/lib/public/AppFramework/Http/Attribute/ARateLimit.php b/lib/public/AppFramework/Http/Attribute/ARateLimit.php index d92fcae1ae1..c06b1180ae3 100644 --- a/lib/public/AppFramework/Http/Attribute/ARateLimit.php +++ b/lib/public/AppFramework/Http/Attribute/ARateLimit.php @@ -17,6 +17,8 @@ namespace OCP\AppFramework\Http\Attribute; */ abstract class ARateLimit { /** + * @param int $limit The maximum number of requests that can be made in the given period in seconds. + * @param int $period The time period in seconds. * @since 27.0.0 */ public function __construct( diff --git a/lib/public/AppFramework/Http/Attribute/AppApiAdminAccessWithoutUser.php b/lib/public/AppFramework/Http/Attribute/AppApiAdminAccessWithoutUser.php new file mode 100644 index 00000000000..6b78fee41af --- /dev/null +++ b/lib/public/AppFramework/Http/Attribute/AppApiAdminAccessWithoutUser.php @@ -0,0 +1,21 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OCP\AppFramework\Http\Attribute; + +use Attribute; + +/** + * Attribute for (sub)administrator controller methods that allow access for ExApps when the User is not set. + * + * @since 30.0.0 + */ +#[Attribute] +class AppApiAdminAccessWithoutUser { +} diff --git a/lib/public/AppFramework/Http/Attribute/OpenAPI.php b/lib/public/AppFramework/Http/Attribute/OpenAPI.php index 26d01937cfb..1b44b2a57fe 100644 --- a/lib/public/AppFramework/Http/Attribute/OpenAPI.php +++ b/lib/public/AppFramework/Http/Attribute/OpenAPI.php @@ -60,12 +60,12 @@ class OpenAPI { /** * @param self::SCOPE_*|string $scope Scopes are used to define different clients. - * It is recommended to go with the scopes available as self::SCOPE_* constants, - * but in exotic cases other APIs might need documentation as well, - * then a free string can be provided (but it should be `a-z` only). + * It is recommended to go with the scopes available as self::SCOPE_* constants, + * but in exotic cases other APIs might need documentation as well, + * then a free string can be provided (but it should be `a-z` only). * @param ?list<string> $tags Tags can be used to group routes inside a scope - * for easier implementation and reviewing of the API specification. - * It defaults to the controller name in snake_case (should be `a-z` and underscore only). + * for easier implementation and reviewing of the API specification. + * It defaults to the controller name in snake_case (should be `a-z` and underscore only). * @since 28.0.0 */ public function __construct( diff --git a/lib/public/AppFramework/Http/ContentSecurityPolicy.php b/lib/public/AppFramework/Http/ContentSecurityPolicy.php index 281aaa06eb8..11ec79bbdb7 100644 --- a/lib/public/AppFramework/Http/ContentSecurityPolicy.php +++ b/lib/public/AppFramework/Http/ContentSecurityPolicy.php @@ -38,7 +38,7 @@ class ContentSecurityPolicy extends EmptyContentSecurityPolicy { ]; /** * @var bool Whether inline CSS is allowed - * TODO: Disallow per default + * TODO: Disallow per default * @link https://github.com/owncloud/core/issues/13458 */ protected $inlineStyleAllowed = true; diff --git a/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php b/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php index 5b4cf7eab8b..0a6258be941 100644 --- a/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php +++ b/lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php @@ -26,7 +26,7 @@ class EmptyContentSecurityPolicy { protected $strictDynamicAllowedOnScripts = null; /** * @var bool Whether eval in JS scripts is allowed - * TODO: Disallow per default + * TODO: Disallow per default * @link https://github.com/owncloud/core/issues/11925 */ protected $evalScriptAllowed = null; @@ -36,7 +36,7 @@ class EmptyContentSecurityPolicy { protected $allowedScriptDomains = null; /** * @var bool Whether inline CSS is allowed - * TODO: Disallow per default + * TODO: Disallow per default * @link https://github.com/owncloud/core/issues/13458 */ protected $inlineStyleAllowed = null; @@ -89,7 +89,7 @@ class EmptyContentSecurityPolicy { } /** - * Use the according JS nonce + * The base64 encoded nonce to be used for script source. * This method is only for CSPMiddleware, custom values are ignored in mergePolicies of ContentSecurityPolicyManager * * @param string $nonce @@ -448,7 +448,7 @@ class EmptyContentSecurityPolicy { if ($this->strictDynamicAllowed) { $scriptSrc .= '\'strict-dynamic\' '; } - $scriptSrc .= '\'nonce-'.base64_encode($this->jsNonce).'\''; + $scriptSrc .= '\'nonce-'.$this->jsNonce.'\''; $allowedScriptDomains = array_flip($this->allowedScriptDomains); unset($allowedScriptDomains['\'self\'']); $this->allowedScriptDomains = array_flip($allowedScriptDomains); diff --git a/lib/public/AppFramework/Http/JSONResponse.php b/lib/public/AppFramework/Http/JSONResponse.php index 1614cb8ce01..afe36c4a8c3 100644 --- a/lib/public/AppFramework/Http/JSONResponse.php +++ b/lib/public/AppFramework/Http/JSONResponse.php @@ -23,6 +23,11 @@ class JSONResponse extends Response { * @var T */ protected $data; + /** + * Additional `json_encode` flags + * @var int + */ + protected $encodeFlags; /** @@ -30,12 +35,20 @@ class JSONResponse extends Response { * @param T $data the object or array that should be transformed * @param S $statusCode the Http status code, defaults to 200 * @param H $headers + * @param int $encodeFlags Additional `json_encode` flags * @since 6.0.0 + * @since 30.0.0 Added `$encodeFlags` param */ - public function __construct(mixed $data = [], int $statusCode = Http::STATUS_OK, array $headers = []) { + public function __construct( + mixed $data = [], + int $statusCode = Http::STATUS_OK, + array $headers = [], + int $encodeFlags = 0, + ) { parent::__construct($statusCode, $headers); $this->data = $data; + $this->encodeFlags = $encodeFlags; $this->addHeader('Content-Type', 'application/json; charset=utf-8'); } @@ -47,14 +60,14 @@ class JSONResponse extends Response { * @throws \Exception If data could not get encoded */ public function render() { - return json_encode($this->data, JSON_HEX_TAG | JSON_THROW_ON_ERROR); + return json_encode($this->data, JSON_HEX_TAG | JSON_THROW_ON_ERROR | $this->encodeFlags, 2048); } /** * Sets values in the data json array * @psalm-suppress InvalidTemplateParam * @param T $data an array or object which will be transformed - * to JSON + * to JSON * @return JSONResponse Reference to this object * @since 6.0.0 - return value was added in 7.0.0 */ diff --git a/lib/public/AppFramework/Http/Response.php b/lib/public/AppFramework/Http/Response.php index 0da290ad48b..940f0f124e8 100644 --- a/lib/public/AppFramework/Http/Response.php +++ b/lib/public/AppFramework/Http/Response.php @@ -111,8 +111,8 @@ class Response { * @param string $name The name of the cookie * @param string $value The value of the cookie * @param \DateTime|null $expireDate Date on that the cookie should expire, if set - * to null cookie will be considered as session - * cookie. + * to null cookie will be considered as session + * cookie. * @param string $sameSite The samesite value of the cookie. Defaults to Lax. Other possibilities are Strict or None * @return $this * @since 8.0.0 @@ -289,7 +289,7 @@ class Response { /** * Get the currently used Content-Security-Policy * @return EmptyContentSecurityPolicy|null Used Content-Security-Policy or null if - * none specified. + * none specified. * @since 8.1.0 */ public function getContentSecurityPolicy() { diff --git a/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php b/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php index cddf5d19171..4f958a2620c 100644 --- a/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php +++ b/lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php @@ -5,54 +5,24 @@ */ namespace OCP\AppFramework\Http\Template; -use OCP\Util; - /** * Class LinkMenuAction * * @since 14.0.0 */ class ExternalShareMenuAction extends SimpleMenuAction { - /** @var string */ - private $owner; - - /** @var string */ - private $displayname; - - /** @var string */ - private $shareName; /** * ExternalShareMenuAction constructor. * - * @param string $label - * @param string $icon - * @param string $owner - * @param string $displayname - * @param string $shareName + * @param string $label Translated label + * @param string $icon Icon CSS class + * @param string $owner Owner user ID (unused) + * @param string $displayname Display name of the owner (unused) + * @param string $shareName Name of the share (unused) * @since 14.0.0 */ public function __construct(string $label, string $icon, string $owner, string $displayname, string $shareName) { parent::__construct('save', $label, $icon); - $this->owner = $owner; - $this->displayname = $displayname; - $this->shareName = $shareName; - } - - /** - * @since 14.0.0 - */ - public function render(): string { - return '<li>' . - ' <button id="save-external-share" class="icon ' . Util::sanitizeHTML($this->getIcon()) . '" data-protected="false" data-owner-display-name="' . Util::sanitizeHTML($this->displayname) . '" data-owner="' . Util::sanitizeHTML($this->owner) . '" data-name="' . Util::sanitizeHTML($this->shareName) . '">' . Util::sanitizeHTML($this->getLabel()) . '</button>' . - '</li>' . - '<li id="external-share-menu-item" class="hidden">' . - ' <span class="menuitem">' . - ' <form class="save-form" action="#">' . - ' <input type="text" id="remote_address" placeholder="user@yourNextcloud.org">' . - ' <input type="submit" value=" " id="save-button-confirm" class="icon-confirm" disabled="disabled"></button>' . - ' </form>' . - ' </span>' . - '</li>'; } } diff --git a/lib/public/AppFramework/Http/Template/IMenuAction.php b/lib/public/AppFramework/Http/Template/IMenuAction.php index d3962300923..50b346add86 100644 --- a/lib/public/AppFramework/Http/Template/IMenuAction.php +++ b/lib/public/AppFramework/Http/Template/IMenuAction.php @@ -18,12 +18,16 @@ interface IMenuAction { public function getId(): string; /** + * The translated label of the menu item. + * * @since 14.0.0 * @return string */ public function getLabel(): string; /** + * The link this menu item points to. + * * @since 14.0.0 * @return string */ @@ -36,6 +40,9 @@ interface IMenuAction { public function getPriority(): int; /** + * Custom render function. + * The returned HTML will be wrapped within a listitem element (`<li>...</li>`). + * * @since 14.0.0 * @return string */ diff --git a/lib/public/AppFramework/Http/Template/LinkMenuAction.php b/lib/public/AppFramework/Http/Template/LinkMenuAction.php index 69e835f6b82..6ae1fcdf13b 100644 --- a/lib/public/AppFramework/Http/Template/LinkMenuAction.php +++ b/lib/public/AppFramework/Http/Template/LinkMenuAction.php @@ -5,8 +5,6 @@ */ namespace OCP\AppFramework\Http\Template; -use OCP\Util; - /** * Class LinkMenuAction * @@ -22,24 +20,6 @@ class LinkMenuAction extends SimpleMenuAction { * @since 14.0.0 */ public function __construct(string $label, string $icon, string $link) { - parent::__construct('directLink-container', $label, $icon, $link); - } - - /** - * @return string - * @since 14.0.0 - */ - public function render(): string { - return '<li>' . - '<a id="directLink-container">' . - '<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' . - '<label for="directLink">' . Util::sanitizeHTML($this->getLabel()) . '</label>' . - '</a>' . - '</li>' . - '<li>' . - '<span class="menuitem">' . - '<input id="directLink" type="text" readonly="" value="' . Util::sanitizeHTML($this->getLink()) . '">' . - '</span>' . - '</li>'; + parent::__construct('directLink', $label, $icon, $link); } } diff --git a/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php b/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php index c12cf087755..1000f4db549 100644 --- a/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php +++ b/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php @@ -8,6 +8,7 @@ namespace OCP\AppFramework\Http\Template; use InvalidArgumentException; use OCP\AppFramework\Http; use OCP\AppFramework\Http\TemplateResponse; +use OCP\IInitialStateService; /** * Class PublicTemplateResponse @@ -20,6 +21,7 @@ use OCP\AppFramework\Http\TemplateResponse; class PublicTemplateResponse extends TemplateResponse { private $headerTitle = ''; private $headerDetails = ''; + /** @var IMenuAction[] */ private $headerActions = []; private $footerVisible = true; @@ -33,9 +35,38 @@ class PublicTemplateResponse extends TemplateResponse { * @param H $headers * @since 14.0.0 */ - public function __construct(string $appName, string $templateName, array $params = [], $status = Http::STATUS_OK, array $headers = []) { + public function __construct( + string $appName, + string $templateName, + array $params = [], + $status = Http::STATUS_OK, + array $headers = [], + ) { parent::__construct($appName, $templateName, $params, 'public', $status, $headers); - \OC_Util::addScript('core', 'public/publicpage'); + \OCP\Util::addScript('core', 'public-page-menu'); + + $state = \OCP\Server::get(IInitialStateService::class); + $state->provideLazyInitialState('core', 'public-page-menu', function () { + $response = []; + foreach ($this->headerActions as $action) { + // First try in it is a custom action that provides rendered HTML + $rendered = $action->render(); + if ($rendered === '') { + // If simple action, add the response data + if ($action instanceof SimpleMenuAction) { + $response[] = $action->getData(); + } + } else { + // custom action so add the rendered output + $response[] = [ + 'id' => $action->getId(), + 'label' => $action->getLabel(), + 'html' => $rendered, + ]; + } + } + return $response; + }); } /** @@ -138,6 +169,6 @@ class PublicTemplateResponse extends TemplateResponse { 'template' => $this, ]); $this->setParams($params); - return parent::render(); + return parent::render(); } } diff --git a/lib/public/AppFramework/Http/Template/SimpleMenuAction.php b/lib/public/AppFramework/Http/Template/SimpleMenuAction.php index 2bb60975f26..4cbbd5302d7 100644 --- a/lib/public/AppFramework/Http/Template/SimpleMenuAction.php +++ b/lib/public/AppFramework/Http/Template/SimpleMenuAction.php @@ -5,8 +5,6 @@ */ namespace OCP\AppFramework\Http\Template; -use OCP\Util; - /** * Class SimpleMenuAction * @@ -68,6 +66,8 @@ class SimpleMenuAction implements IMenuAction { } /** + * The icon CSS class to use. + * * @return string * @since 14.0.0 */ @@ -92,14 +92,28 @@ class SimpleMenuAction implements IMenuAction { } /** + * Custom render function. + * The returned HTML must be wrapped within a listitem (`<li>...</li>`). + * * If an empty string is returned, the default design is used (based on the label and link specified). * @return string * @since 14.0.0 */ public function render(): string { - $detailContent = ($this->detail !== '') ? ' <span class="download-size">(' . Util::sanitizeHTML($this->detail) . ')</span>' : ''; - return sprintf( - '<li id="%s"><a href="%s"><span class="icon %s"></span>%s %s</a></li>', - Util::sanitizeHTML($this->id), Util::sanitizeHTML($this->link), Util::sanitizeHTML($this->icon), Util::sanitizeHTML($this->label), $detailContent - ); + return ''; + } + + /** + * Return JSON data to let the frontend render the menu entry. + * @return array{id: string, label: string, href: string, icon: string, details: string|null} + * @since 31.0.0 + */ + public function getData(): array { + return [ + 'id' => $this->id, + 'label' => $this->label, + 'href' => $this->link, + 'icon' => $this->icon, + 'details' => $this->detail, + ]; } } diff --git a/lib/public/AppFramework/Http/TemplateResponse.php b/lib/public/AppFramework/Http/TemplateResponse.php index f9ac80cdc80..2c7567c080b 100644 --- a/lib/public/AppFramework/Http/TemplateResponse.php +++ b/lib/public/AppFramework/Http/TemplateResponse.php @@ -72,7 +72,7 @@ class TemplateResponse extends Response { * @param string $appName the name of the app to load the template from * @param string $templateName the name of the template * @param array $params an array of parameters which should be passed to the - * template + * template * @param string $renderAs how the page should be rendered, defaults to user * @param S $status * @param H $headers diff --git a/lib/public/AppFramework/OCSController.php b/lib/public/AppFramework/OCSController.php index b4bb62c41ed..7cde2a7e427 100644 --- a/lib/public/AppFramework/OCSController.php +++ b/lib/public/AppFramework/OCSController.php @@ -44,13 +44,13 @@ abstract class OCSController extends ApiController { * @param string $appName the name of the app * @param IRequest $request an instance of the request * @param string $corsMethods comma separated string of HTTP verbs which - * should be allowed for websites or webapps when calling your API, defaults to - * 'PUT, POST, GET, DELETE, PATCH' + * should be allowed for websites or webapps when calling your API, defaults to + * 'PUT, POST, GET, DELETE, PATCH' * @param string $corsAllowedHeaders comma separated string of HTTP headers - * which should be allowed for websites or webapps when calling your API, - * defaults to 'Authorization, Content-Type, Accept' + * which should be allowed for websites or webapps when calling your API, + * defaults to 'Authorization, Content-Type, Accept' * @param int $corsMaxAge number in seconds how long a preflighted OPTIONS - * request should be cached, defaults to 1728000 seconds + * request should be cached, defaults to 1728000 seconds * @since 8.1.0 */ public function __construct($appName, @@ -81,7 +81,7 @@ abstract class OCSController extends ApiController { * Since the OCS endpoints default to XML we need to find out the format * again * @param mixed $response the value that was returned from a controller and - * is not a Response instance + * is not a Response instance * @param string $format the format for which a formatter has been registered * @throws \DomainException if format does not match a registered formatter * @return Response diff --git a/lib/public/AppFramework/Utility/IControllerMethodReflector.php b/lib/public/AppFramework/Utility/IControllerMethodReflector.php index 577191cac40..95d7fbebb56 100644 --- a/lib/public/AppFramework/Utility/IControllerMethodReflector.php +++ b/lib/public/AppFramework/Utility/IControllerMethodReflector.php @@ -31,9 +31,9 @@ interface IControllerMethodReflector { * Inspects the PHPDoc parameters for types * * @param string $parameter the parameter whose type comments should be - * parsed + * parsed * @return string|null type in the type parameters (@param int $something) - * would return int or null if not existing + * would return int or null if not existing * @since 8.0.0 * @deprecated 22.0.0 this method is only used internally */ diff --git a/lib/public/Authentication/TwoFactorAuth/IRegistry.php b/lib/public/Authentication/TwoFactorAuth/IRegistry.php index f4cffd7c34c..6817f1763cf 100644 --- a/lib/public/Authentication/TwoFactorAuth/IRegistry.php +++ b/lib/public/Authentication/TwoFactorAuth/IRegistry.php @@ -38,7 +38,7 @@ interface IRegistry { * * @since 14.0.0 * @return array<string, bool> where the array key is the provider ID (string) and the - * value is the enabled state (bool) + * value is the enabled state (bool) */ public function getProviderStates(IUser $user): array; diff --git a/lib/public/Calendar/ICalendar.php b/lib/public/Calendar/ICalendar.php index 76257579a8f..2f74d329119 100644 --- a/lib/public/Calendar/ICalendar.php +++ b/lib/public/Calendar/ICalendar.php @@ -44,7 +44,7 @@ interface ICalendar { * @param string $pattern which should match within the $searchProperties * @param array $searchProperties defines the properties within the query pattern should match * @param array $options - optional parameters: - * ['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]] + * ['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]] * @param int|null $limit - limit number of search results * @param int|null $offset - offset for paging of search results * @return array an array of events/journals/todos which are arrays of key-value-pairs. the events are sorted by start date (closest first, furthest last) diff --git a/lib/public/Calendar/IHandleImipMessage.php b/lib/public/Calendar/IHandleImipMessage.php index f42ee0fcda7..27190f93f24 100644 --- a/lib/public/Calendar/IHandleImipMessage.php +++ b/lib/public/Calendar/IHandleImipMessage.php @@ -24,7 +24,7 @@ interface IHandleImipMessage extends ICalendar { * * @since 26.0.0 * - * @throws CalendarException on validation failure or calendar write error + * @throws CalendarException on validation failure or calendar write error */ public function handleIMipMessage(string $name, string $calendarData): void; } diff --git a/lib/public/Calendar/IManager.php b/lib/public/Calendar/IManager.php index ff752c0d06e..8a9fe485871 100644 --- a/lib/public/Calendar/IManager.php +++ b/lib/public/Calendar/IManager.php @@ -46,7 +46,7 @@ interface IManager { * @param string $pattern which should match within the $searchProperties * @param array $searchProperties defines the properties within the query pattern should match * @param array $options - optional parameters: - * ['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]] + * ['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]] * @param integer|null $limit - limit number of search results * @param integer|null $offset - offset for paging of search results * @return array an array of events/journals/todos which are arrays of arrays of key-value-pairs diff --git a/lib/public/Collaboration/AutoComplete/IManager.php b/lib/public/Collaboration/AutoComplete/IManager.php index cc586b92d7d..33b4ae0566b 100644 --- a/lib/public/Collaboration/AutoComplete/IManager.php +++ b/lib/public/Collaboration/AutoComplete/IManager.php @@ -18,9 +18,9 @@ interface IManager { public function registerSorter($className); /** - * @param array $sorters list of sorter IDs, separated by "|" - * @param array $sortArray array representation of OCP\Collaboration\Collaborators\ISearchResult - * @param array $context context info of the search, keys: itemType, itemId + * @param array $sorters list of sorter IDs, separated by "|" + * @param array $sortArray array representation of OCP\Collaboration\Collaborators\ISearchResult + * @param array $context context info of the search, keys: itemType, itemId * @since 13.0.0 */ public function runSorters(array $sorters, array &$sortArray, array $context); diff --git a/lib/public/Collaboration/Collaborators/ISearch.php b/lib/public/Collaboration/Collaborators/ISearch.php index a991a683acc..95151d49a86 100644 --- a/lib/public/Collaboration/Collaborators/ISearch.php +++ b/lib/public/Collaboration/Collaborators/ISearch.php @@ -24,7 +24,7 @@ interface ISearch { /** * @param array $pluginInfo with keys 'shareType' containing the name of a corresponding constant in \OCP\Share and - * 'class' with the class name of the plugin + * 'class' with the class name of the plugin * @since 13.0.0 */ public function registerPlugin(array $pluginInfo); diff --git a/lib/public/Collaboration/Collaborators/SearchResultType.php b/lib/public/Collaboration/Collaborators/SearchResultType.php index f5ea0751c7b..c5a8b4e303a 100644 --- a/lib/public/Collaboration/Collaborators/SearchResultType.php +++ b/lib/public/Collaboration/Collaborators/SearchResultType.php @@ -11,7 +11,7 @@ namespace OCP\Collaboration\Collaborators; * @since 13.0.0 */ class SearchResultType { - /** @var string */ + /** @var string */ protected $label; /** diff --git a/lib/public/Collaboration/Reference/IPublicReferenceProvider.php b/lib/public/Collaboration/Reference/IPublicReferenceProvider.php new file mode 100644 index 00000000000..db6c3d3828b --- /dev/null +++ b/lib/public/Collaboration/Reference/IPublicReferenceProvider.php @@ -0,0 +1,33 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OCP\Collaboration\Reference; + +/** + * @since 30.0.0 + */ +interface IPublicReferenceProvider extends IReferenceProvider { + /** + * Return a reference with its metadata for a given reference identifier and sharingToken + * + * @since 30.0.0 + */ + public function resolveReferencePublic(string $referenceText, string $sharingToken): ?IReference; + + /** + * Return a custom cache key to be used for caching the metadata + * This could be for example the current sharingToken if the reference + * access permissions are different for each share + * + * Should return null, if the cache is only related to the + * reference id and has no further dependency + * + * @since 30.0.0 + */ + public function getCacheKeyPublic(string $referenceId, string $sharingToken): ?string; +} diff --git a/lib/public/Collaboration/Reference/IReferenceManager.php b/lib/public/Collaboration/Reference/IReferenceManager.php index 4a7de266435..c3cf7ca8e7b 100644 --- a/lib/public/Collaboration/Reference/IReferenceManager.php +++ b/lib/public/Collaboration/Reference/IReferenceManager.php @@ -27,8 +27,9 @@ interface IReferenceManager { * but may still return null in case this is disabled or the fetching fails * * @since 25.0.0 + * @since 30.0.0 optional arguments `$public` and `$sharingToken` */ - public function resolveReference(string $referenceId): ?IReference; + public function resolveReference(string $referenceId, bool $public = false, string $sharingToken = ''): ?IReference; /** * Get a reference by its cache key @@ -42,8 +43,9 @@ interface IReferenceManager { * the cache can then be filled with a separate request from the frontend * * @since 25.0.0 + * @since 30.0.0 optional arguments `$public` and `$sharingToken` */ - public function getReferenceFromCache(string $referenceId): ?IReference; + public function getReferenceFromCache(string $referenceId, bool $public = false, string $sharingToken = ''): ?IReference; /** * Invalidate all cache entries with a prefix or just one if the cache key is provided diff --git a/lib/public/Collaboration/Reference/LinkReferenceProvider.php b/lib/public/Collaboration/Reference/LinkReferenceProvider.php index 79b5164950c..65bdcecb577 100644 --- a/lib/public/Collaboration/Reference/LinkReferenceProvider.php +++ b/lib/public/Collaboration/Reference/LinkReferenceProvider.php @@ -9,7 +9,6 @@ declare(strict_types=1); namespace OCP\Collaboration\Reference; use Fusonic\OpenGraph\Consumer; -use GuzzleHttp\Exception\GuzzleException; use GuzzleHttp\Psr7\LimitStream; use GuzzleHttp\Psr7\Utils; use OC\Security\RateLimiting\Exception\RateLimitExceededException; @@ -26,7 +25,7 @@ use Psr\Log\LoggerInterface; /** * @since 29.0.0 */ -class LinkReferenceProvider implements IReferenceProvider { +class LinkReferenceProvider implements IReferenceProvider, IPublicReferenceProvider { /** * for image size and webpage header @@ -88,6 +87,14 @@ class LinkReferenceProvider implements IReferenceProvider { } /** + * @inheritDoc + * @since 30.0.0 + */ + public function resolveReferencePublic(string $referenceText, string $sharingToken): ?IReference { + return $this->resolveReference($referenceText); + } + + /** * Populates the reference with OpenGraph data * * @param Reference $reference @@ -107,15 +114,15 @@ class LinkReferenceProvider implements IReferenceProvider { $client = $this->clientService->newClient(); try { - $headResponse = $client->head($reference->getId(), [ 'timeout' => 10 ]); + $headResponse = $client->head($reference->getId(), [ 'timeout' => 3 ]); } catch (\Exception $e) { $this->logger->debug('Failed to perform HEAD request to get target metadata', ['exception' => $e]); return; } $linkContentLength = $headResponse->getHeader('Content-Length'); - if (is_numeric($linkContentLength) && (int) $linkContentLength > self::MAX_CONTENT_LENGTH) { - $this->logger->debug('Skip resolving links pointing to content length > 5 MiB'); + if (is_numeric($linkContentLength) && (int)$linkContentLength > self::MAX_CONTENT_LENGTH) { + $this->logger->debug('[Head] Skip resolving links pointing to content length > 5 MiB'); return; } @@ -129,18 +136,28 @@ class LinkReferenceProvider implements IReferenceProvider { } try { - $response = $client->get($reference->getId(), [ 'timeout' => 10 ]); + $response = $client->get($reference->getId(), [ 'timeout' => 3, 'stream' => true ]); } catch (\Exception $e) { $this->logger->debug('Failed to fetch link for obtaining open graph data', ['exception' => $e]); return; } - $responseBody = (string)$response->getBody(); + $body = $response->getBody(); + if (is_resource($body)) { + $responseContent = fread($body, self::MAX_CONTENT_LENGTH); + if (!feof($body)) { + $this->logger->debug('[Get] Skip resolving links pointing to content length > 5 MiB'); + return; + } + } else { + $this->logger->error('[Get] Impossible to check content length'); + return; + } // OpenGraph handling $consumer = new Consumer(); $consumer->useFallbackMode = true; - $object = $consumer->loadHtml($responseBody); + $object = $consumer->loadHtml($responseContent); $reference->setUrl($reference->getId()); @@ -167,7 +184,7 @@ class LinkReferenceProvider implements IReferenceProvider { $folder = $appData->newFolder('opengraph'); } - $response = $client->get($object->images[0]->url, ['timeout' => 10]); + $response = $client->get($object->images[0]->url, ['timeout' => 3]); $contentType = $response->getHeader('Content-Type'); $contentLength = $response->getHeader('Content-Length'); @@ -178,10 +195,8 @@ class LinkReferenceProvider implements IReferenceProvider { $folder->newFile(md5($reference->getId()), $bodyStream->getContents()); $reference->setImageUrl($this->urlGenerator->linkToRouteAbsolute('core.Reference.preview', ['referenceId' => md5($reference->getId())])); } - } catch (GuzzleException $e) { - $this->logger->info('Failed to fetch and store the open graph image for ' . $reference->getId(), ['exception' => $e]); - } catch (\Throwable $e) { - $this->logger->error('Failed to fetch and store the open graph image for ' . $reference->getId(), ['exception' => $e]); + } catch (\Exception $e) { + $this->logger->debug('Failed to fetch and store the open graph image for ' . $reference->getId(), ['exception' => $e]); } } } @@ -201,4 +216,12 @@ class LinkReferenceProvider implements IReferenceProvider { public function getCacheKey(string $referenceId): ?string { return null; } + + /** + * @inheritDoc + * @since 30.0.0 + */ + public function getCacheKeyPublic(string $referenceId, string $sharingToken): ?string { + return null; + } } diff --git a/lib/public/Collaboration/Reference/RenderReferenceEvent.php b/lib/public/Collaboration/Reference/RenderReferenceEvent.php index 09778a20d2a..692098dbf60 100644 --- a/lib/public/Collaboration/Reference/RenderReferenceEvent.php +++ b/lib/public/Collaboration/Reference/RenderReferenceEvent.php @@ -11,8 +11,10 @@ namespace OCP\Collaboration\Reference; use OCP\EventDispatcher\Event; /** - * Event that apps can emit on their page rendering to trigger loading of aditional - * scripts for reference widget rendering + * Event emitted when apps might render references like link previews or smart picker widgets. + * + * This can be used to inject scripts for extending that. + * Further details can be found in the :ref:`Reference providers` deep dive. * * @since 25.0.0 */ diff --git a/lib/public/Color.php b/lib/public/Color.php index f48655ca04d..c8ba3a1ff15 100644 --- a/lib/public/Color.php +++ b/lib/public/Color.php @@ -83,7 +83,7 @@ class Color { * @since 25.0.0 */ public function name(): string { - return sprintf("#%02x%02x%02x", $this->r, $this->g, $this->b); + return sprintf('#%02x%02x%02x', $this->r, $this->g, $this->b); } /** diff --git a/lib/public/Comments/CommentsEntityEvent.php b/lib/public/Comments/CommentsEntityEvent.php index 2d0c50ad95b..39568151b61 100644 --- a/lib/public/Comments/CommentsEntityEvent.php +++ b/lib/public/Comments/CommentsEntityEvent.php @@ -38,9 +38,9 @@ class CommentsEntityEvent extends Event { /** * @param string $name * @param \Closure $entityExistsFunction The closure should take one - * argument, which is the id of the entity, that comments - * should be handled for. The return should then be bool, - * depending on whether comments are allowed (true) or not. + * argument, which is the id of the entity, that comments + * should be handled for. The return should then be bool, + * depending on whether comments are allowed (true) or not. * @throws \OutOfBoundsException when the entity name is already taken * @since 9.1.0 */ diff --git a/lib/public/Comments/ICommentsManager.php b/lib/public/Comments/ICommentsManager.php index 15a7d8f8cb1..af9d0fe61f0 100644 --- a/lib/public/Comments/ICommentsManager.php +++ b/lib/public/Comments/ICommentsManager.php @@ -85,10 +85,10 @@ interface ICommentsManager { * @param string $objectType the object type, e.g. 'files' * @param string $objectId the id of the object * @param int $limit optional, number of maximum comments to be returned. if - * not specified, all comments are returned. + * not specified, all comments are returned. * @param int $offset optional, starting point * @param \DateTime|null $notOlderThan optional, timestamp of the oldest comments - * that may be returned + * that may be returned * @return list<IComment> * @since 9.0.0 */ @@ -106,7 +106,7 @@ interface ICommentsManager { * @param int $lastKnownCommentId the last known comment (will be used as offset) * @param string $sortDirection direction of the comments (`asc` or `desc`) * @param int $limit optional, number of maximum comments to be returned. if - * set to 0, all comments are returned. + * set to 0, all comments are returned. * @param bool $includeLastKnown * @return list<IComment> * @since 14.0.0 @@ -128,7 +128,7 @@ interface ICommentsManager { * @param int $lastKnownCommentId the last known comment (will be used as offset) * @param string $sortDirection direction of the comments (`asc` or `desc`) * @param int $limit optional, number of maximum comments to be returned. if - * set to 0, all comments are returned. + * set to 0, all comments are returned. * @param bool $includeLastKnown * @return list<IComment> * @since 24.0.0 @@ -175,7 +175,7 @@ interface ICommentsManager { * @param $objectType string the object type, e.g. 'files' * @param $objectId string the id of the object * @param \DateTime|null $notOlderThan optional, timestamp of the oldest comments - * that may be returned + * that may be returned * @param string $verb Limit the verb of the comment - Added in 14.0.0 * @return Int * @since 9.0.0 diff --git a/lib/public/Constants.php b/lib/public/Constants.php index 8326aa6570e..62772d195b2 100644 --- a/lib/public/Constants.php +++ b/lib/public/Constants.php @@ -52,7 +52,7 @@ class Constants { * @since 8.0.0 - Updated in 9.0.0 to allow all POSIX chars since we no * longer support windows as server platform. */ - public const FILENAME_INVALID_CHARS = "\\/"; + public const FILENAME_INVALID_CHARS = '\\/'; /** * @since 21.0.0 – default value for autocomplete/search results limit, diff --git a/lib/public/Contacts/IManager.php b/lib/public/Contacts/IManager.php index f19e72e0763..60abb18b382 100644 --- a/lib/public/Contacts/IManager.php +++ b/lib/public/Contacts/IManager.php @@ -68,14 +68,14 @@ interface IManager { * @param string $pattern which should match within the $searchProperties * @param array $searchProperties defines the properties within the query pattern should match * @param array $options = array() to define the search behavior - * - 'types' boolean (since 15.0.0) If set to true, fields that come with a TYPE property will be an array - * example: ['id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => ['type => 'HOME', 'value' => 'g@h.i']] - * - 'escape_like_param' - If set to false wildcards _ and % are not escaped - * - 'limit' - Set a numeric limit for the search results - * - 'offset' - Set the offset for the limited search results - * - 'enumeration' - (since 23.0.0) Whether user enumeration on system address book is allowed - * - 'fullmatch' - (since 23.0.0) Whether matching on full detail in system address book is allowed - * - 'strict_search' - (since 23.0.0) Whether the search pattern is full string or partial search + * - 'types' boolean (since 15.0.0) If set to true, fields that come with a TYPE property will be an array + * example: ['id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => ['type => 'HOME', 'value' => 'g@h.i']] + * - 'escape_like_param' - If set to false wildcards _ and % are not escaped + * - 'limit' - Set a numeric limit for the search results + * - 'offset' - Set the offset for the limited search results + * - 'enumeration' - (since 23.0.0) Whether user enumeration on system address book is allowed + * - 'fullmatch' - (since 23.0.0) Whether matching on full detail in system address book is allowed + * - 'strict_search' - (since 23.0.0) Whether the search pattern is full string or partial search * @psalm-param array{types?: bool, escape_like_param?: bool, limit?: int, offset?: int, enumeration?: bool, fullmatch?: bool, strict_search?: bool} $options * @return array an array of contacts which are arrays of key-value-pairs * @since 6.0.0 diff --git a/lib/public/DB/QueryBuilder/IExpressionBuilder.php b/lib/public/DB/QueryBuilder/IExpressionBuilder.php index 6df9949cb75..12e30a45071 100644 --- a/lib/public/DB/QueryBuilder/IExpressionBuilder.php +++ b/lib/public/DB/QueryBuilder/IExpressionBuilder.php @@ -51,10 +51,11 @@ interface IExpressionBuilder { * $expr->andX('u.type = ?', 'u.role = ?')); * * @param mixed ...$x Optional clause. Defaults = null, but requires - * at least one defined when converting to string. + * at least one defined when converting to string. * * @return \OCP\DB\QueryBuilder\ICompositeExpression * @since 8.2.0 + * @since 30.0.0 Calling the method without any arguments is deprecated and will throw with the next Doctrine/DBAL update * * @psalm-taint-sink sql $x */ @@ -70,10 +71,11 @@ interface IExpressionBuilder { * $qb->where($qb->expr()->orX('u.type = ?', 'u.role = ?')); * * @param mixed ...$x Optional clause. Defaults = null, but requires - * at least one defined when converting to string. + * at least one defined when converting to string. * * @return \OCP\DB\QueryBuilder\ICompositeExpression * @since 8.2.0 + * @since 30.0.0 Calling the method without any arguments is deprecated and will throw with the next Doctrine/DBAL update * * @psalm-taint-sink sql $x */ @@ -86,7 +88,7 @@ interface IExpressionBuilder { * @param string $operator One of the IExpressionBuilder::* constants. * @param mixed $y The right expression. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string * @since 8.2.0 - Parameter $type was added in 9.0.0 @@ -111,7 +113,7 @@ interface IExpressionBuilder { * @param mixed $x The left expression. * @param mixed $y The right expression. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string * @since 8.2.0 - Parameter $type was added in 9.0.0 @@ -134,7 +136,7 @@ interface IExpressionBuilder { * @param mixed $x The left expression. * @param mixed $y The right expression. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string * @since 8.2.0 - Parameter $type was added in 9.0.0 @@ -157,7 +159,7 @@ interface IExpressionBuilder { * @param mixed $x The left expression. * @param mixed $y The right expression. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string * @since 8.2.0 - Parameter $type was added in 9.0.0 @@ -180,7 +182,7 @@ interface IExpressionBuilder { * @param mixed $x The left expression. * @param mixed $y The right expression. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string * @since 8.2.0 - Parameter $type was added in 9.0.0 @@ -203,7 +205,7 @@ interface IExpressionBuilder { * @param mixed $x The left expression. * @param mixed $y The right expression. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string * @since 8.2.0 - Parameter $type was added in 9.0.0 @@ -226,7 +228,7 @@ interface IExpressionBuilder { * @param mixed $x The left expression. * @param mixed $y The right expression. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string * @since 8.2.0 - Parameter $type was added in 9.0.0 @@ -267,7 +269,7 @@ interface IExpressionBuilder { * @param ILiteral|IParameter|IQueryFunction|string $x Field in string format to be inspected by LIKE() comparison. * @param mixed $y Argument to be used in LIKE() comparison. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string * @since 8.2.0 - Parameter $type was added in 9.0.0 @@ -284,7 +286,7 @@ interface IExpressionBuilder { * @param ILiteral|IParameter|IQueryFunction|string $x Field in string format to be inspected by NOT LIKE() comparison. * @param mixed $y Argument to be used in NOT LIKE() comparison. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string * @since 8.2.0 - Parameter $type was added in 9.0.0 @@ -301,7 +303,7 @@ interface IExpressionBuilder { * @param string $x Field in string format to be inspected by ILIKE() comparison. * @param mixed $y Argument to be used in ILIKE() comparison. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string * @since 9.0.0 @@ -318,7 +320,7 @@ interface IExpressionBuilder { * @param ILiteral|IParameter|IQueryFunction|string $x The field in string format to be inspected by IN() comparison. * @param ILiteral|IParameter|IQueryFunction|string|array $y The placeholder or the array of values to be used by IN() comparison. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string * @since 8.2.0 - Parameter $type was added in 9.0.0 @@ -335,7 +337,7 @@ interface IExpressionBuilder { * @param ILiteral|IParameter|IQueryFunction|string $x The field in string format to be inspected by NOT IN() comparison. * @param ILiteral|IParameter|IQueryFunction|string|array $y The placeholder or the array of values to be used by NOT IN() comparison. * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants - * required when comparing text fields for oci compatibility + * required when comparing text fields for oci compatibility * * @return string * @since 8.2.0 - Parameter $type was added in 9.0.0 diff --git a/lib/public/DB/QueryBuilder/IQueryBuilder.php b/lib/public/DB/QueryBuilder/IQueryBuilder.php index 94ab796adf4..a965e0b5390 100644 --- a/lib/public/DB/QueryBuilder/IQueryBuilder.php +++ b/lib/public/DB/QueryBuilder/IQueryBuilder.php @@ -12,6 +12,7 @@ use Doctrine\DBAL\Connection; use Doctrine\DBAL\ParameterType; use OCP\DB\Exception; use OCP\DB\IResult; +use OCP\IDBConnection; /** * This class provides a wrapper around Doctrine's QueryBuilder @@ -69,7 +70,7 @@ interface IQueryBuilder { * Enable/disable automatic prefixing of table names with the oc_ prefix * * @param bool $enabled If set to true table names will be prefixed with the - * owncloud database prefix automatically. + * owncloud database prefix automatically. * @since 8.2.0 */ public function automaticTablePrefix($enabled); @@ -133,6 +134,8 @@ interface IQueryBuilder { * * @return integer Either QueryBuilder::STATE_DIRTY or QueryBuilder::STATE_CLEAN. * @since 8.2.0 + * @deprecated 30.0.0 This function is going to be removed with the next Doctrine/DBAL update + * and we can not fix this in our wrapper. */ public function getState(); @@ -146,34 +149,37 @@ interface IQueryBuilder { * that interface changed in a breaking way the adapter \OCP\DB\QueryBuilder\IStatement is returned * to bridge old code to the new API * + * @param ?IDBConnection $connection (optional) the connection to run the query against. since 30.0 * @return IResult|int * @throws Exception since 21.0.0 * @since 8.2.0 * @deprecated 22.0.0 Use executeQuery or executeStatement */ - public function execute(); + public function execute(?IDBConnection $connection = null); /** * Execute for select statements * + * @param ?IDBConnection $connection (optional) the connection to run the query against. since 30.0 * @return IResult * @since 22.0.0 * * @throws Exception * @throws \RuntimeException in case of usage with non select query */ - public function executeQuery(): IResult; + public function executeQuery(?IDBConnection $connection = null): IResult; /** * Execute insert, update and delete statements * + * @param ?IDBConnection $connection (optional) the connection to run the query against. since 30.0 * @return int the number of affected rows * @since 22.0.0 * * @throws Exception * @throws \RuntimeException in case of usage with select query */ - public function executeStatement(): int; + public function executeStatement(?IDBConnection $connection = null): int; /** * Gets the complete SQL string formed by the current specifications of this QueryBuilder. @@ -391,8 +397,8 @@ interface IQueryBuilder { * * <code> * $qb = $conn->getQueryBuilder() - * ->delete('users', 'u') - * ->where('u.id = :user_id'); + * ->delete('users') + * ->where('id = :user_id'); * ->setParameter(':user_id', 1); * </code> * @@ -401,6 +407,7 @@ interface IQueryBuilder { * * @return $this This QueryBuilder instance. * @since 8.2.0 + * @since 30.0.0 Alias is deprecated and will no longer be used with the next Doctrine/DBAL update * * @psalm-taint-sink sql $delete */ @@ -412,9 +419,10 @@ interface IQueryBuilder { * * <code> * $qb = $conn->getQueryBuilder() - * ->update('users', 'u') - * ->set('u.password', md5('password')) - * ->where('u.id = ?'); + * ->update('users') + * ->set('email', ':email') + * ->where('id = :user_id'); + * ->setParameter(':user_id', 1); * </code> * * @param string $update The table whose rows are subject to the update. @@ -422,6 +430,7 @@ interface IQueryBuilder { * * @return $this This QueryBuilder instance. * @since 8.2.0 + * @since 30.0.0 Alias is deprecated and will no longer be used with the next Doctrine/DBAL update * * @psalm-taint-sink sql $update */ @@ -532,12 +541,13 @@ interface IQueryBuilder { * </code> * * @param string $fromAlias The alias that points to a from clause. - * @param string $join The table name to join. + * @param string|IQueryFunction $join The table name to join. * @param string $alias The alias of the join table. * @param string|ICompositeExpression|null $condition The condition for the join. * * @return $this This QueryBuilder instance. * @since 8.2.0 + * @since 30.0.0 Allow passing IQueryFunction as parameter for `$join` to allow join with a sub-query. * * @psalm-taint-sink sql $fromAlias * @psalm-taint-sink sql $join @@ -605,9 +615,10 @@ interface IQueryBuilder { * // You can optionally programmatically build and/or expressions * $qb = $conn->getQueryBuilder(); * - * $or = $qb->expr()->orx(); - * $or->add($qb->expr()->eq('u.id', 1)); - * $or->add($qb->expr()->eq('u.id', 2)); + * $or = $qb->expr()->orx( + * $qb->expr()->eq('u.id', 1), + * $qb->expr()->eq('u.id', 2), + * ); * * $qb->update('users', 'u') * ->set('u.password', md5('password')) @@ -833,6 +844,8 @@ interface IQueryBuilder { * * @return mixed * @since 8.2.0 + * @deprecated 30.0.0 This function is going to be removed with the next Doctrine/DBAL update + * and we can not fix this in our wrapper. Please track the details you need, outside the object. */ public function getQueryPart($queryPartName); @@ -841,6 +854,8 @@ interface IQueryBuilder { * * @return array * @since 8.2.0 + * @deprecated 30.0.0 This function is going to be removed with the next Doctrine/DBAL update + * and we can not fix this in our wrapper. Please track the details you need, outside the object. */ public function getQueryParts(); @@ -851,6 +866,8 @@ interface IQueryBuilder { * * @return $this This QueryBuilder instance. * @since 8.2.0 + * @deprecated 30.0.0 This function is going to be removed with the next Doctrine/DBAL update + * and we can not fix this in our wrapper. Please create a new IQueryBuilder instead. */ public function resetQueryParts($queryPartNames = null); @@ -861,6 +878,8 @@ interface IQueryBuilder { * * @return $this This QueryBuilder instance. * @since 8.2.0 + * @deprecated 30.0.0 This function is going to be removed with the next Doctrine/DBAL update + * and we can not fix this in our wrapper. Please create a new IQueryBuilder instead. */ public function resetQueryPart($queryPartName); @@ -983,15 +1002,27 @@ interface IQueryBuilder { public function getLastInsertId(): int; /** - * Returns the table name quoted and with database prefix as needed by the implementation + * Returns the table name quoted and with database prefix as needed by the implementation. + * If a query function is passed the function is casted to string, + * this allows passing functions as sub-queries for join expression. * * @param string|IQueryFunction $table * @return string * @since 9.0.0 + * @since 24.0.0 accepts IQueryFunction as parameter */ public function getTableName($table); /** + * Returns the table name with database prefix as needed by the implementation + * + * @param string $table + * @return string + * @since 30.0.0 + */ + public function prefixTableName(string $table): string; + + /** * Returns the column name quoted and with table alias prefix as needed by the implementation * * @param string $column @@ -1000,4 +1031,30 @@ interface IQueryBuilder { * @since 9.0.0 */ public function getColumnName($column, $tableAlias = ''); + + /** + * Provide a hint for the shard key for queries where this can't be detected otherwise + * + * @param string $column + * @param mixed $value + * @return $this + * @since 30.0.0 + */ + public function hintShardKey(string $column, mixed $value, bool $overwrite = false): self; + + /** + * Set the query to run across all shards if sharding is enabled. + * + * @return $this + * @since 30.0.0 + */ + public function runAcrossAllShards(): self; + + /** + * Get a list of column names that are expected in the query output + * + * @return array + * @since 30.0.0 + */ + public function getOutputColumns(): array; } diff --git a/lib/public/DB/QueryBuilder/Sharded/IShardMapper.php b/lib/public/DB/QueryBuilder/Sharded/IShardMapper.php new file mode 100644 index 00000000000..fa00fb68719 --- /dev/null +++ b/lib/public/DB/QueryBuilder/Sharded/IShardMapper.php @@ -0,0 +1,25 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Robin Appelman <robin@icewind.nl> + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OCP\DB\QueryBuilder\Sharded; + +/** + * Implementation of logic of mapping shard keys to shards. + * @since 30.0.0 + */ +interface IShardMapper { + /** + * Get the shard number for a given shard key and total shard count + * + * @param int $key + * @param int $count + * @return int + * @since 30.0.0 + */ + public function getShardForKey(int $key, int $count): int; +} diff --git a/lib/public/Dashboard/IIconWidget.php b/lib/public/Dashboard/IIconWidget.php index c6cfd03e0ff..203a89279b0 100644 --- a/lib/public/Dashboard/IIconWidget.php +++ b/lib/public/Dashboard/IIconWidget.php @@ -14,7 +14,9 @@ namespace OCP\Dashboard; */ interface IIconWidget extends IWidget { /** - * Get the absolute url for the widget icon + * Get the absolute url for the widget icon (should be colored black or not have a color) + * + * The icon will be inverted automatically in mobile clients and when using dark mode * * @return string * @since 25.0.0 diff --git a/lib/public/Dashboard/IWidget.php b/lib/public/Dashboard/IWidget.php index 134758f02c6..c6bac98cae2 100644 --- a/lib/public/Dashboard/IWidget.php +++ b/lib/public/Dashboard/IWidget.php @@ -15,7 +15,12 @@ namespace OCP\Dashboard; */ interface IWidget { /** - * @return string Unique id that identifies the widget, e.g. the app id + * Get a unique identifier for the widget + * + * To ensure uniqueness, it is recommended to user the app id or start with the + * app id followed by a dash. + * + * @return string Unique id that identifies the widget, e.g. the app id. Only use alphanumeric characters, dash and underscore * @since 20.0.0 */ public function getId(): string; @@ -33,6 +38,13 @@ interface IWidget { public function getOrder(): int; /** + * CSS class that shows the widget icon (should be colored black or not have a color) + * + * The icon will be inverted automatically in mobile clients and when using dark mode. + * Therefore, it is NOT recommended to use a css class that sets the background with: + * `var(--icon-…)` as those will adapt to dark/bright mode in the web and still be inverted + * resulting in a dark icon on dark background. + * * @return string css class that displays an icon next to the widget title * @since 20.0.0 */ diff --git a/lib/public/Encryption/IEncryptionModule.php b/lib/public/Encryption/IEncryptionModule.php index 2c3f33847c9..fbac291c1b9 100644 --- a/lib/public/Encryption/IEncryptionModule.php +++ b/lib/public/Encryption/IEncryptionModule.php @@ -42,8 +42,8 @@ interface IEncryptionModule { * @param array $accessList who has access to the file contains the key 'users' and 'public' * * @return array $header contain data as key-value pairs which should be - * written to the header, in case of a write operation - * or if no additional data is needed return a empty array + * written to the header, in case of a write operation + * or if no additional data is needed return a empty array * @since 8.1.0 */ public function begin($path, $user, $mode, array $header, array $accessList); diff --git a/lib/public/Files.php b/lib/public/Files.php index d176c2f2a7b..62c41c4ada1 100644 --- a/lib/public/Files.php +++ b/lib/public/Files.php @@ -30,7 +30,7 @@ class Files { * Get the mimetype form a local file * @param string $path * @return string - * does NOT work for ownClouds filesystem, use OC_FileSystem::getMimeType instead + * does NOT work for ownClouds filesystem, use OC_FileSystem::getMimeType instead * @since 5.0.0 * @deprecated 14.0.0 */ diff --git a/lib/public/Files/Cache/ICache.php b/lib/public/Files/Cache/ICache.php index 6a64fc26386..bb5608e8480 100644 --- a/lib/public/Files/Cache/ICache.php +++ b/lib/public/Files/Cache/ICache.php @@ -219,7 +219,7 @@ interface ICache { * search for files by mimetype * * @param string $mimetype either a full mimetype to search ('text/plain') or only the first part of a mimetype ('image') - * where it will search for all mimetypes in the group ('image/*') + * where it will search for all mimetypes in the group ('image/*') * @return ICacheEntry[] an array of cache entries where the mimetype matches the search * @since 9.0.0 * @deprecated 9.0.0 due to lack of pagination, not all backends might implement this diff --git a/lib/public/Files/FileInfo.php b/lib/public/Files/FileInfo.php index 468013ac271..f9957f580e8 100644 --- a/lib/public/Files/FileInfo.php +++ b/lib/public/Files/FileInfo.php @@ -133,7 +133,9 @@ interface FileInfo { public function getId(); /** - * Check whether the file is encrypted + * Check whether the node is encrypted. + * If it is a file, then it is server side encrypted. + * If it is a folder, then it is end-to-end encrypted. * * @return bool * @since 7.0.0 diff --git a/lib/public/Files/ForbiddenException.php b/lib/public/Files/ForbiddenException.php index 338757e79eb..514ef8623d3 100644 --- a/lib/public/Files/ForbiddenException.php +++ b/lib/public/Files/ForbiddenException.php @@ -35,6 +35,6 @@ class ForbiddenException extends \Exception { * @since 9.0.0 */ public function getRetry() { - return (bool) $this->retry; + return (bool)$this->retry; } } diff --git a/lib/public/Files/IFilenameValidator.php b/lib/public/Files/IFilenameValidator.php new file mode 100644 index 00000000000..2bd3bb945dc --- /dev/null +++ b/lib/public/Files/IFilenameValidator.php @@ -0,0 +1,39 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Files; + +/** + * @since 30.0.0 + */ +interface IFilenameValidator { + + /** + * It is recommended to use `\OCP\Files\Storage\IStorage::isFileValid` instead as this + * only checks if the filename is valid in general but not for a specific storage + * which might have additional naming rules. + * + * @param string $filename The filename to check for validity + * @return bool + * @since 30.0.0 + */ + public function isFilenameValid(string $filename): bool; + + /** + * It is recommended to use `\OCP\Files\Storage\IStorage::isFileValid` instead as this + * only checks if the filename is valid in general but not for a specific storage + * which might have additional naming rules. + * + * This will validate a filename and throw an exception with details on error. + * + * @param string $filename The filename to check for validity + * @throws \OCP\Files\InvalidPathException or one of its child classes in case of an error + * @since 30.0.0 + */ + public function validateFilename(string $filename): void; +} diff --git a/lib/public/Files/LockNotAcquiredException.php b/lib/public/Files/LockNotAcquiredException.php index 19e0bbc2543..93d861c248f 100644 --- a/lib/public/Files/LockNotAcquiredException.php +++ b/lib/public/Files/LockNotAcquiredException.php @@ -35,6 +35,6 @@ class LockNotAcquiredException extends \Exception { * @since 7.0.0 */ public function __toString(): string { - return __CLASS__ . ": [{$this->code}]: {$this->message}\n"; + return self::class . ": [{$this->code}]: {$this->message}\n"; } } diff --git a/lib/public/Files/Storage/ISharedStorage.php b/lib/public/Files/Storage/ISharedStorage.php new file mode 100644 index 00000000000..836c4aefcdb --- /dev/null +++ b/lib/public/Files/Storage/ISharedStorage.php @@ -0,0 +1,26 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Files\Storage; + +use OCP\Share\IShare; + +/** + * Interface for a storage that is based on a file share + * + * @since 30.0.0 + */ +interface ISharedStorage extends IStorage { + /** + * The the associated share + * + * @return IShare + * @since 30.0.0 + */ + public function getShare(): IShare; +} diff --git a/lib/public/Files/Storage/IStorageFactory.php b/lib/public/Files/Storage/IStorageFactory.php index 7c207ca9f0a..e0ec3128876 100644 --- a/lib/public/Files/Storage/IStorageFactory.php +++ b/lib/public/Files/Storage/IStorageFactory.php @@ -22,7 +22,7 @@ interface IStorageFactory { * @param string $wrapperName * @param callable $callback * @return bool true if the wrapper was added, false if there was already a wrapper with this - * name registered + * name registered * @since 8.0.0 */ public function addStorageWrapper($wrapperName, $callback); diff --git a/lib/public/Files/Template/BeforeGetTemplatesEvent.php b/lib/public/Files/Template/BeforeGetTemplatesEvent.php new file mode 100644 index 00000000000..006163c5f7f --- /dev/null +++ b/lib/public/Files/Template/BeforeGetTemplatesEvent.php @@ -0,0 +1,40 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OCP\Files\Template; + +use OCP\EventDispatcher\Event; + +/** + * @since 30.0.0 + */ +class BeforeGetTemplatesEvent extends Event { + /** @var array<Template> */ + private array $templates; + + /** + * @param array<Template> $templates + * + * @since 30.0.0 + */ + public function __construct(array $templates) { + parent::__construct(); + + $this->templates = $templates; + } + + /** + * @return array<Template> + * + * @since 30.0.0 + */ + public function getTemplates(): array { + return $this->templates; + } +} diff --git a/lib/public/Files/Template/Field.php b/lib/public/Files/Template/Field.php new file mode 100644 index 00000000000..dd65ef857ea --- /dev/null +++ b/lib/public/Files/Template/Field.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\Template; + +/** + * @since 30.0.0 + */ +abstract class Field implements \JsonSerializable { + public ?string $alias = null; + public ?string $tag = null; + public ?int $id = null; + + /** + * @since 30.0.0 + */ + public function __construct( + private string $index, + private FieldType $type + ) { + } + + /** + * @since 30.0.0 + */ + abstract public function setValue(mixed $value): void; + + /** + * @since 30.0.0 + */ + public function jsonSerialize(): array { + return [ + 'index' => $this->index, + 'type' => $this->type->value, + 'alias' => $this->alias, + 'tag' => $this->tag, + 'id' => $this->id, + ]; + } +} diff --git a/lib/public/Files/Template/FieldFactory.php b/lib/public/Files/Template/FieldFactory.php new file mode 100644 index 00000000000..4c0fff6b46f --- /dev/null +++ b/lib/public/Files/Template/FieldFactory.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\Files\Template; + +use OCP\Files\Template\Fields\CheckBoxField; +use OCP\Files\Template\Fields\RichTextField; + +/** + * @since 30.0.0 + */ +class FieldFactory { + /** + * @since 30.0.0 + */ + public static function createField( + string $index, + FieldType $type + ): Field { + return match ($type) { + FieldType::RichText => new RichTextField($index, $type), + FieldType::CheckBox => new CheckBoxField($index, $type), + default => throw new InvalidFieldTypeException(), + }; + } +} diff --git a/lib/public/Files/Template/FieldType.php b/lib/public/Files/Template/FieldType.php new file mode 100644 index 00000000000..2d059cadc17 --- /dev/null +++ b/lib/public/Files/Template/FieldType.php @@ -0,0 +1,19 @@ +<?php + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OCP\Files\Template; + +/** + * @since 30.0.0 + */ +enum FieldType: string { + case RichText = 'rich-text'; + case CheckBox = 'checkbox'; + case DropDownList = 'drop-down-list'; + case Picture = 'picture'; + case Date = 'date'; +} diff --git a/lib/public/Files/Template/Fields/CheckBoxField.php b/lib/public/Files/Template/Fields/CheckBoxField.php new file mode 100644 index 00000000000..48ccb04336a --- /dev/null +++ b/lib/public/Files/Template/Fields/CheckBoxField.php @@ -0,0 +1,47 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OCP\Files\Template\Fields; + +use OCP\Files\Template\Field; +use OCP\Files\Template\FieldType; + +/** + * @since 30.0.0 + */ +class CheckBoxField extends Field { + private bool $checked = false; + + /** + * @since 30.0.0 + */ + public function __construct(string $index, FieldType $type) { + parent::__construct($index, $type); + } + + /** + * @since 30.0.0 + */ + public function setValue(mixed $value): void { + if (!is_bool($value)) { + throw new \Exception('Invalid value for checkbox field type'); + } + + $this->checked = $value; + } + + /** + * @since 30.0.0 + */ + public function jsonSerialize(): array { + $jsonProperties = parent::jsonSerialize(); + + return array_merge($jsonProperties, ['checked' => $this->checked]); + } +} diff --git a/lib/public/Files/Template/Fields/RichTextField.php b/lib/public/Files/Template/Fields/RichTextField.php new file mode 100644 index 00000000000..14539bc9dbd --- /dev/null +++ b/lib/public/Files/Template/Fields/RichTextField.php @@ -0,0 +1,47 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OCP\Files\Template\Fields; + +use OCP\Files\Template\Field; +use OCP\Files\Template\FieldType; + +/** + * @since 30.0.0 + */ +class RichTextField extends Field { + private string $content = ''; + + /** + * @since 30.0.0 + */ + public function __construct(string $index, FieldType $type) { + parent::__construct($index, $type); + } + + /** + * @since 30.0.0 + */ + public function setValue(mixed $value): void { + if (!is_string($value)) { + throw new \Exception('Invalid value for rich-text field type'); + } + + $this->content = $value; + } + + /** + * @since 30.0.0 + */ + public function jsonSerialize(): array { + $jsonProperties = parent::jsonSerialize(); + + return array_merge($jsonProperties, ['content' => $this->content]); + } +} diff --git a/lib/public/Files/Template/FileCreatedFromTemplateEvent.php b/lib/public/Files/Template/FileCreatedFromTemplateEvent.php index ed585504f70..0636d1dc251 100644 --- a/lib/public/Files/Template/FileCreatedFromTemplateEvent.php +++ b/lib/public/Files/Template/FileCreatedFromTemplateEvent.php @@ -17,15 +17,17 @@ use OCP\Files\File; class FileCreatedFromTemplateEvent extends Event { private $template; private $target; + private $templateFields; /** * @param File|null $template * @param File $target * @since 21.0.0 */ - public function __construct(?File $template, File $target) { + public function __construct(?File $template, File $target, array $templateFields) { $this->template = $template; $this->target = $target; + $this->templateFields = $templateFields; } /** @@ -37,6 +39,14 @@ class FileCreatedFromTemplateEvent extends Event { } /** + * @return array + * @since 30.0.0 + */ + public function getTemplateFields(): array { + return $this->templateFields; + } + + /** * @return File * @since 21.0.0 */ diff --git a/lib/public/Files/Template/ITemplateManager.php b/lib/public/Files/Template/ITemplateManager.php index 5adcc0ded25..94e0db935e7 100644 --- a/lib/public/Files/Template/ITemplateManager.php +++ b/lib/public/Files/Template/ITemplateManager.php @@ -67,9 +67,11 @@ interface ITemplateManager { /** * @param string $filePath * @param string $templateId + * @param string $templateType + * @param array $templateFields Since 30.0.0 * @return array * @throws GenericFileException * @since 21.0.0 */ - public function createFromTemplate(string $filePath, string $templateId = '', string $templateType = 'user'): array; + public function createFromTemplate(string $filePath, string $templateId = '', string $templateType = 'user', array $templateFields = []): array; } diff --git a/lib/public/Files/Template/InvalidFieldTypeException.php b/lib/public/Files/Template/InvalidFieldTypeException.php new file mode 100644 index 00000000000..a0c5297526c --- /dev/null +++ b/lib/public/Files/Template/InvalidFieldTypeException.php @@ -0,0 +1,15 @@ +<?php + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OCP\Files\Template; + +/** + * Exception for invalid template field type + * @since 30.0.0 + */ +class InvalidFieldTypeException extends \Exception { +} diff --git a/lib/public/Files/Template/Template.php b/lib/public/Files/Template/Template.php index 94f5cec268f..634935d212e 100644 --- a/lib/public/Files/Template/Template.php +++ b/lib/public/Files/Template/Template.php @@ -24,6 +24,8 @@ final class Template implements \JsonSerializable { private $hasPreview = false; /** @var string|null */ private $previewUrl = null; + /** @var array */ + private $fields = []; /** * @since 21.0.0 @@ -49,6 +51,13 @@ final class Template implements \JsonSerializable { } /** + * @since 30.0.0 + */ + public function setFields(array $fields): void { + $this->fields = $fields; + } + + /** * @since 21.0.0 */ public function jsonSerialize(): array { @@ -64,7 +73,8 @@ final class Template implements \JsonSerializable { 'size' => $this->file->getSize(), 'type' => $this->file->getType(), 'hasPreview' => $this->hasPreview, - 'previewUrl' => $this->previewUrl + 'previewUrl' => $this->previewUrl, + 'fields' => $this->fields ]; } } diff --git a/lib/public/Group/Backend/ABackend.php b/lib/public/Group/Backend/ABackend.php index 83fdcfaaa33..95af1b85d9b 100644 --- a/lib/public/Group/Backend/ABackend.php +++ b/lib/public/Group/Backend/ABackend.php @@ -64,7 +64,7 @@ abstract class ABackend implements GroupInterface, IBatchMethodsBackend { */ public function getGroupsDetails(array $gids): array { if (!($this instanceof IGroupDetailsBackend || $this->implementsActions(GroupInterface::GROUP_DETAILS))) { - throw new \Exception("Should not have been called"); + throw new \Exception('Should not have been called'); } /** @var IGroupDetailsBackend $this */ $groupData = []; diff --git a/lib/public/Group/Backend/ISearchableGroupBackend.php b/lib/public/Group/Backend/ISearchableGroupBackend.php index 900330da22d..e9909fcdba0 100644 --- a/lib/public/Group/Backend/ISearchableGroupBackend.php +++ b/lib/public/Group/Backend/ISearchableGroupBackend.php @@ -24,11 +24,11 @@ interface ISearchableGroupBackend { * $users = $groupBackend->searchInGroup('admin', 'John', 10, 0); * </code> * - * @param string $gid The group id of the user we want to search + * @param string $gid The group id of the user we want to search * @param string $search The part of the display name or user id of the users we * want to search. This can be empty to get all the users. - * @param int $limit The limit of results - * @param int $offset The offset of the results + * @param int $limit The limit of results + * @param int $offset The offset of the results * @return array<string,IUser> Users indexed by uid * @since 27.0.0 */ diff --git a/lib/public/HintException.php b/lib/public/HintException.php index f9bacbd5887..6d9684bddea 100644 --- a/lib/public/HintException.php +++ b/lib/public/HintException.php @@ -21,12 +21,12 @@ class HintException extends \Exception { * HintException constructor. * * @since 23.0.0 - * @param string $message The error message. It will be not revealed to the - * the user (unless the hint is empty) and thus - * should be not translated. - * @param string $hint A useful message that is presented to the end - * user. It should be translated, but must not - * contain sensitive data. + * @param string $message The error message. It will be not revealed to the + * the user (unless the hint is empty) and thus + * should be not translated. + * @param string $hint A useful message that is presented to the end + * user. It should be translated, but must not + * contain sensitive data. * @param int $code * @param \Exception|null $previous */ @@ -43,7 +43,7 @@ class HintException extends \Exception { * @return string */ public function __toString(): string { - return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n"; + return self::class . ": [{$this->code}]: {$this->message} ({$this->hint})\n"; } /** diff --git a/lib/public/Http/Client/IClient.php b/lib/public/Http/Client/IClient.php index 995a68f23bc..ad4c018ab7b 100644 --- a/lib/public/Http/Client/IClient.php +++ b/lib/public/Http/Client/IClient.php @@ -18,26 +18,26 @@ interface IClient { * Sends a GET request * @param string $uri * @param array $options Array such as - * 'query' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, + * 'query' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, * @return IResponse * @throws \Exception If the request could not get completed * @since 8.1.0 @@ -48,21 +48,21 @@ interface IClient { * Sends a HEAD request * @param string $uri * @param array $options Array such as - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, * @return IResponse * @throws \Exception If the request could not get completed * @since 8.1.0 @@ -73,26 +73,26 @@ interface IClient { * Sends a POST request * @param string $uri * @param array $options Array such as - * 'body' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, * @return IResponse * @throws \Exception If the request could not get completed * @since 8.1.0 @@ -103,26 +103,26 @@ interface IClient { * Sends a PUT request * @param string $uri * @param array $options Array such as - * 'body' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, * @return IResponse * @throws \Exception If the request could not get completed * @since 8.1.0 @@ -133,26 +133,26 @@ interface IClient { * Sends a PATCH request * @param string $uri * @param array $options Array such as - * 'body' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, * @return IResponse * @throws \Exception If the request could not get completed * @since 29.0.0 @@ -163,26 +163,26 @@ interface IClient { * Sends a DELETE request * @param string $uri * @param array $options Array such as - * 'body' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, * @return IResponse * @throws \Exception If the request could not get completed * @since 8.1.0 @@ -193,26 +193,26 @@ interface IClient { * Sends an OPTIONS request * @param string $uri * @param array $options Array such as - * 'body' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, * @return IResponse * @throws \Exception If the request could not get completed * @since 8.1.0 @@ -234,26 +234,26 @@ interface IClient { * @param string $method The HTTP method to use * @param string $uri * @param array $options Array such as - * 'query' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, + * 'query' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, * @return IResponse * @throws \Exception If the request could not get completed * @since 29.0.0 @@ -264,26 +264,26 @@ interface IClient { * Sends an asynchronous GET request * @param string $uri * @param array $options Array such as - * 'query' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, + * 'query' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, * @return IPromise * @since 28.0.0 */ @@ -293,21 +293,21 @@ interface IClient { * Sends an asynchronous HEAD request * @param string $uri * @param array $options Array such as - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, * @return IPromise * @since 28.0.0 */ @@ -317,26 +317,26 @@ interface IClient { * Sends an asynchronous POST request * @param string $uri * @param array $options Array such as - * 'body' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, * @return IPromise * @since 28.0.0 */ @@ -346,26 +346,26 @@ interface IClient { * Sends an asynchronous PUT request * @param string $uri * @param array $options Array such as - * 'body' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, * @return IPromise * @since 28.0.0 */ @@ -375,26 +375,26 @@ interface IClient { * Sends an asynchronous DELETE request * @param string $uri * @param array $options Array such as - * 'body' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, * @return IPromise * @since 28.0.0 */ @@ -404,26 +404,26 @@ interface IClient { * Sends an asynchronous OPTIONS request * @param string $uri * @param array $options Array such as - * 'body' => [ - * 'field' => 'abc', - * 'other_field' => '123', - * 'file_name' => fopen('/path/to/file', 'r'), - * ], - * 'headers' => [ - * 'foo' => 'bar', - * ], - * 'cookies' => [ - * 'foo' => 'bar', - * ], - * 'allow_redirects' => [ - * 'max' => 10, // allow at most 10 redirects. - * 'strict' => true, // use "strict" RFC compliant redirects. - * 'referer' => true, // add a Referer header - * 'protocols' => ['https'] // only allow https URLs - * ], - * 'sink' => '/path/to/file', // save to a file or a stream - * 'verify' => true, // bool or string to CA file - * 'debug' => true, + * 'body' => [ + * 'field' => 'abc', + * 'other_field' => '123', + * 'file_name' => fopen('/path/to/file', 'r'), + * ], + * 'headers' => [ + * 'foo' => 'bar', + * ], + * 'cookies' => [ + * 'foo' => 'bar', + * ], + * 'allow_redirects' => [ + * 'max' => 10, // allow at most 10 redirects. + * 'strict' => true, // use "strict" RFC compliant redirects. + * 'referer' => true, // add a Referer header + * 'protocols' => ['https'] // only allow https URLs + * ], + * 'sink' => '/path/to/file', // save to a file or a stream + * 'verify' => true, // bool or string to CA file + * 'debug' => true, * @return IPromise * @since 28.0.0 */ diff --git a/lib/public/Http/Client/IPromise.php b/lib/public/Http/Client/IPromise.php index 7abbd7227d7..8778829af0e 100644 --- a/lib/public/Http/Client/IPromise.php +++ b/lib/public/Http/Client/IPromise.php @@ -34,7 +34,7 @@ interface IPromise { * a new promise resolving to the return value of the called handler. * * @param ?callable(IResponse): void $onFulfilled Invoked when the promise fulfills. Gets an \OCP\Http\Client\IResponse passed in as argument - * @param ?callable(Exception): void $onRejected Invoked when the promise is rejected. Gets an \Exception passed in as argument + * @param ?callable(Exception): void $onRejected Invoked when the promise is rejected. Gets an \Exception passed in as argument * * @return IPromise * @since 28.0.0 @@ -76,7 +76,7 @@ interface IPromise { * @return mixed * * @throws LogicException if the promise has no wait function or if the - * promise does not settle after waiting. + * promise does not settle after waiting. * @since 28.0.0 */ public function wait(bool $unwrap = true): mixed; diff --git a/lib/public/IAddressBook.php b/lib/public/IAddressBook.php index 479e421d700..780b005fe8d 100644 --- a/lib/public/IAddressBook.php +++ b/lib/public/IAddressBook.php @@ -37,19 +37,19 @@ namespace OCP { * @param string $pattern which should match within the $searchProperties * @param array $searchProperties defines the properties within the query pattern should match * @param array $options Options to define the output format and search behavior - * - 'types' boolean (since 15.0.0) If set to true, fields that come with a TYPE property will be an array - * example: ['id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => ['type => 'HOME', 'value' => 'g@h.i']] - * - 'escape_like_param' - If set to false wildcards _ and % are not escaped - * - 'limit' - Set a numeric limit for the search results - * - 'offset' - Set the offset for the limited search results - * - 'wildcard' - (since 23.0.0) Whether the search should use wildcards + * - 'types' boolean (since 15.0.0) If set to true, fields that come with a TYPE property will be an array + * example: ['id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => ['type => 'HOME', 'value' => 'g@h.i']] + * - 'escape_like_param' - If set to false wildcards _ and % are not escaped + * - 'limit' - Set a numeric limit for the search results + * - 'offset' - Set the offset for the limited search results + * - 'wildcard' - (since 23.0.0) Whether the search should use wildcards * @psalm-param array{types?: bool, escape_like_param?: bool, limit?: int, offset?: int, wildcard?: bool} $options * @return array an array of contacts which are arrays of key-value-pairs - * example result: - * [ - * ['id' => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c', 'GEO' => '37.386013;-122.082932'], - * ['id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => ['d@e.f', 'g@h.i']] - * ] + * example result: + * [ + * ['id' => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c', 'GEO' => '37.386013;-122.082932'], + * ['id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => ['d@e.f', 'g@h.i']] + * ] * @since 5.0.0 */ public function search($pattern, $searchProperties, $options); diff --git a/lib/public/ICache.php b/lib/public/ICache.php index ba6016c8d28..5e755d81e14 100644 --- a/lib/public/ICache.php +++ b/lib/public/ICache.php @@ -16,6 +16,11 @@ namespace OCP; */ interface ICache { /** + * @since 30.0.0 + */ + public const DEFAULT_TTL = 24 * 60 * 60; + + /** * Get a value from the user cache * @param string $key * @return mixed diff --git a/lib/public/IConfig.php b/lib/public/IConfig.php index b7feabd0ef5..3bc64c5e133 100644 --- a/lib/public/IConfig.php +++ b/lib/public/IConfig.php @@ -206,9 +206,9 @@ interface IConfig { * @param string $userId the userId of the user that we want to get all values from * @psalm-return array<string, array<string, string>> * @return array[] - 2 dimensional array with the following structure: - * [ $appId => - * [ $key => $value ] - * ] + * [ $appId => + * [ $key => $value ] + * ] * @since 24.0.0 */ public function getAllUserValues(string $userId): array; @@ -245,7 +245,8 @@ interface IConfig { * @param string $appName the app to get the user for * @param string $key the key to get the user for * @param string $value the value to get the user for - * @return array of user IDs + * @return list<string> of user IDs + * @since 31.0.0 return type of `list<string>` * @since 8.0.0 */ public function getUsersForUserValue($appName, $key, $value); diff --git a/lib/public/IDBConnection.php b/lib/public/IDBConnection.php index a5df85896e2..36369732b64 100644 --- a/lib/public/IDBConnection.php +++ b/lib/public/IDBConnection.php @@ -11,6 +11,8 @@ namespace OCP; use Doctrine\DBAL\Schema\Schema; +use OC\DB\QueryBuilder\Sharded\CrossShardMoveHelper; +use OC\DB\QueryBuilder\Sharded\ShardDefinition; use OCP\DB\Exception; use OCP\DB\IPreparedStatement; use OCP\DB\IResult; @@ -134,8 +136,8 @@ interface IDBConnection { * @param string $table The table name (will replace *PREFIX* with the actual prefix) * @param array $input data that should be inserted into the table (column name => value) * @param array|null $compare List of values that should be checked for "if not exists" - * If this is null or an empty array, all keys of $input will be compared - * Please note: text fields (clob) must not be used in the compare array + * If this is null or an empty array, all keys of $input will be compared + * Please note: text fields (clob) must not be used in the compare array * @return int number of inserted rows * @throws Exception used to be the removed dbal exception, since 21.0.0 it's \OCP\DB\Exception * @since 6.0.0 - parameter $compare was added in 8.1.0, return type changed from boolean in 8.1.0 @@ -278,6 +280,7 @@ interface IDBConnection { * * @return \Doctrine\DBAL\Platforms\AbstractPlatform The database platform. * @since 8.0.0 + * @deprecated 30.0.0 Please use {@see self::getDatabaseProvider()} and compare to self::PLATFORM_* constants */ public function getDatabasePlatform(); @@ -341,7 +344,24 @@ interface IDBConnection { * Returns the database provider name * @link https://github.com/nextcloud/server/issues/30877 * @since 28.0.0 - * @return IDBConnection::PLATFORM_* + * @return self::PLATFORM_MYSQL|self::PLATFORM_ORACLE|self::PLATFORM_POSTGRES|self::PLATFORM_SQLITE */ public function getDatabaseProvider(): string; + + /** + * Get the shard definition by name, if configured + * + * @param string $name + * @return ShardDefinition|null + * @since 30.0.0 + */ + public function getShardDefinition(string $name): ?ShardDefinition; + + /** + * Get a helper class for implementing cross-shard moves + * + * @return CrossShardMoveHelper + * @since 30.0.0 + */ + public function getCrossShardMoveHelper(): CrossShardMoveHelper; } diff --git a/lib/public/IDateTimeFormatter.php b/lib/public/IDateTimeFormatter.php index 06dc9d41f81..2d47e1182c2 100644 --- a/lib/public/IDateTimeFormatter.php +++ b/lib/public/IDateTimeFormatter.php @@ -16,15 +16,15 @@ interface IDateTimeFormatter { /** * Formats the date of the given timestamp * - * @param int|\DateTime $timestamp - * @param string $format Either 'full', 'long', 'medium' or 'short' - * full: e.g. 'EEEE, MMMM d, y' => 'Wednesday, August 20, 2014' - * long: e.g. 'MMMM d, y' => 'August 20, 2014' - * medium: e.g. 'MMM d, y' => 'Aug 20, 2014' - * short: e.g. 'M/d/yy' => '8/20/14' - * The exact format is dependent on the language - * @param \DateTimeZone|null $timeZone The timezone to use - * @param \OCP\IL10N|null $l The locale to use + * @param int|\DateTime $timestamp + * @param string $format Either 'full', 'long', 'medium' or 'short' + * full: e.g. 'EEEE, MMMM d, y' => 'Wednesday, August 20, 2014' + * long: e.g. 'MMMM d, y' => 'August 20, 2014' + * medium: e.g. 'MMM d, y' => 'Aug 20, 2014' + * short: e.g. 'M/d/yy' => '8/20/14' + * The exact format is dependent on the language + * @param \DateTimeZone|null $timeZone The timezone to use + * @param \OCP\IL10N|null $l The locale to use * @return string Formatted date string * @since 8.0.0 */ @@ -33,16 +33,16 @@ interface IDateTimeFormatter { /** * Formats the date of the given timestamp * - * @param int|\DateTime $timestamp - * @param string $format Either 'full', 'long', 'medium' or 'short' - * full: e.g. 'EEEE, MMMM d, y' => 'Wednesday, August 20, 2014' - * long: e.g. 'MMMM d, y' => 'August 20, 2014' - * medium: e.g. 'MMM d, y' => 'Aug 20, 2014' - * short: e.g. 'M/d/yy' => '8/20/14' - * The exact format is dependent on the language - * Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable - * @param \DateTimeZone|null $timeZone The timezone to use - * @param \OCP\IL10N|null $l The locale to use + * @param int|\DateTime $timestamp + * @param string $format Either 'full', 'long', 'medium' or 'short' + * full: e.g. 'EEEE, MMMM d, y' => 'Wednesday, August 20, 2014' + * long: e.g. 'MMMM d, y' => 'August 20, 2014' + * medium: e.g. 'MMM d, y' => 'Aug 20, 2014' + * short: e.g. 'M/d/yy' => '8/20/14' + * The exact format is dependent on the language + * Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable + * @param \DateTimeZone|null $timeZone The timezone to use + * @param \OCP\IL10N|null $l The locale to use * @return string Formatted relative date string * @since 8.0.0 */ @@ -52,13 +52,13 @@ interface IDateTimeFormatter { * Gives the relative date of the timestamp * Only works for past dates * - * @param int|\DateTime $timestamp - * @param int|\DateTime|null $baseTimestamp Timestamp to compare $timestamp against, defaults to current time - * @param \OCP\IL10N|null $l The locale to use - * @return string Dates returned are: - * < 1 month => Today, Yesterday, n days ago - * < 13 month => last month, n months ago - * >= 13 month => last year, n years ago + * @param int|\DateTime $timestamp + * @param int|\DateTime|null $baseTimestamp Timestamp to compare $timestamp against, defaults to current time + * @param \OCP\IL10N|null $l The locale to use + * @return string Dates returned are: + * < 1 month => Today, Yesterday, n days ago + * < 13 month => last month, n months ago + * >= 13 month => last year, n years ago * @since 8.0.0 */ public function formatDateSpan($timestamp, $baseTimestamp = null, ?\OCP\IL10N $l = null); @@ -67,14 +67,14 @@ interface IDateTimeFormatter { * Formats the time of the given timestamp * * @param int|\DateTime $timestamp - * @param string $format Either 'full', 'long', 'medium' or 'short' - * full: e.g. 'h:mm:ss a zzzz' => '11:42:13 AM GMT+0:00' - * long: e.g. 'h:mm:ss a z' => '11:42:13 AM GMT' - * medium: e.g. 'h:mm:ss a' => '11:42:13 AM' - * short: e.g. 'h:mm a' => '11:42 AM' - * The exact format is dependent on the language - * @param \DateTimeZone|null $timeZone The timezone to use - * @param \OCP\IL10N|null $l The locale to use + * @param string $format Either 'full', 'long', 'medium' or 'short' + * full: e.g. 'h:mm:ss a zzzz' => '11:42:13 AM GMT+0:00' + * long: e.g. 'h:mm:ss a z' => '11:42:13 AM GMT' + * medium: e.g. 'h:mm:ss a' => '11:42:13 AM' + * short: e.g. 'h:mm a' => '11:42 AM' + * The exact format is dependent on the language + * @param \DateTimeZone|null $timeZone The timezone to use + * @param \OCP\IL10N|null $l The locale to use * @return string Formatted time string * @since 8.0.0 */ @@ -83,16 +83,16 @@ interface IDateTimeFormatter { /** * Gives the relative past time of the timestamp * - * @param int|\DateTime $timestamp - * @param int|\DateTime|null $baseTimestamp Timestamp to compare $timestamp against, defaults to current time - * @param \OCP\IL10N|null $l The locale to use - * @return string Dates returned are: - * < 60 sec => seconds ago - * < 1 hour => n minutes ago - * < 1 day => n hours ago - * < 1 month => Yesterday, n days ago - * < 13 month => last month, n months ago - * >= 13 month => last year, n years ago + * @param int|\DateTime $timestamp + * @param int|\DateTime|null $baseTimestamp Timestamp to compare $timestamp against, defaults to current time + * @param \OCP\IL10N|null $l The locale to use + * @return string Dates returned are: + * < 60 sec => seconds ago + * < 1 hour => n minutes ago + * < 1 day => n hours ago + * < 1 month => Yesterday, n days ago + * < 13 month => last month, n months ago + * >= 13 month => last year, n years ago * @since 8.0.0 */ public function formatTimeSpan($timestamp, $baseTimestamp = null, ?\OCP\IL10N $l = null); @@ -101,10 +101,10 @@ interface IDateTimeFormatter { * Formats the date and time of the given timestamp * * @param int|\DateTime $timestamp - * @param string $formatDate See formatDate() for description - * @param string $formatTime See formatTime() for description - * @param \DateTimeZone|null $timeZone The timezone to use - * @param \OCP\IL10N|null $l The locale to use + * @param string $formatDate See formatDate() for description + * @param string $formatTime See formatTime() for description + * @param \DateTimeZone|null $timeZone The timezone to use + * @param \OCP\IL10N|null $l The locale to use * @return string Formatted date and time string * @since 8.0.0 */ @@ -114,11 +114,11 @@ interface IDateTimeFormatter { * Formats the date and time of the given timestamp * * @param int|\DateTime $timestamp - * @param string $formatDate See formatDate() for description - * Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable - * @param string $formatTime See formatTime() for description - * @param \DateTimeZone|null $timeZone The timezone to use - * @param \OCP\IL10N|null $l The locale to use + * @param string $formatDate See formatDate() for description + * Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable + * @param string $formatTime See formatTime() for description + * @param \DateTimeZone|null $timeZone The timezone to use + * @param \OCP\IL10N|null $l The locale to use * @return string Formatted relative date and time string * @since 8.0.0 */ diff --git a/lib/public/IGroupManager.php b/lib/public/IGroupManager.php index d4ea3f70722..ee88990df79 100644 --- a/lib/public/IGroupManager.php +++ b/lib/public/IGroupManager.php @@ -115,6 +115,14 @@ interface IGroupManager { public function isAdmin($userId); /** + * Checks if a userId is eligible to users administration delegation + * @param string $userId + * @return bool if delegated admin + * @since 30.0.0 + */ + public function isDelegatedAdmin(string $userId): bool; + + /** * Checks if a userId is in a group * @param string $userId * @param string $group diff --git a/lib/public/IImage.php b/lib/public/IImage.php index 5cc1187d33e..7ba08c889da 100644 --- a/lib/public/IImage.php +++ b/lib/public/IImage.php @@ -8,6 +8,8 @@ declare(strict_types=1); */ namespace OCP; +use GdImage; + /** * Class for basic image manipulation * @since 8.1.0 @@ -79,7 +81,7 @@ interface IImage { /** * @return string Returns the mimetype of the data. Returns null - * if the data is not valid. + * if the data is not valid. * @since 13.0.0 */ public function dataMimeType(): ?string; @@ -202,4 +204,22 @@ interface IImage { * @since 19.0.0 */ public function resizeCopy(int $maxSize): IImage; + + /** + * Loads an image from a string of data. + * + * @param string $str A string of image data as read from a file. + * + * @since 31.0.0 + */ + public function loadFromData(string $str): GdImage|false; + + /** + * Reads the EXIF data for an image. + * + * @param string $data EXIF data + * + * @since 31.0.0 + */ + public function readExif(string $data): void; } diff --git a/lib/public/IL10N.php b/lib/public/IL10N.php index bbc2d535535..9f7dedc5ff2 100644 --- a/lib/public/IL10N.php +++ b/lib/public/IL10N.php @@ -52,7 +52,7 @@ interface IL10N { * @param string $type Type of localization * @param \DateTime|int|string $data parameters for this localization * @param array $options currently supports following options: - * - 'width': handed into \Punic\Calendar::formatDate as second parameter + * - 'width': handed into \Punic\Calendar::formatDate as second parameter * @return string|int|false * * Returns the localized data. diff --git a/lib/public/IMemcache.php b/lib/public/IMemcache.php index fbc2719c25d..991af1a8d4f 100644 --- a/lib/public/IMemcache.php +++ b/lib/public/IMemcache.php @@ -30,6 +30,9 @@ interface IMemcache extends ICache { /** * Increase a stored number * + * If no value is stored with the key, it will behave as if a 0 was stored. + * If a non-numeric value is stored, the operation will fail and `false` is returned. + * * @param string $key * @param int $step * @return int | bool @@ -40,6 +43,9 @@ interface IMemcache extends ICache { /** * Decrease a stored number * + * If no value is stored with the key, the operation will fail and `false` is returned. + * If a non-numeric value is stored, the operation will fail and `false` is returned. + * * @param string $key * @param int $step * @return int | bool @@ -50,10 +56,12 @@ interface IMemcache extends ICache { /** * Compare and set * + * Set $key to $new only if it's current value is $new + * * @param string $key * @param mixed $old * @param mixed $new - * @return bool + * @return bool true if the value was successfully set or false if $key wasn't set to $old * @since 8.1.0 */ public function cas($key, $old, $new); @@ -61,10 +69,24 @@ interface IMemcache extends ICache { /** * Compare and delete * + * Delete $key if the stored value is equal to $old + * * @param string $key * @param mixed $old - * @return bool + * @return bool true if the value was successfully deleted or false if $key wasn't set to $old * @since 8.1.0 */ public function cad($key, $old); + + /** + * Negative compare and delete + * + * Delete $key if the stored value is not equal to $old + * + * @param string $key + * @param mixed $old + * @return bool true if the value was successfully deleted or false if $key was set to $old or is not set + * @since 30.0.0 + */ + public function ncad(string $key, mixed $old): bool; } diff --git a/lib/public/INavigationManager.php b/lib/public/INavigationManager.php index eaef1cb35ec..d22e96aa9d3 100644 --- a/lib/public/INavigationManager.php +++ b/lib/public/INavigationManager.php @@ -80,4 +80,42 @@ interface INavigationManager { * @since 22.0.0 */ public function setUnreadCounter(string $id, int $unreadCounter): void; + + /** + * Get a navigation entry by id. + * + * @param string $id ID of the navigation entry + * @since 31.0.0 + */ + public function get(string $id): array|null; + + /** + * Returns the id of the user's default entry + * + * If `user` is not passed, the currently logged in user will be used + * + * @param ?IUser $user User to query default entry for + * @param bool $withFallbacks Include fallback values if no default entry was configured manually + * Before falling back to predefined default entries, + * the user defined entry order is considered and the first entry would be used as the fallback. + * @since 31.0.0 + */ + public function getDefaultEntryIdForUser(?IUser $user = null, bool $withFallbacks = true): string; + + /** + * Get the global default entries with fallbacks + * + * @return string[] The default entries + * @since 31.0.0 + */ + public function getDefaultEntryIds(): array; + + /** + * Set the global default entries with fallbacks + * + * @param string[] $ids + * @throws \InvalidArgumentException If any of the entries is not available + * @since 31.0.0 + */ + public function setDefaultEntryIds(array $ids): void; } diff --git a/lib/public/IRequest.php b/lib/public/IRequest.php index 18efd7a6d16..dedff769f77 100644 --- a/lib/public/IRequest.php +++ b/lib/public/IRequest.php @@ -108,11 +108,11 @@ interface IRequest { * @psalm-taint-source input * * @param string $key the key which you want to access in the URL Parameter - * placeholder, $_POST or $_GET array. - * The priority how they're returned is the following: - * 1. URL parameters - * 2. POST parameters - * 3. GET parameters + * placeholder, $_POST or $_GET array. + * The priority how they're returned is the following: + * 1. URL parameters + * 2. POST parameters + * 3. GET parameters * @param mixed $default If the key is not found, this value will be returned * @return mixed the content of the array * @since 6.0.0 diff --git a/lib/public/ISearch.php b/lib/public/ISearch.php deleted file mode 100644 index 4279ee580c5..00000000000 --- a/lib/public/ISearch.php +++ /dev/null @@ -1,51 +0,0 @@ -<?php - -/** - * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors - * SPDX-FileCopyrightText: 2016 ownCloud, Inc. - * SPDX-License-Identifier: AGPL-3.0-only - */ -namespace OCP; - -/** - * Small Interface for Search - * @since 7.0.0 - * @deprecated 20.0.0 - */ -interface ISearch { - /** - * Search all providers for $query - * @param string $query - * @param string[] $inApps optionally limit results to the given apps - * @param int $page pages start at page 1 - * @param int $size - * @return array An array of OCP\Search\Result's - * @since 8.0.0 - * @deprecated 20.0.0 - */ - public function searchPaged($query, array $inApps = [], $page = 1, $size = 30); - - /** - * Register a new search provider to search with - * @param string $class class name of a OCP\Search\Provider - * @param array $options optional - * @since 7.0.0 - * @deprecated 20.0.0 - */ - public function registerProvider($class, array $options = []); - - /** - * Remove one existing search provider - * @param string $provider class name of a OCP\Search\Provider - * @since 7.0.0 - * @deprecated 20.0.0 - */ - public function removeProvider($provider); - - /** - * Remove all registered search providers - * @since 7.0.0 - * @deprecated 20.0.0 - */ - public function clearProviders(); -} diff --git a/lib/public/IServerContainer.php b/lib/public/IServerContainer.php index 74e7153f810..027dfcb77c4 100644 --- a/lib/public/IServerContainer.php +++ b/lib/public/IServerContainer.php @@ -344,15 +344,6 @@ interface IServerContainer extends ContainerInterface, IContainer { public function getRouter(); /** - * Returns a search instance - * - * @return \OCP\ISearch - * @since 7.0.0 - * @deprecated 20.0.0 - */ - public function getSearch(); - - /** * Get the certificate manager * * @return \OCP\ICertificateManager diff --git a/lib/public/ITagManager.php b/lib/public/ITagManager.php index 392cfc3cca6..8c37104828f 100644 --- a/lib/public/ITagManager.php +++ b/lib/public/ITagManager.php @@ -30,7 +30,7 @@ interface ITagManager { * @param array $defaultTags An array of default tags to be used if none are stored. * @param boolean $includeShared Whether to include tags for items shared with this user by others. - always false since 20.0.0 * @param string $userId user for which to retrieve the tags, defaults to the currently - * logged in user + * logged in user * @return \OCP\ITags * @since 6.0.0 - parameter $includeShared and $userId were added in 8.0.0 - $includeShared is always false since 20.0.0 */ diff --git a/lib/public/ITags.php b/lib/public/ITags.php index 004ff00f25e..1ba6abae5a2 100644 --- a/lib/public/ITags.php +++ b/lib/public/ITags.php @@ -78,7 +78,7 @@ interface ITags { * * @param array $objIds item ids * @return array|false with object id as key and an array - * of tag names as value or false if an error occurred + * of tag names as value or false if an error occurred * @since 8.0.0 */ public function getTagsForObjects(array $objIds); @@ -136,7 +136,7 @@ interface ITags { * Add a list of new tags. * * @param string|string[] $names A string with a name or an array of strings containing - * the name(s) of the to add. + * the name(s) of the to add. * @param bool $sync When true, save the tags * @param int|null $id int Optional object id to add to this|these tag(s) * @return bool Returns false on error. diff --git a/lib/public/IURLGenerator.php b/lib/public/IURLGenerator.php index e950d82cb54..a336d18b00f 100644 --- a/lib/public/IURLGenerator.php +++ b/lib/public/IURLGenerator.php @@ -64,7 +64,7 @@ interface IURLGenerator { * @param string $appName the name of the app * @param string $file the name of the file * @param array $args array with param=>value, will be appended to the returned url - * The value of $args will be urlencoded + * The value of $args will be urlencoded * @return string the url * @since 6.0.0 */ diff --git a/lib/public/IUser.php b/lib/public/IUser.php index 2ed2d0d87b2..4ba9a89f064 100644 --- a/lib/public/IUser.php +++ b/lib/public/IUser.php @@ -77,6 +77,23 @@ interface IUser { public function setPassword($password, $recoveryPassword = null); /** + * Get the password hash of the user + * + * @return ?string the password hash hashed by `\OCP\Security\IHasher::hash()` + * @since 30.0.0 + */ + public function getPasswordHash(): ?string; + + /** + * Set the password hash of the user + * + * @param string $passwordHash the password hash hashed by `\OCP\Security\IHasher::hash()` + * @throws InvalidArgumentException when `$passwordHash` is not a valid hash + * @since 30.0.0 + */ + public function setPasswordHash(string $passwordHash): bool; + + /** * get the users home folder to mount * * @return string diff --git a/lib/public/IUserManager.php b/lib/public/IUserManager.php index 851b565f617..091ccd89048 100644 --- a/lib/public/IUserManager.php +++ b/lib/public/IUserManager.php @@ -210,4 +210,15 @@ interface IUserManager { * @since 26.0.0 */ public function validateUserId(string $uid, bool $checkDataDirectory = false): void; + + /** + * Gets the list of users sorted by lastLogin, from most recent to least recent + * + * @param int|null $limit how many records to fetch + * @param int $offset from which offset to fetch + * @param string $search search users based on search params + * @return list<string> list of user IDs + * @since 30.0.0 + */ + public function getLastLoggedInUsers(?int $limit = null, int $offset = 0, string $search = ''): array; } diff --git a/lib/public/Image.php b/lib/public/Image.php index e2565cca9a4..84d07d6a4b4 100644 --- a/lib/public/Image.php +++ b/lib/public/Image.php @@ -14,5 +14,11 @@ namespace OCP; * This class provides functions to handle images * @since 6.0.0 */ -class Image extends \OC_Image { +class Image extends \OC\Image implements \OCP\IImage { + /** + * @since 31.0.0 + */ + public function __construct() { + parent::__construct(); + } } diff --git a/lib/public/Mail/IEMailTemplate.php b/lib/public/Mail/IEMailTemplate.php index 71a02eff19e..66379abd8ae 100644 --- a/lib/public/Mail/IEMailTemplate.php +++ b/lib/public/Mail/IEMailTemplate.php @@ -57,7 +57,7 @@ interface IEMailTemplate { * * @param string $title * @param string|bool $plainTitle Title that is used in the plain text email - * if empty the $title is used, if false none will be used + * if empty the $title is used, if false none will be used * * @since 12.0.0 */ @@ -68,7 +68,7 @@ interface IEMailTemplate { * * @param string $text; Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email * @param string|bool $plainText Text that is used in the plain text email - * if empty the $text is used, if false none will be used + * if empty the $text is used, if false none will be used * * @since 12.0.0 */ @@ -81,9 +81,9 @@ interface IEMailTemplate { * @param string $metaInfo; Note: When $plainMetaInfo falls back to this, HTML is automatically escaped in the HTML email * @param string $icon Absolute path, must be 16*16 pixels * @param string|bool $plainText Text that is used in the plain text email - * if empty the $text is used, if false none will be used + * if empty the $text is used, if false none will be used * @param string|bool $plainMetaInfo Meta info that is used in the plain text email - * if empty the $metaInfo is used, if false none will be used + * if empty the $metaInfo is used, if false none will be used * @param integer plainIndent If > 0, Indent plainText by this amount. * @since 12.0.0 */ @@ -109,7 +109,7 @@ interface IEMailTemplate { * @param string $text Text of button; Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email * @param string $url URL of button * @param string|false $plainText Text of button in plain text version - * if empty the $text is used, if false none will be used + * if empty the $text is used, if false none will be used * * @since 12.0.0 */ diff --git a/lib/public/Mail/IMailer.php b/lib/public/Mail/IMailer.php index 93efdce1a2d..18eaef541c0 100644 --- a/lib/public/Mail/IMailer.php +++ b/lib/public/Mail/IMailer.php @@ -69,9 +69,9 @@ interface IMailer { * * @param IMessage $message Message to send * @return string[] Array with failed recipients. Be aware that this depends on the used mail backend and - * therefore should be considered + * therefore should be considered * @throws \Exception In case it was not possible to send the message. (for example if an invalid mail address - * has been supplied.) + * has been supplied.) * @since 8.1.0 */ public function send(IMessage $message): array; diff --git a/lib/public/Mail/Provider/Address.php b/lib/public/Mail/Provider/Address.php new file mode 100644 index 00000000000..44a5544ee4b --- /dev/null +++ b/lib/public/Mail/Provider/Address.php @@ -0,0 +1,85 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Mail\Provider; + +/** + * Mail Address Object + * + * This object is used to define the address and label of a email address + * + * @since 30.0.0 + * + */ +class Address implements \OCP\Mail\Provider\IAddress { + + /** + * initialize the mail address object + * + * @since 30.0.0 + * + * @param string|null $address mail address (e.g test@example.com) + * @param string|null $label mail address label/name + */ + public function __construct( + protected ?string $address = null, + protected ?string $label = null + ) { + } + + /** + * sets the mail address + * + * @since 30.0.0 + * + * @param string $value mail address (e.g. test@example.com) + * + * @return self return this object for command chaining + */ + public function setAddress(string $value): self { + $this->address = $value; + return $this; + } + + /** + * gets the mail address + * + * @since 30.0.0 + * + * @return string|null returns the mail address or null if one is not set + */ + public function getAddress(): string|null { + return $this->address; + } + + /** + * sets the mail address label/name + * + * @since 30.0.0 + * + * @param string $value mail address label/name + * + * @return self return this object for command chaining + */ + public function setLabel(string $value): self { + $this->label = $value; + return $this; + } + + /** + * gets the mail address label/name + * + * @since 30.0.0 + * + * @return string|null returns the mail address label/name or null if one is not set + */ + public function getLabel(): string|null { + return $this->label; + } + +} diff --git a/lib/public/Mail/Provider/Attachment.php b/lib/public/Mail/Provider/Attachment.php new file mode 100644 index 00000000000..cb7b9b0d241 --- /dev/null +++ b/lib/public/Mail/Provider/Attachment.php @@ -0,0 +1,139 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Mail\Provider; + +/** + * Mail Attachment Object + * + * This object is used to define the parameters of a mail attachment + * + * @since 30.0.0 + * + */ +class Attachment implements \OCP\Mail\Provider\IAttachment { + + /** + * initialize the mail attachment object + * + * @since 30.0.0 + * + * @param string|null $contents binary contents of file + * @param string|null $name file name (e.g example.txt) + * @param string|null $type mime type (e.g. text/plain) + * @param bool $embedded embedded status of the attachment, default is false + */ + public function __construct( + protected ?string $contents, + protected ?string $name, + protected ?string $type, + protected bool $embedded = false + ) { + } + + /** + * sets the attachment file name + * + * @since 30.0.0 + * + * @param string $value file name (e.g example.txt) + * + * @return self return this object for command chaining + */ + public function setName(string $value): self { + $this->name = $value; + return $this; + } + + /** + * gets the attachment file name + * + * @since 30.0.0 + * + * @return string | null returns the attachment file name or null if not set + */ + public function getName(): string|null { + return $this->name; + } + + /** + * sets the attachment mime type + * + * @since 30.0.0 + * + * @param string $value mime type (e.g. text/plain) + * + * @return self return this object for command chaining + */ + public function setType(string $value): self { + $this->type = $value; + return $this; + } + + /** + * gets the attachment mime type + * + * @since 30.0.0 + * + * @return string | null returns the attachment mime type or null if not set + */ + public function getType(): string|null { + return $this->type; + } + + /** + * sets the attachment contents (actual data) + * + * @since 30.0.0 + * + * @param string $value binary contents of file + * + * @return self return this object for command chaining + */ + public function setContents(string $value): self { + $this->contents = $value; + return $this; + } + + /** + * gets the attachment contents (actual data) + * + * @since 30.0.0 + * + * @return string | null returns the attachment contents or null if not set + */ + public function getContents(): string|null { + return $this->contents; + } + + /** + * sets the embedded status of the attachment + * + * @since 30.0.0 + * + * @param bool $value true - embedded / false - not embedded + * + * @return self return this object for command chaining + */ + public function setEmbedded(bool $value): self { + $this->embedded = $value; + return $this; + } + + /** + * gets the embedded status of the attachment + * + * @since 30.0.0 + * + * @return bool embedded status of the attachment + */ + public function getEmbedded(): bool { + return $this->embedded; + } + +} diff --git a/lib/public/Mail/Provider/Exception/Exception.php b/lib/public/Mail/Provider/Exception/Exception.php new file mode 100644 index 00000000000..7514c72a869 --- /dev/null +++ b/lib/public/Mail/Provider/Exception/Exception.php @@ -0,0 +1,18 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Mail\Provider\Exception; + +/** + * Mail Provider Base Exception + * + * @since 30.0.0 + */ +class Exception extends \Exception { + +} diff --git a/lib/public/Mail/Provider/Exception/SendException.php b/lib/public/Mail/Provider/Exception/SendException.php new file mode 100644 index 00000000000..fba0903cbb3 --- /dev/null +++ b/lib/public/Mail/Provider/Exception/SendException.php @@ -0,0 +1,18 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Mail\Provider\Exception; + +/** + * Mail Provider Send Exception + * + * @since 30.0.0 + */ +class SendException extends Exception { + +} diff --git a/lib/public/Mail/Provider/IAddress.php b/lib/public/Mail/Provider/IAddress.php new file mode 100644 index 00000000000..b5748a51cc0 --- /dev/null +++ b/lib/public/Mail/Provider/IAddress.php @@ -0,0 +1,61 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Mail\Provider; + +/** + * Mail Address Interface + * + * This interface is a base requirement of methods and functionality used to construct a mail address object + * + * @since 30.0.0 + * + */ +interface IAddress { + + /** + * sets the mail address + * + * @since 30.0.0 + * + * @param string $value mail address (test@example.com) + * + * @return self return this object for command chaining + */ + public function setAddress(string $value): self; + + /** + * gets the mail address + * + * @since 30.0.0 + * + * @return string returns the mail address + */ + public function getAddress(): string|null; + + /** + * sets the mail address label/name + * + * @since 30.0.0 + * + * @param string $value mail address label/name + * + * @return self return this object for command chaining + */ + public function setLabel(string $value): self; + + /** + * gets the mail address label/name + * + * @since 30.0.0 + * + * @return string returns the mail address label/name + */ + public function getLabel(): string|null; + +} diff --git a/lib/public/Mail/Provider/IAttachment.php b/lib/public/Mail/Provider/IAttachment.php new file mode 100644 index 00000000000..e27f5ee066b --- /dev/null +++ b/lib/public/Mail/Provider/IAttachment.php @@ -0,0 +1,101 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Mail\Provider; + +/** + * Mail Attachment Interface + * + * This interface is used for defining individual attachments that are attached to a message + * + * @since 30.0.0 + * + */ +interface IAttachment { + + /** + * sets the attachment file name + * + * @since 30.0.0 + * + * @param string $value file name (e.g example.txt) + * + * @return self return this object for command chaining + */ + public function setName(string $value): self; + + /** + * gets the attachment file name + * + * @since 30.0.0 + * + * @return string | null returns the attachment file name or null if one is not set + */ + public function getName(): string|null; + + /** + * sets the attachment mime type + * + * @since 30.0.0 + * + * @param string $value mime type (e.g. text/plain) + * + * @return self return this object for command chaining + */ + public function setType(string $value): self; + + /** + * gets the attachment mime type + * + * @since 30.0.0 + * + * @return string | null returns the attachment mime type or null if not set + */ + public function getType(): string|null; + + /** + * sets the attachment contents (actual data) + * + * @since 30.0.0 + * + * @param string $value binary contents of file + * + * @return self return this object for command chaining + */ + public function setContents(string $value): self; + + /** + * gets the attachment contents (actual data) + * + * @since 30.0.0 + * + * @return string | null returns the attachment contents or null if not set + */ + public function getContents(): string|null; + + /** + * sets the embedded status of the attachment + * + * @since 30.0.0 + * + * @param bool $value true - embedded / false - not embedded + * + * @return self return this object for command chaining + */ + public function setEmbedded(bool $value): self; + + /** + * gets the embedded status of the attachment + * + * @since 30.0.0 + * + * @return bool embedded status of the attachment + */ + public function getEmbedded(): bool; + +} diff --git a/lib/public/Mail/Provider/IManager.php b/lib/public/Mail/Provider/IManager.php new file mode 100644 index 00000000000..ff01f93d2a4 --- /dev/null +++ b/lib/public/Mail/Provider/IManager.php @@ -0,0 +1,106 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Mail\Provider; + +/** + * Mail Provider Manager Interface + * + * This interface is a base requirement of methods and functionality used to construct a mail provider manager object + * + * @since 30.0.0 + * + */ +interface IManager { + + /** + * determine if any mail providers are registered + * + * @since 30.0.0 + * + * @return bool + */ + public function has(): bool; + + /** + * retrieve a count of how many mail providers are registered + * + * @since 30.0.0 + * + * @return int + */ + public function count(): int; + + /** + * retrieve which mail providers are registered + * + * @since 30.0.0 + * + * @return array<string,String> collection of provider id and label ['jmap' => 'JMap Connector'] + */ + public function types(): array; + + /** + * retrieve all registered mail providers + * + * @since 30.0.0 + * + * @return array<string,IProvider> collection of provider id and object ['jmap' => IProviderObject] + */ + public function providers(): array; + + /** + * retrieve a provider with a specific id + * + * @since 30.0.0 + * + * @param string $providerId provider id + * + * @return IProvider|null + */ + public function findProviderById(string $providerId): IProvider|null; + + /** + * retrieve all services for all registered mail providers + * + * @since 30.0.0 + * + * @param string $userId user id + * + * @return array<string,array<string,IService>> collection of provider id, service id and object ['jmap' => ['Service1' => IServiceObject]] + */ + public function services(string $userId): array; + + /** + * retrieve a service with a specific id + * + * @since 30.0.0 + * + * @param string $userId user id + * @param string $serviceId service id + * @param string $providerId provider id + * + * @return IService|null returns service object or null if none found + */ + public function findServiceById(string $userId, string $serviceId, ?string $providerId = null): IService|null; + + /** + * retrieve a service for a specific mail address + * returns first service with specific primary address + * + * @since 30.0.0 + * + * @param string $userId user id + * @param string $address mail address (e.g. test@example.com) + * @param string $providerId provider id + * + * @return IService|null returns service object or null if none found + */ + public function findServiceByAddress(string $userId, string $address, ?string $providerId = null): IService|null; + +} diff --git a/lib/public/Mail/Provider/IMessage.php b/lib/public/Mail/Provider/IMessage.php new file mode 100644 index 00000000000..2ad3b422b9d --- /dev/null +++ b/lib/public/Mail/Provider/IMessage.php @@ -0,0 +1,232 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Mail\Provider; + +/** + * Mail Message Interface + * + * This interface is a base requirement of methods and functionality used to construct a mail message object + * + * @since 30.0.0 + * + */ +interface IMessage { + + /** + * arbitrary unique text string identifying this message + * + * @since 30.0.0 + * + * @return string id of this message + */ + public function id(): string; + + /** + * sets the sender of this message + * + * @since 30.0.0 + * + * @param IAddress $value sender's mail address object + * + * @return self return this object for command chaining + */ + public function setFrom(IAddress $value): self; + + /** + * gets the sender of this message + * + * @since 30.0.0 + * + * @return IAddress|null sender's mail address object + */ + public function getFrom(): IAddress|null; + + /** + * sets the sender's reply to address of this message + * + * @since 30.0.0 + * + * @param IAddress $value senders's reply to mail address object + * + * @return self return this object for command chaining + */ + public function setReplyTo(IAddress $value): self; + + /** + * gets the sender's reply to address of this message + * + * @since 30.0.0 + * + * @return IAddress|null sender's reply to mail address object + */ + public function getReplyTo(): IAddress|null; + + /** + * sets the recipient(s) of this message + * + * @since 30.0.0 + * + * @param IAddress ...$value collection of or one or more mail address objects + * + * @return self return this object for command chaining + */ + public function setTo(IAddress ...$value): self; + + /** + * gets the recipient(s) of this message + * + * @since 30.0.0 + * + * @return array<int,IAddress> collection of all recipient mail address objects + */ + public function getTo(): array; + + /** + * sets the copy to recipient(s) of this message + * + * @since 30.0.0 + * + * @param IAddress ...$value collection of or one or more mail address objects + * + * @return self return this object for command chaining + */ + public function setCc(IAddress ...$value): self; + + /** + * gets the copy to recipient(s) of this message + * + * @since 30.0.0 + * + * @return array<int,IAddress> collection of all copied recipient mail address objects + */ + public function getCc(): array; + + /** + * sets the blind copy to recipient(s) of this message + * + * @since 30.0.0 + * + * @param IAddress ...$value collection of or one or more mail address objects + * + * @return self return this object for command chaining + */ + public function setBcc(IAddress ...$value): self; + + /** + * gets the blind copy to recipient(s) of this message + * + * @since 30.0.0 + * + * @return array<int,IAddress> collection of all blind copied recipient mail address objects + */ + public function getBcc(): array; + + /** + * sets the subject of this message + * + * @since 30.0.0 + * + * @param string $value subject of mail message + * + * @return self return this object for command chaining + */ + public function setSubject(string $value): self; + + /** + * gets the subject of this message + * + * @since 30.0.0 + * + * @return string|null subject of message or null if one is not set + */ + public function getSubject(): string|null; + + /** + * sets the plain text or html body of this message + * + * @since 30.0.0 + * + * @param string $value text or html body of message + * @param bool $html html flag - true for html + * + * @return self return this object for command chaining + */ + public function setBody(string $value, bool $html): self; + + /** + * gets either the html or plain text body of this message + * + * html body will be returned over plain text if html body exists + * + * @since 30.0.0 + * + * @return string|null html/plain body of this message or null if one is not set + */ + public function getBody(): string|null; + + /** + * sets the html body of this message + * + * @since 30.0.0 + * + * @param string $value html body of message + * + * @return self return this object for command chaining + */ + public function setBodyHtml(string $value): self; + + /** + * gets the html body of this message + * + * @since 30.0.0 + * + * @return string|null html body of this message or null if one is not set + */ + public function getBodyHtml(): string|null; + + /** + * sets the plain text body of this message + * + * @since 30.0.0 + * + * @param string $value plain text body of message + * + * @return self return this object for command chaining + */ + public function setBodyPlain(string $value): self; + + /** + * gets the plain text body of this message + * + * @since 30.0.0 + * + * @return string|null plain text body of this message or null if one is not set + */ + public function getBodyPlain(): string|null; + + /** + * sets the attachments of this message + * + * @since 30.0.0 + * + * @param IAttachment ...$value collection of or one or more mail attachment objects + * + * @return self return this object for command chaining + */ + public function setAttachments(IAttachment ...$value): self; + + /** + * gets the attachments of this message + * + * @since 30.0.0 + * + * @return array<int,IAttachment> collection of all mail attachment objects + */ + public function getAttachments(): array; +} diff --git a/lib/public/Mail/Provider/IMessageSend.php b/lib/public/Mail/Provider/IMessageSend.php new file mode 100644 index 00000000000..fe1b2884452 --- /dev/null +++ b/lib/public/Mail/Provider/IMessageSend.php @@ -0,0 +1,33 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Mail\Provider; + +/** + * Mail Message Send Interface + * + * This interface is the required set of methods and functionality used to extend IService with message sending functionality + * + * @since 30.0.0 + * + */ +interface IMessageSend { + + /** + * send an outbound message + * + * @since 30.0.0 + * + * @param IMessage $message mail message object with all required parameters to send a message + * @param array $options array of options reserved for future use + * + * @throws \OCP\Mail\Provider\Exception\SendException on failure, check message for reason + */ + public function sendMessage(IMessage $message, array $options = []): void; + +} diff --git a/lib/public/Mail/Provider/IProvider.php b/lib/public/Mail/Provider/IProvider.php new file mode 100644 index 00000000000..e94ee73217a --- /dev/null +++ b/lib/public/Mail/Provider/IProvider.php @@ -0,0 +1,94 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Mail\Provider; + +/** + * Mail Provider Interface + * + * This interface is a base requirement of methods and functionality used to construct a mail provider object + * + * @since 30.0.0 + * + */ +interface IProvider { + + /** + * arbitrary unique text string identifying this provider + * + * @since 30.0.0 + * + * @return string id of this provider (e.g. UUID or 'IMAP/SMTP' or anything else) + */ + public function id(): string; + + /** + * localized human friendly name of this provider + * + * @since 30.0.0 + * + * @return string label/name of this provider (e.g. Plain Old IMAP/SMTP) + */ + public function label(): string; + + /** + * determine if any services are configured for a specific user + * + * @since 30.0.0 + * + * @param string $userId user id + * + * @return bool true if any services are configure for the user + */ + public function hasServices(string $userId): bool; + + /** + * retrieve collection of services for a specific user + * + * @param string $userId user id + * + * @since 30.0.0 + * + * @return array<string,IService> collection of service id and object ['1' => IServiceObject] + */ + public function listServices(string $userId): array; + + /** + * retrieve a service with a specific id + * + * @since 30.0.0 + * + * @param string $userId user id + * @param string $serviceId service id + * + * @return IService|null returns service object or null if none found + */ + public function findServiceById(string $userId, string $serviceId): IService|null; + + /** + * retrieve a service for a specific mail address + * + * @since 30.0.0 + * + * @param string $userId user id + * @param string $address mail address (e.g. test@example.com) + * + * @return IService|null returns service object or null if none found + */ + public function findServiceByAddress(string $userId, string $address): IService|null; + + /** + * construct a new empty service object + * + * @since 30.0.0 + * + * @return IService blank service object + */ + public function initiateService(): IService; + +} diff --git a/lib/public/Mail/Provider/IService.php b/lib/public/Mail/Provider/IService.php new file mode 100644 index 00000000000..e0bb5161aa6 --- /dev/null +++ b/lib/public/Mail/Provider/IService.php @@ -0,0 +1,119 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Mail\Provider; + +/** + * Mail Service Interface + * + * This interface is a base requirement of methods and functionality used to construct a mail service object + * + * @since 30.0.0 + * + */ +interface IService { + + /** + * arbitrary unique text string identifying this service + * + * @since 30.0.0 + * + * @return string id of this service (e.g. 1 or service1 or anything else) + */ + public function id(): string; + + /** + * checks if a service is able of performing an specific action + * + * @since 30.0.0 + * + * @param string $value required ability e.g. 'MessageSend' + * + * @return bool true/false if ability is supplied and found in collection + */ + public function capable(string $value): bool; + + /** + * retrieves a collection of what actions a service can perfrom + * + * @since 30.0.0 + * + * @return array collection of abilities otherwise empty collection + */ + public function capabilities(): array; + + /** + * gets the localized human frendly name of this service + * + * @since 30.0.0 + * + * @return string label/name of service (e.g. ACME Company Mail Service) + */ + public function getLabel(): string; + + /** + * sets the localized human frendly name of this service + * + * @since 30.0.0 + * + * @param string $value label/name of service (e.g. ACME Company Mail Service) + * + * @return self return this object for command chaining + */ + public function setLabel(string $value): self; + + /** + * gets the primary mailing address for this service + * + * @since 30.0.0 + * + * @return IAddress mail address object + */ + public function getPrimaryAddress(): IAddress; + + /** + * sets the primary mailing address for this service + * + * @since 30.0.0 + * + * @param IAddress $value mail address object + * + * @return self return this object for command chaining + */ + public function setPrimaryAddress(IAddress $value): self; + + /** + * gets the secondary mailing addresses (aliases) collection for this service + * + * @since 30.0.0 + * + * @return array<int, IAddress> collection of mail address objects + */ + public function getSecondaryAddresses(): array; + + /** + * sets the secondary mailing addresses (aliases) for this service + * + * @since 30.0.0 + * + * @param IAddress ...$value collection of one or more mail address objects + * + * @return self return this object for command chaining + */ + public function setSecondaryAddresses(IAddress ...$value): self; + + /** + * construct a new empty message object + * + * @since 30.0.0 + * + * @return IMessage blank message object + */ + public function initiateMessage(): IMessage; + +} diff --git a/lib/public/Mail/Provider/Message.php b/lib/public/Mail/Provider/Message.php new file mode 100644 index 00000000000..7814fb849d5 --- /dev/null +++ b/lib/public/Mail/Provider/Message.php @@ -0,0 +1,338 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Mail\Provider; + +/** + * Mail Message Object + * + * This object is used to define a mail message that can be used to transfer data to a provider + * + * @since 30.0.0 + * + */ +class Message implements \OCP\Mail\Provider\IMessage { + + /** + * initialize the mail message object + * + * @since 30.0.0 + * + * @param array $data message data array + */ + public function __construct( + protected array $data = [], + ) { + } + + /** + * arbitrary unique text string identifying this message + * + * @since 30.0.0 + * + * @return string id of this message + */ + public function id(): string { + // return id of message + return (isset($this->data['id'])) ? $this->data['id'] : ''; + } + + /** + * sets the sender of this message + * + * @since 30.0.0 + * + * @param IAddress $value sender's mail address object + * + * @return self return this object for command chaining + */ + public function setFrom(IAddress $value): self { + // create or update field in data store with value + $this->data['from'] = $value; + // return this object for command chaining + return $this; + } + + /** + * gets the sender of this message + * + * @since 30.0.0 + * + * @return IAddress|null sender's mail address object + */ + public function getFrom(): IAddress|null { + // evaluate if data store field exists and return value(s) or null otherwise + return (isset($this->data['from'])) ? $this->data['from'] : null; + } + + /** + * sets the sender's reply to address of this message + * + * @since 30.0.0 + * + * @param IAddress $value senders's reply to mail address object + * + * @return self return this object for command chaining + */ + public function setReplyTo(IAddress $value): self { + // create or update field in data store with value + $this->data['replyTo'] = $value; + // return this object for command chaining + return $this; + } + + /** + * gets the sender's reply to address of this message + * + * @since 30.0.0 + * + * @return IAddress|null sender's reply to mail address object + */ + public function getReplyTo(): IAddress|null { + // evaluate if data store field exists and return value(s) or null otherwise + return (isset($this->data['replyTo'])) ? $this->data['replyTo'] : null; + } + + /** + * sets the recipient(s) of this message + * + * @since 30.0.0 + * + * @param IAddress ...$value collection of or one or more mail address objects + * + * @return self return this object for command chaining + */ + public function setTo(IAddress ...$value): self { + // create or update field in data store with value + $this->data['to'] = $value; + // return this object for command chaining + return $this; + } + + /** + * gets the recipient(s) of this message + * + * @since 30.0.0 + * + * @return array<int,IAddress> collection of all recipient mail address objects + */ + public function getTo(): array { + // evaluate if data store field exists and return value(s) or empty collection + return (isset($this->data['to'])) ? $this->data['to'] : []; + } + + /** + * sets the copy to recipient(s) of this message + * + * @since 30.0.0 + * + * @param IAddress ...$value collection of or one or more mail address objects + * + * @return self return this object for command chaining + */ + public function setCc(IAddress ...$value): self { + // create or update field in data store with value + $this->data['cc'] = $value; + // return this object for command chaining + return $this; + } + + /** + * gets the copy to recipient(s) of this message + * + * @since 30.0.0 + * + * @return array<int,IAddress> collection of all copied recipient mail address objects + */ + public function getCc(): array { + // evaluate if data store field exists and return value(s) or empty collection + return (isset($this->data['cc'])) ? $this->data['cc'] : []; + } + + /** + * sets the blind copy to recipient(s) of this message + * + * @since 30.0.0 + * + * @param IAddress ...$value collection of or one or more mail address objects + * + * @return self return this object for command chaining + */ + public function setBcc(IAddress ...$value): self { + // create or update field in data store with value + $this->data['bcc'] = $value; + // return this object for command chaining + return $this; + } + + /** + * gets the blind copy to recipient(s) of this message + * + * @since 30.0.0 + * + * @return array<int,IAddress> collection of all blind copied recipient mail address objects + */ + public function getBcc(): array { + // evaluate if data store field exists and return value(s) or empty collection + return (isset($this->data['bcc'])) ? $this->data['bcc'] : []; + } + + /** + * sets the subject of this message + * + * @since 30.0.0 + * + * @param string $value subject of mail message + * + * @return self return this object for command chaining + */ + public function setSubject(string $value): self { + // create or update field in data store with value + $this->data['subject'] = $value; + // return this object for command chaining + return $this; + } + + /** + * gets the subject of this message + * + * @since 30.0.0 + * + * @return string|null subject of message or null if one is not set + */ + public function getSubject(): string|null { + // evaluate if data store field exists and return value(s) or null otherwise + return (isset($this->data['subject'])) ? $this->data['subject'] : null; + } + + /** + * sets the plain text or html body of this message + * + * @since 30.0.0 + * + * @param string $value text or html body of message + * @param bool $html html flag - true for html + * + * @return self return this object for command chaining + */ + public function setBody(string $value, bool $html = false): self { + // evaluate html flag and create or update appropriate field in data store with value + if ($html) { + $this->data['bodyHtml'] = $value; + } else { + $this->data['bodyPlain'] = $value; + } + // return this object for command chaining + return $this; + } + + /** + * gets either the html or plain text body of this message + * + * html body will be returned over plain text if html body exists + * + * @since 30.0.0 + * + * @return string|null html/plain body of this message or null if one is not set + */ + public function getBody(): string|null { + // evaluate if data store field(s) exists and return value + if (isset($this->data['bodyHtml'])) { + return $this->data['bodyHtml']; + } elseif (isset($this->data['bodyPlain'])) { + return $this->data['bodyPlain']; + } + // return null if data fields did not exist in data store + return null; + } + + /** + * sets the html body of this message + * + * @since 30.0.0 + * + * @param string $value html body of message + * + * @return self return this object for command chaining + */ + public function setBodyHtml(string $value): self { + // create or update field in data store with value + $this->data['bodyHtml'] = $value; + // return this object for command chaining + return $this; + } + + /** + * gets the html body of this message + * + * @since 30.0.0 + * + * @return string|null html body of this message or null if one is not set + */ + public function getBodyHtml(): string|null { + // evaluate if data store field exists and return value(s) or null otherwise + return (isset($this->data['bodyHtml'])) ? $this->data['bodyHtml'] : null; + } + + /** + * sets the plain text body of this message + * + * @since 30.0.0 + * + * @param string $value plain text body of message + * + * @return self return this object for command chaining + */ + public function setBodyPlain(string $value): self { + // create or update field in data store with value + $this->data['bodyPlain'] = $value; + // return this object for command chaining + return $this; + } + + /** + * gets the plain text body of this message + * + * @since 30.0.0 + * + * @return string|null plain text body of this message or null if one is not set + */ + public function getBodyPlain(): string|null { + // evaluate if data store field exists and return value(s) or null otherwise + return (isset($this->data['bodyPlain'])) ? $this->data['bodyPlain'] : null; + } + + /** + * sets the attachments of this message + * + * @since 30.0.0 + * + * @param IAttachment ...$value collection of or one or more mail attachment objects + * + * @return self return this object for command chaining + */ + public function setAttachments(IAttachment ...$value): self { + // create or update field in data store with value + $this->data['attachments'] = $value; + // return this object for command chaining + return $this; + } + + /** + * gets the attachments of this message + * + * @since 30.0.0 + * + * @return array<int,IAttachment> collection of all mail attachment objects + */ + public function getAttachments(): array { + // evaluate if data store field exists and return value(s) or null otherwise + return (isset($this->data['attachments'])) ? $this->data['attachments'] : []; + } + +} diff --git a/lib/public/Migration/Attributes/AddColumn.php b/lib/public/Migration/Attributes/AddColumn.php new file mode 100644 index 00000000000..8d16b9b6e8d --- /dev/null +++ b/lib/public/Migration/Attributes/AddColumn.php @@ -0,0 +1,30 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Migration\Attributes; + +use Attribute; + +/** + * attribute on new column creation + * + * @since 30.0.0 + */ +#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_CLASS)] +class AddColumn extends ColumnMigrationAttribute { + /** + * @return string + * @since 30.0.0 + */ + public function definition(): string { + $type = is_null($this->getType()) ? '' : ' (' . $this->getType()->value . ')'; + return empty($this->getName()) ? + 'Addition of a new column' . $type . ' to table \'' . $this->getTable() . '\'' + : 'Addition of column \'' . $this->getName() . '\'' . $type . ' to table \'' . $this->getTable() . '\''; + } +} diff --git a/lib/public/Migration/Attributes/AddIndex.php b/lib/public/Migration/Attributes/AddIndex.php new file mode 100644 index 00000000000..ee22fe7f128 --- /dev/null +++ b/lib/public/Migration/Attributes/AddIndex.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 OCP\Migration\Attributes; + +use Attribute; + +/** + * attribute on index creation + * + * @since 30.0.0 + */ +#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_CLASS)] +class AddIndex extends IndexMigrationAttribute { + /** + * @return string + * @since 30.0.0 + */ + public function definition(): string { + $type = is_null($this->getType()) ? '' : ' (' . $this->getType()->value . ')'; + return 'Addition of a new index' . $type . ' to table \'' . $this->getTable() . '\''; + } +} diff --git a/lib/public/Migration/Attributes/ColumnMigrationAttribute.php b/lib/public/Migration/Attributes/ColumnMigrationAttribute.php new file mode 100644 index 00000000000..30b6fe008e6 --- /dev/null +++ b/lib/public/Migration/Attributes/ColumnMigrationAttribute.php @@ -0,0 +1,101 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Migration\Attributes; + +use JsonSerializable; + +/** + * generic class related to migration attribute about column changes + * + * @since 30.0.0 + */ +class ColumnMigrationAttribute extends MigrationAttribute implements JsonSerializable { + /** + * @param string $table name of the database table + * @param string $name name of the column + * @param ColumnType|null $type type of the column + * @param string $description description of the migration + * @param array $notes notes about the migration/column + * @since 30.0.0 + */ + public function __construct( + string $table, + private string $name = '', + private ?ColumnType $type = null, + string $description = '', + array $notes = [], + ) { + parent::__construct($table, $description, $notes); + } + + /** + * @param string $name + * + * @return $this + * @since 30.0.0 + */ + public function setName(string $name): self { + $this->name = $name; + return $this; + } + + /** + * @return string + * @since 30.0.0 + */ + public function getName(): string { + return $this->name; + } + + /** + * @param ColumnType|null $type + * + * @return $this + * @since 30.0.0 + */ + public function setType(?ColumnType $type): self { + $this->type = $type; + return $this; + } + + /** + * @return ColumnType|null + * @since 30.0.0 + */ + public function getType(): ?ColumnType { + return $this->type; + } + + /** + * @param array $data + * + * @return $this + * @since 30.0.0 + */ + public function import(array $data): self { + parent::import($data); + $this->setName($data['name'] ?? ''); + $this->setType(ColumnType::tryFrom($data['type'] ?? '')); + return $this; + } + + /** + * @return array + * @since 30.0.0 + */ + public function jsonSerialize(): array { + return array_merge( + parent::jsonSerialize(), + [ + 'name' => $this->getName(), + 'type' => $this->getType() ?? '', + ] + ); + } +} diff --git a/lib/public/Migration/Attributes/ColumnType.php b/lib/public/Migration/Attributes/ColumnType.php new file mode 100644 index 00000000000..23445e822b6 --- /dev/null +++ b/lib/public/Migration/Attributes/ColumnType.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\Migration\Attributes; + +/** + * enum ColumnType based on OCP\DB\Types + * + * @see \OCP\DB\Types + * @since 30.0.0 + */ +enum ColumnType : string { + /** @since 30.0.0 */ + case BIGINT = 'bigint'; + /** @since 30.0.0 */ + case BINARY = 'binary'; + /** @since 30.0.0 */ + case BLOB = 'blob'; + /** @since 30.0.0 */ + case BOOLEAN = 'boolean'; + /** @since 30.0.0 */ + case DATE = 'date'; + /** @since 30.0.0 */ + case DATETIME = 'datetime'; + /** @since 30.0.0 */ + case DECIMAL = 'decimal'; + /** @since 30.0.0 */ + case FLOAT = 'float'; + /** @since 30.0.0 */ + case INTEGER = 'integer'; + /** @since 30.0.0 */ + case SMALLINT = 'smallint'; + /** @since 30.0.0 */ + case STRING = 'string'; + /** @since 30.0.0 */ + case TEXT = 'text'; + /** @since 30.0.0 */ + case TIME = 'time'; + /** @since 30.0.0 */ + case JSON = 'json'; +} diff --git a/lib/public/Migration/Attributes/CreateTable.php b/lib/public/Migration/Attributes/CreateTable.php new file mode 100644 index 00000000000..df0418fa4bc --- /dev/null +++ b/lib/public/Migration/Attributes/CreateTable.php @@ -0,0 +1,29 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Migration\Attributes; + +use Attribute; + +/** + * attribute on table creation + * + * @since 30.0.0 + */ +#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_CLASS)] +class CreateTable extends TableMigrationAttribute { + /** + * @return string + * @since 30.0.0 + */ + public function definition(): string { + $definition = 'Creation of new table \'' . $this->getTable() . '\''; + $definition .= empty($this->getColumns()) ? '' : ' with columns ' . implode(', ', $this->getColumns()); + return $definition; + } +} diff --git a/lib/public/Migration/Attributes/DropColumn.php b/lib/public/Migration/Attributes/DropColumn.php new file mode 100644 index 00000000000..1de0ba58489 --- /dev/null +++ b/lib/public/Migration/Attributes/DropColumn.php @@ -0,0 +1,29 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Migration\Attributes; + +use Attribute; + +/** + * attribute on column drop + * + * @since 30.0.0 + */ +#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_CLASS)] +class DropColumn extends ColumnMigrationAttribute { + /** + * @return string + * @since 30.0.0 + */ + public function definition(): string { + return empty($this->getName()) ? + 'Deletion of a column from table \'' . $this->getTable() . '\'' + : 'Deletion of column \'' . $this->getName() . '\' from table \'' . $this->getTable() . '\''; + } +} diff --git a/lib/public/Migration/Attributes/DropIndex.php b/lib/public/Migration/Attributes/DropIndex.php new file mode 100644 index 00000000000..2702cbed9a7 --- /dev/null +++ b/lib/public/Migration/Attributes/DropIndex.php @@ -0,0 +1,27 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Migration\Attributes; + +use Attribute; + +/** + * attribute on index drop + * + * @since 30.0.0 + */ +#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_CLASS)] +class DropIndex extends IndexMigrationAttribute { + /** + * @return string + * @since 30.0.0 + */ + public function definition(): string { + return 'Deletion of an index from table \'' . $this->getTable() . '\''; + } +} diff --git a/lib/public/Migration/Attributes/DropTable.php b/lib/public/Migration/Attributes/DropTable.php new file mode 100644 index 00000000000..e90e4804a3c --- /dev/null +++ b/lib/public/Migration/Attributes/DropTable.php @@ -0,0 +1,27 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Migration\Attributes; + +use Attribute; + +/** + * attribute on table drop + * + * @since 30.0.0 + */ +#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_CLASS)] +class DropTable extends TableMigrationAttribute { + /** + * @return string + * @since 30.0.0 + */ + public function definition(): string { + return 'Deletion of table \'' . $this->getTable() . '\''; + } +} diff --git a/lib/public/Migration/Attributes/GenericMigrationAttribute.php b/lib/public/Migration/Attributes/GenericMigrationAttribute.php new file mode 100644 index 00000000000..6f187635ff7 --- /dev/null +++ b/lib/public/Migration/Attributes/GenericMigrationAttribute.php @@ -0,0 +1,49 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Migration\Attributes; + +use JsonSerializable; + +/** + * generic entry, used to replace migration attribute not yet known in current version + * but used in a future release + * + * @since 30.0.0 + */ +class GenericMigrationAttribute extends MigrationAttribute implements JsonSerializable { + /** + * @param array $details + * @since 30.0.0 + */ + public function __construct( + private readonly array $details = [] + ) { + parent::__construct( + $details['table'] ?? '', + $details['description'] ?? '', + $details['notes'] ?? [] + ); + } + + /** + * @return string + * @since 30.0.0 + */ + public function definition(): string { + return json_encode($this->jsonSerialize(), JSON_UNESCAPED_SLASHES); + } + + /** + * @return array + * @since 30.0.0 + */ + public function jsonSerialize(): array { + return $this->details; + } +} diff --git a/lib/public/Migration/Attributes/IndexMigrationAttribute.php b/lib/public/Migration/Attributes/IndexMigrationAttribute.php new file mode 100644 index 00000000000..88b60a564b3 --- /dev/null +++ b/lib/public/Migration/Attributes/IndexMigrationAttribute.php @@ -0,0 +1,78 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Migration\Attributes; + +use JsonSerializable; + +/** + * generic class related to migration attribute about index changes + * + * @since 30.0.0 + */ +class IndexMigrationAttribute extends MigrationAttribute implements JsonSerializable { + /** + * @param string $table name of the database table + * @param IndexType|null $type type of the index + * @param string $description description of the migration + * @param array $notes notes abour the migration/index + * @since 30.0.0 + */ + public function __construct( + string $table, + private ?IndexType $type = null, + string $description = '', + array $notes = [], + ) { + parent::__construct($table, $description, $notes); + } + + /** + * @param IndexType|null $type + * + * @return $this + * @since 30.0.0 + */ + public function setType(?IndexType $type): self { + $this->type = $type; + return $this; + } + + /** + * @return IndexType|null + * @since 30.0.0 + */ + public function getType(): ?IndexType { + return $this->type; + } + + /** + * @param array $data + * + * @return $this + * @since 30.0.0 + */ + public function import(array $data): self { + parent::import($data); + $this->setType(IndexType::tryFrom($data['type'] ?? '')); + return $this; + } + + /** + * @return array + * @since 30.0.0 + */ + public function jsonSerialize(): array { + return array_merge( + parent::jsonSerialize(), + [ + 'type' => $this->getType() ?? '', + ] + ); + } +} diff --git a/lib/public/Migration/Attributes/IndexType.php b/lib/public/Migration/Attributes/IndexType.php new file mode 100644 index 00000000000..45c88d81041 --- /dev/null +++ b/lib/public/Migration/Attributes/IndexType.php @@ -0,0 +1,23 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Migration\Attributes; + +/** + * type of index + * + * @since 30.0.0 + */ +enum IndexType : string { + /** @since 30.0.0 */ + case PRIMARY = 'primary'; + /** @since 30.0.0 */ + case INDEX = 'index'; + /** @since 30.0.0 */ + case UNIQUE = 'unique'; +} diff --git a/lib/public/Migration/Attributes/MigrationAttribute.php b/lib/public/Migration/Attributes/MigrationAttribute.php new file mode 100644 index 00000000000..d5b2d52cafb --- /dev/null +++ b/lib/public/Migration/Attributes/MigrationAttribute.php @@ -0,0 +1,118 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Migration\Attributes; + +use JsonSerializable; + +/** + * @since 30.0.0 + */ +class MigrationAttribute implements JsonSerializable { + /** + * @param string $table name of the database table + * @param string $description description of the migration + * @param array $notes notes about the migration + * @since 30.0.0 + */ + public function __construct( + private string $table, + private string $description = '', + private array $notes = [], + ) { + } + + /** + * @param string $table + * + * @return $this + * @since 30.0.0 + */ + public function setTable(string $table): self { + $this->table = $table; + return $this; + } + + /** + * @return string + * @since 30.0.0 + */ + public function getTable(): string { + return $this->table; + } + + /** + * @param string $description + * + * @return $this + * @since 30.0.0 + */ + public function setDescription(string $description): self { + $this->description = $description; + return $this; + } + + /** + * @return string + * @since 30.0.0 + */ + public function getDescription(): string { + return $this->description; + } + + /** + * @param array $notes + * + * @return $this + * @since 30.0.0 + */ + public function setNotes(array $notes): self { + $this->notes = $notes; + return $this; + } + + /** + * @return array + * @since 30.0.0 + */ + public function getNotes(): array { + return $this->notes; + } + + /** + * @return string + * @since 30.0.0 + */ + public function definition(): string { + return json_encode($this->jsonSerialize(), JSON_UNESCAPED_SLASHES); + } + + /** + * @param array $data + * + * @return self + * @since 30.0.0 + */ + public function import(array $data): self { + return $this->setDescription($data['description'] ?? '') + ->setNotes($data['notes'] ?? []); + } + + /** + * @return array + * @since 30.0.0 + */ + public function jsonSerialize(): array { + return [ + 'class' => get_class($this), + 'table' => $this->getTable(), + 'description' => $this->getDescription(), + 'notes' => $this->getNotes() + ]; + } +} diff --git a/lib/public/Migration/Attributes/ModifyColumn.php b/lib/public/Migration/Attributes/ModifyColumn.php new file mode 100644 index 00000000000..ef7250ffb34 --- /dev/null +++ b/lib/public/Migration/Attributes/ModifyColumn.php @@ -0,0 +1,30 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Migration\Attributes; + +use Attribute; + +/** + * attribute on column modification + * + * @since 30.0.0 + */ +#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_CLASS)] +class ModifyColumn extends ColumnMigrationAttribute { + /** + * @return string + * @since 30.0.0 + */ + public function definition(): string { + $type = is_null($this->getType()) ? '' : ' to ' . $this->getType()->value; + return empty($this->getName()) ? + 'Modification of a column from table \'' . $this->getTable() . '\'' . $type + : 'Modification of column \'' . $this->getName() . '\' from table \'' . $this->getTable() . '\'' . $type; + } +} diff --git a/lib/public/Migration/Attributes/TableMigrationAttribute.php b/lib/public/Migration/Attributes/TableMigrationAttribute.php new file mode 100644 index 00000000000..0776e50387e --- /dev/null +++ b/lib/public/Migration/Attributes/TableMigrationAttribute.php @@ -0,0 +1,78 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Migration\Attributes; + +use JsonSerializable; + +/** + * generic class related to migration attribute about table changes + * + * @since 30.0.0 + */ +class TableMigrationAttribute extends MigrationAttribute implements JsonSerializable { + /** + * @param string $table name of the database table + * @param array $columns list of columns + * @param string $description description of the migration + * @param array $notes notes about the migration/table + * @since 30.0.0 + */ + public function __construct( + string $table, + private array $columns = [], + string $description = '', + array $notes = [], + ) { + parent::__construct($table, $description, $notes); + } + + /** + * @param array $columns + * + * @return $this + * @since 30.0.0 + */ + public function setColumns(array $columns): self { + $this->columns = $columns; + return $this; + } + + /** + * @return array + * @since 30.0.0 + */ + public function getColumns(): array { + return $this->columns; + } + + /** + * @param array $data + * + * @return $this + * @since 30.0.0 + */ + public function import(array $data): self { + parent::import($data); + $this->setColumns($data['columns'] ?? []); + return $this; + } + + /** + * @return array + * @since 30.0.0 + */ + public function jsonSerialize(): array { + return array_merge( + parent::jsonSerialize(), + [ + 'columns' => $this->getColumns(), + ] + ); + } +} diff --git a/lib/public/Migration/BigIntMigration.php b/lib/public/Migration/BigIntMigration.php index db50147b28e..0fa7e559f79 100644 --- a/lib/public/Migration/BigIntMigration.php +++ b/lib/public/Migration/BigIntMigration.php @@ -16,7 +16,7 @@ use OCP\DB\ISchemaWrapper; abstract class BigIntMigration extends SimpleMigrationStep { /** * @return array Returns an array with the following structure - * ['table1' => ['column1', 'column2'], ...] + * ['table1' => ['column1', 'column2'], ...] * @since 13.0.0 */ abstract protected function getColumnsByTable(); diff --git a/lib/public/Notification/IManager.php b/lib/public/Notification/IManager.php index 6a16af2d7a0..96427ddff92 100644 --- a/lib/public/Notification/IManager.php +++ b/lib/public/Notification/IManager.php @@ -16,7 +16,7 @@ namespace OCP\Notification; interface IManager extends IApp, INotifier { /** * @param string $appClass The service must implement IApp, otherwise a - * \InvalidArgumentException is thrown later + * \InvalidArgumentException is thrown later * @since 17.0.0 */ public function registerApp(string $appClass): void; @@ -24,8 +24,8 @@ interface IManager extends IApp, INotifier { /** * @param \Closure $service The service must implement INotifier, otherwise a * \InvalidArgumentException is thrown later - * @param \Closure $info An array with the keys 'id' and 'name' containing - * the app id and the app name + * @param \Closure $info An array with the keys 'id' and 'name' containing + * the app id and the app name * @deprecated 17.0.0 use registerNotifierService instead. * @since 8.2.0 - Parameter $info was added in 9.0.0 */ @@ -33,7 +33,7 @@ interface IManager extends IApp, INotifier { /** * @param string $notifierService The service must implement INotifier, otherwise a - * \InvalidArgumentException is thrown later + * \InvalidArgumentException is thrown later * @since 17.0.0 * @deprecated 22.0.0 use the IBootStrap registration context */ diff --git a/lib/public/Notification/INotification.php b/lib/public/Notification/INotification.php index 28d2d6bff5a..4a35ee59087 100644 --- a/lib/public/Notification/INotification.php +++ b/lib/public/Notification/INotification.php @@ -137,7 +137,7 @@ interface INotification { * See https://github.com/nextcloud/server/issues/1706 for more information. * * @param string $subject - * @param array $parameters + * @param array<string, array<string, string>> $parameters * @return $this * @throws InvalidValueException if the subject or parameters are invalid * @since 11.0.0 @@ -213,7 +213,7 @@ interface INotification { * See https://github.com/nextcloud/server/issues/1706 for more information. * * @param string $message - * @param array $parameters + * @param array<string, array<string, string>> $parameters * @return $this * @throws InvalidValueException if the message or parameters are invalid * @since 11.0.0 diff --git a/lib/public/OCM/Events/ResourceTypeRegisterEvent.php b/lib/public/OCM/Events/ResourceTypeRegisterEvent.php index 11087106cbc..c0129197566 100644 --- a/lib/public/OCM/Events/ResourceTypeRegisterEvent.php +++ b/lib/public/OCM/Events/ResourceTypeRegisterEvent.php @@ -32,7 +32,7 @@ class ResourceTypeRegisterEvent extends Event { * @param string $name * @param list<string> $shareTypes List of supported share recipients, e.g. 'user', 'group', … * @param array<string, string> $protocols List of supported protocols and their location, - * e.g. ['webdav' => '/remote.php/webdav/'] + * e.g. ['webdav' => '/remote.php/webdav/'] * @since 28.0.0 */ public function registerResourceType(string $name, array $shareTypes, array $protocols): void { diff --git a/lib/public/Preview/BeforePreviewFetchedEvent.php b/lib/public/Preview/BeforePreviewFetchedEvent.php index ac3c8c13b55..8ab875070d9 100644 --- a/lib/public/Preview/BeforePreviewFetchedEvent.php +++ b/lib/public/Preview/BeforePreviewFetchedEvent.php @@ -11,7 +11,13 @@ use OCP\Files\Node; use OCP\IPreview; /** + * Emitted before a file preview is being fetched. + * + * It can be used to block preview rendering by throwing a ``OCP\Files\NotFoundException`` + * * @since 25.0.1 + * @since 28.0.0 the constructor arguments ``$width``, ``$height``, ``$crop`` and ``$mode`` are no longer nullable. + * @since 31.0.0 the constructor arguments ``$mimeType`` was added */ class BeforePreviewFetchedEvent extends \OCP\EventDispatcher\Event { /** @@ -19,14 +25,15 @@ class BeforePreviewFetchedEvent extends \OCP\EventDispatcher\Event { */ public function __construct( private Node $node, - /** @deprecated 28.0.0 null deprecated **/ + /** @deprecated 28.0.0 passing null is deprecated **/ private ?int $width = null, - /** @deprecated 28.0.0 null deprecated **/ + /** @deprecated 28.0.0 passing null is deprecated **/ private ?int $height = null, - /** @deprecated 28.0.0 null deprecated **/ + /** @deprecated 28.0.0 passing null is deprecated **/ private ?bool $crop = null, - /** @deprecated 28.0.0 null deprecated **/ + /** @deprecated 28.0.0 passing null is deprecated **/ private ?string $mode = null, + private ?string $mimeType = null, ) { parent::__construct(); } @@ -66,4 +73,11 @@ class BeforePreviewFetchedEvent extends \OCP\EventDispatcher\Event { public function getMode(): ?string { return $this->mode; } + + /** + * @since 31.0.0 + */ + public function getMimeType(): ?string { + return $this->mimeType; + } } diff --git a/lib/public/Remote/IInstance.php b/lib/public/Remote/IInstance.php index a3c45b396e8..47c10cb4ac1 100644 --- a/lib/public/Remote/IInstance.php +++ b/lib/public/Remote/IInstance.php @@ -21,7 +21,7 @@ interface IInstance { public function getUrl(); /** - * @return string The of of the remote server with protocol + * @return string The of the remote server with protocol * * @since 13.0.0 * @deprecated 23.0.0 diff --git a/lib/public/RichObjectStrings/Definitions.php b/lib/public/RichObjectStrings/Definitions.php index 7c1935d0a9c..5974659e16b 100644 --- a/lib/public/RichObjectStrings/Definitions.php +++ b/lib/public/RichObjectStrings/Definitions.php @@ -368,6 +368,12 @@ class Definitions { 'description' => 'The height in pixels if the file is an image', 'example' => '1080', ], + 'blurhash' => [ + 'since' => '30.0.0', + 'required' => false, + 'description' => 'The blurhash of the image', + 'example' => 'LEHV9uae2yk8pyo0adR*.7kCMdnj', + ], ], ], 'forms-form' => [ diff --git a/lib/public/SabrePluginEvent.php b/lib/public/SabrePluginEvent.php index 9a0206f6ded..c8c9db58ac9 100644 --- a/lib/public/SabrePluginEvent.php +++ b/lib/public/SabrePluginEvent.php @@ -39,7 +39,7 @@ class SabrePluginEvent extends Event { * @since 8.2.0 */ public function setStatusCode($statusCode) { - $this->statusCode = (int) $statusCode; + $this->statusCode = (int)$statusCode; return $this; } @@ -49,7 +49,7 @@ class SabrePluginEvent extends Event { * @since 8.2.0 */ public function setMessage($message) { - $this->message = (string) $message; + $this->message = (string)$message; return $this; } diff --git a/lib/public/Security/Events/GenerateSecurePasswordEvent.php b/lib/public/Security/Events/GenerateSecurePasswordEvent.php index 8adddd529b0..419e7b40ee4 100644 --- a/lib/public/Security/Events/GenerateSecurePasswordEvent.php +++ b/lib/public/Security/Events/GenerateSecurePasswordEvent.php @@ -9,15 +9,34 @@ declare(strict_types=1); namespace OCP\Security\Events; use OCP\EventDispatcher\Event; +use OCP\Security\PasswordContext; /** + * Event to request a secure password to be generated * @since 18.0.0 */ class GenerateSecurePasswordEvent extends Event { - /** @var null|string */ - private $password; + private ?string $password; /** + * Request a secure password to be generated. + * + * By default passwords are generated for the user account context, + * this can be adjusted by passing another `PasswordContext`. + * @since 31.0.0 + */ + public function __construct( + private PasswordContext $context = PasswordContext::ACCOUNT, + ) { + parent::__construct(); + $this->password = null; + } + + /** + * Get the generated password. + * + * If a password generator is registered and successfully generated a password + * that password can get read back. Otherwise `null` is returned. * @since 18.0.0 */ public function getPassword(): ?string { @@ -25,9 +44,20 @@ class GenerateSecurePasswordEvent extends Event { } /** + * Set the generated password. + * + * This is used by password generators to set the generated password. * @since 18.0.0 */ public function setPassword(string $password): void { $this->password = $password; } + + /** + * Get the context this password should generated for. + * @since 31.0.0 + */ + public function getContext(): PasswordContext { + return $this->context; + } } diff --git a/lib/public/Security/Events/ValidatePasswordPolicyEvent.php b/lib/public/Security/Events/ValidatePasswordPolicyEvent.php index 0aa8b516f70..d7ac9442392 100644 --- a/lib/public/Security/Events/ValidatePasswordPolicyEvent.php +++ b/lib/public/Security/Events/ValidatePasswordPolicyEvent.php @@ -9,26 +9,41 @@ declare(strict_types=1); namespace OCP\Security\Events; use OCP\EventDispatcher\Event; +use OCP\Security\PasswordContext; /** + * This event can be emitted to request a validation of a password. + * + * If a password policy app is installed and the password + * is invalid, an `\OCP\HintException` will be thrown. * @since 18.0.0 */ class ValidatePasswordPolicyEvent extends Event { - /** @var string */ - private $password; /** * @since 18.0.0 + * @since 31.0.0 - $context parameter added */ - public function __construct(string $password) { + public function __construct( + private string $password, + private PasswordContext $context = PasswordContext::ACCOUNT, + ) { parent::__construct(); - $this->password = $password; } /** + * Get the password that should be validated. * @since 18.0.0 */ public function getPassword(): string { return $this->password; } + + /** + * Get the context this password should validated for. + * @since 31.0.0 + */ + public function getContext(): PasswordContext { + return $this->context; + } } diff --git a/lib/public/Security/ISecureRandom.php b/lib/public/Security/ISecureRandom.php index 188236dd3f9..aa191ca348f 100644 --- a/lib/public/Security/ISecureRandom.php +++ b/lib/public/Security/ISecureRandom.php @@ -58,7 +58,7 @@ interface ISecureRandom { * Generate a random string of specified length. * @param int $length The length of the generated string * @param string $characters An optional list of characters to use if no character list is - * specified all valid base64 characters are used. + * specified all valid base64 characters are used. * @return string * @since 8.0.0 */ diff --git a/lib/public/Security/Ip/IAddress.php b/lib/public/Security/Ip/IAddress.php new file mode 100644 index 00000000000..242418962fc --- /dev/null +++ b/lib/public/Security/Ip/IAddress.php @@ -0,0 +1,35 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OCP\Security\Ip; + +/** + * @since 30.0.0 + */ +interface IAddress { + /** + * Check if a given IP address is valid + * + * @since 30.0.0 + */ + public static function isValid(string $ip): bool; + + /** + * Check if current address is contained by given ranges + * + * @since 30.0.0 + */ + public function matches(IRange... $ranges): bool; + + /** + * Normalized IP address + * + * @since 30.0.0 + */ + public function __toString(): string; +} diff --git a/lib/public/Security/Ip/IFactory.php b/lib/public/Security/Ip/IFactory.php new file mode 100644 index 00000000000..3b88aa8c756 --- /dev/null +++ b/lib/public/Security/Ip/IFactory.php @@ -0,0 +1,30 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OCP\Security\Ip; + +/** + * @since 30.0.0 + */ +interface IFactory { + /** + * Creates a range from string + * + * @since 30.0.0 + * @throws \InvalidArgumentException on invalid range + */ + public function rangeFromString(string $range): IRange; + + /** + * Creates a address from string + * + * @since 30.0.0 + * @throws \InvalidArgumentException on invalid IP + */ + public function addressFromString(string $ip): IAddress; +} diff --git a/lib/public/Security/Ip/IRange.php b/lib/public/Security/Ip/IRange.php new file mode 100644 index 00000000000..70e1815c75e --- /dev/null +++ b/lib/public/Security/Ip/IRange.php @@ -0,0 +1,37 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OCP\Security\Ip; + +/** + * IP Range (IPv4 or IPv6) + * + * @since 30.0.0 + */ +interface IRange { + /** + * Check if a given range is valid + * + * @since 30.0.0 + */ + public static function isValid(string $range): bool; + + /** + * Check if an address is in the current range + * + * @since 30.0.0 + */ + public function contains(IAddress $address): bool; + + /** + * Normalized IP range + * + * @since 30.0.0 + */ + public function __toString(): string; +} diff --git a/lib/public/Security/Ip/IRemoteAddress.php b/lib/public/Security/Ip/IRemoteAddress.php new file mode 100644 index 00000000000..19a1dab9734 --- /dev/null +++ b/lib/public/Security/Ip/IRemoteAddress.php @@ -0,0 +1,22 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OCP\Security\Ip; + +/** + * IP address of the connected client + * + * @since 30.0.0 + */ +interface IRemoteAddress { + /** + * Check if the current remote address is allowed to perform admin actions + * @since 30.0.0 + */ + public function allowsAdminActions(): bool; +} diff --git a/lib/public/Security/PasswordContext.php b/lib/public/Security/PasswordContext.php new file mode 100644 index 00000000000..909070c09ff --- /dev/null +++ b/lib/public/Security/PasswordContext.php @@ -0,0 +1,29 @@ +<?php + +declare(strict_types=1); +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Security; + +/** + * Define the context in which a password is used. + * This allows setting a context for password validation and password generation. + * + * @package OCP\Security + * @since 31.0.0 + */ +enum PasswordContext { + /** + * Password used for an user account + * @since 31.0.0 + */ + case ACCOUNT; + + /** + * Password used for (public) shares + * @since 31.0.0 + */ + case SHARING; +} diff --git a/lib/public/Settings/IIconSection.php b/lib/public/Settings/IIconSection.php index 5a9fbfebf76..e514a0176b7 100644 --- a/lib/public/Settings/IIconSection.php +++ b/lib/public/Settings/IIconSection.php @@ -29,8 +29,8 @@ interface IIconSection { /** * @return int whether the form should be rather on the top or bottom of - * the settings navigation. The sections are arranged in ascending order of - * the priority values. It is required to return a value between 0 and 99. + * the settings navigation. The sections are arranged in ascending order of + * the priority values. It is required to return a value between 0 and 99. * * E.g.: 70 * @since 9.1 diff --git a/lib/public/Settings/ISettings.php b/lib/public/Settings/ISettings.php index ed465a07fb3..a733eb7956d 100644 --- a/lib/public/Settings/ISettings.php +++ b/lib/public/Settings/ISettings.php @@ -25,8 +25,8 @@ interface ISettings { /** * @return int whether the form should be rather on the top or bottom of - * the admin section. The forms are arranged in ascending order of the - * priority values. It is required to return a value between 0 and 100. + * the admin section. The forms are arranged in ascending order of the + * priority values. It is required to return a value between 0 and 100. * * E.g.: 70 * @since 9.1 diff --git a/lib/public/SetupCheck/SetupResult.php b/lib/public/SetupCheck/SetupResult.php index c79c4e762da..7d64b838087 100644 --- a/lib/public/SetupCheck/SetupResult.php +++ b/lib/public/SetupCheck/SetupResult.php @@ -45,6 +45,7 @@ class SetupResult implements \JsonSerializable { /** * @brief Private constructor, use success()/info()/warning()/error() instead * @param self::SUCCESS|self::INFO|self::WARNING|self::ERROR $severity + * @param array<string, array<string, string>> $descriptionParameters * @throws \OCP\RichObjectStrings\InvalidObjectExeption * @since 28.0.0 * @since 28.0.2 Optional parameter ?array $descriptionParameters diff --git a/lib/public/Share/IAttributes.php b/lib/public/Share/IAttributes.php index af7277c39c0..fad19c60aad 100644 --- a/lib/public/Share/IAttributes.php +++ b/lib/public/Share/IAttributes.php @@ -13,26 +13,26 @@ namespace OCP\Share; */ interface IAttributes { /** - * Sets an attribute enabled/disabled. If the key did not exist before it will be created. + * Sets an attribute. If the key did not exist before it will be created. * * @param string $scope scope * @param string $key key - * @param bool $enabled enabled + * @param bool|string|array|null $value value * @return IAttributes The modified object * @since 25.0.0 */ - public function setAttribute($scope, $key, $enabled); + public function setAttribute(string $scope, string $key, mixed $value): IAttributes; /** - * Returns if attribute is enabled/disabled for given scope id and key. + * Returns the attribute for given scope id and key. * If attribute does not exist, returns null * * @param string $scope scope * @param string $key key - * @return bool|null + * @return bool|string|array|null * @since 25.0.0 */ - public function getAttribute($scope, $key); + public function getAttribute(string $scope, string $key): mixed; /** * Formats the IAttributes object to array with the following format: @@ -40,13 +40,14 @@ interface IAttributes { * 0 => [ * "scope" => <string>, * "key" => <string>, - * "enabled" => <bool> + * "value" => <bool|string|array|null>, * ], * ... * ] * * @return array formatted IAttributes * @since 25.0.0 + * @since 30.0.0, `enabled` was renamed to `value` */ - public function toArray(); + public function toArray(): array; } diff --git a/lib/public/Share/IManager.php b/lib/public/Share/IManager.php index 063e776e68a..b07bc8f8051 100644 --- a/lib/public/Share/IManager.php +++ b/lib/public/Share/IManager.php @@ -300,7 +300,7 @@ interface IManager { public function shareApiAllowLinks(); /** - * Is password on public link requires + * Is password on public link required * * @param bool $checkGroupMembership Check group membership exclusion * @return bool diff --git a/lib/public/Share/IShare.php b/lib/public/Share/IShare.php index 91eebd3afa9..c2843c078e3 100644 --- a/lib/public/Share/IShare.php +++ b/lib/public/Share/IShare.php @@ -564,7 +564,7 @@ interface IShare { public function getShareTime(); /** - * Set if the recipient is informed by mail about the share. + * Set if the recipient should be informed by mail about the share. * * @param bool $mailSend * @return \OCP\Share\IShare The modified object @@ -573,7 +573,7 @@ interface IShare { public function setMailSend($mailSend); /** - * Get if the recipient informed by mail about the share. + * Get if the recipient should be informed by mail about the share. * * @return bool * @since 9.0.0 @@ -617,4 +617,20 @@ interface IShare { * @since 15.0.0 */ public function getHideDownload(): bool; + + /** + * Sets a flag that stores whether a reminder via email has been sent + * + * @return self The modified object + * @since 31.0.0 + */ + public function setReminderSent(bool $reminderSent): IShare; + + /** + * Gets a flag that stores whether a reminder via email has been sent + * + * @return bool + * @since 31.0.0 + */ + public function getReminderSent(): bool; } diff --git a/lib/public/Share/IShareProvider.php b/lib/public/Share/IShareProvider.php index c51bad8f9ef..9d7c8013a36 100644 --- a/lib/public/Share/IShareProvider.php +++ b/lib/public/Share/IShareProvider.php @@ -45,16 +45,6 @@ interface IShareProvider { public function update(\OCP\Share\IShare $share); /** - * Accept a share. - * - * @param IShare $share - * @param string $recipient - * @return IShare The share object - * @since 17.0.0 - */ - // public function acceptShare(IShare $share, string $recipient): IShare; - - /** * Delete a share * * @param \OCP\Share\IShare $share diff --git a/lib/public/Share/IShareProviderSupportsAccept.php b/lib/public/Share/IShareProviderSupportsAccept.php new file mode 100644 index 00000000000..c3a0c2d0218 --- /dev/null +++ b/lib/public/Share/IShareProviderSupportsAccept.php @@ -0,0 +1,27 @@ +<?php + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Share; + +/** + * Interface IShareProviderSupportsAccept + * + * This interface allows to define IShareProvider that can handle the `acceptShare` method, + * which is available since Nextcloud 17. + * + * @since 30.0.0 + */ +interface IShareProviderSupportsAccept extends IShareProvider { + /** + * Accept a share. + * + * @param IShare $share + * @param string $recipient + * @return IShare The share object + * @since 30.0.0 + */ + public function acceptShare(IShare $share, string $recipient): IShare; +} diff --git a/lib/public/Share/IShareProviderWithNotification.php b/lib/public/Share/IShareProviderWithNotification.php new file mode 100644 index 00000000000..c2ba8118175 --- /dev/null +++ b/lib/public/Share/IShareProviderWithNotification.php @@ -0,0 +1,23 @@ +<?php + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\Share; + +/** + * Interface IShareProvider + * + * @since 30.0.0 + */ +interface IShareProviderWithNotification extends IShareProvider { + /** + * Send a mail notification to the recipient of a share + * @param IShare $share + * @return bool True if the mail was sent successfully + * @throws \Exception If the mail could not be sent + * @since 30.0.0 + */ + public function sendMailNotification(IShare $share): bool; +} diff --git a/lib/public/Share_Backend_Collection.php b/lib/public/Share_Backend_Collection.php index 3c3c42ce9f9..8dbe07db851 100644 --- a/lib/public/Share_Backend_Collection.php +++ b/lib/public/Share_Backend_Collection.php @@ -11,7 +11,7 @@ namespace OCP; /** - * Interface for collections of of items implemented by another share backend. + * Interface for collections of items implemented by another share backend. * Extends the Share_Backend interface. * @since 5.0.0 */ diff --git a/lib/public/SpeechToText/Events/AbstractTranscriptionEvent.php b/lib/public/SpeechToText/Events/AbstractTranscriptionEvent.php index eeb7695b387..6554292d413 100644 --- a/lib/public/SpeechToText/Events/AbstractTranscriptionEvent.php +++ b/lib/public/SpeechToText/Events/AbstractTranscriptionEvent.php @@ -13,6 +13,7 @@ use OCP\Files\File; /** * @since 27.0.0 + * @deprecated 30.0.0 */ abstract class AbstractTranscriptionEvent extends Event { /** diff --git a/lib/public/SpeechToText/Events/TranscriptionFailedEvent.php b/lib/public/SpeechToText/Events/TranscriptionFailedEvent.php index 53eb56c2ea9..4c2b0d52017 100644 --- a/lib/public/SpeechToText/Events/TranscriptionFailedEvent.php +++ b/lib/public/SpeechToText/Events/TranscriptionFailedEvent.php @@ -15,6 +15,7 @@ use OCP\Files\File; /** * This Event is emitted if a transcription of a media file using a Speech-To-Text provider failed * @since 27.0.0 + * @deprecated 30.0.0 */ class TranscriptionFailedEvent extends AbstractTranscriptionEvent { /** diff --git a/lib/public/SpeechToText/Events/TranscriptionSuccessfulEvent.php b/lib/public/SpeechToText/Events/TranscriptionSuccessfulEvent.php index 1e333fdc3c7..e8e5359a29e 100644 --- a/lib/public/SpeechToText/Events/TranscriptionSuccessfulEvent.php +++ b/lib/public/SpeechToText/Events/TranscriptionSuccessfulEvent.php @@ -15,6 +15,7 @@ use OCP\Files\File; /** * This Event is emitted when a transcription of a media file happened successfully * @since 27.0.0 + * @deprecated 30.0.0 */ class TranscriptionSuccessfulEvent extends AbstractTranscriptionEvent { /** diff --git a/lib/public/SpeechToText/ISpeechToTextManager.php b/lib/public/SpeechToText/ISpeechToTextManager.php index 27523a69a95..6bd95197695 100644 --- a/lib/public/SpeechToText/ISpeechToTextManager.php +++ b/lib/public/SpeechToText/ISpeechToTextManager.php @@ -17,6 +17,7 @@ use RuntimeException; /** * @since 27.0.0 + * @deprecated 30.0.0 */ interface ISpeechToTextManager { /** @@ -58,11 +59,13 @@ interface ISpeechToTextManager { /** * @param File $file The media file to transcribe + * @param ?string $userId The user that triggered this request + * @param string $appId The app that triggered this request * @returns string The transcription of the passed media file * @throws PreConditionNotMetException If no provider was registered but this method was still called * @throws InvalidArgumentException If the file could not be found or is not of a supported type * @throws RuntimeException If the transcription failed for other reasons * @since 27.0.0 */ - public function transcribeFile(File $file): string; + public function transcribeFile(File $file, ?string $userId, string $appId): string; } diff --git a/lib/public/SpeechToText/ISpeechToTextProvider.php b/lib/public/SpeechToText/ISpeechToTextProvider.php index a1aca06e2e4..dce4a68ea0a 100644 --- a/lib/public/SpeechToText/ISpeechToTextProvider.php +++ b/lib/public/SpeechToText/ISpeechToTextProvider.php @@ -15,6 +15,7 @@ use RuntimeException; /** * @since 27.0.0 + * @deprecated 30.0.0 */ interface ISpeechToTextProvider { /** diff --git a/lib/public/SpeechToText/ISpeechToTextProviderWithId.php b/lib/public/SpeechToText/ISpeechToTextProviderWithId.php index a1d73d10a58..8020c6c9b96 100644 --- a/lib/public/SpeechToText/ISpeechToTextProviderWithId.php +++ b/lib/public/SpeechToText/ISpeechToTextProviderWithId.php @@ -8,6 +8,7 @@ namespace OCP\SpeechToText; /** * @since 28.0.0 + * @deprecated 30.0.0 */ interface ISpeechToTextProviderWithId extends ISpeechToTextProvider { diff --git a/lib/public/SpeechToText/ISpeechToTextProviderWithUserId.php b/lib/public/SpeechToText/ISpeechToTextProviderWithUserId.php index f1b84476b9a..d1bc4216a38 100644 --- a/lib/public/SpeechToText/ISpeechToTextProviderWithUserId.php +++ b/lib/public/SpeechToText/ISpeechToTextProviderWithUserId.php @@ -12,6 +12,7 @@ namespace OCP\SpeechToText; /** * @since 29.0.0 + * @deprecated 30.0.0 */ interface ISpeechToTextProviderWithUserId extends ISpeechToTextProvider { /** diff --git a/lib/public/SystemTag/ISystemTagManager.php b/lib/public/SystemTag/ISystemTagManager.php index 99d806155dc..8d0241e752f 100644 --- a/lib/public/SystemTag/ISystemTagManager.php +++ b/lib/public/SystemTag/ISystemTagManager.php @@ -26,7 +26,7 @@ interface ISystemTagManager { * * @throws \InvalidArgumentException if at least one given tag ids is invalid (string instead of integer, etc.) * @throws TagNotFoundException if at least one given tag ids did no exist - * The message contains a json_encoded array of the ids that could not be found + * The message contains a json_encoded array of the ids that could not be found * * @since 9.0.0, optional parameter $user added in 28.0.0 */ @@ -84,7 +84,7 @@ interface ISystemTagManager { * * @throws TagNotFoundException if tag with the given id does not exist * @throws TagAlreadyExistsException if there is already another tag - * with the same attributes + * with the same attributes * * @since 9.0.0 */ diff --git a/lib/public/SystemTag/ISystemTagObjectMapper.php b/lib/public/SystemTag/ISystemTagObjectMapper.php index b3eb0201ce6..f6e46ad4d84 100644 --- a/lib/public/SystemTag/ISystemTagObjectMapper.php +++ b/lib/public/SystemTag/ISystemTagObjectMapper.php @@ -31,7 +31,7 @@ interface ISystemTagObjectMapper { * @param string $objectType object type * * @return array with object id as key and an array - * of tag ids as value + * of tag ids as value * * @since 9.0.0 */ @@ -48,9 +48,9 @@ interface ISystemTagObjectMapper { * @return string[] array of object ids or empty array if none found * * @throws TagNotFoundException if at least one of the - * given tags does not exist + * given tags does not exist * @throws \InvalidArgumentException When a limit is specified together with - * multiple tag ids + * multiple tag ids * * @since 9.0.0 */ @@ -69,7 +69,7 @@ interface ISystemTagObjectMapper { * @param string|array $tagIds tag id or array of tag ids to assign * * @throws TagNotFoundException if at least one of the - * given tags does not exist + * given tags does not exist * * @since 9.0.0 */ @@ -88,7 +88,7 @@ interface ISystemTagObjectMapper { * @param string|array $tagIds tag id or array of tag ids to unassign * * @throws TagNotFoundException if at least one of the - * given tags does not exist + * given tags does not exist * * @since 9.0.0 */ @@ -101,10 +101,10 @@ interface ISystemTagObjectMapper { * @param string $objectType object type * @param string $tagId tag id to check * @param bool $all true to check that ALL objects have the tag assigned, - * false to check that at least ONE object has the tag. + * false to check that at least ONE object has the tag. * * @return bool true if the condition set by $all is matched, false - * otherwise + * otherwise * * @throws TagNotFoundException if the tag does not exist * diff --git a/lib/public/SystemTag/SystemTagsEntityEvent.php b/lib/public/SystemTag/SystemTagsEntityEvent.php index bccff9eda84..d8f391d0dba 100644 --- a/lib/public/SystemTag/SystemTagsEntityEvent.php +++ b/lib/public/SystemTag/SystemTagsEntityEvent.php @@ -37,9 +37,9 @@ class SystemTagsEntityEvent extends Event { /** * @param string $name * @param \Closure $entityExistsFunction The closure should take one - * argument, which is the id of the entity, that tags - * should be handled for. The return should then be bool, - * depending on whether tags are allowed (true) or not. + * argument, which is the id of the entity, that tags + * should be handled for. The return should then be bool, + * depending on whether tags are allowed (true) or not. * @throws \OutOfBoundsException when the entity name is already taken * @since 9.1.0 */ diff --git a/lib/public/TaskProcessing/EShapeType.php b/lib/public/TaskProcessing/EShapeType.php index d66de6e01a8..cd8d6d837da 100644 --- a/lib/public/TaskProcessing/EShapeType.php +++ b/lib/public/TaskProcessing/EShapeType.php @@ -23,6 +23,7 @@ enum EShapeType: int { case Audio = 3; case Video = 4; case File = 5; + case Enum = 6; case ListOfNumbers = 10; case ListOfTexts = 11; case ListOfImages = 12; @@ -32,11 +33,33 @@ enum EShapeType: int { /** * @param mixed $value + * @param ShapeEnumValue[] $enumValues + * @return void + * @throws ValidationException + * @since 30.0.0 + */ + public function validateEnum(mixed $value, array $enumValues): void { + if ($this !== EShapeType::Enum) { + throw new ValidationException('Provider provided enum values for non-enum slot'); + } + foreach ($enumValues as $enumValue) { + if ($value === $enumValue->getValue()) { + return; + } + } + throw new ValidationException('Wrong value given for Enum slot. Got "' . $value . '", but expected one of the provided enum values: "' . implode('", "', array_map(fn ($enumValue) => $enumValue->getValue(), $enumValues)) . '"'); + } + + /** + * @param mixed $value * @return void * @throws ValidationException * @since 30.0.0 */ private function validateNonFileType(mixed $value): void { + if ($this === EShapeType::Enum && !is_string($value)) { + throw new ValidationException('Non-text item provided for Enum slot'); + } if ($this === EShapeType::Text && !is_string($value)) { throw new ValidationException('Non-text item provided for Text slot'); } @@ -89,7 +112,7 @@ enum EShapeType: int { * @throws ValidationException * @since 30.0.0 */ - public function validateOutput(mixed $value) { + public function validateOutputWithFileData(mixed $value): void { $this->validateNonFileType($value); if ($this === EShapeType::Image && !is_string($value)) { throw new ValidationException('Non-image item provided for Image slot'); @@ -118,6 +141,40 @@ enum EShapeType: int { } /** + * @param mixed $value + * @return void + * @throws ValidationException + * @since 30.0.0 + */ + public function validateOutputWithFileIds(mixed $value): void { + $this->validateNonFileType($value); + if ($this === EShapeType::Image && !is_numeric($value)) { + throw new ValidationException('Non-image item provided for Image slot'); + } + if ($this === EShapeType::ListOfImages && (!is_array($value) || count(array_filter($value, fn ($item) => !is_numeric($item))) > 0)) { + throw new ValidationException('Non-image list item provided for ListOfImages slot'); + } + if ($this === EShapeType::Audio && !is_string($value)) { + throw new ValidationException('Non-audio item provided for Audio slot'); + } + if ($this === EShapeType::ListOfAudios && (!is_array($value) || count(array_filter($value, fn ($item) => !is_numeric($item))) > 0)) { + throw new ValidationException('Non-audio list item provided for ListOfAudio slot'); + } + if ($this === EShapeType::Video && !is_string($value)) { + throw new ValidationException('Non-video item provided for Video slot'); + } + if ($this === EShapeType::ListOfVideos && (!is_array($value) || count(array_filter($value, fn ($item) => !is_numeric($item))) > 0)) { + throw new ValidationException('Non-video list item provided for ListOfTexts slot'); + } + if ($this === EShapeType::File && !is_string($value)) { + throw new ValidationException('Non-file item provided for File slot'); + } + if ($this === EShapeType::ListOfFiles && (!is_array($value) || count(array_filter($value, fn ($item) => !is_numeric($item))) > 0)) { + throw new ValidationException('Non-audio list item provided for ListOfFiles slot'); + } + } + + /** * @param EShapeType $type * @return EShapeType * @since 30.0.0 @@ -125,4 +182,13 @@ enum EShapeType: int { public static function getScalarType(EShapeType $type): EShapeType { return EShapeType::from($type->value % 10); } + + /** + * @param EShapeType $type + * @return bool + * @since 30.0.0 + */ + public static function isFileType(EShapeType $type): bool { + return in_array(EShapeType::getScalarType($type), [EShapeType::File, EShapeType::Image, EShapeType::Audio, EShapeType::Video], true); + } } diff --git a/lib/public/TaskProcessing/IManager.php b/lib/public/TaskProcessing/IManager.php index 599bd244d8a..c26a5d67339 100644 --- a/lib/public/TaskProcessing/IManager.php +++ b/lib/public/TaskProcessing/IManager.php @@ -38,15 +38,15 @@ interface IManager { public function getProviders(): array; /** - * @param string $taskType + * @param string $taskTypeId * @return IProvider * @throws Exception * @since 30.0.0 */ - public function getPreferredProvider(string $taskType); + public function getPreferredProvider(string $taskTypeId); /** - * @return array<string,array{name: string, description: string, inputShape: ShapeDescriptor[], optionalInputShape: ShapeDescriptor[], outputShape: ShapeDescriptor[], optionalOutputShape: ShapeDescriptor[]}> + * @return array<array-key,array{name: string, description: string, inputShape: ShapeDescriptor[], inputShapeEnumValues: ShapeEnumValue[][], inputShapeDefaults: array<array-key, numeric|string>, optionalInputShape: ShapeDescriptor[], optionalInputShapeEnumValues: ShapeEnumValue[][], optionalInputShapeDefaults: array<array-key, numeric|string>, outputShape: ShapeDescriptor[], outputShapeEnumValues: ShapeEnumValue[][], optionalOutputShape: ShapeDescriptor[], optionalOutputShapeEnumValues: ShapeEnumValue[][]}> * @since 30.0.0 */ public function getAvailableTaskTypes(): array; @@ -62,6 +62,33 @@ interface IManager { public function scheduleTask(Task $task): void; /** + * Run the task and return the finished task + * + * @param Task $task The task to run + * @return Task The result task + * @throws PreConditionNotMetException If no or not the requested provider was registered but this method was still called + * @throws ValidationException the given task input didn't pass validation against the task type's input shape and/or the providers optional input shape specs + * @throws Exception storing the task in the database failed + * @throws UnauthorizedException the user scheduling the task does not have access to the files used in the input + * @since 30.0.0 + */ + public function runTask(Task $task): Task; + + /** + * Process task with a synchronous provider + * + * Prepare task input data and run the process method of the provider + * This should only be used by OC\TaskProcessing\SynchronousBackgroundJob::run() and OCP\TaskProcessing\IManager::runTask() + * + * @param Task $task + * @param ISynchronousProvider $provider + * @return bool True if the task has run successfully + * @throws Exception + * @since 30.0.0 + */ + public function processTask(Task $task, ISynchronousProvider $provider): bool; + + /** * Delete a task that has been scheduled before * * @param Task $task The task to delete @@ -91,11 +118,12 @@ interface IManager { * @param int $id The id of the task * @param string|null $error * @param array|null $result + * @param bool $isUsingFileIds * @throws Exception If the query failed * @throws NotFoundException If the task could not be found * @since 30.0.0 */ - public function setTaskResult(int $id, ?string $error, ?array $result): void; + public function setTaskResult(int $id, ?string $error, ?array $result, bool $isUsingFileIds = false): void; /** * @param int $id @@ -140,6 +168,24 @@ interface IManager { public function getUserTasks(?string $userId, ?string $taskTypeId = null, ?string $customId = null): array; /** + * @param string|null $userId The user id that scheduled the task + * @param string|null $taskTypeId The task type id to filter by + * @param string|null $appId The app ID of the app that submitted the task + * @param string|null $customId The custom task ID + * @param int|null $status The task status + * @param int|null $scheduleAfter Minimum schedule time filter + * @param int|null $endedBefore Maximum ending time filter + * @return list<Task> + * @throws Exception If the query failed + * @throws NotFoundException If the task could not be found + * @since 30.0.0 + */ + public function getTasks( + ?string $userId, ?string $taskTypeId = null, ?string $appId = null, ?string $customId = null, + ?int $status = null, ?int $scheduleAfter = null, ?int $endedBefore = null + ): array; + + /** * @param string|null $userId * @param string $appId * @param string|null $customId @@ -152,7 +198,7 @@ interface IManager { /** * Prepare the task's input data, so it can be processed by the provider - * ie. this replaces file ids with base64 data + * ie. this replaces file ids with File objects * * @param Task $task * @return array<array-key, list<numeric|string|File>|numeric|string|File> @@ -160,6 +206,7 @@ interface IManager { * @throws GenericFileException * @throws LockedException * @throws ValidationException + * @throws UnauthorizedException * @since 30.0.0 */ public function prepareInputData(Task $task): array; diff --git a/lib/public/TaskProcessing/IProvider.php b/lib/public/TaskProcessing/IProvider.php index 68a708ca834..a4e752216c7 100644 --- a/lib/public/TaskProcessing/IProvider.php +++ b/lib/public/TaskProcessing/IProvider.php @@ -58,4 +58,52 @@ interface IProvider { * @psalm-return ShapeDescriptor[] */ public function getOptionalOutputShape(): array; + + /** + * Returns the option list for each input shape ENUM slot + * + * @since 30.0.0 + * @psalm-return ShapeEnumValue[][] + */ + public function getInputShapeEnumValues(): array; + + /** + * Returns the default values for input shape slots + * + * @since 30.0.0 + * @psalm-return array<array-key, string|numeric> + */ + public function getInputShapeDefaults(): array; + + /** + * Returns the option list for each optional input shape ENUM slot + * + * @since 30.0.0 + * @psalm-return ShapeEnumValue[][] + */ + public function getOptionalInputShapeEnumValues(): array; + + /** + * Returns the default values for optional input shape slots + * + * @since 30.0.0 + * @psalm-return array<array-key, string|numeric> + */ + public function getOptionalInputShapeDefaults(): array; + + /** + * Returns the option list for each output shape ENUM slot + * + * @since 30.0.0 + * @psalm-return ShapeEnumValue[][] + */ + public function getOutputShapeEnumValues(): array; + + /** + * Returns the option list for each optional output shape ENUM slot + * + * @since 30.0.0 + * @psalm-return ShapeEnumValue[][] + */ + public function getOptionalOutputShapeEnumValues(): array; } diff --git a/lib/public/TaskProcessing/ShapeDescriptor.php b/lib/public/TaskProcessing/ShapeDescriptor.php index 5759b260865..19e57c8a91d 100644 --- a/lib/public/TaskProcessing/ShapeDescriptor.php +++ b/lib/public/TaskProcessing/ShapeDescriptor.php @@ -49,11 +49,11 @@ class ShapeDescriptor implements \JsonSerializable { } /** - * @return array{name: string, description: string, type: "Number"|"Text"|"Audio"|"Image"|"Video"|"File"|"ListOfNumbers"|"ListOfTexts"|"ListOfImages"|"ListOfAudios"|"ListOfVideos"|"ListOfFiles"} + * @return array{name: string, description: string, type: "Number"|"Text"|"Audio"|"Image"|"Video"|"File"|"Enum"|"ListOfNumbers"|"ListOfTexts"|"ListOfImages"|"ListOfAudios"|"ListOfVideos"|"ListOfFiles"} * @since 30.0.0 */ public function jsonSerialize(): array { - /** @var "Number"|"Text"|"Audio"|"Image"|"Video"|"File"|"ListOfNumbers"|"ListOfTexts"|"ListOfImages"|"ListOfAudios"|"ListOfVideos"|"ListOfFiles" $type */ + /** @var "Number"|"Text"|"Audio"|"Image"|"Video"|"File"|"Enum"|"ListOfNumbers"|"ListOfTexts"|"ListOfImages"|"ListOfAudios"|"ListOfVideos"|"ListOfFiles" $type */ $type = $this->getShapeType()->name; return [ 'name' => $this->getName(), diff --git a/lib/public/TaskProcessing/ShapeEnumValue.php b/lib/public/TaskProcessing/ShapeEnumValue.php new file mode 100644 index 00000000000..bc500524304 --- /dev/null +++ b/lib/public/TaskProcessing/ShapeEnumValue.php @@ -0,0 +1,51 @@ +<?php + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +namespace OCP\TaskProcessing; + +/** + * Data object for input output shape enum slot value + * @since 30.0.0 + */ +class ShapeEnumValue implements \JsonSerializable { + /** + * @param string $name + * @param string $value + * @since 30.0.0 + */ + public function __construct( + private string $name, + private string $value, + ) { + } + + /** + * @return string + * @since 30.0.0 + */ + public function getName(): string { + return $this->name; + } + + /** + * @return string + * @since 30.0.0 + */ + public function getValue(): string { + return $this->value; + } + + /** + * @return array{name: string, value: string} + * @since 30.0.0 + */ + public function jsonSerialize(): array { + return [ + 'name' => $this->getName(), + 'value' => $this->getValue(), + ]; + } +} diff --git a/lib/public/TaskProcessing/Task.php b/lib/public/TaskProcessing/Task.php index 2ec367e4a0a..db8e4d7fab5 100644 --- a/lib/public/TaskProcessing/Task.php +++ b/lib/public/TaskProcessing/Task.php @@ -30,6 +30,9 @@ final class Task implements \JsonSerializable { protected int $lastUpdated; + protected ?string $webhookUri = null; + protected ?string $webhookMethod = null; + /** * @since 30.0.0 */ @@ -60,6 +63,10 @@ final class Task implements \JsonSerializable { */ protected int $status = self::STATUS_UNKNOWN; + protected ?int $scheduledAt = null; + protected ?int $startedAt = null; + protected ?int $endedAt = null; + /** * @param string $taskTypeId * @param array<string,list<numeric|string>|numeric|string> $input @@ -198,7 +205,55 @@ final class Task implements \JsonSerializable { } /** - * @psalm-return array{id: ?int, lastUpdated: int, type: string, status: 'STATUS_CANCELLED'|'STATUS_FAILED'|'STATUS_SUCCESSFUL'|'STATUS_RUNNING'|'STATUS_SCHEDULED'|'STATUS_UNKNOWN', userId: ?string, appId: string, input: array<array-key, list<numeric|string>|numeric|string>, output: ?array<array-key, list<numeric|string>|numeric|string>, customId: ?string, completionExpectedAt: ?int, progress: ?float} + * @return int|null + * @since 30.0.0 + */ + final public function getScheduledAt(): ?int { + return $this->scheduledAt; + } + + /** + * @param int|null $scheduledAt + * @since 30.0.0 + */ + final public function setScheduledAt(?int $scheduledAt): void { + $this->scheduledAt = $scheduledAt; + } + + /** + * @return int|null + * @since 30.0.0 + */ + final public function getStartedAt(): ?int { + return $this->startedAt; + } + + /** + * @param int|null $startedAt + * @since 30.0.0 + */ + final public function setStartedAt(?int $startedAt): void { + $this->startedAt = $startedAt; + } + + /** + * @return int|null + * @since 30.0.0 + */ + final public function getEndedAt(): ?int { + return $this->endedAt; + } + + /** + * @param int|null $endedAt + * @since 30.0.0 + */ + final public function setEndedAt(?int $endedAt): void { + $this->endedAt = $endedAt; + } + + /** + * @psalm-return array{id: ?int, lastUpdated: int, type: string, status: 'STATUS_CANCELLED'|'STATUS_FAILED'|'STATUS_SUCCESSFUL'|'STATUS_RUNNING'|'STATUS_SCHEDULED'|'STATUS_UNKNOWN', userId: ?string, appId: string, input: array<array-key, list<numeric|string>|numeric|string>, output: ?array<array-key, list<numeric|string>|numeric|string>, customId: ?string, completionExpectedAt: ?int, progress: ?float, scheduledAt: ?int, startedAt: ?int, endedAt: ?int} * @since 30.0.0 */ final public function jsonSerialize(): array { @@ -214,6 +269,9 @@ final class Task implements \JsonSerializable { 'customId' => $this->getCustomId(), 'completionExpectedAt' => $this->getCompletionExpectedAt()?->getTimestamp(), 'progress' => $this->getProgress(), + 'scheduledAt' => $this->getScheduledAt(), + 'startedAt' => $this->getStartedAt(), + 'endedAt' => $this->getEndedAt(), ]; } @@ -265,6 +323,40 @@ final class Task implements \JsonSerializable { } /** + * @return null|string + * @since 30.0.0 + */ + final public function getWebhookUri(): ?string { + return $this->webhookUri; + } + + /** + * @param string|null $webhookUri + * @return void + * @since 30.0.0 + */ + final public function setWebhookUri(?string $webhookUri): void { + $this->webhookUri = $webhookUri; + } + + /** + * @return null|string + * @since 30.0.0 + */ + final public function getWebhookMethod(): ?string { + return $this->webhookMethod; + } + + /** + * @param string|null $webhookMethod + * @return void + * @since 30.0.0 + */ + final public function setWebhookMethod(?string $webhookMethod): void { + $this->webhookMethod = $webhookMethod; + } + + /** * @param int $status * @return 'STATUS_CANCELLED'|'STATUS_FAILED'|'STATUS_SUCCESSFUL'|'STATUS_RUNNING'|'STATUS_SCHEDULED'|'STATUS_UNKNOWN' * @since 30.0.0 diff --git a/lib/public/TaskProcessing/TaskTypes/ContextWrite.php b/lib/public/TaskProcessing/TaskTypes/ContextWrite.php index 08a8fc5b301..36ee8f24d3f 100644 --- a/lib/public/TaskProcessing/TaskTypes/ContextWrite.php +++ b/lib/public/TaskProcessing/TaskTypes/ContextWrite.php @@ -43,7 +43,7 @@ class ContextWrite implements ITaskType { * @since 30.0.0 */ public function getName(): string { - return $this->l->t('ContextWrite'); + return $this->l->t('Context write'); } /** diff --git a/lib/public/TaskProcessing/TaskTypes/TextToText.php b/lib/public/TaskProcessing/TaskTypes/TextToText.php index 7ac7f2eca05..92eaf5629e8 100644 --- a/lib/public/TaskProcessing/TaskTypes/TextToText.php +++ b/lib/public/TaskProcessing/TaskTypes/TextToText.php @@ -51,7 +51,7 @@ class TextToText implements ITaskType { * @since 30.0.0 */ public function getDescription(): string { - return $this->l->t('Runs an arbitrary prompt through a language model that retuns a reply'); + return $this->l->t('Runs an arbitrary prompt through a language model that returns a reply'); } /** diff --git a/lib/public/TaskProcessing/TaskTypes/TextToTextTranslate.php b/lib/public/TaskProcessing/TaskTypes/TextToTextTranslate.php new file mode 100644 index 00000000000..11b71ec3eb2 --- /dev/null +++ b/lib/public/TaskProcessing/TaskTypes/TextToTextTranslate.php @@ -0,0 +1,102 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OCP\TaskProcessing\TaskTypes; + +use OCP\IL10N; +use OCP\L10N\IFactory; +use OCP\TaskProcessing\EShapeType; +use OCP\TaskProcessing\ITaskType; +use OCP\TaskProcessing\ShapeDescriptor; + +/** + * This is the task processing task type for generic text processing + * @since 30.0.0 + */ +class TextToTextTranslate implements ITaskType { + /** + * @since 30.0.0 + */ + public const ID = 'core:text2text:translate'; + + private IL10N $l; + + /** + * @param IFactory $l10nFactory + * @since 30.0.0 + */ + public function __construct( + IFactory $l10nFactory, + ) { + $this->l = $l10nFactory->get('core'); + } + + + /** + * @inheritDoc + * @since 30.0.0 + */ + public function getName(): string { + return $this->l->t('Translate'); + } + + /** + * @inheritDoc + * @since 30.0.0 + */ + public function getDescription(): string { + return $this->l->t('Translate text from one language to another'); + } + + /** + * @return string + * @since 30.0.0 + */ + public function getId(): string { + return self::ID; + } + + /** + * @return ShapeDescriptor[] + * @since 30.0.0 + */ + public function getInputShape(): array { + return [ + 'input' => new ShapeDescriptor( + $this->l->t('Origin text'), + $this->l->t('The text to translate'), + EShapeType::Text + ), + 'origin_language' => new ShapeDescriptor( + $this->l->t('Origin language'), + $this->l->t('The language of the origin text'), + EShapeType::Enum + ), + 'target_language' => new ShapeDescriptor( + $this->l->t('Target language'), + $this->l->t('The desired language to translate the origin text in'), + EShapeType::Enum + ), + ]; + } + + /** + * @return ShapeDescriptor[] + * @since 30.0.0 + */ + public function getOutputShape(): array { + return [ + 'output' => new ShapeDescriptor( + $this->l->t('Result'), + $this->l->t('The translated text'), + EShapeType::Text + ), + ]; + } +} diff --git a/lib/public/TextProcessing/Events/AbstractTextProcessingEvent.php b/lib/public/TextProcessing/Events/AbstractTextProcessingEvent.php index d61847716bf..e42f64ca28c 100644 --- a/lib/public/TextProcessing/Events/AbstractTextProcessingEvent.php +++ b/lib/public/TextProcessing/Events/AbstractTextProcessingEvent.php @@ -13,6 +13,7 @@ use OCP\TextProcessing\Task; /** * @since 27.1.0 + * @deprecated 30.0.0 */ abstract class AbstractTextProcessingEvent extends Event { /** diff --git a/lib/public/TextProcessing/Events/TaskFailedEvent.php b/lib/public/TextProcessing/Events/TaskFailedEvent.php index b41c519bab9..dfdb9137f95 100644 --- a/lib/public/TextProcessing/Events/TaskFailedEvent.php +++ b/lib/public/TextProcessing/Events/TaskFailedEvent.php @@ -10,6 +10,7 @@ use OCP\TextProcessing\Task; /** * @since 27.1.0 + * @deprecated 30.0.0 */ class TaskFailedEvent extends AbstractTextProcessingEvent { /** diff --git a/lib/public/TextProcessing/Events/TaskSuccessfulEvent.php b/lib/public/TextProcessing/Events/TaskSuccessfulEvent.php index b96e401364d..0716f4d45c6 100644 --- a/lib/public/TextProcessing/Events/TaskSuccessfulEvent.php +++ b/lib/public/TextProcessing/Events/TaskSuccessfulEvent.php @@ -8,6 +8,7 @@ namespace OCP\TextProcessing\Events; /** * @since 27.1.0 + * @deprecated 30.0.0 */ class TaskSuccessfulEvent extends AbstractTextProcessingEvent { } diff --git a/lib/public/TextProcessing/Exception/TaskFailureException.php b/lib/public/TextProcessing/Exception/TaskFailureException.php index e996811c28e..06fbdf5e765 100644 --- a/lib/public/TextProcessing/Exception/TaskFailureException.php +++ b/lib/public/TextProcessing/Exception/TaskFailureException.php @@ -9,6 +9,7 @@ namespace OCP\TextProcessing\Exception; /** * Exception thrown when a task failed * @since 28.0.0 + * @deprecated 30.0.0 */ class TaskFailureException extends \RuntimeException { } diff --git a/lib/public/TextProcessing/FreePromptTaskType.php b/lib/public/TextProcessing/FreePromptTaskType.php index 2aac04422c1..2433f24dbd7 100644 --- a/lib/public/TextProcessing/FreePromptTaskType.php +++ b/lib/public/TextProcessing/FreePromptTaskType.php @@ -15,6 +15,7 @@ use OCP\L10N\IFactory; /** * This is the text processing task type for free prompting * @since 27.1.0 + * @deprecated 30.0.0 */ class FreePromptTaskType implements ITaskType { private IL10N $l; diff --git a/lib/public/TextProcessing/HeadlineTaskType.php b/lib/public/TextProcessing/HeadlineTaskType.php index 893997ce669..00eb66466ae 100644 --- a/lib/public/TextProcessing/HeadlineTaskType.php +++ b/lib/public/TextProcessing/HeadlineTaskType.php @@ -15,6 +15,7 @@ use OCP\L10N\IFactory; /** * This is the text processing task type for creating headline * @since 27.1.0 + * @deprecated 30.0.0 */ class HeadlineTaskType implements ITaskType { private IL10N $l; diff --git a/lib/public/TextProcessing/IManager.php b/lib/public/TextProcessing/IManager.php index 8869b1d0d60..701ad18940f 100644 --- a/lib/public/TextProcessing/IManager.php +++ b/lib/public/TextProcessing/IManager.php @@ -20,6 +20,7 @@ use RuntimeException; * API surface for apps interacting with and making use of LanguageModel providers * without known which providers are installed * @since 27.1.0 + * @deprecated 30.0.0 */ interface IManager { /** diff --git a/lib/public/TextProcessing/IProvider.php b/lib/public/TextProcessing/IProvider.php index 4f1444e2b0e..24efbc1ec8c 100644 --- a/lib/public/TextProcessing/IProvider.php +++ b/lib/public/TextProcessing/IProvider.php @@ -17,6 +17,7 @@ use RuntimeException; * implement a text processing provider * @psalm-template-covariant T of ITaskType * @since 27.1.0 + * @deprecated 30.0.0 */ interface IProvider { /** diff --git a/lib/public/TextProcessing/IProviderWithExpectedRuntime.php b/lib/public/TextProcessing/IProviderWithExpectedRuntime.php index 46bbcccdc37..b3986e8b3a8 100644 --- a/lib/public/TextProcessing/IProviderWithExpectedRuntime.php +++ b/lib/public/TextProcessing/IProviderWithExpectedRuntime.php @@ -15,6 +15,7 @@ namespace OCP\TextProcessing; * @since 28.0.0 * @template T of ITaskType * @template-extends IProvider<T> + * @deprecated 30.0.0 */ interface IProviderWithExpectedRuntime extends IProvider { /** diff --git a/lib/public/TextProcessing/IProviderWithId.php b/lib/public/TextProcessing/IProviderWithId.php index 7fda3350ae8..359ec9cef71 100644 --- a/lib/public/TextProcessing/IProviderWithId.php +++ b/lib/public/TextProcessing/IProviderWithId.php @@ -13,6 +13,7 @@ namespace OCP\TextProcessing; * @since 28.0.0 * @extends IProvider<T> * @template T of ITaskType + * @deprecated 30.0.0 */ interface IProviderWithId extends IProvider { /** diff --git a/lib/public/TextProcessing/IProviderWithUserId.php b/lib/public/TextProcessing/IProviderWithUserId.php index b97ca2145b7..197dd3d9740 100644 --- a/lib/public/TextProcessing/IProviderWithUserId.php +++ b/lib/public/TextProcessing/IProviderWithUserId.php @@ -15,6 +15,7 @@ namespace OCP\TextProcessing; * @since 28.0.0 * @template T of ITaskType * @template-extends IProvider<T> + * @deprecated 30.0.0 */ interface IProviderWithUserId extends IProvider { /** diff --git a/lib/public/TextProcessing/ITaskType.php b/lib/public/TextProcessing/ITaskType.php index fcff9c8b207..5ec1e8dd049 100644 --- a/lib/public/TextProcessing/ITaskType.php +++ b/lib/public/TextProcessing/ITaskType.php @@ -13,6 +13,7 @@ namespace OCP\TextProcessing; * This is a task type interface that is implemented by text processing * task types * @since 27.1.0 + * @deprecated 30.0.0 */ interface ITaskType { /** diff --git a/lib/public/TextProcessing/SummaryTaskType.php b/lib/public/TextProcessing/SummaryTaskType.php index b77852d3da1..656a50ebc62 100644 --- a/lib/public/TextProcessing/SummaryTaskType.php +++ b/lib/public/TextProcessing/SummaryTaskType.php @@ -15,6 +15,7 @@ use OCP\L10N\IFactory; /** * This is the text processing task type for summaries * @since 27.1.0 + * @deprecated 30.0.0 */ class SummaryTaskType implements ITaskType { private IL10N $l; diff --git a/lib/public/TextProcessing/Task.php b/lib/public/TextProcessing/Task.php index 63fcf2c952a..d968ad9ba3e 100644 --- a/lib/public/TextProcessing/Task.php +++ b/lib/public/TextProcessing/Task.php @@ -13,6 +13,7 @@ namespace OCP\TextProcessing; * This is a text processing task * @since 27.1.0 * @psalm-template-covariant T of ITaskType + * @deprecated 30.0.0 */ final class Task implements \JsonSerializable { protected ?int $id = null; diff --git a/lib/public/TextProcessing/TopicsTaskType.php b/lib/public/TextProcessing/TopicsTaskType.php index 3f1c2c33eda..c693ee3d27f 100644 --- a/lib/public/TextProcessing/TopicsTaskType.php +++ b/lib/public/TextProcessing/TopicsTaskType.php @@ -15,6 +15,7 @@ use OCP\L10N\IFactory; /** * This is the text processing task type for topics extraction * @since 27.1.0 + * @deprecated 30.0.0 */ class TopicsTaskType implements ITaskType { private IL10N $l; diff --git a/lib/public/TextToImage/Events/AbstractTextToImageEvent.php b/lib/public/TextToImage/Events/AbstractTextToImageEvent.php index 4217c75d6b7..75920487412 100644 --- a/lib/public/TextToImage/Events/AbstractTextToImageEvent.php +++ b/lib/public/TextToImage/Events/AbstractTextToImageEvent.php @@ -14,6 +14,7 @@ use OCP\TextToImage\Task; /** * @since 28.0.0 + * @deprecated 30.0.0 */ abstract class AbstractTextToImageEvent extends Event { /** diff --git a/lib/public/TextToImage/Events/TaskFailedEvent.php b/lib/public/TextToImage/Events/TaskFailedEvent.php index eb3049cecc2..8a1b8bbad61 100644 --- a/lib/public/TextToImage/Events/TaskFailedEvent.php +++ b/lib/public/TextToImage/Events/TaskFailedEvent.php @@ -13,6 +13,7 @@ use OCP\TextToImage\Task; /** * @since 28.0.0 + * @deprecated 30.0.0 */ class TaskFailedEvent extends AbstractTextToImageEvent { /** diff --git a/lib/public/TextToImage/Events/TaskSuccessfulEvent.php b/lib/public/TextToImage/Events/TaskSuccessfulEvent.php index c8b125eeb35..ae679437457 100644 --- a/lib/public/TextToImage/Events/TaskSuccessfulEvent.php +++ b/lib/public/TextToImage/Events/TaskSuccessfulEvent.php @@ -11,6 +11,7 @@ namespace OCP\TextToImage\Events; /** * @since 28.0.0 + * @deprecated 30.0.0 */ class TaskSuccessfulEvent extends AbstractTextToImageEvent { } diff --git a/lib/public/TextToImage/Exception/TaskFailureException.php b/lib/public/TextToImage/Exception/TaskFailureException.php index 18d86c6dd1f..89144c3033a 100644 --- a/lib/public/TextToImage/Exception/TaskFailureException.php +++ b/lib/public/TextToImage/Exception/TaskFailureException.php @@ -9,6 +9,7 @@ namespace OCP\TextToImage\Exception; /** * @since 28.0.0 + * @deprecated 30.0.0 */ class TaskFailureException extends TextToImageException { } diff --git a/lib/public/TextToImage/Exception/TaskNotFoundException.php b/lib/public/TextToImage/Exception/TaskNotFoundException.php index a367bc4c849..a488eceb7f4 100644 --- a/lib/public/TextToImage/Exception/TaskNotFoundException.php +++ b/lib/public/TextToImage/Exception/TaskNotFoundException.php @@ -9,6 +9,7 @@ namespace OCP\TextToImage\Exception; /** * @since 28.0.0 + * @deprecated 30.0.0 */ class TaskNotFoundException extends TextToImageException { } diff --git a/lib/public/TextToImage/Exception/TextToImageException.php b/lib/public/TextToImage/Exception/TextToImageException.php index 44b1ccac36a..d8672544072 100644 --- a/lib/public/TextToImage/Exception/TextToImageException.php +++ b/lib/public/TextToImage/Exception/TextToImageException.php @@ -9,6 +9,7 @@ namespace OCP\TextToImage\Exception; /** * @since 28.0.0 + * @deprecated 30.0.0 */ class TextToImageException extends \Exception { } diff --git a/lib/public/TextToImage/IManager.php b/lib/public/TextToImage/IManager.php index a9c3bb8d54b..df8adfc39f4 100644 --- a/lib/public/TextToImage/IManager.php +++ b/lib/public/TextToImage/IManager.php @@ -20,6 +20,7 @@ use RuntimeException; * API surface for apps interacting with and making use of TextToImage providers * without knowing which providers are installed * @since 28.0.0 + * @deprecated 30.0.0 */ interface IManager { /** diff --git a/lib/public/TextToImage/IProvider.php b/lib/public/TextToImage/IProvider.php index ad9deba1730..4a278a0d706 100644 --- a/lib/public/TextToImage/IProvider.php +++ b/lib/public/TextToImage/IProvider.php @@ -15,6 +15,7 @@ use RuntimeException; * This is the interface that is implemented by apps that * implement a text to image provider * @since 28.0.0 + * @deprecated 30.0.0 */ interface IProvider { /** diff --git a/lib/public/TextToImage/IProviderWithUserId.php b/lib/public/TextToImage/IProviderWithUserId.php index c42ec163dbe..a3eedbd9dc0 100644 --- a/lib/public/TextToImage/IProviderWithUserId.php +++ b/lib/public/TextToImage/IProviderWithUserId.php @@ -9,6 +9,7 @@ namespace OCP\TextToImage; /** * @since 29.0.0 + * @deprecated 30.0.0 */ interface IProviderWithUserId extends IProvider { /** diff --git a/lib/public/TextToImage/Task.php b/lib/public/TextToImage/Task.php index a460c082eea..7b94de0fbb3 100644 --- a/lib/public/TextToImage/Task.php +++ b/lib/public/TextToImage/Task.php @@ -20,6 +20,7 @@ use OCP\Image; * This is a text to image task * * @since 28.0.0 + * @deprecated 30.0.0 */ final class Task implements \JsonSerializable { protected ?int $id = null; @@ -80,7 +81,7 @@ final class Task implements \JsonSerializable { $images = []; for ($i = 0; $i < $this->getNumberOfImages(); $i++) { $image = new Image(); - $image->loadFromFileHandle($folder->getFile((string) $i)->read()); + $image->loadFromFileHandle($folder->getFile((string)$i)->read()); $images[] = $image; } return $images; diff --git a/lib/public/Translation/CouldNotTranslateException.php b/lib/public/Translation/CouldNotTranslateException.php index 77948f18da9..fc9f33c879a 100644 --- a/lib/public/Translation/CouldNotTranslateException.php +++ b/lib/public/Translation/CouldNotTranslateException.php @@ -11,6 +11,7 @@ namespace OCP\Translation; /** * @since 27.0.0 + * @deprecated 30.0.0 */ class CouldNotTranslateException extends \RuntimeException { /** diff --git a/lib/public/Translation/IDetectLanguageProvider.php b/lib/public/Translation/IDetectLanguageProvider.php index 28f64ab8ef5..18f40b1aa52 100644 --- a/lib/public/Translation/IDetectLanguageProvider.php +++ b/lib/public/Translation/IDetectLanguageProvider.php @@ -12,6 +12,7 @@ namespace OCP\Translation; /** * @since 26.0.0 + * @deprecated 30.0.0 */ interface IDetectLanguageProvider { /** diff --git a/lib/public/Translation/ITranslationManager.php b/lib/public/Translation/ITranslationManager.php index 8c587f5286f..efeaa2de1e2 100644 --- a/lib/public/Translation/ITranslationManager.php +++ b/lib/public/Translation/ITranslationManager.php @@ -15,6 +15,7 @@ use OCP\PreConditionNotMetException; /** * @since 26.0.0 + * @deprecated 30.0.0 */ interface ITranslationManager { /** diff --git a/lib/public/Translation/ITranslationProvider.php b/lib/public/Translation/ITranslationProvider.php index 45c0467f77e..39267ab9ca5 100644 --- a/lib/public/Translation/ITranslationProvider.php +++ b/lib/public/Translation/ITranslationProvider.php @@ -14,6 +14,7 @@ use RuntimeException; /** * @since 26.0.0 + * @deprecated 30.0.0 */ interface ITranslationProvider { /** diff --git a/lib/public/Translation/ITranslationProviderWithId.php b/lib/public/Translation/ITranslationProviderWithId.php index 1554fd9bb01..93fc641ee02 100644 --- a/lib/public/Translation/ITranslationProviderWithId.php +++ b/lib/public/Translation/ITranslationProviderWithId.php @@ -12,6 +12,7 @@ namespace OCP\Translation; /** * @since 29.0.0 + * @deprecated 30.0.0 */ interface ITranslationProviderWithId extends ITranslationProvider { /** diff --git a/lib/public/Translation/ITranslationProviderWithUserId.php b/lib/public/Translation/ITranslationProviderWithUserId.php index a89058ce488..5bc2255f21f 100644 --- a/lib/public/Translation/ITranslationProviderWithUserId.php +++ b/lib/public/Translation/ITranslationProviderWithUserId.php @@ -12,6 +12,7 @@ namespace OCP\Translation; /** * @since 29.0.0 + * @deprecated 30.0.0 */ interface ITranslationProviderWithUserId extends ITranslationProvider { /** diff --git a/lib/public/Translation/LanguageTuple.php b/lib/public/Translation/LanguageTuple.php index 21edcf24453..883daa01da3 100644 --- a/lib/public/Translation/LanguageTuple.php +++ b/lib/public/Translation/LanguageTuple.php @@ -14,6 +14,7 @@ use JsonSerializable; /** * @since 26.0.0 + * @deprecated 30.0.0 */ class LanguageTuple implements JsonSerializable { /** diff --git a/lib/public/User/Backend/IGetRealUIDBackend.php b/lib/public/User/Backend/IGetRealUIDBackend.php index 08ac09f2b5c..8041043f7d5 100644 --- a/lib/public/User/Backend/IGetRealUIDBackend.php +++ b/lib/public/User/Backend/IGetRealUIDBackend.php @@ -17,7 +17,7 @@ interface IGetRealUIDBackend { * For example the database backend accepts different cased UIDs in all the functions * but the internal UID that is to be used should be correctly cased. * - * This little function makes sure that the used UID will be correct hen using the user object + * This little function makes sure that the used UID will be correct when using the user object * * @since 17.0.0 * @param string $uid diff --git a/lib/public/User/Backend/IPasswordHashBackend.php b/lib/public/User/Backend/IPasswordHashBackend.php new file mode 100644 index 00000000000..2525b4e45ea --- /dev/null +++ b/lib/public/User/Backend/IPasswordHashBackend.php @@ -0,0 +1,30 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OCP\User\Backend; + +use InvalidArgumentException; + +/** + * @since 30.0.0 + */ +interface IPasswordHashBackend { + /** + * @return ?string the password hash hashed by `\OCP\Security\IHasher::hash()` + * @since 30.0.0 + */ + public function getPasswordHash(string $userId): ?string; + + /** + * @param string $passwordHash the password hash hashed by `\OCP\Security\IHasher::hash()` + * @throws InvalidArgumentException when `$passwordHash` is not a valid hash + * @since 30.0.0 + */ + public function setPasswordHash(string $userId, string $passwordHash): bool; +} diff --git a/lib/public/User/Events/BeforeUserIdUnassignedEvent.php b/lib/public/User/Events/BeforeUserIdUnassignedEvent.php new file mode 100644 index 00000000000..2dee62521aa --- /dev/null +++ b/lib/public/User/Events/BeforeUserIdUnassignedEvent.php @@ -0,0 +1,34 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OCP\User\Events; + +use OCP\EventDispatcher\Event; + +/** + * Emitted before removing the mapping between an external user and an internal userid + * @since 31.0.0 + */ +class BeforeUserIdUnassignedEvent extends Event { + /** + * @since 31.0.0 + */ + public function __construct( + private readonly string $userId, + ) { + parent::__construct(); + } + + /** + * @since 31.0.0 + */ + public function getUserId(): string { + return $this->userId; + } +} diff --git a/lib/public/User/Events/UserIdAssignedEvent.php b/lib/public/User/Events/UserIdAssignedEvent.php new file mode 100644 index 00000000000..829bd50c0d0 --- /dev/null +++ b/lib/public/User/Events/UserIdAssignedEvent.php @@ -0,0 +1,34 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OCP\User\Events; + +use OCP\EventDispatcher\Event; + +/** + * Emitted by backends (like user_ldap) when a user created externally is mapped for the first time and assigned a userid + * @since 31.0.0 + */ +class UserIdAssignedEvent extends Event { + /** + * @since 31.0.0 + */ + public function __construct( + private readonly string $userId, + ) { + parent::__construct(); + } + + /** + * @since 31.0.0 + */ + public function getUserId(): string { + return $this->userId; + } +} diff --git a/lib/public/User/Events/UserIdUnassignedEvent.php b/lib/public/User/Events/UserIdUnassignedEvent.php new file mode 100644 index 00000000000..128648a0753 --- /dev/null +++ b/lib/public/User/Events/UserIdUnassignedEvent.php @@ -0,0 +1,34 @@ +<?php + +declare(strict_types=1); + +/** + * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +namespace OCP\User\Events; + +use OCP\EventDispatcher\Event; + +/** + * Emitted after removing the mapping between an external user and an internal userid + * @since 31.0.0 + */ +class UserIdUnassignedEvent extends Event { + /** + * @since 31.0.0 + */ + public function __construct( + private readonly string $userId, + ) { + parent::__construct(); + } + + /** + * @since 31.0.0 + */ + public function getUserId(): string { + return $this->userId; + } +} diff --git a/lib/public/Util.php b/lib/public/Util.php index 4cee9addf10..4bd2c61dfbe 100644 --- a/lib/public/Util.php +++ b/lib/public/Util.php @@ -18,7 +18,6 @@ use OCP\L10N\IFactory; use OCP\Mail\IMailer; use OCP\Share\IManager; use Psr\Container\ContainerExceptionInterface; -use Psr\Log\LoggerInterface; /** * This class provides different helper functions to make the life of a developer easier @@ -242,7 +241,7 @@ class Util { * @param string $app app * @param string $file file * @param array $args array with param=>value, will be appended to the returned url - * The value of $args will be urlencoded + * The value of $args will be urlencoded * @return string the url * @since 4.0.0 - parameter $args was added in 4.5.0 */ @@ -489,44 +488,11 @@ class Util { } /** - * Get a list of characters forbidden in file names - * @return string[] - * @since 29.0.0 - */ - public static function getForbiddenFileNameChars(): array { - // Get always forbidden characters - $invalidChars = str_split(\OCP\Constants::FILENAME_INVALID_CHARS); - if ($invalidChars === false) { - $invalidChars = []; - } - - // Get admin defined invalid characters - $additionalChars = \OCP\Server::get(IConfig::class)->getSystemValue('forbidden_chars', []); - if (!is_array($additionalChars)) { - \OCP\Server::get(LoggerInterface::class)->error('Invalid system config value for "forbidden_chars" is ignored.'); - $additionalChars = []; - } - return array_merge($invalidChars, $additionalChars); - } - - /** - * Returns whether the given file name is valid - * @param string $file file name to check - * @return bool true if the file name is valid, false otherwise - * @deprecated 8.1.0 use OCP\Files\Storage\IStorage::verifyPath() - * @since 7.0.0 - * @suppress PhanDeprecatedFunction - */ - public static function isValidFileName($file) { - return \OC_Util::isValidFileName($file); - } - - /** * Compare two strings to provide a natural sort * @param string $a first string to compare * @param string $b second string to compare * @return int -1 if $b comes before $a, 1 if $a comes before $b - * or 0 if the strings are identical + * or 0 if the strings are identical * @since 7.0.0 */ public static function naturalSortCompare($a, $b) { |