Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

bundled-libs/serendipity_generateFTPChecksums.php

@@ -3,7 +3,7 @@
 # All rights reserved.  See LICENSE file for licensing details
 
 // Call this file from the base directory with 
-// echo "true" | 'php -B "define('IN_serendipity', true);" -F bundled-libs/serendipity_generateFTPChecksums.php'
+// echo "true" | php -B "define('IN_serendipity', true);" -F bundled-libs/serendipity_generateFTPChecksums.php
 
 if (IN_serendipity !== true) {
     die ("Don't hack!\n");

docs/NEWS

@@ -4,6 +4,30 @@
 Version 2.0-beta2 ()
 ------------------------------------------------------------------------
 
+    * RSS importer accepts pubDate in addition to pubdate element.
+    
+    * 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)
 ------------------------------------------------------------------------
 

include/admin/importers/generic.inc.php

@@ -94,6 +94,9 @@ class Serendipity_Import_Generic extends Serendipity_Import {
         }
 
         $entry['title'] = $this->decode($item['title']);
+        if (!isset($item['pubdate']) && isset($item['pubDate'])) {
+            $item['pubdate'] = $item['pubDate'];
+        }
         $entry['timestamp'] = $this->decode(strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date']));
         if ($entry['timestamp'] == -1) {
             // strtotime does not seem to parse ISO 8601 dates

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");

include/compat.inc.php

@@ -105,7 +105,7 @@ if (!function_exists('errorToExceptionHandler')) {
                 }
                 print_r($debugbacktrace);
             }
-            //print_r($args); // debugging
+            //print_r($args); // debugging [Use with care! Not to public, since holding password and credentials!!!]
             // debugbacktrace is nice, but additional it is good to have the verbosity of SPL EXCEPTIONS, except for db connect errors
             // compare version to not get strange T_NEW parse errors (http://board.s9y.org/viewtopic.php?f=10&t=19436)
             if (!$serendipity['dbConn'] || version_compare(PHP_VERSION, '5.3', '<')) {

include/functions_images.inc.php

@@ -1810,7 +1810,7 @@ function serendipity_traversePath($basedir, $dir='', $onlyDirs = true, $pattern
     if ($aExcludeDirs === null) {
         // add _vti_cnf to exclude possible added servers frontpage extensions
         // add ckeditor/kcfinders .thumb dir to exclude, since no hook
-        $aExcludeDirs = array("CVS" => true, ".svn" => true, ".thumbs" => true, "_vti_cnf" => true);
+        $aExcludeDirs = array("CVS" => true, ".svn" => true, ".thumbs" => true, "_vti_cnf" => true, ".git" => true);
     }
 
     $odir = serendipity_dirSlash('end', $basedir) . serendipity_dirSlash('end', $dir);

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;
 }
 

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'),

lang/UTF-8/plugin_lang.php

@@ -80,3 +80,7 @@ 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?');

lang/UTF-8/serendipity_lang_bg.inc.php

@@ -1022,3 +1022,7 @@ $i18n_filename_to   = array('-', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_cn.inc.php

@@ -1032,3 +1032,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_cs.inc.php

@@ -1060,3 +1060,7 @@ $i18n_filename_to = array (
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_cz.inc.php

@@ -1060,3 +1060,7 @@ $i18n_filename_to = array (
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_da.inc.php

@@ -1029,3 +1029,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_de.inc.php

@@ -1034,3 +1034,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI-Tool');
 @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?');

lang/UTF-8/serendipity_lang_en.inc.php

@@ -627,7 +627,7 @@
 @define('RESET_DATE', 'Reset date');
 @define('RESET_DATE_DESC', 'Click here to reset the date to the current time');
 @define('PROBLEM_PERMISSIONS_HOWTO', 'Permissions can be set by running shell command: `<em>%s</em>` on the failed directory, or by setting this using an FTP program');
-@define('WARNING_TEMPLATE_DEPRECATED', 'Warning: Your current theme is using a deprecated template method, you are advised to update if possible');
+@define('WARNING_TEMPLATE_DEPRECATED', 'Warning: Your current theme is using a deprecated theme method, you are advised to update if possible');
 @define('ENTRY_PUBLISHED_FUTURE', 'This entry is not yet published.');
 @define('ENTRIES_BY', 'Entries by %s');
 @define('PREVIOUS', 'Previous');
@@ -1032,3 +1032,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_es.inc.php

@@ -1048,3 +1048,7 @@ Melvin TODO [20060128]: What spanish word do we use for "referrers" ??
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_fa.inc.php

@@ -1032,3 +1032,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_fi.inc.php

@@ -1030,3 +1030,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_fr.inc.php

@@ -1037,3 +1037,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_hu.inc.php

@@ -1028,3 +1028,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_is.inc.php

@@ -1030,3 +1030,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_it.inc.php

@@ -1033,3 +1033,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_ja.inc.php

@@ -1034,3 +1034,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_ko.inc.php

@@ -1032,3 +1032,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_nl.inc.php

@@ -1032,3 +1032,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_no.inc.php

@@ -1032,3 +1032,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_pl.inc.php

@@ -1028,3 +1028,7 @@ $i18n_filename_to   = array('_', 'a', 'A', 'a', 'A', 'b', 'B', 'c', 'C', 'c', 'C
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_pt.inc.php

@@ -1034,3 +1034,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_pt_PT.inc.php

@@ -1041,3 +1041,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_ro.inc.php

@@ -1031,3 +1031,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_ru.inc.php

@@ -1033,3 +1033,7 @@ $i18n_filename_to   = array('_', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_sa.inc.php

@@ -949,3 +949,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_se.inc.php

@@ -1030,3 +1030,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_sk.inc.php

@@ -1020,3 +1020,7 @@ $i18n_filename_to = array (
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_ta.inc.php

@@ -1029,3 +1029,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_tn.inc.php

@@ -1034,3 +1034,7 @@ $i18n_unknown = 'tw';
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_tr.inc.php

@@ -1034,3 +1034,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_tw.inc.php

@@ -1035,3 +1035,7 @@ $i18n_unknown = 'tw';
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/UTF-8/serendipity_lang_zh.inc.php

@@ -1030,3 +1030,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/addlang.txt

@@ -1,4 +1,3 @@
-@define('INSTALLER_CLI_TOOLS', 'Server-side command line tools');
-@define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
-@define('INSTALLER_CLI_TOOLSTATUS', 'Executable?');
-@define('VIDEO', 'Video');
+@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?');

lang/plugin_lang.php

@@ -80,3 +80,7 @@ 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?');

lang/serendipity_lang_bg.inc.php

@@ -1022,3 +1022,7 @@ $i18n_filename_to   = array('-', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_cn.inc.php

@@ -1032,3 +1032,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_cs.inc.php

@@ -1060,3 +1060,7 @@ $i18n_filename_to = array (
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_cz.inc.php

@@ -1060,3 +1060,7 @@ $i18n_filename_to = array (
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_da.inc.php

@@ -1029,3 +1029,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_de.inc.php

@@ -1034,3 +1034,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI-Tool');
 @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?');

lang/serendipity_lang_en.inc.php

@@ -1032,3 +1032,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_es.inc.php

@@ -1048,3 +1048,7 @@ Melvin TODO [20060128]: What spanish word do we use for "referrers" ??
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_fa.inc.php

@@ -1032,3 +1032,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_fi.inc.php

@@ -1030,3 +1030,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_fr.inc.php

@@ -1037,3 +1037,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_hu.inc.php

@@ -1028,3 +1028,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_is.inc.php

@@ -1030,3 +1030,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_it.inc.php

@@ -1033,3 +1033,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_ja.inc.php

@@ -1034,3 +1034,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_ko.inc.php

@@ -1032,3 +1032,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_nl.inc.php

@@ -1032,3 +1032,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_no.inc.php

@@ -1032,3 +1032,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_pl.inc.php

@@ -1028,3 +1028,7 @@ $i18n_filename_to   = array('_', 'a', 'A', 'a', 'A', 'b', 'B', 'c', 'C', 'c', 'C
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_pt.inc.php

@@ -1034,3 +1034,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_pt_PT.inc.php

@@ -1041,3 +1041,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_ro.inc.php

@@ -1031,3 +1031,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_ru.inc.php

@@ -1033,3 +1033,7 @@ $i18n_filename_to   = array('_', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_sa.inc.php

@@ -949,3 +949,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_se.inc.php

@@ -1030,3 +1030,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_sk.inc.php

@@ -1020,3 +1020,7 @@ $i18n_filename_to = array (
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_ta.inc.php

@@ -1029,3 +1029,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_tn.inc.php

@@ -1034,3 +1034,7 @@ $i18n_unknown = 'tw';
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_tr.inc.php

@@ -1034,3 +1034,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_tw.inc.php

@@ -1035,3 +1035,7 @@ $i18n_unknown = 'tw';
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

lang/serendipity_lang_zh.inc.php

@@ -1030,3 +1030,7 @@
 @define('INSTALLER_CLI_TOOLNAME', 'CLI tool');
 @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?');

plugins/serendipity_event_spartacus/serendipity_event_spartacus.php

@@ -385,7 +385,7 @@ class serendipity_event_spartacus extends serendipity_event
         }
         $url_ip = gethostbyname($url_hostname);
 
-        $this->outputMSG('notice', sprintf(PLUGIN_EVENT_SPARTACUS_FETCHING, '<a href="' . $url . '">' . basename($url) . '</a>'));
+        $this->outputMSG('notice', sprintf(PLUGIN_EVENT_SPARTACUS_FETCHING, '<a target="_blank" href="' . $url . '">' . basename($url) . '</a>'));
 
         if (file_exists($target) && filesize($target) > 0 && filemtime($target) >= (time()-$cacheTimeout)) {
             $data = file_get_contents($target);

templates/2k11/admin/entries.tpl

@@ -111,7 +111,7 @@
                     <div id="category_filter" class="form_field">
                         <label for="categoryfilter" class="visuallyhidden">{$CONST.FILTERS}</label>
                         <input id="categoryfilter" type="text" placeholder="{$CONST.FILTERS}: {$CONST.CATEGORIES}">
-                        <button id="reset_categoryfilter" class="icon_link" type="button" title="Reset filters"><span class="icon-cancel"></span><span class="visuallyhidden">Reset filters</span></button> {* i18n *}
+                        <button id="reset_categoryfilter" class="icon_link" type="button" title="{$CONST.RESET_FILTERS}"><span class="icon-cancel"></span><span class="visuallyhidden">{$CONST.RESET_FILTERS}</span></button>
                     </div>
 
                 {foreach from=$entry_vars.category_options item="entry_cat"}

templates/2k11/admin/overview.inc.tpl

@@ -16,11 +16,11 @@
             <section id="dashboard_update">
                 <h3>{$CONST.UPDATE_NOTIFICATION}</h3>
 
-                <span class="msg_notice"><span class="icon-info-circled"></span> Check for new Serendipity version failed</span> {* i18n *}
+                <span class="msg_notice"><span class="icon-info-circled"></span> {$CONST.UPDATE_FAILMSG}</span>
                 <form id="updateCheckDisable" method="POST">
                     <input type="hidden" name="serendipity[adminAction]" value="updateCheckDisable" />
                     {$token}
-                    <button type="submit">Disable update check</button> {* i18n *}
+                    <button type="submit">{$CONST.UPDATE_FAILACTION}</button>
                 </form>
             </section>
         {else if $update}

templates/2k11/admin/plugins.inc.tpl

@@ -77,9 +77,21 @@
         {foreach $groupstack as $plug}
             <li class="clearfix">
                 <div class="equal_heights">
-                    <h4>{$plug.name} ({$plug.class_name})</h4>
+                    <h4>{$plug.name}</h4>
 
-                    <p class="plugin_desc">{$plug.description}</p>
+                {if $plug.description}
+                    <details class="plugin_data">
+                        <summary><var class="perm_name">[{$plug.class_name}]</var></summary>
+
+                        <div class="plugin_desc clearfix">
+                        {$plug.description}
+                        </div>
+                    </details>
+                {else}
+                    <div class="plugin_data">
+                        <var class="perm_name">[{$plug.class_name}]</var>
+                    </div>
+                {/if}
 
                     <ul class="plugin_info plainList">
                     {if ! empty($plug.author)}

templates/2k11/admin/style.css

@@ -479,7 +479,8 @@ label > span,
 #mediaPropertyForm header b,
 #mediaPropertyForm footer b,
 #content .upgrade_done,
-.pluginmanager_description .perm_name {
+.pluginmanager_description .perm_name,
+.plugin_data > .perm_name {
     display: block;
 }
 
@@ -502,7 +503,8 @@ details,
 form > a,
 form > button,
 #content .upgrade_done,
-#upgrade_notice {
+#upgrade_notice,
+.plugin_data > .perm_name {
     margin-top: 1.5em;
     margin-bottom: 1.5em;
 }
@@ -517,6 +519,10 @@ form > button,
     margin-bottom: .25em;
 }
 
+.plugin_desc {
+    margin-top: .25em;
+}
+
 #categories,
 #categories ul,
 #serendipity_image_folders,