backporting some stuff from trunk to 0.8

diff --git a/bundled-libs/Onyx/RSS.php b/bundled-libs/Onyx/RSS.php
index 7f4aeeea3c430ef87518b85fee08da076aa13e37..9601c4108a47dbd47cacb386326ff077705df0f2 100644 (file)
--- a/bundled-libs/Onyx/RSS.php
+++ b/bundled-libs/Onyx/RSS.php
@@ -81,7 +81,7 @@ class ONYX_RSS
       }
       xml_set_object($this->parser, $this);
       xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, false);
-      xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, LANG_CHARSET);
+      @xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, LANG_CHARSET);
       xml_set_element_handler($this->parser, 'tag_open', 'tag_close');
       xml_set_character_data_handler($this->parser, 'cdata');
    }

diff --git a/docs/NEWS b/docs/NEWS
index 8818557e6f09d822909b70c0a5caf5b87004321d..e384a348cfd39a9b51a0a0f459185aff787809fb 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -1,5 +1,8 @@
 svn di# $Id$
 
+Version 0.8.3 ()
+------------------------------------------------------------------------
+
 Version 0.8.2 (June 29th, 2005)
 ------------------------------------------------------------------------
 

diff --git a/plugins/serendipity_event_spartacus/lang_fr.inc.php b/plugins/serendipity_event_spartacus/lang_fr.inc.php
new file mode 100644 (file)
index 0000000..56c4a20
--- /dev/null
+++ b/plugins/serendipity_event_spartacus/lang_fr.inc.php
@@ -0,0 +1,23 @@
+<?php # $Id: lang_ja.inc.php,v 1.4 2005/05/17 11:37:42 garvinhicking Exp $
+
+##########################################################################
+# serendipity - another blogger...                                       #
+##########################################################################
+#                                                                        #
+# (c) 2003 Jannis Hermanns <J@hacked.it>                                 #
+# http://www.jannis.to/programming/serendipity.html                      #
+#                                                                        #
+# Translated by                                                          #
+# Sebastian Mordziol <argh@php-tools.net>                                #
+# http://sebastian.mordziol.de                                           #
+#                                                                        #
+##########################################################################
+
+@define('PLUGIN_EVENT_SPARTACUS_NAME', 'Spartacus');
+@define('PLUGIN_EVENT_SPARTACUS_DESC', '[S]erendipity [P]lugin [A]ccess [R]epository [T]ool [A]nd [C]ustomization/[U]nification [S]ystem - Vous permet de télécharger des plugins directement de notre dépôt officiel.');
+@define('PLUGIN_EVENT_SPARTACUS_FETCH', 'Cliquez ici pour télécharger un nouveau %s du dépôt officiel de Serendipity');
+@define('PLUGIN_EVENT_SPARTACUS_FETCHERROR', 'Impossible d\'accéder à l\'adresse %s. Peut-être que le serveur de Serendipity ou de SourceForge.net n\'est momentanément pas accessible. Merci de réessayer plus tard.');
+@define('PLUGIN_EVENT_SPARTACUS_FETCHING', 'Essaie d\'accéder à l\'adresse %s...');
+
+/* vim: set sts=4 ts=4 expandtab : */
+?>
\ No newline at end of file

diff --git a/plugins/serendipity_event_spartacus/lang_tn.inc.php b/plugins/serendipity_event_spartacus/lang_tn.inc.php
new file mode 100644 (file)
index 0000000..3d4e8f4
--- /dev/null
+++ b/plugins/serendipity_event_spartacus/lang_tn.inc.php
@@ -0,0 +1,23 @@
+<?php # $Id: $\r
+##########################################################################\r
+# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity    #\r
+# Developer Team) All rights reserved.  See LICENSE file for licensing   #\r
+# details                                                                                               #\r
+#                                                                        #\r
+# (c) 2003 Jannis Hermanns <J@hacked.it>                                 #\r
+# http://www.jannis.to/programming/serendipity.html                      #\r
+#                                                                        #\r
+# Translated by                                                          #\r
+# (c) 2004-2005 CapriSkye <admin@capriskye.com>                          #\r
+#               http://open.38.com                                       #\r
+##########################################################################\r
+\r
+        @define('PLUGIN_EVENT_SPARTACUS_NAME', 'Spartacus (外掛存庫)');\r
+        @define('PLUGIN_EVENT_SPARTACUS_DESC', '[S]erendipity [P]lugin [A]ccess [R]epository [T]ool [A]nd [C]ustomization/[U]nification [S]ystem - 允許你從 s9y 的線上存庫下載外掛');\r
+        @define('PLUGIN_EVENT_SPARTACUS_FETCH', '點這裡從 s9y 的外掛存庫安裝新 %s');\r
+        @define('PLUGIN_EVENT_SPARTACUS_FETCHERROR', '網址 %s 無法開啟。也許 s9y 或 SourceForge.net 的主機有問題 - 請稍後在試。');\r
+        @define('PLUGIN_EVENT_SPARTACUS_FETCHING', '打開網址 %s...');\r
+        @define('PLUGIN_EVENT_SPARTACUS_FETCHED_BYTES_URL', '從上面的網址接收 %s 個位元組的資料。儲存成檔案 %s...');\r
+        @define('PLUGIN_EVENT_SPARTACUS_FETCHED_BYTES_CACHE', '從主機內接收 %s 個位元組的資料。儲存成檔案 %s...');\r
+        @define('PLUGIN_EVENT_SPARTACUS_FETCHED_DONE', '存取資料完成。');\r
+?>
\ No newline at end of file

diff --git a/plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php b/plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php
index c5dfecdda24a3d9a10fe95c19de4410cf56cbbf0..faf6c717addf4702a3e74174b1c349e4bc2147c9 100644 (file)
--- a/plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php
+++ b/plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php
@@ -115,7 +115,7 @@ class s9y_remoterss_XMLTree {
         // XML functions
         $p = xml_parser_create();
         // by: anony@mous.com - meets XML 1.0 specification
-        xml_parser_set_option($p, XML_OPTION_CASE_FOLDING, 0);
+        @xml_parser_set_option($p, XML_OPTION_CASE_FOLDING, 0);
         xml_parser_set_option($p, XML_OPTION_TARGET_ENCODING, LANG_CHARSET);
         xml_parse_into_struct($p, $data, $vals, $index);
         xml_parser_free($p);

diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index efb261567c0c3ced7f295bb07e149a5baf542f49..f7f525801ea78037e32dd22b2cfe69d1afb2cdfe 100644 (file)
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -21,7 +21,7 @@ if (IS_installed === true && !defined('IN_serendipity')) {
 include_once(S9Y_INCLUDE_PATH . 'include/compat.inc.php');
 
 // The version string
-$serendipity['version']         = '0.8.2';
+$serendipity['version']         = '0.8.3-dev';
 
 // Name of folder for the default theme
 $serendipity['defaultTemplate'] = 'default';

diff --git a/templates/kubrick/index.tpl b/templates/kubrick/index.tpl
index 97045c58daca3c37f64a59eb3aa8a78cf5d22a22..c8f5427b807974d7d7de7d5eb1b7731b35394b45 100644 (file)
--- a/templates/kubrick/index.tpl
+++ b/templates/kubrick/index.tpl
@@ -41,8 +41,8 @@
 
 {if $rightSidebarElements > 0}
     <div id="sidebar" valign="top">
-      {serendipity_printSidebar side="right"}
-      {serendipity_printSidebar side="left"}
+    {serendipity_printSidebar side="right"}
+    {serendipity_printSidebar side="left"}
     </div>
 {/if}