apps/admin_audit/l10n/eo.js

@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "admin_audit",
+    {
+    "Auditing / Logging" : "Ekzamenado / Protokolado",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Provizi protokolado-kapablojn por Nextcloud, kiel ekzemple protokolado de aliroj al dosieroj aŭ aliaj delikataj agoj."
+},
+"nplurals=2; plural=(n != 1);");

apps/admin_audit/l10n/eo.json

@@ -0,0 +1,5 @@
+{ "translations": {
+    "Auditing / Logging" : "Ekzamenado / Protokolado",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Provizi protokolado-kapablojn por Nextcloud, kiel ekzemple protokolado de aliroj al dosieroj aŭ aliaj delikataj agoj."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/cloud_federation_api/l10n/eo.js

@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "cloud_federation_api",
+    {
+    "Cloud Federation API" : "API de Nuba Federacio",
+    "Enable clouds to communicate with each other and exchange data" : "Ebligi interkomunikadon inter diversaj nuboj kaj la interŝanĝon de datumoj",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "La API de Nuba Federacio ebligas diversajn instancojn de Nextcloud interkomuniki kaj interŝanĝi datumojn inter si."
+},
+"nplurals=2; plural=(n != 1);");

apps/cloud_federation_api/l10n/eo.json

@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cloud Federation API" : "API de Nuba Federacio",
+    "Enable clouds to communicate with each other and exchange data" : "Ebligi interkomunikadon inter diversaj nuboj kaj la interŝanĝon de datumoj",
+    "The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data." : "La API de Nuba Federacio ebligas diversajn instancojn de Nextcloud interkomuniki kaj interŝanĝi datumojn inter si."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

apps/dav/l10n/pl.js

@@ -75,6 +75,9 @@ OC.L10N.register(
     "Cancelled: %1$s" : "Anulowane: %1$s",
     "\"%1$s\" has been canceled" : "\"%1$s\" zostało anulowane",
     "Re: %1$s" : "Odp: %1$s",
+    "%1$s has accepted your invitation" : "Twoje zaproszenie zostało zaakceptowane przez %1$s",
+    "%1$s has tentatively accepted your invitation" : "Twoje zaproszenie zostało wstępnie zaakceptowane przez %1$s",
+    "%1$s has declined your invitation" : "Twoje zaproszenie zostało odrzucone przez %1$s",
     "%1$s has responded to your invitation" : "%1$s odpowiedział/a na Twoje zaproszenie",
     "Invitation updated: %1$s" : "Zaktualizowano zaproszenie: %1$s",
     "%1$s updated the event \"%2$s\"" : "%1$s zaktualizował/a wydarzenie \"%2$s\"",

apps/dav/l10n/pl.json

@@ -73,6 +73,9 @@
     "Cancelled: %1$s" : "Anulowane: %1$s",
     "\"%1$s\" has been canceled" : "\"%1$s\" zostało anulowane",
     "Re: %1$s" : "Odp: %1$s",
+    "%1$s has accepted your invitation" : "Twoje zaproszenie zostało zaakceptowane przez %1$s",
+    "%1$s has tentatively accepted your invitation" : "Twoje zaproszenie zostało wstępnie zaakceptowane przez %1$s",
+    "%1$s has declined your invitation" : "Twoje zaproszenie zostało odrzucone przez %1$s",
     "%1$s has responded to your invitation" : "%1$s odpowiedział/a na Twoje zaproszenie",
     "Invitation updated: %1$s" : "Zaktualizowano zaproszenie: %1$s",
     "%1$s updated the event \"%2$s\"" : "%1$s zaktualizował/a wydarzenie \"%2$s\"",

apps/dav/lib/CalDAV/Reminder/ReminderService.php

@@ -179,7 +179,7 @@ public function processReminders() :void {
 				continue;
 			}
 
-			if ($this->config->getAppValue('dav', 'sendEventRemindersToSharedGroupMembers', 'yes') === 'no') {
+			if ($this->config->getAppValue('dav', 'sendEventRemindersToSharedUsers', 'yes') === 'no') {
 				$users = $this->getAllUsersWithWriteAccessToCalendar($reminder['calendar_id']);
 			} else {
 				$users = [];

apps/dav/lib/CardDAV/Converter.php

@@ -29,10 +29,12 @@
 
 use Exception;
 use OCP\Accounts\IAccountManager;
+use OCP\Accounts\PropertyDoesNotExistException;
 use OCP\IImage;
 use OCP\IUser;
 use Sabre\VObject\Component\VCard;
 use Sabre\VObject\Property\Text;
+use function array_merge;
 
 class Converter {
 
@@ -44,7 +46,13 @@ public function __construct(IAccountManager $accountManager) {
 	}
 
 	public function createCardFromUser(IUser $user): ?VCard {
-		$userProperties = $this->accountManager->getAccount($user)->getProperties();
+		$account = $this->accountManager->getAccount($user);
+		$userProperties = $account->getProperties();
+		try {
+			$additionalEmailsCollection = $account->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
+			$userProperties = array_merge($userProperties, $additionalEmailsCollection->getProperties());
+		} catch (PropertyDoesNotExistException $e) {
+		}
 
 		$uid = $user->getUID();
 		$cloudId = $user->getCloudId();
@@ -75,6 +83,7 @@ public function createCardFromUser(IUser $user): ?VCard {
 							$vCard->add('PHOTO', $image->data(), ['ENCODING' => 'b', 'TYPE' => $image->mimeType()]);
 						}
 						break;
+					case IAccountManager::COLLECTION_EMAIL:
 					case IAccountManager::PROPERTY_EMAIL:
 						$vCard->add(new Text($vCard, 'EMAIL', $property->getValue(), ['TYPE' => 'OTHER']));
 						break;

apps/dav/lib/Settings/CalDAVSettings.php

@@ -46,7 +46,7 @@ class CalDAVSettings implements IDelegatedSettings {
 		'sendInvitations' => 'yes',
 		'generateBirthdayCalendar' => 'yes',
 		'sendEventReminders' => 'yes',
-		'sendEventRemindersToSharedGroupMembers' => 'yes',
+		'sendEventRemindersToSharedUsers' => 'yes',
 		'sendEventRemindersPush' => 'no',
 	];
 

apps/dav/src/settings.js

@@ -16,9 +16,9 @@ const CalDavSettingsView = new View({
 				'generateBirthdayCalendar'
 			),
 			sendEventReminders: loadState('dav', 'sendEventReminders'),
-			sendEventRemindersToSharedGroupMembers: loadState(
+			sendEventRemindersToSharedUsers: loadState(
 				'dav',
-				'sendEventRemindersToSharedGroupMembers'
+				'sendEventRemindersToSharedUsers'
 			),
 			sendEventRemindersPush: loadState('dav', 'sendEventRemindersPush'),
 		}

apps/dav/src/views/CalDavSettings.spec.js

@@ -43,7 +43,7 @@ describe('CalDavSettings', () => {
 						sendInvitations: true,
 						generateBirthdayCalendar: true,
 						sendEventReminders: true,
-						sendEventRemindersToSharedGroupMembers: true,
+						sendEventRemindersToSharedUsers: true,
 						sendEventRemindersPush: true,
 					}
 				},
@@ -65,10 +65,10 @@ describe('CalDavSettings', () => {
 			'Send notifications for events'
 		)
 		expect(sendEventReminders).toBeChecked()
-		const sendEventRemindersToSharedGroupMembers = TLUtils.getByLabelText(
+		const sendEventRemindersToSharedUsers = TLUtils.getByLabelText(
 			'Send reminder notifications to calendar sharees as well'
 		)
-		expect(sendEventRemindersToSharedGroupMembers).toBeChecked()
+		expect(sendEventRemindersToSharedUsers).toBeChecked()
 		const sendEventRemindersPush = TLUtils.getByLabelText(
 			'Enable notifications for events via push'
 		)
@@ -114,7 +114,7 @@ describe('CalDavSettings', () => {
 			'no'
 		)
 
-		expect(sendEventRemindersToSharedGroupMembers).toBeDisabled()
+		expect(sendEventRemindersToSharedUsers).toBeDisabled()
 		expect(sendEventRemindersPush).toBeDisabled()
 
 		OCP.AppConfig.setValue.mockClear()
@@ -126,7 +126,7 @@ describe('CalDavSettings', () => {
 			'yes'
 		)
 
-		expect(sendEventRemindersToSharedGroupMembers).toBeEnabled()
+		expect(sendEventRemindersToSharedUsers).toBeEnabled()
 		expect(sendEventRemindersPush).toBeEnabled()
 		*/
 	})

apps/dav/src/views/CalDavSettings.vue

@@ -51,7 +51,7 @@
 		</p>
 		<p class="indented">
 			<NcCheckboxRadioSwitch id="caldavSendEventRemindersToSharedGroupMembers"
-				:checked.sync="sendEventRemindersToSharedGroupMembers"
+				:checked.sync="sendEventRemindersToSharedUsers"
 				type="switch"
 				:disabled="!sendEventReminders">
 				{{ $t('dav', 'Send reminder notifications to calendar sharees as well' ) }}
@@ -130,10 +130,10 @@ export default {
 		sendEventReminders(value) {
 			OCP.AppConfig.setValue('dav', 'sendEventReminders', value ? 'yes' : 'no')
 		},
-		sendEventRemindersToSharedGroupMembers(value) {
+		sendEventRemindersToSharedUsers(value) {
 			OCP.AppConfig.setValue(
 				'dav',
-				'sendEventRemindersToSharedGroupMembers',
+				'sendEventRemindersToSharedUsers',
 				value ? 'yes' : 'no'
 			)
 		},

apps/dav/tests/unit/Settings/CalDAVSettingsTest.php

@@ -61,7 +61,7 @@ public function testGetForm(): void {
 			   ['dav', 'sendInvitations', 'yes'],
 			   ['dav', 'generateBirthdayCalendar', 'yes'],
 			   ['dav', 'sendEventReminders', 'yes'],
-			   ['dav', 'sendEventRemindersToSharedGroupMembers', 'yes'],
+			   ['dav', 'sendEventRemindersToSharedUsers', 'yes'],
 			   ['dav', 'sendEventRemindersPush', 'no'],
 		   )
 		   ->will($this->onConsecutiveCalls('yes', 'no', 'yes', 'yes', 'yes'));
@@ -76,7 +76,7 @@ public function testGetForm(): void {
 				['sendInvitations', true],
 				['generateBirthdayCalendar', false],
 				['sendEventReminders', true],
-				['sendEventRemindersToSharedGroupMembers', true],
+				['sendEventRemindersToSharedUsers', true],
 				['sendEventRemindersPush', true],
 			);
 		$result = $this->settings->getForm();

apps/federation/lib/SyncFederationAddressBooks.php

@@ -82,10 +82,14 @@ public function syncThemAll(\Closure $callback) {
 			} catch (\Exception $ex) {
 				if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
 					$this->dbHandler->setServerStatus($url, TrustedServers::STATUS_ACCESS_REVOKED);
-					$this->logger->error("Server sync for $url failed because of revoked access.");
+					$this->logger->error("Server sync for $url failed because of revoked access.", [
+						'exception' => $ex,
+					]);
 				} else {
 					$this->dbHandler->setServerStatus($url, TrustedServers::STATUS_FAILURE);
-					$this->logger->error("Server sync for $url failed.");
+					$this->logger->error("Server sync for $url failed.", [
+						'exception' => $ex,
+					]);
 				}
 				$callback($url, $ex);
 			}

apps/files/l10n/en_GB.js

@@ -109,6 +109,8 @@ OC.L10N.register(
     "Create new folder" : "Create new folder",
     "Upload file" : "Upload file",
     "Recent" : "Recent",
+    "This file has the tag {tag}" : "This file has the tag {tag}",
+    "This file has the tags {firstTags} and {lastTag}" : "This file has the tags {firstTags} and {lastTag}",
     "Not favorited" : "Not favourited",
     "Remove from favorites" : "Remove from favourites",
     "Add to favorites" : "Add to favourites",

apps/files/l10n/en_GB.json

@@ -107,6 +107,8 @@
     "Create new folder" : "Create new folder",
     "Upload file" : "Upload file",
     "Recent" : "Recent",
+    "This file has the tag {tag}" : "This file has the tag {tag}",
+    "This file has the tags {firstTags} and {lastTag}" : "This file has the tags {firstTags} and {lastTag}",
     "Not favorited" : "Not favourited",
     "Remove from favorites" : "Remove from favourites",
     "Add to favorites" : "Add to favourites",

apps/files/l10n/es.js

@@ -109,6 +109,8 @@ OC.L10N.register(
     "Create new folder" : "Crear nueva carpeta",
     "Upload file" : "Subir archivo",
     "Recent" : "Reciente",
+    "This file has the tag {tag}" : "Este archivo tiene la etiqueta {tag}",
+    "This file has the tags {firstTags} and {lastTag}" : "Este archivo tiene las etiquetas {firstTags} y {lastTag}",
     "Not favorited" : "Quitado como favorito",
     "Remove from favorites" : "Quitar de favoritos",
     "Add to favorites" : "Añadir a favoritos",

apps/files/l10n/es.json

@@ -107,6 +107,8 @@
     "Create new folder" : "Crear nueva carpeta",
     "Upload file" : "Subir archivo",
     "Recent" : "Reciente",
+    "This file has the tag {tag}" : "Este archivo tiene la etiqueta {tag}",
+    "This file has the tags {firstTags} and {lastTag}" : "Este archivo tiene las etiquetas {firstTags} y {lastTag}",
     "Not favorited" : "Quitado como favorito",
     "Remove from favorites" : "Quitar de favoritos",
     "Add to favorites" : "Añadir a favoritos",

apps/files/l10n/fr.js

@@ -109,6 +109,8 @@ OC.L10N.register(
     "Create new folder" : "Créer un nouveau dossier",
     "Upload file" : "Téléverser un fichier",
     "Recent" : "Récent",
+    "This file has the tag {tag}" : "Ce fichier a l'étiquette {tag}",
+    "This file has the tags {firstTags} and {lastTag}" : "Ce fichier a les étiquettes {firstTags} et {lastTag}",
     "Not favorited" : "Non marqué comme favori",
     "Remove from favorites" : "Retirer des favoris",
     "Add to favorites" : "Ajouter aux favoris",
@@ -174,6 +176,7 @@ OC.L10N.register(
     "Download file {name}" : "Télécharger le fichier {name}",
     "\"{displayName}\" action executed successfully" : "Action \"{displayName}\" exécutée avec succès",
     "\"{displayName}\" action failed" : "Échec de l'action \"{displayName}\"",
+    "Total rows summary" : "Récapitulatif du nombre total de lignes",
     "Select all" : "Tout sélectionner",
     "Unselect all" : "Tout désélectionner",
     "\"{displayName}\" failed on some elements " : "\"{displayName}\" a échoué pour avec certains éléments",
@@ -229,6 +232,7 @@ OC.L10N.register(
     "Delete permanently" : "Supprimer définitivement",
     "Set up templates folder" : "Configurer le dossier des modèles",
     "Templates" : "Modèles",
+    "Create new templates folder" : "Créer un nouveau dossier de modèles",
     "Unable to initialize the templates directory" : "Impossible d'initialiser le dossier des modèles",
     "Toggle %1$s sublist" : "Basculer %1$s sous-liste",
     "Toggle grid view" : "Activer/Désactiver l'affichage mosaïque",

apps/files/l10n/fr.json

@@ -107,6 +107,8 @@
     "Create new folder" : "Créer un nouveau dossier",
     "Upload file" : "Téléverser un fichier",
     "Recent" : "Récent",
+    "This file has the tag {tag}" : "Ce fichier a l'étiquette {tag}",
+    "This file has the tags {firstTags} and {lastTag}" : "Ce fichier a les étiquettes {firstTags} et {lastTag}",
     "Not favorited" : "Non marqué comme favori",
     "Remove from favorites" : "Retirer des favoris",
     "Add to favorites" : "Ajouter aux favoris",
@@ -172,6 +174,7 @@
     "Download file {name}" : "Télécharger le fichier {name}",
     "\"{displayName}\" action executed successfully" : "Action \"{displayName}\" exécutée avec succès",
     "\"{displayName}\" action failed" : "Échec de l'action \"{displayName}\"",
+    "Total rows summary" : "Récapitulatif du nombre total de lignes",
     "Select all" : "Tout sélectionner",
     "Unselect all" : "Tout désélectionner",
     "\"{displayName}\" failed on some elements " : "\"{displayName}\" a échoué pour avec certains éléments",
@@ -227,6 +230,7 @@
     "Delete permanently" : "Supprimer définitivement",
     "Set up templates folder" : "Configurer le dossier des modèles",
     "Templates" : "Modèles",
+    "Create new templates folder" : "Créer un nouveau dossier de modèles",
     "Unable to initialize the templates directory" : "Impossible d'initialiser le dossier des modèles",
     "Toggle %1$s sublist" : "Basculer %1$s sous-liste",
     "Toggle grid view" : "Activer/Désactiver l'affichage mosaïque",

apps/files/l10n/zh_HK.js

@@ -109,6 +109,8 @@ OC.L10N.register(
     "Create new folder" : "新增資料夾",
     "Upload file" : "上傳檔案",
     "Recent" : "最新",
+    "This file has the tag {tag}" : "此檔案有標籤 {tag}",
+    "This file has the tags {firstTags} and {lastTag}" : "此檔案有標籤 {firstTags} 與 {lastTag}",
     "Not favorited" : "未加入至最愛",
     "Remove from favorites" : "從最愛中移除",
     "Add to favorites" : "加到我的最愛",

apps/files/l10n/zh_HK.json

@@ -107,6 +107,8 @@
     "Create new folder" : "新增資料夾",
     "Upload file" : "上傳檔案",
     "Recent" : "最新",
+    "This file has the tag {tag}" : "此檔案有標籤 {tag}",
+    "This file has the tags {firstTags} and {lastTag}" : "此檔案有標籤 {firstTags} 與 {lastTag}",
     "Not favorited" : "未加入至最愛",
     "Remove from favorites" : "從最愛中移除",
     "Add to favorites" : "加到我的最愛",