9 files changed, 19 insertions, 15 deletions
diff --git a/settings/BackgroundJobs/VerifyUserData.php b/settings/BackgroundJobs/VerifyUserData.php
index 8c02ae1727c..5e5b2b9c678 100644
--- a/settings/BackgroundJobs/VerifyUserData.php
+++ b/settings/BackgroundJobs/VerifyUserData.php
@@ -231,7 +231,7 @@ class VerifyUserData extends Job {
 
 			$body = json_decode($response->getBody(), true);
 
-			if ($body['federationId'] === $cloudId) {
+			if (is_array($body) && isset($body['federationId']) && $body['federationId'] === $cloudId) {
 				return $body;
 			}
 
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index b96d9d29df9..fa145bd1171 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -4,9 +4,9 @@ OC.L10N.register(
     "{actor} changed your password" : "{actor} hat Ihr Passwort geändert",
     "You changed your password" : "Sie haben Ihr Passwort geändert",
     "Your password was reset by an administrator" : "Ihr Passwort wurde vom Administrator zurückgesetzt",
-    "{actor} changed your email address" : "{Aktör} EMail Adresse geändert",
-    "You changed your email address" : "Du hast deine EMail Adresse geändert",
-    "Your email address was changed by an administrator" : "Deine EMail Adresse wurde durch den Administrator geändert",
+    "{actor} changed your email address" : "{Aktör} E-Mail-Adresse geändert",
+    "You changed your email address" : "Sie haben Ihre E-Mail-Adresse geändert",
+    "Your email address was changed by an administrator" : "Ihre E-Mail-Adresse wurde durch den Administrator geändert",
     "Security" : "Sicherheit",
     "You successfully logged in using two-factor authentication (%1$s)" : "Du hast dich erfolgreich mittels Zwei-Faktor-Authentifizierung angemeldet (%1$s)",
     "A login attempt using two-factor authentication failed (%1$s)" : "Ein Anmeldeversuch mittels Zwei-Faktor-Authentifizierung schlug fehl (%1$s)",
@@ -33,7 +33,7 @@ OC.L10N.register(
     "Unable to delete group." : "Gruppe konnte nicht gelöscht werden.",
     "Invalid SMTP password." : "Ungültiges SMTP Passwort.",
     "Well done, %s!" : "Gut gemacht, %s!",
-    "If you received this email, the email configuration seems to be correct." : "Wenn du diese EMail empfangen hast, scheint die EMail Konfiguration korrekt zu sein.",
+    "If you received this email, the email configuration seems to be correct." : "Wenn du diese E-Mail empfangen hast, sind die E-Mail-Einstellungen korrekt.",
     "Email setting test" : "Test der E-Mail-Einstellungen",
     "Email could not be sent. Check your mail server log" : "E-Mail konnte nicht versandt werden. Prüfen Sie Ihr E-Mail-Server-Protokoll",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Beim Senden der E-Mail ist ein Problem aufgetreten. Bitte überprüfen Sie Ihre Einstellungen. (Fehler: %s)",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index 4aaf6d8de66..4e913e064b8 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -2,9 +2,9 @@
     "{actor} changed your password" : "{actor} hat Ihr Passwort geändert",
     "You changed your password" : "Sie haben Ihr Passwort geändert",
     "Your password was reset by an administrator" : "Ihr Passwort wurde vom Administrator zurückgesetzt",
-    "{actor} changed your email address" : "{Aktör} EMail Adresse geändert",
-    "You changed your email address" : "Du hast deine EMail Adresse geändert",
-    "Your email address was changed by an administrator" : "Deine EMail Adresse wurde durch den Administrator geändert",
+    "{actor} changed your email address" : "{Aktör} E-Mail-Adresse geändert",
+    "You changed your email address" : "Sie haben Ihre E-Mail-Adresse geändert",
+    "Your email address was changed by an administrator" : "Ihre E-Mail-Adresse wurde durch den Administrator geändert",
     "Security" : "Sicherheit",
     "You successfully logged in using two-factor authentication (%1$s)" : "Du hast dich erfolgreich mittels Zwei-Faktor-Authentifizierung angemeldet (%1$s)",
     "A login attempt using two-factor authentication failed (%1$s)" : "Ein Anmeldeversuch mittels Zwei-Faktor-Authentifizierung schlug fehl (%1$s)",
@@ -31,7 +31,7 @@
     "Unable to delete group." : "Gruppe konnte nicht gelöscht werden.",
     "Invalid SMTP password." : "Ungültiges SMTP Passwort.",
     "Well done, %s!" : "Gut gemacht, %s!",
-    "If you received this email, the email configuration seems to be correct." : "Wenn du diese EMail empfangen hast, scheint die EMail Konfiguration korrekt zu sein.",
+    "If you received this email, the email configuration seems to be correct." : "Wenn du diese E-Mail empfangen hast, sind die E-Mail-Einstellungen korrekt.",
     "Email setting test" : "Test der E-Mail-Einstellungen",
     "Email could not be sent. Check your mail server log" : "E-Mail konnte nicht versandt werden. Prüfen Sie Ihr E-Mail-Server-Protokoll",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Beim Senden der E-Mail ist ein Problem aufgetreten. Bitte überprüfen Sie Ihre Einstellungen. (Fehler: %s)",
diff --git a/settings/l10n/nb.js b/settings/l10n/nb.js
index a57460e2e67..7f25fe6049a 100644
--- a/settings/l10n/nb.js
+++ b/settings/l10n/nb.js
@@ -250,6 +250,7 @@ OC.L10N.register(
     "For optimal performance it's important to configure background jobs correctly. For bigger instances 'Cron' is the recommended setting. Please see the documentation for more information." : "For optimal ytelse er det viktig å sette opp bakgrunnsjobber rett. For kjøring på større installasjoner er 'Cron' anbefalt innstilling. Se dokumentasjonen for mer informasjon.",
     "Execute one task with each page loaded" : "Utfør en oppgave med hver side som blir lastet",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registrert i en webcron-tjeneste for å kalle cron.php hvert 15. minutt over http.",
+    "Use system cron service to call the cron.php file every 15 minutes." : "Bruk systemets cron-tjeneste til å kalle cron.php hvert kvarter.",
     "The cron.php needs to be executed by the system user \"%s\"." : "Filen cron.php må kjøres systemet som følgende bruker \"%s\".",
     "To run this you need the PHP posix extension. See {linkstart}PHP documentation{linkend} for more details." : "For å kjøre denne trenger du «PHP posix extension». Se {linkstart}PHP dokumentasjonen{linkend} for flere detaljer.",
     "Version" : "Versjon",
diff --git a/settings/l10n/nb.json b/settings/l10n/nb.json
index 79b2579f71c..c2fccf54417 100644
--- a/settings/l10n/nb.json
+++ b/settings/l10n/nb.json
@@ -248,6 +248,7 @@
     "For optimal performance it's important to configure background jobs correctly. For bigger instances 'Cron' is the recommended setting. Please see the documentation for more information." : "For optimal ytelse er det viktig å sette opp bakgrunnsjobber rett. For kjøring på større installasjoner er 'Cron' anbefalt innstilling. Se dokumentasjonen for mer informasjon.",
     "Execute one task with each page loaded" : "Utfør en oppgave med hver side som blir lastet",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registrert i en webcron-tjeneste for å kalle cron.php hvert 15. minutt over http.",
+    "Use system cron service to call the cron.php file every 15 minutes." : "Bruk systemets cron-tjeneste til å kalle cron.php hvert kvarter.",
     "The cron.php needs to be executed by the system user \"%s\"." : "Filen cron.php må kjøres systemet som følgende bruker \"%s\".",
     "To run this you need the PHP posix extension. See {linkstart}PHP documentation{linkend} for more details." : "For å kjøre denne trenger du «PHP posix extension». Se {linkstart}PHP dokumentasjonen{linkend} for flere detaljer.",
     "Version" : "Versjon",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index b0ffc524d0c..c1652e8fbd2 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -11,7 +11,7 @@ OC.L10N.register(
     "You successfully logged in using two-factor authentication (%1$s)" : "Je bent succesvol ingelogd via tweefactot authenticatie (%1$s)",
     "A login attempt using two-factor authentication failed (%1$s)" : "Een inlogpoging via tweefactor authenticatie is mislukt (%1$s)",
     "Your <strong>password</strong> or <strong>email</strong> was modified" : "Je <strong>wachtwoord</strong> of <strong>e-mailadres</strong> is gewijzigd",
-    "Your apps" : "Jou apps",
+    "Your apps" : "Jouw apps",
     "Enabled apps" : "Ingeschakelde apps",
     "Disabled apps" : "Uitgeschakelde apps",
     "App bundles" : "App bundels",
@@ -246,6 +246,7 @@ OC.L10N.register(
     "All checks passed." : "Alle checks geslaagd",
     "Background jobs" : "Achtergrond jobs",
     "Last job ran %s." : "Laatste job liep %s.",
+    "Last job execution ran %s. Something seems wrong." : "Laatst uitgevoerde job: %s. Er lijkt iets fout gegaan.",
     "Background job didn’t run yet!" : "Achtergrondjob nog niet gelopen!",
     "For optimal performance it's important to configure background jobs correctly. For bigger instances 'Cron' is the recommended setting. Please see the documentation for more information." : "Voor optimale prestaties is het belangrijk om de achtergrondtaken goed te configureren. Voor grotere installaties is \"Cron' de aanbevolen instelling. Bekijk de documentatie voor meer informatie.",
     "Execute one task with each page loaded" : "Bij laden van elke pagina één taak uitvoeren",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index 660bc2132d8..bb1e1d383be 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -9,7 +9,7 @@
     "You successfully logged in using two-factor authentication (%1$s)" : "Je bent succesvol ingelogd via tweefactot authenticatie (%1$s)",
     "A login attempt using two-factor authentication failed (%1$s)" : "Een inlogpoging via tweefactor authenticatie is mislukt (%1$s)",
     "Your <strong>password</strong> or <strong>email</strong> was modified" : "Je <strong>wachtwoord</strong> of <strong>e-mailadres</strong> is gewijzigd",
-    "Your apps" : "Jou apps",
+    "Your apps" : "Jouw apps",
     "Enabled apps" : "Ingeschakelde apps",
     "Disabled apps" : "Uitgeschakelde apps",
     "App bundles" : "App bundels",
@@ -244,6 +244,7 @@
     "All checks passed." : "Alle checks geslaagd",
     "Background jobs" : "Achtergrond jobs",
     "Last job ran %s." : "Laatste job liep %s.",
+    "Last job execution ran %s. Something seems wrong." : "Laatst uitgevoerde job: %s. Er lijkt iets fout gegaan.",
     "Background job didn’t run yet!" : "Achtergrondjob nog niet gelopen!",
     "For optimal performance it's important to configure background jobs correctly. For bigger instances 'Cron' is the recommended setting. Please see the documentation for more information." : "Voor optimale prestaties is het belangrijk om de achtergrondtaken goed te configureren. Voor grotere installaties is \"Cron' de aanbevolen instelling. Bekijk de documentatie voor meer informatie.",
     "Execute one task with each page loaded" : "Bij laden van elke pagina één taak uitvoeren",
diff --git a/settings/l10n/sv.js b/settings/l10n/sv.js
index cf0dc5de58a..21f9ce8442c 100644
--- a/settings/l10n/sv.js
+++ b/settings/l10n/sv.js
@@ -316,8 +316,8 @@ OC.L10N.register(
     "For password reset and notifications" : "För lösenordsåterställning och notifikationer",
     "Phone number" : "Telefonnummer",
     "Your phone number" : "Ditt telefonnummer",
-    "Address" : "Adress",
-    "Your postal address" : "Din postadress",
+    "Address" : "Ort/Stad",
+    "Your postal address" : "Ort/Stad",
     "Website" : "Webbsida",
     "It can take up to 24 hours before the account is displayed as verified." : "Det kan ta upp till 24 timmar innan kontot visas som verifierat.",
     "Link https://…" : "Länk https://...",
diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json
index cb1f6749fd0..76f084b6e7b 100644
--- a/settings/l10n/sv.json
+++ b/settings/l10n/sv.json
@@ -314,8 +314,8 @@
     "For password reset and notifications" : "För lösenordsåterställning och notifikationer",
     "Phone number" : "Telefonnummer",
     "Your phone number" : "Ditt telefonnummer",
-    "Address" : "Adress",
-    "Your postal address" : "Din postadress",
+    "Address" : "Ort/Stad",
+    "Your postal address" : "Ort/Stad",
     "Website" : "Webbsida",
     "It can take up to 24 hours before the account is displayed as verified." : "Det kan ta upp till 24 timmar innan kontot visas som verifierat.",
     "Link https://…" : "Länk https://...",