19 files changed, 117 insertions, 10 deletions
diff --git a/settings/admin.php b/settings/admin.php
index 5e04f34367a..ea8aa7af5d0 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -44,6 +44,8 @@ $tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
 $tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());
 $tmpl->assign('old_php', OC_Util::isPHPoutdated());
 $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
+$tmpl->assign('cron_log', OC_Config::getValue('cron_log', true));
+$tmpl->assign('lastcron', OC_Appconfig::getValue('core', 'lastcron', false));
 $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes'));
 
 // Check if connected using HTTPS
diff --git a/settings/ajax/lostpassword.php b/settings/ajax/lostpassword.php
index b5f47bbceab..88c2bee6142 100644
--- a/settings/ajax/lostpassword.php
+++ b/settings/ajax/lostpassword.php
@@ -6,7 +6,7 @@ OCP\JSON::callCheck();
 $l=OC_L10N::get('core');
 
 // Get data
-if( isset( $_POST['email'] ) && filter_var( $_POST['email'], FILTER_VALIDATE_EMAIL) ) {
+if( isset( $_POST['email'] ) && OC_Mail::validateAddress($_POST['email']) ) {
 	$email=trim($_POST['email']);
 	OC_Preferences::setValue(OC_User::getUser(), 'settings', 'email', $email);
 	OC_JSON::success(array("data" => array( "message" => $l->t("Email saved") )));
diff --git a/settings/css/settings.css b/settings/css/settings.css
index a47e7bf6563..280d022af4e 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -167,6 +167,26 @@ table.shareAPI td { padding-bottom: 0.8em; }
 	width: 40px;
 }
 
+.cronlog {
+	margin-left: 10px;
+}
+
+.cronstatus {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+	vertical-align: text-bottom;
+}
+
+span.success {
+        background: #37ce02;
+        border-radius: 8px;
+}
+
+span.error {
+        background: #ce3702;
+}
+
 /* HELP */
 .pressed {background-color:#DDD;}
 
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 92c5450b7dc..54fe0bbcf39 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -93,6 +93,7 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "La connexió a internet no funciona",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Aquest servidor no té cap connexió a internet que funcioni. Això significa que algunes de les característiques com el muntatge d'emmagatzemament extern, les notificacions quant a actualitzacions o la instal·lació d'aplicacions de tercers no funcionarà. L'accés remot a fitxers i l'enviament de correus electrònics podria tampoc no funcionar. Us suggerim que habiliteu la connexió a internet per aquest servidor si voleu tenir totes les característiques.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "L'últim cron s'ha executat el %s",
 "Execute one task with each page loaded" => "Executa una tasca per cada paquet carregat",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php està registrat en un servei webcron que fa una crida a cron.php cada 15 minuts a través de http.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Utilitza el servei cron del sistema per fer una crida al fitxer cron.php cada 15 minuts.",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 1d9a554f3c7..960938b1c68 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,10 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Uvedena nesprávná hodnota pro %s",
 "Saved" => "Uloženo",
-"test email settings" => "nastavení zkušebního emailu",
+"test email settings" => "otestovat nastavení e-mailu",
+"If you received this email, the settings seem to be correct." => "Pokud jste obdrželi tento e-mail, nastavení se zdají být v pořádku.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Při odesílání e-mailu nastala chyba. Překontrolujte vaše nastavení.",
 "Email sent" => "E-mail odeslán",
+"You need to set your user email before being able to send test emails." => "Pro možnost odeslání zkušebních e-mailů musíte nejprve nastavit svou e-mailovou adresu.",
+"Send mode" => "Mód odesílání",
 "Encryption" => "Šifrování",
-"Authentication method" => "Metoda autentifikace",
+"Authentication method" => "Metoda ověření",
 "Unable to load list from App Store" => "Nelze načíst seznam z App Store",
 "Authentication error" => "Chyba přihlášení",
 "Your full name has been changed." => "Vaše celé jméno bylo změněno.",
@@ -67,6 +72,8 @@ $TRANSLATIONS = array(
 "Fatal issues only" => "Pouze fatální problémy",
 "None" => "Žádné",
 "Login" => "Přihlásit",
+"Plain" => "Čistý text",
+"NT LAN Manager" => "Správce NT LAN",
 "SSL" => "SSL",
 "TLS" => "TLS",
 "Security Warning" => "Bezpečnostní upozornění",
@@ -86,6 +93,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "Připojení k internetu nefunguje",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Server nemá funkční připojení k internetu. Některé moduly jako např. externí úložiště, oznámení o dostupných aktualizacích nebo instalace aplikací třetích stran nebudou fungovat. Přístup k souborům z jiných míst a odesílání oznamovacích e-mailů také nemusí fungovat. Pokud si přejete využívat všech vlastností ownCloud, doporučujeme povolit připojení k internetu tomuto serveru.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Poslední cron byl spuštěn v %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Poslední cron byl spuštěn v  %s. To se stalo před více než hodinu. Vypadá to, že není něco v pořádku.",
+"Cron was not executed yet!" => "Cron ještě nebyl spuštěn!",
 "Execute one task with each page loaded" => "Spustit jednu úlohu s každým načtením stránky",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
@@ -106,16 +116,16 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Vynutit HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Vynutí připojování klientů k %s šifrovaným spojením.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Připojte se k %s skrze HTTPS pro povolení nebo zakázání vynucování SSL.",
-"Email Server" => "Emailový server",
-"This is used for sending out notifications." => "Toto se používá při odesílání upozornění.",
+"Email Server" => "E-mailový server",
+"This is used for sending out notifications." => "Toto se používá pro odesílání upozornění.",
 "From address" => "Adresa odesílatele",
-"Authentication required" => "Ověření vyžadováno",
+"Authentication required" => "Vyžadováno ověření",
 "Server address" => "Adresa serveru",
 "Port" => "Port",
 "Credentials" => "Přihlašovací údaje",
 "SMTP Username" => "SMTP uživatelské jméno ",
 "SMTP Password" => "SMTP heslo",
-"Test email settings" => "Nastavení zkušebního emailu",
+"Test email settings" => "Otestovat nastavení e-mailu",
 "Send email" => "Odeslat e-mail",
 "Log" => "Záznam",
 "Log level" => "Úroveň zaznamenávání",
@@ -147,6 +157,7 @@ $TRANSLATIONS = array(
 "Full Name" => "Celé jméno",
 "Email" => "E-mail",
 "Your email address" => "Vaše e-mailová adresa",
+"Fill in an email address to enable password recovery and receive notifications" => "Zadejte e-mailovou adresu pro umožnění obnovy zapomenutého hesla a pro přijímání upozornění.",
 "Profile picture" => "Profilový obrázek",
 "Upload new" => "Nahrát nový",
 "Select new from Files" => "Vyberte nový ze souborů",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index d8ee237bed5..df8d2c419b9 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Saved" => "Gemt",
+"test email settings" => "test email indstillinger",
 "Email sent" => "E-mail afsendt",
 "Encryption" => "Kryptering",
 "Unable to load list from App Store" => "Kunne ikke indlæse listen fra App Store",
@@ -25,7 +26,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Forkert admin gendannelseskode. Se venligst koden efter og prøv igen.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnøgle blev opdateret.",
 "Unable to change password" => "Kunne ikke ændre kodeord",
+"Sending..." => "Sender...",
 "User Documentation" => "Brugerdokumentation",
+"Admin Documentation" => "Administrator Dokumentation",
 "Update to {appversion}" => "Opdatér til {appversion}",
 "Disable" => "Deaktiver",
 "Enable" => "Aktiver",
@@ -38,6 +41,11 @@ $TRANSLATIONS = array(
 "Update" => "Opdater",
 "Updated" => "Opdateret",
 "Select a profile picture" => "Vælg et profilbillede",
+"Very weak password" => "Meget svagt kodeord",
+"Weak password" => "Svagt kodeord",
+"So-so password" => "Jævnt kodeord",
+"Good password" => "Godt kodeord",
+"Strong password" => "Stærkt kodeord",
 "Decrypting files... Please wait, this can take some time." => "Dekryptere filer... Vent venligst, dette kan tage lang tid. ",
 "deleted" => "Slettet",
 "undo" => "fortryd",
@@ -58,6 +66,9 @@ $TRANSLATIONS = array(
 "Fatal issues only" => "Kun alvorlige fejl",
 "None" => "Ingen",
 "Login" => "Login",
+"NT LAN Manager" => "NT LAN Manager",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Sikkerhedsadvarsel",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Du tilgår %s via HTTP. Vi anbefaler at du konfigurerer din server til i stedet at kræve HTTPS.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Din data mappe og dine filer er muligvis tilgængelige fra internettet. .htaccess filen virker ikke. Vi anbefaler på det kraftigste at du konfigurerer din webserver så data mappen ikke længere er tilgængelig, eller at du flytter data mappen uden for webserverens dokument rod.  ",
@@ -95,8 +106,16 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Gennemtving HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Tving klienten til at forbinde til %s via en kryptetet forbindelse.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Forbind venligst til din %s via HTTPS for at aktivere eller deaktivere SSL tvang.",
+"Email Server" => "Email Server",
+"From address" => "Fra adresse",
+"Authentication required" => "Godkendelse påkrævet",
 "Server address" => "Serveradresse",
 "Port" => "Port",
+"Credentials" => "Brugeroplysninger",
+"SMTP Username" => "SMTP Brugernavn",
+"SMTP Password" => "SMTP Kodeord",
+"Test email settings" => "Test email indstillinger",
+"Send email" => "Send email",
 "Log" => "Log",
 "Log level" => "Log niveau",
 "More" => "Mere",
@@ -106,6 +125,7 @@ $TRANSLATIONS = array(
 "Add your App" => "Tilføj din App",
 "More Apps" => "Flere Apps",
 "Select an App" => "Vælg en App",
+"Documentation:" => "Dokumentation:",
 "See application page at apps.owncloud.com" => "Se applikationens side på apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenseret af <span class=\"author\"></span>",
 "Administrator Documentation" => "Administrator Dokumentation",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 5f1433f62ca..ffbda893018 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -93,6 +93,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "Keine Netzwerkverbindung",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Letzter Cron wurde um %s ausgeführt.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
+"Cron was not executed yet!" => "Cron wurde bis jetzt noch nicht ausgeführt!",
 "Execute one task with each page loaded" => "Führe eine Aufgabe mit jeder geladenen Seite aus",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Benutze den System-Crondienst um die cron.php alle 15 Minuten aufzurufen.",
@@ -144,7 +147,7 @@ $TRANSLATIONS = array(
 "Commercial Support" => "Kommerzieller Support",
 "Get the apps to sync your files" => "Lade die Apps zur Synchronisierung Deiner Daten herunter",
 "Show First Run Wizard again" => "Erstinstallation erneut durchführen",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s</strong>",
 "Password" => "Passwort",
 "Your password was changed" => "Dein Passwort wurde geändert.",
 "Unable to change your password" => "Passwort konnte nicht geändert werden",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 8884afcbc3c..0b30cc0c191 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -93,6 +93,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "Keine Internetverbindung",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Versenden von Mail-Benachrichtigungen funktionieren eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen nutzen wollen.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Letzter Cron wurde um %s ausgeführt.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
+"Cron was not executed yet!" => "Cron wurde bis jetzt noch nicht ausgeführt!",
 "Execute one task with each page loaded" => "Eine Aufgabe bei jedem Laden der Seite ausführen",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.",
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
index 2315586b187..b377a6b3381 100644
--- a/settings/l10n/en_GB.php
+++ b/settings/l10n/en_GB.php
@@ -93,6 +93,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "Internet connection not working",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don't work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Last cron was executed at %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Last cron was executed at %s. This is more than an hour ago, something seems wrong.",
+"Cron was not executed yet!" => "Cron was not executed yet!",
 "Execute one task with each page loaded" => "Execute one task with each page loaded",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php is registered at a webcron service to call cron.php every 15 minutes over http.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Use system's cron service to call the cron.php file every 15 minutes.",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 734149034b9..ec6e3b3bd65 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -93,6 +93,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "La conexión a Internet no está funcionando",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Este servidor no tiene conexión a Internet. Esto significa que algunas de las características no funcionarán, como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones, la instalación de aplicaciones de terceros, el acceso a los archivos de forma remota o el envío de correos electrónicos de notificación. Sugerimos habilitar una conexión a Internet en este servidor para disfrutar de todas las funciones.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Cron fue ejecutado por última vez a las %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Cron fue ejecutado por última vez a las %s. Esto fue hace más de una hora, algo anda mal.",
+"Cron was not executed yet!" => "¡Cron aún no ha sido ejecutado!",
 "Execute one task with each page loaded" => "Ejecutar una tarea con cada página cargada",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Utiliza el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos.",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 284c47e0806..7bef4092a43 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -83,6 +83,9 @@ $TRANSLATIONS = array(
 "We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Suosittelemme vahvasti asentamaan vaaditut paketit järjestelmään, jotta jotain seuraavista maa-asetuksista on mahdollista tukea: %s.",
 "Internet connection not working" => "Internet-yhteys ei toimi",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Viimeisin cron suoritettiin %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Viimeisin cron suoritettiin %s. Siitä on yli tunti aikaa, joten jokin näyttää olevan pielessä.",
+"Cron was not executed yet!" => "Cronia ei suoritettu vielä!",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumiseen 15 minuutin välein",
 "Sharing" => "Jakaminen",
 "Enable Share API" => "Käytä jakamisen ohjelmointirajapintaa",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 181fd11f972..10151a0a1e1 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -93,6 +93,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "Concessione Internet non funzionante",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Questo server ownCloud non ha una connessione a Internet funzionante. Ciò significa che alcune delle funzionalità come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. L'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalità.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "L'ultimo cron è stato eseguito alle %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "L'ultimo cron è stato eseguito alle %s. È più di un ora fa, qualcosa sembra sbagliato.",
+"Cron was not executed yet!" => "Cron non è ancora stato eseguito!",
 "Execute one task with each page loaded" => "Esegui un'operazione con ogni pagina caricata",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 826a6a77e00..c497eb12a68 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -93,6 +93,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "Internet verbinding werkt niet",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Laatst uitgevoerde cron op %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Laatst uitgevoerde cron op %s. Dat is langer dan een uur geleden, er is iets fout gegaan.",
+"Cron was not executed yet!" => "Cron is nog niet uitgevoerd!",
 "Execute one task with each page loaded" => "Bij laden van elke pagina één taak uitvoeren",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php is geregisteerd bij een webcron service om elke 15 minuten cron.php over http aan te roepen.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 33b22a147dc..640e1df9585 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -93,6 +93,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "Połączenie internetowe nie działa",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Ten serwer OwnCloud nie ma połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub 3-cie aplikacje mogą nie działać. Dostęp do plików z zewnątrz i wysyłanie powiadomienia e-mail nie może również działać. Sugerujemy, aby włączyć połączenia internetowego dla tego serwera, jeśli chcesz mieć wszystkie opcje.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Ostatni cron był uruchomiony %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Ostatni cron był uruchomiony %s. To jest więcej niż godzinę temu, wygląda na to, że coś jest nie tak.",
+"Cron was not executed yet!" => "Cron nie został jeszcze uruchomiony!",
 "Execute one task with each page loaded" => "Wykonuj jedno zadanie wraz z każdą wczytaną stroną",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na 15 minut przez http.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Użyj systemowego cron-a do uruchamiania cron.php raz na 15 minut.",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 4a7554499d5..dad6773d6af 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -93,6 +93,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "Sem conexão com a internet",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Este servidor não tem conexão com a internet. Isso significa que algumas das características como a montagem de armazenamento externo, notificações sobre atualizações ou instalação de aplicativos de 3ºs terceiros não funcionam. Acessar arquivos remotamente e envio de e-mails de notificação também não podem funcionar. Sugerimos permitir conexão com a internet para esse servidor, se você deseja ter todas as funcionalidades.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Último cron foi executado em %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Última cron foi executado em %s. Isso é, mais do que uma hora atrás, algo parece errado.",
+"Cron was not executed yet!" => "Cron não foi executado ainda!",
 "Execute one task with each page loaded" => "Execute uma tarefa com cada página carregada",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php está registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Use o sistema de serviço cron para chamar o arquivo cron.php a cada 15 minutos.",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 49f3aeeb65d..9cbdeee2c23 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "Сохранено",
 "Email sent" => "Письмо отправлено",
 "Encryption" => "Шифрование",
 "Unable to load list from App Store" => "Не удалось загрузить список из App Store",
@@ -37,6 +38,11 @@ $TRANSLATIONS = array(
 "Update" => "Обновить",
 "Updated" => "Обновлено",
 "Select a profile picture" => "Выберите картинку профиля",
+"Very weak password" => "Очень слабый пароль",
+"Weak password" => "Слабый пароль",
+"So-so password" => "Так себе пароль",
+"Good password" => "Хороший пароль",
+"Strong password" => "Устойчивый к взлому пароль",
 "Decrypting files... Please wait, this can take some time." => "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время.",
 "deleted" => "удален",
 "undo" => "отмена",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index e02c6701a98..68b464a5cc2 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -93,6 +93,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "İnternet bağlantısı çalışmıyor",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Bu sunucunun çalışan bir internet bağlantısı yok. Bu, harici depolama alanı bağlama, güncelleştirme bildirimleri veya 3. parti uygulama kurma gibi bazı özellikler çalışmayacak demektir. Uzak dosyalara erişim ve e-posta ile bildirim gönderme de çalışmayacaktır. Eğer bu özelliklerin tamamını kullanmak istiyorsanız, sunucu için internet bağlantısını etkinleştirmenizi öneriyoruz.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Son cron %s zamanında çalıştırıldı.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Son cron %s zamanında çalıştırıldı. Bu bir saatten daha uzun bir süre, bir şeyler yanlış gibi görünüyor.",
+"Cron was not executed yet!" => "Cron henüz çalıştırılmadı!",
 "Execute one task with each page loaded" => "Yüklenen her sayfa ile bir görev çalıştır",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
diff --git a/settings/routes.php b/settings/routes.php
index 6954bd3823d..a8bb0d981e8 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-/** @var $this OC_Router */
+/** @var $this OCP\Route\IRouter */
 
 // Settings pages
 $this->create('settings_help', '/settings/help')
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 6e816c1fff6..9092d2833fd 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -157,7 +157,24 @@ if (!$_['internetconnectionworking']) {
 ;?>
 
 <fieldset class="personalblock" id="backgroundjobs">
-	<h2><?php p($l->t('Cron'));?></h2>
+	<h2 class="inlineblock"><?php p($l->t('Cron'));?></h2>
+	<?php if ($_['cron_log']): ?>
+	<p class="cronlog inlineblock">
+		<?php if ($_['lastcron'] !== false):
+			$human_time = OC_Util::formatDate($_['lastcron']) . " UTC";
+			if (time() - $_['lastcron'] <= 3600): ?>
+				<span class="cronstatus success"></span>
+				<?php p($l->t("Last cron was executed at %s.", array($human_time)));
+			else: ?>
+				<span class="cronstatus error"></span>
+				<?php p($l->t("Last cron was executed at %s. This is more than an hour ago, something seems wrong.", array($human_time)));
+			endif;
+		else: ?>
+			<span class="cronstatus error"></span>
+			<?php p($l->t("Cron was not executed yet!"));
+		endif; ?>
+	</p>
+	<?php endif; ?>
 	<p>
 				<input type="radio" name="mode" value="ajax"
 					   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {