Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83982240 authored May 20, 2024 by AVINASH GUSAIN

Merge remote-tracking branch 'origin/main' into dev/access-token

parents aa7b7fac 93e8f30b

appinfo/info.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -25,7 +25,11 @@
		<personal-section>OCA\EcloudAccounts\Settings\BetaSection</personal-section>
		</settings>
		<commands>
		<command>OCA\EcloudAccounts\Command\UpdateBlacklistedDomains</command>
		<command>OCA\EcloudAccounts\Command\Migrate2FASecrets</command>
		<command>OCA\EcloudAccounts\Command\MigrateWebmailAddressbooks</command>
		</commands>
		<background-jobs>
		<job>OCA\EcloudAccounts\BackgroundJob\BlacklistedDomainsJob</job>
		</background-jobs>
		</info>

l10n/de.js

+2 −1

Original line number	Diff line number	Diff line
		@@ -84,6 +84,7 @@ OC.L10N.register(
		"You cannot set an email address with a Murena domain as recovery email address.": "Sie können keine E-Mail-Adresse mit einer Murena-Domäne als Wiederherstellungs-E-Mail-Adresse festlegen.",
		"Captcha is not verified!": "Captcha wird nicht überprüft!",
		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.",
		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!"
		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!",
		"The domain of this email address is blacklisted. Please provide another recovery address.": "Die Domäne dieser E-Mailadresse ist auf der Sperrliste. Bitte geben Sie eine andere E-Mailadresse an."
		},
		"nplurals=2; plural=(n != 1);");

l10n/de.json

+2 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,8 @@
		"You cannot set an email address with a Murena domain as recovery email address.": "Sie können keine E-Mail-Adresse mit einer Murena-Domäne als Wiederherstellungs-E-Mail-Adresse festlegen.",
		"Captcha is not verified!": "Captcha wird nicht überprüft!",
		"A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.",
		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!"
		"An error occurred while creating your account!": "Beim Anlegen Ihres Kontos ist ein Fehler aufgetreten!",
		"The domain of this email address is blacklisted. Please provide another recovery address.": "Die Domäne dieser E-Mailadresse ist auf der Sperrliste. Bitte geben Sie eine andere E-Mailadresse an."
		},
		"pluralForm": "nplurals=2; plural=(n != 1);"
		}

l10n/en.js

+2 −1

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ OC.L10N.register(
		"You cannot set an email address with a Murena domain as recovery email address.": "You cannot set an email address with a Murena domain as recovery email address.",
		"Captcha is not verified!": "Captcha is not verified!",
		"A server-side error occurred while processing your request! Please try again later.": "A server-side error occurred while processing your request! Please try again later.",
		"An error occurred while creating your account!": "An error occurred while creating your account!"
		"An error occurred while creating your account!": "An error occurred while creating your account!",
		"The domain of this email address is blacklisted. Please provide another recovery address.": "The domain of this email address is blacklisted. Please provide another recovery address."
		},
		"nplurals=2; plural=(n != 1);");

l10n/en.json

+2 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,8 @@
		"You cannot set an email address with a Murena domain as recovery email address.": "You cannot set an email address with a Murena domain as recovery email address.",
		"Captcha is not verified!": "Captcha is not verified!",
		"A server-side error occurred while processing your request! Please try again later.": "A server-side error occurred while processing your request! Please try again later.",
		"An error occurred while creating your account!": "An error occurred while creating your account!"
		"An error occurred while creating your account!": "An error occurred while creating your account!",
		"The domain of this email address is blacklisted. Please provide another recovery address.": "The domain of this email address is blacklisted. Please provide another recovery address."
		},
		"pluralForm": "nplurals=2; plural=(n != 1);"
		}