diff options
Diffstat (limited to 'apps')
49 files changed, 279 insertions, 161 deletions
diff --git a/apps/dav/l10n/de.js b/apps/dav/l10n/de.js index c87fdbe6639..e22163e7731 100644 --- a/apps/dav/l10n/de.js +++ b/apps/dav/l10n/de.js @@ -278,9 +278,9 @@ OC.L10N.register( "Long absence Message" : "Lange Abwesenheits Meldung", "Save" : "Speichern", "Disable absence" : "Abwesenheitmeldungen deaktivieren", - "Failed to load availability" : "Fehler beim Laden der Verfügbarkeit", + "Failed to load availability" : "Verfügbarkeit konnte nicht geladen werden", "Saved availability" : "Verfügbarkeit gespeichert", - "Failed to save availability" : "Fehler beim Speichern der Verfügbarkeit", + "Failed to save availability" : "Verfügbarkeit konnte nicht gespeichert werden", "Time zone:" : "Zeitzone:", "to" : "an", "Delete slot" : "Slot löschen", diff --git a/apps/dav/l10n/de.json b/apps/dav/l10n/de.json index 36562db38a9..02a0a5707ab 100644 --- a/apps/dav/l10n/de.json +++ b/apps/dav/l10n/de.json @@ -276,9 +276,9 @@ "Long absence Message" : "Lange Abwesenheits Meldung", "Save" : "Speichern", "Disable absence" : "Abwesenheitmeldungen deaktivieren", - "Failed to load availability" : "Fehler beim Laden der Verfügbarkeit", + "Failed to load availability" : "Verfügbarkeit konnte nicht geladen werden", "Saved availability" : "Verfügbarkeit gespeichert", - "Failed to save availability" : "Fehler beim Speichern der Verfügbarkeit", + "Failed to save availability" : "Verfügbarkeit konnte nicht gespeichert werden", "Time zone:" : "Zeitzone:", "to" : "an", "Delete slot" : "Slot löschen", diff --git a/apps/dav/l10n/de_DE.js b/apps/dav/l10n/de_DE.js index 9f79fbe5113..f513d35cdc9 100644 --- a/apps/dav/l10n/de_DE.js +++ b/apps/dav/l10n/de_DE.js @@ -278,9 +278,9 @@ OC.L10N.register( "Long absence Message" : "Lange Abwesenheitsnachricht", "Save" : "Speichern", "Disable absence" : "Abwesenheit deaktivieren", - "Failed to load availability" : "Laden der Verfügbarkeit fehlgeschlagen", + "Failed to load availability" : "Verfügbarkeit konnte nicht geladen werden", "Saved availability" : "Verfügbarkeit gespeichert", - "Failed to save availability" : "Fehler beim Speichern der Verfügbarkeit", + "Failed to save availability" : "Verfügbarkeit konnte nicht gespeichert werden", "Time zone:" : "Zeitzone:", "to" : "an", "Delete slot" : "Zeitfenster löschen", diff --git a/apps/dav/l10n/de_DE.json b/apps/dav/l10n/de_DE.json index 554260858a6..e27822fbaa6 100644 --- a/apps/dav/l10n/de_DE.json +++ b/apps/dav/l10n/de_DE.json @@ -276,9 +276,9 @@ "Long absence Message" : "Lange Abwesenheitsnachricht", "Save" : "Speichern", "Disable absence" : "Abwesenheit deaktivieren", - "Failed to load availability" : "Laden der Verfügbarkeit fehlgeschlagen", + "Failed to load availability" : "Verfügbarkeit konnte nicht geladen werden", "Saved availability" : "Verfügbarkeit gespeichert", - "Failed to save availability" : "Fehler beim Speichern der Verfügbarkeit", + "Failed to save availability" : "Verfügbarkeit konnte nicht gespeichert werden", "Time zone:" : "Zeitzone:", "to" : "an", "Delete slot" : "Zeitfenster löschen", diff --git a/apps/dav/lib/Files/FileSearchBackend.php b/apps/dav/lib/Files/FileSearchBackend.php index 1b785962112..ace367e4490 100644 --- a/apps/dav/lib/Files/FileSearchBackend.php +++ b/apps/dav/lib/Files/FileSearchBackend.php @@ -422,10 +422,16 @@ class FileSearchBackend implements ISearchBackend { $field = $this->mapPropertyNameToColumn($property); } + try { + $castedValue = $this->castValue($property, $value ?? ''); + } catch (\Error $e) { + throw new \InvalidArgumentException('Invalid property value for ' . $property->name, previous: $e); + } + return new SearchComparison( $trimmedType, $field, - $this->castValue($property, $value ?? ''), + $castedValue, $extra ?? '' ); diff --git a/apps/dav/lib/Service/DefaultContactService.php b/apps/dav/lib/Service/DefaultContactService.php index 193f3b285c6..ad7a1179195 100644 --- a/apps/dav/lib/Service/DefaultContactService.php +++ b/apps/dav/lib/Service/DefaultContactService.php @@ -9,9 +9,11 @@ declare(strict_types=1); namespace OCA\DAV\Service; +use OCA\DAV\AppInfo\Application; use OCA\DAV\CardDAV\CardDavBackend; use OCP\App\IAppManager; use OCP\Files\AppData\IAppDataFactory; +use OCP\IAppConfig; use Psr\Log\LoggerInterface; use Symfony\Component\Uid\Uuid; @@ -20,11 +22,16 @@ class DefaultContactService { private CardDavBackend $cardDav, private IAppManager $appManager, private IAppDataFactory $appDataFactory, + private IAppConfig $config, private LoggerInterface $logger, ) { } public function createDefaultContact(int $addressBookId): void { + $enableDefaultContact = $this->config->getValueString(Application::APP_ID, 'enableDefaultContact', 'no'); + if ($enableDefaultContact !== 'yes') { + return; + } $appData = $this->appDataFactory->get('dav'); try { $folder = $appData->getFolder('defaultContact'); diff --git a/apps/dav/tests/unit/Service/DefaultContactServiceTest.php b/apps/dav/tests/unit/Service/DefaultContactServiceTest.php index 9540e77ce6c..68bbc02ed08 100644 --- a/apps/dav/tests/unit/Service/DefaultContactServiceTest.php +++ b/apps/dav/tests/unit/Service/DefaultContactServiceTest.php @@ -17,6 +17,7 @@ use OCP\Files\IAppData; use OCP\Files\NotFoundException; use OCP\Files\SimpleFS\ISimpleFile; use OCP\Files\SimpleFS\ISimpleFolder; +use OCP\IAppConfig; use PHPUnit\Framework\MockObject\MockObject; use Psr\Log\LoggerInterface; use Symfony\Component\Uid\Uuid; @@ -28,6 +29,7 @@ class DefaultContactServiceTest extends TestCase { private MockObject|IAppManager $appManager; private MockObject|IAppDataFactory $appDataFactory; private MockObject|LoggerInterface $logger; + private MockObject|IAppConfig $config; protected function setUp(): void { parent::setUp(); @@ -36,19 +38,21 @@ class DefaultContactServiceTest extends TestCase { $this->appManager = $this->createMock(IAppManager::class); $this->appDataFactory = $this->createMock(IAppDataFactory::class); $this->logger = $this->createMock(LoggerInterface::class); + $this->config = $this->createMock(IAppConfig::class); $this->service = new DefaultContactService( $this->cardDav, $this->appManager, $this->appDataFactory, - $this->logger + $this->config, + $this->logger, ); } public function testCreateDefaultContactWithInvalidCard(): void { // Invalid vCard missing required FN property $vcardContent = "BEGIN:VCARD\nVERSION:3.0\nEND:VCARD"; - + $this->config->method('getValueString')->willReturn('yes'); $appData = $this->createMock(IAppData::class); $folder = $this->createMock(ISimpleFolder::class); $file = $this->createMock(ISimpleFile::class); @@ -72,6 +76,7 @@ class DefaultContactServiceTest extends TestCase { $originalRev = '20200101T000000Z'; $vcardContent = "BEGIN:VCARD\nVERSION:3.0\nFN:Test User\nUID:$originalUid\nREV:$originalRev\nEND:VCARD"; + $this->config->method('getValueString')->willReturn('yes'); $appData = $this->createMock(IAppData::class); $folder = $this->createMock(ISimpleFolder::class); $file = $this->createMock(ISimpleFile::class); @@ -103,6 +108,7 @@ class DefaultContactServiceTest extends TestCase { public function testDefaultContactFileDoesNotExist(): void { $appData = $this->createMock(IAppData::class); + $this->config->method('getValueString')->willReturn('yes'); $appData->method('getFolder')->willThrowException(new NotFoundException()); $this->appDataFactory->method('get')->willReturn($appData); @@ -115,6 +121,7 @@ class DefaultContactServiceTest extends TestCase { public function testUidAndRevAreAddedIfMissing(): void { $vcardContent = "BEGIN:VCARD\nVERSION:3.0\nFN:Test User\nEND:VCARD"; + $this->config->method('getValueString')->willReturn('yes'); $appData = $this->createMock(IAppData::class); $folder = $this->createMock(ISimpleFolder::class); $file = $this->createMock(ISimpleFile::class); @@ -145,4 +152,14 @@ class DefaultContactServiceTest extends TestCase { $this->assertNotNull($vcard->UID); $this->assertTrue(Uuid::isValid($vcard->UID->getValue())); } + + public function testDefaultContactIsNotCreatedIfEnabled(): void { + $this->config->method('getValueString')->willReturn('no'); + $this->logger->expects($this->never()) + ->method('error'); + $this->cardDav->expects($this->never()) + ->method('createCard'); + + $this->service->createDefaultContact(123); + } } diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js index b4737de2722..c30f8526f79 100644 --- a/apps/files/l10n/de.js +++ b/apps/files/l10n/de.js @@ -237,10 +237,10 @@ OC.L10N.register( "One file could not be converted: {message}" : "Eine Datei konnte nicht konvertiert werden: {message}", "_One file could not be converted_::_%n files could not be converted_" : ["Eine Datei konnte nicht konvertiert werden","%n Dateien konnten nicht konvertiert werden"], "_One file successfully converted_::_%n files successfully converted_" : ["Eine Datei erfolgreich konvertiert","%n Dateien erfolgreich konvertiert"], - "Files successfully converted" : "Dateien erfolgreich konvertiert", + "Files successfully converted" : "Dateien konvertiert", "Failed to convert files" : "Dateien konnten nicht konvertiert werden", "Converting file …" : "Datei wird konvertiert …", - "File successfully converted" : "Datei erfolgreich konvertiert", + "File successfully converted" : "Datei konvertiert", "Failed to convert file: {message}" : "Fehler beim Konvertieren der Datei: {message}", "Failed to convert file" : "Datei konnte nicht konvertiert werden", "Deletion cancelled" : "Löschen abgebrochen", @@ -456,6 +456,6 @@ OC.L10N.register( "Submitting fields…" : "Felder werden übermittelt…", "Filter filenames…" : "Dateinamen filtern…", "{count} files could not be converted" : "{count} Dateien konnten nicht konvertiert werden", - "{count} files successfully converted" : "{count} Dateien erfolgreich konvertiert" + "{count} files successfully converted" : "{count} Dateien konvertiert" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json index 271bf1b64a0..5d7d8d52a7e 100644 --- a/apps/files/l10n/de.json +++ b/apps/files/l10n/de.json @@ -235,10 +235,10 @@ "One file could not be converted: {message}" : "Eine Datei konnte nicht konvertiert werden: {message}", "_One file could not be converted_::_%n files could not be converted_" : ["Eine Datei konnte nicht konvertiert werden","%n Dateien konnten nicht konvertiert werden"], "_One file successfully converted_::_%n files successfully converted_" : ["Eine Datei erfolgreich konvertiert","%n Dateien erfolgreich konvertiert"], - "Files successfully converted" : "Dateien erfolgreich konvertiert", + "Files successfully converted" : "Dateien konvertiert", "Failed to convert files" : "Dateien konnten nicht konvertiert werden", "Converting file …" : "Datei wird konvertiert …", - "File successfully converted" : "Datei erfolgreich konvertiert", + "File successfully converted" : "Datei konvertiert", "Failed to convert file: {message}" : "Fehler beim Konvertieren der Datei: {message}", "Failed to convert file" : "Datei konnte nicht konvertiert werden", "Deletion cancelled" : "Löschen abgebrochen", @@ -454,6 +454,6 @@ "Submitting fields…" : "Felder werden übermittelt…", "Filter filenames…" : "Dateinamen filtern…", "{count} files could not be converted" : "{count} Dateien konnten nicht konvertiert werden", - "{count} files successfully converted" : "{count} Dateien erfolgreich konvertiert" + "{count} files successfully converted" : "{count} Dateien konvertiert" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js index 66198b56d10..a3317a14f25 100644 --- a/apps/files/l10n/de_DE.js +++ b/apps/files/l10n/de_DE.js @@ -236,11 +236,11 @@ OC.L10N.register( "All files failed to be converted" : "Alle Dateien konnten nicht konvertiert werden", "One file could not be converted: {message}" : "Eine Datei konnte nicht konvertiert werden: {message}", "_One file could not be converted_::_%n files could not be converted_" : ["Eine Datei konnte nicht konvertiert werden","%n Dateien konnten nicht konvertiert werden"], - "_One file successfully converted_::_%n files successfully converted_" : ["Eine Datei erfolgreich konvertiert","%n Dateien erfolgreich konvertiert"], + "_One file successfully converted_::_%n files successfully converted_" : ["Eine Datei erfolgreich konvertiert","%n Dateien konvertiert"], "Files successfully converted" : "Dateien konvertiert", "Failed to convert files" : "Dateien konnten nicht konvertiert werden", "Converting file …" : "Datei wird konvertiert …", - "File successfully converted" : "Datei erfolgreich konvertiert", + "File successfully converted" : "Datei konvertiert", "Failed to convert file: {message}" : "Fehler beim Konvertieren der Datei: {message}", "Failed to convert file" : "Datei konnte nicht konvertiert werden", "Deletion cancelled" : "Löschen abgebrochen", @@ -456,6 +456,6 @@ OC.L10N.register( "Submitting fields…" : "Felder werden übermittelt…", "Filter filenames…" : "Dateinamen filtern…", "{count} files could not be converted" : "{count} Dateien konnten nicht konvertiert werden", - "{count} files successfully converted" : "{count} Dateien erfolgreich konvertiert" + "{count} files successfully converted" : "{count} Dateien konvertiert" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json index 5c8e00f2b5c..26995446190 100644 --- a/apps/files/l10n/de_DE.json +++ b/apps/files/l10n/de_DE.json @@ -234,11 +234,11 @@ "All files failed to be converted" : "Alle Dateien konnten nicht konvertiert werden", "One file could not be converted: {message}" : "Eine Datei konnte nicht konvertiert werden: {message}", "_One file could not be converted_::_%n files could not be converted_" : ["Eine Datei konnte nicht konvertiert werden","%n Dateien konnten nicht konvertiert werden"], - "_One file successfully converted_::_%n files successfully converted_" : ["Eine Datei erfolgreich konvertiert","%n Dateien erfolgreich konvertiert"], + "_One file successfully converted_::_%n files successfully converted_" : ["Eine Datei erfolgreich konvertiert","%n Dateien konvertiert"], "Files successfully converted" : "Dateien konvertiert", "Failed to convert files" : "Dateien konnten nicht konvertiert werden", "Converting file …" : "Datei wird konvertiert …", - "File successfully converted" : "Datei erfolgreich konvertiert", + "File successfully converted" : "Datei konvertiert", "Failed to convert file: {message}" : "Fehler beim Konvertieren der Datei: {message}", "Failed to convert file" : "Datei konnte nicht konvertiert werden", "Deletion cancelled" : "Löschen abgebrochen", @@ -454,6 +454,6 @@ "Submitting fields…" : "Felder werden übermittelt…", "Filter filenames…" : "Dateinamen filtern…", "{count} files could not be converted" : "{count} Dateien konnten nicht konvertiert werden", - "{count} files successfully converted" : "{count} Dateien erfolgreich konvertiert" + "{count} files successfully converted" : "{count} Dateien konvertiert" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_reminders/l10n/de.js b/apps/files_reminders/l10n/de.js index 7a57af3d8b9..903a425b227 100644 --- a/apps/files_reminders/l10n/de.js +++ b/apps/files_reminders/l10n/de.js @@ -15,9 +15,9 @@ OC.L10N.register( "Clear reminder" : "Erinnerung löschen", "Please choose a valid date & time" : "Bitte gültiges Datum und Uhrzeit wählen", "Reminder set for \"{fileName}\"" : "Erinnerung für \"{fileName}\" gesetzt", - "Failed to set reminder" : "Fehler beim Setzen der Erinnerung", + "Failed to set reminder" : "Erinnerung konnte nicht festgelegt werden", "Reminder cleared for \"{fileName}\"" : "Erinnerung für \"{fileName}\" gelöscht", - "Failed to clear reminder" : "Fehler beim Löschen der Erinnerung", + "Failed to clear reminder" : "Erinnerung konnte nicht gelöscht werden", "We will remind you of this file" : "Du wirst an diese Datei erinnert", "Cancel" : "Abbrechen", "Set reminder" : "Erinnerung erstellen", diff --git a/apps/files_reminders/l10n/de.json b/apps/files_reminders/l10n/de.json index 7ae1c95466b..d4e5cb056da 100644 --- a/apps/files_reminders/l10n/de.json +++ b/apps/files_reminders/l10n/de.json @@ -13,9 +13,9 @@ "Clear reminder" : "Erinnerung löschen", "Please choose a valid date & time" : "Bitte gültiges Datum und Uhrzeit wählen", "Reminder set for \"{fileName}\"" : "Erinnerung für \"{fileName}\" gesetzt", - "Failed to set reminder" : "Fehler beim Setzen der Erinnerung", + "Failed to set reminder" : "Erinnerung konnte nicht festgelegt werden", "Reminder cleared for \"{fileName}\"" : "Erinnerung für \"{fileName}\" gelöscht", - "Failed to clear reminder" : "Fehler beim Löschen der Erinnerung", + "Failed to clear reminder" : "Erinnerung konnte nicht gelöscht werden", "We will remind you of this file" : "Du wirst an diese Datei erinnert", "Cancel" : "Abbrechen", "Set reminder" : "Erinnerung erstellen", diff --git a/apps/files_reminders/l10n/de_DE.js b/apps/files_reminders/l10n/de_DE.js index 8e8741d1d47..18353694380 100644 --- a/apps/files_reminders/l10n/de_DE.js +++ b/apps/files_reminders/l10n/de_DE.js @@ -7,7 +7,7 @@ OC.L10N.register( "View folder" : "Ordner anzeigen", "Files reminder" : "Dateierinnerung", "The \"files_reminders\" app can work properly." : "Die App \"files_reminders\" kann ordnungsgemäß funktionieren.", - "The \"files_reminders\" app needs the notification app to work properly. You should either enable notifications or disable files_reminder." : "Die App \"files_reminders“ benötigt die Benachrichtigungs-App, um ordnungsgemäß zu funktionieren. Sie sollten entweder Benachrichtigungen aktivieren oder „files_reminders“ deaktivieren.", + "The \"files_reminders\" app needs the notification app to work properly. You should either enable notifications or disable files_reminder." : "Die App \"files_reminders\" benötigt die Benachrichtigungs-App, um ordnungsgemäß zu funktionieren. Sie sollten entweder Benachrichtigungen aktivieren oder \"files_reminders\" deaktivieren.", "Set file reminders" : "Dateierinnerungen setzen", "**📣 File reminders**\n\nSet file reminders.\n\nNote: to use the `File reminders` app, ensure that the `Notifications` app is installed and enabled. The `Notifications` app provides the necessary APIs for the `File reminders` app to work correctly." : "**📣 Dateierinnerungen**\n\nDateierinnerungen festlegen.\n\nHinweis: Um die App ``Dateierinnerungen` zu verwenden, stellen Sie sicher, dass die App `Benachrichtigungen` installiert und aktiviert ist. Die App `Benachrichtigungen` bietet die erforderlichen APIs, damit die App `Dateierinnerungen` ordnungsgemäß funktioniert.", "Set reminder for \"{fileName}\"" : "Erinnerung für \"{fileName}\" setzen", @@ -15,9 +15,9 @@ OC.L10N.register( "Clear reminder" : "Erinnerung löschen", "Please choose a valid date & time" : "Bitte gültiges Datum und Uhrzeit wählen", "Reminder set for \"{fileName}\"" : "Erinnerung für \"{fileName}\" gesetzt", - "Failed to set reminder" : "Fehler beim Setzen der Erinnerung", + "Failed to set reminder" : "Erinnerung konnte nicht festgelegt werden", "Reminder cleared for \"{fileName}\"" : "Erinnerung für \"{fileName}\" gelöscht", - "Failed to clear reminder" : "Fehler beim Löschen der Erinnerung", + "Failed to clear reminder" : "Erinnerung konnte nicht gelöscht werden", "We will remind you of this file" : "Sie werden an diese Datei erinnert", "Cancel" : "Abbrechen", "Set reminder" : "Erinnerung erstellen", diff --git a/apps/files_reminders/l10n/de_DE.json b/apps/files_reminders/l10n/de_DE.json index 12adb345499..ec9b07b39b7 100644 --- a/apps/files_reminders/l10n/de_DE.json +++ b/apps/files_reminders/l10n/de_DE.json @@ -5,7 +5,7 @@ "View folder" : "Ordner anzeigen", "Files reminder" : "Dateierinnerung", "The \"files_reminders\" app can work properly." : "Die App \"files_reminders\" kann ordnungsgemäß funktionieren.", - "The \"files_reminders\" app needs the notification app to work properly. You should either enable notifications or disable files_reminder." : "Die App \"files_reminders“ benötigt die Benachrichtigungs-App, um ordnungsgemäß zu funktionieren. Sie sollten entweder Benachrichtigungen aktivieren oder „files_reminders“ deaktivieren.", + "The \"files_reminders\" app needs the notification app to work properly. You should either enable notifications or disable files_reminder." : "Die App \"files_reminders\" benötigt die Benachrichtigungs-App, um ordnungsgemäß zu funktionieren. Sie sollten entweder Benachrichtigungen aktivieren oder \"files_reminders\" deaktivieren.", "Set file reminders" : "Dateierinnerungen setzen", "**📣 File reminders**\n\nSet file reminders.\n\nNote: to use the `File reminders` app, ensure that the `Notifications` app is installed and enabled. The `Notifications` app provides the necessary APIs for the `File reminders` app to work correctly." : "**📣 Dateierinnerungen**\n\nDateierinnerungen festlegen.\n\nHinweis: Um die App ``Dateierinnerungen` zu verwenden, stellen Sie sicher, dass die App `Benachrichtigungen` installiert und aktiviert ist. Die App `Benachrichtigungen` bietet die erforderlichen APIs, damit die App `Dateierinnerungen` ordnungsgemäß funktioniert.", "Set reminder for \"{fileName}\"" : "Erinnerung für \"{fileName}\" setzen", @@ -13,9 +13,9 @@ "Clear reminder" : "Erinnerung löschen", "Please choose a valid date & time" : "Bitte gültiges Datum und Uhrzeit wählen", "Reminder set for \"{fileName}\"" : "Erinnerung für \"{fileName}\" gesetzt", - "Failed to set reminder" : "Fehler beim Setzen der Erinnerung", + "Failed to set reminder" : "Erinnerung konnte nicht festgelegt werden", "Reminder cleared for \"{fileName}\"" : "Erinnerung für \"{fileName}\" gelöscht", - "Failed to clear reminder" : "Fehler beim Löschen der Erinnerung", + "Failed to clear reminder" : "Erinnerung konnte nicht gelöscht werden", "We will remind you of this file" : "Sie werden an diese Datei erinnert", "Cancel" : "Abbrechen", "Set reminder" : "Erinnerung erstellen", diff --git a/apps/files_reminders/lib/Dav/PropFindPlugin.php b/apps/files_reminders/lib/Dav/PropFindPlugin.php index 0f3b53c4861..014e636eb2d 100644 --- a/apps/files_reminders/lib/Dav/PropFindPlugin.php +++ b/apps/files_reminders/lib/Dav/PropFindPlugin.php @@ -62,7 +62,7 @@ class PropFindPlugin extends ServerPlugin { } $fileId = $node->getId(); - $reminder = $this->reminderService->getDueForUser($user, $fileId); + $reminder = $this->reminderService->getDueForUser($user, $fileId, false); if ($reminder === null) { return ''; } diff --git a/apps/files_reminders/lib/Service/ReminderService.php b/apps/files_reminders/lib/Service/ReminderService.php index 45b89a272a3..6ee39562076 100644 --- a/apps/files_reminders/lib/Service/ReminderService.php +++ b/apps/files_reminders/lib/Service/ReminderService.php @@ -64,8 +64,10 @@ class ReminderService { /** * @throws NodeNotFoundException */ - public function getDueForUser(IUser $user, int $fileId): ?RichReminder { - $this->checkNode($user, $fileId); + public function getDueForUser(IUser $user, int $fileId, bool $checkNode = true): ?RichReminder { + if ($checkNode) { + $this->checkNode($user, $fileId); + } /** @var null|false|Reminder $cachedReminder */ $cachedReminder = $this->cache->get("{$user->getUID()}-$fileId"); if ($cachedReminder === false) { diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js index 9b260dd1af0..3a897c97c5c 100644 --- a/apps/files_sharing/l10n/de.js +++ b/apps/files_sharing/l10n/de.js @@ -412,7 +412,7 @@ OC.L10N.register( "You can upload into this folder" : "Du kannst in diesen Ordner hochladen", "No compatible server found at {remote}" : "Keinen kompatiblen Server unter {remote} gefunden", "Invalid server URL" : "Falsche Server-URL", - "Failed to add the public link to your Nextcloud" : "Fehler beim Hinzufügen des öffentlichen Links zu deiner Nextcloud", + "Failed to add the public link to your Nextcloud" : "Der öffentliche Link konnte nicht zu deiner Nextcloud hinzugefügt werden", "Files" : "Dateien", "Download all files" : "Alle Dateien herunterladen", "Search for share recipients" : "Nach Freigabe-Empfängern suchen", diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json index 4b61000993d..4dc0f6a273b 100644 --- a/apps/files_sharing/l10n/de.json +++ b/apps/files_sharing/l10n/de.json @@ -410,7 +410,7 @@ "You can upload into this folder" : "Du kannst in diesen Ordner hochladen", "No compatible server found at {remote}" : "Keinen kompatiblen Server unter {remote} gefunden", "Invalid server URL" : "Falsche Server-URL", - "Failed to add the public link to your Nextcloud" : "Fehler beim Hinzufügen des öffentlichen Links zu deiner Nextcloud", + "Failed to add the public link to your Nextcloud" : "Der öffentliche Link konnte nicht zu deiner Nextcloud hinzugefügt werden", "Files" : "Dateien", "Download all files" : "Alle Dateien herunterladen", "Search for share recipients" : "Nach Freigabe-Empfängern suchen", diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js index 5caec03aaea..dcf87c7df98 100644 --- a/apps/files_sharing/l10n/de_DE.js +++ b/apps/files_sharing/l10n/de_DE.js @@ -412,7 +412,7 @@ OC.L10N.register( "You can upload into this folder" : "Sie können in diesen Ordner hochladen", "No compatible server found at {remote}" : "Keinen kompatiblen Server unter {remote} gefunden", "Invalid server URL" : "Falsche Server-URL", - "Failed to add the public link to your Nextcloud" : "Fehler beim Hinzufügen des öffentlichen Links zu Ihrer Nextcloud", + "Failed to add the public link to your Nextcloud" : "Der öffentliche Link konnte nicht zu Ihrer Nextcloud hinzugefügt werden", "Files" : "Dateien", "Download all files" : "Alle Dateien herunterladen", "Search for share recipients" : "Nach Freigabeempfängern suchen", diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json index cd955c1163d..b918effcbd8 100644 --- a/apps/files_sharing/l10n/de_DE.json +++ b/apps/files_sharing/l10n/de_DE.json @@ -410,7 +410,7 @@ "You can upload into this folder" : "Sie können in diesen Ordner hochladen", "No compatible server found at {remote}" : "Keinen kompatiblen Server unter {remote} gefunden", "Invalid server URL" : "Falsche Server-URL", - "Failed to add the public link to your Nextcloud" : "Fehler beim Hinzufügen des öffentlichen Links zu Ihrer Nextcloud", + "Failed to add the public link to your Nextcloud" : "Der öffentliche Link konnte nicht zu Ihrer Nextcloud hinzugefügt werden", "Files" : "Dateien", "Download all files" : "Alle Dateien herunterladen", "Search for share recipients" : "Nach Freigabeempfängern suchen", diff --git a/apps/files_sharing/l10n/uk.js b/apps/files_sharing/l10n/uk.js index c41217776a5..a87d5169bfc 100644 --- a/apps/files_sharing/l10n/uk.js +++ b/apps/files_sharing/l10n/uk.js @@ -411,7 +411,7 @@ OC.L10N.register( "You can upload into this folder" : "Ви можете завантажити до цього каталогу", "No compatible server found at {remote}" : "Відсутній сумісний сервер за адресою {remote}", "Invalid server URL" : "Недійсна адреса сервера URL", - "Failed to add the public link to your Nextcloud" : "Не вдалося додати загальнодоступне посилання до вашого Nextcloud", + "Failed to add the public link to your Nextcloud" : "Не вдалося додати публічне посилання до вашого Nextcloud", "Files" : "Файли", "Download all files" : "Звантажити всі файли", "Search for share recipients" : "Виберіть отримувачів", diff --git a/apps/files_sharing/l10n/uk.json b/apps/files_sharing/l10n/uk.json index 5045716043d..2f199857bc3 100644 --- a/apps/files_sharing/l10n/uk.json +++ b/apps/files_sharing/l10n/uk.json @@ -409,7 +409,7 @@ "You can upload into this folder" : "Ви можете завантажити до цього каталогу", "No compatible server found at {remote}" : "Відсутній сумісний сервер за адресою {remote}", "Invalid server URL" : "Недійсна адреса сервера URL", - "Failed to add the public link to your Nextcloud" : "Не вдалося додати загальнодоступне посилання до вашого Nextcloud", + "Failed to add the public link to your Nextcloud" : "Не вдалося додати публічне посилання до вашого Nextcloud", "Files" : "Файли", "Download all files" : "Звантажити всі файли", "Search for share recipients" : "Виберіть отримувачів", diff --git a/apps/files_sharing/src/mixins/ShareDetails.js b/apps/files_sharing/src/mixins/ShareDetails.js index 61cffab86f2..6ccdf8d63d0 100644 --- a/apps/files_sharing/src/mixins/ShareDetails.js +++ b/apps/files_sharing/src/mixins/ShareDetails.js @@ -5,6 +5,8 @@ import Share from '../models/Share.ts' import Config from '../services/ConfigService.ts' +import { ATOMIC_PERMISSIONS } from '../lib/SharePermissionsToolBox.js' +import logger from '../services/logger.ts' export default { methods: { @@ -26,6 +28,18 @@ export default { share = this.mapShareRequestToShareObject(shareRequestObject) } + if (this.fileInfo.type !== 'dir') { + const originalPermissions = share.permissions + const strippedPermissions = originalPermissions + & ~ATOMIC_PERMISSIONS.CREATE + & ~ATOMIC_PERMISSIONS.DELETE + + if (originalPermissions !== strippedPermissions) { + logger.debug('Removed create/delete permissions from file share (only valid for folders)') + share.permissions = strippedPermissions + } + } + const shareDetails = { fileInfo: this.fileInfo, share, diff --git a/apps/files_sharing/src/views/SharingDetailsTab.vue b/apps/files_sharing/src/views/SharingDetailsTab.vue index 4411348d5ac..5b778223c8b 100644 --- a/apps/files_sharing/src/views/SharingDetailsTab.vue +++ b/apps/files_sharing/src/views/SharingDetailsTab.vue @@ -38,7 +38,7 @@ <NcCheckboxRadioSwitch :button-variant="true" data-cy-files-sharing-share-permissions-bundle="upload-edit" :checked.sync="sharingPermission" - :value="bundledPermissions.ALL.toString()" + :value="allPermissions" name="sharing_permission_radio" type="radio" button-variant-grouped="vertical" @@ -400,6 +400,9 @@ export default { } } }, + allPermissions() { + return this.isFolder ? this.bundledPermissions.ALL.toString() : this.bundledPermissions.ALL_FILE.toString() + }, /** * Can the sharee edit the shared file ? */ @@ -712,8 +715,15 @@ export default { [ATOMIC_PERMISSIONS.DELETE]: this.t('files_sharing', 'Delete'), } - return [ATOMIC_PERMISSIONS.READ, ATOMIC_PERMISSIONS.CREATE, ATOMIC_PERMISSIONS.UPDATE, ...(this.resharingIsPossible ? [ATOMIC_PERMISSIONS.SHARE] : []), ATOMIC_PERMISSIONS.DELETE] - .filter((permission) => hasPermissions(this.share.permissions, permission)) + const permissionsList = [ + ATOMIC_PERMISSIONS.READ, + ...(this.isFolder ? [ATOMIC_PERMISSIONS.CREATE] : []), + ATOMIC_PERMISSIONS.UPDATE, + ...(this.resharingIsPossible ? [ATOMIC_PERMISSIONS.SHARE] : []), + ...(this.isFolder ? [ATOMIC_PERMISSIONS.DELETE] : []), + ] + + return permissionsList.filter((permission) => hasPermissions(this.share.permissions, permission)) .map((permission, index) => index === 0 ? translatedPermissions[permission] : translatedPermissions[permission].toLocaleLowerCase(getLanguage())) @@ -831,6 +841,13 @@ export default { isReshareChecked = this.canReshare, } = {}) { // calc permissions if checked + + if (!this.isFolder && (isCreateChecked || isDeleteChecked)) { + logger.debug('Ignoring create/delete permissions for file share — only available for folders') + isCreateChecked = false + isDeleteChecked = false + } + const permissions = 0 | (isReadChecked ? ATOMIC_PERMISSIONS.READ : 0) | (isCreateChecked ? ATOMIC_PERMISSIONS.CREATE : 0) diff --git a/apps/files_versions/lib/AppInfo/Application.php b/apps/files_versions/lib/AppInfo/Application.php index dcc446d1ff6..1f35034d820 100644 --- a/apps/files_versions/lib/AppInfo/Application.php +++ b/apps/files_versions/lib/AppInfo/Application.php @@ -107,7 +107,8 @@ class Application extends App implements IBootstrap { $context->registerEventListener(BeforeNodeRenamedEvent::class, FileEventsListener::class); $context->registerEventListener(BeforeNodeCopiedEvent::class, FileEventsListener::class); - $context->registerEventListener(NodeWrittenEvent::class, VersionAuthorListener::class); + // we add the version author listener with lower priority to make sure new versions already are created by FileEventsListener + $context->registerEventListener(NodeWrittenEvent::class, VersionAuthorListener::class, -1); $context->registerEventListener(VersionRestoredEvent::class, LegacyRollbackListener::class); } diff --git a/apps/settings/l10n/de.js b/apps/settings/l10n/de.js index 968e53e6f0b..6460690502f 100644 --- a/apps/settings/l10n/de.js +++ b/apps/settings/l10n/de.js @@ -429,7 +429,7 @@ OC.L10N.register( "_%n app has an update available_::_%n apps have an update available_" : ["Für eine App ist eine Aktualisierung verfügbar.","Für %n Apps sind Aktualisierungen verfügbar."], "_Update_::_Update all_" : ["Aktualisieren","Alle aktualisieren"], "Failed to load groups" : "Gruppen konnten nicht geladen werden", - "Failed to create group" : "Fehler beim Erstellen der Gruppe", + "Failed to create group" : "Gruppe konnte nicht erstellt werden", "Creating group…" : "Erstelle Gruppe…", "Create group" : "Gruppe erstellen", "Group name" : "Gruppenname", @@ -720,7 +720,7 @@ OC.L10N.register( "Wiped {userid}'s devices" : "{userid}s Geräte bereinigt", "Failed to load groups with details" : "Gruppen mit Details konnten nicht geladen werden", "Failed to load sub admin groups with details" : "Unteradministrations-Gruppen mit Details konnten nicht geladen werden", - "Failed to update line manager" : "Fehler beim Aktualisieren des Managers", + "Failed to update line manager" : "Manager konnte nicht aktualisiert werden", "Fully delete {userid}'s account including all their personal files, app data, etc." : "Vollständig {userid}s Konto löschen inklusive aller persönlichen Dateien, App-Daten, usw.", "Account deletion" : "Kontenlöschung", "Delete {userid}'s account" : "Konto von {userid} löschen", diff --git a/apps/settings/l10n/de.json b/apps/settings/l10n/de.json index 84699f767dd..bb76e29c208 100644 --- a/apps/settings/l10n/de.json +++ b/apps/settings/l10n/de.json @@ -427,7 +427,7 @@ "_%n app has an update available_::_%n apps have an update available_" : ["Für eine App ist eine Aktualisierung verfügbar.","Für %n Apps sind Aktualisierungen verfügbar."], "_Update_::_Update all_" : ["Aktualisieren","Alle aktualisieren"], "Failed to load groups" : "Gruppen konnten nicht geladen werden", - "Failed to create group" : "Fehler beim Erstellen der Gruppe", + "Failed to create group" : "Gruppe konnte nicht erstellt werden", "Creating group…" : "Erstelle Gruppe…", "Create group" : "Gruppe erstellen", "Group name" : "Gruppenname", @@ -718,7 +718,7 @@ "Wiped {userid}'s devices" : "{userid}s Geräte bereinigt", "Failed to load groups with details" : "Gruppen mit Details konnten nicht geladen werden", "Failed to load sub admin groups with details" : "Unteradministrations-Gruppen mit Details konnten nicht geladen werden", - "Failed to update line manager" : "Fehler beim Aktualisieren des Managers", + "Failed to update line manager" : "Manager konnte nicht aktualisiert werden", "Fully delete {userid}'s account including all their personal files, app data, etc." : "Vollständig {userid}s Konto löschen inklusive aller persönlichen Dateien, App-Daten, usw.", "Account deletion" : "Kontenlöschung", "Delete {userid}'s account" : "Konto von {userid} löschen", diff --git a/apps/settings/l10n/de_DE.js b/apps/settings/l10n/de_DE.js index 0cdf4a81eac..35698a0a7fd 100644 --- a/apps/settings/l10n/de_DE.js +++ b/apps/settings/l10n/de_DE.js @@ -40,7 +40,7 @@ OC.L10N.register( "Your email address was changed by an administrator" : "Ihre E-Mail-Adresse wurde von der Administration geändert", "You created an app password for a session named \"{token}\"" : "Sie haben ein App-Passwort für eine Sitzung mit dem Namen \"{token}\" erstellt", "An administrator created an app password for a session named \"{token}\"" : "Die Administration hat ein App-Passwort für eine Sitzung mit dem Namen \"{token}\" erstellt", - "You deleted app password \"{token}\"" : "Sie haben das App-Passwort \"{token}\" entfernt", + "You deleted app password \"{token}\"" : "Sie haben das App-Passwort \"{token}\" gelöscht", "You renamed app password \"{token}\" to \"{newToken}\"" : "Sie haben das App-Passwort \"{token}\" in \"{newToken}\" umbenannt", "You granted filesystem access to app password \"{token}\"" : "Sie haben Dateisystemzugriff für App-Passwort \"{token}\" erlaubt", "You revoked filesystem access from app password \"{token}\"" : "Sie haben Dateisystemzugriff für App-Passwort \"{token}\" widerrufen", @@ -429,7 +429,7 @@ OC.L10N.register( "_%n app has an update available_::_%n apps have an update available_" : ["Für %n App ist eine Aktualisierung verfügbar","Für %n Apps sind Aktualisierungen verfügbar"], "_Update_::_Update all_" : ["Aktualisieren","Alle aktualisieren"], "Failed to load groups" : "Gruppen konnten nicht geladen werden", - "Failed to create group" : "Fehler beim Erstellen der Gruppe", + "Failed to create group" : "Gruppe konnte nicht erstellt werden", "Creating group…" : "Erstelle Gruppe…", "Create group" : "Gruppe erstellen", "Group name" : "Gruppenname", @@ -720,7 +720,7 @@ OC.L10N.register( "Wiped {userid}'s devices" : "{userid}s Geräte gelöscht", "Failed to load groups with details" : "Gruppen mit Details konnten nicht geladen werden", "Failed to load sub admin groups with details" : "Unteradministrations-Gruppen mit Details konnten nicht geladen werden", - "Failed to update line manager" : "Fehler beim Aktualisieren des Managers", + "Failed to update line manager" : "Manager konnte nicht aktualisiert werden", "Fully delete {userid}'s account including all their personal files, app data, etc." : "Lösche {userid}s Konto vollständig inklusive aller persönlichen Dateien, App-Daten, usw.", "Account deletion" : "Löschung des Kontos", "Delete {userid}'s account" : "Konto von {userid} löschen", diff --git a/apps/settings/l10n/de_DE.json b/apps/settings/l10n/de_DE.json index 6b1f4cd1aca..423964970c0 100644 --- a/apps/settings/l10n/de_DE.json +++ b/apps/settings/l10n/de_DE.json @@ -38,7 +38,7 @@ "Your email address was changed by an administrator" : "Ihre E-Mail-Adresse wurde von der Administration geändert", "You created an app password for a session named \"{token}\"" : "Sie haben ein App-Passwort für eine Sitzung mit dem Namen \"{token}\" erstellt", "An administrator created an app password for a session named \"{token}\"" : "Die Administration hat ein App-Passwort für eine Sitzung mit dem Namen \"{token}\" erstellt", - "You deleted app password \"{token}\"" : "Sie haben das App-Passwort \"{token}\" entfernt", + "You deleted app password \"{token}\"" : "Sie haben das App-Passwort \"{token}\" gelöscht", "You renamed app password \"{token}\" to \"{newToken}\"" : "Sie haben das App-Passwort \"{token}\" in \"{newToken}\" umbenannt", "You granted filesystem access to app password \"{token}\"" : "Sie haben Dateisystemzugriff für App-Passwort \"{token}\" erlaubt", "You revoked filesystem access from app password \"{token}\"" : "Sie haben Dateisystemzugriff für App-Passwort \"{token}\" widerrufen", @@ -427,7 +427,7 @@ "_%n app has an update available_::_%n apps have an update available_" : ["Für %n App ist eine Aktualisierung verfügbar","Für %n Apps sind Aktualisierungen verfügbar"], "_Update_::_Update all_" : ["Aktualisieren","Alle aktualisieren"], "Failed to load groups" : "Gruppen konnten nicht geladen werden", - "Failed to create group" : "Fehler beim Erstellen der Gruppe", + "Failed to create group" : "Gruppe konnte nicht erstellt werden", "Creating group…" : "Erstelle Gruppe…", "Create group" : "Gruppe erstellen", "Group name" : "Gruppenname", @@ -718,7 +718,7 @@ "Wiped {userid}'s devices" : "{userid}s Geräte gelöscht", "Failed to load groups with details" : "Gruppen mit Details konnten nicht geladen werden", "Failed to load sub admin groups with details" : "Unteradministrations-Gruppen mit Details konnten nicht geladen werden", - "Failed to update line manager" : "Fehler beim Aktualisieren des Managers", + "Failed to update line manager" : "Manager konnte nicht aktualisiert werden", "Fully delete {userid}'s account including all their personal files, app data, etc." : "Lösche {userid}s Konto vollständig inklusive aller persönlichen Dateien, App-Daten, usw.", "Account deletion" : "Löschung des Kontos", "Delete {userid}'s account" : "Konto von {userid} löschen", diff --git a/apps/settings/l10n/lv.js b/apps/settings/l10n/lv.js index 3257902204e..ff6ec94d479 100644 --- a/apps/settings/l10n/lv.js +++ b/apps/settings/l10n/lv.js @@ -127,7 +127,7 @@ OC.L10N.register( "Server-side encryption" : "Servera šifrēšana", "Enable server-side encryption" : "Ieslēgt servera šifrēšanu", "No encryption module loaded, please enable an encryption module in the app menu." : "Nav ielādēts šifrēšanas moduļis, lūdzu, aktivizējiet šifrēšanas moduli lietotņu izvēlnē.", - "Select default encryption module:" : "Atlasiet noklusēto šifrēšanas moduli:", + "Select default encryption module:" : "Atlasīt noklusējuma šifrēšanas moduli:", "Enable encryption" : "Ieslēgt šifrēšanu", "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Šifrēšana vien negarantē sistēmas drošību. Skatiet dokumentāciju, lai iegūtu papildinformāciju par šifrēšanas lietotnes izmantošanu un atbalstītajiem izmantošanas veidiem.", "Be aware that encryption always increases the file size." : "Jāapzinās, ka šifrēšanas vienmēr palielina datnes lielumu.", diff --git a/apps/settings/l10n/lv.json b/apps/settings/l10n/lv.json index 121c9605bcb..d65b531b8c3 100644 --- a/apps/settings/l10n/lv.json +++ b/apps/settings/l10n/lv.json @@ -125,7 +125,7 @@ "Server-side encryption" : "Servera šifrēšana", "Enable server-side encryption" : "Ieslēgt servera šifrēšanu", "No encryption module loaded, please enable an encryption module in the app menu." : "Nav ielādēts šifrēšanas moduļis, lūdzu, aktivizējiet šifrēšanas moduli lietotņu izvēlnē.", - "Select default encryption module:" : "Atlasiet noklusēto šifrēšanas moduli:", + "Select default encryption module:" : "Atlasīt noklusējuma šifrēšanas moduli:", "Enable encryption" : "Ieslēgt šifrēšanu", "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "Šifrēšana vien negarantē sistēmas drošību. Skatiet dokumentāciju, lai iegūtu papildinformāciju par šifrēšanas lietotnes izmantošanu un atbalstītajiem izmantošanas veidiem.", "Be aware that encryption always increases the file size." : "Jāapzinās, ka šifrēšanas vienmēr palielina datnes lielumu.", diff --git a/apps/settings/l10n/pt_BR.js b/apps/settings/l10n/pt_BR.js index 7ae98016c8a..ab7126d5923 100644 --- a/apps/settings/l10n/pt_BR.js +++ b/apps/settings/l10n/pt_BR.js @@ -380,13 +380,13 @@ OC.L10N.register( "Not allowed groups will still be able to receive shares, but not to initiate them." : "Grupos não permitidos ainda poderão receber compartilhamentos, mas não poderão iniciá-los.", "Set default expiration date for internal shares" : "Definir data de expiração padrão para compartilhamentos internos", "Enforce expiration date" : "Fazer cumprir a data de expiração", - "Default expiration time of new shares in days" : "Tempo de expiração padrão de novas ações em dias", + "Default expiration time of new shares in days" : "Tempo de expiração padrão de novos compartilhamentos em dias", "Expire shares after x days" : "Expiração de compartilhamentos após x dias", - "Set default expiration date for shares to other servers" : "Defina a data de expiração padrão para compartilhamentos com outros servidores", + "Set default expiration date for shares to other servers" : "Definir a data de expiração padrão para compartilhamentos com outros servidores", "Enforce expiration date for remote shares" : "Aplicar data de expiração para compartilhamentos remotos", "Default expiration time of remote shares in days" : "Tempo de expiração padrão de compartilhamentos remotos em dias", - "Expire remote shares after x days" : "Expirar compartilhamentos remotos após x dias", - "Set default expiration date for shares via link or mail" : "Defina a data de expiração padrão para compartilhamentos via link ou e-mail", + "Expire remote shares after x days" : "Expiração de compartilhamentos remotos após x dias", + "Set default expiration date for shares via link or mail" : "Definir a data de expiração padrão para compartilhamentos via link ou e-mail", "Default expiration time of shares in days" : "Tempo de expiração padrão dos compartilhamentos em dias", "Privacy settings for sharing" : "Configurações de privacidade para compartilhamento", "Allow account name autocompletion in share dialog and allow access to the system address book" : "Permitir o preenchimento automático do nome da conta na caixa de diálogo de compartilhamento e permitir o acesso ao catálogo de endereços do sistema", @@ -440,7 +440,7 @@ OC.L10N.register( "Could not load app discover section" : "Não foi possível carregar a seção de descoberta do aplicativo", "Could not render element" : "Não foi possível renderizar o elemento", "Nothing to show" : "Nada a mostrar", - "Could not load section content from app store." : "Não foi possível carregar o conteúdo da seção da app store.", + "Could not load section content from app store." : "Não foi possível carregar o conteúdo da seção da loja de aplicativos.", "Loading" : "Carregando", "Fetching the latest news…" : "Buscando as últimas notícias…", "Carousel" : "Carrossel", @@ -593,13 +593,13 @@ OC.L10N.register( "New password" : "Nova senha", "Change password" : "Alterar senha", "Choose your profile picture" : "Escolha sua foto de perfil", - "Please select a valid png or jpg file" : "Selecione um arquivo png ou jpg válido", + "Please select a valid png or jpg file" : "Por favor, selecione um arquivo png ou jpg válido", "Error setting profile picture" : "Erro ao definir a foto do perfil", "Error cropping profile picture" : "Erro ao recortar a foto do perfil", "Error saving profile picture" : "Erro ao salvar a foto do perfil", "Error removing profile picture" : "Erro ao remover a foto do perfil", "Your profile picture" : "Sua foto de perfil", - "Upload profile picture" : "Carregar foto do perfil", + "Upload profile picture" : "Fazer upload da foto do perfil", "Choose profile picture from Files" : "Escolher foto do perfil em Arquivos", "Remove profile picture" : "Remover foto do perfil", "The file must be a PNG or JPG" : "O arquivo deve ser um PNG ou JPG", @@ -622,15 +622,15 @@ OC.L10N.register( "Set as primary email" : "Definir como e-mail principal ", "Additional email address {index}" : "Endereço de e-mail adicional {index} ", "Unable to delete primary email address" : "Não é possível excluir o endereço de e-mail principal", - "Unable to update primary email address" : "Não foi possível atualizar o endereço de e-mail primário ", - "Unable to add additional email address" : "Incapaz de adicionar endereço de e-mail adicional", - "Unable to update additional email address" : "Não foi possível atualizar o endereço de e-mail adicional ", + "Unable to update primary email address" : "Não é possível atualizar o endereço de e-mail primário ", + "Unable to add additional email address" : "Não é possível adicionar um endereço de e-mail adicional", + "Unable to update additional email address" : "Não é possível atualizar o endereço de e-mail adicional ", "Unable to delete additional email address" : "Não é possível excluir endereço de e-mail adicional", - "Primary email for password reset and notifications" : "E-mail principal para redefinição de senha e notificações ", + "Primary email for password reset and notifications" : "E-mail principal para redefinição de senha e notificações", "No email address set" : "Nenhum endereço de e-mail foi configurado", "Your handle" : "Seu identificador", "Derived from your locale ({weekDayName})" : "Derivado da sua localidade ({weekDayName})", - "Unable to update first day of week" : "Não foi possível atualizar o primeiro dia da semana", + "Unable to update first day of week" : "Não é possível atualizar o primeiro dia da semana", "Day to use as the first day of week" : "Dia a ser usado como o primeiro dia da semana", "Your headline" : "Seu título", "Unable to update language" : "Não foi possível atualizar o idioma", @@ -645,13 +645,13 @@ OC.L10N.register( "Your organisation" : "Sua organização", "Your phone number" : "Seu número de telefone", "Edit your Profile visibility" : "Edite a visibilidade do seu perfil", - "Unable to update profile enabled state" : "Não é possível atualizar o estado de habilitação do perfil", - "Enable profile" : "Habilitar perfil", + "Unable to update profile enabled state" : "Não é possível atualizar o estado de ativação do perfil", + "Enable profile" : "Ativar perfil", "The more restrictive setting of either visibility or scope is respected on your Profile. For example, if visibility is set to \"Show to everyone\" and scope is set to \"Private\", \"Private\" is respected." : "A configuração mais restritiva de visibilidade ou escopo é respeitada em seu perfil. Por exemplo, se a visibilidade for definida como \"Mostrar para todos\" e o escopo for definido como \"Privado\", \"Privado\" será respeitado.", "Unable to update visibility of {displayId}" : "Não foi possível atualizar a visibilidade de {displayId}", - "she/her" : "ela/ela", - "he/him" : "ele/ele", - "they/them" : "eles/eles", + "she/her" : "ela/dela", + "he/him" : "ele/dele", + "they/them" : "eles/delas", "Your role" : "Seu papel", "Your X (formerly Twitter) handle" : "Seu identificador X (anteriormente Twitter)", "Your website" : "Seu website", @@ -816,25 +816,25 @@ OC.L10N.register( "Supported apps" : "Aplicativos compatíveis", "Show to everyone" : "Mostrar para todos", "Show to logged in accounts only" : "Mostrar apenas para contas logadas", - "Hide" : "Esconder ", + "Hide" : "Ocultar", "Manually installed apps cannot be updated" : "Os aplicativos instalados manualmente não podem ser atualizados", "{progress}% Deploying …" : "{progress}% Implantando …", "{progress}% Initializing …" : "{progress}% Inicializando …", "Health checking" : "Verificação de saúde", - "Deploy and Enable" : "Implantar e Habilitar", + "Deploy and Enable" : "Implantar e Ativar", "Download and enable" : "Baixar e ativar", "Disable" : "Desativar", - "Allow untested app" : "Permitir app não testado", - "The app will be downloaded from the App Store" : "O aplicativo será baixado da App Store", + "Allow untested app" : "Permitir aplicativo não testado", + "The app will be downloaded from the App Store" : "O aplicativo será baixado da Loja de Aplicativos", "This app is not marked as compatible with your Nextcloud version. If you continue you will still be able to install the app. Note that the app might not work as expected." : "Este aplicativo não está marcado como compatível com sua versão do Nextcloud. Se você continuar, ainda poderá instalar o aplicativo mas poderá não funcionar como esperado.", "Unknown" : "Desconhecido", "Never" : "Nunca", "Could not register device: Network error" : "Não foi possível registrar o dispositivo: Erro de rede", "Could not register device: Probably already registered" : "Não foi possível registrar o dispositivo: Provavelmente já registrado", "Could not register device" : "Não foi possível registrar o dispositivo", - "An error occurred during the request. Unable to proceed." : "Ocorreu um erro durante a solicitação. Não foi possível prosseguir.", - "The app has been enabled but needs to be updated." : "O aplicativo foi habilitado, mas precisa ser atualizado.", - "Error: This app cannot be enabled because it makes the server unstable" : "Erro: Este aplicativo não pode ser habilitado pois torna o servidor instável.", + "An error occurred during the request. Unable to proceed." : "Ocorreu um erro durante a solicitação. Não é possível prosseguir.", + "The app has been enabled but needs to be updated." : "O aplicativo foi ativado, mas precisa ser atualizado.", + "Error: This app cannot be enabled because it makes the server unstable" : "Erro: Este aplicativo não pode ser ativado, pois torna o servidor instável.", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "O aplicativo foi ativado, mas precisa ser atualizado. Você será redirecionado para a página de atualização em 5 segundos.", "Do you really want to wipe your data from this device?" : "Quer realmente limpar seus dados deste dispositivo?", "Confirm wipe" : "Confirmar a limpeza", @@ -852,7 +852,7 @@ OC.L10N.register( "General documentation" : "Documentação geral", "Legal notice" : "Aviso legal", "Privacy policy" : "Política de privacidade", - "None/STARTTLS" : "None/STARTTLS", + "None/STARTTLS" : "Sem/STARTTLS", "SSL" : "SSL", "Open documentation" : "Abrir documentação", "It is important to set up this server to be able to send emails, like for password reset and notifications." : "É importante configurar este servidor para poder enviar e-mails para redefinir a senha e notificações.", @@ -880,7 +880,7 @@ OC.L10N.register( "Reasons to use Nextcloud in your organization" : "Motivos para usar o Nextcloud na sua empresa.", "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Desenvolvido pela {communityopen}comunidade Nextcloud{linkclose}. O {githubopen}código-fonte{linkclose} é licenciado sob a {licenseopen}AGPL{linkclose}.", "Like our Facebook page" : "Curta nossa página no Facebook", - "Follow us on X" : "Siga -nos no x", + "Follow us on X" : "Siga-nos no X", "Follow us on Mastodon" : "Siga-nos no Mastodon", "Check out our blog" : "Confira nosso blog", "Subscribe to our newsletter" : "Assine nosso boletim informativo", diff --git a/apps/settings/l10n/pt_BR.json b/apps/settings/l10n/pt_BR.json index c16efd62702..4658fa59f2e 100644 --- a/apps/settings/l10n/pt_BR.json +++ b/apps/settings/l10n/pt_BR.json @@ -378,13 +378,13 @@ "Not allowed groups will still be able to receive shares, but not to initiate them." : "Grupos não permitidos ainda poderão receber compartilhamentos, mas não poderão iniciá-los.", "Set default expiration date for internal shares" : "Definir data de expiração padrão para compartilhamentos internos", "Enforce expiration date" : "Fazer cumprir a data de expiração", - "Default expiration time of new shares in days" : "Tempo de expiração padrão de novas ações em dias", + "Default expiration time of new shares in days" : "Tempo de expiração padrão de novos compartilhamentos em dias", "Expire shares after x days" : "Expiração de compartilhamentos após x dias", - "Set default expiration date for shares to other servers" : "Defina a data de expiração padrão para compartilhamentos com outros servidores", + "Set default expiration date for shares to other servers" : "Definir a data de expiração padrão para compartilhamentos com outros servidores", "Enforce expiration date for remote shares" : "Aplicar data de expiração para compartilhamentos remotos", "Default expiration time of remote shares in days" : "Tempo de expiração padrão de compartilhamentos remotos em dias", - "Expire remote shares after x days" : "Expirar compartilhamentos remotos após x dias", - "Set default expiration date for shares via link or mail" : "Defina a data de expiração padrão para compartilhamentos via link ou e-mail", + "Expire remote shares after x days" : "Expiração de compartilhamentos remotos após x dias", + "Set default expiration date for shares via link or mail" : "Definir a data de expiração padrão para compartilhamentos via link ou e-mail", "Default expiration time of shares in days" : "Tempo de expiração padrão dos compartilhamentos em dias", "Privacy settings for sharing" : "Configurações de privacidade para compartilhamento", "Allow account name autocompletion in share dialog and allow access to the system address book" : "Permitir o preenchimento automático do nome da conta na caixa de diálogo de compartilhamento e permitir o acesso ao catálogo de endereços do sistema", @@ -438,7 +438,7 @@ "Could not load app discover section" : "Não foi possível carregar a seção de descoberta do aplicativo", "Could not render element" : "Não foi possível renderizar o elemento", "Nothing to show" : "Nada a mostrar", - "Could not load section content from app store." : "Não foi possível carregar o conteúdo da seção da app store.", + "Could not load section content from app store." : "Não foi possível carregar o conteúdo da seção da loja de aplicativos.", "Loading" : "Carregando", "Fetching the latest news…" : "Buscando as últimas notícias…", "Carousel" : "Carrossel", @@ -591,13 +591,13 @@ "New password" : "Nova senha", "Change password" : "Alterar senha", "Choose your profile picture" : "Escolha sua foto de perfil", - "Please select a valid png or jpg file" : "Selecione um arquivo png ou jpg válido", + "Please select a valid png or jpg file" : "Por favor, selecione um arquivo png ou jpg válido", "Error setting profile picture" : "Erro ao definir a foto do perfil", "Error cropping profile picture" : "Erro ao recortar a foto do perfil", "Error saving profile picture" : "Erro ao salvar a foto do perfil", "Error removing profile picture" : "Erro ao remover a foto do perfil", "Your profile picture" : "Sua foto de perfil", - "Upload profile picture" : "Carregar foto do perfil", + "Upload profile picture" : "Fazer upload da foto do perfil", "Choose profile picture from Files" : "Escolher foto do perfil em Arquivos", "Remove profile picture" : "Remover foto do perfil", "The file must be a PNG or JPG" : "O arquivo deve ser um PNG ou JPG", @@ -620,15 +620,15 @@ "Set as primary email" : "Definir como e-mail principal ", "Additional email address {index}" : "Endereço de e-mail adicional {index} ", "Unable to delete primary email address" : "Não é possível excluir o endereço de e-mail principal", - "Unable to update primary email address" : "Não foi possível atualizar o endereço de e-mail primário ", - "Unable to add additional email address" : "Incapaz de adicionar endereço de e-mail adicional", - "Unable to update additional email address" : "Não foi possível atualizar o endereço de e-mail adicional ", + "Unable to update primary email address" : "Não é possível atualizar o endereço de e-mail primário ", + "Unable to add additional email address" : "Não é possível adicionar um endereço de e-mail adicional", + "Unable to update additional email address" : "Não é possível atualizar o endereço de e-mail adicional ", "Unable to delete additional email address" : "Não é possível excluir endereço de e-mail adicional", - "Primary email for password reset and notifications" : "E-mail principal para redefinição de senha e notificações ", + "Primary email for password reset and notifications" : "E-mail principal para redefinição de senha e notificações", "No email address set" : "Nenhum endereço de e-mail foi configurado", "Your handle" : "Seu identificador", "Derived from your locale ({weekDayName})" : "Derivado da sua localidade ({weekDayName})", - "Unable to update first day of week" : "Não foi possível atualizar o primeiro dia da semana", + "Unable to update first day of week" : "Não é possível atualizar o primeiro dia da semana", "Day to use as the first day of week" : "Dia a ser usado como o primeiro dia da semana", "Your headline" : "Seu título", "Unable to update language" : "Não foi possível atualizar o idioma", @@ -643,13 +643,13 @@ "Your organisation" : "Sua organização", "Your phone number" : "Seu número de telefone", "Edit your Profile visibility" : "Edite a visibilidade do seu perfil", - "Unable to update profile enabled state" : "Não é possível atualizar o estado de habilitação do perfil", - "Enable profile" : "Habilitar perfil", + "Unable to update profile enabled state" : "Não é possível atualizar o estado de ativação do perfil", + "Enable profile" : "Ativar perfil", "The more restrictive setting of either visibility or scope is respected on your Profile. For example, if visibility is set to \"Show to everyone\" and scope is set to \"Private\", \"Private\" is respected." : "A configuração mais restritiva de visibilidade ou escopo é respeitada em seu perfil. Por exemplo, se a visibilidade for definida como \"Mostrar para todos\" e o escopo for definido como \"Privado\", \"Privado\" será respeitado.", "Unable to update visibility of {displayId}" : "Não foi possível atualizar a visibilidade de {displayId}", - "she/her" : "ela/ela", - "he/him" : "ele/ele", - "they/them" : "eles/eles", + "she/her" : "ela/dela", + "he/him" : "ele/dele", + "they/them" : "eles/delas", "Your role" : "Seu papel", "Your X (formerly Twitter) handle" : "Seu identificador X (anteriormente Twitter)", "Your website" : "Seu website", @@ -814,25 +814,25 @@ "Supported apps" : "Aplicativos compatíveis", "Show to everyone" : "Mostrar para todos", "Show to logged in accounts only" : "Mostrar apenas para contas logadas", - "Hide" : "Esconder ", + "Hide" : "Ocultar", "Manually installed apps cannot be updated" : "Os aplicativos instalados manualmente não podem ser atualizados", "{progress}% Deploying …" : "{progress}% Implantando …", "{progress}% Initializing …" : "{progress}% Inicializando …", "Health checking" : "Verificação de saúde", - "Deploy and Enable" : "Implantar e Habilitar", + "Deploy and Enable" : "Implantar e Ativar", "Download and enable" : "Baixar e ativar", "Disable" : "Desativar", - "Allow untested app" : "Permitir app não testado", - "The app will be downloaded from the App Store" : "O aplicativo será baixado da App Store", + "Allow untested app" : "Permitir aplicativo não testado", + "The app will be downloaded from the App Store" : "O aplicativo será baixado da Loja de Aplicativos", "This app is not marked as compatible with your Nextcloud version. If you continue you will still be able to install the app. Note that the app might not work as expected." : "Este aplicativo não está marcado como compatível com sua versão do Nextcloud. Se você continuar, ainda poderá instalar o aplicativo mas poderá não funcionar como esperado.", "Unknown" : "Desconhecido", "Never" : "Nunca", "Could not register device: Network error" : "Não foi possível registrar o dispositivo: Erro de rede", "Could not register device: Probably already registered" : "Não foi possível registrar o dispositivo: Provavelmente já registrado", "Could not register device" : "Não foi possível registrar o dispositivo", - "An error occurred during the request. Unable to proceed." : "Ocorreu um erro durante a solicitação. Não foi possível prosseguir.", - "The app has been enabled but needs to be updated." : "O aplicativo foi habilitado, mas precisa ser atualizado.", - "Error: This app cannot be enabled because it makes the server unstable" : "Erro: Este aplicativo não pode ser habilitado pois torna o servidor instável.", + "An error occurred during the request. Unable to proceed." : "Ocorreu um erro durante a solicitação. Não é possível prosseguir.", + "The app has been enabled but needs to be updated." : "O aplicativo foi ativado, mas precisa ser atualizado.", + "Error: This app cannot be enabled because it makes the server unstable" : "Erro: Este aplicativo não pode ser ativado, pois torna o servidor instável.", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "O aplicativo foi ativado, mas precisa ser atualizado. Você será redirecionado para a página de atualização em 5 segundos.", "Do you really want to wipe your data from this device?" : "Quer realmente limpar seus dados deste dispositivo?", "Confirm wipe" : "Confirmar a limpeza", @@ -850,7 +850,7 @@ "General documentation" : "Documentação geral", "Legal notice" : "Aviso legal", "Privacy policy" : "Política de privacidade", - "None/STARTTLS" : "None/STARTTLS", + "None/STARTTLS" : "Sem/STARTTLS", "SSL" : "SSL", "Open documentation" : "Abrir documentação", "It is important to set up this server to be able to send emails, like for password reset and notifications." : "É importante configurar este servidor para poder enviar e-mails para redefinir a senha e notificações.", @@ -878,7 +878,7 @@ "Reasons to use Nextcloud in your organization" : "Motivos para usar o Nextcloud na sua empresa.", "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Desenvolvido pela {communityopen}comunidade Nextcloud{linkclose}. O {githubopen}código-fonte{linkclose} é licenciado sob a {licenseopen}AGPL{linkclose}.", "Like our Facebook page" : "Curta nossa página no Facebook", - "Follow us on X" : "Siga -nos no x", + "Follow us on X" : "Siga-nos no X", "Follow us on Mastodon" : "Siga-nos no Mastodon", "Check out our blog" : "Confira nosso blog", "Subscribe to our newsletter" : "Assine nosso boletim informativo", diff --git a/apps/settings/l10n/uk.js b/apps/settings/l10n/uk.js index 94a84bfcc36..e5cab86d655 100644 --- a/apps/settings/l10n/uk.js +++ b/apps/settings/l10n/uk.js @@ -8,7 +8,7 @@ OC.L10N.register( "Federated" : "Для об'єднаних хмар", "Only synchronize to trusted servers" : "Синхронізовувати лише з серверами, яким довіряємо", "Published" : "Публічно", - "Synchronize to trusted servers and the global and public address book" : "Синхронізація з надійними серверами та глобальною та загальнодоступною адресною книгою", + "Synchronize to trusted servers and the global and public address book" : "Синхронізація з надійними серверами та глобальною та публічною адресною книгою", "Verify" : "Перевірити", "Verifying …" : "Перевірка ...", "Unable to change password" : "Неможливо змінити пароль", @@ -288,7 +288,7 @@ OC.L10N.register( "Allow apps to use the Share API" : "Дозволити застосункам використовувати API спільного доступу", "Allow resharing" : "Дозволити передавати у спільний доступ іншим", "Allow sharing with groups" : "Дозволити спільне використання групами", - "Restrict users to only share with users in their groups" : "Дозволити користувачам надання у спільний доступ лише користувачам груп, до яких вони входять", + "Restrict users to only share with users in their groups" : "Дозволити надання у спільний доступ тільки в межах власних груп", "Ignore the following groups when checking group membership" : "Ігнорувати такі групи під час перевірки участи в групі", "Allow users to share via link and emails" : "Дозволити користувачам надання у спільний доступ за допомогою посилань та ел. листів", "Allow public uploads" : "Дозволити публічне завантаження", @@ -299,8 +299,8 @@ OC.L10N.register( "Allow users to set custom share link tokens" : "Дозволити користвучам встановити власні токени спільних посилань", "Limit sharing based on groups" : "Обмежити надання у спільний доступ на основі груп", "Allow sharing for everyone (default)" : "Дозволити надання у спільний доступ для всіх (типово)", - "Exclude some groups from sharing" : "Виключити окремі групи зі спільного доступу", - "Limit sharing to some groups" : "Обмежити надання у спільний доступ для вибраних груп", + "Exclude some groups from sharing" : "Не дозволяти таким групам надавати у спільний доступ", + "Limit sharing to some groups" : "Дозволити надання у спільний доступ тільки для таких груп", "Groups allowed to share" : "Групи, які можуть надавати у спільний доступ", "Groups excluded from sharing" : "Групи, виключені зі спільного доступу", "Not allowed groups will still be able to receive shares, but not to initiate them." : "Групи, в яких відсутні дозволи, все ще зможуть отримувати дані, що у спільному доступі, але самі не зможуть надавати у спільний доступ.", @@ -320,9 +320,9 @@ OC.L10N.register( "Restrict account name autocompletion and system address book access to users within the same groups" : "Обмежити автозаповнення імени користувача та доступу до системної адресної книги тільки користувачам однієї й тої саме групи", "Restrict account name autocompletion to users based on phone number integration" : "Обмежити автозаповнення імени користувача користувачам на основі інтеграції телефонних номерів", "Allow autocompletion when entering the full name or email address (ignoring missing phonebook match and being in the same group)" : "Дозволити автозаповнення під час введення повного імени або адреси електронної пошти (ігноруватимуться відсутні збіги у телефонній книзі та перебування в одній й тій саме групі)", - "Show disclaimer text on the public link upload page (only shown when the file list is hidden)" : "Показувати текст застереження на сторінці завантаження загальнодоступного посилання (відображається, лише якщо список файлів приховано)", + "Show disclaimer text on the public link upload page (only shown when the file list is hidden)" : "Показувати текст застереження на сторінці завантаження публічного посилання (відображається, лише якщо список файлів приховано)", "Disclaimer text" : "Текст відмови від відповідальності", - "This text will be shown on the public link upload page when the file list is hidden." : "Цей текст буде показано на сторінці завантаження загальнодоступного посилання, коли список файлів приховано.", + "This text will be shown on the public link upload page when the file list is hidden." : "Цей текст буде показано на сторінці завантаження публічного посилання, якщо список файлів приховано.", "Default share permissions" : "Спільний доступ буде типово надано з правами", "Two-Factor Authentication" : "Двофакторна авторизація", "Two-factor authentication can be enforced for all accounts and specific groups. If they do not have a two-factor provider configured, they will be unable to log into the system." : "Двофакторну авторизацію можна примусово визначити як для всіх користувачів, так й для окремих груп. Якщо такі користувачі не визначили постачальника двофакторної авторизації, то вони не зможуть увійти до хмари.", @@ -604,7 +604,7 @@ OC.L10N.register( "Account deletion" : "Вилучення облікового запису", "Delete {userid}'s account" : "Вилучити обліковий запис {userid}", "Display name was successfully changed" : "Ім'я для показу успішно змінено", - "Password was successfully changed" : "Ім'я для показу успішно змінено", + "Password was successfully changed" : "Пароль успішно змінено", "Email was successfully changed" : "Адресу електронної пошти успішно змінено", "Welcome mail sent!" : "Запрошення надіслано!", "Loading account …" : "Завантаження облікового запису ...", diff --git a/apps/settings/l10n/uk.json b/apps/settings/l10n/uk.json index 0f58f87b72b..39a98243ca0 100644 --- a/apps/settings/l10n/uk.json +++ b/apps/settings/l10n/uk.json @@ -6,7 +6,7 @@ "Federated" : "Для об'єднаних хмар", "Only synchronize to trusted servers" : "Синхронізовувати лише з серверами, яким довіряємо", "Published" : "Публічно", - "Synchronize to trusted servers and the global and public address book" : "Синхронізація з надійними серверами та глобальною та загальнодоступною адресною книгою", + "Synchronize to trusted servers and the global and public address book" : "Синхронізація з надійними серверами та глобальною та публічною адресною книгою", "Verify" : "Перевірити", "Verifying …" : "Перевірка ...", "Unable to change password" : "Неможливо змінити пароль", @@ -286,7 +286,7 @@ "Allow apps to use the Share API" : "Дозволити застосункам використовувати API спільного доступу", "Allow resharing" : "Дозволити передавати у спільний доступ іншим", "Allow sharing with groups" : "Дозволити спільне використання групами", - "Restrict users to only share with users in their groups" : "Дозволити користувачам надання у спільний доступ лише користувачам груп, до яких вони входять", + "Restrict users to only share with users in their groups" : "Дозволити надання у спільний доступ тільки в межах власних груп", "Ignore the following groups when checking group membership" : "Ігнорувати такі групи під час перевірки участи в групі", "Allow users to share via link and emails" : "Дозволити користувачам надання у спільний доступ за допомогою посилань та ел. листів", "Allow public uploads" : "Дозволити публічне завантаження", @@ -297,8 +297,8 @@ "Allow users to set custom share link tokens" : "Дозволити користвучам встановити власні токени спільних посилань", "Limit sharing based on groups" : "Обмежити надання у спільний доступ на основі груп", "Allow sharing for everyone (default)" : "Дозволити надання у спільний доступ для всіх (типово)", - "Exclude some groups from sharing" : "Виключити окремі групи зі спільного доступу", - "Limit sharing to some groups" : "Обмежити надання у спільний доступ для вибраних груп", + "Exclude some groups from sharing" : "Не дозволяти таким групам надавати у спільний доступ", + "Limit sharing to some groups" : "Дозволити надання у спільний доступ тільки для таких груп", "Groups allowed to share" : "Групи, які можуть надавати у спільний доступ", "Groups excluded from sharing" : "Групи, виключені зі спільного доступу", "Not allowed groups will still be able to receive shares, but not to initiate them." : "Групи, в яких відсутні дозволи, все ще зможуть отримувати дані, що у спільному доступі, але самі не зможуть надавати у спільний доступ.", @@ -318,9 +318,9 @@ "Restrict account name autocompletion and system address book access to users within the same groups" : "Обмежити автозаповнення імени користувача та доступу до системної адресної книги тільки користувачам однієї й тої саме групи", "Restrict account name autocompletion to users based on phone number integration" : "Обмежити автозаповнення імени користувача користувачам на основі інтеграції телефонних номерів", "Allow autocompletion when entering the full name or email address (ignoring missing phonebook match and being in the same group)" : "Дозволити автозаповнення під час введення повного імени або адреси електронної пошти (ігноруватимуться відсутні збіги у телефонній книзі та перебування в одній й тій саме групі)", - "Show disclaimer text on the public link upload page (only shown when the file list is hidden)" : "Показувати текст застереження на сторінці завантаження загальнодоступного посилання (відображається, лише якщо список файлів приховано)", + "Show disclaimer text on the public link upload page (only shown when the file list is hidden)" : "Показувати текст застереження на сторінці завантаження публічного посилання (відображається, лише якщо список файлів приховано)", "Disclaimer text" : "Текст відмови від відповідальності", - "This text will be shown on the public link upload page when the file list is hidden." : "Цей текст буде показано на сторінці завантаження загальнодоступного посилання, коли список файлів приховано.", + "This text will be shown on the public link upload page when the file list is hidden." : "Цей текст буде показано на сторінці завантаження публічного посилання, якщо список файлів приховано.", "Default share permissions" : "Спільний доступ буде типово надано з правами", "Two-Factor Authentication" : "Двофакторна авторизація", "Two-factor authentication can be enforced for all accounts and specific groups. If they do not have a two-factor provider configured, they will be unable to log into the system." : "Двофакторну авторизацію можна примусово визначити як для всіх користувачів, так й для окремих груп. Якщо такі користувачі не визначили постачальника двофакторної авторизації, то вони не зможуть увійти до хмари.", @@ -602,7 +602,7 @@ "Account deletion" : "Вилучення облікового запису", "Delete {userid}'s account" : "Вилучити обліковий запис {userid}", "Display name was successfully changed" : "Ім'я для показу успішно змінено", - "Password was successfully changed" : "Ім'я для показу успішно змінено", + "Password was successfully changed" : "Пароль успішно змінено", "Email was successfully changed" : "Адресу електронної пошти успішно змінено", "Welcome mail sent!" : "Запрошення надіслано!", "Loading account …" : "Завантаження облікового запису ...", diff --git a/apps/sharebymail/l10n/de.js b/apps/sharebymail/l10n/de.js index 05ea2fb063f..bbbe6d400f2 100644 --- a/apps/sharebymail/l10n/de.js +++ b/apps/sharebymail/l10n/de.js @@ -17,7 +17,7 @@ OC.L10N.register( "Sharing %1$s failed, because this item is already shared with the account %2$s" : "Freigeben von %1$s ist fehlgeschlagen, da dieses Element schon mit dem Konto %2$s geteilt wurde", "We cannot send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Automatisch erzeugtes Passwort kann nicht versandt werden. Bitte gib in deinen persönlichen Einstellungen eine gültige E-Mail-Adresse ein und versuche es erneut.", "Failed to send share by email. Got an invalid email address" : "Die Freigabe per E-Mail konnte nicht gesendet werden. Habe eine ungültige E-Mail-Adresse erhalten.", - "Failed to send share by email" : "Fehler beim Senden der Freigabe per E-Mail", + "Failed to send share by email" : "Freigabe konnte nicht per E-Mail gesendet werden", "%1$s shared %2$s with you" : "%1$s hat %2$s mit dir geteilt", "Note:" : "Bemerkung:", "This share is valid until %s at midnight" : "Diese Freigabe ist bis zum %s um Mitternacht gültig", diff --git a/apps/sharebymail/l10n/de.json b/apps/sharebymail/l10n/de.json index 4578343e077..a98ad30a28d 100644 --- a/apps/sharebymail/l10n/de.json +++ b/apps/sharebymail/l10n/de.json @@ -15,7 +15,7 @@ "Sharing %1$s failed, because this item is already shared with the account %2$s" : "Freigeben von %1$s ist fehlgeschlagen, da dieses Element schon mit dem Konto %2$s geteilt wurde", "We cannot send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Automatisch erzeugtes Passwort kann nicht versandt werden. Bitte gib in deinen persönlichen Einstellungen eine gültige E-Mail-Adresse ein und versuche es erneut.", "Failed to send share by email. Got an invalid email address" : "Die Freigabe per E-Mail konnte nicht gesendet werden. Habe eine ungültige E-Mail-Adresse erhalten.", - "Failed to send share by email" : "Fehler beim Senden der Freigabe per E-Mail", + "Failed to send share by email" : "Freigabe konnte nicht per E-Mail gesendet werden", "%1$s shared %2$s with you" : "%1$s hat %2$s mit dir geteilt", "Note:" : "Bemerkung:", "This share is valid until %s at midnight" : "Diese Freigabe ist bis zum %s um Mitternacht gültig", diff --git a/apps/sharebymail/l10n/de_DE.js b/apps/sharebymail/l10n/de_DE.js index 4168c98805d..338d60108cd 100644 --- a/apps/sharebymail/l10n/de_DE.js +++ b/apps/sharebymail/l10n/de_DE.js @@ -16,8 +16,8 @@ OC.L10N.register( "Share by mail" : "Geteilt über eine E-Mail", "Sharing %1$s failed, because this item is already shared with the account %2$s" : "Freigeben von %1$s ist fehlgeschlagen, da dieses Element schon mit dem Konto %2$s geteilt wurde", "We cannot send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Automatisch erzeugtes Passwort kann nicht versandt werden. Bitte geben Sie in Ihren persönlichen Einstellungen eine gültige E-Mail-Adresse ein und versuche Sie es erneut.", - "Failed to send share by email. Got an invalid email address" : "Die Freigabe per E-Mail konnte nicht gesendet werden. Habe eine ungültige E-Mail-Adresse erhalten.", - "Failed to send share by email" : "Fehler beim Senden der Freigabe per E-Mail", + "Failed to send share by email. Got an invalid email address" : "Die Freigabe per E-Mail konnte nicht gesendet werden. Es wurde eine ungültige E-Mail-Adresse angegeben.", + "Failed to send share by email" : "Freigabe konnte nicht per E-Mail gesendet werden", "%1$s shared %2$s with you" : "%1$s hat %2$s mit Ihnen geteilt", "Note:" : "Anmerkung:", "This share is valid until %s at midnight" : "Diese Freigabe ist bis zum %s um Mitternacht gültig", diff --git a/apps/sharebymail/l10n/de_DE.json b/apps/sharebymail/l10n/de_DE.json index b6713c5f49e..27ee126b8f0 100644 --- a/apps/sharebymail/l10n/de_DE.json +++ b/apps/sharebymail/l10n/de_DE.json @@ -14,8 +14,8 @@ "Share by mail" : "Geteilt über eine E-Mail", "Sharing %1$s failed, because this item is already shared with the account %2$s" : "Freigeben von %1$s ist fehlgeschlagen, da dieses Element schon mit dem Konto %2$s geteilt wurde", "We cannot send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Automatisch erzeugtes Passwort kann nicht versandt werden. Bitte geben Sie in Ihren persönlichen Einstellungen eine gültige E-Mail-Adresse ein und versuche Sie es erneut.", - "Failed to send share by email. Got an invalid email address" : "Die Freigabe per E-Mail konnte nicht gesendet werden. Habe eine ungültige E-Mail-Adresse erhalten.", - "Failed to send share by email" : "Fehler beim Senden der Freigabe per E-Mail", + "Failed to send share by email. Got an invalid email address" : "Die Freigabe per E-Mail konnte nicht gesendet werden. Es wurde eine ungültige E-Mail-Adresse angegeben.", + "Failed to send share by email" : "Freigabe konnte nicht per E-Mail gesendet werden", "%1$s shared %2$s with you" : "%1$s hat %2$s mit Ihnen geteilt", "Note:" : "Anmerkung:", "This share is valid until %s at midnight" : "Diese Freigabe ist bis zum %s um Mitternacht gültig", diff --git a/apps/systemtags/l10n/de.js b/apps/systemtags/l10n/de.js index 85c8f0ded1b..bae01f498d9 100644 --- a/apps/systemtags/l10n/de.js +++ b/apps/systemtags/l10n/de.js @@ -53,7 +53,7 @@ OC.L10N.register( "Updated tag" : "Schlagwort aktualisiert", "Failed to update tag" : "Schlagwort konnte nicht aktualisiert werden", "Deleted tag" : "Schlagwort gelöscht", - "Failed to delete tag" : "Fehler beim Löschen des Schlagwortes", + "Failed to delete tag" : "Schlagwort konnte nicht gelöscht werden", "Create or edit tags" : "Schlagworte erstellen oder bearbeiten", "Search for a tag to edit" : "Nach einem Schlagwort zum Bearbeiten suchen", "Collaborative tags …" : "Kollaborative Schlagworte …", diff --git a/apps/systemtags/l10n/de.json b/apps/systemtags/l10n/de.json index 6f366504d3d..83fc4b6daf6 100644 --- a/apps/systemtags/l10n/de.json +++ b/apps/systemtags/l10n/de.json @@ -51,7 +51,7 @@ "Updated tag" : "Schlagwort aktualisiert", "Failed to update tag" : "Schlagwort konnte nicht aktualisiert werden", "Deleted tag" : "Schlagwort gelöscht", - "Failed to delete tag" : "Fehler beim Löschen des Schlagwortes", + "Failed to delete tag" : "Schlagwort konnte nicht gelöscht werden", "Create or edit tags" : "Schlagworte erstellen oder bearbeiten", "Search for a tag to edit" : "Nach einem Schlagwort zum Bearbeiten suchen", "Collaborative tags …" : "Kollaborative Schlagworte …", diff --git a/apps/systemtags/l10n/de_DE.js b/apps/systemtags/l10n/de_DE.js index 51caab4fe61..447cb344bce 100644 --- a/apps/systemtags/l10n/de_DE.js +++ b/apps/systemtags/l10n/de_DE.js @@ -53,7 +53,7 @@ OC.L10N.register( "Updated tag" : "Schlagwort aktualisiert", "Failed to update tag" : "Schlagwort konnte nicht aktualisiert werden", "Deleted tag" : "Schlagwort gelöscht", - "Failed to delete tag" : "Fehler beim Löschen des Schlagwortes", + "Failed to delete tag" : "Schlagwort konnte nicht gelöscht werden", "Create or edit tags" : "Schlagworte erstellen oder bearbeiten", "Search for a tag to edit" : "Nach einem Schlagwort zum Bearbeiten suchen", "Collaborative tags …" : "Kollaborative Schlagworte …", diff --git a/apps/systemtags/l10n/de_DE.json b/apps/systemtags/l10n/de_DE.json index 29ac9c9d66f..cc905e232d5 100644 --- a/apps/systemtags/l10n/de_DE.json +++ b/apps/systemtags/l10n/de_DE.json @@ -51,7 +51,7 @@ "Updated tag" : "Schlagwort aktualisiert", "Failed to update tag" : "Schlagwort konnte nicht aktualisiert werden", "Deleted tag" : "Schlagwort gelöscht", - "Failed to delete tag" : "Fehler beim Löschen des Schlagwortes", + "Failed to delete tag" : "Schlagwort konnte nicht gelöscht werden", "Create or edit tags" : "Schlagworte erstellen oder bearbeiten", "Search for a tag to edit" : "Nach einem Schlagwort zum Bearbeiten suchen", "Collaborative tags …" : "Kollaborative Schlagworte …", diff --git a/apps/systemtags/l10n/et_EE.js b/apps/systemtags/l10n/et_EE.js index 00f18f25faa..172bd38c71e 100644 --- a/apps/systemtags/l10n/et_EE.js +++ b/apps/systemtags/l10n/et_EE.js @@ -32,23 +32,51 @@ OC.L10N.register( "%s (restricted)" : "%s (piiratud)", "%s (invisible)" : "%s (nähtamatu)", "<strong>System tags</strong> for a file have been modified" : "<strong>Süsteemi sildid</strong> sellele failile on muudetud", + "Files" : "Failid", "Tags" : "Sildid", + "All tagged %s …" : "Kõik sildistatud kui „%s“…", + "tagged %s" : "sildistatud kui „%s“", "Collaborative tags" : "Koostöö sildid", + "Public" : "Avalik", + "Restricted" : "Piiratud", + "Invisible" : "Nähtamatu", + "Created tag" : "Silt on loodud", + "Failed to create tag" : "Sildi loomine ei õnnestunud", + "Updated tag" : "Silt on uuendatud", + "Failed to update tag" : "Sildi uuendamine ei õnnestunud", + "Deleted tag" : "Silt on kustutatud", + "Failed to delete tag" : "Sildi kustutamine ei õnnestunud", + "Create or edit tags" : "Loo või muuda silte", + "Search for a tag to edit" : "Otsi muudetavat silti", + "Collaborative tags …" : "Ühistegevuslikud sildid…", + "No tags to select" : "Pole ühtegi silti, mida valida", + "Tag name" : "Sildi nimi", + "Tag level" : "Sildi tase", "Create" : "Loo", "Update" : "Uuenda", "Delete" : "Kustuta", "Reset" : "Lähtesta", - "Public" : "Avalik", - "Restricted" : "Piiratud", - "Invisible" : "Nähtamatu", - "No tags found" : "Silte ei leitud", + "Loading …" : "Laadimine ...", + "Manage tags" : "Halda silte", + "Applying tags changes…" : "Salvestan sildi muudatusi…", + "Search or create tag" : "Otsi või loo silt", + "Search tag" : "Otsi silti", + "Change tag color" : "Muuda sildi värvi", + "Create new tag" : "Loo uus silt", + "Select or create tags to apply to all selected files" : "Vali või loo sildid kõikide valitud failide jaoks", + "Select tags to apply to all selected files" : "Vali sildid kõikide valitud failide jaoks", "Cancel" : "Tühista", + "Apply changes" : "Rakenda muudatused", + "Failed to load tags" : "Siltide laadimine ei õnnestu", + "Failed to load selected tags" : "Valitud siltide laadimine ei õnnestu", + "Failed to select tag" : "Sildi valimine ei õnnestu", + "System admin disabled tag creation. You can only use existing ones." : "Peakasutaja on keelanud siltide loomise. Sa võid kasutada vaid olemasolevaid.", + "Loading collaborative tags …" : "Laadin ühistegevuslikke silte…", + "Search or create collaborative tags" : "Otsi või loo ühistegevuslikke silte", + "No tags to select, type to create a new tag" : "Pole ühtegi valitavat silti, uue sildi lisamiseks hakka kirjutama", + "Open in Files" : "Ava failirakenduses", + "No tags found" : "Silte ei leitud", "This file has the tag {tag}" : "Sellel failil on silt {tag}", - "This file has the tags {firstTags} and {lastTag}" : "Sellel failil on sildid {firstTags} and {lastTag}", - "No files in here" : "Siin ei ole faile", - "No entries found in this folder" : "Selles kaustast ei leitud kirjeid", - "Name" : "Nimi", - "Size" : "Suurus", - "Modified" : "Muudetud" + "This file has the tags {firstTags} and {lastTag}" : "Sellel failil on sildid {firstTags} and {lastTag}" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/systemtags/l10n/et_EE.json b/apps/systemtags/l10n/et_EE.json index 073f53170e9..80999124b02 100644 --- a/apps/systemtags/l10n/et_EE.json +++ b/apps/systemtags/l10n/et_EE.json @@ -30,23 +30,51 @@ "%s (restricted)" : "%s (piiratud)", "%s (invisible)" : "%s (nähtamatu)", "<strong>System tags</strong> for a file have been modified" : "<strong>Süsteemi sildid</strong> sellele failile on muudetud", + "Files" : "Failid", "Tags" : "Sildid", + "All tagged %s …" : "Kõik sildistatud kui „%s“…", + "tagged %s" : "sildistatud kui „%s“", "Collaborative tags" : "Koostöö sildid", + "Public" : "Avalik", + "Restricted" : "Piiratud", + "Invisible" : "Nähtamatu", + "Created tag" : "Silt on loodud", + "Failed to create tag" : "Sildi loomine ei õnnestunud", + "Updated tag" : "Silt on uuendatud", + "Failed to update tag" : "Sildi uuendamine ei õnnestunud", + "Deleted tag" : "Silt on kustutatud", + "Failed to delete tag" : "Sildi kustutamine ei õnnestunud", + "Create or edit tags" : "Loo või muuda silte", + "Search for a tag to edit" : "Otsi muudetavat silti", + "Collaborative tags …" : "Ühistegevuslikud sildid…", + "No tags to select" : "Pole ühtegi silti, mida valida", + "Tag name" : "Sildi nimi", + "Tag level" : "Sildi tase", "Create" : "Loo", "Update" : "Uuenda", "Delete" : "Kustuta", "Reset" : "Lähtesta", - "Public" : "Avalik", - "Restricted" : "Piiratud", - "Invisible" : "Nähtamatu", - "No tags found" : "Silte ei leitud", + "Loading …" : "Laadimine ...", + "Manage tags" : "Halda silte", + "Applying tags changes…" : "Salvestan sildi muudatusi…", + "Search or create tag" : "Otsi või loo silt", + "Search tag" : "Otsi silti", + "Change tag color" : "Muuda sildi värvi", + "Create new tag" : "Loo uus silt", + "Select or create tags to apply to all selected files" : "Vali või loo sildid kõikide valitud failide jaoks", + "Select tags to apply to all selected files" : "Vali sildid kõikide valitud failide jaoks", "Cancel" : "Tühista", + "Apply changes" : "Rakenda muudatused", + "Failed to load tags" : "Siltide laadimine ei õnnestu", + "Failed to load selected tags" : "Valitud siltide laadimine ei õnnestu", + "Failed to select tag" : "Sildi valimine ei õnnestu", + "System admin disabled tag creation. You can only use existing ones." : "Peakasutaja on keelanud siltide loomise. Sa võid kasutada vaid olemasolevaid.", + "Loading collaborative tags …" : "Laadin ühistegevuslikke silte…", + "Search or create collaborative tags" : "Otsi või loo ühistegevuslikke silte", + "No tags to select, type to create a new tag" : "Pole ühtegi valitavat silti, uue sildi lisamiseks hakka kirjutama", + "Open in Files" : "Ava failirakenduses", + "No tags found" : "Silte ei leitud", "This file has the tag {tag}" : "Sellel failil on silt {tag}", - "This file has the tags {firstTags} and {lastTag}" : "Sellel failil on sildid {firstTags} and {lastTag}", - "No files in here" : "Siin ei ole faile", - "No entries found in this folder" : "Selles kaustast ei leitud kirjeid", - "Name" : "Nimi", - "Size" : "Suurus", - "Modified" : "Muudetud" + "This file has the tags {firstTags} and {lastTag}" : "Sellel failil on sildid {firstTags} and {lastTag}" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/user_ldap/l10n/de_DE.js b/apps/user_ldap/l10n/de_DE.js index acdcdab78de..5cc130582c8 100644 --- a/apps/user_ldap/l10n/de_DE.js +++ b/apps/user_ldap/l10n/de_DE.js @@ -1,8 +1,8 @@ OC.L10N.register( "user_ldap", { - "Failed to clear the mappings." : "Löschen der Zuordnungen fehlgeschlagen.", - "Failed to delete the server configuration" : "Löschen der Serverkonfiguration fehlgeschlagen", + "Failed to clear the mappings." : "Die Zuordnungen konnten nicht gelöscht werden.", + "Failed to delete the server configuration" : "Die Serverkonfiguration konnte nicht gelöscht werden", "Invalid configuration: Anonymous binding is not allowed." : "Die Konfiguration ist ungültig: anonymes Binden ist nicht erlaubt. ", "Valid configuration, connection established!" : "Gültige Konfiguration, Verbindung hergestellt!", "Valid configuration, but binding failed. Please check the server settings and credentials." : "Die Konfiguration ist gültig, aber der LDAP-Bind ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen. ", diff --git a/apps/user_ldap/l10n/de_DE.json b/apps/user_ldap/l10n/de_DE.json index 2e415b8400c..288e84d4cde 100644 --- a/apps/user_ldap/l10n/de_DE.json +++ b/apps/user_ldap/l10n/de_DE.json @@ -1,6 +1,6 @@ { "translations": { - "Failed to clear the mappings." : "Löschen der Zuordnungen fehlgeschlagen.", - "Failed to delete the server configuration" : "Löschen der Serverkonfiguration fehlgeschlagen", + "Failed to clear the mappings." : "Die Zuordnungen konnten nicht gelöscht werden.", + "Failed to delete the server configuration" : "Die Serverkonfiguration konnte nicht gelöscht werden", "Invalid configuration: Anonymous binding is not allowed." : "Die Konfiguration ist ungültig: anonymes Binden ist nicht erlaubt. ", "Valid configuration, connection established!" : "Gültige Konfiguration, Verbindung hergestellt!", "Valid configuration, but binding failed. Please check the server settings and credentials." : "Die Konfiguration ist gültig, aber der LDAP-Bind ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen. ", diff --git a/apps/workflowengine/src/components/Rule.vue b/apps/workflowengine/src/components/Rule.vue index c9632d6c196..1c321fd014c 100644 --- a/apps/workflowengine/src/components/Rule.vue +++ b/apps/workflowengine/src/components/Rule.vue @@ -31,7 +31,6 @@ <Operation :operation="operation" :colored="false"> <component :is="operation.element" v-if="operation.element" - ref="operationComponent" :model-value="inputValue" @update:model-value="updateOperationByEvent" /> <component :is="operation.options" @@ -133,9 +132,8 @@ export default { }, mounted() { this.originalRule = JSON.parse(JSON.stringify(this.rule)) - if (this.operation?.element) { - this.$refs.operationComponent.value = this.rule.operation + this.inputValue = this.rule.operation } else if (this.operation?.options) { // keeping this in an else for apps that try to be backwards compatible and may ship both // to be removed in 03/2028 |