diff --git a/docs/NEWS b/docs/NEWS index bcb4efb4..6266923c 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -4,6 +4,28 @@ Version 2.0-beta2 () ------------------------------------------------------------------------ + * Upgrader in Dashboard can be disabled, returns error message when + URL not accessible + + * Added a category filtering ability for the entry editor + + * Better check when removing old/dead files to prevent error + messages + + * WYSIWYG editor respects image floats + + * Support html5 multiple file upload + + * Modernizr, magnificPopup updates + + * Improvements to equal heights js, button labels + + * No longer truncate long entry titles + + * Improve non-WYSIWYG editor tag insertion, url insertion + + * Improve less DOM firing on certain javascript tasks + Version 2.0-beta1 (April 14th, 2014) ------------------------------------------------------------------------ diff --git a/include/admin/overview.inc.php b/include/admin/overview.inc.php index 6f221354..02e8b630 100644 --- a/include/admin/overview.inc.php +++ b/include/admin/overview.inc.php @@ -44,12 +44,11 @@ $output = array(); serendipity_plugin_api::hook_event('backend_frontpage_display', $output); $data['backend_frontpage_display'] = $output['more']; -$data['curVersion'] = serendipity_getCurrentVersion(); $data['usedVersion'] = $serendipity['version']; $data['updateCheck'] = $serendipity['updateCheck']; +$data['curVersion'] = serendipity_getCurrentVersion(); $data['update'] = version_compare($data['usedVersion'], $data['curVersion'], '<'); - $comments = serendipity_db_query("SELECT c.*, e.title FROM {$serendipity['dbPrefix']}comments c LEFT JOIN {$serendipity['dbPrefix']}entries e ON (e.id = c.entry_id) ORDER BY c.id DESC LIMIT 5"); diff --git a/include/functions_installer.inc.php b/include/functions_installer.inc.php index e993dd4e..24dac8b5 100644 --- a/include/functions_installer.inc.php +++ b/include/functions_installer.inc.php @@ -1204,15 +1204,24 @@ function serendipity_verifyFTPChecksums() { * */ function serendipity_getCurrentVersion() { global $serendipity; + if ($serendipity['updateCheck'] != "stable" && $serendipity['updateCheck'] != "beta") { return -1; } + + // Perform update check once a day. We use a suffix of the configured channel, so when + // the user switches channels, it has its own timer. + if ($serendipity['last_update_check_' . $serendipity['updateCheck']] >= (time()-86400)) { + // Last update was performed less than a day ago. Return last result. + return $serendipity['last_update_version_' . $serendipity['updateCheck']]; + } + + serendipity_set_config_var('last_update_check_' . $serendipity['updateCheck'], time()); $updateURL = 'https://raw.github.com/s9y/Serendipity/master/docs/RELEASE'; - $context = stream_context_create( array('http'=>array('timeout' => 5.0)) ); + $context = stream_context_create(array('http' => array('timeout' => 5.0))); + $file = @file_get_contents($updateURL, false, $context); - $file = @file_get_contents($updateURL, false, $context); - - if ( ! $file) { + if (!$file) { if (function_exists('curl_init')) { $ch = curl_init($updateURL); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); @@ -1225,14 +1234,17 @@ function serendipity_getCurrentVersion() { if ($file) { if ($serendipity['updateCheck'] == "stable") { if (preg_match('/^stable:(.+)\b/', $file, $match)) { + serendipity_set_config_var('last_update_version_' . $serendipity['updateCheck'], $match[1]); return $match[1]; } } else { if (preg_match('/^beta:(.+)\b/', $file, $match)) { + serendipity_set_config_var('last_update_version_' . $serendipity['updateCheck'], $match[1]); return $match[1]; } } } + return -1; } diff --git a/include/tpl/config_local.inc.php b/include/tpl/config_local.inc.php index ac3cb1ef..101ffb75 100644 --- a/include/tpl/config_local.inc.php +++ b/include/tpl/config_local.inc.php @@ -400,7 +400,7 @@ 'permission' => 'blogConfiguration'), array('var' => 'updateCheck', 'title' => UPDATE_NOTIFICATION, - 'description' => "Show the update notification in the Dashboard, and for which channel?", # i18n + 'description' => UPDATE_NOTIFICATION_DESC, 'type' => 'list', 'default' => array('stable' => 'stable', 'beta' => 'beta', 'false' => NO ), # i18n 'permission' => 'blogConfiguration'), diff --git a/lang/UTF-8/plugin_lang.php b/lang/UTF-8/plugin_lang.php index e72e037d..6d54992d 100644 --- a/lang/UTF-8/plugin_lang.php +++ b/lang/UTF-8/plugin_lang.php @@ -81,3 +81,6 @@ foreach($const['missing'] AS $file => $constants) { echo "---------------------------\n"; } @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_bg.inc.php b/lang/UTF-8/serendipity_lang_bg.inc.php index 4a4fe76a..7c1ca8a4 100644 --- a/lang/UTF-8/serendipity_lang_bg.inc.php +++ b/lang/UTF-8/serendipity_lang_bg.inc.php @@ -1023,3 +1023,6 @@ $i18n_filename_to = array('-', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_cn.inc.php b/lang/UTF-8/serendipity_lang_cn.inc.php index c791e02c..4951b71c 100644 --- a/lang/UTF-8/serendipity_lang_cn.inc.php +++ b/lang/UTF-8/serendipity_lang_cn.inc.php @@ -1033,3 +1033,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_cs.inc.php b/lang/UTF-8/serendipity_lang_cs.inc.php index b4be11eb..b39aa092 100644 --- a/lang/UTF-8/serendipity_lang_cs.inc.php +++ b/lang/UTF-8/serendipity_lang_cs.inc.php @@ -1061,3 +1061,6 @@ $i18n_filename_to = array ( @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_cz.inc.php b/lang/UTF-8/serendipity_lang_cz.inc.php index b83cd38c..99cf61a6 100644 --- a/lang/UTF-8/serendipity_lang_cz.inc.php +++ b/lang/UTF-8/serendipity_lang_cz.inc.php @@ -1061,3 +1061,6 @@ $i18n_filename_to = array ( @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_da.inc.php b/lang/UTF-8/serendipity_lang_da.inc.php index 93f7400f..60985a30 100644 --- a/lang/UTF-8/serendipity_lang_da.inc.php +++ b/lang/UTF-8/serendipity_lang_da.inc.php @@ -1030,3 +1030,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_de.inc.php b/lang/UTF-8/serendipity_lang_de.inc.php index 6a811cc5..74882e0f 100644 --- a/lang/UTF-8/serendipity_lang_de.inc.php +++ b/lang/UTF-8/serendipity_lang_de.inc.php @@ -1035,3 +1035,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Ausführbar?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Filter entfernen'); +@define('UPDATE_FAILMSG', 'Update-Check für neue Serendipity-Version fehlgeschlagen. Das kann passieren wenn die URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE nicht erreichbar ist, der Server ausgehende Verbindungen verhindert oder es andere Verbindungsprobleme gibt.'); +@define('UPDATE_FAILACTION', 'Automatischen Update-Check deaktivieren'); +@define('UPDATE_NOTIFICATION_DESC', 'Sollen Update-Checks im Dashboard angezeigt werden, und wenn ja für welche Versionen?'); diff --git a/lang/UTF-8/serendipity_lang_en.inc.php b/lang/UTF-8/serendipity_lang_en.inc.php index 158ef892..7ab469f3 100644 --- a/lang/UTF-8/serendipity_lang_en.inc.php +++ b/lang/UTF-8/serendipity_lang_en.inc.php @@ -1033,3 +1033,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_es.inc.php b/lang/UTF-8/serendipity_lang_es.inc.php index 8c3243d4..0b04a964 100644 --- a/lang/UTF-8/serendipity_lang_es.inc.php +++ b/lang/UTF-8/serendipity_lang_es.inc.php @@ -1049,3 +1049,6 @@ Melvin TODO [20060128]: What spanish word do we use for "referrers" ?? @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_fa.inc.php b/lang/UTF-8/serendipity_lang_fa.inc.php index 81889d2f..7375d5e4 100644 --- a/lang/UTF-8/serendipity_lang_fa.inc.php +++ b/lang/UTF-8/serendipity_lang_fa.inc.php @@ -1033,3 +1033,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_fi.inc.php b/lang/UTF-8/serendipity_lang_fi.inc.php index d07ee44f..03031b74 100644 --- a/lang/UTF-8/serendipity_lang_fi.inc.php +++ b/lang/UTF-8/serendipity_lang_fi.inc.php @@ -1031,3 +1031,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_fr.inc.php b/lang/UTF-8/serendipity_lang_fr.inc.php index 82aab51a..7aace2f4 100644 --- a/lang/UTF-8/serendipity_lang_fr.inc.php +++ b/lang/UTF-8/serendipity_lang_fr.inc.php @@ -1038,3 +1038,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_hu.inc.php b/lang/UTF-8/serendipity_lang_hu.inc.php index 14d45820..8fd61cdc 100644 --- a/lang/UTF-8/serendipity_lang_hu.inc.php +++ b/lang/UTF-8/serendipity_lang_hu.inc.php @@ -1029,3 +1029,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_is.inc.php b/lang/UTF-8/serendipity_lang_is.inc.php index c8558248..a2f56b95 100644 --- a/lang/UTF-8/serendipity_lang_is.inc.php +++ b/lang/UTF-8/serendipity_lang_is.inc.php @@ -1031,3 +1031,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_it.inc.php b/lang/UTF-8/serendipity_lang_it.inc.php index 77f51c8d..5a2f1095 100644 --- a/lang/UTF-8/serendipity_lang_it.inc.php +++ b/lang/UTF-8/serendipity_lang_it.inc.php @@ -1034,3 +1034,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_ja.inc.php b/lang/UTF-8/serendipity_lang_ja.inc.php index de77d619..6096b2a3 100644 --- a/lang/UTF-8/serendipity_lang_ja.inc.php +++ b/lang/UTF-8/serendipity_lang_ja.inc.php @@ -1035,3 +1035,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_ko.inc.php b/lang/UTF-8/serendipity_lang_ko.inc.php index 12018da9..ddc9809d 100644 --- a/lang/UTF-8/serendipity_lang_ko.inc.php +++ b/lang/UTF-8/serendipity_lang_ko.inc.php @@ -1033,3 +1033,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_nl.inc.php b/lang/UTF-8/serendipity_lang_nl.inc.php index 9e529009..0f63b42c 100644 --- a/lang/UTF-8/serendipity_lang_nl.inc.php +++ b/lang/UTF-8/serendipity_lang_nl.inc.php @@ -1033,3 +1033,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_no.inc.php b/lang/UTF-8/serendipity_lang_no.inc.php index 501a9d31..d5c43df1 100644 --- a/lang/UTF-8/serendipity_lang_no.inc.php +++ b/lang/UTF-8/serendipity_lang_no.inc.php @@ -1033,3 +1033,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_pl.inc.php b/lang/UTF-8/serendipity_lang_pl.inc.php index d811b05d..3edf9e85 100644 --- a/lang/UTF-8/serendipity_lang_pl.inc.php +++ b/lang/UTF-8/serendipity_lang_pl.inc.php @@ -1029,3 +1029,6 @@ $i18n_filename_to = array('_', 'a', 'A', 'a', 'A', 'b', 'B', 'c', 'C', 'c', 'C @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_pt.inc.php b/lang/UTF-8/serendipity_lang_pt.inc.php index 23658039..e0860b05 100644 --- a/lang/UTF-8/serendipity_lang_pt.inc.php +++ b/lang/UTF-8/serendipity_lang_pt.inc.php @@ -1035,3 +1035,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_pt_PT.inc.php b/lang/UTF-8/serendipity_lang_pt_PT.inc.php index d63c0088..0378db7c 100644 --- a/lang/UTF-8/serendipity_lang_pt_PT.inc.php +++ b/lang/UTF-8/serendipity_lang_pt_PT.inc.php @@ -1042,3 +1042,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_ro.inc.php b/lang/UTF-8/serendipity_lang_ro.inc.php index 987a1a6c..ed577133 100644 --- a/lang/UTF-8/serendipity_lang_ro.inc.php +++ b/lang/UTF-8/serendipity_lang_ro.inc.php @@ -1032,3 +1032,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_ru.inc.php b/lang/UTF-8/serendipity_lang_ru.inc.php index c1ddbafa..5573d7e4 100644 --- a/lang/UTF-8/serendipity_lang_ru.inc.php +++ b/lang/UTF-8/serendipity_lang_ru.inc.php @@ -1034,3 +1034,6 @@ $i18n_filename_to = array('_', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_sa.inc.php b/lang/UTF-8/serendipity_lang_sa.inc.php index de7ffe35..6e111237 100644 --- a/lang/UTF-8/serendipity_lang_sa.inc.php +++ b/lang/UTF-8/serendipity_lang_sa.inc.php @@ -950,3 +950,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_se.inc.php b/lang/UTF-8/serendipity_lang_se.inc.php index d525349b..62e0bc93 100644 --- a/lang/UTF-8/serendipity_lang_se.inc.php +++ b/lang/UTF-8/serendipity_lang_se.inc.php @@ -1031,3 +1031,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_sk.inc.php b/lang/UTF-8/serendipity_lang_sk.inc.php index 5f748901..9273f52e 100644 --- a/lang/UTF-8/serendipity_lang_sk.inc.php +++ b/lang/UTF-8/serendipity_lang_sk.inc.php @@ -1021,3 +1021,6 @@ $i18n_filename_to = array ( @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_ta.inc.php b/lang/UTF-8/serendipity_lang_ta.inc.php index a948a151..ed38385d 100644 --- a/lang/UTF-8/serendipity_lang_ta.inc.php +++ b/lang/UTF-8/serendipity_lang_ta.inc.php @@ -1030,3 +1030,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_tn.inc.php b/lang/UTF-8/serendipity_lang_tn.inc.php index 9378d57a..38f249f9 100644 --- a/lang/UTF-8/serendipity_lang_tn.inc.php +++ b/lang/UTF-8/serendipity_lang_tn.inc.php @@ -1035,3 +1035,6 @@ $i18n_unknown = 'tw'; @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_tr.inc.php b/lang/UTF-8/serendipity_lang_tr.inc.php index 6d7f187d..832cb929 100644 --- a/lang/UTF-8/serendipity_lang_tr.inc.php +++ b/lang/UTF-8/serendipity_lang_tr.inc.php @@ -1035,3 +1035,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_tw.inc.php b/lang/UTF-8/serendipity_lang_tw.inc.php index 9590b5f9..0098f15b 100644 --- a/lang/UTF-8/serendipity_lang_tw.inc.php +++ b/lang/UTF-8/serendipity_lang_tw.inc.php @@ -1036,3 +1036,6 @@ $i18n_unknown = 'tw'; @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/UTF-8/serendipity_lang_zh.inc.php b/lang/UTF-8/serendipity_lang_zh.inc.php index 13f46bb1..e6285399 100644 --- a/lang/UTF-8/serendipity_lang_zh.inc.php +++ b/lang/UTF-8/serendipity_lang_zh.inc.php @@ -1031,3 +1031,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/addlang.txt b/lang/addlang.txt index c52c0492..f4593f78 100644 --- a/lang/addlang.txt +++ b/lang/addlang.txt @@ -1 +1,3 @@ -@define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/plugin_lang.php b/lang/plugin_lang.php index e72e037d..6d54992d 100644 --- a/lang/plugin_lang.php +++ b/lang/plugin_lang.php @@ -81,3 +81,6 @@ foreach($const['missing'] AS $file => $constants) { echo "---------------------------\n"; } @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_bg.inc.php b/lang/serendipity_lang_bg.inc.php index 694d2585..6ba3eb62 100644 --- a/lang/serendipity_lang_bg.inc.php +++ b/lang/serendipity_lang_bg.inc.php @@ -1023,3 +1023,6 @@ $i18n_filename_to = array('-', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_cn.inc.php b/lang/serendipity_lang_cn.inc.php index c791e02c..4951b71c 100644 --- a/lang/serendipity_lang_cn.inc.php +++ b/lang/serendipity_lang_cn.inc.php @@ -1033,3 +1033,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_cs.inc.php b/lang/serendipity_lang_cs.inc.php index 3d07948b..b8f8d478 100644 --- a/lang/serendipity_lang_cs.inc.php +++ b/lang/serendipity_lang_cs.inc.php @@ -1061,3 +1061,6 @@ $i18n_filename_to = array ( @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_cz.inc.php b/lang/serendipity_lang_cz.inc.php index d7ddee46..5dd6cf72 100644 --- a/lang/serendipity_lang_cz.inc.php +++ b/lang/serendipity_lang_cz.inc.php @@ -1061,3 +1061,6 @@ $i18n_filename_to = array ( @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_da.inc.php b/lang/serendipity_lang_da.inc.php index 7aff945f..e20f9852 100644 --- a/lang/serendipity_lang_da.inc.php +++ b/lang/serendipity_lang_da.inc.php @@ -1030,3 +1030,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_de.inc.php b/lang/serendipity_lang_de.inc.php index d5b36851..a8e3cc3b 100644 --- a/lang/serendipity_lang_de.inc.php +++ b/lang/serendipity_lang_de.inc.php @@ -1035,3 +1035,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Ausführbar?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Filter entfernen'); +@define('UPDATE_FAILMSG', 'Update-Check für neue Serendipity-Version fehlgeschlagen. Das kann passieren wenn die URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE nicht erreichbar ist, der Server ausgehende Verbindungen verhindert oder es andere Verbindungsprobleme gibt.'); +@define('UPDATE_FAILACTION', 'Automatischen Update-Check deaktivieren'); +@define('UPDATE_NOTIFICATION_DESC', 'Sollen Update-Checks im Dashboard angezeigt werden, und wenn ja für welche Versionen?'); diff --git a/lang/serendipity_lang_en.inc.php b/lang/serendipity_lang_en.inc.php index 3660b1c4..cf6ee4e4 100644 --- a/lang/serendipity_lang_en.inc.php +++ b/lang/serendipity_lang_en.inc.php @@ -1033,3 +1033,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_es.inc.php b/lang/serendipity_lang_es.inc.php index 43c3d82d..42c3e238 100644 --- a/lang/serendipity_lang_es.inc.php +++ b/lang/serendipity_lang_es.inc.php @@ -1049,3 +1049,6 @@ Melvin TODO [20060128]: What spanish word do we use for "referrers" ?? @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_fa.inc.php b/lang/serendipity_lang_fa.inc.php index 81889d2f..7375d5e4 100644 --- a/lang/serendipity_lang_fa.inc.php +++ b/lang/serendipity_lang_fa.inc.php @@ -1033,3 +1033,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_fi.inc.php b/lang/serendipity_lang_fi.inc.php index d07ee44f..03031b74 100644 --- a/lang/serendipity_lang_fi.inc.php +++ b/lang/serendipity_lang_fi.inc.php @@ -1031,3 +1031,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_fr.inc.php b/lang/serendipity_lang_fr.inc.php index 59d0a86e..1fedaf3c 100644 --- a/lang/serendipity_lang_fr.inc.php +++ b/lang/serendipity_lang_fr.inc.php @@ -1038,3 +1038,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_hu.inc.php b/lang/serendipity_lang_hu.inc.php index ac1a17bd..6f3620f3 100644 --- a/lang/serendipity_lang_hu.inc.php +++ b/lang/serendipity_lang_hu.inc.php @@ -1029,3 +1029,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_is.inc.php b/lang/serendipity_lang_is.inc.php index 24d6c023..91c9cfc9 100644 --- a/lang/serendipity_lang_is.inc.php +++ b/lang/serendipity_lang_is.inc.php @@ -1031,3 +1031,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_it.inc.php b/lang/serendipity_lang_it.inc.php index 17120540..4dba7bc2 100644 --- a/lang/serendipity_lang_it.inc.php +++ b/lang/serendipity_lang_it.inc.php @@ -1034,3 +1034,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_ja.inc.php b/lang/serendipity_lang_ja.inc.php index de77d619..6096b2a3 100644 --- a/lang/serendipity_lang_ja.inc.php +++ b/lang/serendipity_lang_ja.inc.php @@ -1035,3 +1035,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_ko.inc.php b/lang/serendipity_lang_ko.inc.php index 12018da9..ddc9809d 100644 --- a/lang/serendipity_lang_ko.inc.php +++ b/lang/serendipity_lang_ko.inc.php @@ -1033,3 +1033,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_nl.inc.php b/lang/serendipity_lang_nl.inc.php index 63fae184..0a4fee9b 100644 --- a/lang/serendipity_lang_nl.inc.php +++ b/lang/serendipity_lang_nl.inc.php @@ -1033,3 +1033,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_no.inc.php b/lang/serendipity_lang_no.inc.php index f7f46012..70e68e32 100644 --- a/lang/serendipity_lang_no.inc.php +++ b/lang/serendipity_lang_no.inc.php @@ -1033,3 +1033,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_pl.inc.php b/lang/serendipity_lang_pl.inc.php index 9855dae2..5be48181 100644 --- a/lang/serendipity_lang_pl.inc.php +++ b/lang/serendipity_lang_pl.inc.php @@ -1029,3 +1029,6 @@ $i18n_filename_to = array('_', 'a', 'A', 'a', 'A', 'b', 'B', 'c', 'C', 'c', 'C @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_pt.inc.php b/lang/serendipity_lang_pt.inc.php index c92e7e85..6721f014 100644 --- a/lang/serendipity_lang_pt.inc.php +++ b/lang/serendipity_lang_pt.inc.php @@ -1035,3 +1035,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_pt_PT.inc.php b/lang/serendipity_lang_pt_PT.inc.php index 4ac9a64d..cfe663b0 100644 --- a/lang/serendipity_lang_pt_PT.inc.php +++ b/lang/serendipity_lang_pt_PT.inc.php @@ -1042,3 +1042,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_ro.inc.php b/lang/serendipity_lang_ro.inc.php index 987a1a6c..ed577133 100644 --- a/lang/serendipity_lang_ro.inc.php +++ b/lang/serendipity_lang_ro.inc.php @@ -1032,3 +1032,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_ru.inc.php b/lang/serendipity_lang_ru.inc.php index c1ddbafa..5573d7e4 100644 --- a/lang/serendipity_lang_ru.inc.php +++ b/lang/serendipity_lang_ru.inc.php @@ -1034,3 +1034,6 @@ $i18n_filename_to = array('_', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_sa.inc.php b/lang/serendipity_lang_sa.inc.php index 883c1494..78e146df 100644 --- a/lang/serendipity_lang_sa.inc.php +++ b/lang/serendipity_lang_sa.inc.php @@ -950,3 +950,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_se.inc.php b/lang/serendipity_lang_se.inc.php index 4171770b..bc6798b6 100644 --- a/lang/serendipity_lang_se.inc.php +++ b/lang/serendipity_lang_se.inc.php @@ -1031,3 +1031,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_sk.inc.php b/lang/serendipity_lang_sk.inc.php index 5f748901..9273f52e 100644 --- a/lang/serendipity_lang_sk.inc.php +++ b/lang/serendipity_lang_sk.inc.php @@ -1021,3 +1021,6 @@ $i18n_filename_to = array ( @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_ta.inc.php b/lang/serendipity_lang_ta.inc.php index a948a151..ed38385d 100644 --- a/lang/serendipity_lang_ta.inc.php +++ b/lang/serendipity_lang_ta.inc.php @@ -1030,3 +1030,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_tn.inc.php b/lang/serendipity_lang_tn.inc.php index 9378d57a..38f249f9 100644 --- a/lang/serendipity_lang_tn.inc.php +++ b/lang/serendipity_lang_tn.inc.php @@ -1035,3 +1035,6 @@ $i18n_unknown = 'tw'; @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_tr.inc.php b/lang/serendipity_lang_tr.inc.php index 6d7f187d..832cb929 100644 --- a/lang/serendipity_lang_tr.inc.php +++ b/lang/serendipity_lang_tr.inc.php @@ -1035,3 +1035,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_tw.inc.php b/lang/serendipity_lang_tw.inc.php index 72b4c8c1..d0c348d7 100644 --- a/lang/serendipity_lang_tw.inc.php +++ b/lang/serendipity_lang_tw.inc.php @@ -1036,3 +1036,6 @@ $i18n_unknown = 'tw'; @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/lang/serendipity_lang_zh.inc.php b/lang/serendipity_lang_zh.inc.php index 06cd078e..1e5c7fdf 100644 --- a/lang/serendipity_lang_zh.inc.php +++ b/lang/serendipity_lang_zh.inc.php @@ -1031,3 +1031,6 @@ @define('INSTALLER_CLI_TOOLSTATUS', 'Executable?'); @define('VIDEO', 'Video'); @define('RESET_FILTERS', 'Reset filters'); +@define('UPDATE_FAILMSG', 'Check for new Serendipity version failed. This can happen because either the URL https://raw.github.com/s9y/Serendipity/master/docs/RELEASE is down, your server blocks outgoing connections or there are other connection issues.'); +@define('UPDATE_FAILACTION', 'Disable automatic update check'); +@define('UPDATE_NOTIFICATION_DESC', 'Show the update notification in the Dashboard, and for which channel?'); diff --git a/templates/2k11/admin/overview.inc.tpl b/templates/2k11/admin/overview.inc.tpl index 6620b96d..abada88f 100644 --- a/templates/2k11/admin/overview.inc.tpl +++ b/templates/2k11/admin/overview.inc.tpl @@ -16,11 +16,11 @@

{$CONST.UPDATE_NOTIFICATION}

- Check for new Serendipity version failed {* i18n *} + {$CONST.UPDATE_FAILMSG}
{$token} - {* i18n *} +
{else if $update}