php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/docs NEWS,1.55,1.56

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

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

Modified Files:
	NEWS 
Log Message:
Remember last state of media library.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- NEWS	29 Jan 2005 15:45:21 -0000	1.55
+++ NEWS	9 Feb 2005 11:11:24 -0000	1.56
@@ -3,6 +3,9 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Remember last state of media library (sort order, files per page,
+      directory, sortfield), via JavaScript+Cookies (garvinhicking)
+
     * Added native import for Nucleus (3.15) entries, comments, categories
       and authors (garvinhicking)
 

[php-blog-cvs] serendipity/include functions_config.inc.php,1.19,1.20 functions_images.inc.php,1.28,1.29

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

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

Modified Files:
	functions_config.inc.php functions_images.inc.php 
Log Message:
Remember last state of media library.


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- functions_images.inc.php	6 Feb 2005 01:04:52 -0000	1.28
+++ functions_images.inc.php	9 Feb 2005 11:11:25 -0000	1.29
@@ -768,45 +768,46 @@
 function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = false, $url = NULL, $show_upload = false) {
     global $serendipity;
     $sort_row_interval = array(8, 16, 50, 100);
+    $sortParams        = array('perpage', 'order', 'ordermode');
+    $importParams      = array('adminModule', 'htmltarget', 'filename_only', 'textarea', 'subpage');
+    $extraParems       = '';
 
-    $perPage = (isset($serendipity['GET']['sortorder']['perpage']) ? $serendipity['GET']['sortorder']['perpage'] : $sort_row_interval[0]);
-    $start   = ($page-1) * $perPage;
-
-    $serendipity['imageList'] = serendipity_fetchImagesFromDatabase(
-                                  $start,
-                                  $perPage,
-                                  $totalImages, // Passed by ref
-                                  (isset($serendipity['GET']['sortorder']['order']) ? $serendipity['GET']['sortorder']['order'] : false),
-                                  (isset($serendipity['GET']['sortorder']['ordermode']) ? $serendipity['GET']['sortorder']['ordermode'] : false),
-                                  (isset($serendipity['GET']['only_path']) ? $serendipity['GET']['only_path'] : '')
-    );
-
-    $extraParems = '';
-
-    $importParams = array('adminModule', 'htmltarget', 'filename_only', 'textarea', 'subpage');
     foreach($importParams AS $importParam) {
         if (isset($serendipity['GET'][$importParam])) {
             $extraParems .= 'serendipity[' . $importParam . ']='. $serendipity['GET'][$importParam] .'&';
         }
     }
 
-    if (isset($serendipity['GET']['only_path']) && !empty($serendipity['GET']['only_path']) ) {
-        $extraParems .= 'serendipity[only_path]='. $serendipity['GET']['only_path'] .'&';
-        $serendipity['GET']['only_path'] = serendipity_uploadSecure($serendipity['GET']['only_path'], true);
+    foreach($sortParams AS $sortParam) {
+        serendipity_restoreVar($serendipity['COOKIE']['sortorder_' . $sortParam], $serendipity['GET']['sortorder'][$sortParam]);
+        serendipity_JSsetCookie('sortorder_' . $sortParam, $serendipity['GET']['sortorder'][$sortParam]);
+        $extraParems .= 'serendipity[sortorder]['. $sortParam .']='. $serendipity['GET']['sortorder'][$sortParam] .'&';
     }
 
-    foreach ( (array)$serendipity['GET']['sortorder'] as $k => $v ) {
-        $extraParems .= 'serendipity[sortorder]['. $k .']='. $v .'&';
+    serendipity_restoreVar($serendipity['COOKIE']['only_path'], $serendipity['GET']['only_path']);
+    serendipity_JSsetCookie('only_path', $serendipity['GET']['only_path']);
+    if (!empty($serendipity['GET']['only_path'])) {
+        $extraParems .= 'serendipity[only_path]='. $serendipity['GET']['only_path'] .'&';
+        $serendipity['GET']['only_path'] = serendipity_uploadSecure($serendipity['GET']['only_path'], true);
     }
 
-    $pages = ceil($totalImages/$perPage);
-    $linkPrevious  = '?'. $extraParems .'serendipity[page]=' . ($page-1);
-    $linkNext      = '?'. $extraParems .'serendipity[page]=' . ($page+1);
-
-    $sort_order = serendipity_getImageFields();
+    $perPage = (isset($serendipity['GET']['sortorder']['perpage']) ? $serendipity['GET']['sortorder']['perpage'] : $sort_row_interval[0]);
+    $start   = ($page-1) * $perPage;
 
-    $paths = serendipity_traversePath($serendipity['serendipityPath'] . $serendipity['uploadPath']);
+    $serendipity['imageList'] = serendipity_fetchImagesFromDatabase(
+                                  $start,
+                                  $perPage,
+                                  $totalImages, // Passed by ref
+                                  (isset($serendipity['GET']['sortorder']['order']) ? $serendipity['GET']['sortorder']['order'] : false),
+                                  (isset($serendipity['GET']['sortorder']['ordermode']) ? $serendipity['GET']['sortorder']['ordermode'] : false),
+                                  (isset($serendipity['GET']['only_path']) ? $serendipity['GET']['only_path'] : '')
+    );
 
+    $pages         = ceil($totalImages / $perPage);
+    $linkPrevious  = '?' . $extraParems . 'serendipity[page]=' . ($page-1);
+    $linkNext      = '?' . $extraParems . 'serendipity[page]=' . ($page+1);
+    $sort_order    = serendipity_getImageFields();
+    $paths         = serendipity_traversePath($serendipity['serendipityPath'] . $serendipity['uploadPath']);
 
     if (is_null($lineBreak)) {
         $lineBreak = floor(750 / ($serendipity['thumbSize'] + 20));

Index: functions_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_config.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- functions_config.inc.php	27 Jan 2005 15:31:31 -0000	1.19
+++ functions_config.inc.php	9 Feb 2005 11:11:24 -0000	1.20
@@ -193,6 +193,24 @@
     }
 }
 
+function serendipity_restoreVar(&$source, &$target) {
+    global $serendipity;
+    
+    if (isset($source) && !isset($target)) {
+        $target = $source;
+        return true;
+    }
+
+    return false;
+}
+
+function serendipity_JSsetCookie($name, $value) {
+    $name  = str_replace('"', '\"', $name);
+    $value = str_replace('"', '\"', $value);
+
+    echo '<script type="text/javascript">SetCookie("' . $name . '", "' . $value . '")</script>' . "\n";
+}
+
 function serendipity_setCookie($name,$value) {
     global $serendipity;
 

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

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

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

Modified Files:
	config_local.inc.php 
Log Message:
Display current webserver time in timezone offset config var, for users to easier see the difference



Index: config_local.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_local.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- config_local.inc.php	27 Jan 2005 15:31:32 -0000	1.10
+++ config_local.inc.php	9 Feb 2005 10:19:14 -0000	1.11
@@ -230,7 +230,8 @@
                                           'title'       => INSTALL_OFFSET,
                                           'description' => INSTALL_OFFSET_DESC,
                                           'type'        => 'int',
-                                          'default'     => 0),
+                                          'default'     => 0,
+                                          'flags'       => array('parseDescription')),
 
                                     array('var'         => 'showFutureEntries',
                                           'title'       => INSTALL_SHOWFUTURE,

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.36,1.37

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

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

Modified Files:
	functions_installer.inc.php 
Log Message:
Display current webserver time in timezone offset config var, for users to easier see the difference



Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- functions_installer.inc.php	9 Feb 2005 08:43:26 -0000	1.36
+++ functions_installer.inc.php	9 Feb 2005 10:19:13 -0000	1.37
@@ -214,16 +214,14 @@
 function serendipity_replaceEmbeddedConfigVars ($s) {
     return str_replace(
                   array(
-                    '[USERLEVEL_ADMIN]',
-                    '[USERLEVEL_CHIEF]',
-                    '[USERLEVEL_EDITOR]'
+                    '%clock%'
                   ),
 
                   array(
-                    USERLEVEL_ADMIN,
-                    USERLEVEL_CHIEF,
-                    USERLEVEL_EDITOR
-                  ), $s);
+                    date('H:i')
+                  ), 
+                  
+                  $s);
 }
 
 function serendipity_guessInput($type, $name, $value='', $default='') {
@@ -375,7 +373,6 @@
             if (in_array('probeDefault', $item['flags'])) {
                 $item['default'] = serendipity_probeInstallation($item['var']);
             }
-
 ?>
                         <tr>
                             <td style="border-bottom: 1px #000000 solid" align="left" valign="top" width="75%">

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.63,1.64 serendipity_lang_cn.inc.php,1.30,1.31 serendipity_lang_cs.inc.php,1.110,1.111 serendipity_lang_cz.inc.php,1.110,1.111 serendipity_lang_da.inc.php,1.130,1.131 serendipity_lang_de.inc.php,1.151,1.152 serendipity_lang_en.inc.php,1.132,1.133 serendipity_lang_es.inc.php,1.125,1.126 serendipity_lang_fi.inc.php,1.18,1.19 serendipity_lang_fr.inc.php,1.110,1.111 serendipity_lang_it.inc.php,1.49,1.50 serendipity_lang_ja.inc.php,1.28,1.29 serendipity_lang_ko.inc.php,1.18,1.19 serendipity_lang_nl.inc.php,1.86,1.87 serendipity_lang_no.inc.php,1.50,1.51 serendipity_lang_pt.inc.php,1.85,1.86 serendipity_lang_ru.inc.php,1.23,1.24 serendipity_lang_tn.inc.php,1.31,1.32 serendipity_lang_tw.inc.php,1.46,1.47 serendipity_lang_zh.inc.php,1.30,1.31

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

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23158/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:
Display current webserver time in timezone offset config var, for users to easier see the difference



Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- serendipity_lang_cs.inc.php	6 Feb 2005 01:04:54 -0000	1.110
+++ serendipity_lang_cs.inc.php	9 Feb 2005 10:19:14 -0000	1.111
@@ -568,7 +568,6 @@
 @define('ALREADY_INSTALLED', 'Naistalován');
 @define('SELECT_A_PLUGIN_TO_ADD', 'Vyberte plugin, který chcete nainstalovat');
 @define('INSTALL_OFFSET', 'Èasový posun serveru');
-@define('INSTALL_OFFSET_DESC', 'Vložte poèet hodin mezi èasem serveru a Vaším èasovým pásmem');
 @define('STICKY_POSTINGS', 'Sticky Postings');
 @define('INSTALL_FETCHLIMIT', 'Záznamy zobrazené na hlavní stránce');
 @define('INSTALL_FETCHLIMIT_DESC', 'Poèet záznamù zobrazených na každé hlavní stránce');
@@ -679,6 +678,7 @@
 @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
 
 /* 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.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- serendipity_lang_no.inc.php	6 Feb 2005 01:04:57 -0000	1.50
+++ serendipity_lang_no.inc.php	9 Feb 2005 10:19:18 -0000	1.51
@@ -567,7 +567,6 @@
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
-@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
 @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
 @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
@@ -678,5 +677,6 @@
 @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
 
 ?>
\ 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.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- serendipity_lang_zh.inc.php	6 Feb 2005 01:04:58 -0000	1.30
+++ serendipity_lang_zh.inc.php	9 Feb 2005 10:19:18 -0000	1.31
@@ -567,7 +567,6 @@
 @define('RSS_IMPORT_CATEGORY', 'ÓÃÕâ¸öÀà±ð¸ø²»ÏàͬµÄÊäÈëÎÄÕÂ');
 
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
-@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
 @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
 @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
@@ -676,6 +675,7 @@
 @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
 
 /* 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.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- serendipity_lang_en.inc.php	6 Feb 2005 01:04:55 -0000	1.132
+++ serendipity_lang_en.inc.php	9 Feb 2005 10:19:16 -0000	1.133
@@ -565,7 +565,6 @@
 @define('ALREADY_INSTALLED', 'Already installed');
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install');
 @define('INSTALL_OFFSET', 'Server time Offset');
-@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone');
 @define('STICKY_POSTINGS', 'Sticky Postings');
 @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage');
 @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend');
@@ -674,5 +673,7 @@
 @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
+
 /* 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.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- serendipity_lang_ja.inc.php	6 Feb 2005 16:52:35 -0000	1.28
+++ serendipity_lang_ja.inc.php	9 Feb 2005 10:19:17 -0000	1.29
@@ -567,7 +567,6 @@
 @define('ALREADY_INSTALLED', '既にインストール済みです');
 @define('SELECT_A_PLUGIN_TO_ADD', 'インストールしたいプラグインを選択する');
 @define('INSTALL_OFFSET', 'サーバー時間差');
-@define('INSTALL_OFFSET_DESC', 'ウェブサーバとあなたの希望の時間帯の時差を入力します。');
 @define('STICKY_POSTINGS', 'スティッキ投稿');
 @define('INSTALL_FETCHLIMIT', 'フロントページにエントリを表示する');
 @define('INSTALL_FETCHLIMIT_DESC', '各ページでフロントエンドに表示するエントリの数');
@@ -676,6 +675,7 @@
 @define('ADMIN_ENTRIES', 'エントリ');
 @define('RECHECK_INSTALLATION', 'インストールの再検査');
 @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
 
 /* 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.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- serendipity_lang_bg.inc.php	6 Feb 2005 01:04:53 -0000	1.63
+++ serendipity_lang_bg.inc.php	9 Feb 2005 10:19:14 -0000	1.64
@@ -551,7 +551,6 @@
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
-@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
 @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
 @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
@@ -662,6 +661,7 @@
 @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
 
 /* 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.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- serendipity_lang_tw.inc.php	6 Feb 2005 01:04:58 -0000	1.46
+++ serendipity_lang_tw.inc.php	9 Feb 2005 10:19:18 -0000	1.47
@@ -568,7 +568,6 @@
 @define('RSS_IMPORT_CATEGORY', '¥Î³o­ÓÃþ§Oµ¹¤£¬Û¦Pªº¿é¤J¤å³¹');
 
 @define('INSTALL_OFFSET', '¥D¾÷®É°Ï');
-@define('INSTALL_OFFSET_DESC', '½Ð¿é¤J±z­nªº®É°Ï¸ò¥D¾÷®É°Ïªº®É®t');
 @define('STICKY_POSTINGS', '³»¸m¤å³¹');
 @define('INSTALL_FETCHLIMIT', '¦b¥D­¶Åã¥Üªº¤å³¹');
 @define('INSTALL_FETCHLIMIT_DESC', '¥D­¶Åã¥Üªº¤å³¹¼Æ');
@@ -677,6 +676,7 @@
 @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
 
 /* 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.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- serendipity_lang_cz.inc.php	6 Feb 2005 01:04:54 -0000	1.110
+++ serendipity_lang_cz.inc.php	9 Feb 2005 10:19:15 -0000	1.111
@@ -568,7 +568,6 @@
 @define('ALREADY_INSTALLED', 'Naistalován');
 @define('SELECT_A_PLUGIN_TO_ADD', 'Vyberte plugin, který chcete nainstalovat');
 @define('INSTALL_OFFSET', 'Èasový posun serveru');
-@define('INSTALL_OFFSET_DESC', 'Vlo¾te poèet hodin mezi èasem serveru a Va¹ím èasovým pásmem');
 @define('STICKY_POSTINGS', 'Sticky Postings');
 @define('INSTALL_FETCHLIMIT', 'Záznamy zobrazené na hlavní stránce');
 @define('INSTALL_FETCHLIMIT_DESC', 'Poèet záznamù zobrazených na ka¾dé hlavní stránce');
@@ -679,6 +678,7 @@
 @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
 
 /* 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.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- serendipity_lang_pt.inc.php	6 Feb 2005 01:04:58 -0000	1.85
+++ serendipity_lang_pt.inc.php	9 Feb 2005 10:19:18 -0000	1.86
@@ -567,7 +567,6 @@
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
-@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
 @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
 @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
@@ -678,6 +677,7 @@
 @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
 
 /* 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.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- serendipity_lang_it.inc.php	6 Feb 2005 01:04:56 -0000	1.49
+++ serendipity_lang_it.inc.php	9 Feb 2005 10:19:17 -0000	1.50
@@ -568,7 +568,6 @@
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
-@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
 @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
 @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
@@ -679,6 +678,7 @@
 @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
 
 /* 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.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- serendipity_lang_da.inc.php	6 Feb 2005 01:04:54 -0000	1.130
+++ serendipity_lang_da.inc.php	9 Feb 2005 10:19:15 -0000	1.131
@@ -567,7 +567,6 @@
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
-@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
 @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
 @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
@@ -678,6 +677,7 @@
 @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
 
 /* 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.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- serendipity_lang_fr.inc.php	6 Feb 2005 01:04:55 -0000	1.110
+++ serendipity_lang_fr.inc.php	9 Feb 2005 10:19:16 -0000	1.111
@@ -570,7 +570,6 @@
 @define('ALREADY_INSTALLED', 'Déjà installé');
 @define('SELECT_A_PLUGIN_TO_ADD', 'Sélectionnez le plugin que vous voulez installer');
 @define('INSTALL_OFFSET', 'Décalage de l\'heure serveur');
-@define('INSTALL_OFFSET_DESC', 'Entrez le nombre d\'heures entre la date de votre serveur et le fuseau horaire de votre choix.');
 @define('STICKY_POSTINGS', 'Billets indélébiles');
 @define('INSTALL_FETCHLIMIT', 'Billets à afficher sur la page d\'accueil');
 @define('INSTALL_FETCHLIMIT_DESC', 'Nombre de billets à afficher par page dans l\'interface principale du blog');
@@ -681,6 +680,7 @@
 @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
 
 /* 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.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_lang_fi.inc.php	6 Feb 2005 01:04:55 -0000	1.18
+++ serendipity_lang_fi.inc.php	9 Feb 2005 10:19:16 -0000	1.19
@@ -565,7 +565,6 @@
 @define('ALREADY_INSTALLED', 'Asennettu jo');
 @define('SELECT_A_PLUGIN_TO_ADD', 'Valitse laajennos, jonka haluat asentaa');
 @define('INSTALL_OFFSET', 'Palvelimen aikasiirtymä');
-@define('INSTALL_OFFSET_DESC', 'Anna palvelimen kellon ja oman kellosi välinen aikaero');
 @define('STICKY_POSTINGS', 'Tahmeat kirjaukset');
 @define('INSTALL_FETCHLIMIT', 'Etusivulla esitettävät kirjaukset');
 @define('INSTALL_FETCHLIMIT_DESC', 'Selaimessa esitettävien kirjausten lukumäärä');
@@ -674,6 +673,7 @@
 @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
 
 /* 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.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_lang_ko.inc.php	6 Feb 2005 01:04:57 -0000	1.18
+++ serendipity_lang_ko.inc.php	9 Feb 2005 10:19:17 -0000	1.19
@@ -571,7 +571,6 @@
 @define('ALREADY_INSTALLED', 'Already installed');
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install');
 @define('INSTALL_OFFSET', 'Server time Offset');
-@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone');
 @define('STICKY_POSTINGS', 'Sticky Postings');
 @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage');
 @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend');
@@ -679,6 +678,7 @@
 @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
 
 /* 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.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- serendipity_lang_es.inc.php	6 Feb 2005 01:04:55 -0000	1.125
+++ serendipity_lang_es.inc.php	9 Feb 2005 10:19:16 -0000	1.126
@@ -571,7 +571,6 @@
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
-@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
 @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
 @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
@@ -680,6 +679,7 @@
 @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
 
 /* 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.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- serendipity_lang_cn.inc.php	6 Feb 2005 01:04:54 -0000	1.30
+++ serendipity_lang_cn.inc.php	9 Feb 2005 10:19:14 -0000	1.31
@@ -567,7 +567,6 @@
 @define('RSS_IMPORT_CATEGORY', '用这个类别给不相同的输入文章');
 
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
-@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
 @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
 @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
@@ -676,6 +675,7 @@
 @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
 
 /* 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.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- serendipity_lang_tn.inc.php	6 Feb 2005 01:04:58 -0000	1.31
+++ serendipity_lang_tn.inc.php	9 Feb 2005 10:19:18 -0000	1.32
@@ -568,7 +568,6 @@
 @define('RSS_IMPORT_CATEGORY', '用這個類別給不相同的輸入文章');
 
 @define('INSTALL_OFFSET', '主機時區');
-@define('INSTALL_OFFSET_DESC', '請輸入您要的時區跟主機時區的時差');
 @define('STICKY_POSTINGS', '頂置文章');
 @define('INSTALL_FETCHLIMIT', '在主頁顯示的文章');
 @define('INSTALL_FETCHLIMIT_DESC', '主頁顯示的文章數');
@@ -677,6 +676,7 @@
 @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
 
 /* 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.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- serendipity_lang_ru.inc.php	6 Feb 2005 01:04:58 -0000	1.23
+++ serendipity_lang_ru.inc.php	9 Feb 2005 10:19:18 -0000	1.24
@@ -569,7 +569,6 @@
 @define('SELECT_A_PLUGIN_TO_ADD', 'Выберите плагин для добавления');
 @define('QUICKSAVE', 'Быстрое сохранение');
 @define('INSTALL_OFFSET', 'Смещение времени на сервере');
-@define('INSTALL_OFFSET_DESC', 'Введите разницу в часах между временем на вашем сервере и в желаемой часовой зоне');
 @define('STICKY_POSTINGS', 'Закреплённые записи');
 @define('INSTALL_FETCHLIMIT', 'Записи, которые всегда следует отображать на главной странице');
 @define('INSTALL_FETCHLIMIT_DESC', 'Количество записей для показа на каждой странице frontend\'а');
@@ -679,6 +678,7 @@
 @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
 
 /* 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.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- serendipity_lang_de.inc.php	6 Feb 2005 01:04:55 -0000	1.151
+++ serendipity_lang_de.inc.php	9 Feb 2005 10:19:15 -0000	1.152
@@ -567,7 +567,6 @@
 @define('ALREADY_INSTALLED', 'Bereits installiert');
 @define('SELECT_A_PLUGIN_TO_ADD', 'Plugin zur Installation wählen');
 @define('INSTALL_OFFSET', 'Server Zeitunterschied');
-@define('INSTALL_OFFSET_DESC', 'Wieviele Stunden liegen zwischen der Uhrzeit des Servers und der eigenen Zeitzone');
 @define('STICKY_POSTINGS', 'Dauerhafte Einträge');
 @define('INSTALL_FETCHLIMIT', 'Anzahl der Artikel auf der Startseite');
 @define('INSTALL_FETCHLIMIT_DESC', 'Wieviele Artikel sollen auf jeder Seite des Blogs angezeigt werden');
@@ -660,22 +659,23 @@
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Voreinstellungen für neue Einträge');
 @define('UPGRADE', 'Aktualisieren');
 @define('UPGRADE_TO_VERSION', 'Aktuelle 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('DELETE_DIRECTORY', 'Verzeichnis löschen');
+@define('DELETE_DIRECTORY_DESC', 'Sie sind dabei, den Inhalt eines Verzeichnisses zu löschen, in dem Dateien enthalten sind, die möglicherweise in Blog-Einträgen verwendet wurden!');
+@define('FORCE_DELETE', 'ALLE Dateien dieses Verzeichnisses löschen, inklusive der Dateien, die Serendipity nicht katalogisiert hat');
+@define('CREATE_DIRECTORY', 'Verzeichnis anlegen');
+@define('CREATE_NEW_DIRECTORY', 'Neues Verzeichnis anlegen');
+@define('CREATE_DIRECTORY_DESC', 'Hier kann ein neues Verzeichnis angelegt werden um Mediendaten zu speichern. Bitte den Namen des neuen Verzeichnisses angeben und optional ein übergeordnetes Verzeichnis auswählen.');
+@define('BASE_DIRECTORY', 'Stammverzeichnis');
+@define('USERLEVEL_EDITOR_DESC', 'Redakteur');
+@define('USERLEVEL_CHIEF_DESC', 'Chef-Redakteur');
+@define('USERLEVEL_ADMIN_DESC', 'Administrator');
+@define('USERCONF_USERLEVEL', 'Zugriffsrechte');
+@define('USERCONF_USERLEVEL_DESC', 'Zugriffsrechte bestimmen die Art und den Umfang des Zugriffes eines Benutzers auf die Funkionalitäten des Blogs');
+@define('USER_SELF_INFO', 'Angemeldet als %s (%s)');
+@define('ADMIN_ENTRIES', 'Einträge');
+@define('RECHECK_INSTALLATION', 'Installation erneut überprüfen');
+@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');
 
 /* 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.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- serendipity_lang_nl.inc.php	6 Feb 2005 01:04:57 -0000	1.86
+++ serendipity_lang_nl.inc.php	9 Feb 2005 10:19:17 -0000	1.87
@@ -571,7 +571,6 @@
 @define('SELECT_A_PLUGIN_TO_ADD', 'Selecteerd welke plugin u wenst te installeren');
 @define('QUICKSAVE', 'Opslaan');
 @define('INSTALL_OFFSET', 'Aanpassing servertijd');
-@define('INSTALL_OFFSET_DESC', 'Voer het verschil in uren in tussen uw webserver tijd en uw gewenste tijdzone');
 @define('STICKY_POSTINGS', 'Post-its');
 @define('INSTALL_FETCHLIMIT', 'Inzendingen die weergegeven moeten woreden');
 @define('INSTALL_FETCHLIMIT_DESC', 'Aantal inzendingen die weergeven moeten worden voor elke pagina');
@@ -680,6 +679,7 @@
 @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
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.35,1.36

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

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

Modified Files:
	functions_installer.inc.php 
Log Message:
PAT_ARCHIVES_SHORT is no longer used (Right, Tom?)


Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- functions_installer.inc.php	3 Feb 2005 19:19:56 -0000	1.35
+++ functions_installer.inc.php	9 Feb 2005 08:43:26 -0000	1.36
@@ -593,7 +593,6 @@
                    '{indexFile}',
                    '{PAT_UNSUBSCRIBE}', '{PATH_UNSUBSCRIBE}',
                    '{PAT_ARCHIVES}', '{PATH_ARCHIVES}',
-                   '{PAT_ARCHIVES_SHORT}',
                    '{PAT_FEEDS}', '{PATH_FEEDS}',
                    '{PAT_FEED}',
                    '{PAT_ADMIN}', '{PATH_ADMIN}',
@@ -613,7 +612,6 @@
                    $indexFile,
                    trim(PAT_UNSUBSCRIBE, '@/i'), PATH_UNSUBSCRIBE,
                    trim(PAT_ARCHIVES, '@/i'), PATH_ARCHIVES,
-                   trim(PAT_ARCHIVES_SHORT, '@/i'),
                    trim(PAT_FEEDS, '@/i'), PATH_FEEDS,
                    trim(PAT_FEED, '@/i'),
                    trim(PAT_ADMIN, '@/i'), PATH_ADMIN,

[php-blog-cvs] serendipity/include/tpl htaccess_cgi_rewrite.tpl,1.7,1.8 htaccess_rewrite.tpl,1.7,1.8

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

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

Modified Files:
	htaccess_cgi_rewrite.tpl htaccess_rewrite.tpl 
Log Message:
PAT_ARCHIVES_SHORT is no longer used (Right, Tom?)


Index: htaccess_rewrite.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/htaccess_rewrite.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- htaccess_rewrite.tpl	11 Jan 2005 13:00:45 -0000	1.7
+++ htaccess_rewrite.tpl	9 Feb 2005 08:43:27 -0000	1.8
@@ -7,7 +7,6 @@
 RewriteEngine On
 RewriteBase {PREFIX}
 RewriteRule ^{PAT_ARCHIVES} {indexFile}?url=/{PATH_ARCHIVES}/$1.html [L,QSA]
-RewriteRule ^{PAT_ARCHIVES_SHORT} {indexFile}?url=/{PATH_ARCHIVES}/$1-short.html [L,NC,QSA]
 RewriteRule ^([0-9]+)[_\-][0-9a-z_\-]*\.html {indexFile}?url=$1-article.html [L,NC,QSA]
 RewriteRule ^{PAT_FEEDS}/(.*) {indexFile}?url=/{PATH_FEEDS}/$1 [L,QSA]
 RewriteRule ^{PAT_UNSUBSCRIBE} {indexFile}?url=/{PATH_UNSUBSCRIBE}/$1/$2 [L,QSA]

Index: htaccess_cgi_rewrite.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/htaccess_cgi_rewrite.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- htaccess_cgi_rewrite.tpl	11 Jan 2005 13:00:45 -0000	1.7
+++ htaccess_cgi_rewrite.tpl	9 Feb 2005 08:43:27 -0000	1.8
@@ -5,7 +5,6 @@
 RewriteEngine On
 RewriteBase {PREFIX}
 RewriteRule ^{PAT_ARCHIVES} {indexFile}?url=/{PATH_ARCHIVES}/$1.html [L,QSA]
-RewriteRule ^{PAT_ARCHIVES_SHORT} {indexFile}?url=/{PATH_ARCHIVES}/$1-short.html [L,NC,QSA]
 RewriteRule ^([0-9]+)[_\-][0-9a-z_\-]*\.html {indexFile}?url=$1-article.html [L,NC,QSA]
 RewriteRule ^{PAT_FEEDS}/(.*) {indexFile}?url=/{PATH_FEEDS}/$1 [L,QSA]
 RewriteRule ^{PAT_UNSUBSCRIBE} {indexFile}?url=/{PATH_UNSUBSCRIBE}/$1/$2 [L,QSA]

[php-blog-cvs] serendipity/include functions_entries.inc.php,1.54,1.55

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

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

Modified Files:
	functions_entries.inc.php 
Log Message:
propriertary sqlite searching


Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- functions_entries.inc.php	3 Feb 2005 18:55:16 -0000	1.54
+++ functions_entries.inc.php	9 Feb 2005 08:41:03 -0000	1.55
@@ -429,6 +429,13 @@
         $group     = '';
         $distinct  = 'DISTINCT';
         $find_part = "(title~'$term' OR body~'$term' OR extended~'$term')";
+    } elseif ($serendipity['dbType'] == 'sqlite') {
+        // Very extensive SQLite search. There currently seems no other way to perform fulltext search in SQLite
+        // But it's better than no search at all :-D
+        $group     = 'GROUP BY e.id';
+        $distinct  = '';
+        $term      = serendipity_mb('strtolower', $term);
+        $find_part = "(lower(title) LIKE '%$term%' OR lower(body) LIKE '%$term%' OR extended LIKE '%$term%')";
     } else {
         $group     = 'GROUP BY e.id';
         $distinct  = '';

[php-blog-cvs] serendipity/plugins/serendipity_plugin_remoterss serendipity_plugin_remoterss.php,1.14,1.15

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

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

Modified Files:
	serendipity_plugin_remoterss.php 
Log Message:
the element may be empty, do not emit an error in this case. thanks to omid from the forums.


Index: serendipity_plugin_remoterss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_plugin_remoterss.php	27 Jan 2005 13:04:42 -0000	1.14
+++ serendipity_plugin_remoterss.php	7 Feb 2005 13:55:29 -0000	1.15
@@ -421,7 +421,7 @@
                             $content .= '<img src="' . $bulletimg . '" border="0" alt="*" /> ';
                         }
                         $content .= $this->rss_utf8_decode($item['title']) . "</a><br />\n";
-                        $item['timestamp'] = strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date']);
+                        $item['timestamp'] = @strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date']);
                         if (!($item['timestamp'] == -1) AND ($displaydate == 'true')) {
                             $content .= '<div class="serendipitySideBarDate">'
                                       . htmlspecialchars(serendipity_formatTime($dateformat, $item['timestamp'], false))

[php-blog-cvs] serendipity/plugins/serendipity_event_contentrewrite serendipity_event_contentrewrite.php,1.13,1.14

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

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

Modified Files:
	serendipity_event_contentrewrite.php 
Log Message:
fixed bug, patch by gizmola


Index: serendipity_event_contentrewrite.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_contentrewrite/serendipity_event_contentrewrite.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_event_contentrewrite.php	8 Jan 2005 12:25:10 -0000	1.13
+++ serendipity_event_contentrewrite.php	7 Feb 2005 10:41:25 -0000	1.14
@@ -80,7 +80,7 @@
         ));
 
         if (!empty($_POST['SAVECONF'])) $this->cleanup();
-        $rows = serendipity_db_query("SELECT name, value FROM {$serendipity['dbPrefix']}config WHERE name LIKE '" . $this->instance . "/%'");
+        $rows = serendipity_db_query("SELECT name, value FROM {$serendipity['dbPrefix']}config WHERE name LIKE '" . $this->instance . "/%' ORDER BY name");
 
         $counter = 0;
         $values  = array();

[php-blog-cvs] serendipity/lang serendipity_lang_ja.inc.php,1.27,1.28

[Tadashi J. <el...@us...>]

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

Modified Files:
	serendipity_lang_ja.inc.php 
Log Message:
o updated translation.


Index: serendipity_lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ja.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- serendipity_lang_ja.inc.php	6 Feb 2005 01:04:56 -0000	1.27
+++ serendipity_lang_ja.inc.php	6 Feb 2005 16:52:35 -0000	1.28
@@ -170,7 +170,7 @@
 @define('DELETE_SURE', '#%s の削除を本当に実行しますか?');
 @define('NOT_REALLY', 'Not really...');
 @define('DUMP_IT', 'Dump it!');
-@define('RIP_ENTRY', 'R.I.P. entry #%s');
+@define('RIP_ENTRY', 'R.I.P. エントリ #%s');
 @define('CATEGORY_DELETED_ARTICLES_MOVED', 'カテゴリ #%s を削除しました。古い記事はカテゴリ #%s に移動しました。');
 @define('CATEGORY_DELETED', 'カテゴリ #%s を削除しました。');
 @define('INVALID_CATEGORY', 'カテゴリは破棄するために提供されませんでした。');
@@ -299,7 +299,7 @@
 @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 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>');
+@define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity は現在のインストール済みバージョン %s の設定を検出しました。しかし serendipity 自身はバージョン %s としてインストールされています。<a href="%s">ここをクリック</a>してアップグレードする必要があります!');
 @define('SERENDIPITY_UPGRADER_WELCOME', 'やあ、Serendipity アップグレードエージェントにようこそ。');
 @define('SERENDIPITY_UPGRADER_PURPOSE', '私は Serendipity %s をアップグレードインストールするのを助けるためにここに居ます。');
 @define('SERENDIPITY_UPGRADER_WHY', '今 Serendipity %s をインストールしましたが、まだこのバージョンに適したデータベースをアップグレードインストールしていないのでこのメッセージを見ています。');
@@ -535,7 +535,7 @@
 @define('TRACKBACK_SENT', 'トラックバック成功');
 @define('TRACKBACK_FAILED', 'トラックバック失敗: %s');
 @define('TRACKBACK_NOT_FOUND', 'トラックバック URI が見つかりません。');
-@define('TRACKBACK_URI_MISMATCH', 'The autodiscovered trackback URI does not match our target URI.');
+@define('TRACKBACK_URI_MISMATCH', '自動検出されたトラックバック URI はターゲット URI と一致しません。');
 @define('TRACKBACK_CHECKING', 'トラックバックが可能か <u>%s</u> を検査中...');
 @define('TRACKBACK_NO_DATA', '対象はデータが含まれませんでした。');
 @define('TRACKBACK_SIZE', 'ターゲット URI は最大ファイルサイズ %s を超過しました。');
@@ -669,13 +669,13 @@
 @define('BASE_DIRECTORY', 'ベースディレクトリ');
 @define('USERLEVEL_EDITOR_DESC', '標準の編集者');
 @define('USERLEVEL_CHIEF_DESC', 'チーフ編集者');
-@define('USERLEVEL_ADMIN_DESC', '管理者'); // Translate
-@define('USERCONF_USERLEVEL', 'アクセスレベル'); // Translate
+@define('USERLEVEL_ADMIN_DESC', '管理者');
+@define('USERCONF_USERLEVEL', 'アクセスレベル');
 @define('USERCONF_USERLEVEL_DESC', 'このレベルはこのユーザがウェブログに対してどういう種類のアクセスを持つか決定するため使用されます。');
 @define('USER_SELF_INFO', '%s としてログイン中 (%s)');
 @define('ADMIN_ENTRIES', 'エントリ');
-@define('RECHECK_INSTALLATION', 'Recheck installation'); // Translate
-@define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d'); // Translate
+@define('RECHECK_INSTALLATION', 'インストールの再検査');
+@define('IMAGICK_EXEC_ERROR', '実行できませんでした: "%s", エラー: %s, 返り値: %d');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity/include/admin images.inc.php,1.15,1.16

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

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

Modified Files:
	images.inc.php 
Log Message:
- Fix imagick not rotating in the right direction (apparently gdlib and imagick doesn't agree on which direction to rotate in)
- Escape arguments and commands used when executing imagick, to avoid evil command injections
- Emit error if imagick execution failed
- Don't echo that we've created a thumbnail, when the creation failed


Index: images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/images.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- images.inc.php	3 Feb 2005 18:55:19 -0000	1.15
+++ images.inc.php	6 Feb 2005 01:04:52 -0000	1.16
@@ -139,8 +139,9 @@
                 printf(FILE_FETCHED . '<br />', $serendipity['POST']['imageurl'], $tfile);
 
                 // Create thumbnail
-                $created_thumbnail = serendipity_makeThumbnail($tfile, false, $authorid, $serendipity['POST']['target_directory']);
-                echo THUMB_CREATED_DONE . '<br />';
+                if ( serendipity_makeThumbnail($tfile, false, $authorid, $serendipity['POST']['target_directory']) ) {
+                    echo THUMB_CREATED_DONE . '<br />';
+                }
             }
         }
     } else {
@@ -169,8 +170,9 @@
                 @chmod($target, 0664);
 
                 // Create thumbnail
-                $created_thumbnail = serendipity_makeThumbnail($tfile, false, $authorid, $serendipity['POST']['target_directory']);
-                echo THUMB_CREATED_DONE . '<br />';
+                if ( serendipity_makeThumbnail($tfile, false, $authorid, $serendipity['POST']['target_directory']) ) {
+                    echo THUMB_CREATED_DONE . '<br />';
+                }
             } else {
                 echo ERROR_UNKNOWN_NOUPLOAD . '<br />';
             }

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.62,1.63 serendipity_lang_cn.inc.php,1.29,1.30 serendipity_lang_cs.inc.php,1.109,1.110 serendipity_lang_cz.inc.php,1.109,1.110 serendipity_lang_da.inc.php,1.129,1.130 serendipity_lang_de.inc.php,1.150,1.151 serendipity_lang_en.inc.php,1.131,1.132 serendipity_lang_es.inc.php,1.124,1.125 serendipity_lang_fi.inc.php,1.17,1.18 serendipity_lang_fr.inc.php,1.109,1.110 serendipity_lang_it.inc.php,1.48,1.49 serendipity_lang_ja.inc.php,1.26,1.27 serendipity_lang_ko.inc.php,1.17,1.18 serendipity_lang_nl.inc.php,1.85,1.86 serendipity_lang_no.inc.php,1.49,1.50 serendipity_lang_pt.inc.php,1.84,1.85 serendipity_lang_ru.inc.php,1.22,1.23 serendipity_lang_tn.inc.php,1.30,1.31 serendipity_lang_tw.inc.php,1.45,1.46 serendipity_lang_zh.inc.php,1.29,1.30

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

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16576/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 imagick not rotating in the right direction (apparently gdlib and imagick doesn't agree on which direction to rotate in)
- Escape arguments and commands used when executing imagick, to avoid evil command injections
- Emit error if imagick execution failed
- Don't echo that we've created a thumbnail, when the creation failed


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- serendipity_lang_cs.inc.php	5 Feb 2005 23:57:33 -0000	1.109
+++ serendipity_lang_cs.inc.php	6 Feb 2005 01:04:54 -0000	1.110
@@ -678,6 +678,7 @@
 @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
 
 /* 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.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- serendipity_lang_no.inc.php	5 Feb 2005 23:57:35 -0000	1.49
+++ serendipity_lang_no.inc.php	6 Feb 2005 01:04:57 -0000	1.50
@@ -677,5 +677,6 @@
 @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
 
 ?>
\ 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.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_lang_zh.inc.php	5 Feb 2005 23:57:35 -0000	1.29
+++ serendipity_lang_zh.inc.php	6 Feb 2005 01:04:58 -0000	1.30
@@ -675,6 +675,7 @@
 @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
 
 /* 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.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- serendipity_lang_en.inc.php	5 Feb 2005 23:57:34 -0000	1.131
+++ serendipity_lang_en.inc.php	6 Feb 2005 01:04:55 -0000	1.132
@@ -673,5 +673,6 @@
 @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
 /* 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.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_lang_ja.inc.php	5 Feb 2005 23:57:35 -0000	1.26
+++ serendipity_lang_ja.inc.php	6 Feb 2005 01:04:56 -0000	1.27
@@ -675,6 +675,7 @@
 @define('USER_SELF_INFO', '%s としてログイン中 (%s)');
 @define('ADMIN_ENTRIES', 'エントリ');
 @define('RECHECK_INSTALLATION', 'Recheck installation'); // Translate
+@define('IMAGICK_EXEC_ERROR', 'Unable to execute: "%s", error: %s, return var: %d'); // Translate
 
 /* 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.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- serendipity_lang_bg.inc.php	5 Feb 2005 23:57:33 -0000	1.62
+++ serendipity_lang_bg.inc.php	6 Feb 2005 01:04:53 -0000	1.63
@@ -661,6 +661,7 @@
 @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
 
 /* 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.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- serendipity_lang_tw.inc.php	5 Feb 2005 23:57:35 -0000	1.45
+++ serendipity_lang_tw.inc.php	6 Feb 2005 01:04:58 -0000	1.46
@@ -676,6 +676,7 @@
 @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
 
 /* 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.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- serendipity_lang_cz.inc.php	5 Feb 2005 23:57:33 -0000	1.109
+++ serendipity_lang_cz.inc.php	6 Feb 2005 01:04:54 -0000	1.110
@@ -678,6 +678,7 @@
 @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
 
 /* 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.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- serendipity_lang_pt.inc.php	5 Feb 2005 23:57:35 -0000	1.84
+++ serendipity_lang_pt.inc.php	6 Feb 2005 01:04:58 -0000	1.85
@@ -677,6 +677,7 @@
 @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
 
 /* 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.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- serendipity_lang_it.inc.php	5 Feb 2005 23:57:34 -0000	1.48
+++ serendipity_lang_it.inc.php	6 Feb 2005 01:04:56 -0000	1.49
@@ -678,6 +678,7 @@
 @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
 
 /* 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.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- serendipity_lang_da.inc.php	5 Feb 2005 23:57:33 -0000	1.129
+++ serendipity_lang_da.inc.php	6 Feb 2005 01:04:54 -0000	1.130
@@ -677,6 +677,7 @@
 @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
 
 /* 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.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- serendipity_lang_fr.inc.php	5 Feb 2005 23:57:34 -0000	1.109
+++ serendipity_lang_fr.inc.php	6 Feb 2005 01:04:55 -0000	1.110
@@ -680,6 +680,7 @@
 @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
 
 /* 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.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_lang_fi.inc.php	5 Feb 2005 23:57:34 -0000	1.17
+++ serendipity_lang_fi.inc.php	6 Feb 2005 01:04:55 -0000	1.18
@@ -673,6 +673,7 @@
 @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
 
 /* 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.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_lang_ko.inc.php	5 Feb 2005 23:57:35 -0000	1.17
+++ serendipity_lang_ko.inc.php	6 Feb 2005 01:04:57 -0000	1.18
@@ -678,6 +678,7 @@
 @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
 
 /* 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.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- serendipity_lang_es.inc.php	5 Feb 2005 23:57:34 -0000	1.124
+++ serendipity_lang_es.inc.php	6 Feb 2005 01:04:55 -0000	1.125
@@ -679,6 +679,7 @@
 @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
 
 /* 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.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_lang_cn.inc.php	5 Feb 2005 23:57:33 -0000	1.29
+++ serendipity_lang_cn.inc.php	6 Feb 2005 01:04:54 -0000	1.30
@@ -675,6 +675,7 @@
 @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
 
 /* 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.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- serendipity_lang_tn.inc.php	5 Feb 2005 23:57:35 -0000	1.30
+++ serendipity_lang_tn.inc.php	6 Feb 2005 01:04:58 -0000	1.31
@@ -676,6 +676,7 @@
 @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
 
 /* 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.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- serendipity_lang_ru.inc.php	5 Feb 2005 23:57:35 -0000	1.22
+++ serendipity_lang_ru.inc.php	6 Feb 2005 01:04:58 -0000	1.23
@@ -678,6 +678,7 @@
 @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
 
 /* 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.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- serendipity_lang_de.inc.php	5 Feb 2005 23:57:34 -0000	1.150
+++ serendipity_lang_de.inc.php	6 Feb 2005 01:04:55 -0000	1.151
@@ -675,6 +675,7 @@
 @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
 
 /* 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.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- serendipity_lang_nl.inc.php	5 Feb 2005 23:57:35 -0000	1.85
+++ serendipity_lang_nl.inc.php	6 Feb 2005 01:04:57 -0000	1.86
@@ -679,6 +679,7 @@
 @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
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity/include functions_images.inc.php,1.27,1.28

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

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

Modified Files:
	functions_images.inc.php 
Log Message:
- Fix imagick not rotating in the right direction (apparently gdlib and imagick doesn't agree on which direction to rotate in)
- Escape arguments and commands used when executing imagick, to avoid evil command injections
- Emit error if imagick execution failed
- Don't echo that we've created a thumbnail, when the creation failed


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- functions_images.inc.php	3 Feb 2005 18:55:17 -0000	1.27
+++ functions_images.inc.php	6 Feb 2005 01:04:52 -0000	1.28
@@ -212,24 +212,25 @@
         if ($serendipity['magick'] !== true) {
             $r = serendipity_resize_image_gd($infile, $outfile, $size);
         } else {
-                /*if ($serendipity["dim"] == "height") $newSize = "*x".$serendipity["thumbSize"];
-                else $newSize = $serendipity["thumbSize"]."x*"; */
+            $r = array($size, $size);
+            $newSize = $size . 'x' . $size;
             if ($ft_mime != 'application/pdf') {
-               $newSize = $size . 'x' . $size;
-               $r = array($size, $size);
-               $cmd     = $serendipity['convert'] . " -antialias -scale $newSize \"$infile\" \"$outfile\"  2>&1";
+               $cmd     = escapeshellcmd($serendipity['convert']) . ' -antialias -scale '. escapeshellarg($newSize) .' '. escapeshellarg($infile) .' '. escapeshellarg($outfile);
             } else {
-               $newSize = $size . 'x' . $size;
-               $cmd     = $serendipity['convert'] . " -antialias -flatten -scale $newSize \"$infile\" \"$outfile.png\" 2>&1";
-               echo $cmd;
+               $cmd     = escapeshellcmd($serendipity['convert']) . ' -antialias -flatten -scale '. escapeshellarg($newSize) .' '. escapeshellarg($infile) .' '. escapeshellarg($outfile .'.png');
             }
-            $res     = `$cmd`;
+            exec($cmd, $output, $result);
+            if ( $result != 0 ) {
+                echo '<div class="serendipityAdminMsgError">'. sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) .'</div>';
+                $r = false; // return failure
+            }
+            unset($output, $result);
         }
     }
 
     /* Lets assume we are all done, now we add the image to the image database */
     if ($insertMode) {
-        $r['image_id'] = serendipity_insertImageInDatabase($f, $suf, $fdim['mime'], filesize($infile), $fdim[0], $fdim[1], $serendipity['thumbSuffix'], time(), $authorid, $directory);
+        serendipity_insertImageInDatabase($f, $suf, $fdim['mime'], filesize($infile), $fdim[0], $fdim[1], $serendipity['thumbSuffix'], time(), $authorid, $directory);
     }
 
     return $r;
@@ -245,7 +246,6 @@
 
     $admin = '';
     if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF && $file['authorid'] != '0' && $file['authorid'] != $serendipity['authorid']) {
-        // A non-admin user may not delete private files from other users.
         return;
     }
 
@@ -254,12 +254,16 @@
     if ($serendipity['magick'] !== true) {
         serendipity_resize_image_gd($infile, $outfile, $width, $height);
     } else {
-        $cmd = $serendipity['convert'] . ' -scale ' .  $width . 'x' . $height . ' ' . $infile . ' ' . $outfile;
-        $res = `$cmd`;
+        $cmd = escapeshellcmd($serendipity['convert']) . ' -scale ' .  escapeshellarg($width . 'x' . $height) . ' ' . escapeshellarg($infile) . ' ' . escapeshellarg($outfile);
+        exec($cmd, $output, $result);
+        if ( $result != 0 ) {
+            echo '<div class="serendipityAdminMsgError">'. sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) .'</div>';
+        }
+        unset($output, $result);
     }
 
     serendipity_updateImageInDatabase(array('dimensions_width' => $width, 'dimensions_height' => $height), $id);
-    return;
+    return true;
 }
 
 /**
@@ -283,10 +287,25 @@
         serendipity_rotate_image_gd($infile, $outfile, $degrees);
         serendipity_rotate_image_gd($infileThumb, $outfileThumb, $degrees);
     } else {
-        $cmd = $serendipity['convert'] . ' -rotate ' . $degrees . ' ' . $infile . ' ' . $outfile;
-        $res = `$cmd`;
-        $cmdThumb = $serendipity['convert'] . ' -rotate ' . $degrees . ' ' . $infileThumb . ' ' . $outfileThumb;
-        $resThumb = `$cmdThumb`;
+        /* Why can't we just all agree on the rotation direction? */
+        $degrees = (360 - $degrees);
+
+        /* Resize main image */
+        $cmd = escapeshellcmd($serendipity['convert']) . ' -rotate ' . escapeshellarg($degrees) . ' ' . escapeshellarg($infile) . ' ' . escapeshellarg($outfile);
+        exec($cmd, $output, $result);
+        if ( $result != 0 ) {
+            echo '<div class="serendipityAdminMsgError">'. sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) .'</div>';
+        }
+        unset($output, $result);
+
+        /* Resize thumbnail */
+        $cmd = escapeshellcmd($serendipity['convert']) . ' -rotate ' . escapeshellarg($degrees) . ' ' . escapeshellarg($infileThumb) . ' ' . escapeshellarg($outfileThumb);
+        exec($cmd, $output, $result);
+        if ( $result != 0 ) {
+            echo '<div class="serendipityAdminMsgError">'. sprintf(IMAGICK_EXEC_ERROR, $cmd, $output[0], $result) .'</div>';
+        }
+        unset($output, $result);
+
     }
 
     $fdim = @getimagesize($outfile);
@@ -347,9 +366,7 @@
 
             if ($update) {
                 $i++;
-                $updates  = array(
-                  'thumbnail_name' => $serendipity['thumbSuffix']
-                );
+                $updates = array('thumbnail_name' => $serendipity['thumbSuffix']);
                 serendipity_updateImageInDatabase($updates, $file['id']);
             }
         } else {

[php-blog-cvs] serendipity/include/admin installer.inc.php,1.23,1.24

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

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

Modified Files:
	installer.inc.php 
Log Message:
- Add a link so the user can easier recheck the installation if it failed before


Index: installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/installer.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- installer.inc.php	3 Feb 2005 18:55:19 -0000	1.23
+++ installer.inc.php	5 Feb 2005 23:57:32 -0000	1.24
@@ -377,6 +377,7 @@
 <div align="center">
 <?php if ( $errorCount > 0 ) { ?>
     <div class="serendipityAdminMsgError"><?php echo PROBLEM_DIAGNOSTIC ?></div>
+    <h2><a href="serendipity_admin.php"><?php echo RECHECK_INSTALLATION ?></a></h2>
 <?php } else { ?>
     <?php echo SELECT_INSTALLATION_TYPE ?>:
     <h2><a href="?serendipity[step]=2a"><?php echo SIMPLE_INSTALLATION ?></a> - <a href="?serendipity[step]=2b"><?php echo EXPERT_INSTALLATION ?></a></h2>

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.61,1.62 serendipity_lang_cn.inc.php,1.28,1.29 serendipity_lang_cs.inc.php,1.108,1.109 serendipity_lang_cz.inc.php,1.108,1.109 serendipity_lang_da.inc.php,1.128,1.129 serendipity_lang_de.inc.php,1.149,1.150 serendipity_lang_en.inc.php,1.130,1.131 serendipity_lang_es.inc.php,1.123,1.124 serendipity_lang_fi.inc.php,1.16,1.17 serendipity_lang_fr.inc.php,1.108,1.109 serendipity_lang_it.inc.php,1.47,1.48 serendipity_lang_ja.inc.php,1.25,1.26 serendipity_lang_ko.inc.php,1.16,1.17 serendipity_lang_nl.inc.php,1.84,1.85 serendipity_lang_no.inc.php,1.48,1.49 serendipity_lang_pt.inc.php,1.83,1.84 serendipity_lang_ru.inc.php,1.21,1.22 serendipity_lang_tn.inc.php,1.29,1.30 serendipity_lang_tw.inc.php,1.44,1.45 serendipity_lang_zh.inc.php,1.28,1.29

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

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1851/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:
- Add a link so the user can easier recheck the installation if it failed before


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- serendipity_lang_cs.inc.php	3 Feb 2005 21:06:11 -0000	1.108
+++ serendipity_lang_cs.inc.php	5 Feb 2005 23:57:33 -0000	1.109
@@ -677,6 +677,7 @@
 @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
 
 /* 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.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- serendipity_lang_no.inc.php	3 Feb 2005 21:06:12 -0000	1.48
+++ serendipity_lang_no.inc.php	5 Feb 2005 23:57:35 -0000	1.49
@@ -676,5 +676,6 @@
 @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
 
 ?>
\ 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.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- serendipity_lang_zh.inc.php	3 Feb 2005 21:06:13 -0000	1.28
+++ serendipity_lang_zh.inc.php	5 Feb 2005 23:57:35 -0000	1.29
@@ -674,6 +674,7 @@
 @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
 
 /* 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.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- serendipity_lang_en.inc.php	3 Feb 2005 21:06:11 -0000	1.130
+++ serendipity_lang_en.inc.php	5 Feb 2005 23:57:34 -0000	1.131
@@ -672,6 +672,6 @@
 @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
 /* 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.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- serendipity_lang_ja.inc.php	3 Feb 2005 22:19:14 -0000	1.25
+++ serendipity_lang_ja.inc.php	5 Feb 2005 23:57:35 -0000	1.26
@@ -674,6 +674,7 @@
 @define('USERCONF_USERLEVEL_DESC', 'このレベルはこのユーザがウェブログに対してどういう種類のアクセスを持つか決定するため使用されます。');
 @define('USER_SELF_INFO', '%s としてログイン中 (%s)');
 @define('ADMIN_ENTRIES', 'エントリ');
+@define('RECHECK_INSTALLATION', 'Recheck installation'); // Translate
 
 /* 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.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- serendipity_lang_bg.inc.php	3 Feb 2005 21:06:10 -0000	1.61
+++ serendipity_lang_bg.inc.php	5 Feb 2005 23:57:33 -0000	1.62
@@ -660,6 +660,7 @@
 @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
 
 /* 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.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- serendipity_lang_tw.inc.php	3 Feb 2005 21:06:13 -0000	1.44
+++ serendipity_lang_tw.inc.php	5 Feb 2005 23:57:35 -0000	1.45
@@ -675,6 +675,7 @@
 @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
 
 /* 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.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- serendipity_lang_cz.inc.php	3 Feb 2005 21:06:11 -0000	1.108
+++ serendipity_lang_cz.inc.php	5 Feb 2005 23:57:33 -0000	1.109
@@ -677,6 +677,7 @@
 @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
 
 /* 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.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- serendipity_lang_pt.inc.php	3 Feb 2005 21:06:13 -0000	1.83
+++ serendipity_lang_pt.inc.php	5 Feb 2005 23:57:35 -0000	1.84
@@ -676,6 +676,7 @@
 @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
 
 /* 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.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- serendipity_lang_it.inc.php	3 Feb 2005 21:06:12 -0000	1.47
+++ serendipity_lang_it.inc.php	5 Feb 2005 23:57:34 -0000	1.48
@@ -677,6 +677,7 @@
 @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
 
 /* 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.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- serendipity_lang_da.inc.php	3 Feb 2005 21:06:11 -0000	1.128
+++ serendipity_lang_da.inc.php	5 Feb 2005 23:57:33 -0000	1.129
@@ -676,6 +676,7 @@
 @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
 
 /* 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.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- serendipity_lang_fr.inc.php	3 Feb 2005 21:06:12 -0000	1.108
+++ serendipity_lang_fr.inc.php	5 Feb 2005 23:57:34 -0000	1.109
@@ -679,6 +679,7 @@
 @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
 
 /* 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.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_lang_fi.inc.php	3 Feb 2005 21:06:12 -0000	1.16
+++ serendipity_lang_fi.inc.php	5 Feb 2005 23:57:34 -0000	1.17
@@ -672,6 +672,7 @@
 @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
 
 /* 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.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_lang_ko.inc.php	3 Feb 2005 21:06:12 -0000	1.16
+++ serendipity_lang_ko.inc.php	5 Feb 2005 23:57:35 -0000	1.17
@@ -677,6 +677,7 @@
 @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
 
 /* 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.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- serendipity_lang_es.inc.php	3 Feb 2005 21:06:11 -0000	1.123
+++ serendipity_lang_es.inc.php	5 Feb 2005 23:57:34 -0000	1.124
@@ -678,6 +678,7 @@
 @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
 
 /* 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.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- serendipity_lang_cn.inc.php	3 Feb 2005 21:06:11 -0000	1.28
+++ serendipity_lang_cn.inc.php	5 Feb 2005 23:57:33 -0000	1.29
@@ -674,6 +674,7 @@
 @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
 
 /* 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.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_lang_tn.inc.php	3 Feb 2005 21:06:13 -0000	1.29
+++ serendipity_lang_tn.inc.php	5 Feb 2005 23:57:35 -0000	1.30
@@ -675,6 +675,7 @@
 @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
 
 /* 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.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- serendipity_lang_ru.inc.php	3 Feb 2005 21:06:13 -0000	1.21
+++ serendipity_lang_ru.inc.php	5 Feb 2005 23:57:35 -0000	1.22
@@ -677,6 +677,7 @@
 @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
 
 /* 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.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- serendipity_lang_de.inc.php	3 Feb 2005 21:06:11 -0000	1.149
+++ serendipity_lang_de.inc.php	5 Feb 2005 23:57:34 -0000	1.150
@@ -674,6 +674,7 @@
 @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
 
 /* 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.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- serendipity_lang_nl.inc.php	3 Feb 2005 21:06:12 -0000	1.84
+++ serendipity_lang_nl.inc.php	5 Feb 2005 23:57:35 -0000	1.85
@@ -678,6 +678,7 @@
 @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
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity serendipity_admin.php,1.68,1.69

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

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

Modified Files:
	serendipity_admin.php 
Log Message:
- Forgot to make the login button pretty


Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- serendipity_admin.php	3 Feb 2005 21:06:04 -0000	1.68
+++ serendipity_admin.php	4 Feb 2005 19:42:50 -0000	1.69
@@ -109,7 +109,7 @@
                                 <td colspan="2"><input id="autologin" type="checkbox" name="serendipity[auto]" /><label for="autologin"> <?php echo AUTOMATIC_LOGIN ?>
                             </tr>
                             <tr>
-                                <td colspan="2" align="right"><input type="submit" name="submit" value="<?php echo LOGIN ?> &gt;" /></td>
+                                <td colspan="2" align="right"><input type="submit" name="submit" value="<?php echo LOGIN ?> &gt;" class="serendipityPrettyButton" /></td>
                             </tr>
                         </table>
                     </form>

[php-blog-cvs] serendipity/templates/default commentpopup.tpl,1.2,1.3 entries.tpl,1.11,1.12

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

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

Modified Files:
	commentpopup.tpl entries.tpl 
Log Message:
use rel=nofollow for links to send a trackback to your blog. Bots should not index this as they can't/shouldn't create trackbacks, so this is a useful place for nofollow :)
[hint from isotopp, that is :)]


Index: entries.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/entries.tpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- entries.tpl	30 Dec 2004 22:41:29 -0000	1.11
+++ entries.tpl	4 Feb 2005 13:10:15 -0000	1.12
@@ -109,7 +109,7 @@
                 <a id="trackbacks"></a>
                 <div class="serendipity_commentsTitle">{$CONST.TRACKBACKS}</div>
                     <div class="serendipity_center">
-                        <a style="font-weight: normal" href="{$entry.link_trackback}" onclick="alert('{$CONST.TRACKBACK_SPECIFIC_ON_CLICK|@escape:htmlall}'); return false;" title="{$CONST.TRACKBACK_SPECIFIC_ON_CLICK|@escape}">{$CONST.TRACKBACK_SPECIFIC}</a>
+                        <a rel="nofollow" style="font-weight: normal" href="{$entry.link_trackback}" onclick="alert('{$CONST.TRACKBACK_SPECIFIC_ON_CLICK|@escape:htmlall}'); return false;" title="{$CONST.TRACKBACK_SPECIFIC_ON_CLICK|@escape}">{$CONST.TRACKBACK_SPECIFIC}</a>
                     </div>
                     <br />
                         {serendipity_printTrackbacks entry=$entry.id}

Index: commentpopup.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/commentpopup.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- commentpopup.tpl	2 Dec 2004 10:55:12 -0000	1.2
+++ commentpopup.tpl	4 Feb 2005 13:10:15 -0000	1.3
@@ -35,7 +35,7 @@
     <div class="serendipity_commentsTitle">{$CONST.TRACKBACKS}</div><br />
     <dl>
         <dt><b>{$CONST.TRACKBACK_SPECIFIC}:</b><br /></dt>
-        <dd><a href="{$comment_url}">{$comment_url}</a><br /></dd>
+        <dd><a rel="nofollow" href="{$comment_url}">{$comment_url}</a><br /></dd>
 
         <dt><b>{$CONST.DIRECT_LINK}:</b><br /></dt>
         <dd><a href="{$comment_entryurl}">{$comment_entryurl}</a></dd>

[php-blog-cvs] serendipity/lang serendipity_lang_ja.inc.php,1.24,1.25

[Tadashi J. <el...@us...>]

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

Modified Files:
	serendipity_lang_ja.inc.php 
Log Message:
o Sync with en.


Index: serendipity_lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ja.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- serendipity_lang_ja.inc.php	3 Feb 2005 21:06:12 -0000	1.24
+++ serendipity_lang_ja.inc.php	3 Feb 2005 22:19:14 -0000	1.25
@@ -1,7 +1,7 @@
 <?php # $Id$
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
-# Translation (c) Tadashi Jokagi <el...@us...>
+# Translation (c) Tadashi Jokagi <el...@us...>, 2004-2005.
 
 @define('LANG_CHARSET', 'UTF-8');
 @define('DATE_LOCALES', 'ja,jp,ja_JP.UTF-8');
@@ -94,7 +94,7 @@
 @define('ADDING_IMAGE', '画像追加中...');
 @define('THUMB_CREATED_DONE', 'サムネイルを作成しました。<br>終了します。');
 @define('ERROR_FILE_EXISTS_ALREADY', 'エラー: ファイルはマシン上に既に存在します!');
-@define('ERROR_UNKNOWN_NOUPLOAD', '未知のエラーが生じました。ファイルはアップロードしませんでした。Maybe your filesize is larger than the maximum size allowed by your server installation. Check with your ISP or edit your php.ini file to allow larger file size uploads.');
+@define('ERROR_UNKNOWN_NOUPLOAD', '未知のエラーが生じました。ファイルはアップロードしませんでした。おそらくファイルサイズがサーバーのインストールで許可された最大サイズを超えたと思われます。ISP に確認するか、php.ini ファイルで許可されたアップロード可能な最大ファイルサイズを編集してください。');
 @define('GO', 'Go!');
 @define('NEWSIZE', '新規サイズ: ');
 @define('RESIZE_BLAHBLAH', '<b>リサイズ %s</b><p>');
@@ -117,7 +117,7 @@
 @define('HOLDS_A_BLAHBLAH', 'サイドバーに HTML の情報(ナゲット)を保持します。');
 @define('TITLE_FOR_NUGGET', 'ナゲットの題名');
 @define('THE_NUGGET', 'HTML の塊です!');
-@define('SYNDICATE_THIS_BLOG', 'Syndicate This Blog');
+@define('SYNDICATE_THIS_BLOG', 'このブログと Syndicate');
 @define('YOU_CHOSE', 'あなたは %s を選択しました。');
 @define('IMAGE_ROTATE_LEFT', '左回り(時計と反対回り)に 90 度回転する');
 @define('IMAGE_ROTATE_RIGHT', '右回り(時計回り)に 90 度回転する');
@@ -369,23 +369,23 @@
 @define('INSTALL_DBPASS', 'データベースパスワード');
 @define('INSTALL_DBPASS_DESC', '上のユーザー名と一致するパスワードを指定します。');
 @define('INSTALL_DBNAME', 'データベース名');
-@define('INSTALL_DBNAME_DESC', '使用するデータベース名を指定');
+@define('INSTALL_DBNAME_DESC', '使用するデータベース名を指定します。');
 @define('INSTALL_DBPREFIX', 'データベーステーブル接頭語');
 @define('INSTALL_DBPREFIX_DESC', 'テーブル名の接頭語を指定します。例えば「serendipity_」です。');
 
 /* PATHS */
 @define('INSTALL_CAT_PATHS', 'パス');
-@define('INSTALL_CAT_PATHS_DESC', 'さまざまなパスに異なる必要なフォルダーとファイルを指定します。ディレクトリには末尾にスラッシュを忘れないでください!');
+@define('INSTALL_CAT_PATHS_DESC', '各種パスに必要なフォルダーとファイルを指定します。ディレクトリには末尾にスラッシュを忘れないでください!');
 @define('INSTALL_FULLPATH', 'フルパス');
 @define('INSTALL_FULLPATH_DESC', 'serendipity をインストールした絶対フルパスです。');
 @define('INSTALL_UPLOADPATH', 'アップロードパス');
-@define('INSTALL_UPLOADPATH_DESC', 'すべてのアップロードはここに来ます。\'フルパス\' への相対パス - 通常 \'uploads/\' です。');
+@define('INSTALL_UPLOADPATH_DESC', 'すべてのアップロードはここに来ます。「フルパス\」への相対パス - 通常「uploads/」です。');
 @define('INSTALL_RELPATH', '相対パス');
-@define('INSTALL_RELPATH_DESC', 'ブラウザーで使用する serendipity のパスです。通常 \'/serendipity/\' です。');
+@define('INSTALL_RELPATH_DESC', 'ブラウザーで使用する serendipity のパスです。通常「/serendipity/」 です。');
 @define('INSTALL_RELTEMPLPATH', '相対テンプレートパス');
-@define('INSTALL_RELTEMPLPATH_DESC', 'テンプレートが含まれるフォルダーへのパスです - \'相対パス\'への相対です。');
+@define('INSTALL_RELTEMPLPATH_DESC', 'テンプレートが含まれるフォルダーへのパスです - 「相対パス」への相対です。');
 @define('INSTALL_RELUPLOADPATH', '相対アップロードパス path');
-@define('INSTALL_RELUPLOADPATH_DESC', 'ブラウザからのアップロードのパスです - \'相対パス\'への相対です。');
+@define('INSTALL_RELUPLOADPATH_DESC', 'ブラウザからのアップロードのパスです - 「相対パス」への相対です。');
 @define('INSTALL_URL', 'ブログの URL');
 @define('INSTALL_URL_DESC', 'serendipity をインストールしたベース URL');
 @define('INSTALL_INDEXFILE', 'インデックスファイル');
@@ -395,21 +395,21 @@
 @define('INSTALL_CAT_SETTINGS', '大域設定');
 @define('INSTALL_CAT_SETTINGS_DESC', 'Serendipity がどのように振舞うかカスタマイズします。');
 @define('INSTALL_USERNAME', '管理者ユーザー名');
-@define('INSTALL_USERNAME_DESC', '管理者ログインのユーザー名');
+@define('INSTALL_USERNAME_DESC', '管理者ログインのユーザー名を指定します。');
 @define('INSTALL_PASSWORD', '管理者パスワード');
-@define('INSTALL_PASSWORD_DESC', '管理者ログインのパスワード');
+@define('INSTALL_PASSWORD_DESC', '管理者ログインのパスワードを指定します。');
 @define('INSTALL_EMAIL', '管理者電子メール');
-@define('INSTALL_EMAIL_DESC', 'ブログ管理者の電子メール');
+@define('INSTALL_EMAIL_DESC', 'ブログ管理者の電子メールを指定します。');
 @define('INSTALL_SENDMAIL', '管理者にメールを送信しますか?');
 @define('INSTALL_SENDMAIL_DESC', 'エントリにコメントが投稿されたとき、電子メールを受信しますか?');
 @define('INSTALL_SUBSCRIBE', 'ユーザーのエントリの購読を許可しますか?');
-@define('INSTALL_SUBSCRIBE_DESC', 'Allow users to subscribe to an entry and thereby receive a mail when new comments are made to that entry');
+@define('INSTALL_SUBSCRIBE_DESC', 'ユーザーがエントリを購読し、かつ新しいコメントがそのエントリへ作られた場合、そのメイルを受け取ることを許可します。');
 @define('INSTALL_BLOGNAME', 'ブログの名前');
-@define('INSTALL_BLOGNAME_DESC', 'ブログのタイトル');
+@define('INSTALL_BLOGNAME_DESC', 'ブログの題名を記述します。');
 @define('INSTALL_BLOGDESC', 'ブログの説明');
-@define('INSTALL_BLOGDESC_DESC', 'ブログの説明');
+@define('INSTALL_BLOGDESC_DESC', 'ブログについての紹介文を記述します。');
 @define('INSTALL_LANG', '言語');
-@define('INSTALL_LANG_DESC', 'ブログの言語を選択');
+@define('INSTALL_LANG_DESC', 'ブログの言語を選択します。');
 
 /* Appearance and options */
 @define('INSTALL_CAT_DISPLAY', '外観とオプション');
@@ -468,7 +468,7 @@
 @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', 'Submitted comments will be subject to moderation before being displayed.');
+@define('COMMENTS_WILL_BE_MODERATED', '送信されたコメントは表示する前にもでレーションされるでしょう。');
 @define('YOU_HAVE_THESE_OPTIONS', '次のオプションが利用可能です:');
 @define('THIS_COMMENT_NEEDS_REVIEW', '警告: このコメントは表示する前に認証が必要です');
 @define('DELETE_COMMENT', 'コメントを削除');
@@ -559,7 +559,7 @@
 @define('BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS', '以下にインストール済みのプラグインの一覧があります');
 @define('SIDEBAR_PLUGIN', 'サイドバープラグイン');
 @define('EVENT_PLUGIN', 'イベントプラグイン');
-@define('CLICK_HERE_TO_INSTALL_PLUGIN', '新しい%sをインストールする');
+@define('CLICK_HERE_TO_INSTALL_PLUGIN', '新しい %s をインストールする');
 @define('UNKNOWN', '未知');
 @define('VERSION', 'バージョン');
 @define('NA', 'N/A');
@@ -567,7 +567,7 @@
 @define('ALREADY_INSTALLED', '既にインストール済みです');
 @define('SELECT_A_PLUGIN_TO_ADD', 'インストールしたいプラグインを選択する');
 @define('INSTALL_OFFSET', 'サーバー時間差');
-@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone');
+@define('INSTALL_OFFSET_DESC', 'ウェブサーバとあなたの希望の時間帯の時差を入力します。');
 @define('STICKY_POSTINGS', 'スティッキ投稿');
 @define('INSTALL_FETCHLIMIT', 'フロントページにエントリを表示する');
 @define('INSTALL_FETCHLIMIT_DESC', '各ページでフロントエンドに表示するエントリの数');
@@ -595,7 +595,7 @@
 @define('INSTALL_SHOWFUTURE', '未来のエントリを表示する');
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.');
 @define('INSTALL_DBPERSISTENT', '継続的接続を使用する');
-@define('INSTALL_DBPERSISTENT_DESC', '継続的データベース接続の使用法を有効にします。詳しいことは<a href="http://php.net/manual/features.persistent-connections.php" target="_blank">ここ</a>を参照してください。これは通常推奨しません。');
+@define('INSTALL_DBPERSISTENT_DESC', '継続的データベース接続の使用法を有効にします。詳しいことは<a href="http://php.net/manual/features.persistent-connections.php" target="_blank">ここ</a>を参照してください。これは通常使用することを推奨しません。');
 @define('NO_IMAGES_FOUND', '画像が見つかりません。');
 @define('PERSONAL_SETTINGS', '個人設定');
 @define('REFERER', 'リファラー');
@@ -617,16 +617,16 @@
 @define('PHP_INSTALLATION', 'PHP インストール');
 @define('THEY_DO', 'それを行う');
 @define('THEY_DONT', 'それを行わない');
-@define('SIMPLE_INSTALLATION', '簡単なインストール作業');
-@define('EXPERT_INSTALLATION', '上級者のインストール作業');
-@define('COMPLETE_INSTALLATION', 'インストール作業完了');
+@define('SIMPLE_INSTALLATION', '簡単なインストール作業を行う');
+@define('EXPERT_INSTALLATION', '上級者のインストール作業を行う');
+@define('COMPLETE_INSTALLATION', 'インストール作業を完了する');
 @define('WONT_INSTALL_DB_AGAIN', '再度データベースをインストールしないでしょう。');
-@define('CHECK_DATABASE_EXISTS', 'データベースとテーブルが既に存在するか確認します');
+@define('CHECK_DATABASE_EXISTS', 'データベースとテーブルが既に存在するか確認します。');
 @define('CREATING_PRIMARY_AUTHOR', '主要な執筆者 \'%s\' を作成中');
 @define('SETTING_DEFAULT_TEMPLATE', 'デフォルトテンプレート設定');
 @define('INSTALLING_DEFAULT_PLUGINS', 'デフォルトプラグインのインストール');
 @define('SERENDIPITY_INSTALLED', 'Serendipity のインストールに成功しました。');
-@define('VISIT_BLOG_HERE', 'ここからあなたの新しいブログに訪問します');
+@define('VISIT_BLOG_HERE', 'ここからあなたの新しいブログに訪問できます。');
 @define('THANK_YOU_FOR_CHOOSING', 'Serendipity を選んでくれてありがとうございます。');
 @define('ERROR_DETECTED_IN_INSTALL', 'インストール作業でエラーを検知しました。');
 @define('OPERATING_SYSTEM', 'オペレーションシステム');
@@ -658,22 +658,22 @@
 @define('IFRAME_WARNING', 'ブラウザーが iframe をサポートしていません。serendipity_config.inc.php ファイルを開いて、$serendipity[\'use_iframe\'] を FALSE に設定してください。');
 @define('NONE', 'なし');
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', '新規エントリのデフォルト設定');
-@define('UPGRADE', 'Upgrade'); // Translate
-@define('UPGRADE_TO_VERSION', 'Upgrade to version %s'); // Translate
-@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('UPGRADE', 'アップグレード');
+@define('UPGRADE_TO_VERSION', 'バージョン %s へアップグレード');
+@define('DELETE_DIRECTORY', 'ディレクトリの削除');
+@define('DELETE_DIRECTORY_DESC', 'メディアファイル(恐らくあなたのエントリのうちのいくつかの中で使用されるファイル)を含むディレクトリの内容を削除をします。');
+@define('FORCE_DELETE', 'Serendipity でこのディレクトリ中の未知のものを含むファイルをすべて削除します。');
+@define('CREATE_DIRECTORY', 'ディレクトリの作成');
+@define('CREATE_NEW_DIRECTORY', '新規ディレクトリの作成');
+@define('CREATE_DIRECTORY_DESC', 'ここで、メディアファイルを中へ保存めに新しいディレクトリを作成することができます。新しいディレクトリの名前を選び、それを保存するオプションと親ディレクトリを選択します。');
+@define('BASE_DIRECTORY', 'ベースディレクトリ');
+@define('USERLEVEL_EDITOR_DESC', '標準の編集者');
+@define('USERLEVEL_CHIEF_DESC', 'チーフ編集者');
+@define('USERLEVEL_ADMIN_DESC', '管理者'); // Translate
+@define('USERCONF_USERLEVEL', 'アクセスレベル'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'このレベルはこのユーザがウェブログに対してどういう種類のアクセスを持つか決定するため使用されます。');
+@define('USER_SELF_INFO', '%s としてログイン中 (%s)');
+@define('ADMIN_ENTRIES', 'エントリ');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity serendipity_admin.php,1.67,1.68

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

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

Modified Files:
	serendipity_admin.php 
Log Message:
- Pretty up text in infobar
- Remove unnecessary ucfirst call function, when we could just change the case of the language constants (pet peeve for over a year :))


Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- serendipity_admin.php	3 Feb 2005 19:06:31 -0000	1.67
+++ serendipity_admin.php	3 Feb 2005 21:06:04 -0000	1.68
@@ -66,7 +66,7 @@
             <tr>
                 <td colspan="2" id="serendipityAdminInfopane">
                     <?php if (serendipity_userLoggedIn()) { ?>
-                        <?php echo sprintf(USER_SELF_INFO, $serendipity['serendipityUser'], $serendipity['serendipityUserlevel']) ?>
+                        <?php echo sprintf(USER_SELF_INFO, $serendipity['serendipityUser'], $serendipity['permissionLevels'][$serendipity['serendipityUserlevel']]) ?>
                     <?php } ?>
                 </td>
             </tr>
@@ -127,7 +127,7 @@
                     </ul>
                     <br />
                     <ul class="serendipitySideBarMenu">
-                        <li class="serendipitySideBarMenuHead"><?php echo serendipity_mb('ucfirst', ENTRIES); ?></li>
+                        <li class="serendipitySideBarMenuHead"><?php echo ADMIN_ENTRIES ?></li>
                         <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&amp;serendipity[adminAction]=new"><?php echo NEW_ENTRY; ?></a></li>
                         <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&amp;serendipity[adminAction]=editSelect"><?php echo EDIT_ENTRIES; ?></a></li>
                         <li><a href="serendipity_admin.php?serendipity[adminModule]=comments"><?php echo COMMENTS; ?></a></li>

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.60,1.61 serendipity_lang_cn.inc.php,1.27,1.28 serendipity_lang_cs.inc.php,1.107,1.108 serendipity_lang_cz.inc.php,1.107,1.108 serendipity_lang_da.inc.php,1.127,1.128 serendipity_lang_de.inc.php,1.148,1.149 serendipity_lang_en.inc.php,1.129,1.130 serendipity_lang_es.inc.php,1.122,1.123 serendipity_lang_fi.inc.php,1.15,1.16 serendipity_lang_fr.inc.php,1.107,1.108 serendipity_lang_it.inc.php,1.46,1.47 serendipity_lang_ja.inc.php,1.23,1.24 serendipity_lang_ko.inc.php,1.15,1.16 serendipity_lang_nl.inc.php,1.83,1.84 serendipity_lang_no.inc.php,1.47,1.48 serendipity_lang_pt.inc.php,1.82,1.83 serendipity_lang_ru.inc.php,1.20,1.21 serendipity_lang_tn.inc.php,1.28,1.29 serendipity_lang_tw.inc.php,1.43,1.44 serendipity_lang_zh.inc.php,1.27,1.28

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

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29925/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:
- Pretty up text in infobar
- Remove unnecessary ucfirst call function, when we could just change the case of the language constants (pet peeve for over a year :))


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- serendipity_lang_cs.inc.php	3 Feb 2005 18:25:16 -0000	1.107
+++ serendipity_lang_cs.inc.php	3 Feb 2005 21:06:11 -0000	1.108
@@ -316,7 +316,6 @@
 @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('USER_SELF_INFO', 'pøihlášen jako %s, úroveò %s');
 @define('DIRECTORIES_AVAILABLE', 'Po kliknutí na nìkterý podadresáø v seznamu mùžete vytvoøit další podadresáø.');
 @define('ALL_DIRECTORIES', 'všechny adresáøe');
 @define('MANAGE_DIRECTORIES', 'Práce s adresáøi');
@@ -676,6 +675,8 @@
 @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
 
 /* 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.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- serendipity_lang_no.inc.php	3 Feb 2005 18:25:18 -0000	1.47
+++ serendipity_lang_no.inc.php	3 Feb 2005 21:06:12 -0000	1.48
@@ -302,7 +302,6 @@
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'Du kan ikke opprette brukere med et høyere brukernivå enn deg selv');
 @define('CREATED_USER', 'En ny bruker %s er opprettet');
 @define('MODIFIED_USER', 'Egenskapene for brukeren %s er endret');
-@define('USER_SELF_INFO', 'logget inn som %s, brukernivå %s');
 @define('USER_LEVEL', 'brukernivå');
 @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.');
@@ -675,5 +674,7 @@
 @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
 
 ?>
\ 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.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- serendipity_lang_zh.inc.php	3 Feb 2005 18:25:19 -0000	1.27
+++ serendipity_lang_zh.inc.php	3 Feb 2005 21:06:13 -0000	1.28
@@ -322,7 +322,6 @@
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'Äú²»ÄÜÐÂÔö±ÈÄú¸ßȨÏÞµÄ×÷Õß');
 @define('CREATED_USER', 'ÐÂ×÷Õß %s ÒѾ­ÐÂÔö');
 @define('MODIFIED_USER', '×÷Õß %s µÄ×ÊÁÏÒѾ­¸ü¸Ä');
-@define('USER_SELF_INFO', 'µÇÈëÕʺŠ%s, ȨÏÞ %s');
 @define('USER_LEVEL', '×÷ÕßȨÏÞ');
 @define('DELETE_USER', 'ÄúҪɾ³ýÕâ¸ö×÷Õß #%d %s. È·¶¨Âð? Õâ»áÔÚÖ÷Ò³Òþ²ØËûËùдµÄÈκÎÎÄÕÂ.');
 @define('DELETED_USER', '×÷Õß #%d %s Òѱ»É¾³ý.');
@@ -673,6 +672,8 @@
 @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
 
 /* 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.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- serendipity_lang_en.inc.php	3 Feb 2005 18:25:18 -0000	1.129
+++ serendipity_lang_en.inc.php	3 Feb 2005 21:06:11 -0000	1.130
@@ -321,7 +321,6 @@
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'You cannot create users with a higher userlevel than yourself');
 @define('CREATED_USER', 'A new user %s has been created');
 @define('MODIFIED_USER', 'The properties of user %s have been changed');
-@define('USER_SELF_INFO', 'logged in as %s, level %s');
 @define('USER_LEVEL', 'Userlevel');
 @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.');
@@ -671,6 +670,8 @@
 @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
 
 /* 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.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- serendipity_lang_ja.inc.php	3 Feb 2005 18:25:18 -0000	1.23
+++ serendipity_lang_ja.inc.php	3 Feb 2005 21:06:12 -0000	1.24
@@ -323,7 +323,6 @@
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'あなたより高いユーザーレベルを持ったユーザを作ることができません。');
 @define('CREATED_USER', '新規ユーザー %s を作成しました。');
 @define('MODIFIED_USER', 'ユーザー %s のプロパティを変更しました。');
-@define('USER_SELF_INFO', '%s でログインしています(レベル %s)');
 @define('USER_LEVEL', 'ユーザーレベル');
 @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 を削除しました。');
@@ -673,6 +672,8 @@
 @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
 
 /* 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.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- serendipity_lang_bg.inc.php	3 Feb 2005 18:25:16 -0000	1.60
+++ serendipity_lang_bg.inc.php	3 Feb 2005 21:06:10 -0000	1.61
@@ -351,7 +351,6 @@
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'You cannot create users with a higher userlevel than yourself'); // Translate
 @define('CREATED_USER', 'A new user %s has been created'); // Translate
 @define('MODIFIED_USER', 'The properties of user %s have been changed'); // Translate
-@define('USER_SELF_INFO', 'logged in as %s, level %s'); // Translate
 @define('USER_LEVEL', 'Userlevel'); // Translate
 @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
@@ -659,6 +658,8 @@
 @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
 
 /* 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.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- serendipity_lang_tw.inc.php	3 Feb 2005 18:25:19 -0000	1.43
+++ serendipity_lang_tw.inc.php	3 Feb 2005 21:06:13 -0000	1.44
@@ -322,7 +322,6 @@
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', '±z¤£¯à·s¼W¤ñ±z°ªÅv­­ªº§@ªÌ');
 @define('CREATED_USER', '·s§@ªÌ %s ¤w¸g·s¼W');
 @define('MODIFIED_USER', '§@ªÌ %s ªº¸ê®Æ¤w¸g§ó§ï');
-@define('USER_SELF_INFO', 'µn¤J±b¸¹ %s, Åv­­ %s');
 @define('USER_LEVEL', '§@ªÌÅv­­');
 @define('DELETE_USER', '±z­n§R°£³o­Ó§@ªÌ #%d %s. ½T©w¶Ü? ³o·|¦b¥D­¶ÁôÂÃ¥L©Ò¼gªº¥ô¦ó¤å³¹.');
 @define('DELETED_USER', '§@ªÌ #%d %s ¤w³Q§R°£.');
@@ -674,6 +673,8 @@
 @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
 
 /* 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.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- serendipity_lang_cz.inc.php	3 Feb 2005 18:25:16 -0000	1.107
+++ serendipity_lang_cz.inc.php	3 Feb 2005 21:06:11 -0000	1.108
@@ -316,7 +316,6 @@
 @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('USER_SELF_INFO', 'pøihlá¹en jako %s, úroveò %s');
 @define('DIRECTORIES_AVAILABLE', 'Po kliknutí na nìkterý podadresáø v seznamu mù¾ete vytvoøit dal¹í podadresáø.');
 @define('ALL_DIRECTORIES', 'v¹echny adresáøe');
 @define('MANAGE_DIRECTORIES', 'Práce s adresáøi');
@@ -676,6 +675,8 @@
 @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
 
 /* 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.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- serendipity_lang_pt.inc.php	3 Feb 2005 18:25:19 -0000	1.82
+++ serendipity_lang_pt.inc.php	3 Feb 2005 21:06:13 -0000	1.83
@@ -303,7 +303,6 @@
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'Você não pode criar usuários com um nível maior que o seu');
 @define('CREATED_USER', 'Um novo usuário %s foi criado');
 @define('MODIFIED_USER', 'As propriedades do usuário %s foram alteradas');
-@define('USER_SELF_INFO', 'identificado como %s, nível %s');
 @define('USER_LEVEL', 'Nível do usuário');
 @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.');
@@ -675,6 +674,8 @@
 @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
 
 /* 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.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- serendipity_lang_it.inc.php	3 Feb 2005 18:25:18 -0000	1.46
+++ serendipity_lang_it.inc.php	3 Feb 2005 21:06:12 -0000	1.47
@@ -309,7 +309,6 @@
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'Non puoi creare utenti di livello superiore al tuo');
 @define('CREATED_USER', 'Un nuovo utente %s è stato creato');
 @define('MODIFIED_USER', 'Le caratteristiche dell\'utente %s sono state modificate');
-@define('USER_SELF_INFO', 'connesso come %s, livello %s');
 @define('USER_LEVEL', 'Livello utente');
 @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.');
@@ -676,6 +675,8 @@
 @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
 
 /* 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.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- serendipity_lang_da.inc.php	3 Feb 2005 18:25:17 -0000	1.127
+++ serendipity_lang_da.inc.php	3 Feb 2005 21:06:11 -0000	1.128
@@ -305,7 +305,6 @@
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'Du kan ikke oprette brugere med en højere brugerniveau end digselv');
 @define('CREATED_USER', 'En ny bruger %s er blevet oprettet');
 @define('MODIFIED_USER', 'Egenskaberne for brugeren %s er blevet ændret');
-@define('USER_SELF_INFO', 'logget ind som %s, brugerniveau %s');
 @define('USER_LEVEL', 'brugerniveau');
 @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.');
@@ -675,6 +674,8 @@
 @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
 
 /* 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.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- serendipity_lang_fr.inc.php	3 Feb 2005 18:25:18 -0000	1.107
+++ serendipity_lang_fr.inc.php	3 Feb 2005 21:06:12 -0000	1.108
@@ -307,7 +307,6 @@
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'Vous ne pouvez pas créer d\'utilisateur avec un niveau d\'autorisation plus élevé que le vôtre.');
 @define('CREATED_USER', 'Un nouvel utilisateur %s a été crée');
 @define('MODIFIED_USER', 'Les propriétés de l\'utilisateur %s ont été changées');
-@define('USER_SELF_INFO', 'authentifié comme %s, niveau d\'autorisation %s');
 @define('USER_LEVEL', 'Niveau d\'autorisation');
 @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é.');
@@ -678,6 +677,8 @@
 @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
 
 /* 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.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_lang_fi.inc.php	3 Feb 2005 18:25:18 -0000	1.15
+++ serendipity_lang_fi.inc.php	3 Feb 2005 21:06:12 -0000	1.16
@@ -321,7 +321,6 @@
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'Et voi muokata ylempiarvoisiasi.');
 @define('CREATED_USER', 'Uusi käyttäjä %s on luotu');
 @define('MODIFIED_USER', 'Käyttäjä %s muokattu');
-@define('USER_SELF_INFO', 'kirjauduttu käyttäjänä %s, tasolla %s');
 @define('USER_LEVEL', 'Taso');
 @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.');
@@ -671,6 +670,8 @@
 @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
 
 /* 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.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_lang_ko.inc.php	3 Feb 2005 18:25:18 -0000	1.15
+++ serendipity_lang_ko.inc.php	3 Feb 2005 21:06:12 -0000	1.16
@@ -327,7 +327,6 @@
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'You cannot create users with a higher userlevel than yourself');
 @define('CREATED_USER', 'A new user %s has been created');
 @define('MODIFIED_USER', 'The properties of user %s have been changed');
-@define('USER_SELF_INFO', 'logged in as %s, level %s');
 @define('USER_LEVEL', 'Userlevel');
 @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.');
@@ -676,6 +675,8 @@
 @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
 
 /* 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.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- serendipity_lang_es.inc.php	3 Feb 2005 18:25:18 -0000	1.122
+++ serendipity_lang_es.inc.php	3 Feb 2005 21:06:11 -0000	1.123
@@ -299,7 +299,6 @@
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'No puedes crear usuarios con un nivel mayor que el tuyo');
 @define('CREATED_USER', 'Un nuevo usuario %s se ha creado');
 @define('MODIFIED_USER', 'Las propiedades del usuario %s se han cambiado');
-@define('USER_SELF_INFO', 'conectado como %s, nivel %s');
 @define('USER_LEVEL', 'Nivel de usuario');
 @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.');
@@ -677,6 +676,8 @@
 @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
 
 /* 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.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- serendipity_lang_cn.inc.php	3 Feb 2005 18:25:16 -0000	1.27
+++ serendipity_lang_cn.inc.php	3 Feb 2005 21:06:11 -0000	1.28
@@ -322,7 +322,6 @@
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', '您不能新增比您高权限的作者');
 @define('CREATED_USER', '新作者 %s 已经新增');
 @define('MODIFIED_USER', '作者 %s 的资料已经更改');
-@define('USER_SELF_INFO', '登入帐号 %s, 权限 %s');
 @define('USER_LEVEL', '作者权限');
 @define('DELETE_USER', '您要删除这个作者 #%d %s. 确定吗? 这会在主页隐藏他所写的任何文章.');
 @define('DELETED_USER', '作者 #%d %s 已被删除.');
@@ -673,6 +672,8 @@
 @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
 
 /* 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.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- serendipity_lang_tn.inc.php	3 Feb 2005 18:25:19 -0000	1.28
+++ serendipity_lang_tn.inc.php	3 Feb 2005 21:06:13 -0000	1.29
@@ -322,7 +322,6 @@
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', '您不能新增比您高權限的作者');
 @define('CREATED_USER', '新作者 %s 已經新增');
 @define('MODIFIED_USER', '作者 %s 的資料已經更改');
-@define('USER_SELF_INFO', '登入帳號 %s, 權限 %s');
 @define('USER_LEVEL', '作者權限');
 @define('DELETE_USER', '您要刪除這個作者 #%d %s. 確定嗎? 這會在主頁隱藏他所寫的任何文章.');
 @define('DELETED_USER', '作者 #%d %s 已被刪除.');
@@ -674,6 +673,8 @@
 @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
 
 /* 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.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_lang_ru.inc.php	3 Feb 2005 18:25:19 -0000	1.20
+++ serendipity_lang_ru.inc.php	3 Feb 2005 21:06:13 -0000	1.21
@@ -324,7 +324,6 @@
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'Вы не можете создать пользователей с уровнем доступа выше вашего собственного');
 @define('CREATED_USER', 'Новый пользователь %s был успешно создан');
 @define('MODIFIED_USER', 'Свойства пользователя %s были изменены');
-@define('USER_SELF_INFO', 'вы вошли как пользователь %s, уровень доступа %s');
 @define('USER_LEVEL', 'Userlevel');
 @define('DELETE_USER', 'Вы собираетесь удалить пользователя #%d %s. Вы уверены? Эта операция запретит отображение любых добавленных им записей.');
 @define('DELETED_USER', 'Пользователь #%d %s удалён.');
@@ -676,6 +675,8 @@
 @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
 
 /* 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.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- serendipity_lang_de.inc.php	3 Feb 2005 18:25:17 -0000	1.148
+++ serendipity_lang_de.inc.php	3 Feb 2005 21:06:11 -0000	1.149
@@ -308,7 +308,6 @@
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'Sie können keine Benutzer mit einem höheren Benutzerlevel als Ihrem anlegen');
 @define('CREATED_USER', 'Der neue Benutzer %s wurde angelegt');
 @define('MODIFIED_USER', 'Die Eigenschaften von Benutzer %s wurden geändert');
-@define('USER_SELF_INFO', 'angemeldet als %s, Userlevel %s');
 @define('USER_LEVEL', 'Userlevel');
 @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.');
@@ -673,6 +672,8 @@
 @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
 
 /* 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.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- serendipity_lang_nl.inc.php	3 Feb 2005 18:25:18 -0000	1.83
+++ serendipity_lang_nl.inc.php	3 Feb 2005 21:06:12 -0000	1.84
@@ -326,7 +326,6 @@
 @define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'U kunt geen gebruikers aanmaken met een hoger gebruikersniveau als uzelf');
 @define('CREATED_USER', '%s is aangemaakt als nieuwe gebruiker');
 @define('MODIFIED_USER', 'De eigenschappen van gebruiker, %s, zijn gewijzigd');
-@define('USER_SELF_INFO', 'Aangemeld als %s, met gebruikersniveau %s');
 @define('USER_LEVEL', 'Gebruikersniveau');
 @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.');
@@ -677,6 +676,8 @@
 @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
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.34,1.35

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

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

Modified Files:
	functions_installer.inc.php 
Log Message:
- array_merge() PATH data :)


Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- functions_installer.inc.php	3 Feb 2005 19:14:44 -0000	1.34
+++ functions_installer.inc.php	3 Feb 2005 19:19:56 -0000	1.35
@@ -132,7 +132,7 @@
             $path[] = ini_get('safe_mode_exec_dir');
 
             if (isset($_SERVER['PATH'])) {
-                $path = explode(':', $_SERVER['PATH']);
+                $path = array_merge($path, explode(':', $_SERVER['PATH']));
             }
 
             /* add some other possible locations to the path while we are at it,

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.33,1.34

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

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

Modified Files:
	functions_installer.inc.php 
Log Message:
- The aboslute best place to find imagick is in safe_mode_exec_dir, so check that first


Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- functions_installer.inc.php	31 Jan 2005 10:08:23 -0000	1.33
+++ functions_installer.inc.php	3 Feb 2005 19:14:44 -0000	1.34
@@ -129,6 +129,8 @@
         case 'convert':
             $path = array();
 
+            $path[] = ini_get('safe_mode_exec_dir');
+
             if (isset($_SERVER['PATH'])) {
                 $path = explode(':', $_SERVER['PATH']);
             }

[php-blog-cvs] serendipity/templates/default/admin style.css,1.26,1.27

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

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

Modified Files:
	style.css 
Log Message:
- Fix wrong colspan in installer/upgrader and login page
- Sex up the admin topbanner with some shadow and background


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/admin/style.css,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- style.css	1 Feb 2005 21:05:18 -0000	1.26
+++ style.css	3 Feb 2005 19:06:32 -0000	1.27
@@ -27,17 +27,18 @@
 #serendipityAdminBanner {
     background-color: #FFFFFF;
     height: 80px;
+    background-image: url({TEMPLATE_PATH}img/banner_background.png);
 }
 
 #serendipityAdminInfopane {
     background-color: #F8F9FA;
     font-size: 10px;
     padding: 5px;
-    border-top: 1px solid #000000;
-    border-bottom: 1px solid #000000;
     vertical-align: middle;
     text-align: right;
     color: #5E5E5E;
+    height: 27px;
+    background-image: url({TEMPLATE_PATH}img/infobar_background.png);
 }
 
 #serendipityAdminMainpane {
@@ -72,6 +73,7 @@
 
 #serendipitySideBar {
     width: 20%;
+    padding-top: 10px;
 }
 
 #serendipityAdminFooter {

[php-blog-cvs] serendipity/templates/default/admin/img banner_background.png,NONE,1.1 infobar_background.png,NONE,1.1

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

Update of /cvsroot/php-blog/serendipity/templates/default/admin/img
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5423/templates/default/admin/img

Added Files:
	banner_background.png infobar_background.png 
Log Message:
- Fix wrong colspan in installer/upgrader and login page
- Sex up the admin topbanner with some shadow and background


--- NEW FILE: banner_background.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: infobar_background.png ---
(This appears to be a binary file; contents omitted.)