php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/include/tpl config_local.inc.php,1.11,1.12

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include/tpl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9900/include/tpl

Modified Files:
	config_local.inc.php 
Log Message:
Fix serious plugin hook_event bug. Plugins were cached because of the introduction of a new hook too early in sequence, resulting in weird behaviour with plugin configuration (see mail by rasmus)

For the multilingual plugin to be able to function properly, a new autodetection routine has been put in place. I think this even acts nicely in the core serendipity, but for the future we may want to move it to a plugin somehow (I don't see a way currently)



Index: config_local.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_local.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- config_local.inc.php	9 Feb 2005 10:19:14 -0000	1.11
+++ config_local.inc.php	16 Feb 2005 12:36:19 -0000	1.12
@@ -164,6 +164,13 @@
                                           'type'        => 'list',
                                           'default'     => $serendipity['languages'],
                                           'flags'       => array('simpleInstall')),
+
+                                    array('var'         => 'lang_content_negotiation',
+                                          'title'       => AUTOLANG,
+                                          'description' => AUTOLANG_DESC,
+                                          'type'        => 'bool',
+                                          'default'     => false,
+                                          'userlevel'   => USERLEVEL_CHIEF),
                             ));
 
     $res['display'] =
@@ -173,7 +180,8 @@
                                           'title'       => INSTALL_FETCHLIMIT,
                                           'description' => INSTALL_FETCHLIMIT_DESC,
                                           'type'        => 'int',
-                                          'default'     => 15),
+                                          'default'     => 15,
+                                          'userlevel'   => USERLEVEL_CHIEF),
 
                                     array('var'         => 'useGzip',
                                           'title'       => INSTALL_USEGZIP,
@@ -199,7 +207,8 @@
                                           'title'       => INSTALL_POPUP,
                                           'description' => INSTALL_POPUP_DESC,
                                           'type'        => 'bool',
-                                          'default'     => false),
+                                          'default'     => false,
+                                          'userlevel'   => USERLEVEL_CHIEF),
 
                                     array('var'         => 'embed',
                                           'title'       => INSTALL_EMBED,
@@ -217,7 +226,8 @@
                                           'title'       => INSTALL_BLOCKREF,
                                           'description' => INSTALL_BLOCKREF_DESC,
                                           'type'        => 'string',
-                                          'default'     => ';'),
+                                          'default'     => ';',
+                                          'userlevel'   => USERLEVEL_CHIEF),
 
                                     array('var'         => 'rewrite',
                                           'title'       => INSTALL_REWRITE,
@@ -231,13 +241,15 @@
                                           'description' => INSTALL_OFFSET_DESC,
                                           'type'        => 'int',
                                           'default'     => 0,
+                                          'userlevel'   => USERLEVEL_CHIEF,
                                           'flags'       => array('parseDescription')),
 
                                     array('var'         => 'showFutureEntries',
                                           'title'       => INSTALL_SHOWFUTURE,
                                           'description' => INSTALL_SHOWFUTURE_DESC,
                                           'type'        => 'bool',
-                                          'default'     => false),
+                                          'default'     => false,
+                                          'userlevel'   => USERLEVEL_CHIEF),
                             ));
 
     $res['imagehandling'] =

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.68,1.69 serendipity_lang_cn.inc.php,1.35,1.36 serendipity_lang_cs.inc.php,1.115,1.116 serendipity_lang_cz.inc.php,1.115,1.116 serendipity_lang_da.inc.php,1.135,1.136 serendipity_lang_de.inc.php,1.156,1.157 serendipity_lang_en.inc.php,1.137,1.138 serendipity_lang_es.inc.php,1.130,1.131 serendipity_lang_fi.inc.php,1.23,1.24 serendipity_lang_fr.inc.php,1.115,1.116 serendipity_lang_it.inc.php,1.54,1.55 serendipity_lang_ja.inc.php,1.34,1.35 serendipity_lang_ko.inc.php,1.23,1.24 serendipity_lang_nl.inc.php,1.91,1.92 serendipity_lang_no.inc.php,1.55,1.56 serendipity_lang_pt.inc.php,1.90,1.91 serendipity_lang_ru.inc.php,1.28,1.29 serendipity_lang_tn.inc.php,1.36,1.37 serendipity_lang_tw.inc.php,1.51,1.52 serendipity_lang_zh.inc.php,1.35,1.36

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9900/lang

Modified Files:
	serendipity_lang_bg.inc.php serendipity_lang_cn.inc.php 
	serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php 
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
	serendipity_lang_fi.inc.php serendipity_lang_fr.inc.php 
	serendipity_lang_it.inc.php serendipity_lang_ja.inc.php 
	serendipity_lang_ko.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_no.inc.php serendipity_lang_pt.inc.php 
	serendipity_lang_ru.inc.php serendipity_lang_tn.inc.php 
	serendipity_lang_tw.inc.php serendipity_lang_zh.inc.php 
Log Message:
Fix serious plugin hook_event bug. Plugins were cached because of the introduction of a new hook too early in sequence, resulting in weird behaviour with plugin configuration (see mail by rasmus)

For the multilingual plugin to be able to function properly, a new autodetection routine has been put in place. I think this even acts nicely in the core serendipity, but for the future we may want to move it to a plugin somehow (I don't see a way currently)



Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- serendipity_lang_cs.inc.php	16 Feb 2005 00:43:50 -0000	1.115
+++ serendipity_lang_cs.inc.php	16 Feb 2005 12:36:27 -0000	1.116
@@ -651,6 +651,8 @@
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
 @define('CHARSET', 'Charset');
+@define('AUTOLANG', 'Use visitor\'s browser language as default');
+@define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- serendipity_lang_no.inc.php	16 Feb 2005 00:43:53 -0000	1.55
+++ serendipity_lang_no.inc.php	16 Feb 2005 12:36:29 -0000	1.56
@@ -650,5 +650,7 @@
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
 @define('CHARSET', 'Charset');
+@define('AUTOLANG', 'Use visitor\'s browser language as default');
+@define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
 
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_zh.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_zh.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- serendipity_lang_zh.inc.php	16 Feb 2005 00:43:53 -0000	1.35
+++ serendipity_lang_zh.inc.php	16 Feb 2005 12:36:30 -0000	1.36
@@ -648,6 +648,8 @@
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
 @define('CHARSET', 'Charset');
+@define('AUTOLANG', 'Use visitor\'s browser language as default');
+@define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- serendipity_lang_en.inc.php	16 Feb 2005 00:43:52 -0000	1.137
+++ serendipity_lang_en.inc.php	16 Feb 2005 12:36:28 -0000	1.138
@@ -617,36 +617,38 @@
 @define('DO_MARKUP_DESCRIPTION', 'Apply markup transformations to the text (smilies, shortcut markups via *, /, _, ...). Disabling this will preserve any HTML-code in the text.');
 @define('CATEGORY_ALREADY_EXIST', 'A category with the name "%s" already exist');
 @define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content');
-@define('ADMIN', 'Administration'); // Re-Translate
-@define('ADMIN_FRONTPAGE', 'Frontpage'); // Translate
-@define('QUOTE', 'Quote'); // Translate
-@define('IFRAME_SAVE', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while..'); // Translate
-@define('IFRAME_SAVE_DRAFT', 'A draft of this entry has been saved'); // Translate
-@define('IFRAME_PREVIEW', 'Serendipity is now creating the preview of your entry...'); // Translate
-@define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.'); // Translate
+@define('ADMIN', 'Administration');
+@define('ADMIN_FRONTPAGE', 'Frontpage');
+@define('QUOTE', 'Quote');
+@define('IFRAME_SAVE', 'Serendipity is now saving your entry, creating trackbacks and performing possible XML-RPC calls. This may take a while..');
+@define('IFRAME_SAVE_DRAFT', 'A draft of this entry has been saved');
+@define('IFRAME_PREVIEW', 'Serendipity is now creating the preview of your entry...');
+@define('IFRAME_WARNING', 'Your browser does not support the concept of iframes. Please open your serendipity_config.inc.php file and set $serendipity[\'use_iframe\'] variable to FALSE.');
 @define('NONE', 'none');
-@define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Default settings for new entries'); // Translate
+@define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Default settings for new entries');
 @define('UPGRADE', 'Upgrade');
 @define('UPGRADE_TO_VERSION', 'Upgrade to version %s');
-@define('DELETE_DIRECTORY', 'Delete directory'); // Translate
-@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.'); // Translate
-@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity'); // Translate
-@define('CREATE_DIRECTORY', 'Create directory'); // Translate
-@define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
-@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
-@define('BASE_DIRECTORY', 'Base directory'); // Translate
-@define('USERLEVEL_EDITOR_DESC', 'Standard editor'); // Translate
-@define('USERLEVEL_CHIEF_DESC', 'Chief editor'); // Translate
-@define('USERLEVEL_ADMIN_DESC', 'Administrator'); // Translate
-@define('USERCONF_USERLEVEL', 'Access level'); // Translate
-@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog'); // Translate
-@define('USER_SELF_INFO', 'Logged in as %s (%s)'); // Translate
-@define('ADMIN_ENTRIES', 'Entries'); // Translate
-@define('RECHECK_INSTALLATION', 'Recheck installation'); // Translate
-@define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d'); // Translate
-@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
-@define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
+@define('DELETE_DIRECTORY', 'Delete directory');
+@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.');
+@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity');
+@define('CREATE_DIRECTORY', 'Create directory');
+@define('CREATE_NEW_DIRECTORY', 'Create new directory');
+@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.');
+@define('BASE_DIRECTORY', 'Base directory');
+@define('USERLEVEL_EDITOR_DESC', 'Standard editor');
+@define('USERLEVEL_CHIEF_DESC', 'Chief editor');
+@define('USERLEVEL_ADMIN_DESC', 'Administrator');
+@define('USERCONF_USERLEVEL', 'Access level');
+@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog');
+@define('USER_SELF_INFO', 'Logged in as %s (%s)');
+@define('ADMIN_ENTRIES', 'Entries');
+@define('RECHECK_INSTALLATION', 'Recheck installation');
+@define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d');
+@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone');
+@define('UNMET_REQUIREMENTS', 'Requirements failed: %s');
 @define('CHARSET', 'Charset');
+@define('AUTOLANG', 'Use visitor\'s browser language as default');
+@define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ja.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity_lang_ja.inc.php	16 Feb 2005 00:43:52 -0000	1.34
+++ serendipity_lang_ja.inc.php	16 Feb 2005 12:36:29 -0000	1.35
@@ -648,6 +648,8 @@
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', '要求に失敗: %s');
 @define('CHARSET', 'Charset');
+@define('AUTOLANG', 'Use visitor\'s browser language as default');
+@define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- serendipity_lang_bg.inc.php	16 Feb 2005 00:43:50 -0000	1.68
+++ serendipity_lang_bg.inc.php	16 Feb 2005 12:36:27 -0000	1.69
@@ -634,6 +634,8 @@
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
 @define('CHARSET', 'Charset');
+@define('AUTOLANG', 'Use visitor\'s browser language as default');
+@define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_tw.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tw.inc.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- serendipity_lang_tw.inc.php	16 Feb 2005 00:43:53 -0000	1.51
+++ serendipity_lang_tw.inc.php	16 Feb 2005 12:36:30 -0000	1.52
@@ -648,6 +648,8 @@
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
 @define('CHARSET', 'Charset');
+@define('AUTOLANG', 'Use visitor\'s browser language as default');
+@define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- serendipity_lang_cz.inc.php	16 Feb 2005 00:43:51 -0000	1.115
+++ serendipity_lang_cz.inc.php	16 Feb 2005 12:36:27 -0000	1.116
@@ -651,6 +651,8 @@
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
 @define('CHARSET', 'Charset');
+@define('AUTOLANG', 'Use visitor\'s browser language as default');
+@define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- serendipity_lang_pt.inc.php	16 Feb 2005 00:43:53 -0000	1.90
+++ serendipity_lang_pt.inc.php	16 Feb 2005 12:36:30 -0000	1.91
@@ -650,6 +650,8 @@
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
 @define('CHARSET', 'Charset');
+@define('AUTOLANG', 'Use visitor\'s browser language as default');
+@define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_it.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- serendipity_lang_it.inc.php	16 Feb 2005 00:43:52 -0000	1.54
+++ serendipity_lang_it.inc.php	16 Feb 2005 12:36:28 -0000	1.55
@@ -649,6 +649,8 @@
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
 @define('CHARSET', 'Charset');
+@define('AUTOLANG', 'Use visitor\'s browser language as default');
+@define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- serendipity_lang_da.inc.php	16 Feb 2005 00:43:51 -0000	1.135
+++ serendipity_lang_da.inc.php	16 Feb 2005 12:36:28 -0000	1.136
@@ -650,6 +650,8 @@
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
 @define('CHARSET', 'Charset');
+@define('AUTOLANG', 'Use visitor\'s browser language as default');
+@define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- serendipity_lang_fr.inc.php	16 Feb 2005 00:43:52 -0000	1.115
+++ serendipity_lang_fr.inc.php	16 Feb 2005 12:36:28 -0000	1.116
@@ -653,6 +653,8 @@
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
 @define('CHARSET', 'Charset');
+@define('AUTOLANG', 'Use visitor\'s browser language as default');
+@define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_fi.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fi.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- serendipity_lang_fi.inc.php	16 Feb 2005 00:43:52 -0000	1.23
+++ serendipity_lang_fi.inc.php	16 Feb 2005 12:36:28 -0000	1.24
@@ -647,6 +647,8 @@
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
 @define('CHARSET', 'Charset');
+@define('AUTOLANG', 'Use visitor\'s browser language as default');
+@define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_ko.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ko.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- serendipity_lang_ko.inc.php	16 Feb 2005 00:43:53 -0000	1.23
+++ serendipity_lang_ko.inc.php	16 Feb 2005 12:36:29 -0000	1.24
@@ -652,6 +652,8 @@
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
 @define('CHARSET', 'Charset');
+@define('AUTOLANG', 'Use visitor\'s browser language as default');
+@define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- serendipity_lang_es.inc.php	16 Feb 2005 00:43:52 -0000	1.130
+++ serendipity_lang_es.inc.php	16 Feb 2005 12:36:28 -0000	1.131
@@ -652,6 +652,8 @@
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
 @define('CHARSET', 'Charset');
+@define('AUTOLANG', 'Use visitor\'s browser language as default');
+@define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_cn.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cn.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- serendipity_lang_cn.inc.php	16 Feb 2005 00:43:50 -0000	1.35
+++ serendipity_lang_cn.inc.php	16 Feb 2005 12:36:27 -0000	1.36
@@ -648,6 +648,8 @@
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
 @define('CHARSET', 'Charset');
+@define('AUTOLANG', 'Use visitor\'s browser language as default');
+@define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_tn.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tn.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- serendipity_lang_tn.inc.php	16 Feb 2005 00:43:53 -0000	1.36
+++ serendipity_lang_tn.inc.php	16 Feb 2005 12:36:30 -0000	1.37
@@ -648,6 +648,8 @@
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
 @define('CHARSET', 'Charset');
+@define('AUTOLANG', 'Use visitor\'s browser language as default');
+@define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_ru.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ru.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- serendipity_lang_ru.inc.php	16 Feb 2005 00:43:53 -0000	1.28
+++ serendipity_lang_ru.inc.php	16 Feb 2005 12:36:30 -0000	1.29
@@ -650,6 +650,8 @@
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
 @define('CHARSET', 'Charset');
+@define('AUTOLANG', 'Use visitor\'s browser language as default');
+@define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- serendipity_lang_de.inc.php	16 Feb 2005 00:43:51 -0000	1.156
+++ serendipity_lang_de.inc.php	16 Feb 2005 12:36:28 -0000	1.157
@@ -647,7 +647,9 @@
 @define('IMAGICK_EXEC_ERROR', 'Konnte folgendes Programm nicht ausführen: "%s", Fehlermeldung: %s, Rückgabewert: %d');
 @define('INSTALL_OFFSET_DESC', 'Wieviele Stunden liegen zwischen der Uhrzeit des Servers (aktuell: %clock%) und der eigenen Zeitzone');
 @define('UNMET_REQUIREMENTS', 'Bedingung unerfüllt: %s');
-@define('CHARSET', 'Charset');
+@define('CHARSET', 'Zeichensatz');
+@define('AUTOLANG', 'Sprache des Browsers eines Besuchers verwenden');
+@define('AUTOLANG_DESC', 'Falls aktiviert wird die im Browser des Besuchers eingestellte Sprache als Standardsprache für Einträge und die Serendipity Oberfläche benutzt.');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- serendipity_lang_nl.inc.php	16 Feb 2005 00:43:53 -0000	1.91
+++ serendipity_lang_nl.inc.php	16 Feb 2005 12:36:29 -0000	1.92
@@ -651,6 +651,8 @@
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
 @define('CHARSET', 'Charset');
+@define('AUTOLANG', 'Use visitor\'s browser language as default');
+@define('AUTOLANG_DESC', 'If enabled, this will use the visitor\'s browser language setting to determine the default language of your entry and interface language.');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

[php-blog-cvs] serendipity/plugins/serendipity_event_emoticate serendipity_event_emoticate.php,1.22,1.23

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13515

Modified Files:
	serendipity_event_emoticate.php 
Log Message:
there's always more exceptions to the rule. :-)<br /> shall still be
transformed.


Index: serendipity_event_emoticate.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate/serendipity_event_emoticate.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- serendipity_event_emoticate.php	16 Feb 2005 10:17:45 -0000	1.22
+++ serendipity_event_emoticate.php	16 Feb 2005 10:26:05 -0000	1.23
@@ -171,7 +171,7 @@
                             $element = &$eventData[$temp['element']];
 
                             foreach ($this->getEmoticons() as $key => $value) {
-                                $element = preg_replace("/([\t\s\.\!]+)" . $key . "([\t\s\!\.\)]+|\$)/m",
+                                $element = preg_replace("/([\t\s\.\!>]+)" . $key . "([\t\s\!\.\)<]+|\$)/U",
                                     "$1<img src=\"$value\" alt=\"$key\" style=\"display: inline; vertical-align: bottom;\" class=\"emoticon\" />$2",
                                     $element);
                             }

[php-blog-cvs] serendipity/plugins/serendipity_event_emoticate serendipity_event_emoticate.php,1.21,1.22

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11256

Modified Files:
	serendipity_event_emoticate.php 
Log Message:
also allow smilies after a '!' and at the end of a string.


Index: serendipity_event_emoticate.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate/serendipity_event_emoticate.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- serendipity_event_emoticate.php	16 Feb 2005 10:16:09 -0000	1.21
+++ serendipity_event_emoticate.php	16 Feb 2005 10:17:45 -0000	1.22
@@ -171,7 +171,7 @@
                             $element = &$eventData[$temp['element']];
 
                             foreach ($this->getEmoticons() as $key => $value) {
-                                $element = preg_replace("/([\t\s\.]+)" . $key . "([\t\s\!\.\)]+)/m",
+                                $element = preg_replace("/([\t\s\.\!]+)" . $key . "([\t\s\!\.\)]+|\$)/m",
                                     "$1<img src=\"$value\" alt=\"$key\" style=\"display: inline; vertical-align: bottom;\" class=\"emoticon\" />$2",
                                     $element);
                             }

[php-blog-cvs] serendipity/plugins/serendipity_event_emoticate serendipity_event_emoticate.php,1.20,1.21

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10762

Modified Files:
	serendipity_event_emoticate.php 
Log Message:
Don't screw up badly when smilies appear mid-sentence:
"hello:Dolly" would be transfered to the :-D smilie.
Adjusted regular expressions so that a whitespace character before and after the smilie is needed.
Does this create new trouble?


Index: serendipity_event_emoticate.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_emoticate/serendipity_event_emoticate.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_event_emoticate.php	9 Feb 2005 16:26:07 -0000	1.20
+++ serendipity_event_emoticate.php	16 Feb 2005 10:16:09 -0000	1.21
@@ -171,7 +171,7 @@
                             $element = &$eventData[$temp['element']];
 
                             foreach ($this->getEmoticons() as $key => $value) {
-                                $element = preg_replace("/([\t\ ]?)" . $key . "([\t\ \!\.\)]?)/m",
+                                $element = preg_replace("/([\t\s\.]+)" . $key . "([\t\s\!\.\)]+)/m",
                                     "$1<img src=\"$value\" alt=\"$key\" style=\"display: inline; vertical-align: bottom;\" class=\"emoticon\" />$2",
                                     $element);
                             }

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.67,1.68 serendipity_lang_cn.inc.php,1.34,1.35 serendipity_lang_cs.inc.php,1.114,1.115 serendipity_lang_cz.inc.php,1.114,1.115 serendipity_lang_da.inc.php,1.134,1.135 serendipity_lang_de.inc.php,1.155,1.156 serendipity_lang_en.inc.php,1.136,1.137 serendipity_lang_es.inc.php,1.129,1.130 serendipity_lang_fi.inc.php,1.22,1.23 serendipity_lang_fr.inc.php,1.114,1.115 serendipity_lang_it.inc.php,1.53,1.54 serendipity_lang_ja.inc.php,1.33,1.34 serendipity_lang_ko.inc.php,1.22,1.23 serendipity_lang_nl.inc.php,1.90,1.91 serendipity_lang_no.inc.php,1.54,1.55 serendipity_lang_pt.inc.php,1.89,1.90 serendipity_lang_ru.inc.php,1.27,1.28 serendipity_lang_tn.inc.php,1.35,1.36 serendipity_lang_tw.inc.php,1.50,1.51 serendipity_lang_zh.inc.php,1.34,1.35

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8567

Modified Files:
	serendipity_lang_bg.inc.php serendipity_lang_cn.inc.php 
	serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php 
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
	serendipity_lang_fi.inc.php serendipity_lang_fr.inc.php 
	serendipity_lang_it.inc.php serendipity_lang_ja.inc.php 
	serendipity_lang_ko.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_no.inc.php serendipity_lang_pt.inc.php 
	serendipity_lang_ru.inc.php serendipity_lang_tn.inc.php 
	serendipity_lang_tw.inc.php serendipity_lang_zh.inc.php 
Log Message:
- Using PHP's tokenizer revealed some more orphans


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- serendipity_lang_cs.inc.php	15 Feb 2005 23:57:57 -0000	1.114
+++ serendipity_lang_cs.inc.php	16 Feb 2005 00:43:50 -0000	1.115
@@ -101,7 +101,6 @@
 @define('SHOWS_TOP_EXIT', 'Nejèastìjší výstupy z tohoto weblogu');
 @define('SYNDICATION', 'Spolupráce');
 @define('SHOWS_RSS_BLAHBLAH', 'Sdílené RSS linky');
-@define('PLUG', 'Pøipojení');
 @define('ADVERTISES_BLAHBLAH', 'Reklama na tvùrce systému vašeho weblogu');
 @define('HTML_NUGGET', 'Vložený HTML kód');
 @define('HOLDS_A_BLAHBLAH', 'Vložení HTML kódu do postranního sloupce');
@@ -295,7 +294,6 @@
 @define('DELETE_USER', 'Chcete vymazat uživatele #%d %s. Myslíte to vážnì? Tato akce znemožní prohlížet jím vytvoøené záznamy na hlavní stránce.');
 @define('DELETED_USER', 'Uživatel #%d %s je vymazán.');
 @define('LIMIT_TO_NUMBER', 'Kolik záznamù by mìlo být zobrazeno?');
-@define('FILTER', 'Filtr');
 @define('ENTRIES_PER_PAGE', 'záznamù na stránku');
 @define('DIRECTORIES_AVAILABLE', 'Po kliknutí na nìkterý podadresáø v seznamu mùžete vytvoøit další podadresáø.');
 @define('ALL_DIRECTORIES', 'všechny adresáøe');
@@ -536,7 +534,6 @@
 @define('EVENT_PLUGIN', 'plugin události');
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Kliknìte a instalujte nový %s');
 @define('VERSION', 'verze');
-@define('NA', 'N/A');
 @define('INSTALL', 'Instalovat');
 @define('ALREADY_INSTALLED', 'Naistalován');
 @define('SELECT_A_PLUGIN_TO_ADD', 'Vyberte plugin, který chcete nainstalovat');

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- serendipity_lang_no.inc.php	15 Feb 2005 23:58:10 -0000	1.54
+++ serendipity_lang_no.inc.php	16 Feb 2005 00:43:53 -0000	1.55
@@ -96,7 +96,6 @@
 @define('SHOWS_TOP_EXIT', 'Viser de exit-sider det har blitt klikket flest ganger på');
 @define('SYNDICATION', 'Syndikering');
 @define('SHOWS_RSS_BLAHBLAH', 'Viser RSS syndikeringslinker');
-@define('PLUG', 'Plug');
 @define('ADVERTISES_BLAHBLAH', 'Reklamer for din blogs opprinnelse');
 @define('HTML_NUGGET', 'HTML Nugget');
 @define('HOLDS_A_BLAHBLAH', 'Indeholder en bit HTML i din sidebar');
@@ -287,7 +286,6 @@
 @define('DELETE_USER', 'Du er i ferd med å slette bruker #%d %s. Er du sikker? Dette vil forhindre visning av alle artikler skrevet av brukeren.');
 @define('DELETED_USER', 'Bruker #%d %s er slettet.');
 @define('LIMIT_TO_NUMBER', 'Hvor mange punkter skal vises?');
-@define('FILTER', 'Filter');
 @define('ENTRIES_PER_PAGE', 'artikler per side');
 
 /* TRANSLATE */
@@ -535,7 +533,6 @@
 @define('EVENT_PLUGIN', 'event plugin'); // Translate
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s'); // Translate
 @define('VERSION', 'version'); // Translate
-@define('NA', 'N/A'); // Translate
 @define('INSTALL', 'Install'); // Translate
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate

Index: serendipity_lang_zh.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_zh.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity_lang_zh.inc.php	15 Feb 2005 23:58:23 -0000	1.34
+++ serendipity_lang_zh.inc.php	16 Feb 2005 00:43:53 -0000	1.35
@@ -100,7 +100,6 @@
 @define('SHOWS_TOP_EXIT', 'ÏÔʾÄúµÄÈռǵÄÖ÷Òª³öÔ´');
 @define('SYNDICATION', 'ÎÄÕÂͬ²½');
 @define('SHOWS_RSS_BLAHBLAH', 'ÏÔʾ RSS ͬ²½Á¬½á');
-@define('PLUG', 'Íâ¹Ò');
 @define('ADVERTISES_BLAHBLAH', 'Ðû´«ÄúµÄÍø·ÈÕ¼Ç');
 @define('HTML_NUGGET', 'HTML ѶϢ');
 @define('HOLDS_A_BLAHBLAH', 'ÏÔʾ HTML ѶϢµ½²àÁÐ');
@@ -303,7 +302,6 @@
 @define('DELETE_USER', 'ÄúҪɾ³ýÕâ¸ö×÷Õß #%d %s. È·¶¨Âð? Õâ»áÔÚÖ÷Ò³Òþ²ØËûËùдµÄÈκÎÎÄÕÂ.');
 @define('DELETED_USER', '×÷Õß #%d %s Òѱ»É¾³ý.');
 @define('LIMIT_TO_NUMBER', 'ÒªÏÔʾ¶àÉÙÏîÄ¿?');
-@define('FILTER', '¹ýÂË');
 @define('ENTRIES_PER_PAGE', 'ÿҳÏÔʾµÄÎÄÕÂ');
 @define('XML_IMAGE_TO_DISPLAY', 'XML °´Å¥');
 @define('XML_IMAGE_TO_DISPLAY_DESC','Á¬½áµ½ XML Feeds µÄ¶¼»áÓÃÕâ¸öͼƬ±íʾ. ²»Ìîд½«»áʹÓÃÔ¤ÉèµÄͼƬ, »òÊäÈë \'none\' ¹Ø±ÕÕâ¸ö¹¦ÄÜ.');
@@ -533,7 +531,6 @@
 @define('EVENT_PLUGIN', 'ʼþÍâ¹Ò');
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'µãÕâÀﰲװР%s');
 @define('VERSION', '°æ±¾');
-@define('NA', 'N/A');
 @define('INSTALL', '°²×°');
 @define('ALREADY_INSTALLED', 'ÒѾ­°²×°');
 @define('SELECT_A_PLUGIN_TO_ADD', 'ÇëÑ¡ÔñÒª°²×°µÄÍâ¹Ò');

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- serendipity_lang_en.inc.php	15 Feb 2005 23:58:03 -0000	1.136
+++ serendipity_lang_en.inc.php	16 Feb 2005 00:43:52 -0000	1.137
@@ -100,7 +100,6 @@
 @define('SHOWS_TOP_EXIT', 'Shows top exit links from your blogs');
 @define('SYNDICATION', 'Syndication');
 @define('SHOWS_RSS_BLAHBLAH', 'Shows RSS syndication links');
-@define('PLUG', 'Plug');
 @define('ADVERTISES_BLAHBLAH', 'Advertises the origins of your blog');
 @define('HTML_NUGGET', 'HTML Nugget');
 @define('HOLDS_A_BLAHBLAH', 'Holds a nugget of HTML in your sidebar');
@@ -303,7 +302,6 @@
 @define('DELETE_USER', 'You are about to delete user #%d %s. Are you serious? This will disallow showing any entries written by him on the frontend.');
 @define('DELETED_USER', 'User #%d %s deleted.');
 @define('LIMIT_TO_NUMBER', 'How many items should be displayed?');
-@define('FILTER', 'Filter');
 @define('ENTRIES_PER_PAGE', 'entries per page');
 @define('XML_IMAGE_TO_DISPLAY', 'XML Button');
 @define('XML_IMAGE_TO_DISPLAY_DESC','Links to XML Feeds will be displayed by this image. Leave empty for default, enter \'none\' to disable.');
@@ -534,7 +532,6 @@
 @define('EVENT_PLUGIN', 'event plugin');
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s');
 @define('VERSION', 'version');
-@define('NA', 'N/A');
 @define('INSTALL', 'Install');
 @define('ALREADY_INSTALLED', 'Already installed');
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install');

Index: serendipity_lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ja.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- serendipity_lang_ja.inc.php	15 Feb 2005 23:58:07 -0000	1.33
+++ serendipity_lang_ja.inc.php	16 Feb 2005 00:43:52 -0000	1.34
@@ -101,7 +101,6 @@
 @define('SHOWS_TOP_EXIT', 'あなたのブログから退出したリンクのトップを表示します。');
 @define('SYNDICATION', 'Syndication');
 @define('SHOWS_RSS_BLAHBLAH', 'RSS syndication リンクを表示します。');
-@define('PLUG', 'プラグ');
 @define('ADVERTISES_BLAHBLAH', 'ブログの元を宣伝します。');
 @define('HTML_NUGGET', 'HTML ナゲット');
 @define('HOLDS_A_BLAHBLAH', 'サイドバーに HTML の情報(ナゲット)を保持します。');
@@ -304,7 +303,6 @@
 @define('DELETE_USER', 'You are about to delete user #%d %s. Are you serious? This will disallow showing any entries written by him on the frontend.');
 @define('DELETED_USER', 'ユーザー ID #%d の %s を削除しました。');
 @define('LIMIT_TO_NUMBER', 'どれだけの項目を表示しますか?');
-@define('FILTER', 'フィルター');
 @define('ENTRIES_PER_PAGE', 'ページ毎のエントリ');
 @define('XML_IMAGE_TO_DISPLAY', 'XML ボタン');
 @define('XML_IMAGE_TO_DISPLAY_DESC','Links to XML Feeds will be displayed by this image. Leave empty for default, enter \'none\' to disable.');
@@ -535,7 +533,6 @@
 @define('EVENT_PLUGIN', 'イベントプラグイン');
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', '新しい %s をインストールする');
 @define('VERSION', 'バージョン');
-@define('NA', 'N/A');
 @define('INSTALL', 'インストール');
 @define('ALREADY_INSTALLED', '既にインストール済みです');
 @define('SELECT_A_PLUGIN_TO_ADD', 'インストールしたいプラグインを選択する');

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- serendipity_lang_bg.inc.php	15 Feb 2005 23:57:56 -0000	1.67
+++ serendipity_lang_bg.inc.php	16 Feb 2005 00:43:50 -0000	1.68
@@ -96,7 +96,6 @@
 @define('SHOWS_TOP_EXIT', 'Ïîêàçâà, íà êîè ëèíêîâå íàé-ìíîãî ñå å êëèêàëî îò ñàéòà âè');
 @define('SYNDICATION', 'Ñèíõðîíèçàöèÿ');
 @define('SHOWS_RSS_BLAHBLAH', 'Ïîêàæè RSS ëèíêîâå');
-@define('PLUG', 'Äîáàâêà');
 @define('ADVERTISES_BLAHBLAH', 'Ðåêëàìèðàé ïðîèçõîäà íà ñâîÿ áëîã');
 @define('HTML_NUGGET', 'HTML Ïîëå');
 @define('HOLDS_A_BLAHBLAH', 'Äîáàâè  HTML ïîëå â ñâîÿ ñàéò');
@@ -336,7 +335,6 @@
 @define('DELETE_USER', 'You are about to delete user #%d %s. Are you serious? This will disallow showing any entries written by him on the frontend.'); // Translate
 @define('DELETED_USER', 'User #%d %s deleted.'); // Translate
 @define('LIMIT_TO_NUMBER', 'How many items should be displayed?'); // Translate
-@define('FILTER', 'Filter'); // Translate
 @define('ENTRIES_PER_PAGE', 'entries per page'); // Translate
 @define('XML_IMAGE_TO_DISPLAY', 'XML Button'); // Translate
 @define('DIRECTORIES_AVAILABLE', 'In the list of available subdirectories you can click on any directory name to create a new directory within that structure.'); // Translate
@@ -519,7 +517,6 @@
 @define('EVENT_PLUGIN', 'event plugin'); // Translate
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s'); // Translate
 @define('VERSION', 'version'); // Translate
-@define('NA', 'N/A'); // Translate
 @define('INSTALL', 'Install'); // Translate
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate

Index: serendipity_lang_tw.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tw.inc.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- serendipity_lang_tw.inc.php	15 Feb 2005 23:58:22 -0000	1.50
+++ serendipity_lang_tw.inc.php	16 Feb 2005 00:43:53 -0000	1.51
@@ -100,7 +100,6 @@
 @define('SHOWS_TOP_EXIT', 'Åã¥Ü±zªº¤é°Oªº¥D­n¥X·½');
 @define('SYNDICATION', '¤å³¹¦P¨B');
 @define('SHOWS_RSS_BLAHBLAH', 'Åã¥Ü RSS ¦P¨B³sµ²');
-@define('PLUG', '¥~±¾');
 @define('ADVERTISES_BLAHBLAH', '«Å¶Ç±zªººô¸ô¤é°O');
 @define('HTML_NUGGET', 'HTML °T®§');
 @define('HOLDS_A_BLAHBLAH', 'Åã¥Ü HTML °T®§¨ì°¼¦C');
@@ -303,7 +302,6 @@
 @define('DELETE_USER', '±z­n§R°£³o­Ó§@ªÌ #%d %s. ½T©w¶Ü? ³o·|¦b¥D­¶ÁôÂÃ¥L©Ò¼gªº¥ô¦ó¤å³¹.');
 @define('DELETED_USER', '§@ªÌ #%d %s ¤w³Q§R°£.');
 @define('LIMIT_TO_NUMBER', '­nÅã¥Ü¦h¤Ö¶µ¥Ø?');
-@define('FILTER', '¹LÂo');
 @define('ENTRIES_PER_PAGE', '¨C­¶Åã¥Üªº¤å³¹');
 @define('XML_IMAGE_TO_DISPLAY', 'XML «ö¶s');
 @define('XML_IMAGE_TO_DISPLAY_DESC','³sµ²¨ì XML Feeds ªº³£·|¥Î³o­Ó¹Ï¤ùªí¥Ü. ¤£¶ñ¼g±N·|¨Ï¥Î¹w³]ªº¹Ï¤ù, ©Î¿é¤J \'none\' Ãö³¬³o­Ó¥\¯à.');
@@ -533,7 +531,6 @@
 @define('EVENT_PLUGIN', '¨Æ¥ó¥~±¾');
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'ÂI³o¸Ì¦w¸Ë·s %s');
 @define('VERSION', 'ª©¥»');
-@define('NA', 'N/A');
 @define('INSTALL', '¦w¸Ë');
 @define('ALREADY_INSTALLED', '¤w¸g¦w¸Ë');
 @define('SELECT_A_PLUGIN_TO_ADD', '½Ð¿ï¾Ü­n¦w¸Ëªº¥~±¾');

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- serendipity_lang_cz.inc.php	15 Feb 2005 23:57:59 -0000	1.114
+++ serendipity_lang_cz.inc.php	16 Feb 2005 00:43:51 -0000	1.115
@@ -101,7 +101,6 @@
 @define('SHOWS_TOP_EXIT', 'Nejèastìj¹í výstupy z tohoto weblogu');
 @define('SYNDICATION', 'Spolupráce');
 @define('SHOWS_RSS_BLAHBLAH', 'Sdílené RSS linky');
-@define('PLUG', 'Pøipojení');
 @define('ADVERTISES_BLAHBLAH', 'Reklama na tvùrce systému va¹eho weblogu');
 @define('HTML_NUGGET', 'Vlo¾ený HTML kód');
 @define('HOLDS_A_BLAHBLAH', 'Vlo¾ení HTML kódu do postranního sloupce');
@@ -295,7 +294,6 @@
 @define('DELETE_USER', 'Chcete vymazat u¾ivatele #%d %s. Myslíte to vá¾nì? Tato akce znemo¾ní prohlí¾et jím vytvoøené záznamy na hlavní stránce.');
 @define('DELETED_USER', 'U¾ivatel #%d %s je vymazán.');
 @define('LIMIT_TO_NUMBER', 'Kolik záznamù by mìlo být zobrazeno?');
-@define('FILTER', 'Filtr');
 @define('ENTRIES_PER_PAGE', 'záznamù na stránku');
 @define('DIRECTORIES_AVAILABLE', 'Po kliknutí na nìkterý podadresáø v seznamu mù¾ete vytvoøit dal¹í podadresáø.');
 @define('ALL_DIRECTORIES', 'v¹echny adresáøe');
@@ -536,7 +534,6 @@
 @define('EVENT_PLUGIN', 'plugin události');
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Kliknìte a instalujte nový %s');
 @define('VERSION', 'verze');
-@define('NA', 'N/A');
 @define('INSTALL', 'Instalovat');
 @define('ALREADY_INSTALLED', 'Naistalován');
 @define('SELECT_A_PLUGIN_TO_ADD', 'Vyberte plugin, který chcete nainstalovat');

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- serendipity_lang_pt.inc.php	15 Feb 2005 23:58:20 -0000	1.89
+++ serendipity_lang_pt.inc.php	16 Feb 2005 00:43:53 -0000	1.90
@@ -96,7 +96,6 @@
 @define('SHOWS_TOP_EXIT', 'Exibe os links de saída mais requisitados de seu blog');
 @define('SYNDICATION', 'Sindicalização');
 @define('SHOWS_RSS_BLAHBLAH', 'Shows RSS syndication links');
-@define('PLUG', 'Plugar');
 @define('ADVERTISES_BLAHBLAH', 'Adverte da origem do seu blog');
 @define('HTML_NUGGET', 'Fragmento de HTML');
 @define('HOLDS_A_BLAHBLAH', 'Apresenta um fragmento de HTML à sua barra lateral');
@@ -288,7 +287,6 @@
 @define('DELETE_USER', 'Você está prestes a excluir o usuário #%d %s. Tem certeza disso? Isso fará com que os artigos escritos por ele não sejam mais exibidos.');
 @define('DELETED_USER', 'Usuário #%d %s excluído.');
 @define('LIMIT_TO_NUMBER', 'Quantos itens devem ser exibidos?');
-@define('FILTER', 'Filtro');
 @define('ENTRIES_PER_PAGE', 'artigos por página');
 @define('XML_IMAGE_TO_DISPLAY', 'Botão XML');
 @define('XML_IMAGE_TO_DISPLAY_DESC','Links para XML Feeds serão exibidos por esta imagem. Deixe em branco para padrão, digite \'none\' para desabilitar.');
@@ -535,7 +533,6 @@
 @define('EVENT_PLUGIN', 'event plugin'); // Translate
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s'); // Translate
 @define('VERSION', 'version'); // Translate
-@define('NA', 'N/A'); // Translate
 @define('INSTALL', 'Install'); // Translate
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate

Index: serendipity_lang_it.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- serendipity_lang_it.inc.php	15 Feb 2005 23:58:06 -0000	1.53
+++ serendipity_lang_it.inc.php	16 Feb 2005 00:43:52 -0000	1.54
@@ -102,7 +102,6 @@
 @define('SHOWS_TOP_EXIT', 'Mostra dove vanno i tuoi lettori quando escono dal blog');
 @define('SYNDICATION', 'Diffusione');
 @define('SHOWS_RSS_BLAHBLAH', 'Mostra i link di diffusione RSS');
-@define('PLUG', 'Plug');
 @define('ADVERTISES_BLAHBLAH', 'Pubblicizza le origini del tuo blog');
 @define('HTML_NUGGET', 'Pillola di HTML');
 @define('HOLDS_A_BLAHBLAH', 'Infila un pezzo di HTML nella tua barra laterale');
@@ -166,7 +165,6 @@
 @define('CATEGORY_SAVED', 'Categoria salvata');
 @define('SELECT_TEMPLATE', 'Seleziona il modello che vuoi usare per il tuo blog');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Notizie non inserite!');
-@define('IMPORT', 'Importa');
 @define('YES', 'Sì');
 @define('NO', 'No');
 @define('USE_DEFAULT', 'Default');
@@ -293,7 +291,6 @@
 @define('DELETE_USER', 'Stai per cancellare l\'utente #%d %s. Sei convinto? Questo impedirà la visualizzazione delle notizie scritte da lui sulla pagina principale.');
 @define('DELETED_USER', 'Utente #%d %s cancellato.');
 @define('LIMIT_TO_NUMBER', 'Quante notizie vuoi mostrare?');
-@define('FILTER', 'Filtro');
 @define('ENTRIES_PER_PAGE', 'notizie per pagina');
 @define('XML_IMAGE_TO_DISPLAY', 'Pulsante XML');
 @define('XML_IMAGE_TO_DISPLAY_DESC','I link ai feed XML saranno indicati da questa immagine. Lasciare vuoto per l\'immagine di default, inserire \'none\' per disabilitarla.');
@@ -535,7 +532,6 @@
 @define('EVENT_PLUGIN', 'event plugin'); // Translate
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s'); // Translate
 @define('VERSION', 'version'); // Translate
-@define('NA', 'N/A'); // Translate
 @define('INSTALL', 'Install'); // Translate
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- serendipity_lang_da.inc.php	15 Feb 2005 23:57:59 -0000	1.134
+++ serendipity_lang_da.inc.php	16 Feb 2005 00:43:51 -0000	1.135
@@ -99,7 +99,6 @@
 @define('SHOWS_TOP_EXIT', 'Viser de udgangssider der er klikket flest gange på');
 @define('SYNDICATION', 'Syndikering');
 @define('SHOWS_RSS_BLAHBLAH', 'Viser RSS syndikeringslinks');
-@define('PLUG', 'Plug');
 @define('ADVERTISES_BLAHBLAH', 'Reklamer for din blogs oprindelse');
 @define('HTML_NUGGET', 'HTML Nugget');
 @define('HOLDS_A_BLAHBLAH', 'Indeholder et stykke HTML i din sidebar');
@@ -290,7 +289,6 @@
 @define('DELETE_USER', 'Du er ved at slette bruger #%d %s. Er du sikker? Dette vil forbyde visningen af alle artikler skrevet af ham.');
 @define('DELETED_USER', 'Bruger #%d %s er blevet slettet.');
 @define('LIMIT_TO_NUMBER', 'Hvor mange punkter skal vises?');
-@define('FILTER', 'Filter');
 @define('ENTRIES_PER_PAGE', 'artikler per side');
 @define('PERMISSIONS', 'Rettigheder');
 
@@ -535,7 +533,6 @@
 @define('EVENT_PLUGIN', 'event plugin'); // Translate
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s'); // Translate
 @define('VERSION', 'version'); // Translate
-@define('NA', 'N/A'); // Translate
 @define('INSTALL', 'Install'); // Translate
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- serendipity_lang_fr.inc.php	15 Feb 2005 23:58:04 -0000	1.114
+++ serendipity_lang_fr.inc.php	16 Feb 2005 00:43:52 -0000	1.115
@@ -101,7 +101,6 @@
 @define('SHOWS_TOP_EXIT', 'Montrer le top des liens de sites qui sortent de votre blog');
 @define('SYNDICATION', 'Syndication');
 @define('SHOWS_RSS_BLAHBLAH', 'Montrer les liens de syndication RSS');
-@define('PLUG', 'Plug');
 @define('ADVERTISES_BLAHBLAH', 'Publicité sur l\'origine de votre blog');
 @define('HTML_NUGGET', 'Bloc HTML');
 @define('HOLDS_A_BLAHBLAH', 'Permet d\'afficher des contenus personnalisés au format HTML dans la barre latérale');
@@ -292,7 +291,6 @@
 @define('DELETE_USER', 'Vous êtes sur le point de supprimer l\'utilisateur #%d %s. Êtes-vous sûr de vouloir continuer? Les billets de cet utilisateur ne seront plus visibles dans votre blog.');
 @define('DELETED_USER', 'Utilisateur #%d %s supprimé.');
 @define('LIMIT_TO_NUMBER', 'Limiter le nombre de billets à?');
-@define('FILTER', 'Filtre');
 @define('ENTRIES_PER_PAGE', 'billets par page');
 @define('XML_IMAGE_TO_DISPLAY', 'Bouton "XML"');
 @define('XML_IMAGE_TO_DISPLAY_DESC','Les liens vers les fils XML seront affichés avec cette image. Laisser vide pour l\'image par défaut, ou tapez \'none\' pour la désactiver.');
@@ -538,7 +536,6 @@
 @define('EVENT_PLUGIN', 'plugin d\'évènement');
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Cliquez ici pour installer un nouveau %s');
 @define('VERSION', 'version');
-@define('NA', 'n.d.');
 @define('INSTALL', 'Installer');
 @define('ALREADY_INSTALLED', 'Déjà installé');
 @define('SELECT_A_PLUGIN_TO_ADD', 'Sélectionnez le plugin que vous voulez installer');

Index: serendipity_lang_fi.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fi.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- serendipity_lang_fi.inc.php	15 Feb 2005 23:58:04 -0000	1.22
+++ serendipity_lang_fi.inc.php	16 Feb 2005 00:43:52 -0000	1.23
@@ -100,7 +100,6 @@
 @define('SHOWS_TOP_EXIT', 'Näyttää eniten viittaamasi sivustot, joille on poistuttu');
 @define('SYNDICATION', 'Ajantasaistus');
 @define('SHOWS_RSS_BLAHBLAH', 'Näyttää RSS linkit');
-@define('PLUG', 'Liitä');
 @define('ADVERTISES_BLAHBLAH', 'Mainostaa Serendipityä');
 @define('HTML_NUGGET', 'HTML raapale');
 @define('HOLDS_A_BLAHBLAH', 'Lisää HTML raapaleen sivupalstaan');
@@ -303,7 +302,6 @@
 @define('DELETE_USER', 'Olet aikeissa poistaa käyttäjän  #%d %s. Oletko tosissasi? Käyttäjän kirjoitukset sensuroidaan.');
 @define('DELETED_USER', 'Käyttäjä #%d %s tuhottu.');
 @define('LIMIT_TO_NUMBER', 'Montako näytetään?');
-@define('FILTER', 'Suodin');
 @define('ENTRIES_PER_PAGE', 'kirjoitusta sivulla');
 @define('XML_IMAGE_TO_DISPLAY', 'XML Nappula');
 @define('XML_IMAGE_TO_DISPLAY_DESC','XML kanavat esitetään tällä kuvanappulalla.Tyhjä valitsee oletuksen kirjoittamalla:\'none\' ei käytetä kuvanappulaa.');
@@ -534,7 +532,6 @@
 @define('EVENT_PLUGIN', 'tapahtumalaajennos');
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Napsauta lisätäksesi uuden %s');
 @define('VERSION', 'versio');
-@define('NA', 'Ei saatavissa');
 @define('INSTALL', 'Asenna');
 @define('ALREADY_INSTALLED', 'Asennettu jo');
 @define('SELECT_A_PLUGIN_TO_ADD', 'Valitse laajennos, jonka haluat asentaa');

Index: serendipity_lang_ko.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ko.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- serendipity_lang_ko.inc.php	15 Feb 2005 23:58:08 -0000	1.22
+++ serendipity_lang_ko.inc.php	16 Feb 2005 00:43:53 -0000	1.23
@@ -105,7 +105,6 @@
 @define('SHOWS_TOP_EXIT', 'Shows top exit links from your blogs');
 @define('SYNDICATION', 'Syndication');
 @define('SHOWS_RSS_BLAHBLAH', 'Shows RSS syndication links');
-@define('PLUG', 'Plug');
 @define('ADVERTISES_BLAHBLAH', 'Advertises the origins of your blog');
 @define('HTML_NUGGET', 'HTML Nugget');
 @define('HOLDS_A_BLAHBLAH', 'Holds a nugget of HTML in your sidebar');
@@ -309,7 +308,6 @@
 @define('DELETE_USER', 'You are about to delete user #%d %s. Are you serious? This will disallow showing any entries written by him on the frontend.');
 @define('DELETED_USER', 'User #%d %s deleted.');
 @define('LIMIT_TO_NUMBER', 'How many items should be displayed?');
-@define('FILTER', 'Filter');
 @define('ENTRIES_PER_PAGE', 'entries per page');
 @define('XML_IMAGE_TO_DISPLAY', 'XML Button');
 @define('XML_IMAGE_TO_DISPLAY_DESC','Links to XML Feeds will be displayed by this image. Leave empty for default, enter \'none\' to disable.');
@@ -540,7 +538,6 @@
 @define('EVENT_PLUGIN', 'event plugin');
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s');
 @define('VERSION', 'version');
-@define('NA', 'N/A');
 @define('INSTALL', 'Install');
 @define('ALREADY_INSTALLED', 'Already installed');
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install');

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- serendipity_lang_es.inc.php	15 Feb 2005 23:58:03 -0000	1.129
+++ serendipity_lang_es.inc.php	16 Feb 2005 00:43:52 -0000	1.130
@@ -97,7 +97,6 @@
 @define('SHOWS_TOP_EXIT', 'Muestra las salidas más frecuentes de tu weblog');
 @define('SYNDICATION', 'Sindicación');
 @define('SHOWS_RSS_BLAHBLAH', 'Muestra los enlaces RSS de sindicación');
-@define('PLUG', 'Plug');
 @define('ADVERTISES_BLAHBLAH', 'Informa del código en el que se basa tu weblog');
 @define('HTML_NUGGET', 'Fragmento de HTML');
 @define('HOLDS_A_BLAHBLAH', 'Prensenta un fragmento de HTML en la barra lateral');
@@ -284,7 +283,6 @@
 @define('DELETE_USER', 'Estás a punto de borrar el usuario #%d %s. ¿En serio? Esto no mostrará las entradas escritas por él.');
 @define('DELETED_USER', 'Usuario #%d %s borrado.');
 @define('LIMIT_TO_NUMBER', '¿Cuántos deberían mostrarse?');
-@define('FILTER', 'Filtro');
 @define('ENTRIES_PER_PAGE', 'entradas por página');
 @define('DIRECTORIES_AVAILABLE', 'En la lista de subdirectorios disponibles puedes hacer click en el nombre de un directorio para crear un nuevo directorio en esa estructura.');
 @define('ALL_DIRECTORIES', 'todos los directorios');
@@ -539,7 +537,6 @@
 @define('EVENT_PLUGIN', 'event plugin'); // Translate
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s'); // Translate
 @define('VERSION', 'version'); // Translate
-@define('NA', 'N/A'); // Translate
 @define('INSTALL', 'Install'); // Translate
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate

Index: serendipity_lang_cn.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cn.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity_lang_cn.inc.php	15 Feb 2005 23:57:57 -0000	1.34
+++ serendipity_lang_cn.inc.php	16 Feb 2005 00:43:50 -0000	1.35
@@ -100,7 +100,6 @@
 @define('SHOWS_TOP_EXIT', '显示您的日记的主要出源');
 @define('SYNDICATION', '文章同步');
 @define('SHOWS_RSS_BLAHBLAH', '显示 RSS 同步连结');
-@define('PLUG', '外挂');
 @define('ADVERTISES_BLAHBLAH', '宣传您的网路日记');
 @define('HTML_NUGGET', 'HTML 讯息');
 @define('HOLDS_A_BLAHBLAH', '显示 HTML 讯息到侧列');
@@ -303,7 +302,6 @@
 @define('DELETE_USER', '您要删除这个作者 #%d %s. 确定吗? 这会在主页隐藏他所写的任何文章.');
 @define('DELETED_USER', '作者 #%d %s 已被删除.');
 @define('LIMIT_TO_NUMBER', '要显示多少项目?');
-@define('FILTER', '过滤');
 @define('ENTRIES_PER_PAGE', '每页显示的文章');
 @define('XML_IMAGE_TO_DISPLAY', 'XML 按钮');
 @define('XML_IMAGE_TO_DISPLAY_DESC','连结到 XML Feeds 的都会用这个图片表示. 不填写将会使用预设的图片, 或输入 \'none\' 关闭这个功能.');
@@ -533,7 +531,6 @@
 @define('EVENT_PLUGIN', '事件外挂');
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', '点这里安装新 %s');
 @define('VERSION', '版本');
-@define('NA', 'N/A');
 @define('INSTALL', '安装');
 @define('ALREADY_INSTALLED', '已经安装');
 @define('SELECT_A_PLUGIN_TO_ADD', '请选择要安装的外挂');

Index: serendipity_lang_tn.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tn.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- serendipity_lang_tn.inc.php	15 Feb 2005 23:58:21 -0000	1.35
+++ serendipity_lang_tn.inc.php	16 Feb 2005 00:43:53 -0000	1.36
@@ -100,7 +100,6 @@
 @define('SHOWS_TOP_EXIT', '顯示您的日記的主要出源');
 @define('SYNDICATION', '文章同步');
 @define('SHOWS_RSS_BLAHBLAH', '顯示 RSS 同步連結');
-@define('PLUG', '外掛');
 @define('ADVERTISES_BLAHBLAH', '宣傳您的網路日記');
 @define('HTML_NUGGET', 'HTML 訊息');
 @define('HOLDS_A_BLAHBLAH', '顯示 HTML 訊息到側列');
@@ -303,7 +302,6 @@
 @define('DELETE_USER', '您要刪除這個作者 #%d %s. 確定嗎? 這會在主頁隱藏他所寫的任何文章.');
 @define('DELETED_USER', '作者 #%d %s 已被刪除.');
 @define('LIMIT_TO_NUMBER', '要顯示多少項目?');
-@define('FILTER', '過濾');
 @define('ENTRIES_PER_PAGE', '每頁顯示的文章');
 @define('XML_IMAGE_TO_DISPLAY', 'XML 按鈕');
 @define('XML_IMAGE_TO_DISPLAY_DESC','連結到 XML Feeds 的都會用這個圖片表示. 不填寫將會使用預設的圖片, 或輸入 \'none\' 關閉這個功能.');
@@ -533,7 +531,6 @@
 @define('EVENT_PLUGIN', '事件外掛');
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', '點這裡安裝新 %s');
 @define('VERSION', '版本');
-@define('NA', 'N/A');
 @define('INSTALL', '安裝');
 @define('ALREADY_INSTALLED', '已經安裝');
 @define('SELECT_A_PLUGIN_TO_ADD', '請選擇要安裝的外掛');

Index: serendipity_lang_ru.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ru.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- serendipity_lang_ru.inc.php	15 Feb 2005 23:58:21 -0000	1.27
+++ serendipity_lang_ru.inc.php	16 Feb 2005 00:43:53 -0000	1.28
@@ -101,7 +101,6 @@
 @define('SHOWS_TOP_EXIT', 'Показывает сайты, куда читатели вашего блога уходили чаще всего');
 @define('SYNDICATION', 'Синхронизация');
 @define('SHOWS_RSS_BLAHBLAH', 'Показывает ссылки на RSS-ленты для аггрегации вашего блога');
-@define('PLUG', 'Реклама');
 @define('ADVERTISES_BLAHBLAH', 'Рекламирует происхождение вашего блога (ссылка на сайт Serendipity)');
 @define('HTML_NUGGET', 'Фрагмент HTML');
 @define('HOLDS_A_BLAHBLAH', 'Добавляет фрагмент HTML кода в вашу боковую панель');
@@ -305,7 +304,6 @@
 @define('DELETE_USER', 'Вы собираетесь удалить пользователя #%d %s. Вы уверены? Эта операция запретит отображение любых добавленных им записей.');
 @define('DELETED_USER', 'Пользователь #%d %s удалён.');
 @define('LIMIT_TO_NUMBER', 'Сколько заметок должно быть показано?');
-@define('FILTER', 'Фильтр');
 @define('ENTRIES_PER_PAGE', 'записей на странице');
 @define('XML_IMAGE_TO_DISPLAY', 'Кпонка XML');
 @define('XML_IMAGE_TO_DISPLAY_DESC', 'Ссылки на XML фиды будут отмечены этим изображением. Оставьте поле пустым для картинки по умолчанию, или введите \'none\' чтобы не показывать кнопки вообще.');
@@ -536,7 +534,6 @@
 @define('EVENT_PLUGIN', 'event-плагин');
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Нажмите здесь чтобы установить новый %s');
 @define('VERSION', 'версия');
-@define('NA', 'N/A');
 @define('INSTALL', 'Установить');
 @define('ALREADY_INSTALLED', 'Уже установлен');
 @define('SELECT_A_PLUGIN_TO_ADD', 'Выберите плагин для добавления');

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- serendipity_lang_de.inc.php	15 Feb 2005 23:58:02 -0000	1.155
+++ serendipity_lang_de.inc.php	16 Feb 2005 00:43:51 -0000	1.156
@@ -98,7 +98,6 @@
 @define('SHOWS_TOP_EXIT', 'Zeigt die Top-Exit-Links des Blogs');
 @define('SYNDICATION', 'Syndication');
 @define('SHOWS_RSS_BLAHBLAH', 'Zeigt die RSS Syndication-Links');
-@define('PLUG', 'Plug');
 @define('ADVERTISES_BLAHBLAH', 'Zeigt einen Hinweis darauf, dass Serendipity als Blog-Software verwendet wird');
 @define('HTML_NUGGET', 'HTML Klotz');
 @define('HOLDS_A_BLAHBLAH', 'Zeigt einen kleinen Klotz HTML Code in einer der Seitenleisten an');
@@ -293,7 +292,6 @@
 @define('DELETE_USER', 'Sie wollen den Benutzer #%d %s löschen. Sind sie sicher? Dadurch werden seine Artikel nicht mehr auf der Oberfläche angezeigt.');
 @define('DELETED_USER', 'Benutzer #%d %s gelöscht.');
 @define('LIMIT_TO_NUMBER', 'Wieviele Elemente sollen angezeigt werden?');
-@define('FILTER', 'Filter');
 @define('ENTRIES_PER_PAGE', 'Artikel pro Seite');
 @define('DIRECTORIES_AVAILABLE', 'In der Liste der verfügbaren Unterverzeichnisse kann durch einen Klick auf einen Verzeichnisnamen ein neuer Ordner unterhalb des gewählten erstellt werden.');
 @define('ALL_DIRECTORIES', 'alle Verzeichnisse');
@@ -535,7 +533,6 @@
 @define('EVENT_PLUGIN', 'Ereignis-Plugin');
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Hier klicken um %s zu installieren');
 @define('VERSION', 'version');
-@define('NA', 'Nicht verfügbar');
 @define('INSTALL', 'Installieren');
 @define('ALREADY_INSTALLED', 'Bereits installiert');
 @define('SELECT_A_PLUGIN_TO_ADD', 'Plugin zur Installation wählen');

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- serendipity_lang_nl.inc.php	15 Feb 2005 23:58:09 -0000	1.90
+++ serendipity_lang_nl.inc.php	16 Feb 2005 00:43:53 -0000	1.91
@@ -103,7 +103,6 @@
 @define('SHOWS_TOP_EXIT', 'Hier worden de, door u geplaatste, links getoond die regelmatig door uw lezers bekeken worden');
 @define('SYNDICATION', 'Syndication');
 @define('SHOWS_RSS_BLAHBLAH', 'Toont de RSS Syndication-Links');
-@define('PLUG', 'Plug');
 @define('ADVERTISES_BLAHBLAH', 'Toont een link waar anderen Serendipity software kunnen downloaden');
 @define('HTML_NUGGET', 'HTML Invoer');
 @define('HOLDS_A_BLAHBLAH', 'Een stukje waarin u uw eigen HTML-tekst kunt schrijven, deze verschijnt aan de zijkant');
@@ -307,7 +306,6 @@
 @define('DELETE_USER', 'U staat op het punt de volgende gebruiker te verwijderen: #%d %s. Weet u zeker dat u deze gebruiker wilt verwijderen? Wanneer u dit doet zullen de inzendingen van deze gebruiker niet meer worden weergegeven.');
 @define('DELETED_USER', 'Gebruiker, #%d %s, is verwijderd.');
 @define('LIMIT_TO_NUMBER', 'Hoeveel items moeten er worden weergegeven?');
-@define('FILTER', 'Filter');
 @define('ENTRIES_PER_PAGE', 'inzendingen per pagina');
 @define('XML_IMAGE_TO_DISPLAY', 'XML Button');
 @define('XML_IMAGE_TO_DISPLAY_DESC','Deze afbeelding laat u uw XML Feeds weergeven. Laat het veld leeg voor de standaard instellingen, voer \'none\' in om het uit te schakellen.');
@@ -538,7 +536,6 @@
 @define('EVENT_PLUGIN', 'evenementen plugin');
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Klik hier om een nieuwe %s te installeren');
 @define('VERSION', 'versie');
-@define('NA', 'Niet beschikbaar');
 @define('INSTALL', 'Installeren');
 @define('ALREADY_INSTALLED', 'Reed geïnstalleerd');
 @define('SELECT_A_PLUGIN_TO_ADD', 'Selecteerd welke plugin u wenst te installeren');

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.66,1.67 serendipity_lang_cn.inc.php,1.33,1.34 serendipity_lang_cs.inc.php,1.113,1.114 serendipity_lang_cz.inc.php,1.113,1.114 serendipity_lang_da.inc.php,1.133,1.134 serendipity_lang_de.inc.php,1.154,1.155 serendipity_lang_en.inc.php,1.135,1.136 serendipity_lang_es.inc.php,1.128,1.129 serendipity_lang_fi.inc.php,1.21,1.22 serendipity_lang_fr.inc.php,1.113,1.114 serendipity_lang_it.inc.php,1.52,1.53 serendipity_lang_ja.inc.php,1.32,1.33 serendipity_lang_ko.inc.php,1.21,1.22 serendipity_lang_nl.inc.php,1.89,1.90 serendipity_lang_no.inc.php,1.53,1.54 serendipity_lang_pt.inc.php,1.88,1.89 serendipity_lang_ru.inc.php,1.26,1.27 serendipity_lang_tn.inc.php,1.34,1.35 serendipity_lang_tw.inc.php,1.49,1.50 serendipity_lang_zh.inc.php,1.33,1.34

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29528/lang

Modified Files:
	serendipity_lang_bg.inc.php serendipity_lang_cn.inc.php 
	serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php 
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
	serendipity_lang_fi.inc.php serendipity_lang_fr.inc.php 
	serendipity_lang_it.inc.php serendipity_lang_ja.inc.php 
	serendipity_lang_ko.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_no.inc.php serendipity_lang_pt.inc.php 
	serendipity_lang_ru.inc.php serendipity_lang_tn.inc.php 
	serendipity_lang_tw.inc.php serendipity_lang_zh.inc.php 
Log Message:
- Run of 'famous translation cleanup script'


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- serendipity_lang_cs.inc.php	15 Feb 2005 11:25:34 -0000	1.113
+++ serendipity_lang_cs.inc.php	15 Feb 2005 23:57:57 -0000	1.114
@@ -21,7 +21,6 @@
 @define('MANAGE_STYLES', 'Zmìna stylu');
 @define('CONFIGURE_PLUGINS', 'Konfigurace pluginù');
 @define('CONFIGURATION', 'Konfigurace');
-@define('IMPORT_EXPORT_ENTRIES', 'Import/export záznamù');
 @define('BACK_TO_BLOG', 'Zpìt do weblogu');
 @define('LOGIN', 'Pøihlášení');
 @define('LOGOUT', 'Odhlášení');
@@ -29,7 +28,6 @@
 @define('CREATE', 'Vytvoøit');
 @define('SAVE', 'Uložit');
 @define('NAME', 'Jméno');
-@define('CLICK_CAT_TO_EDIT', 'Zvolte kategorii pro editaci ');
 @define('CREATE_NEW_CAT', 'Vytvoøení nové kategorie');
 @define('I_WANT_THUMB', 'Použít náhled.');
 @define('I_WANT_BIG_IMAGE', 'Použít celý obrázek.');
@@ -38,16 +36,12 @@
 @define('BACK', 'Zpìt');
 @define('FORWARD', 'Dále');
 @define('ANONYMOUS', 'Anonym');
-@define('LINK_TO_COMMENT', 'Odkaz na komentáø è.');
-@define('SEND_MAIL_TO', 'Poslat mail');
 @define('NEW_TRACKBACK_TO', 'Nová odezva na');
 @define('NEW_COMMENT_TO', 'Nový komentáø k');
 @define('RECENT', 'Nové...');
 @define('OLDER', 'Starší...');
 @define('DONE', 'Hotovo');
 @define('WELCOME_BACK', 'Vítejte zpìt,');
-@define('RUNNING', 'Serendipity v.');
-@define('ADD_PLUGIN', 'Pøidat plugin');
 @define('TITLE', 'Titulek');
 @define('DESCRIPTION', 'Popis');
 @define('PLACEMENT', 'Umístìní');
@@ -57,15 +51,11 @@
 @define('DOWN', 'Dolù');
 @define('ENTRIES', 'záznamy');
 @define('NEW_ENTRY', 'Nový záznam');
-@define('AUTHOR_SUITE', 'Autorská sekce');
 @define('EDIT_ENTRIES', 'Editovat záznamy');
 @define('CATEGORIES', 'Kategorie');
-@define('EDIT_CATEGORIES', 'Editace kategorií');
 @define('WARNING_THIS_BLAHBLAH', "POZOR:\\nTato akce mùže trvat déle pokud máte mnoho obrázkù bez náhledù.");
 @define('CREATE_THUMBS', 'Vytvoøit náhledy');
 @define('MANAGE_IMAGES', 'Správa obrázkù');
-@define('ADMIN_INTERFACE', 'Admin. rozhraní');
-@define('SERENDIPITY_AUTHORING_SUITE', 'Autorská sekce');
 @define('NAME', 'Jméno');
 @define('EMAIL', 'Email');
 @define('HOMEPAGE', 'Domácí stránka');
@@ -175,9 +165,7 @@
 @define('INVALID_CATEGORY', 'Žádná kategorie nebyla urèena k vymazání');
 @define('CATEGORY_SAVED', 'Kategorie uložena');
 @define('SELECT_TEMPLATE', 'Vyberte vzor pro Vᚠweblog');
-@define('ENTRIES_SUCCESSFULLY_INSERTED', 'Záznamy byly vloženy úspìšnì!');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Záznamy nebyly vloženy úspìšnì!');
-@define('VIEW_FEED_EXPORT', 'Ukázat export');
 @define('YES', 'Ano');
 @define('NO', 'Ne');
 @define('USE_DEFAULT', 'Default');
@@ -195,9 +183,7 @@
 @define('SERENDIPITY_NOT_INSTALLED', 'Serendipity ještì není nainstalován. <a href="%s">Instalujte</a> jej nyní.');
 @define('INCLUDE_ERROR', 'chyba serendipity: nelze vložit %s - ukonèeno.');
 @define('DATABASE_ERROR', 'chyba serendipity: nelze se spojit s databází - ukonèeno.');
-@define('ATTEMPT_SETUP_DATABASE', 'Pokus o nastavení databáze...');
 @define('CREATE_DATABASE', 'Vytvoøení základní databáze...');
-@define('DATABASE_DONE', 'Dokonèeno vytvoøení databáze');
 @define('ATTEMPT_WRITE_FILE', 'Pokus uložit soubor %s...');
 @define('WRITTEN_N_SAVED', 'Konfigurace byla zapsána a uložena');
 @define('IMAGE_ALIGNMENT', 'Úprava obrázku');
@@ -225,7 +211,6 @@
 @define('SUBSCRIPTION_MAIL', "Pozor %s,\n\nA právì byl pøidán nový komentáø k záznamu, který sledujete na \"%s\", s názvem \"%s\"\nJméno odesílatele: %s\n\nZáznam najdete zde: %s\n\nMùžete se odhlásit zde: %s\n");
 @define('SUBSCRIPTION_TRACKBACK_MAIL', "Pozor %s,\n\nA právì byla pøidána nová odezva k záznamu, který sledujete na \"%s\", s názvem \"%s\"\nJméno odesílatele: %s\n\nZáznam najdete zde: %s\n\nMùžete se odhlásit zde: %s\n");
 @define('SIGNATURE', "\n-- \n%s je vytvoøen pomocí Serendipity.\n Tento perfektní blogovací systém mùžete zdarma používat také.\nNavštivte <http://s9y.org>, kde se dozvíte vše potøebné.");
-@define('DATABASE_ALREADY_INSTALLED', 'VYNECHÁNO: Databáze je už nainstalována');
 @define('SYNDICATION_PLUGIN_091', 'Kanál RSS 0.91');
 @define('SYNDICATION_PLUGIN_20', 'Kanál RSS 2.0');
 @define('SYNDICATION_PLUGIN_10', 'Kanál RSS 1.0');
@@ -282,8 +267,6 @@
 @define('SORT_ORDER_DESC', 'Sestupnì');
 @define('THUMBNAIL_SHORT', 'Náhl.');
 @define('ORIGINAL_SHORT', 'Orig.');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Zabránit kešování HTTP');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'Nastavení "true" zpùsobí, že odkazy na vᚠkanál RSS neumožní klientùm šetøit pøenášené pásmo. Je doporuèeno nastavit "false".');
 @define('APPLY_MARKUP_TO', 'Zapnout znaèkování %s');
 @define('CALENDAR_BEGINNING_OF_WEEK', 'Zaèátek týdne');
 @define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity detekoval, že vaše konfigurace je uložena ve verzi %s, ale serendipity je instalován jako verze %s, je potøeba upgrade! <a href="%s">Kliknìte zde</a>');
@@ -303,8 +286,6 @@
 @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Vaše instalace Serendipity je upgradována na %s');
 @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Kliknutím %ssem%s se vrátíte do vašeho weblogu');
 @define('MANAGE_USERS', 'Správa uživatelù');
-@define('EDIT_USERS', 'Editovat uživatele');
-@define('CREATE_USERS', 'Vytvoøit uživatele');
 @define('CREATE_NEW_USER', 'Vytvoøit nového uživatele');
 @define('CREATE_NOT_AUTHORIZED', 'Nemùžete editovat uživatele se stejnou úrovní jako je vaše');
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'Nemùžete vytvoøit uživatele s vyšší úrovní než je vaše');
@@ -320,7 +301,6 @@
 @define('ALL_DIRECTORIES', 'všechny adresáøe');
 @define('MANAGE_DIRECTORIES', 'Práce s adresáøi');
 @define('DIRECTORY_CREATED', 'Adresáø <strong>%s</strong> byl vytvoøen.');
-@define('NEW_DIRECTORY', 'Vytvoøit nový adresáø');
 @define('PARENT_DIRECTORY', 'Základní adresáø');
 @define('CONFIRM_DELETE_DIRECTORY', 'Jste si jist, že chcete odstranit všechen obsah adresáøe %s?');
 @define('ERROR_NO_DIRECTORY', 'Chyba: Adresáø %s neexistuje');
@@ -434,7 +414,6 @@
 
 @define('ALREADY_SUBCATEGORY', '%s je opravdu subkategorie pod %s.');
 @define('PARENT_CATEGORY', 'Nadøazená kategorie');
-@define('REPLY', 'Odpovìï');
 @define('IN_REPLY_TO', 'Odpovìï na');
 @define('TOP_LEVEL', 'Nejvyšší úroveò');
 @define('XML_IMAGE_TO_DISPLAY', 'Znak XML');
@@ -453,7 +432,6 @@
 @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Pouze v popisu');
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'V obojím');
 
-@define('RSS_IMPORT_DESC', 'Import RSS stáhne RSS kanál a vloží všechny zde obsažené záznamy do seznamu Vašich záznamù. Mùžete zvolit import konceptù nebo k publikaci. Kategorie cizích záznamù musí být pojmenovány pøesnì tak, jako Vaše kategorie v serendipity. V dalším vstupním boxu mùžete urèit kategorii pro záznamy, které neodpovídají dosud importovaným.');
 @define('RSS_IMPORT_CATEGORY', 'Použít tuto kategorii pro neurèené záznamy');
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Neznámá chyba, soubor nebyl nahrán. Je možné, že délka souboru pøekraèuje maximum, povolené serverem. Spojte se s vaším ISP nebo editujte soubor php.ini a povolte vìtší velikost.');
 @define('COMMENTS_WILL_BE_MODERATED', 'Odeslané komentáøe budou pøed uveøejnìním moderovány.');
@@ -534,12 +512,8 @@
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Èekající na povolení');
 @define('RSS_IMPORT_BODYONLY', 'Uložit celý importovaný text do "hlavní" èásti, nerozdìlovat do "rozšíøené" èásti.');
 @define('SYNDICATION_PLUGIN_FULLFEED', 'Zobrazit celé èlánky vèetnì rozšíøené èásti v RSS kanálu');
-@define('MAX_COMPAT_OLD_BLOG', 'Zajistit maximální kompatibilitu se starým blogem, prosím...');
-@define('IMPORT_AGAIN_FORCE', 'Zkuste to znovu. Variantnì mùžete zvolit \'Vnutit\' pro vložení záznamù do existující architektury.');
 @define('MT_DATA_FILE', 'Soubory Movable Type');
 @define('FORCE', 'Vnutit');
-@define('WORDPRESS_DATA', 'Data WordPress');
-@define('MUST_BE_ADMIN', 'Pro provedení této akce musíte být administrátor.');
 @define('CREATE_AUTHOR', 'Vytvoøit autora \'%s\'.');
 @define('CREATE_CATEGORY', 'Vytvoøit kategorii \'%s\'.');
 @define('MYSQL_REQUIRED', 'Pro provedení této akce je nutné mít databázi MySQL.');
@@ -561,7 +535,6 @@
 @define('SIDEBAR_PLUGIN', 'postranní plugin');
 @define('EVENT_PLUGIN', 'plugin události');
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Kliknìte a instalujte nový %s');
-@define('UNKNOWN', 'Neznámý/á');
 @define('VERSION', 'verze');
 @define('NA', 'N/A');
 @define('INSTALL', 'Instalovat');

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- serendipity_lang_no.inc.php	15 Feb 2005 11:25:37 -0000	1.53
+++ serendipity_lang_no.inc.php	15 Feb 2005 23:58:10 -0000	1.54
@@ -17,7 +17,6 @@
 @define('MANAGE_STYLES', 'Administrer temaer');
 @define('CONFIGURE_PLUGINS', 'Konfigurerer plugins');
 @define('CONFIGURATION', 'Konfigurasjon');
-@define('IMPORT_EXPORT_ENTRIES', 'Importer/eksporter artikler');
 @define('BACK_TO_BLOG', 'Tilbake til weblogg');
 @define('LOGIN', 'Logg inn');
 @define('LOGOUT', 'Logg ut');
@@ -25,7 +24,6 @@
 @define('CREATE', 'Opprett');
 @define('SAVE', 'Lagre');
 @define('NAME', 'Navn');
-@define('CLICK_CAT_TO_EDIT', 'Klik på en kategori for å redigere den');
 @define('CREATE_NEW_CAT', 'Oppret ny kategori');
 @define('I_WANT_THUMB', 'Jeg vil bruke minibildet i min artikkel.');
 @define('I_WANT_BIG_IMAGE', 'Jeg vil bruke det originale bildet i min artikkel.');
@@ -34,16 +32,12 @@
 @define('BACK', 'Tilbake');
 @define('FORWARD', 'Frem');
 @define('ANONYMOUS', 'Anonym');
-@define('LINK_TO_COMMENT', 'Link til kommentar #');
-@define('SEND_MAIL_TO', 'Send en mail til');
 @define('NEW_TRACKBACK_TO', 'Ny trackback opprettet til');
 @define('NEW_COMMENT_TO', 'Ny kommentar opprettet til');
 @define('RECENT', 'Nyere...');
 @define('OLDER', 'Eldre...');
 @define('DONE', 'Ferdig');
 @define('WELCOME_BACK', 'Velkommen tilbake,');
-@define('RUNNING', 'Du benytter Serendipity v.');
-@define('ADD_PLUGIN', 'Legg til plugin');
 @define('TITLE', 'Tittel');
 @define('DESCRIPTION', 'Beskrivelse');
 @define('PLACEMENT', 'Plassering');
@@ -52,15 +46,11 @@
 @define('DOWN', 'NED');
 @define('ENTRIES', 'artikler');
 @define('NEW_ENTRY', 'Ny artikkel');
-@define('AUTHOR_SUITE', 'Redaktørsuite');
 @define('EDIT_ENTRIES', 'Rediger artikler');
 @define('CATEGORIES', 'Kategorier');
-@define('EDIT_CATEGORIES', 'Administrer kategorier');
 @define('WARNING_THIS_BLAHBLAH', "ADVARSEL:\\nDette kan ta lang tid hvis det er mange bilder uten minibilder.");
 @define('CREATE_THUMBS', 'Lag minibilder på nytt');
 @define('MANAGE_IMAGES', 'Administrer bilder');
-@define('ADMIN_INTERFACE', 'Admin-interface');
-@define('SERENDIPITY_AUTHORING_SUITE', 'Serendipity Redaktørsuite');
 @define('NAME', 'Navn');
 @define('EMAIL', 'Email');
 @define('HOMEPAGE', 'Hjemmeside');
@@ -169,9 +159,7 @@
 @define('INVALID_CATEGORY', 'Ingen kategori ble valgt for sletting');
 @define('CATEGORY_SAVED', 'Kategori lagret');
 @define('SELECT_TEMPLATE', 'Velg den malen du ønsker å bruke til din blog');
-@define('ENTRIES_SUCCESSFULLY_INSERTED', 'Artikler innsatt uten problemer!');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Det var problemer under indsettelsen av artiklene!');
-@define('VIEW_FEED_EXPORT', 'Vis eksportert feed');
 @define('YES', 'Ja');
 @define('NO', 'Nei');
 @define('USE_DEFAULT', 'Default');
@@ -189,9 +177,7 @@
 @define('SERENDIPITY_NOT_INSTALLED', 'Serendipity er ennå ikke installert. Klikk <a href="%s">her for å installere</a> nå.');
 @define('INCLUDE_ERROR', 'serendipityfejl: Kunne ikke inkludere %s - Avbryter.');
 @define('DATABASE_ERROR', 'serendipityfejl: Kunne ikke oprette forbindelse til databasen - Avbryter.');
-@define('ATTEMPT_SETUP_DATABASE', 'Forsøker å sette opp databasen...');
 @define('CREATE_DATABASE', 'Oppretter standarddatabase-setup...');
-@define('DATABASE_DONE', 'Ferdig med å sette opp database');
 @define('ATTEMPT_WRITE_FILE', 'Forsøker å skrive til %s ...');
 @define('WRITTEN_N_SAVED', 'Konfigurasjon skrevet &amp; lagret');
 @define('IMAGE_ALIGNMENT', 'Bildejustering');
@@ -219,7 +205,6 @@
 @define('SUBSCRIPTION_MAIL', "Hej %s,\n\nEn ny kommentar er blitt lagt til en artikkel du abonnerer på hos \"%s\", ved navn \"%s\"\nNavnet på skribenten er: %s\n\nDu kan finne artikkelen her: %s\n\nDu kan stoppe ditt abonnement ved å klikke på denne linken: %s\n");
 @define('SUBSCRIPTION_TRACKBACK_MAIL', "Hei %s,\n\nEn ny trackback er laget til en artikkel du abonnerer på hos \"%s\", ved navn \"%s\"\nNavnet på skribenten er: %s\n\nDu kan finne artiklen her: %s\n\nDu kan stoppe ditt abonnement ved å klikke på denne linken: %s\n");
 @define('SIGNATURE', "\n-- \n%s bruker Serendipity.\nDen bedste blogg på dette, du kan også bruke det.\nKikk nærmere på <http://s9y.org> for å finne mere informasjon.");
-@define('DATABASE_ALREADY_INSTALLED', 'IGNORERE: Database er allerede installert');
 @define('SYNDICATION_PLUGIN_091', 'RSS 0.91-feed');
 @define('SYNDICATION_PLUGIN_10', 'RSS 1.0-feed');
 @define('SYNDICATION_PLUGIN_20', 'RSS 2.0-feed');
@@ -275,8 +260,6 @@
 @define('THUMBNAIL_SHORT', 'Mini');
 @define('ORIGINAL_SHORT', 'Orig.');
 @define('APPLY_MARKUP_TO', 'Formater %s');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Forhindrer HTTP-caching');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'Hvis satt til "true" vil dette befale RSS-feeden din om å ikke tillate klienter å cache feeden. Det anbefales å sette dette til "false".');
 @define('CALENDAR_BEGINNING_OF_WEEK', 'Starten på uken');
 @define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity har opdaget at din nåværende konfigurasjon passer til versjon %s. Serendipity selv er installert som version %s, Det er nødvendig å oppgradere! <a href="%s">Klikk her!</a>');
 @define('SERENDIPITY_UPGRADER_WELCOME', 'Velkommen til Serendipitys oppgraderingsscript.');
@@ -295,8 +278,6 @@
 @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Din Serendipity-installation er nå oppgradert til version %s');
 @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Du kan vende tilbake til din blog ved å klikke %sher%s');
 @define('MANAGE_USERS', 'Håndter brukere');
-@define('EDIT_USERS', 'Rediger brukere');
-@define('CREATE_USERS', 'Opprett brukere');
 @define('CREATE_NEW_USER', 'Opprett ny bruker');
 @define('CREATE_NOT_AUTHORIZED', 'Du kan ikke redigere brukere med det samme brukernivå som deg selv');
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'Du kan ikke opprette brukere med et høyere brukernivå enn deg selv');
@@ -416,7 +397,6 @@
 @define('ALL_DIRECTORIES', 'alle mapper');
 @define('MANAGE_DIRECTORIES', 'Håndter mapper');
 @define('DIRECTORY_CREATED', 'Mappen <strong>%s</strong> er oprettet.');
-@define('NEW_DIRECTORY', 'Opprett ny mappe');
 @define('PARENT_DIRECTORY', 'Hovedmappe');
 @define('CONFIRM_DELETE_DIRECTORY', 'Er du sikker på du vil slette alt indholdet i mappen %s?');
 @define('ERROR_NO_DIRECTORY', 'Feil: Mappen %s eksisterer ikke');
@@ -430,7 +410,6 @@
 @define('FOUND_FILE', 'Fant ny/endret fil: %s.');
 @define('ALREADY_SUBCATEGORY', '%s er allerede en underkategori av %s.');
 @define('PARENT_CATEGORY', 'Hovedkategori');
-@define('REPLY', 'Besvar');
 @define('IN_REPLY_TO', 'Som svar på');
 @define('TOP_LEVEL', 'Topnivå');
 @define('XML_IMAGE_TO_DISPLAY', 'XML-knapp');
@@ -448,7 +427,6 @@
 @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Kun udvidet artikkel');
 @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Kun i oversikten');
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'Hele tiden');
-@define('RSS_IMPORT_DESC', 'RSS-import vil hente en RSS-feed og sette inn alle artiklene i denne i ditt arkiv. Du kan velge om du vil importere disse med UTKAST eller PUBLISER status. Kategorier i den fremmede feeden skal inneholde nøyaktig det samme navnet som de navn du har tastet inn i Serendipity. Via det andre feltet kan du velge hvilken kategori du vil plassere artikler som ikke matcher kategorier i den importerete feeden.');
 @define('RSS_IMPORT_CATEGORY', 'Bruk denne kategorien for kategoriløse artikler');
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Det oppstod en ukjent feil, filen ble ikke lastet opp. Kanskje er din filstørrelse større end den maksimale størrelse tillatt av ditt serveroppsett. Spør din webtilbyder eller rediger din php.ini fil for å tillate uploads av større filer.');
 @define('COMMENTS_WILL_BE_MODERATED', 'Kommentarer på denne artikkelen vil først bli vist når de er blitt godkjendt.');
@@ -533,12 +511,8 @@
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
 @define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // Translate
-@define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...'); // Translate
-@define('IMPORT_AGAIN_FORCE', 'Then try again. Alternatively, you may check the \'force\' box, which will force the entries into the existing architecture.'); // Translate
 @define('MT_DATA_FILE', 'Movable Type data file'); // Translate
 @define('FORCE', 'Force'); // Translate
-@define('WORDPRESS_DATA', 'WordPress data'); // Translate
-@define('MUST_BE_ADMIN', 'You must be an administrator to complete this action.'); // Translate
 @define('CREATE_AUTHOR', 'Create author \'%s\'.'); // Translate
 @define('CREATE_CATEGORY', 'Create category \'%s\'.'); // Translate
 @define('MYSQL_REQUIRED', 'You must have the MySQL extension in order to perform this action.'); // Translate
@@ -560,7 +534,6 @@
 @define('SIDEBAR_PLUGIN', 'sidebar plugin'); // Translate
 @define('EVENT_PLUGIN', 'event plugin'); // Translate
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s'); // Translate
-@define('UNKNOWN', 'Unknown'); // Translate
 @define('VERSION', 'version'); // Translate
 @define('NA', 'N/A'); // Translate
 @define('INSTALL', 'Install'); // Translate

Index: serendipity_lang_zh.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_zh.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- serendipity_lang_zh.inc.php	15 Feb 2005 11:25:38 -0000	1.33
+++ serendipity_lang_zh.inc.php	15 Feb 2005 23:58:23 -0000	1.34
@@ -19,7 +19,6 @@
 @define('MANAGE_STYLES', '²¼¾°¹ÜÀí');
 @define('CONFIGURE_PLUGINS', 'É趨Íâ¹Ò');
 @define('CONFIGURATION', '¹ÜÀíÉ趨');
-@define('IMPORT_EXPORT_ENTRIES', 'ÊäÈë/Êä³ö ÎÄÕÂ');
 @define('BACK_TO_BLOG', '»Øµ½ÈÕ¼ÇÊ×Ò³');
 @define('LOGIN', 'µÇÈë');
 @define('LOGOUT', 'µÇ³ö');
@@ -27,7 +26,6 @@
 @define('CREATE', '½¨Á¢');
 @define('SAVE', '´¢´æ');
 @define('NAME', 'Ãû³Æ');
-@define('CLICK_CAT_TO_EDIT', 'µãÀà±ð½øÐб༭');
 @define('CREATE_NEW_CAT', 'ÐÂÔöÀà±ð');
 @define('I_WANT_THUMB', 'ÎÒÒªÔÚÎÄÕÂÄÚʹÓÃËõͼ.');
 @define('I_WANT_BIG_IMAGE', 'ÎÒÒªÔÚÎÄÕÂÄÚʹÓôóÐÍͼƬ.');
@@ -36,16 +34,12 @@
 @define('BACK', '·µ»Ø');
 @define('FORWARD', 'Ç°½ø');
 @define('ANONYMOUS', 'ÄäÃû');
-@define('LINK_TO_COMMENT', 'Á¬½áµ½»ØÏì #');
-@define('SEND_MAIL_TO', '¼ÄËÍÓʼþµ½');
 @define('NEW_TRACKBACK_TO', 'еÄÒýÓõ½');
 @define('NEW_COMMENT_TO', 'еĻØÏìµ½');
 @define('RECENT', 'ÐÂÎÄ¿â...');
 @define('OLDER', '¾ÉÎÄ¿â...');
 @define('DONE', 'Íê³É');
 @define('WELCOME_BACK', '»¶Ó­»ØÀ´,');
-@define('RUNNING', 'ÄúʹÓÃµÄ Serendipity °æ±¾ÊÇ v.');
-@define('ADD_PLUGIN', '¼ÓÈëÍâ¹Ò');
 @define('TITLE', '±êÌâ');
 @define('DESCRIPTION', '¼ò½é');
 @define('PLACEMENT', 'λַ');
@@ -55,15 +49,11 @@
 @define('DOWN', 'ÏÂ');
 @define('ENTRIES', 'ÎÄÕÂ');
 @define('NEW_ENTRY', 'ÐÂÔöÎÄÕÂ');
-@define('AUTHOR_SUITE', '׫дÌ×¼þ');
 @define('EDIT_ENTRIES', '±à¼­ÎÄÕÂ');
 @define('CATEGORIES', 'Àà±ð');
-@define('EDIT_CATEGORIES', '¹ÜÀíÀà±ð');
 @define('WARNING_THIS_BLAHBLAH', "¾¯¸æ:\\nÕâ¸ö¿ÉÄÜÐèÒª³¤Ê±¼äÈç¹ûÓкܶ಻ÊÇËõͼµÄͼƬ.");
 @define('CREATE_THUMBS', 'Öؽ¨Ëõͼ');
 @define('MANAGE_IMAGES', '¹ÜÀíͼƬ');
-@define('ADMIN_INTERFACE', '¹ÜÀíÌ×¼þ');
-@define('SERENDIPITY_AUTHORING_SUITE', 'Serendipity ׫дÌ×¼þ');
 @define('NAME', 'Ãû³Æ');
 @define('EMAIL', 'Email');
 @define('HOMEPAGE', 'ÍøÖ·');
@@ -173,15 +163,9 @@
 @define('INVALID_CATEGORY', 'ûÓÐÌṩɾ³ýµÄÀà±ð');
 @define('CATEGORY_SAVED', 'Àà±ðÒÑ´¢´æ');
 @define('SELECT_TEMPLATE', 'ÇëÑ¡ÔñÍø·ÈռǵIJ¼¾°');
-@define('ENTRIES_SUCCESSFULLY_INSERTED', 'Íê³ÉÔöÈëÎÄÕÂ!');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'ûÓÐÍê³ÉÔöÈëÎÄÕÂ!');
-@define('VIEW_FEED_EXPORT', 'ä¯ÀÀÊä³ö');
-@define('MAX_COMPAT_OLD_BLOG', 'ΪÁËÄܹ»ºÍÄúµÄ¾ÉÈÕ¼ÇÓÐ×î´óµÄÏàÈÝÐÔ, Çë...');
-@define('IMPORT_AGAIN_FORCE', 'È»ºóÔÚÊÔÒ»´Î. »òÕßÄú¿ÉÒÔ¹´Ñ¡ \'Ç¿ÖÆ\' À¸Î», Ëü»áÇ¿Öƽ«ÄúµÄÎÄÕÂÊäÈëµ½ÏÖÓеļܹ¹.');
 @define('MT_DATA_FILE', 'Movable Type ×ÊÁϵµ');
 @define('FORCE', 'Ç¿ÖÆ');
-@define('WORDPRESS_DATA', 'WordPress ×ÊÁÏ');
-@define('MUST_BE_ADMIN', 'Äú±ØÐëÊǹÜÀíÔ±²ÅÄÜÖ´ÐÐÕâ¸ö¶¯×÷.');
 @define('CREATE_AUTHOR', 'ÐÂÔö×÷Õß \'%s\'.');
 @define('CREATE_CATEGORY', 'ÐÂÔöÀà±ð \'%s\'.');
 @define('MYSQL_REQUIRED', 'Äú±ØÐëÒªÓÐ MySQL µÄÀ©³ä¹¦ÄܲÅÄÜÖ´ÐÐÕâ¸ö¶¯×÷.');
@@ -208,10 +192,8 @@
 @define('SERENDIPITY_NOT_INSTALLED', 'Serendipity »¹Ã»°²×°Íê³É. Çë°´ <a href="%s">°²×°</a>.');
 @define('INCLUDE_ERROR', 'serendipity ´íÎó: ÎÞ·¨°üÀ¨ %s - Í˳ö.');
 @define('DATABASE_ERROR', 'serendipity ´íÎó: ÎÞ·¨Á¬½áµ½×ÊÁÏ¿â - Í˳ö.');
-@define('ATTEMPT_SETUP_DATABASE', '½øÐÐ×ÊÁÏ¿âÉ趨...');
 @define('CHECK_DATABASE_EXISTS', '¼ì²é×ÊÁÏ¿âÊÇ·ñ´æÔÚ. Èç¹ûÄú¿´µ½×ÊÁÏ¿â²éѯ´íÎó, Çë²»ÓùÜËü...');
 @define('CREATE_DATABASE', '½¨Á¢Ô¤Éè×ÊÁÏ¿âÉ趨...');
-@define('DATABASE_DONE', '×ÊÁϿ⽨Á¢Íê³É');
 @define('ATTEMPT_WRITE_FILE', '¶Áд %s µµ°¸...');
 @define('SERENDIPITY_INSTALLED', '%sSerendipity ÒÑ°²×°Íê³É.%s Çë¼ÇµÃÄúµÄÃÜÂë: "%s", ÄúµÄÕʺÅÊÇ "%s".%sÄúÏÖÔÚ¿ÉÒÔµ½Ð½¨Á¢µÄ <a href="%s">Íø·ÈÕ¼Ç</a>');
 @define('WRITTEN_N_SAVED', '´¢´æÍê±Ï');
@@ -238,7 +220,6 @@
 @define('SUBSCRIPTION_MAIL', "ÄúºÃ %s,\n\nÄú¶©ÔĵÄÎÄÕÂÓÐÁËеĻØÏìÔÚ \"%s\", ±êÌâÊÇ \"%s\"\n»ØÏìµÄ·¢±íÕßÊÇ: %s\n\nÄú¿ÉÒÔÔÚÕâÕÒµ½´ËÎÄÕÂ: %s\n\nÄú¿ÉÒÔµãÕâ¸öÁ¬½áÈ¡Ïû¶©ÔÄ: %s\n");
 @define('SUBSCRIPTION_TRACKBACK_MAIL', "ÄúºÃ %s,\n\nÄú¶©ÔĵÄÎÄÕÂÓÐÁËеÄÒýÓÃÔÚ \"%s\", ±êÌâÊÇ \"%s\"\nÒýÓõÄ×÷ÕßÊÇ: %s\n\nÄú¿ÉÒÔÔÚÕâÕÒµ½´ËÎÄÕÂ: %s\n\nÄú¿ÉÒÔµãÕâ¸öÁ¬½áÈ¡Ïû¶©ÔÄ: %s\n");
 @define('SIGNATURE', "\n-- \n%s is powered by Serendipity.\nThe best blog around, you can use it too.\nCheck out <http://s9y.org> to find out how.");
-@define('DATABASE_ALREADY_INSTALLED', 'ÂÔ¹ý: ×ÊÁÏ¿âÒÑ°²×°');
 @define('SYNDICATION_PLUGIN_091', 'RSS 0.91 feed');
 @define('SYNDICATION_PLUGIN_10', 'RSS 1.0 feed');
 @define('SYNDICATION_PLUGIN_20', 'RSS 2.0 feed');
@@ -294,8 +275,6 @@
 @define('SORT_ORDER_DESC', 'µÝ¼õÅÅÐò');
 @define('THUMBNAIL_SHORT', 'Ëõͼ');
 @define('ORIGINAL_SHORT', 'ԭʼ');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE', '±ÜÃâ HTTP ¿ìÈ¡¼ÇÒä');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'Èç¹ûÉ趨 "ÊÇ", ÄúµÄ RSS feed É趨½«»á±ä³É²»°üÀ¨¼õÉÙ¿íƵµÄ¿ìÈ¡¼ÇÒä. ½¨ÒéÄú×îºÃÉ趨Ϊ "·ñ", ÕâÑù¿Í»§¶Ë²Å¿ÉÒÔʹÓÿìÈ¡¼ÇÒäµÄºÃ´¦.');
 @define('APPLY_MARKUP_TO', 'Ì×Óñê¼Çµ½ %s');
 @define('CALENDAR_BEGINNING_OF_WEEK', 'Ò»ÖܵĵÚÒ»Ìì');
 @define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity Õì²âµ½ÄúµÄÅäÖð汾ÊÇ %s, µ«ÊÇ Serendipity ±¾ÉíµÄ°²×°°æ±¾ÊÇ %s, Çë¸üÐÂÄúµÄ³Ìʽ°æ±¾! <a href="%s">¸üÐÂ</a>');
@@ -315,8 +294,6 @@
 @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'ÄúµÄ Serendipity ÒÔ¸üÐÂÖÁ°æ±¾ %s');
 @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Äú¿ÉÒÔµã %sÕâÀï%s ·µ»ØÈÕ¼ÇÊ×Ò³');
 @define('MANAGE_USERS', '¹ÜÀí×÷Õß');
-@define('EDIT_USERS', '±à¼­×÷Õß');
-@define('CREATE_USERS', 'ÐÂÔö×÷Õß');
 @define('CREATE_NEW_USER', 'ÐÂÔö×÷Õß');
 @define('CREATE_NOT_AUTHORIZED', 'Äú²»ÄÜÐ޸ĸúÄúÏàͬȨÏÞµÄ×÷Õß');
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'Äú²»ÄÜÐÂÔö±ÈÄú¸ßȨÏÞµÄ×÷Õß');
@@ -335,7 +312,6 @@
 @define('ALL_DIRECTORIES', 'È«²¿Ä¿ÂÌ');
 @define('MANAGE_DIRECTORIES', '¹ÜÀíĿ¼');
 @define('DIRECTORY_CREATED', 'Ŀ¼ <strong>%s</strong> ÒѾ­ÐÂÔö.');
-@define('NEW_DIRECTORY', '½¨Á¢ÐÂĿ¼');
 @define('PARENT_DIRECTORY', 'ĸĿ¼');
 @define('CONFIRM_DELETE_DIRECTORY', 'È·¶¨ÒªÉ¾³ýÕâ¸öĿ¼ÄÚµÄÈ«²¿ÄÚÈÝÂð %s?');
 @define('ERROR_NO_DIRECTORY', '´íÎó: Ŀ¼ %s ²»´æÔÚ');
@@ -349,7 +325,6 @@
 @define('FOUND_FILE', 'ÕÒµ½ ÐÂ/ÐÞ¸Ä ¹ýµÄµµ°¸: %s.');
 @define('ALREADY_SUBCATEGORY', '%s ÒѾ­ÊÇ´ËÀà±ðµÄ×ÓÀà±ð %s.');
 @define('PARENT_CATEGORY', 'ĸÀà±ð');
-@define('REPLY', '»Ø¸²');
 @define('IN_REPLY_TO', '»Ø¸²µ½');
 @define('TOP_LEVEL', '×î¸ß²ã');
 @define('SYNDICATION_PLUGIN_GENERIC_FEED', '%s feed');
@@ -557,13 +532,11 @@
 @define('SIDEBAR_PLUGIN', '²àÁÐÍâ¹Ò');
 @define('EVENT_PLUGIN', 'ʼþÍâ¹Ò');
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'µãÕâÀﰲװР%s');
-@define('UNKNOWN', 'δ֪');
 @define('VERSION', '°æ±¾');
 @define('NA', 'N/A');
 @define('INSTALL', '°²×°');
 @define('ALREADY_INSTALLED', 'ÒѾ­°²×°');
 @define('SELECT_A_PLUGIN_TO_ADD', 'ÇëÑ¡ÔñÒª°²×°µÄÍâ¹Ò');
-@define('RSS_IMPORT_DESC', 'RSS µÄÊäÈ빦ÄÜ¿ÉÒÔÈÃÄúߢȡ RSS feed ºÍÊäÈëËùÓеÄÎÄÕÂ. Äú¿ÉÒÔÑ¡ÔñÓòݸå»ò¹«¿ªµÄ·½Ê½ÊäÈë. ÍâÀ´ feed µÄÀà±ðÃû³Æ±ØÐë¸úÄúµÄ Serendipity Àà±ðÃû³ÆÏàͬ. Èç¹ûÀà±ðÃû³Æ²»Ïàͬ, Äú¿ÉÒÔÓÃÆäËûÀ¸Î»Ñ¡ÔñÄúÒªÁ¬½áÎÄÕµÄÀà±ð.');
 @define('RSS_IMPORT_CATEGORY', 'ÓÃÕâ¸öÀà±ð¸ø²»ÏàͬµÄÊäÈëÎÄÕÂ');
 
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- serendipity_lang_en.inc.php	15 Feb 2005 11:25:35 -0000	1.135
+++ serendipity_lang_en.inc.php	15 Feb 2005 23:58:03 -0000	1.136
@@ -19,7 +19,6 @@
 @define('MANAGE_STYLES', 'Manage styles');
 @define('CONFIGURE_PLUGINS', 'Configure Plugins');
 @define('CONFIGURATION', 'Configuration');
-@define('IMPORT_EXPORT_ENTRIES', 'Import/Export Entries');
 @define('BACK_TO_BLOG', 'Back to Weblog');
 @define('LOGIN', 'Login');
 @define('LOGOUT', 'Logout');
@@ -27,7 +26,6 @@
 @define('CREATE', 'Create');
 @define('SAVE', 'Save');
 @define('NAME', 'Name');
-@define('CLICK_CAT_TO_EDIT', 'Click on a category to edit it');
 @define('CREATE_NEW_CAT', 'Create New Category');
 @define('I_WANT_THUMB', 'I want to use the thumbnail in my entry.');
 @define('I_WANT_BIG_IMAGE', 'I want to use the larger image in my entry.');
@@ -36,16 +34,12 @@
 @define('BACK', 'Back');
 @define('FORWARD', 'Forward');
 @define('ANONYMOUS', 'Anonymous');
-@define('LINK_TO_COMMENT', 'Link to comment #');
-@define('SEND_MAIL_TO', 'Send a mail to');
 @define('NEW_TRACKBACK_TO', 'New trackback made to');
 @define('NEW_COMMENT_TO', 'New comment posted to');
 @define('RECENT', 'Recent...');
 @define('OLDER', 'Older...');
 @define('DONE', 'Done');
 @define('WELCOME_BACK', 'Welcome back,');
-@define('RUNNING', 'You are running Serendipity v.');
-@define('ADD_PLUGIN', 'Add plugin');
 @define('TITLE', 'Title');
 @define('DESCRIPTION', 'Description');
 @define('PLACEMENT', 'Placement');
@@ -55,14 +49,11 @@
 @define('DOWN', 'DOWN');
 @define('ENTRIES', 'entries');
 @define('NEW_ENTRY', 'New entry');
-@define('AUTHOR_SUITE', 'Authoring Suite');
 @define('EDIT_ENTRIES', 'Edit entries');
 @define('CATEGORIES', 'Categories');
 @define('WARNING_THIS_BLAHBLAH', "WARNING:\\nThis may take a long time if there are many images without thumbnails.");
 @define('CREATE_THUMBS', 'Rebuild Thumbs');
 @define('MANAGE_IMAGES', 'Manage images');
-@define('ADMIN_INTERFACE', 'Admin interface');
-@define('SERENDIPITY_AUTHORING_SUITE', 'Serendipity Authoring Suite');
 @define('NAME', 'Name');
 @define('EMAIL', 'Email');
 @define('HOMEPAGE', 'Homepage');
@@ -174,15 +165,9 @@
 @define('INVALID_CATEGORY', 'No category was provided for deletion');
 @define('CATEGORY_SAVED', 'Category saved');
 @define('SELECT_TEMPLATE', 'Select the template you wish to use for your blog');
-@define('ENTRIES_SUCCESSFULLY_INSERTED', 'Entries successfully inserted!');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Entries were not successfully inserted!');
-@define('VIEW_FEED_EXPORT', 'View feed export');
-@define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...');
-@define('IMPORT_AGAIN_FORCE', 'Then try again. Alternatively, you may check the \'force\' box, which will force the entries into the existing architecture.');
 @define('MT_DATA_FILE', 'Movable Type data file');
 @define('FORCE', 'Force');
-@define('WORDPRESS_DATA', 'WordPress data');
-@define('MUST_BE_ADMIN', 'You must be an administrator to complete this action.');
 @define('CREATE_AUTHOR', 'Create author \'%s\'.');
 @define('CREATE_CATEGORY', 'Create category \'%s\'.');
 @define('MYSQL_REQUIRED', 'You must have the MySQL extension in order to perform this action.');
@@ -209,9 +194,7 @@
 @define('SERENDIPITY_NOT_INSTALLED', 'Serendipity is not yet installed. Please <a href="%s">install</a> it now.');
 @define('INCLUDE_ERROR', 'serendipity error: could not include %s - exiting.');
 @define('DATABASE_ERROR', 'serendipity error: unable to connect to database - exiting.');
-@define('ATTEMPT_SETUP_DATABASE', 'Attempting to setup database...');
 @define('CREATE_DATABASE', 'Creating default database setup...');
-@define('DATABASE_DONE', 'Done creating database');
 @define('ATTEMPT_WRITE_FILE', 'Attempting to write %s file...');
 @define('WRITTEN_N_SAVED', 'Configuration written &amp; saved');
 @define('IMAGE_ALIGNMENT', 'Image alignment');
@@ -237,7 +220,6 @@
 @define('SUBSCRIPTION_MAIL', "Hello %s,\n\nA new comment was made to the entry you are monitoring on \"%s\", entitled \"%s\"\nThe name of the poster is: %s\n\nYou can find the entry here: %s\n\nYou can unsubscribe by clicking on this link: %s\n");
 @define('SUBSCRIPTION_TRACKBACK_MAIL', "Hello %s,\n\nA new trackback was added to the entry you are monitoring on \"%s\", entitled \"%s\"\nThe name of the poster is: %s\n\nYou can find the entry here: %s\n\nYou can unsubscribe by clicking on this link: %s\n");
 @define('SIGNATURE', "\n-- \n%s is powered by Serendipity.\nThe best blog around, you can use it too.\nCheck out <http://s9y.org> to find out how.");
-@define('DATABASE_ALREADY_INSTALLED', 'SKIPPED: Database already installed');
 @define('SYNDICATION_PLUGIN_091', 'RSS 0.91 feed');
 @define('SYNDICATION_PLUGIN_10', 'RSS 1.0 feed');
 @define('SYNDICATION_PLUGIN_20', 'RSS 2.0 feed');
@@ -293,8 +275,6 @@
 @define('SORT_ORDER_DESC', 'Descending');
 @define('THUMBNAIL_SHORT', 'Thumb');
 @define('ORIGINAL_SHORT', 'Orig.');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Prevent HTTP caching');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'If set to "true", this will modify the link to your RSS feed to NOT include a setting for bandwidth saving caching of RSS feed requests. It is recommended to set this to "false", so that clients can benefit from caching.');
 @define('APPLY_MARKUP_TO', 'Apply markup to %s');
 @define('CALENDAR_BEGINNING_OF_WEEK', 'Beginning of the week');
 @define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity has detected that your configuration is currently installed with version %s, however serendipity itself is installed as version %s, you need to upgrade! <a href="%s">Click here</a>');
@@ -314,8 +294,6 @@
 @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Your Serendipity installation is now upgraded to version %s');
 @define('SERENDIPITY_UPGRADER_RETURN_HERE', 'You can return to your blog by clicking %shere%s');
 @define('MANAGE_USERS', 'Manage users');
-@define('EDIT_USERS', 'Edit users');
-@define('CREATE_USERS', 'Create users');
 @define('CREATE_NEW_USER', 'Create new user');
 @define('CREATE_NOT_AUTHORIZED', 'You cannot modify users with the same userlevel as yourself');
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'You cannot create users with a higher userlevel than yourself');
@@ -334,7 +312,6 @@
 @define('ALL_DIRECTORIES', 'all directories');
 @define('MANAGE_DIRECTORIES', 'Manage directories');
 @define('DIRECTORY_CREATED', 'Directory <strong>%s</strong> has been created.');
-@define('NEW_DIRECTORY', 'Create a new directory');
 @define('PARENT_DIRECTORY', 'Parent directory');
 @define('CONFIRM_DELETE_DIRECTORY', 'Are you sure you want to remove all the contents of directory %s?');
 @define('ERROR_NO_DIRECTORY', 'Error: Directory %s does not exist');
@@ -348,7 +325,6 @@
 @define('FOUND_FILE', 'Found new/modified file: %s.');
 @define('ALREADY_SUBCATEGORY', '%s is a already a subcategory of %s.');
 @define('PARENT_CATEGORY', 'Parent category');
-@define('REPLY', 'Reply');
 @define('IN_REPLY_TO', 'In reply to');
 @define('TOP_LEVEL', 'Top level');
 @define('SYNDICATION_PLUGIN_GENERIC_FEED', '%s feed');
@@ -463,7 +439,6 @@
 @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Extended entry only');
 @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Overview page only');
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'All times');
-@define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.');
 @define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries');
 
 @define('COMMENTS_WILL_BE_MODERATED', 'Submitted comments will be subject to moderation before being displayed.');
@@ -558,7 +533,6 @@
 @define('SIDEBAR_PLUGIN', 'sidebar plugin');
 @define('EVENT_PLUGIN', 'event plugin');
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s');
-@define('UNKNOWN', 'Unknown');
 @define('VERSION', 'version');
 @define('NA', 'N/A');
 @define('INSTALL', 'Install');

Index: serendipity_lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ja.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- serendipity_lang_ja.inc.php	15 Feb 2005 11:25:36 -0000	1.32
+++ serendipity_lang_ja.inc.php	15 Feb 2005 23:58:07 -0000	1.33
@@ -20,7 +20,6 @@
 @define('MANAGE_STYLES', 'スタイル管理');
 @define('CONFIGURE_PLUGINS', 'プラグイン設定');
 @define('CONFIGURATION', '設定');
-@define('IMPORT_EXPORT_ENTRIES', 'エントリインポート・エクスポート');
 @define('BACK_TO_BLOG', 'Weblog に戻る');
 @define('LOGIN', 'ログイン');
 @define('LOGOUT', 'ログアウト');
@@ -28,7 +27,6 @@
 @define('CREATE', '作成');
 @define('SAVE', '保存');
 @define('NAME', '名前');
-@define('CLICK_CAT_TO_EDIT', 'クリックするとそのカテゴリを編集します');
 @define('CREATE_NEW_CAT', '新規カテゴリを作成する');
 @define('I_WANT_THUMB', 'エントリ中でサムネイルを使用したい');
 @define('I_WANT_BIG_IMAGE', 'エントリの中で大きな画像を使用したい');
@@ -37,16 +35,12 @@
 @define('BACK', '戻る');
 @define('FORWARD', '転送');
 @define('ANONYMOUS', '匿名');
-@define('LINK_TO_COMMENT', '次のコメントにリンクする: #');
-@define('SEND_MAIL_TO', 'メールを送信する: ');
 @define('NEW_TRACKBACK_TO', '新規トラックバックを作成する: ');
 @define('NEW_COMMENT_TO', '新規コメントを投稿する: ');
 @define('RECENT', '最近の記事...');
 @define('OLDER', '古い記事...');
 @define('DONE', '実行完了');
 @define('WELCOME_BACK', 'ようこそ!! ');
-@define('RUNNING', '実行している Serendipity のバージョン:');
-@define('ADD_PLUGIN', 'プラグイン追加');
 @define('TITLE', '題名');
 @define('DESCRIPTION', '説明');
 @define('PLACEMENT', '配置');
@@ -56,15 +50,11 @@
 @define('DOWN', '下へ');
 @define('ENTRIES', 'エントリ');
 @define('NEW_ENTRY', '新規エントリ追加');
-@define('AUTHOR_SUITE', 'オーサリングスーツ');
 @define('EDIT_ENTRIES', 'エントリ編集');
 @define('CATEGORIES', 'カテゴリ一覧');
-@define('EDIT_CATEGORIES', 'カテゴリ管理');
 @define('WARNING_THIS_BLAHBLAH', "警告:\\nサムネイルなしの画像が多い場合、長時間かかるかもしれません。");
 @define('CREATE_THUMBS', 'サムネイル再構築');
 @define('MANAGE_IMAGES', '画像管理');
-@define('ADMIN_INTERFACE', '管理インターフェース');
-@define('SERENDIPITY_AUTHORING_SUITE', 'Serendipity 著作スイート');
 @define('NAME', '名前');
 @define('EMAIL', '電子メール');
 @define('HOMEPAGE', 'ホームページ');
@@ -176,15 +166,9 @@
 @define('INVALID_CATEGORY', 'カテゴリは破棄するために提供されませんでした。');
 @define('CATEGORY_SAVED', 'カテゴリを保存しました。');
 @define('SELECT_TEMPLATE', 'ウェブログに使用したいテンプレートを選択します。');
-@define('ENTRIES_SUCCESSFULLY_INSERTED', 'エントリの挿入に成功しました!');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'エントリの挿入が成功しませんでした!');
-@define('VIEW_FEED_EXPORT', 'View feed export');
-@define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...');
-@define('IMPORT_AGAIN_FORCE', 'Then try again. Alternatively, you may check the \'force\' box, which will force the entries into the existing architecture.');
 @define('MT_DATA_FILE', 'Movable Type データファイル');
 @define('FORCE', '強制');
-@define('WORDPRESS_DATA', 'WordPress データ');
-@define('MUST_BE_ADMIN', 'この操作を完了するには管理者でなければなりません。');
 @define('CREATE_AUTHOR', '執筆者 \'%s\' を作成する');
 @define('CREATE_CATEGORY', 'カテゴリ \'%s\' を作成する');
 @define('MYSQL_REQUIRED', 'この操作を実行するには MySQL 拡張が古過ぎます。');
@@ -211,9 +195,7 @@
 @define('SERENDIPITY_NOT_INSTALLED', 'Serendipity はまだインストールされていません。今から<a href="%s">インストール</a> してください。');
 @define('INCLUDE_ERROR', 'serendipity エラー: could not include %s - exiting.');
 @define('DATABASE_ERROR', 'serendipity エラー: データベースに接続できませんでした - 終了します。');
-@define('ATTEMPT_SETUP_DATABASE', 'データベース設定を試みますAttemping to setup database...');
 @define('CREATE_DATABASE', 'デフォルトデータベースセットアップの作成中...');
-@define('DATABASE_DONE', 'データベースの作成が終了しました。');
 @define('ATTEMPT_WRITE_FILE', 'ファイル %s の書き込みを試みます...');
 @define('WRITTEN_N_SAVED', '設定の書き込みと保存');
 @define('IMAGE_ALIGNMENT', '画像位置あわせ');
@@ -239,7 +221,6 @@
 @define('SUBSCRIPTION_MAIL', "こんにちは %s さん。\n監視中のエントリに新しいコメントが作成されました。\n\nブログ名:\n%s\nエントリ名:\n%s\n\n下記でエントリを見つけることができます:\n%s\n\n下記のリンクをクリックすると購読解除することができます:\n%s\n");
 @define('SUBSCRIPTION_TRACKBACK_MAIL', "Hello %s,\n\nA new trackback was added to the entry you are monitoring on \"%s\", entitled \"%s\"\nThe name of the poster is: %s\n\nYou can find the entry here: %s\n\nYou can unsubscribe by clicking on this link: %s\n");
 @define('SIGNATURE', "\n-- \n%s は Serendipityを使っています。\n最良の blog を探しているなら <http://s9y.org> を見てください。");
-@define('DATABASE_ALREADY_INSTALLED', '飛ばします: データベースは既にインストール済みです。');
 @define('SYNDICATION_PLUGIN_091', 'RSS 0.91 フィード');
 @define('SYNDICATION_PLUGIN_10', 'RSS 1.0 フォード');
 @define('SYNDICATION_PLUGIN_20', 'RSS 2.0 フィード');
@@ -295,8 +276,6 @@
 @define('SORT_ORDER_DESC', '降順');
 @define('THUMBNAIL_SHORT', 'サムネイル');
 @define('ORIGINAL_SHORT', 'オリジナル');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'HTTP キャッシュを防ぐ');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'If set to "true", this will modify the link to your RSS feed to NOT include a setting for bandwidth saving caching of RSS feed requests. It is recommended to set this to "false", so that clients can benefit from caching.');
 @define('APPLY_MARKUP_TO', '%s へのマークアップを適用します。');
 @define('CALENDAR_BEGINNING_OF_WEEK', '週の開始曜日');
 @define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity は現在のインストール済みバージョン %s の設定を検出しました。しかし serendipity 自身はバージョン %s としてインストールされています。<a href="%s">ここをクリック</a>してアップグレードする必要があります!');
@@ -316,8 +295,6 @@
 @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'あなたの Serendipity は今バージョン %s にアップグレードしました。');
 @define('SERENDIPITY_UPGRADER_RETURN_HERE', '%sここ%s をクリックするとブログに戻ることができます');
 @define('MANAGE_USERS', 'ユーザー管理');
-@define('EDIT_USERS', 'ユーザーを編集する');
-@define('CREATE_USERS', 'ユーザーを作成する');
 @define('CREATE_NEW_USER', '新規ユーザーを追加する');
 @define('CREATE_NOT_AUTHORIZED', 'あなたと同じユーザーレベルのユーザーを修正することは出来ません。');
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'あなたより高いユーザーレベルを持ったユーザを作ることができません。');
@@ -336,7 +313,6 @@
 @define('ALL_DIRECTORIES', 'すべてのディレクトリ');
 @define('MANAGE_DIRECTORIES', 'ディレクトリ管理');
 @define('DIRECTORY_CREATED', 'ディレクトリ <strong>%s</strong> を作成しました。');
-@define('NEW_DIRECTORY', '新規ディレクトリ作成');
 @define('PARENT_DIRECTORY', '親ディレクトリ');
 @define('CONFIRM_DELETE_DIRECTORY', '本当にディレクトリ %s の内容をすべて削除しますか?');
 @define('ERROR_NO_DIRECTORY', 'エラー: ディレクトリ %s がありません');
@@ -350,7 +326,6 @@
 @define('FOUND_FILE', '新規/修正されたファイルを見つけました: %s.');
 @define('ALREADY_SUBCATEGORY', '%s は %s のサブカテゴリに既に存在します。');
 @define('PARENT_CATEGORY', '親カテゴリ');
-@define('REPLY', '返信');
 @define('IN_REPLY_TO', '返信先指定');
 @define('TOP_LEVEL', 'トップレベル');
 @define('SYNDICATION_PLUGIN_GENERIC_FEED', '%s フィード');
@@ -465,7 +440,6 @@
 @define('PLUGIN_ITEM_DISPLAY_EXTENDED', '拡張エントリのみ表示');
 @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', '概要ページのみ表示');
 @define('PLUGIN_ITEM_DISPLAY_BOTH', '常に表示');
-@define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.');
 @define('RSS_IMPORT_CATEGORY', '一致しなかったインポートしたエントリはこのカテゴリを使用する');
 
 @define('COMMENTS_WILL_BE_MODERATED', '送信されたコメントは表示する前にもでレーションされるでしょう。');
@@ -560,7 +534,6 @@
 @define('SIDEBAR_PLUGIN', 'サイドバープラグイン');
 @define('EVENT_PLUGIN', 'イベントプラグイン');
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', '新しい %s をインストールする');
-@define('UNKNOWN', '未知');
 @define('VERSION', 'バージョン');
 @define('NA', 'N/A');
 @define('INSTALL', 'インストール');
@@ -649,7 +622,7 @@
 @define('CATEGORY_ALREADY_EXIST', '"%s" という名前のカテゴリは既に存在します。');
 @define('ERROR_FILE_FORBIDDEN', 'アクティブコンテンツのファイルをアップロードすることを認められていません。');
 @define('ADMIN', '管理');
-@define('ADMIN_FRONTPAGE', 'フロントページ'); 
+@define('ADMIN_FRONTPAGE', 'フロントページ');
 @define('QUOTE', '引用');
 @define('IFRAME_SAVE', 'Serendipity はをエントリ保存中で、トラックバックの作成と可能な限り XML-RPC 呼び出しを実行中です。これは時間がかかるかもしれません...');
 @define('IFRAME_SAVE_DRAFT', 'このエントリの草稿を保存しました。');

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- serendipity_lang_bg.inc.php	15 Feb 2005 11:25:28 -0000	1.66
+++ serendipity_lang_bg.inc.php	15 Feb 2005 23:57:56 -0000	1.67
@@ -17,7 +17,6 @@
 @define('MANAGE_STYLES', 'Ïðîìÿíà íà ñòèëà');
 @define('CONFIGURE_PLUGINS', 'Êîíôèãóðàöèÿ íà äîïúëíèòåëíèòå ìîäóëè');
 @define('CONFIGURATION', 'Êîíôèãóðàöèÿ');
-@define('IMPORT_EXPORT_ENTRIES', 'Âìúêíè/Èçìúêíè Äàííè');
 @define('BACK_TO_BLOG', 'Îáðàòíî êúì áëîã-à');
 @define('LOGIN', 'Âõîä');
 @define('LOGOUT', 'Èçõîä');
@@ -25,7 +24,6 @@
 @define('CREATE', 'Ñúçäàé');
 @define('SAVE', 'Çàïàçè');
 @define('NAME', 'Èìå');
-@define('CLICK_CAT_TO_EDIT', 'Êëèêíåòå íà êàòåãîðèÿòà çà äà ìîæåòå äà ÿ ðåäàêòèðàòå');
 @define('CREATE_NEW_CAT', 'Ñúçäàâàíå íà íîâà êàòåãîðèÿ');
 @define('I_WANT_THUMB', 'Èñêàì äà ïîëçâàì òúìáíåéëè â ìîåòî ñúäúðæàíèå.');
 @define('I_WANT_BIG_IMAGE', 'Èñêàì äà ïîëçâà ãîëÿìà êàðòèíêà â ìîåòî ñúäúðæàíèå');
@@ -34,16 +32,12 @@
 @define('BACK', 'Íàçàä');
 @define('FORWARD', 'Íàïðåä');
 @define('ANONYMOUS', 'Àíîíèìåí');
-@define('LINK_TO_COMMENT', 'Ëèíê êúì êîìåíòàð #');
-@define('SEND_MAIL_TO', 'Èçïðàòè email íà:');
 @define('NEW_TRACKBACK_TO', 'Íîâî ïðîñëåäÿâàíå íà');
 @define('NEW_COMMENT_TO', 'Íîâ êîìåíòàð ïúáëèêóâàí îò');
 @define('RECENT', 'Ñåãàøíè...');
 @define('OLDER', 'Ïðåäèøíè...');
 @define('DONE', 'Ãîòîâî');
 @define('WELCOME_BACK', 'Äîáðå äîøúë îòíîâî,');
-@define('RUNNING', 'Â ìîìåíòà âåðñèÿòà íà Serendipity å:');
-@define('ADD_PLUGIN', 'Äîáàâåòå ìîäóë');
 @define('TITLE', 'Çàãëàâèå');
 @define('DESCRIPTION', 'Îïèñàíèå');
 @define('PLACEMENT', 'Ïîëîæåíèå');
@@ -53,15 +47,11 @@
 @define('DOWN', 'Íàäîëó');
 @define('ENTRIES', 'Ñúäúðæàíèå:');
 @define('NEW_ENTRY', 'Íîâî');
-@define('AUTHOR_SUITE', 'Ðàçäåë çà âúâåæäàíå');
 @define('EDIT_ENTRIES', 'Ðåäàêöèÿ íà ñúäúðæàíèå');
 @define('CATEGORIES', 'Êàòåãîðèè');
-@define('EDIT_CATEGORIES', 'Ðåäàêöèÿ íà êàòåãîðèè');
 @define('WARNING_THIS_BLAHBLAH', "Âíèìàíèå!!!:\\n Âúçìîæíî å îïåðàöèÿòà äà ïðîäúëæè ìíîãî âðåìå, àêî èìà ìíîãî èçîáðàæåíèÿ.");
 @define('CREATE_THUMBS', 'Íàïðàâè òúìáíåéëè îòíîâî');
 @define('MANAGE_IMAGES', 'Ðåäàêöèÿ íà èçîáðàæåíèÿòà');
-@define('ADMIN_INTERFACE', 'Àäìèíèñòðàöèÿ');
-@define('SERENDIPITY_AUTHORING_SUITE', 'Serendipity : Ðàçäåë çà âúâåæäàíå íà èíôîðìàöèÿ');
 @define('NAME', 'Èìå');
 @define('EMAIL', 'Email');
 @define('HOMEPAGE', 'Ñòðàíèöà â èíòåðíåò');
@@ -169,9 +159,7 @@
 @define('INVALID_CATEGORY', 'Íÿìà êàòåãîðèÿ çà èçòðèâàíå');
 @define('CATEGORY_SAVED', 'ÊÀòåãîðèÿòà å çàïàçåíà');
 @define('SELECT_TEMPLATE', 'ÈÇáåðåòå âúíøíèÿ âèä íà áëîã-à ñè');
-@define('ENTRIES_SUCCESSFULLY_INSERTED', 'Ñúäúðæàíèåòî å ïóáëèêóâàíî óñïåøíî!');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Ñúäúðæàíèåòî íå áåïå ïóáëèêóâàíî!');
-@define('VIEW_FEED_EXPORT', 'Ïîêàæè èçíàñÿíåòî íà íîâèíèòå');
 @define('YES', 'Äà');
 @define('NO', 'Íå');
 @define('CHECK_N_SAVE', 'Èçáåðè  &amp; Çàïàçè');
@@ -188,9 +176,7 @@
 @define('SERENDIPITY_NOT_INSTALLED', 'Serendipity îøå íå å èíñòàëèðàíà. ìîëÿ êëèíåòå íà òîçè  <a href="%s">ëèíê</a>.');
 @define('INCLUDE_ERROR', 'serendipity ãðåøêà: íå ìîãà äà âìúêíà òîçè ôàéë %s - èçëèçàì.');
 @define('DATABASE_ERROR', 'serendipity ãðåøêà: íå ìîãà äà ñå ñâúðæà ñ áàçàòà äàííè - èçëèçàì.');
-@define('ATTEMPT_SETUP_DATABASE', 'Ïðîáâàì äà ñúçäàì áàçàòà äàííè...');
 @define('CREATE_DATABASE', 'Ñúçäàâàì áàçàòà äàííè...');
-@define('DATABASE_DONE', 'Áàçàòà äàííè å ñúçäàäåíà');
 @define('ATTEMPT_WRITE_FILE', 'Ïðîáâàì äà ïèøà âúâ ôàéë %s ...');
 @define('WRITTEN_N_SAVED', 'Êîíôèãóðàöèÿòà å çàïèñàíà');
 @define('IMAGE_ALIGNMENT', 'Ïîëîæåíèå íà èçîáðàæåíèåòî');
@@ -218,7 +204,6 @@
 @define('SUBSCRIPTION_MAIL', "Çäðàâåé %s,\n\nÍîâ êîìåíòàð å íàïðàâåí ïî ìàòåðèàëà êîéòî ñëåäèòå \"%s\", îçàãëàâåí \"%s\"\nÈìåòî íà òîçè, êîéòî å ïóáëèêóâàë å: %s\n\nÌîæåòå äà íàìåðèòå ñúäúðæàíèåòî òóê: %s\n\nÌîæåòå äà ñå îòïèøåòå, êëèêâàéêè íà òîçè ëèíê %s\n");
 @define('SUBSCRIPTION_TRACKBACK_MAIL', "Çäðàâåé %s,\n\nÍîâ êîìåíòàð å íàïðàâåí ïî ìàòåðèàëà êîéòî ñëåäèòå \"%s\", îçàãëàâåí \"%s\"\nÈìåòî íà òîçè, êîéòî å ïóáëèêóâàë å: %s\n\nÌîæåòå äà íàìåðèòå ñúäúðæàíèåòî òóê: %s\n\nÌîæåòå äà ñå îòïèøåòå, êëèêâàéêè íà òîçè ëèíê %s\n");
 @define('SIGNATURE', "\n-- \n%s is íàïðàâåí îò Serendipity.\nÍàé-äîáðèÿò áëîã.\nÌîæåòå äà ñè ãî ñâàëèòå îò òóê <http://s9y.org> .");
-@define('DATABASE_ALREADY_INSTALLED', 'Áàçàòà äàííè âå÷å å èíñòàëèðàíà');
 @define('SYNDICATION_PLUGIN_091', 'RSS 0.91 ');
 @define('SYNDICATION_PLUGIN_10', 'RSS 1.0 ');
 @define('SYNDICATION_PLUGIN_20', 'RSS 2.0 ');
@@ -273,8 +258,6 @@
 @define('SORT_ORDER_DESC', 'Óâåëè÷àâàø');
 @define('THUMBNAIL_SHORT', 'Òóìáíåéë');
 @define('ORIGINAL_SHORT', 'Îðèãèíàëåí.');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Ñïðè HTTP êåøèðàíåòî');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'Àêî òîâà å "true" âðåìåòî çà çàðåæäàíå øå áóäå ñðàâíèòåëíî ïî-ãîëÿìî îò êîëêîòî àêî òàçîè îïöèÿ å "false"');
 @define('APPLY_MARKUP_TO', 'Ïðèëîæè äåéñòâèåòî íà %s');
 @define('CALENDAR_BEGINNING_OF_WEEK', 'Íà÷àëî íà ñåäìèöàòà');
 @define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity ðàçáðà ,÷å âàïàòà êîíôèãèðàöèÿ å çà âåðñèÿ %s, ìîëÿ âçåìåòå íîâà âåðñèÿ îò òóê: <a href="%s">Click here</a>');
@@ -344,8 +327,6 @@
 @define('USE_DEFAULT', 'Default'); // Translate
 @define('PAGE_BROWSE_ENTRIES', 'Page %s of %s, totalling %s entries'); // Translate
 @define('MANAGE_USERS', 'Manage users'); // Translate
-@define('EDIT_USERS', 'Edit users'); // Translate
-@define('CREATE_USERS', 'Create users'); // Translate
 @define('CREATE_NEW_USER', 'Create new user'); // Translate
 @define('CREATE_NOT_AUTHORIZED', 'You cannot modify users with the same userlevel as yourself'); // Translate
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'You cannot create users with a higher userlevel than yourself'); // Translate
@@ -362,7 +343,6 @@
 @define('ALL_DIRECTORIES', 'all directories'); // Translate
 @define('MANAGE_DIRECTORIES', 'Manage directories'); // Translate
 @define('DIRECTORY_CREATED', 'Directory <strong>%s</strong> has been created.'); // Translate
-@define('NEW_DIRECTORY', 'Create a new directory'); // Translate
 @define('PARENT_DIRECTORY', 'Parent directory'); // Translate
 @define('CONFIRM_DELETE_DIRECTORY', 'Are you sure you want to remove all the contents of directory %s?'); // Translate
 @define('ERROR_NO_DIRECTORY', 'Error: Directory %s does not exist'); // Translate
@@ -376,7 +356,6 @@
 @define('FOUND_FILE', 'Found new/modified file: %s.'); // Translate
 @define('ALREADY_SUBCATEGORY', '%s is a already a subcategory of %s.'); // Translate
 @define('PARENT_CATEGORY', 'Parent category'); // Translate
-@define('REPLY', 'Reply'); // Translate
 @define('IN_REPLY_TO', 'In reply to'); // Translate
 @define('TOP_LEVEL', 'Top level'); // Translate
 @define('SYNDICATION_PLUGIN_GENERIC_FEED', '%s feed'); // Translate
@@ -477,7 +456,6 @@
 @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Extended entry only'); // Translate
 @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Overview page only'); // Translate
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'All times'); // Translate
-@define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.'); // Translate
 @define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries'); // Translate
 @define('COMMENTS_WILL_BE_MODERATED', 'Submitted comments will be subject to moderation before being displayed.'); // Translate
 @define('YOU_HAVE_THESE_OPTIONS', 'You have the following options available:'); // Translate
@@ -517,12 +495,8 @@
 @define('COMMENTS_FILTER_NEED_APPROVAL', 'Pending approval'); // Translate
 @define('RSS_IMPORT_BODYONLY', 'Put all imported text in the "body" section and do not split up into "extended entry" section.'); // Translate
 @define('SYNDICATION_PLUGIN_FULLFEED', 'Show full articles with extended body inside RSS feed'); // Translate
-@define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...'); // Translate
-@define('IMPORT_AGAIN_FORCE', 'Then try again. Alternatively, you may check the \'force\' box, which will force the entries into the existing architecture.'); // Translate
 @define('MT_DATA_FILE', 'Movable Type data file'); // Translate
 @define('FORCE', 'Force'); // Translate
-@define('WORDPRESS_DATA', 'WordPress data'); // Translate
-@define('MUST_BE_ADMIN', 'You must be an administrator to complete this action.'); // Translate
 @define('CREATE_AUTHOR', 'Create author \'%s\'.'); // Translate
 @define('CREATE_CATEGORY', 'Create category \'%s\'.'); // Translate
 @define('MYSQL_REQUIRED', 'You must have the MySQL extension in order to perform this action.'); // Translate
@@ -544,7 +518,6 @@
 @define('SIDEBAR_PLUGIN', 'sidebar plugin'); // Translate
 @define('EVENT_PLUGIN', 'event plugin'); // Translate
 @define('CLICK_HERE_TO_INSTALL_PLUGIN', 'Click here to install a new %s'); // Translate
-@define('UNKNOWN', 'Unknown'); // Translate
 @define('VERSION', 'version'); // Translate
 @define('NA', 'N/A'); // Translate
 @define('INSTALL', 'Install'); // Translate

Index: serendipity_lang_tw.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tw.inc.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- serendipity_lang_tw.inc.php	15 Feb 2005 11:25:38 -0000	1.49
+++ serendipity_lang_tw.inc.php	15 Feb 2005 23:58:22 -0000	1.50
@@ -19,7 +19,6 @@
 @define('MANAGE_STYLES', '§G´ººÞ²z');
 @define('CONFIGURE_PLUGINS', '³]©w¥~±¾');
 @define('CONFIGURATION', 'ºÞ²z³]©w');
-@define('IMPORT_EXPORT_ENTRIES', '¿é¤J/¿é¥X ¤å³¹');
 @define('BACK_TO_BLOG', '¦^¨ì¤é°O­º­¶');
 @define('LOGIN', 'µn¤J');
 @define('LOGOUT', 'µn¥X');
@@ -27,7 +26,6 @@
 @define('CREATE', '«Ø¥ß');
 @define('SAVE', 'Àx¦s');
 @define('NAME', '¦WºÙ');
-@define('CLICK_CAT_TO_EDIT', 'ÂIÃþ§O¶i¦æ½s¿è');
 @define('CREATE_NEW_CAT', '·s¼WÃþ§O');
 @define('I_WANT_THUMB', '§Ú­n¦b¤å³¹¤º¨Ï¥ÎÁY¹Ï.');
 @define('I_WANT_BIG_IMAGE', '§Ú­n¦b¤å³¹¤º¨Ï¥Î¤j«¬¹Ï¤ù.');
@@ -36,16 +34,12 @@
 @define('BACK', 'ªð¦^');
 @define('FORWARD', '«e¶i');
 @define('ANONYMOUS', '°Î¦W');
-@define('LINK_TO_COMMENT', '³sµ²¨ì°jÅT #');
-@define('SEND_MAIL_TO', '±H°e¶l¥ó¨ì');
 @define('NEW_TRACKBACK_TO', '·sªº¤Þ¥Î¨ì');
 @define('NEW_COMMENT_TO', '·sªº°jÅT¨ì');
 @define('RECENT', '·s¤å®w...');
 @define('OLDER', '¤å®w...');
 @define('DONE', '§¹¦¨');
 @define('WELCOME_BACK', 'Åwªï¦^¨Ó,');
-@define('RUNNING', '±z¨Ï¥Îªº Serendipity ª©¥»¬O v.');
-@define('ADD_PLUGIN', '¥[¤J¥~±¾');
 @define('TITLE', '¼ÐÃD');
 @define('DESCRIPTION', '²¤¶');
 @define('PLACEMENT', '¦ì§}');
@@ -55,15 +49,11 @@
 @define('DOWN', '¤U');
 @define('ENTRIES', '¤å³¹');
 @define('NEW_ENTRY', '·s¼W¤å³¹');
-@define('AUTHOR_SUITE', '¼¶¼g®M¥ó');
 @define('EDIT_ENTRIES', '½s¿è¤å³¹');
 @define('CATEGORIES', 'Ãþ§O');
-@define('EDIT_CATEGORIES', 'ºÞ²zÃþ§O');
 @define('WARNING_THIS_BLAHBLAH', "ĵ§i:\\n³o­Ó¥i¯à»Ý­nªø®É¶¡¦pªG¦³«Ü¦h¤£¬OÁY¹Ïªº¹Ï¤ù.");
 @define('CREATE_THUMBS', '­««ØÁY¹Ï');
 @define('MANAGE_IMAGES', 'ºÞ²z¹Ï¤ù');
-@define('ADMIN_INTERFACE', 'ºÞ²z®M¥ó');
-@define('SERENDIPITY_AUTHORING_SUITE', 'Serendipity ¼¶¼g®M¥ó');
 @define('NAME', '¦WºÙ');
 @define('EMAIL', 'Email');
 @define('HOMEPAGE', 'ºô§}');
@@ -173,15 +163,9 @@
 @define('INVALID_CATEGORY', '¨S¦³´£¨Ñ§R°£ªºÃþ§O');
 @define('CATEGORY_SAVED', 'Ãþ§O¤wÀx¦s');
 @define('SELECT_TEMPLATE', '½Ð¿ï¾Üºô¸ô¤é°Oªº§G´º');
-@define('ENTRIES_SUCCESSFULLY_INSERTED', '§¹¦¨¼W¤J¤å³¹!');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', '¨S¦³§¹¦¨¼W¤J¤å³¹!');
-@define('VIEW_FEED_EXPORT', 'ÂsÄý¿é¥X');
-@define('MAX_COMPAT_OLD_BLOG', '¬°¤F¯à°÷©M±zªºÂ¤é°O¦³³Ì¤jªº¬Û®e©Ê, ½Ð...');
-@define('IMPORT_AGAIN_FORCE', 'µM«á¦b¸Õ¤@¦¸. ©ÎªÌ±z¥i¥H¤Ä¿ï \'±j¨î\' Äæ¦ì, ¥¦·|±j¨î±N±zªº¤å³¹¿é¤J¨ì²{¦³ªº¬[ºc.');
 @define('MT_DATA_FILE', 'Movable Type ¸ê®ÆÀÉ');
 @define('FORCE', '±j¨î');
-@define('WORDPRESS_DATA', 'WordPress ¸ê®Æ');
-@define('MUST_BE_ADMIN', '±z¥²¶·¬OºÞ²z­û¤~¯à°õ¦æ³o­Ó°Ê§@.');
 @define('CREATE_AUTHOR', '·s¼W§@ªÌ \'%s\'.');
 @define('CREATE_CATEGORY', '·s¼WÃþ§O \'%s\'.');
 @define('MYSQL_REQUIRED', '±z¥²¶·­n¦³ MySQL ªºÂX¥R¥\¯à¤~¯à°õ¦æ³o­Ó°Ê§@.');
@@ -208,10 +192,8 @@
 @define('SERENDIPITY_NOT_INSTALLED', 'Serendipity ÁÙ¨S¦w¸Ë§¹¦¨. ½Ð«ö <a href="%s">¦w¸Ë</a>.');
 @define('INCLUDE_ERROR', 'serendipity ¿ù»~: µLªk¥]¬A %s - °h¥X.');
 @define('DATABASE_ERROR', 'serendipity ¿ù»~: µLªk³sµ²¨ì¸ê®Æ®w - °h¥X.');
-@define('ATTEMPT_SETUP_DATABASE', '¶i¦æ¸ê®Æ®w³]©w...');
 @define('CHECK_DATABASE_EXISTS', 'Àˬd¸ê®Æ®w¬O§_¦s¦b. ¦pªG±z¬Ý¨ì¸ê®Æ®w¬d¸ß¿ù»~, ½Ð¤£¥ÎºÞ¥¦...');
 @define('CREATE_DATABASE', '«Ø¥ß¹w³]¸ê®Æ®w³]©w...');
-@define('DATABASE_DONE', '¸ê®Æ®w«Ø¥ß§¹¦¨');
 @define('ATTEMPT_WRITE_FILE', 'Ū¼g %s ÀÉ®×...');
 @define('SERENDIPITY_INSTALLED', '%sSerendipity ¤w¦w¸Ë§¹¦¨.%s ½Ð°O±o±zªº±K½X: "%s", ±zªº±b¸¹¬O "%s".%s±z²{¦b¥i¥H¨ì·s«Ø¥ßªº <a href="%s">ºô¸ô¤é°O</a>');
 @define('WRITTEN_N_SAVED', 'Àx¦s§¹²¦');
@@ -238,7 +220,6 @@
 @define('SUBSCRIPTION_MAIL', "±z¦n %s,\n\n±z­q¾\ªº¤å³¹¦³¤F·sªº°jÅT¦b \"%s\", ¼ÐÃD¬O \"%s\"\n°jÅTªºµoªíªÌ¬O: %s\n\n±z¥i¥H¦b³o§ä¨ì¦¹¤å³¹: %s\n\n±z¥i¥HÂI³o­Ó³sµ²¨ú®ø­q¾\: %s\n");
 @define('SUBSCRIPTION_TRACKBACK_MAIL', "±z¦n %s,\n\n±z­q¾\ªº¤å³¹¦³¤F·sªº¤Þ¥Î¦b \"%s\", ¼ÐÃD¬O \"%s\"\n¤Þ¥Îªº§@ªÌ¬O: %s\n\n±z¥i¥H¦b³o§ä¨ì¦¹¤å³¹: %s\n\n±z¥i¥HÂI³o­Ó³sµ²¨ú®ø­q¾\: %s\n");
 @define('SIGNATURE', "\n-- \n%s is powered by Serendipity.\nThe best blog around, you can use it too.\nCheck out <http://s9y.org> to find out how.");
-@define('DATABASE_ALREADY_INSTALLED', '²¤¹L: ¸ê®Æ®w¤w¦w¸Ë');
 @define('SYNDICATION_PLUGIN_091', 'RSS 0.91 feed');
 @define('SYNDICATION_PLUGIN_10', 'RSS 1.0 feed');
 @define('SYNDICATION_PLUGIN_20', 'RSS 2.0 feed');
@@ -294,8 +275,6 @@
 @define('SORT_ORDER_DESC', '»¼´î±Æ§Ç');
 @define('THUMBNAIL_SHORT', 'ÁY¹Ï');
 @define('ORIGINAL_SHORT', '­ì©l');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'ÁקK HTTP §Ö¨ú°O¾Ð');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', '¦pªG³]©w "¬O", ±zªº RSS feed ³]©w±N·|Åܦ¨¤£¥]¬A´î¤Ö¼eÀWªº§Ö¨ú°O¾Ð. «Øij±z³Ì¦n³]©w¬° "§_", ³o¼Ë«È¤áºÝ¤~¥i¥H¨Ï¥Î§Ö¨ú°O¾Ðªº¦n³B.');
 @define('APPLY_MARKUP_TO', '®M¥Î¼Ð°O¨ì %s');
 @define('CALENDAR_BEGINNING_OF_WEEK', '¤@¶gªº²Ä¤@¤Ñ');
 @define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity °»´ú¨ì±zªº°t¸mª©¥»¬O %s, ¦ý¬O Serendipity ¥»¨­ªº¦w¸Ëª©¥»¬O %s, ½Ð§ó·s±zªºµ{¦¡ª©¥»! <a href="%s">§ó·s</a>');
@@ -315,8 +294,6 @@
 @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', '±zªº Serendipity ¥H§ó·s¦Üª©¥» %s');
 @define('SERENDIPITY_UPGRADER_RETURN_HERE', '±z¥i¥HÂI %s³o¸Ì%s ªð¦^¤é°O­º­¶');
 @define('MANAGE_USERS', 'ºÞ²z§@ªÌ');
-@define('EDIT_USERS', '½s¿è§@ªÌ');
-@define('CREATE_USERS', '·s¼W§@ªÌ');
 @define('CREATE_NEW_USER', '·s¼W§@ªÌ');
 @define('CREATE_NOT_AUTHORIZED', '±z¤£¯à­×§ï¸ò±z¬Û¦PÅv­­ªº§@ªÌ');
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', '±z¤£¯à·s¼W¤ñ±z°ªÅv­­ªº§@ªÌ');
@...
 
[truncated message content]

[php-blog-cvs] serendipity/include functions_images.inc.php,1.32,1.33

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24095

Modified Files:
	functions_images.inc.php 
Log Message:
- This makes more sense, since media can be an image, and still have a missing thumbnail


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- functions_images.inc.php	15 Feb 2005 23:28:54 -0000	1.32
+++ functions_images.inc.php	15 Feb 2005 23:34:45 -0000	1.33
@@ -906,12 +906,18 @@
             $file['imgsrc'] = $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
             $is_image = serendipity_isImage($file);
 
-            if ($is_image) {
+            /* If it is an image, and the thumbnail exists */
+            if ($is_image && file_exists($file['imgsrc'])) {
                 $preview .= '<img src="' . $file['imgsrc'] . '" border="0" alt="'. $file['name'] . '" />';
-                if ($url) { $preview = '<a href="'. $url .'&amp;serendipity[image]='. $file['id'] .'">'. $preview .'</a>'; }
-            } elseif (!file_exists($file['imgsrc'])) {
+                if ($url) {
+                    $preview = '<a href="'. $url .'&amp;serendipity[image]='. $file['id'] .'">'. $preview .'</a>';
+                }
+            /* If it's not an image, or the thumbnail does not exist */
+            } else {
                 $preview .= '<img src="'. serendipity_getTemplateFile('admin/img/mime_unknown.png') .'" alt="'. $file['mime'] .'" /><br /><span style="font-weight: bold; font-size: 8pt">- ' . $file['mime'] .' -</span>';
-                if ($url) { $preview .= '<br /><a href="' . $url . '&amp;serendipity[image]=' . $file['id'] . '">' . $file['name'] . '.' . $file['extension'] . '</a>'; }
+                if ($url) {
+                    $preview .= '<br /><a href="' . $url . '&amp;serendipity[image]=' . $file['id'] . '">' . $file['name'] . '.' . $file['extension'] . '</a>';
+                }
                 $preview .= '</div>';
             }
 ?>

[php-blog-cvs] serendipity/include functions_images.inc.php,1.31,1.32

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22835

Modified Files:
	functions_images.inc.php 
Log Message:
- Don't risk showing the thumbnail and the 'no-thumbnail' icon


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- functions_images.inc.php	9 Feb 2005 19:46:09 -0000	1.31
+++ functions_images.inc.php	15 Feb 2005 23:28:54 -0000	1.32
@@ -909,9 +909,7 @@
             if ($is_image) {
                 $preview .= '<img src="' . $file['imgsrc'] . '" border="0" alt="'. $file['name'] . '" />';
                 if ($url) { $preview = '<a href="'. $url .'&amp;serendipity[image]='. $file['id'] .'">'. $preview .'</a>'; }
-            }
-
-            if (!file_exists($file['imgsrc'])) {
+            } elseif (!file_exists($file['imgsrc'])) {
                 $preview .= '<img src="'. serendipity_getTemplateFile('admin/img/mime_unknown.png') .'" alt="'. $file['mime'] .'" /><br /><span style="font-weight: bold; font-size: 8pt">- ' . $file['mime'] .' -</span>';
                 if ($url) { $preview .= '<br /><a href="' . $url . '&amp;serendipity[image]=' . $file['id'] . '">' . $file['name'] . '.' . $file['extension'] . '</a>'; }
                 $preview .= '</div>';

[php-blog-cvs] serendipity/include/admin images.inc.php,1.17,1.18

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13560/include/admin

Modified Files:
	images.inc.php 
Log Message:
fix bad/undefined variable passing.
Maybe this already fixes the issues people are having?


Index: images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/images.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- images.inc.php	9 Feb 2005 19:46:10 -0000	1.17
+++ images.inc.php	15 Feb 2005 12:07:01 -0000	1.18
@@ -143,7 +143,7 @@
                     echo THUMB_CREATED_DONE . '<br />';
                 }
                 // Insert into database
-                $image_id = serendipity_insertImageInDatabase($_FILES['userfile']['name'], $directory, $authorid);
+                $image_id = serendipity_insertImageInDatabase($tfile, $serendipity['POST']['target_directory'], $authorid);
             }
         }
     } else {
@@ -176,7 +176,7 @@
                     echo THUMB_CREATED_DONE . '<br />';
                 }
                 // Insert into database
-                $image_id = serendipity_insertImageInDatabase($_FILES['userfile']['name'], $directory, $authorid);
+                $image_id = serendipity_insertImageInDatabase($tfile, $serendipity['POST']['target_directory'], $authorid);
             } else {
                 echo ERROR_UNKNOWN_NOUPLOAD . '<br />';
             }

[php-blog-cvs] serendipity/plugins/serendipity_plugin_remoterss serendipity_plugin_remoterss.php,1.17,1.18

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_remoterss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4943/plugins/serendipity_plugin_remoterss

Modified Files:
	serendipity_plugin_remoterss.php 
Log Message:
If RSS feeds are encoded differently than UTF-8, we had a problem.
Let users specify the source encoding of an RSS feed, because Onyx RSS doesn't report the used charset.

Fixes import problems and displaying remote RSS feeds.


Index: serendipity_plugin_remoterss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_plugin_remoterss.php	9 Feb 2005 16:26:32 -0000	1.17
+++ serendipity_plugin_remoterss.php	15 Feb 2005 11:25:28 -0000	1.18
@@ -284,13 +284,13 @@
         $propbag->add('description',   PLUGIN_REMOTERSS_BLAHBLAH);
         $propbag->add('stackable',     true);
         $propbag->add('author',        'Udo Gerhards, Richard Thomas Harrison');
-        $propbag->add('version',       '1.0');
+        $propbag->add('version',       '1.1');
         $propbag->add('requirements',  array(
             'serendipity' => '0.8',
             'smarty'      => '2.6.7',
             'php'         => '4.1.0'
         ));
-        $propbag->add('configuration', array('number', 'displaydate', 'dateformat', 'sidebartitle', 'rssuri', 'target', 'cachetime', 'feedtype', 'bulletimg', 'markup'));
+        $propbag->add('configuration', array('number', 'displaydate', 'dateformat', 'sidebartitle', 'rssuri', 'charset', 'target', 'cachetime', 'feedtype', 'bulletimg', 'markup'));
     }
 
     function introspect_config_item($name, &$propbag) {
@@ -302,6 +302,25 @@
                 $propbag->add('default', 'false');
                 break;
 
+            case 'charset':
+                $propbag->add('type', 'radio');
+                $propbag->add('name', CHARSET);
+                $propbag->add('description', CHARSET);
+                $propbag->add('default', 'native');
+
+                $charsets = array();
+                if (LANG_CHARSET != 'UTF-8') {
+                    $charsets['value'][] = $charsets['desc'][] = 'UTF-8';
+                }
+                if (LANG_CHARSET != 'ISO-8859-1') {
+                    $charsets['value'][] = $charsets['desc'][] = 'ISO-8859-1';
+                }
+
+                $charsets['value'][] = 'native';
+                $charsets['desc'][]  = LANG_CHARSET;
+                $propbag->add('radio', $charsets);
+                break;
+
             case 'feedtype':
                 $select = array('rss' => 'RSS', 'opml' => 'OPML');
                 $propbag->add('type', 'select');
@@ -421,11 +440,11 @@
                         if (empty($item['title'])) {
                             continue;
                         }
-                        $content .= '<a href="' . $this->rss_utf8_decode($item['link']) . '" target="'.$target.'">';
+                        $content .= '<a href="' . $this->decode($item['link']) . '" target="'.$target.'">';
                         if (!empty($bulletimg)) {
                             $content .= '<img src="' . $bulletimg . '" border="0" alt="*" /> ';
                         }
-                        $content .= $this->rss_utf8_decode($item['title']) . "</a><br />\n";
+                        $content .= $this->decode($item['title']) . "</a><br />\n";
                         $item['timestamp'] = @strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date']);
                         if (!($item['timestamp'] == -1) AND ($displaydate == 'true')) {
                             $content .= '<div class="serendipitySideBarDate">'
@@ -462,23 +481,23 @@
                         $content = '';
                         while (($showAll || ($i < $number)) && ($item = $opml->getOPMLOutlineAttr($opmltree, $i))) {
                             if (!empty($item['url'])) {
-                                $url = $this->rss_utf8_decode($item['url']);
+                                $url = $this->decode($item['url']);
                             } elseif (!empty($item['htmlUrl'])) {
-                                $url = $this->rss_utf8_decode($item['htmlUrl']);
+                                $url = $this->decode($item['htmlUrl']);
                             } elseif (!empty($item['xmlUrl'])) {
-                                $url = $this->rss_utf8_decode($item['xmlUrl']);
+                                $url = $this->decode($item['xmlUrl']);
                             } elseif (!empty($item['urlHTTP'])) {
-                                $url = $this->rss_utf8_decode($item['urlHTTP']);
+                                $url = $this->decode($item['urlHTTP']);
                             } else {
                                 $url = '';
                             }
 
                             if (!empty($item['text'])) {
-                                $text = htmlspecialchars($this->rss_utf8_decode($item['text']));
+                                $text = htmlspecialchars($this->decode($item['text']));
                             } elseif (!empty($item['title'])) {
-                                $text = htmlspecialchars($this->rss_utf8_decode($item['title']));
+                                $text = htmlspecialchars($this->decode($item['title']));
                             } elseif (!empty($item['description'])) {
-                                $text = htmlspecialchars($this->rss_utf8_decode($item['description']));
+                                $text = htmlspecialchars($this->decode($item['description']));
                             } else {
                                 $text = '';
                             }
@@ -527,14 +546,26 @@
         }
     }
 
-    function rss_utf8_decode($string) {
-        if (strtolower(LANG_CHARSET) != 'utf-8') {
-            return utf8_decode($string);
-        } else {
-            return $string;
+    function decode($string) {
+        switch($this->get_config('charset', 'native')) {
+            case 'native':
+                return $string;
+
+            case 'ISO-8859-1':
+                if (function_exists('iconv')) {
+                    return iconv('ISO-8859-1', LANG_CHARSET, $string);
+                } elseif (function_exists('recode')) {
+                    return recode('iso-8859-1..' . LANG_CHARSET, $string);
+                } else {
+                    return $string;
+                }
+            
+            case 'UTF-8':
+            default:
+                return utf8_decode($string);
         }
     }
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/include/admin/importers generic.inc.php,1.5,1.6

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin/importers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4943/include/admin/importers

Modified Files:
	generic.inc.php 
Log Message:
If RSS feeds are encoded differently than UTF-8, we had a problem.
Let users specify the source encoding of an RSS feed, because Onyx RSS doesn't report the used charset.

Fixes import problems and displaying remote RSS feeds.


Index: generic.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/generic.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- generic.inc.php	26 Jan 2005 14:14:05 -0000	1.5
+++ generic.inc.php	15 Feb 2005 11:25:26 -0000	1.6
@@ -10,6 +10,15 @@
     var $inputFields = array();
 
     function Serendipity_Import_Generic($data) {
+        $charsets = array();
+        if (LANG_CHARSET != 'UTF-8') {
+            $charsets['UTF-8'] = 'UTF-8';
+        }
+        if (LANG_CHARSET != 'ISO-8859-1') {
+            $charset['ISO-8859-1'] = 'ISO-8859-1';
+        }
+        $charsets['native'] = LANG_CHARSET;
+
         $this->data = $data;
         $this->inputFields = array(array('text'    => RSS . ' ' . URL,
                                          'type'    => 'input',
@@ -26,6 +35,12 @@
                                          'name'    => 'category',
                                          'value'   => 0,
                                          'default' => $this->_getCategoryList()),
+                                         
+                                   array('text'    => CHARSET,
+                                         'type'    => 'list',
+                                         'name'    => 'charset',
+                                         'value'   => 'UTF-8',
+                                         'default' => $charsets),
 
                                     array('text'   => RSS_IMPORT_BODYONLY,
                                          'type'    => 'bool',
@@ -52,6 +67,26 @@
         return $ret;
     }
 
+    function decode($string) {
+        switch($this->data['charset']) {
+            case 'native':
+                return $string;
+
+            case 'ISO-8859-1':
+                if (function_exists('iconv')) {
+                    return iconv('ISO-8859-1', LANG_CHARSET, $string);
+                } elseif (function_exists('recode')) {
+                    return recode('iso-8859-1..' . LANG_CHARSET, $string);
+                } else {
+                    return $string;
+                }
+            
+            case 'UTF-8':
+            default:
+                return utf8_decode($string);
+        }
+    }
+
     function buildEntry($item, &$entry) {
         global $serendipity;
 
@@ -59,7 +94,7 @@
         $bodyonly = serendipity_get_bool($this->data['bodyonly']);
 
         if ($item['description']) {
-            $entry['body'] = utf8_decode($item['description']);
+            $entry['body'] = $this->decode($item['description']);
         }
 
         if ($item['content:encoded']) {
@@ -75,14 +110,14 @@
             // switch). We substract 4 letters because of possible '...' additions to an entry.
             $testbody = substr(trim(strip_tags($entry['body'])), 0, -4);
             if ($testbody != substr(trim(strip_tags($item['content:encoded'])), 0, strlen($testbody))) {
-                $data .= utf8_decode($item['content:encoded']);
+                $data .= $this->decode($item['content:encoded']);
             } else {
-                $data = utf8_decode($item['content:encoded']);
+                $data = $this->decode($item['content:encoded']);
             }
         }
 
-        $entry['title'] = utf8_decode($item['title']);
-        $entry['timestamp'] = utf8_decode(strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date']));
+        $entry['title'] = $this->decode($item['title']);
+        $entry['timestamp'] = $this->decode(strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date']));
         if ($entry['timestamp'] == -1) {
             $entry['timestamp'] = time();
         }
@@ -94,7 +129,7 @@
         }
 
         if (!empty($item['category'])) {
-            $cat = serendipity_fetchCategoryInfo(0, trim(utf8_decode($item['category'])));
+            $cat = serendipity_fetchCategoryInfo(0, trim($this->decode($item['category'])));
             if (is_array($cat) && isset($cat['categoryid'])) {
                 $entry['categories'][] = $cat['categoryid'];
             }

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.65,1.66 serendipity_lang_cn.inc.php,1.32,1.33 serendipity_lang_cs.inc.php,1.112,1.113 serendipity_lang_cz.inc.php,1.112,1.113 serendipity_lang_da.inc.php,1.132,1.133 serendipity_lang_de.inc.php,1.153,1.154 serendipity_lang_en.inc.php,1.134,1.135 serendipity_lang_es.inc.php,1.127,1.128 serendipity_lang_fi.inc.php,1.20,1.21 serendipity_lang_fr.inc.php,1.112,1.113 serendipity_lang_it.inc.php,1.51,1.52 serendipity_lang_ja.inc.php,1.31,1.32 serendipity_lang_ko.inc.php,1.20,1.21 serendipity_lang_nl.inc.php,1.88,1.89 serendipity_lang_no.inc.php,1.52,1.53 serendipity_lang_pt.inc.php,1.87,1.88 serendipity_lang_ru.inc.php,1.25,1.26 serendipity_lang_tn.inc.php,1.33,1.34 serendipity_lang_tw.inc.php,1.48,1.49 serendipity_lang_zh.inc.php,1.32,1.33

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4943/lang

Modified Files:
	serendipity_lang_bg.inc.php serendipity_lang_cn.inc.php 
	serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php 
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
	serendipity_lang_fi.inc.php serendipity_lang_fr.inc.php 
	serendipity_lang_it.inc.php serendipity_lang_ja.inc.php 
	serendipity_lang_ko.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_no.inc.php serendipity_lang_pt.inc.php 
	serendipity_lang_ru.inc.php serendipity_lang_tn.inc.php 
	serendipity_lang_tw.inc.php serendipity_lang_zh.inc.php 
Log Message:
If RSS feeds are encoded differently than UTF-8, we had a problem.
Let users specify the source encoding of an RSS feed, because Onyx RSS doesn't report the used charset.

Fixes import problems and displaying remote RSS feeds.


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- serendipity_lang_cs.inc.php	9 Feb 2005 17:06:07 -0000	1.112
+++ serendipity_lang_cs.inc.php	15 Feb 2005 11:25:34 -0000	1.113
@@ -680,6 +680,7 @@
 @define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
+@define('CHARSET', 'Charset');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- serendipity_lang_no.inc.php	9 Feb 2005 17:06:11 -0000	1.52
+++ serendipity_lang_no.inc.php	15 Feb 2005 11:25:37 -0000	1.53
@@ -679,5 +679,6 @@
 @define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
+@define('CHARSET', 'Charset');
 
 ?>
\ No newline at end of file

Index: serendipity_lang_zh.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_zh.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- serendipity_lang_zh.inc.php	9 Feb 2005 17:06:13 -0000	1.32
+++ serendipity_lang_zh.inc.php	15 Feb 2005 11:25:38 -0000	1.33
@@ -677,6 +677,7 @@
 @define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
+@define('CHARSET', 'Charset');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- serendipity_lang_en.inc.php	9 Feb 2005 17:06:08 -0000	1.134
+++ serendipity_lang_en.inc.php	15 Feb 2005 11:25:35 -0000	1.135
@@ -675,6 +675,7 @@
 @define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
+@define('CHARSET', 'Charset');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ja.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- serendipity_lang_ja.inc.php	10 Feb 2005 04:46:57 -0000	1.31
+++ serendipity_lang_ja.inc.php	15 Feb 2005 11:25:36 -0000	1.32
@@ -677,6 +677,7 @@
 @define('IMAGICK_EXEC_ERROR', '実行できませんでした: "%s", エラー: %s, 返り値: %d');
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', '要求に失敗: %s');
+@define('CHARSET', 'Charset');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- serendipity_lang_bg.inc.php	9 Feb 2005 17:06:07 -0000	1.65
+++ serendipity_lang_bg.inc.php	15 Feb 2005 11:25:28 -0000	1.66
@@ -663,6 +663,7 @@
 @define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
+@define('CHARSET', 'Charset');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_tw.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tw.inc.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- serendipity_lang_tw.inc.php	9 Feb 2005 17:06:13 -0000	1.48
+++ serendipity_lang_tw.inc.php	15 Feb 2005 11:25:38 -0000	1.49
@@ -678,6 +678,7 @@
 @define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
-
+@define('CHARSET', 'Charset');
+ 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- serendipity_lang_cz.inc.php	9 Feb 2005 17:06:07 -0000	1.112
+++ serendipity_lang_cz.inc.php	15 Feb 2005 11:25:35 -0000	1.113
@@ -680,6 +680,7 @@
 @define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
+@define('CHARSET', 'Charset');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- serendipity_lang_pt.inc.php	9 Feb 2005 17:06:12 -0000	1.87
+++ serendipity_lang_pt.inc.php	15 Feb 2005 11:25:37 -0000	1.88
@@ -679,6 +679,7 @@
 @define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
+@define('CHARSET', 'Charset');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_it.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- serendipity_lang_it.inc.php	9 Feb 2005 17:06:09 -0000	1.51
+++ serendipity_lang_it.inc.php	15 Feb 2005 11:25:36 -0000	1.52
@@ -680,6 +680,7 @@
 @define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
+@define('CHARSET', 'Charset');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- serendipity_lang_da.inc.php	9 Feb 2005 17:06:08 -0000	1.132
+++ serendipity_lang_da.inc.php	15 Feb 2005 11:25:35 -0000	1.133
@@ -679,6 +679,7 @@
 @define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
+@define('CHARSET', 'Charset');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- serendipity_lang_fr.inc.php	9 Feb 2005 17:06:09 -0000	1.112
+++ serendipity_lang_fr.inc.php	15 Feb 2005 11:25:36 -0000	1.113
@@ -682,6 +682,7 @@
 @define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
+@define('CHARSET', 'Charset');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_fi.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fi.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_lang_fi.inc.php	9 Feb 2005 17:06:09 -0000	1.20
+++ serendipity_lang_fi.inc.php	15 Feb 2005 11:25:36 -0000	1.21
@@ -675,6 +675,7 @@
 @define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
+@define('CHARSET', 'Charset');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_ko.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ko.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_lang_ko.inc.php	9 Feb 2005 17:06:10 -0000	1.20
+++ serendipity_lang_ko.inc.php	15 Feb 2005 11:25:36 -0000	1.21
@@ -680,6 +680,7 @@
 @define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
+@define('CHARSET', 'Charset');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- serendipity_lang_es.inc.php	9 Feb 2005 17:06:09 -0000	1.127
+++ serendipity_lang_es.inc.php	15 Feb 2005 11:25:36 -0000	1.128
@@ -681,6 +681,7 @@
 @define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
+@define('CHARSET', 'Charset');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_cn.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cn.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- serendipity_lang_cn.inc.php	9 Feb 2005 17:06:07 -0000	1.32
+++ serendipity_lang_cn.inc.php	15 Feb 2005 11:25:34 -0000	1.33
@@ -677,6 +677,7 @@
 @define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
+@define('CHARSET', 'Charset');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_tn.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tn.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- serendipity_lang_tn.inc.php	9 Feb 2005 17:06:12 -0000	1.33
+++ serendipity_lang_tn.inc.php	15 Feb 2005 11:25:38 -0000	1.34
@@ -678,6 +678,7 @@
 @define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
+@define('CHARSET', 'Charset');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_ru.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ru.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- serendipity_lang_ru.inc.php	9 Feb 2005 17:06:12 -0000	1.25
+++ serendipity_lang_ru.inc.php	15 Feb 2005 11:25:38 -0000	1.26
@@ -680,6 +680,7 @@
 @define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
+@define('CHARSET', 'Charset');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- serendipity_lang_de.inc.php	9 Feb 2005 17:06:08 -0000	1.153
+++ serendipity_lang_de.inc.php	15 Feb 2005 11:25:35 -0000	1.154
@@ -677,6 +677,7 @@
 @define('IMAGICK_EXEC_ERROR', 'Konnte folgendes Programm nicht ausführen: "%s", Fehlermeldung: %s, Rückgabewert: %d');
 @define('INSTALL_OFFSET_DESC', 'Wieviele Stunden liegen zwischen der Uhrzeit des Servers (aktuell: %clock%) und der eigenen Zeitzone');
 @define('UNMET_REQUIREMENTS', 'Bedingung unerfüllt: %s');
+@define('CHARSET', 'Charset');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- serendipity_lang_nl.inc.php	9 Feb 2005 17:06:11 -0000	1.88
+++ serendipity_lang_nl.inc.php	15 Feb 2005 11:25:37 -0000	1.89
@@ -681,6 +681,7 @@
 @define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver (current: %clock%) and your desired time zone'); // Translate
 @define('UNMET_REQUIREMENTS', 'Requirements failed: %s'); // Translate
+@define('CHARSET', 'Charset');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity/include/admin import.inc.php,1.8,1.9

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3056/include/admin

Modified Files:
	import.inc.php 
Log Message:
power to the people


Index: import.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/import.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- import.inc.php	3 Feb 2005 18:55:19 -0000	1.8
+++ import.inc.php	15 Feb 2005 11:15:30 -0000	1.9
@@ -5,7 +5,7 @@
 if (IN_serendipity !== true) {
     die ("Don't hack!");
 }
-if ( $serendipity['serendipityUserlevel'] != USERLEVEL_ADMIN ) {
+if ( $serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF ) {
     return;
 }
 

[php-blog-cvs] serendipity/include/admin users.inc.php,1.11,1.12

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32733/include/admin

Modified Files:
	users.inc.php 
Log Message:
Users cannot create users with their own userlevel!
Fixes Bug #1122539


Index: users.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/users.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- users.inc.php	3 Feb 2005 18:55:19 -0000	1.11
+++ users.inc.php	15 Feb 2005 08:29:13 -0000	1.12
@@ -28,7 +28,7 @@
 
 /* Save new user */
 if (isset($_POST['SAVE_NEW'])) {
-    if ($serendipity['POST']['userlevel'] >= $serendipity['serendipityUserlevel'] && $serendipity['serendipityUserlevel'] < USERLEVEL_ADMIN) {
+    if ($_POST['userlevel'] >= $serendipity['serendipityUserlevel'] && $serendipity['serendipityUserlevel'] < USERLEVEL_ADMIN) {
         echo '<div class="serendipityAdminMsgError">' . CREATE_NOT_AUTHORIZED . '</div>';
     } else {
         $enc_pass = md5($_POST['pass']);

[php-blog-cvs] serendipity/docs NEWS,1.60,1.61

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8053/docs

Modified Files:
	NEWS 
Log Message:
sunlog and geeklog importers. I'm spent. :-D


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- NEWS	14 Feb 2005 14:52:05 -0000	1.60
+++ NEWS	14 Feb 2005 16:55:40 -0000	1.61
@@ -3,17 +3,15 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
-    * Added native import for b2Evolution "Paris" entries, comments,
-      categories and authors (garvinhicking)
-
-    * Added native import for boastMachine 3.0 entries, comments,
-      categories and authors (garvinhicking)
-
-    * Added native import for Textpattern 1.0rc1 entries, comments,
-      categories and authors (garvinhicking)
-
-    * Added native import for pMachine Pro 2.4 entries, comments,
-      categories and authors (garvinhicking)
+    * Added native importers to migrate entries, comments,
+      categories and authors for: 
+      - geeklog 1.3.11
+      - sunlog 0.4.4
+      - b2Evolution "Paris"
+      - boastMachine 3.0
+      - Textpattern 1.0rc1
+      - pMachine Pro 2.4
+      (garvinhicking)
 
     * Remember last state of media library (sort order, files per page,
       directory, sortfield), via JavaScript+Cookies (garvinhicking)

[php-blog-cvs] serendipity/include/admin/importers geeklog.inc.php,NONE,1.1 sunlog.inc.php,NONE,1.1

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin/importers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8053/include/admin/importers

Added Files:
	geeklog.inc.php sunlog.inc.php 
Log Message:
sunlog and geeklog importers. I'm spent. :-D


--- NEW FILE: geeklog.inc.php ---
<?php # $Id: geeklog.inc.php,v 1.1 2005/02/14 16:55:41 garvinhicking Exp $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved.  See LICENSE file for licensing details

/*****************************************************************
 *  geeklog  Importer,    by Garvin Hicking *
 * ****************************************************************/

class Serendipity_Import_geeklog extends Serendipity_Import {
    var $info        = array('software' => 'Geeklog 1.3.11');
    var $data        = array();
    var $inputFields = array();
    var $categories  = array();
    var $trans_table = '';

    function getImportNotes() {
        return 'GeekLog has a granular control over access privileges which cannot be migrated to Serendipity. All Users will be migrated as Superusers, you may need to set them to editor or chief users manually after import.';
    }

    function Serendipity_Import_geeklog($data) {
        $this->data = $data;
        $this->inputFields = array(array('text' => INSTALL_DBHOST,
                                         'type' => 'input',
                                         'name' => 'host'),

                                   array('text' => INSTALL_DBUSER,
                                         'type' => 'input',
                                         'name' => 'user'),

                                   array('text' => INSTALL_DBPASS,
                                         'type' => 'protected',
                                         'name' => 'pass'),

                                   array('text' => INSTALL_DBNAME,
                                         'type' => 'input',
                                         'name' => 'name'),

                                   array('text' => INSTALL_DBPREFIX,
                                         'type' => 'input',
                                         'name' => 'prefix',
                                         'default' => 'gl_'),

                                   array('text'    => ACTIVATE_AUTODISCOVERY,
                                         'type'    => 'bool',
                                         'name'    => 'autodiscovery',
                                         'default' => 'false')
                            );
    }

    function validateData() {
        return sizeof($this->data);
    }

    function getInputFields() {
        return $this->inputFields;
    }

    function strtrRecursive($data, $trans_table) {
        foreach ($data as $key => $val) {
            if (is_array($val)) {
                $data[$key] = $this->strtrRecursive($val);
            }
            else {
                $data[$key] = strtr($val, $trans_table);
            }
        }

        return $data;
    }

    function import() {
        global $serendipity;

        // Save this so we can return it to its original value at the end of this method.
        $noautodiscovery = isset($serendipity['noautodiscovery']) ? $serendipity['noautodiscovery'] : false;

        if ($this->data['autodiscovery'] == 'false') {
            $serendipity['noautodiscovery'] = 1;
        }

        // We need to convert interesting characters to HTML entities, except for those with special relevance to HTML.
        $this->trans_table = get_html_translation_table(HTML_ENTITIES);
        foreach (get_html_translation_table(HTML_SPECIALCHARS) as $char => $encoded)
            if (isset($this->trans_table[$char]))
                unset($this->trans_table[$char]);

        $this->data['prefix'] = serendipity_db_escape_string($this->data['prefix']);
        $users = array();
        $entries = array();

        if (!extension_loaded('mysql')) {
            return MYSQL_REQUIRED;
        }

        $gdb = @mysql_connect($this->data['host'], $this->data['user'], $this->data['pass']);
        if (!$gdb) {
            return sprintf(COULDNT_CONNECT, $this->data['host']);
        }

        if (!@mysql_select_db($this->data['name'])) {
            return sprintf(COULDNT_SELECT_DB, mysql_error($gdb));
        }

        /* Users */
        $res = @mysql_query("SELECT uid        AS ID, 
                                    username   AS user_login, 
                                    passwd     AS user_pass,
                                    email      AS user_email, 
                                    homepage   AS user_url
                               FROM {$this->data['prefix']}users", $gdb);
        if (!$res) {
            return sprintf(COULDNT_SELECT_USER_INFO, mysql_error($gdb));
        }
        
        for ($x=0, $max_x = mysql_num_rows($res); $x < $max_x ; $x++ ) {
            $users[$x] = mysql_fetch_assoc($res);

            $data = array('right_publish' => 1,
                          'username'      => $users[$x]['user_login'],
                          'email'         => $users[$x]['user_email'],
                          'userlevel'     => USERLEVEL_ADMIN,
                          'password'      => $users[$x]['user_pass']); // MD5 compatible

            serendipity_db_insert('authors', $this->strtrRecursive($data, $this->trans_table));
            echo mysql_error();
            $users[$x]['authorid'] = serendipity_db_insert_id('authors', 'authorid');
        }

        /* Categories */
        $res = @mysql_query("SELECT tid AS cat_ID, topic AS cat_name, topic AS category_description FROM {$this->data['prefix']}topics ORDER BY tid;", $gdb);
        if (!$res) {
            return sprintf(COULDNT_SELECT_CATEGORY_INFO, mysql_error($gdb));
        }

        // Get all the info we need
        for ($x=0, $max_x = mysql_num_rows($res) ; $x < $max_x ; $x++) {
            $categories[] = mysql_fetch_assoc($res);
        }

        // Insert all categories as top level (we need to know everyone's ID before we can represent the hierarchy).
        for ($x=0, $max_x = sizeof($categories) ; $x < $max_x ; $x++ ) {
            $cat = array('category_name'        => $categories[$x]['cat_name'],
                         'category_description' => $categories[$x]['category_description'],
                         'parentid'             => 0, // <---
                         'category_left'        => 0,
                         'category_right'       => 0);

            serendipity_db_insert('category', $this->strtrRecursive($cat, $this->trans_table));
            $categories[$x]['categoryid'] = serendipity_db_insert_id('category', 'categoryid');
        }

        serendipity_rebuildCategoryTree();

        /* Entries */
        $res = @mysql_query("SELECT * FROM {$this->data['prefix']}stories ORDER BY sid;", $gdb);
        if (!$res) {
            return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($gdb));
        }

        for ($x=0, $max_x = mysql_num_rows($res) ; $x < $max_x ; $x++ ) {
            $entries[$x] = mysql_fetch_assoc($res);

            $entry = array('title'          => $entries[$x]['title'],
                           'isdraft'        => ($entries[$x]['draft_flag'] == '0') ? 'false' : 'true',
                           'allow_comments' => ($entries[$x]['comments'] == '1' ) ? 'true' : 'false',
                           'timestamp'      => strtotime($entries[$x]['date']),
                           'body'           => strtr($entries[$x]['introtext'], $this->trans_table),
                           'extended'       => strtr($entries[$x]['bodytext'], $this->trans_table),
                           );

            $entry['authorid'] = '';
            $entry['author']   = '';
            foreach ($users as $user) {
                if ($user['ID'] == $entries[$x]['uid']) {
                    $entry['authorid'] = $user['authorid'];
                    $entry['author']   = $user['user_login'];
                    break;
                }
            }

            if (!is_int($entries[$x]['entryid'] = serendipity_updertEntry($entry))) {
                return $entries[$x]['entryid'];
            }

            /* Entry/category */
            foreach ($categories as $category) {
                if ($category['cat_ID'] == $entries[$x]['tid'] ) {
                    $data = array('entryid'    => $entries[$x]['entryid'],
                                  'categoryid' => $category['categoryid']);
                    serendipity_db_insert('entrycat', $this->strtrRecursive($data, $this->trans_table));
                    break;
                }
            }
        }
        
        /* Comments */
        $res = @mysql_query("SELECT * FROM {$this->data['prefix']}comments;", $gdb);
        if (!$res) {
            return sprintf(COULDNT_SELECT_COMMENT_INFO, mysql_error($gdb));
        }

        while ($a = mysql_fetch_assoc($res)) {
            foreach ($entries as $entry) {
                if ($entry['sid'] == $a['sid'] ) {
                    $username = '';
                    $mail     = '';
                    $url      = '';

                    foreach($users AS $user) {
                        if ($user['ID'] == $a['uid']) {
                            $username = $user['user_login'];
                            $mail = $user['user_email'];
                            $url  = $user['user_url'];
                            break;
                        }
                    }

                    $comment = array('entry_id ' => $entry['entryid'],
                                     'parent_id' => 0,
                                     'timestamp' => strtotime($a['date']),
                                     'author'    => $username,
                                     'email'     => $mail,
                                     'url'       => $url,
                                     'ip'        => $a['ip'],
                                     'status'    => 'approved',
                                     'body'      => $a['comment'],
                                     'type'      => 'NORMAL');

                    serendipity_db_insert('comments', $this->strtrRecursive($comment, $this->trans_table));
                    $cid = serendipity_db_insert_id('comments', 'id');
                    serendipity_approveComment($cid, $entry['entryid'], true);
                }
            }
        }

        $serendipity['noautodiscovery'] = $noautodiscovery;

        // That was fun.
        return true;
    }
}

return 'Serendipity_Import_geeklog';

/* vim: set sts=4 ts=4 expandtab : */
?>

--- NEW FILE: sunlog.inc.php ---
<?php # $Id: sunlog.inc.php,v 1.1 2005/02/14 16:55:41 garvinhicking Exp $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved.  See LICENSE file for licensing details

/*****************************************************************
 *  sunlog  Importer,    by Garvin Hicking *
 * ****************************************************************/

class Serendipity_Import_sunlog extends Serendipity_Import {
    var $info        = array('software' => 'Sunlog 0.4.4');
    var $data        = array();
    var $inputFields = array();
    var $categories  = array();
    var $trans_table = '';

    function getImportNotes() {
        return 'Sunlog uses a crypted string to represent stored passwords. Thus, those passwords are incompatible with the MD5 hashing of Serendipity and can not be reconstructed. The passwords for all users have been set to "sunlog". <strong>You need to modify the passwords manually for each user</strong>, we are sorry for that inconvenience.<br />'
             . '<br />'
             . 'Sunlog has a granular control over access privileges which cannot be migrated to Serendipity. All Users will be migrated as Superusers, you may need to set them to editor or chief users manually after import.';
    }

    function Serendipity_Import_sunlog($data) {
        $this->data = $data;
        $this->inputFields = array(array('text' => INSTALL_DBHOST,
                                         'type' => 'input',
                                         'name' => 'host'),

                                   array('text' => INSTALL_DBUSER,
                                         'type' => 'input',
                                         'name' => 'user'),

                                   array('text' => INSTALL_DBPASS,
                                         'type' => 'protected',
                                         'name' => 'pass'),

                                   array('text' => INSTALL_DBNAME,
                                         'type' => 'input',
                                         'name' => 'name'),

                                   array('text' => INSTALL_DBPREFIX,
                                         'type' => 'input',
                                         'name' => 'prefix',
                                         'default' => 'sunlog_'),

                                   array('text'    => ACTIVATE_AUTODISCOVERY,
                                         'type'    => 'bool',
                                         'name'    => 'autodiscovery',
                                         'default' => 'false')
                            );
    }

    function validateData() {
        return sizeof($this->data);
    }

    function getInputFields() {
        return $this->inputFields;
    }

    function strtrRecursive($data, $trans_table) {
        foreach ($data as $key => $val) {
            if (is_array($val)) {
                $data[$key] = $this->strtrRecursive($val);
            }
            else {
                $data[$key] = strtr($val, $trans_table);
            }
        }

        return $data;
    }

    function import() {
        global $serendipity;

        // Save this so we can return it to its original value at the end of this method.
        $noautodiscovery = isset($serendipity['noautodiscovery']) ? $serendipity['noautodiscovery'] : false;

        if ($this->data['autodiscovery'] == 'false') {
            $serendipity['noautodiscovery'] = 1;
        }

        // We need to convert interesting characters to HTML entities, except for those with special relevance to HTML.
        $this->trans_table = get_html_translation_table(HTML_ENTITIES);
        foreach (get_html_translation_table(HTML_SPECIALCHARS) as $char => $encoded)
            if (isset($this->trans_table[$char]))
                unset($this->trans_table[$char]);

        $this->data['prefix'] = serendipity_db_escape_string($this->data['prefix']);
        $users = array();
        $entries = array();

        if (!extension_loaded('mysql')) {
            return MYSQL_REQUIRED;
        }

        $sunlogdb = @mysql_connect($this->data['host'], $this->data['user'], $this->data['pass']);
        if (!$sunlogdb) {
            return sprintf(COULDNT_CONNECT, $this->data['host']);
        }

        if (!@mysql_select_db($this->data['name'])) {
            return sprintf(COULDNT_SELECT_DB, mysql_error($sunlogdb));
        }

        /* Users */
        $res = @mysql_query("SELECT id         AS ID, 
                                    name       AS user_login, 
                                    email      AS user_email, 
                                    homepage   AS user_url
                               FROM {$this->data['prefix']}users", $sunlogdb);
        if (!$res) {
            return sprintf(COULDNT_SELECT_USER_INFO, mysql_error($sunlogdb));
        }
        
        for ($x=0, $max_x = mysql_num_rows($res); $x < $max_x ; $x++ ) {
            $users[$x] = mysql_fetch_assoc($res);

            $data = array('right_publish' => 1,
                          'username'      => $users[$x]['user_login'],
                          'email'         => $users[$x]['user_email'],
                          'userlevel'     => USERLEVEL_ADMIN,
                          'password'      => md5('sunlog'));

            serendipity_db_insert('authors', $this->strtrRecursive($data, $this->trans_table));
            echo mysql_error();
            $users[$x]['authorid'] = serendipity_db_insert_id('authors', 'authorid');
        }

        /* Categories */
        if (!$this->importCategories(null)) {
            return sprintf(COULDNT_SELECT_CATEGORY_INFO, mysql_error($sunlogdb));
        }
        serendipity_rebuildCategoryTree();

        /* Entries */
        $res = @mysql_query("SELECT * FROM {$this->data['prefix']}articles ORDER BY id;", $sunlogdb);
        if (!$res) {
            return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($sunlogdb));
        }

        for ($x=0, $max_x = mysql_num_rows($res) ; $x < $max_x ; $x++ ) {
            $entries[$x] = mysql_fetch_assoc($res);

            $entry = array('title'          => $entries[$x]['title'],
                           'isdraft'        => ($entries[$x]['draft'] == '0') ? 'false' : 'true',
                           'allow_comments' => ($entries[$x]['c_comments'] == '1' ) ? 'true' : 'false',
                           'timestamp'      => strtotime($entries[$x]['timestamp']),
                           'body'           => strtr($entries[$x]['lead_converted'], $this->trans_table),
                           'extended'       => strtr($entries[$x]['article_converted'], $this->trans_table),
                           );

            $entry['authorid'] = '';
            $entry['author']   = '';
            foreach ($users as $user) {
                if ($user['ID'] == $entries[$x]['author']) {
                    $entry['authorid'] = $user['authorid'];
                    $entry['author']   = $user['user_login'];
                    break;
                }
            }

            if (!is_int($entries[$x]['entryid'] = serendipity_updertEntry($entry))) {
                return $entries[$x]['entryid'];
            }
        }
        
        /* Even more category stuff */
        $res = @mysql_query("SELECT * FROM {$this->data['prefix']}transfer_c;", $sunlogdb);
        if (!$res) {
            return sprintf(COULDNT_SELECT_CATEGORY_INFO, mysql_error($sunlogdb));
        }
        
        for ($x=0, $max_x = mysql_num_rows($res) ; $x < $max_x ; $x++ ) {
            $entrycat = mysql_fetch_assoc($res);
            
            $entryid = 0;
            $categoryid = 0;
            foreach($entries AS $entry) {
                if ($entry['id'] == $entrycat['article']) {
                    $entryid = $entry['entryid'];
                    break;
                }
            }
            
            foreach($this->categories AS $category) {
                if ($category['id'] == $entrycat['category']) {
                    $categoryid = $category['categoryid'];
                }
            }

            if ($entryid > 0 && $categoryid > 0) {
                $data = array('entryid'    => $entryid,
                              'categoryid' => $categoryid);
                serendipity_db_insert('entrycat', $this->strtrRecursive($data, $this->trans_table));
            }
        }        

        /* Comments */
        $res = @mysql_query("SELECT * FROM {$this->data['prefix']}c_comments;", $sunlogdb);
        if (!$res) {
            return sprintf(COULDNT_SELECT_COMMENT_INFO, mysql_error($sunlogdb));
        }

        while ($a = mysql_fetch_assoc($res)) {
            foreach ($entries as $entry) {
                if ($entry['id'] == $a['for_entry'] ) {
                    $username = '';
                    $mail     = '';
                    $url      = '';

                    foreach($users AS $user) {
                        if ($user['ID'] == $a['user']) {
                            $username = $user['user_login'];
                            $mail = $user['user_email'];
                            $url  = $user['user_url'];
                            break;
                        }
                    }

                    $comment = array('entry_id ' => $entry['entryid'],
                                     'parent_id' => 0,
                                     'timestamp' => strtotime($a['insertdate']),
                                     'author'    => $username,
                                     'email'     => $mail,
                                     'url'       => $url,
                                     'ip'        => '',
                                     'status'    => 'approved',
                                     'body'      => $a['comment'],
                                     'type'      => 'NORMAL');

                    serendipity_db_insert('comments', $this->strtrRecursive($comment, $this->trans_table));
                    $cid = serendipity_db_insert_id('comments', 'id');
                    serendipity_approveComment($cid, $entry['entryid'], true);
                }
            }
        }

        $serendipity['noautodiscovery'] = $noautodiscovery;

        // That was fun.
        return true;
    }

    function importCategories($parentid = 0, $new_parentid = 0) {
        $where = "WHERE parent = '" . mysql_escape_string($parentid) . "'";

        $res = mysql_query("SELECT * FROM {$this->data['prefix']}categories
                                     " . $where);
        if (!$res) {
            echo mysql_error();
            return false;
        }

        // Get all the info we need
        for ($x=0, $max_x = mysql_num_rows($res) ; $x < $max_x ; $x++) {
            $row = mysql_fetch_assoc($res);
            $cat = array('category_name'        => $row['title'],
                         'category_description' => $row['optional_1'] . ' ' . $row['optional_2'] . ' ' . $row['optional_3'],
                         'parentid'             => (int)$new_parentid,
                         'category_left'        => 0,
                         'category_right'       => 0);

            serendipity_db_insert('category', $this->strtrRecursive($cat, $this->trans_table));
            $row['categoryid']  = serendipity_db_insert_id('category', 'categoryid');
            $this->categories[] = $row;
            $this->importCategories($row['id'], $row['categoryid']);
        }
        
        return true;
    }
}

return 'Serendipity_Import_sunlog';

/* vim: set sts=4 ts=4 expandtab : */
?>

[php-blog-cvs] serendipity rss.php,1.40,1.41

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050

Modified Files:
	rss.php 
Log Message:
Ground control to major b0rk...


Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- rss.php	9 Feb 2005 15:26:02 -0000	1.40
+++ rss.php	14 Feb 2005 16:23:53 -0000	1.41
@@ -247,6 +247,7 @@
     die("Invalid RSS version specified\n");
 }
 
+unset($entries['display_dat']); // Only needed for headers.
 serendipity_printEntries_rss($entries, $version, $comments, $fullFeed);
 
 switch ($version) {

[php-blog-cvs] serendipity/include/admin/importers b2evolution.inc.php,NONE,1.1

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin/importers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24262/include/admin/importers

Added Files:
	b2evolution.inc.php 
Log Message:
added b2 native import.


--- NEW FILE: b2evolution.inc.php ---
<?php # $Id: b2evolution.inc.php,v 1.1 2005/02/14 14:52:05 garvinhicking Exp $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved.  See LICENSE file for licensing details

/*****************************************************************
 *  b2evolution  Importer,   by Garvin Hicking *
 * ****************************************************************/

class Serendipity_Import_b2evolution extends Serendipity_Import {
    var $info        = array('software' => 'b2Evolution 0.9.0.11 Paris');
    var $data        = array();
    var $inputFields = array();
    var $categories  = array();
    var $trans_table = '';

    function getImportNotes() {
        return '';
    }

    function Serendipity_Import_b2evolution($data) {
        $this->data = $data;
        $this->inputFields = array(array('text' => INSTALL_DBHOST,
                                         'type' => 'input',
                                         'name' => 'host'),

                                   array('text' => INSTALL_DBUSER,
                                         'type' => 'input',
                                         'name' => 'user'),

                                   array('text' => INSTALL_DBPASS,
                                         'type' => 'protected',
                                         'name' => 'pass'),

                                   array('text' => INSTALL_DBNAME,
                                         'type' => 'input',
                                         'name' => 'name'),

                                   array('text'    => ACTIVATE_AUTODISCOVERY,
                                         'type'    => 'bool',
                                         'name'    => 'autodiscovery',
                                         'default' => 'false')
                            );
    }

    function validateData() {
        return sizeof($this->data);
    }

    function getInputFields() {
        return $this->inputFields;
    }

    function strtrRecursive($data, $trans_table) {
        foreach ($data as $key => $val) {
            if (is_array($val)) {
                $data[$key] = $this->strtrRecursive($val);
            }
            else {
                $data[$key] = strtr($val, $trans_table);
            }
        }

        return $data;
    }

    function import() {
        global $serendipity;

        // Save this so we can return it to its original value at the end of this method.
        $noautodiscovery = isset($serendipity['noautodiscovery']) ? $serendipity['noautodiscovery'] : false;

        if ($this->data['autodiscovery'] == 'false') {
            $serendipity['noautodiscovery'] = 1;
        }

        // We need to convert interesting characters to HTML entities, except for those with special relevance to HTML.
        $this->trans_table = get_html_translation_table(HTML_ENTITIES);
        foreach (get_html_translation_table(HTML_SPECIALCHARS) as $char => $encoded)
            if (isset($this->trans_table[$char]))
                unset($this->trans_table[$char]);

        $users = array();
        $entries = array();

        if (!extension_loaded('mysql')) {
            return MYSQL_REQUIRED;
        }

        $b2db = @mysql_connect($this->data['host'], $this->data['user'], $this->data['pass']);
        if (!$b2db) {
            return sprintf(COULDNT_CONNECT, $this->data['host']);
        }

        if (!@mysql_select_db($this->data['name'])) {
            return sprintf(COULDNT_SELECT_DB, mysql_error($b2db));
        }

        /* Users */
        $res = @mysql_query("SELECT ID         AS ID, 
                                    user_login AS user_login, 
                                    user_pass  AS user_pass,
                                    user_email AS user_email, 
                                    user_level AS user_level,
                                    user_url   AS user_url
                               FROM evo_users", $b2db);
        if (!$res) {
            return sprintf(COULDNT_SELECT_USER_INFO, mysql_error($b2db));
        }
        
        for ($x=0, $max_x = mysql_num_rows($res); $x < $max_x ; $x++ ) {
            $users[$x] = mysql_fetch_assoc($res);

            $data = array('right_publish' => ($users[$x]['user_level'] >= 2) ? 1 : 0,
                          'username'      => $users[$x]['user_login'],
                          'email'         => $users[$x]['user_email'],
                          'password'      => $users[$x]['user_pass']); // MD5 compatible

            if ( $users[$x]['user_level'] <= 2 ) {
                $data['userlevel'] = USERLEVEL_EDITOR;
            } elseif ($users[$x]['user_level'] <= 9) {
                $data['userlevel'] = USERLEVEL_CHIEF;
            } else {
                $data['userlevel'] = USERLEVEL_ADMIN;
            }

            serendipity_db_insert('authors', $this->strtrRecursive($data, $this->trans_table));
            $users[$x]['authorid'] = serendipity_db_insert_id('authors', 'authorid');
        }

        /* Categories */
        if (!$this->importCategories(null)) {
            return sprintf(COULDNT_SELECT_CATEGORY_INFO, mysql_error($b2db));
        }
        serendipity_rebuildCategoryTree();

        /* Entries */
        $res = @mysql_query("SELECT * FROM evo_posts ORDER BY ID;", $b2db);
        if (!$res) {
            return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($b2db));
        }

        for ($x=0, $max_x = mysql_num_rows($res) ; $x < $max_x ; $x++ ) {
            $entries[$x] = mysql_fetch_assoc($res);

            $entry = array('title'          => $entries[$x]['post_title'],
                           'isdraft'        => ($entries[$x]['post_status'] == 'published') ? 'false' : 'true',
                           'allow_comments' => ($entries[$x]['post_comments'] == 'open' ) ? 'true' : 'false',
                           'timestamp'      => strtotime($entries[$x]['post_issue_date']),
                           'body'           => strtr($entries[$x]['post_content'], $this->trans_table));

            $entry['authorid'] = '';
            $entry['author']   = '';
            foreach ($users as $user) {
                if ($user['ID'] == $entries[$x]['post_author']) {
                    $entry['authorid'] = $user['authorid'];
                    $entry['author']   = $user['user_login'];
                    break;
                }
            }

            if (!is_int($entries[$x]['entryid'] = serendipity_updertEntry($entry))) {
                return $entries[$x]['entryid'];
            }

            /* Entry/category */
            foreach ($this->categories as $category) {
                if ($category['cat_ID'] == $entries[$x]['post_category'] ) {
                    $data = array('entryid'    => $entries[$x]['entryid'],
                                  'categoryid' => $category['categoryid']);
                    serendipity_db_insert('entrycat', $this->strtrRecursive($data, $this->trans_table));
                    break;
                }
            }
        }
        
        /* Even more category stuff */
        $res = @mysql_query("SELECT * FROM evo_postcats;", $b2db);
        if (!$res) {
            return sprintf(COULDNT_SELECT_CATEGORY_INFO, mysql_error($b2db));
        }
        
        for ($x=0, $max_x = mysql_num_rows($res) ; $x < $max_x ; $x++ ) {
            $entrycat = mysql_fetch_assoc($res);
            
            $entryid = 0;
            $categoryid = 0;
            foreach($entries AS $entry) {
                if ($entry['ID'] == $entrycat['postcat_post_ID']) {
                    $entryid = $entry['entryid'];
                    break;
                }
            }
            
            foreach($this->categories AS $category) {
                if ($category['cat_ID'] == $entrycat['postcat_cat_ID']) {
                    $categoryid = $category['categoryid'];
                }
            }

            if ($entryid > 0 && $categoryid > 0) {
                $data = array('entryid'    => $entryid,
                              'categoryid' => $categoryid);
                serendipity_db_insert('entrycat', $this->strtrRecursive($data, $this->trans_table));
            }
        }        

        /* Comments */
        $res = @mysql_query("SELECT * FROM evo_comments;", $b2db);
        if (!$res) {
            return sprintf(COULDNT_SELECT_COMMENT_INFO, mysql_error($b2db));
        }

        while ($a = mysql_fetch_assoc($res)) {
            foreach ($entries as $entry) {
                if ($entry['ID'] == $a['comment_post_ID'] ) {
                    $username = '';
                    $mail     = '';
                    $url      = '';
                    if (!empty($a['comment_author_ID'])) {
                        foreach($users AS $user) {
                            if ($user['ID'] == $a['comment_author_ID']) {
                                $username = $user['user_login'];
                                $mail = $user['user_email'];
                                $url  = $user['user_url'];
                                break;
                            }
                        }
                    }

                    if (empty($username) && empty($mail)) {
                        $username = $a['comment_author'];
                        $mail = $a['comment_author_email'];
                        $url = $a['comment_author_url'];
                    }

                    $comment = array('entry_id ' => $entry['entryid'],
                                     'parent_id' => 0,
                                     'timestamp' => strtotime($a['comment_date']),
                                     'author'    => $username,
                                     'email'     => $mail,
                                     'url'       => $url,
                                     'ip'        => $a['comment_author_IP'],
                                     'status'    => ($a['comment_status'] == 'published' ? 'approved' : 'pending'),
                                     'body'      => $a['comment_content'],
                                     'type'      => 'NORMAL');

                    serendipity_db_insert('comments', $this->strtrRecursive($comment, $this->trans_table));
                    if ($a['comment_status'] == 'published') {
                        $cid = serendipity_db_insert_id('comments', 'id');
                        serendipity_approveComment($cid, $entry['entryid'], true);
                    }
                }
            }
        }

        $serendipity['noautodiscovery'] = $noautodiscovery;

        // That was fun.
        return true;
    }

    function importCategories($parentid = 0, $new_parentid = 0) {
        if (is_null($parentid)) {
            $where = 'WHERE ISNULL(cat_parent_ID)';
        } else {
            $where = "WHERE cat_parent_ID = '" . mysql_escape_string($parentid) . "'";
        }

        $res = mysql_query("SELECT * FROM evo_categories
                                     " . $where);
        if (!$res) {
            echo mysql_error();
            return false;
        }

        // Get all the info we need
        for ($x=0, $max_x = mysql_num_rows($res) ; $x < $max_x ; $x++) {
            $row = mysql_fetch_assoc($res);
            $cat = array('category_name'        => $row['cat_name'],
                         'category_description' => $row['cat_description'],
                         'parentid'             => (int)$new_parentid,
                         'category_left'        => 0,
                         'category_right'       => 0);

            serendipity_db_insert('category', $this->strtrRecursive($cat, $this->trans_table));
            $row['categoryid']  = serendipity_db_insert_id('category', 'categoryid');
            $this->categories[] = $row;
            $this->importCategories($row['cat_ID'], $row['categoryid']);
        }
        
        return true;
    }
}

return 'Serendipity_Import_b2evolution';

/* vim: set sts=4 ts=4 expandtab : */
?>

[php-blog-cvs] serendipity/docs NEWS,1.59,1.60

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24262/docs

Modified Files:
	NEWS 
Log Message:
added b2 native import.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- NEWS	14 Feb 2005 14:14:03 -0000	1.59
+++ NEWS	14 Feb 2005 14:52:05 -0000	1.60
@@ -3,6 +3,9 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Added native import for b2Evolution "Paris" entries, comments,
+      categories and authors (garvinhicking)
+
     * Added native import for boastMachine 3.0 entries, comments,
       categories and authors (garvinhicking)
 

[php-blog-cvs] serendipity/docs NEWS,1.58,1.59

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7729/docs

Modified Files:
	NEWS 
Log Message:
added native boastMachine import


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- NEWS	14 Feb 2005 13:46:38 -0000	1.58
+++ NEWS	14 Feb 2005 14:14:03 -0000	1.59
@@ -3,6 +3,9 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Added native import for boastMachine 3.0 entries, comments,
+      categories and authors (garvinhicking)
+
     * Added native import for Textpattern 1.0rc1 entries, comments,
       categories and authors (garvinhicking)
 

[php-blog-cvs] serendipity/include/admin/importers bmachine.inc.php,NONE,1.1

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin/importers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7729/include/admin/importers

Added Files:
	bmachine.inc.php 
Log Message:
added native boastMachine import


--- NEW FILE: bmachine.inc.php ---
<?php # $Id: bmachine.inc.php,v 1.1 2005/02/14 14:14:02 garvinhicking Exp $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved.  See LICENSE file for licensing details

/*****************************************************************
 *  bmachine  Importer,   by Garvin Hicking *
 * ****************************************************************/

class Serendipity_Import_bmachine extends Serendipity_Import {
    var $info        = array('software' => 'boastMachine 3.0');
    var $data        = array();
    var $inputFields = array();
    var $categories  = array();
    var $trans_table = '';

    function getImportNotes() {
        return '';
    }

    function Serendipity_Import_bmachine($data) {
        $this->data = $data;
        $this->inputFields = array(array('text' => INSTALL_DBHOST,
                                         'type' => 'input',
                                         'name' => 'host'),

                                   array('text' => INSTALL_DBUSER,
                                         'type' => 'input',
                                         'name' => 'user'),

                                   array('text' => INSTALL_DBPASS,
                                         'type' => 'protected',
                                         'name' => 'pass'),

                                   array('text' => INSTALL_DBNAME,
                                         'type' => 'input',
                                         'name' => 'name'),

                                   array('text'    => ACTIVATE_AUTODISCOVERY,
                                         'type'    => 'bool',
                                         'name'    => 'autodiscovery',
                                         'default' => 'false')
                            );
    }

    function validateData() {
        return sizeof($this->data);
    }

    function getInputFields() {
        return $this->inputFields;
    }

    function strtrRecursive($data, $trans_table) {
        foreach ($data as $key => $val) {
            if (is_array($val)) {
                $data[$key] = $this->strtrRecursive($val);
            }
            else {
                $data[$key] = strtr($val, $trans_table);
            }
        }

        return $data;
    }

    function import() {
        global $serendipity;

        // Save this so we can return it to its original value at the end of this method.
        $noautodiscovery = isset($serendipity['noautodiscovery']) ? $serendipity['noautodiscovery'] : false;

        if ($this->data['autodiscovery'] == 'false') {
            $serendipity['noautodiscovery'] = 1;
        }

        // We need to convert interesting characters to HTML entities, except for those with special relevance to HTML.
        $this->trans_table = get_html_translation_table(HTML_ENTITIES);
        foreach (get_html_translation_table(HTML_SPECIALCHARS) as $char => $encoded)
            if (isset($this->trans_table[$char]))
                unset($this->trans_table[$char]);

        $users = array();
        $entries = array();

        if (!extension_loaded('mysql')) {
            return MYSQL_REQUIRED;
        }

        $txpdb = @mysql_connect($this->data['host'], $this->data['user'], $this->data['pass']);
        if (!$txpdb) {
            return sprintf(COULDNT_CONNECT, $this->data['host']);
        }

        if (!@mysql_select_db($this->data['name'])) {
            return sprintf(COULDNT_SELECT_DB, mysql_error($txpdb));
        }

        /* Users */
        $res = @mysql_query("SELECT id         AS ID, 
                                    user_login AS user_login, 
                                    user_pass  AS user_pass,
                                    user_email AS user_email, 
                                    level      AS user_level,
                                    user_url   AS user_url
                               FROM bmc_users", $txpdb);
        if (!$res) {
            return sprintf(COULDNT_SELECT_USER_INFO, mysql_error($txpdb));
        }
        
        for ($x=0, $max_x = mysql_num_rows($res); $x < $max_x ; $x++ ) {
            $users[$x] = mysql_fetch_assoc($res);

            $data = array('right_publish' => ($users[$x]['user_level'] >= 2) ? 1 : 0,
                          'username'      => $users[$x]['user_login'],
                          'email'         => $users[$x]['user_email'],
                          'password'      => $users[$x]['user_pass']); // MD5 compatible

            if ( $users[$x]['user_level'] <= 2 ) {
                $data['userlevel'] = USERLEVEL_EDITOR;
            } elseif ($users[$x]['user_level'] == 3) {
                $data['userlevel'] = USERLEVEL_CHIEF;
            } else {
                $data['userlevel'] = USERLEVEL_ADMIN;
            }

            serendipity_db_insert('authors', $this->strtrRecursive($data, $this->trans_table));
            $users[$x]['authorid'] = serendipity_db_insert_id('authors', 'authorid');
        }

        /* Categories */
        $res = @mysql_query("SELECT id       AS cat_ID, 
                                    cat_name AS cat_name, 
                                    cat_info AS category_description 
                               FROM bmc_cats ORDER BY id;", $txpdb);
        if (!$res) {
            return sprintf(COULDNT_SELECT_CATEGORY_INFO, mysql_error($txpdb));
        }

        // Get all the info we need
        for ($x=0, $max_x = mysql_num_rows($res) ; $x < $max_x ; $x++) {
            $categories[] = mysql_fetch_assoc($res);
        }

        // Insert all categories as top level (we need to know everyone's ID before we can represent the hierarchy).
        for ($x=0, $max_x = sizeof($categories) ; $x < $max_x ; $x++ ) {
            $cat = array('category_name'        => $categories[$x]['cat_name'],
                         'category_description' => $categories[$x]['category_description'],
                         'parentid'             => 0, // <---
                         'category_left'        => 0,
                         'category_right'       => 0);

            serendipity_db_insert('category', $this->strtrRecursive($cat, $this->trans_table));
            $categories[$x]['categoryid'] = serendipity_db_insert_id('category', 'categoryid');
        }

        serendipity_rebuildCategoryTree();

        /* Entries */
        $res = @mysql_query("SELECT * FROM bmc_posts ORDER BY id;", $txpdb);
        if (!$res) {
            return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($txpdb));
        }

        for ($x=0, $max_x = mysql_num_rows($res) ; $x < $max_x ; $x++ ) {
            $entries[$x] = mysql_fetch_assoc($res);

            $entry = array('title'          => $entries[$x]['title'],
                           'isdraft'        => ($entries[$x]['status'] == '1') ? 'false' : 'true',
                           'allow_comments' => ($entries[$x]['m_cmt'] == '1' ) ? 'true' : 'false',
                           'timestamp'      => $entries[$x]['date'],
                           'extended'       => strtr(utf8_decode($entries[$x]['data']), $this->trans_table),
                           'body'           => strtr(utf8_decode($entries[$x]['summary']), $this->trans_table));

            $entry['authorid'] = '';
            $entry['author']   = '';
            foreach ($users as $user) {
                if ($user['ID'] == $entries[$x]['author']) {
                    $entry['authorid'] = $user['authorid'];
                    $entry['author']   = $user['user_login'];
                    break;
                }
            }

            if (!is_int($entries[$x]['entryid'] = serendipity_updertEntry($entry))) {
                return $entries[$x]['entryid'];
            }

            /* Entry/category */
            foreach ($this->categories as $category) {
                if ($category['cat_ID'] == $entries[$x]['cat'] ) {
                    $data = array('entryid'    => $entries[$x]['entryid'],
                                  'categoryid' => $category['categoryid']);
                    serendipity_db_insert('entrycat', $this->strtrRecursive($data, $this->trans_table));
                    break;
                }
            }
        }

        /* Comments */
        $res = @mysql_query("SELECT * FROM bmc_comments;", $txpdb);
        if (!$res) {
            return sprintf(COULDNT_SELECT_COMMENT_INFO, mysql_error($txpdb));
        }

        while ($a = mysql_fetch_assoc($res)) {
            foreach ($entries as $entry) {
                if ($entry['id'] == $a['post'] ) {
                    $username = '';
                    $mail     = '';
                    $url      = '';
                    if (!empty($a['author'])) {
                        foreach($users AS $user) {
                            if ($user['ID'] == $a['author']) {
                                $username = $user['user_login'];
                                $mail = $user['user_email'];
                                $url  = $user['user_url'];
                                break;
                            }
                        }
                    }

                    if (empty($username) && empty($mail)) {
                        $username = $a['auth_name'];
                        $mail = $a['auth_email'];
                        $url = $a['auth_url'];
                    }

                    $comment = array('entry_id ' => $entry['entryid'],
                                     'parent_id' => 0,
                                     'timestamp' => $a['date'],
                                     'author'    => $username,
                                     'email'     => $mail,
                                     'url'       => $url,
                                     'ip'        => $a['auth_ip'],
                                     'status'    => 'approved',
                                     'body'      => $a['data'],
                                     'type'      => 'NORMAL');

                    serendipity_db_insert('comments', $this->strtrRecursive($comment, $this->trans_table));
                    $cid = serendipity_db_insert_id('comments', 'id');
                    serendipity_approveComment($cid, $entry['entryid'], true);
                }
            }
        }

        $serendipity['noautodiscovery'] = $noautodiscovery;

        // That was fun.
        return true;
    }
}

return 'Serendipity_Import_bmachine';

/* vim: set sts=4 ts=4 expandtab : */
?>

[php-blog-cvs] serendipity/include/admin/importers textpattern.inc.php,NONE,1.1

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin/importers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28482/include/admin/importers

Added Files:
	textpattern.inc.php 
Log Message:
Added native textpattern 1.0rc1 import. That's one wicked system, does some nasty SQL joining by entity names instead of IDs.


--- NEW FILE: textpattern.inc.php ---
<?php # $Id: textpattern.inc.php,v 1.1 2005/02/14 13:46:40 garvinhicking Exp $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved.  See LICENSE file for licensing details

/*****************************************************************
 *  textpattern  Importer,   by Garvin Hicking *
 * ****************************************************************/

class Serendipity_Import_textpattern extends Serendipity_Import {
    var $info        = array('software' => 'Textpattern 1.0rc1');
    var $data        = array();
    var $inputFields = array();
    var $categories  = array();
    var $trans_table = '';

    function getImportNotes() {
        return 'Textpattern uses MySQLs native PASSWORD() function to save passwords. Thus, those passwords are incompatible with the MD5 hashing of Serendipity. The passwords for all users have been set to "txp". <strong>You need to modify the passwords manually for each user</strong>, we are sorry for that inconvenience.<br />';
    }

    function Serendipity_Import_textpattern($data) {
        $this->data = $data;
        $this->inputFields = array(array('text' => INSTALL_DBHOST,
                                         'type' => 'input',
                                         'name' => 'host'),

                                   array('text' => INSTALL_DBUSER,
                                         'type' => 'input',
                                         'name' => 'user'),

                                   array('text' => INSTALL_DBPASS,
                                         'type' => 'protected',
                                         'name' => 'pass'),

                                   array('text' => INSTALL_DBNAME,
                                         'type' => 'input',
                                         'name' => 'name'),

                                   array('text' => INSTALL_DBPREFIX,
                                         'type' => 'input',
                                         'name' => 'prefix',
                                         'default' => ''),

                                   array('text'    => ACTIVATE_AUTODISCOVERY,
                                         'type'    => 'bool',
                                         'name'    => 'autodiscovery',
                                         'default' => 'false')
                            );
    }

    function validateData() {
        return sizeof($this->data);
    }

    function getInputFields() {
        return $this->inputFields;
    }

    function strtrRecursive($data, $trans_table) {
        foreach ($data as $key => $val) {
            if (is_array($val)) {
                $data[$key] = $this->strtrRecursive($val);
            }
            else {
                $data[$key] = strtr($val, $trans_table);
            }
        }

        return $data;
    }

    function import() {
        global $serendipity;

        // Save this so we can return it to its original value at the end of this method.
        $noautodiscovery = isset($serendipity['noautodiscovery']) ? $serendipity['noautodiscovery'] : false;

        if ($this->data['autodiscovery'] == 'false') {
            $serendipity['noautodiscovery'] = 1;
        }

        // We need to convert interesting characters to HTML entities, except for those with special relevance to HTML.
        $this->trans_table = get_html_translation_table(HTML_ENTITIES);
        foreach (get_html_translation_table(HTML_SPECIALCHARS) as $char => $encoded)
            if (isset($this->trans_table[$char]))
                unset($this->trans_table[$char]);

        $this->data['prefix'] = serendipity_db_escape_string($this->data['prefix']);
        $users = array();
        $entries = array();

        if (!extension_loaded('mysql')) {
            return MYSQL_REQUIRED;
        }

        $txpdb = @mysql_connect($this->data['host'], $this->data['user'], $this->data['pass']);
        if (!$txpdb) {
            return sprintf(COULDNT_CONNECT, $this->data['host']);
        }

        if (!@mysql_select_db($this->data['name'])) {
            return sprintf(COULDNT_SELECT_DB, mysql_error($txpdb));
        }

        /* Users */
        $res = @mysql_query("SELECT user_id    AS ID, 
                                    name       AS user_login, 
                                    `pass`     AS user_pass,
                                    email      AS user_email, 
                                    privs      AS user_level
                               FROM {$this->data['prefix']}txp_users", $txpdb);
        if (!$res) {
            return sprintf(COULDNT_SELECT_USER_INFO, mysql_error($txpdb));
        }
        
        for ($x=0, $max_x = mysql_num_rows($res); $x < $max_x ; $x++ ) {
            $users[$x] = mysql_fetch_assoc($res);

            $data = array('right_publish' => ($users[$x]['user_level'] <= 4) ? 1 : 0,
                          'username'      => $users[$x]['user_login'],
                          'email'         => $users[$x]['user_email'],
                          'password'      => md5('txp')); // blame TXP for using PASSWORD().

            if ( $users[$x]['user_level'] == 1 ) {
                $data['userlevel'] = USERLEVEL_EDITOR;
            } elseif ($users[$x]['user_level'] == 2) {
                $data['userlevel'] = USERLEVEL_CHIEF;
            } else {
                $data['userlevel'] = USERLEVEL_ADMIN;
            }

            serendipity_db_insert('authors', $this->strtrRecursive($data, $this->trans_table));
            $users[$x]['authorid'] = serendipity_db_insert_id('authors', 'authorid');
        }

        /* Categories */
        if (!$this->importCategories('root')) {
            return sprintf(COULDNT_SELECT_CATEGORY_INFO, mysql_error($txpdb));
        }
        serendipity_rebuildCategoryTree();

        /* Entries */
        // Notice: Textpattern doesn't honor the prefix for this table. Wicked system.
        $res = @mysql_query("SELECT * FROM txp_textpattern ORDER BY Posted;", $txpdb);
        if (!$res) {
            return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($txpdb));
        }

        for ($x=0, $max_x = mysql_num_rows($res) ; $x < $max_x ; $x++ ) {
            $entries[$x] = mysql_fetch_assoc($res);

            $entry = array('title'          => $entries[$x]['Title'],
                           'isdraft'        => ($entries[$x]['status'] == '4') ? 'false' : 'true',
                           'allow_comments' => ($entries[$x]['Annotate'] == '1' ) ? 'true' : 'false',
                           'timestamp'      => strtotime($entries[$x]['Posted']),
                           'extended'       => strtr($entries[$x]['Body_html'], $this->trans_table),
                           'body'           => strtr(utf8_decode($entries[$x]['Excerpt']), $this->trans_table));

            $entry['authorid'] = '';
            $entry['author']   = '';
            foreach ($users as $user) {
                if ($user['user_login'] == $entries[$x]['AuthorID']) {
                    $entry['authorid'] = $user['authorid'];
                    $entry['author']   = $user['user_login'];
                    break;
                }
            }

            if (!is_int($entries[$x]['entryid'] = serendipity_updertEntry($entry))) {
                return $entries[$x]['entryid'];
            }

            /* Entry/category */
            foreach ($this->categories as $category) {
                if ($category['name'] == $entries[$x]['Category1'] || $category['name'] == $entries[$x]['Category2']) {
                    $data = array('entryid'    => $entries[$x]['entryid'],
                                  'categoryid' => $category['categoryid']);
                    serendipity_db_insert('entrycat', $this->strtrRecursive($data, $this->trans_table));
                    break;
                }
            }
        }

        /* Comments */
        $res = @mysql_query("SELECT * FROM {$this->data['prefix']}txp_discuss;", $txpdb);
        if (!$res) {
            return sprintf(COULDNT_SELECT_COMMENT_INFO, mysql_error($txpdb));
        }

        while ($a = mysql_fetch_assoc($res)) {
            foreach ($entries as $entry) {
                if ($entry['ID'] == $a['parentid'] ) {
                    $username = $a['name'];
                    $mail     = $a['email'];
                    $url      = $a['web'];

                    $comment = array('entry_id ' => $entry['entryid'],
                                     'parent_id' => 0,
                                     'timestamp' => strtotime($a['posted']),
                                     'author'    => $username,
                                     'email'     => $mail,
                                     'url'       => $url,
                                     'ip'        => $a['ip'],
                                     'status'    => ($a['visible'] == '1' ? 'approved' : 'pending'),
                                     'body'      => $a['message'],
                                     'type'      => 'NORMAL');

                    serendipity_db_insert('comments', $this->strtrRecursive($comment, $this->trans_table));
                    if ($a['visible'] == '1') {
                        $cid = serendipity_db_insert_id('comments', 'id');
                        serendipity_approveComment($cid, $entry['entryid'], true);
                    }
                }
            }
        }

        $serendipity['noautodiscovery'] = $noautodiscovery;

        // That was fun.
        return true;
    }

    function importCategories($parentname = 'root', $parentid = 0) {
        $res = mysql_query("SELECT * FROM {$this->data['prefix']}txp_category
                                     WHERE parent = '" . mysql_escape_string($parentname) . "' AND type = 'article'");
        if (!$res) {
            echo mysql_error();
            return false;
        }

        // Get all the info we need
        for ($x=0, $max_x = mysql_num_rows($res) ; $x < $max_x ; $x++) {
            $row = mysql_fetch_assoc($res);
            $cat = array('category_name'        => $row['name'],
                         'category_description' => $row['name'],
                         'parentid'             => $parentid,
                         'category_left'        => 0,
                         'category_right'       => 0);

            serendipity_db_insert('category', $this->strtrRecursive($cat, $this->trans_table));
            $row['categoryid']  = serendipity_db_insert_id('category', 'categoryid');
            $this->categories[] = $row;
            $this->importCategories($row['name'], $row['categoryid']);
        }
        
        return true;
    }
}

return 'Serendipity_Import_textpattern';

/* vim: set sts=4 ts=4 expandtab : */
?>

[php-blog-cvs] serendipity/docs NEWS,1.57,1.58

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28482/docs

Modified Files:
	NEWS 
Log Message:
Added native textpattern 1.0rc1 import. That's one wicked system, does some nasty SQL joining by entity names instead of IDs.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- NEWS	14 Feb 2005 12:52:02 -0000	1.57
+++ NEWS	14 Feb 2005 13:46:38 -0000	1.58
@@ -3,6 +3,9 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Added native import for Textpattern 1.0rc1 entries, comments,
+      categories and authors (garvinhicking)
+
     * Added native import for pMachine Pro 2.4 entries, comments,
       categories and authors (garvinhicking)
 

[php-blog-cvs] serendipity/include/admin/importers pmachine.inc.php,NONE,1.1

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin/importers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6180/include/admin/importers

Added Files:
	pmachine.inc.php 
Log Message:
pMachine Pro 2.4 native import


--- NEW FILE: pmachine.inc.php ---
<?php # $Id: pmachine.inc.php,v 1.1 2005/02/14 12:52:03 garvinhicking Exp $
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved.  See LICENSE file for licensing details

/*****************************************************************
 *  pMachine  Importer,  by Garvin Hicking *
 * ****************************************************************/

class Serendipity_Import_pMachine extends Serendipity_Import {
    var $info        = array('software' => 'pMachine Pro 2.4');
    var $data        = array();
    var $inputFields = array();


    function Serendipity_Import_pMachine($data) {
        $this->data = $data;
        $this->inputFields = array(array('text' => INSTALL_DBHOST,
                                         'type' => 'input',
                                         'name' => 'host'),

                                   array('text' => INSTALL_DBUSER,
                                         'type' => 'input',
                                         'name' => 'user'),

                                   array('text' => INSTALL_DBPASS,
                                         'type' => 'protected',
                                         'name' => 'pass'),

                                   array('text' => INSTALL_DBNAME,
                                         'type' => 'input',
                                         'name' => 'name'),

                                   array('text' => INSTALL_DBPREFIX,
                                         'type' => 'input',
                                         'name' => 'prefix',
                                         'default' => 'pm_'),

                                   array('text'    => ACTIVATE_AUTODISCOVERY,
                                         'type'    => 'bool',
                                         'name'    => 'autodiscovery',
                                         'default' => 'false')
                            );
    }

    function validateData() {
        return sizeof($this->data);
    }

    function getInputFields() {
        return $this->inputFields;
    }

    function strtrRecursive($data, $trans_table) {
        foreach ($data as $key => $val) {
            if (is_array($val)) {
                $data[$key] = $this->strtrRecursive($val);
            }
            else {
                $data[$key] = strtr($val, $trans_table);
            }
        }

        return $data;
    }

    function import() {
        global $serendipity;

        // Save this so we can return it to its original value at the end of this method.
        $noautodiscovery = isset($serendipity['noautodiscovery']) ? $serendipity['noautodiscovery'] : false;

        if ($this->data['autodiscovery'] == 'false') {
            $serendipity['noautodiscovery'] = 1;
        }

        // We need to convert interesting characters to HTML entities, except for those with special relevance to HTML.
        $trans_table = get_html_translation_table(HTML_ENTITIES);
        foreach (get_html_translation_table(HTML_SPECIALCHARS) as $char => $encoded)
            if (isset($trans_table[$char]))
                unset($trans_table[$char]);

        $this->data['prefix'] = serendipity_db_escape_string($this->data['prefix']);
        $users = array();
        $categories = array();
        $entries = array();

        if (!extension_loaded('mysql')) {
            return MYSQL_REQUIRED;
        }

        $pmdb = @mysql_connect($this->data['host'], $this->data['user'], $this->data['pass']);
        if (!$pmdb) {
            return sprintf(COULDNT_CONNECT, $this->data['host']);
        }

        if (!@mysql_select_db($this->data['name'])) {
            return sprintf(COULDNT_SELECT_DB, mysql_error($pmdb));
        }

        /* Users */
        $res = @mysql_query("SELECT id         AS ID, 
                                    username   AS user_login, 
                                    `password` AS user_pass,
                                    email      AS user_email, 
                                    status     AS user_level,
                                    url        AS url
                               FROM {$this->data['prefix']}members", $pmdb);
        if (!$res) {
            return sprintf(COULDNT_SELECT_USER_INFO, mysql_error($pmdb));
        }

        for ($x=0, $max_x = mysql_num_rows($res); $x < $max_x ; $x++ ) {
            $users[$x] = mysql_fetch_assoc($res);

            $data = array('right_publish' => ($users[$x]['user_level'] >= 3) ? 1 : 0,
                          'username'      => $users[$x]['user_login'],
                          'email'         => $users[$x]['user_email'],
                          'password'      => $users[$x]['user_pass']); // pMachine uses md5, too.

            if ( $users[$x]['user_level'] < 12 ) {
                $data['userlevel'] = USERLEVEL_EDITOR;
            } else {
                $data['userlevel'] = USERLEVEL_ADMIN;
            }

            serendipity_db_insert('authors', $this->strtrRecursive($data, $trans_table));
            $users[$x]['authorid'] = serendipity_db_insert_id('authors', 'authorid');
        }

        /* Categories */
        $res = @mysql_query("SELECT id       AS cat_ID, 
                                    category AS cat_name, 
                                    category AS category_description 
                               FROM {$this->data['prefix']}categories ORDER BY id", $pmdb);
        if (!$res) {
            return sprintf(COULDNT_SELECT_CATEGORY_INFO, mysql_error($pmdb));
        }

        // Get all the info we need
        for ($x=0, $max_x = mysql_num_rows($res) ; $x < $max_x ; $x++) {
            $categories[] = mysql_fetch_assoc($res);
        }

        // Insert all categories as top level (we need to know everyone's ID before we can represent the hierarchy).
        for ($x=0, $max_x = sizeof($categories) ; $x < $max_x ; $x++ ) {
            $cat = array('category_name'        => $categories[$x]['cat_name'],
                         'category_description' => $categories[$x]['category_description'],
                         'parentid'             => 0, // <---
                         'category_left'        => 0,
                         'category_right'       => 0);

            serendipity_db_insert('category', $this->strtrRecursive($cat, $trans_table));
            $categories[$x]['categoryid'] = serendipity_db_insert_id('category', 'categoryid');
        }

        serendipity_rebuildCategoryTree();

        /* Entries */
        $res = @mysql_query("SELECT * FROM {$this->data['prefix']}weblog ORDER BY t_stamp;", $pmdb);
        if (!$res) {
            return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($pmdb));
        }

        for ($x=0, $max_x = mysql_num_rows($res) ; $x < $max_x ; $x++ ) {
            $entries[$x] = mysql_fetch_assoc($res);

            $entry = array('title'          => $entries[$x]['title'],
                           'isdraft'        => ($entries[$x]['status'] == 'open') ? 'false' : 'true',
                           'allow_comments' => ($entries[$x]['showcomments'] == '1' ) ? 'true' : 'false',
                           'timestamp'      => $entries[$x]['t_stamp'],
                           'extended'       => strtr($entries[$x]['more'], $trans_table),
                           'body'           => strtr($entries[$x]['body'], $trans_table));

            $entry['authorid'] = '';
            $entry['author']   = '';
            foreach ($users as $user) {
                if ($user['ID'] == $entries[$x]['member_id']) {
                    $entry['authorid'] = $user['authorid'];
                    $entry['author']   = $user['username'];
                    break;
                }
            }

            if (!is_int($entries[$x]['entryid'] = serendipity_updertEntry($entry))) {
                return $entries[$x]['entryid'];
            }

            /* Entry/category */
            foreach ($categories as $category) {
                if ($category['cat_ID'] == $entries[$x]['category'] ) {
                    $data = array('entryid'    => $entries[$x]['entryid'],
                                  'categoryid' => $category['categoryid']);
                    serendipity_db_insert('entrycat', $this->strtrRecursive($data, $trans_table));
                    break;
                }
            }
        }

        /* Comments */
        $res = @mysql_query("SELECT * FROM {$this->data['prefix']}comments;", $pmdb);
        if (!$res) {
            return sprintf(COULDNT_SELECT_COMMENT_INFO, mysql_error($pmdb));
        }

        while ($a = mysql_fetch_assoc($res)) {
            foreach ($entries as $entry) {
                if ($entry['post_id'] == $a['post_id'] ) {
                    $username = '';
                    $mail     = '';
                    $url      = '';
                    if (!empty($a['member_id'])) {
                        foreach($users AS $user) {
                            if ($user['ID'] == $a['member_id']) {
                                $username = $user['user_login'];
                                $mail     = $user['user_email'];
                                $url      = $user['url'];
                                break;
                            }
                        }
                    }

                    $comment = array('entry_id ' => $entry['entryid'],
                                     'parent_id' => 0,
                                     'timestamp' => $a['t_stamp'],
                                     'author'    => $username,
                                     'email'     => $mail,
                                     'url'       => $url,
                                     'ip'        => $a['comment_ip'],
                                     'status'    => ($a['status'] == 'open' ? 'approved' : 'pending'),
                                     'body'      => $a['body'],
                                     'type'      => 'NORMAL');

                    serendipity_db_insert('comments', $this->strtrRecursive($comment, $trans_table));
                    if ($a['status'] == 'open') {
                        $cid = serendipity_db_insert_id('comments', 'id');
                        serendipity_approveComment($cid, $entry['entryid'], true);
                    }
                }
            }
        }

        $serendipity['noautodiscovery'] = $noautodiscovery;

        // That was fun.
        return true;
    }
}

return 'Serendipity_Import_pMachine';

/* vim: set sts=4 ts=4 expandtab : */
?>